aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib/runners/runner.ts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2023-07-31 14:34:36 +0200
committerChocobozzz <me@florianbigard.com>2023-08-11 15:02:33 +0200
commit3a4992633ee62d5edfbb484d9c6bcb3cf158489d (patch)
treee4510b39bdac9c318fdb4b47018d08f15368b8f0 /server/lib/runners/runner.ts
parent04d1da5621d25d59bd5fa1543b725c497bf5d9a8 (diff)
downloadPeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.tar.gz
PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.tar.zst
PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.zip
Migrate server to ESM
Sorry for the very big commit that may lead to git log issues and merge conflicts, but it's a major step forward: * Server can be faster at startup because imports() are async and we can easily lazy import big modules * Angular doesn't seem to support ES import (with .js extension), so we had to correctly organize peertube into a monorepo: * Use yarn workspace feature * Use typescript reference projects for dependencies * Shared projects have been moved into "packages", each one is now a node module (with a dedicated package.json/tsconfig.json) * server/tools have been moved into apps/ and is now a dedicated app bundled and published on NPM so users don't have to build peertube cli tools manually * server/tests have been moved into packages/ so we don't compile them every time we want to run the server * Use isolatedModule option: * Had to move from const enum to const (https://www.typescriptlang.org/docs/handbook/enums.html#objects-vs-enums) * Had to explictely specify "type" imports when used in decorators * Prefer tsx (that uses esbuild under the hood) instead of ts-node to load typescript files (tests with mocha or scripts): * To reduce test complexity as esbuild doesn't support decorator metadata, we only test server files that do not import server models * We still build tests files into js files for a faster CI * Remove unmaintained peertube CLI import script * Removed some barrels to speed up execution (less imports)
Diffstat (limited to 'server/lib/runners/runner.ts')
-rw-r--r--server/lib/runners/runner.ts49
1 files changed, 0 insertions, 49 deletions
diff --git a/server/lib/runners/runner.ts b/server/lib/runners/runner.ts
deleted file mode 100644
index 947fdb3f0..000000000
--- a/server/lib/runners/runner.ts
+++ /dev/null
@@ -1,49 +0,0 @@
1import express from 'express'
2import { retryTransactionWrapper } from '@server/helpers/database-utils'
3import { logger, loggerTagsFactory } from '@server/helpers/logger'
4import { sequelizeTypescript } from '@server/initializers/database'
5import { MRunner, MRunnerJob } from '@server/types/models/runners'
6import { RUNNER_JOBS } from '@server/initializers/constants'
7import { RunnerJobState } from '@shared/models'
8
9const lTags = loggerTagsFactory('runner')
10
11const updatingRunner = new Set<number>()
12
13function updateLastRunnerContact (req: express.Request, runner: MRunner) {
14 const now = new Date()
15
16 // Don't update last runner contact too often
17 if (now.getTime() - runner.lastContact.getTime() < RUNNER_JOBS.LAST_CONTACT_UPDATE_INTERVAL) return
18 if (updatingRunner.has(runner.id)) return
19
20 updatingRunner.add(runner.id)
21
22 runner.lastContact = now
23 runner.ip = req.ip
24
25 logger.debug('Updating last runner contact for %s', runner.name, lTags(runner.name))
26
27 retryTransactionWrapper(() => {
28 return sequelizeTypescript.transaction(async transaction => {
29 return runner.save({ transaction })
30 })
31 })
32 .catch(err => logger.error('Cannot update last runner contact for %s', runner.name, { err, ...lTags(runner.name) }))
33 .finally(() => updatingRunner.delete(runner.id))
34}
35
36function runnerJobCanBeCancelled (runnerJob: MRunnerJob) {
37 const allowedStates = new Set<RunnerJobState>([
38 RunnerJobState.PENDING,
39 RunnerJobState.PROCESSING,
40 RunnerJobState.WAITING_FOR_PARENT_JOB
41 ])
42
43 return allowedStates.has(runnerJob.state)
44}
45
46export {
47 updateLastRunnerContact,
48 runnerJobCanBeCancelled
49}