diff options
author | Chocobozzz <me@florianbigard.com> | 2023-07-31 14:34:36 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-08-11 15:02:33 +0200 |
commit | 3a4992633ee62d5edfbb484d9c6bcb3cf158489d (patch) | |
tree | e4510b39bdac9c318fdb4b47018d08f15368b8f0 /server/middlewares/validators/runners/runners.ts | |
parent | 04d1da5621d25d59bd5fa1543b725c497bf5d9a8 (diff) | |
download | PeerTube-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/middlewares/validators/runners/runners.ts')
-rw-r--r-- | server/middlewares/validators/runners/runners.ts | 104 |
1 files changed, 0 insertions, 104 deletions
diff --git a/server/middlewares/validators/runners/runners.ts b/server/middlewares/validators/runners/runners.ts deleted file mode 100644 index 4d4d79b4c..000000000 --- a/server/middlewares/validators/runners/runners.ts +++ /dev/null | |||
@@ -1,104 +0,0 @@ | |||
1 | import express from 'express' | ||
2 | import { body, param } from 'express-validator' | ||
3 | import { isIdValid } from '@server/helpers/custom-validators/misc' | ||
4 | import { | ||
5 | isRunnerDescriptionValid, | ||
6 | isRunnerNameValid, | ||
7 | isRunnerRegistrationTokenValid, | ||
8 | isRunnerTokenValid | ||
9 | } from '@server/helpers/custom-validators/runners/runners' | ||
10 | import { RunnerModel } from '@server/models/runner/runner' | ||
11 | import { RunnerRegistrationTokenModel } from '@server/models/runner/runner-registration-token' | ||
12 | import { forceNumber } from '@shared/core-utils' | ||
13 | import { HttpStatusCode, RegisterRunnerBody, ServerErrorCode } from '@shared/models' | ||
14 | import { areValidationErrors } from '../shared/utils' | ||
15 | |||
16 | const tags = [ 'runner' ] | ||
17 | |||
18 | const registerRunnerValidator = [ | ||
19 | body('registrationToken').custom(isRunnerRegistrationTokenValid), | ||
20 | body('name').custom(isRunnerNameValid), | ||
21 | body('description').optional().custom(isRunnerDescriptionValid), | ||
22 | |||
23 | async (req: express.Request, res: express.Response, next: express.NextFunction) => { | ||
24 | if (areValidationErrors(req, res, { tags })) return | ||
25 | |||
26 | const body: RegisterRunnerBody = req.body | ||
27 | |||
28 | const runnerRegistrationToken = await RunnerRegistrationTokenModel.loadByRegistrationToken(body.registrationToken) | ||
29 | |||
30 | if (!runnerRegistrationToken) { | ||
31 | return res.fail({ | ||
32 | status: HttpStatusCode.NOT_FOUND_404, | ||
33 | message: 'Registration token is invalid', | ||
34 | tags | ||
35 | }) | ||
36 | } | ||
37 | |||
38 | const existing = await RunnerModel.loadByName(body.name) | ||
39 | if (existing) { | ||
40 | return res.fail({ | ||
41 | status: HttpStatusCode.BAD_REQUEST_400, | ||
42 | message: 'This runner name already exists on this instance', | ||
43 | tags | ||
44 | }) | ||
45 | } | ||
46 | |||
47 | res.locals.runnerRegistrationToken = runnerRegistrationToken | ||
48 | |||
49 | return next() | ||
50 | } | ||
51 | ] | ||
52 | |||
53 | const deleteRunnerValidator = [ | ||
54 | param('runnerId').custom(isIdValid), | ||
55 | |||
56 | async (req: express.Request, res: express.Response, next: express.NextFunction) => { | ||
57 | if (areValidationErrors(req, res, { tags })) return | ||
58 | |||
59 | const runner = await RunnerModel.load(forceNumber(req.params.runnerId)) | ||
60 | |||
61 | if (!runner) { | ||
62 | return res.fail({ | ||
63 | status: HttpStatusCode.NOT_FOUND_404, | ||
64 | message: 'Runner not found', | ||
65 | tags | ||
66 | }) | ||
67 | } | ||
68 | |||
69 | res.locals.runner = runner | ||
70 | |||
71 | return next() | ||
72 | } | ||
73 | ] | ||
74 | |||
75 | const getRunnerFromTokenValidator = [ | ||
76 | body('runnerToken').custom(isRunnerTokenValid), | ||
77 | |||
78 | async (req: express.Request, res: express.Response, next: express.NextFunction) => { | ||
79 | if (areValidationErrors(req, res, { tags })) return | ||
80 | |||
81 | const runner = await RunnerModel.loadByToken(req.body.runnerToken) | ||
82 | |||
83 | if (!runner) { | ||
84 | return res.fail({ | ||
85 | status: HttpStatusCode.NOT_FOUND_404, | ||
86 | message: 'Unknown runner token', | ||
87 | type: ServerErrorCode.UNKNOWN_RUNNER_TOKEN, | ||
88 | tags | ||
89 | }) | ||
90 | } | ||
91 | |||
92 | res.locals.runner = runner | ||
93 | |||
94 | return next() | ||
95 | } | ||
96 | ] | ||
97 | |||
98 | // --------------------------------------------------------------------------- | ||
99 | |||
100 | export { | ||
101 | registerRunnerValidator, | ||
102 | deleteRunnerValidator, | ||
103 | getRunnerFromTokenValidator | ||
104 | } | ||