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/server.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/server.ts')
-rw-r--r-- | server/middlewares/validators/server.ts | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/server/middlewares/validators/server.ts b/server/middlewares/validators/server.ts deleted file mode 100644 index 7d37ae229..000000000 --- a/server/middlewares/validators/server.ts +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | import express from 'express' | ||
2 | import { body } from 'express-validator' | ||
3 | import { HttpStatusCode } from '../../../shared/models/http/http-error-codes' | ||
4 | import { isHostValid, isValidContactBody } from '../../helpers/custom-validators/servers' | ||
5 | import { isUserDisplayNameValid } from '../../helpers/custom-validators/users' | ||
6 | import { logger } from '../../helpers/logger' | ||
7 | import { CONFIG, isEmailEnabled } from '../../initializers/config' | ||
8 | import { Redis } from '../../lib/redis' | ||
9 | import { ServerModel } from '../../models/server/server' | ||
10 | import { areValidationErrors } from './shared' | ||
11 | |||
12 | const serverGetValidator = [ | ||
13 | body('host').custom(isHostValid).withMessage('Should have a valid host'), | ||
14 | |||
15 | async (req: express.Request, res: express.Response, next: express.NextFunction) => { | ||
16 | if (areValidationErrors(req, res)) return | ||
17 | |||
18 | const server = await ServerModel.loadByHost(req.body.host) | ||
19 | if (!server) { | ||
20 | return res.fail({ | ||
21 | status: HttpStatusCode.NOT_FOUND_404, | ||
22 | message: 'Server host not found.' | ||
23 | }) | ||
24 | } | ||
25 | |||
26 | res.locals.server = server | ||
27 | |||
28 | return next() | ||
29 | } | ||
30 | ] | ||
31 | |||
32 | const contactAdministratorValidator = [ | ||
33 | body('fromName') | ||
34 | .custom(isUserDisplayNameValid), | ||
35 | body('fromEmail') | ||
36 | .isEmail(), | ||
37 | body('body') | ||
38 | .custom(isValidContactBody), | ||
39 | |||
40 | async (req: express.Request, res: express.Response, next: express.NextFunction) => { | ||
41 | if (areValidationErrors(req, res)) return | ||
42 | |||
43 | if (CONFIG.CONTACT_FORM.ENABLED === false) { | ||
44 | return res.fail({ | ||
45 | status: HttpStatusCode.CONFLICT_409, | ||
46 | message: 'Contact form is not enabled on this instance.' | ||
47 | }) | ||
48 | } | ||
49 | |||
50 | if (isEmailEnabled() === false) { | ||
51 | return res.fail({ | ||
52 | status: HttpStatusCode.CONFLICT_409, | ||
53 | message: 'SMTP is not configured on this instance.' | ||
54 | }) | ||
55 | } | ||
56 | |||
57 | if (await Redis.Instance.doesContactFormIpExist(req.ip)) { | ||
58 | logger.info('Refusing a contact form by %s: already sent one recently.', req.ip) | ||
59 | |||
60 | return res.fail({ | ||
61 | status: HttpStatusCode.FORBIDDEN_403, | ||
62 | message: 'You already sent a contact form recently.' | ||
63 | }) | ||
64 | } | ||
65 | |||
66 | return next() | ||
67 | } | ||
68 | ] | ||
69 | |||
70 | // --------------------------------------------------------------------------- | ||
71 | |||
72 | export { | ||
73 | serverGetValidator, | ||
74 | contactAdministratorValidator | ||
75 | } | ||