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) --- .../middlewares/validators/user-notifications.ts | 71 ---------------------- 1 file changed, 71 deletions(-) delete mode 100644 server/middlewares/validators/user-notifications.ts (limited to 'server/middlewares/validators/user-notifications.ts') diff --git a/server/middlewares/validators/user-notifications.ts b/server/middlewares/validators/user-notifications.ts deleted file mode 100644 index 8d70dcdd2..000000000 --- a/server/middlewares/validators/user-notifications.ts +++ /dev/null @@ -1,71 +0,0 @@ -import express from 'express' -import { body, query } from 'express-validator' -import { isNotEmptyIntArray, toBooleanOrNull } from '../../helpers/custom-validators/misc' -import { isUserNotificationSettingValid } from '../../helpers/custom-validators/user-notifications' -import { areValidationErrors } from './shared' - -const listUserNotificationsValidator = [ - query('unread') - .optional() - .customSanitizer(toBooleanOrNull) - .isBoolean().withMessage('Should have a valid unread boolean'), - - (req: express.Request, res: express.Response, next: express.NextFunction) => { - if (areValidationErrors(req, res)) return - - return next() - } -] - -const updateNotificationSettingsValidator = [ - body('newVideoFromSubscription') - .custom(isUserNotificationSettingValid), - body('newCommentOnMyVideo') - .custom(isUserNotificationSettingValid), - body('abuseAsModerator') - .custom(isUserNotificationSettingValid), - body('videoAutoBlacklistAsModerator') - .custom(isUserNotificationSettingValid), - body('blacklistOnMyVideo') - .custom(isUserNotificationSettingValid), - body('myVideoImportFinished') - .custom(isUserNotificationSettingValid), - body('myVideoPublished') - .custom(isUserNotificationSettingValid), - body('commentMention') - .custom(isUserNotificationSettingValid), - body('newFollow') - .custom(isUserNotificationSettingValid), - body('newUserRegistration') - .custom(isUserNotificationSettingValid), - body('newInstanceFollower') - .custom(isUserNotificationSettingValid), - body('autoInstanceFollowing') - .custom(isUserNotificationSettingValid), - - (req: express.Request, res: express.Response, next: express.NextFunction) => { - if (areValidationErrors(req, res)) return - - return next() - } -] - -const markAsReadUserNotificationsValidator = [ - body('ids') - .optional() - .custom(isNotEmptyIntArray).withMessage('Should have a valid array of notification ids'), - - (req: express.Request, res: express.Response, next: express.NextFunction) => { - if (areValidationErrors(req, res)) return - - return next() - } -] - -// --------------------------------------------------------------------------- - -export { - listUserNotificationsValidator, - updateNotificationSettingsValidator, - markAsReadUserNotificationsValidator -} -- cgit v1.2.3