From 3a4992633ee62d5edfbb484d9c6bcb3cf158489d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 31 Jul 2023 14:34:36 +0200 Subject: 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) --- server/middlewares/validators/shared/utils.ts | 69 --------------------------- 1 file changed, 69 deletions(-) delete mode 100644 server/middlewares/validators/shared/utils.ts (limited to 'server/middlewares/validators/shared/utils.ts') diff --git a/server/middlewares/validators/shared/utils.ts b/server/middlewares/validators/shared/utils.ts deleted file mode 100644 index f39128fdd..000000000 --- a/server/middlewares/validators/shared/utils.ts +++ /dev/null @@ -1,69 +0,0 @@ -import express from 'express' -import { param, validationResult } from 'express-validator' -import { isIdOrUUIDValid, toCompleteUUID } from '@server/helpers/custom-validators/misc' -import { logger } from '../../../helpers/logger' - -function areValidationErrors ( - req: express.Request, - res: express.Response, - options: { - omitLog?: boolean - omitBodyLog?: boolean - tags?: string[] - } = {}) { - const { omitLog = false, omitBodyLog = false, tags = [] } = options - - if (!omitLog) { - logger.debug( - 'Checking %s - %s parameters', - req.method, req.originalUrl, - { - body: omitBodyLog - ? 'omitted' - : req.body, - params: req.params, - query: req.query, - files: req.files, - tags - } - ) - } - - const errors = validationResult(req) - - if (!errors.isEmpty()) { - logger.warn('Incorrect request parameters', { path: req.originalUrl, err: errors.mapped() }) - - res.fail({ - message: 'Incorrect request parameters: ' + Object.keys(errors.mapped()).join(', '), - instance: req.originalUrl, - data: { - 'invalid-params': errors.mapped() - } - }) - - return true - } - - return false -} - -function isValidVideoIdParam (paramName: string) { - return param(paramName) - .customSanitizer(toCompleteUUID) - .custom(isIdOrUUIDValid).withMessage('Should have a valid video id (id, short UUID or UUID)') -} - -function isValidPlaylistIdParam (paramName: string) { - return param(paramName) - .customSanitizer(toCompleteUUID) - .custom(isIdOrUUIDValid).withMessage('Should have a valid playlist id (id, short UUID or UUID)') -} - -// --------------------------------------------------------------------------- - -export { - areValidationErrors, - isValidVideoIdParam, - isValidPlaylistIdParam -} -- cgit v1.2.3