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/helpers/custom-validators/users.ts | 123 ------------------------------ 1 file changed, 123 deletions(-) delete mode 100644 server/helpers/custom-validators/users.ts (limited to 'server/helpers/custom-validators/users.ts') diff --git a/server/helpers/custom-validators/users.ts b/server/helpers/custom-validators/users.ts deleted file mode 100644 index f02b3ba65..000000000 --- a/server/helpers/custom-validators/users.ts +++ /dev/null @@ -1,123 +0,0 @@ -import validator from 'validator' -import { UserRole } from '@shared/models' -import { isEmailEnabled } from '../../initializers/config' -import { CONSTRAINTS_FIELDS, NSFW_POLICY_TYPES } from '../../initializers/constants' -import { exists, isArray, isBooleanValid } from './misc' - -const USERS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.USERS - -function isUserPasswordValid (value: string) { - return validator.isLength(value, USERS_CONSTRAINTS_FIELDS.PASSWORD) -} - -function isUserPasswordValidOrEmpty (value: string) { - // Empty password is only possible if emailing is enabled. - if (value === '') return isEmailEnabled() - - return isUserPasswordValid(value) -} - -function isUserVideoQuotaValid (value: string) { - return exists(value) && validator.isInt(value + '', USERS_CONSTRAINTS_FIELDS.VIDEO_QUOTA) -} - -function isUserVideoQuotaDailyValid (value: string) { - return exists(value) && validator.isInt(value + '', USERS_CONSTRAINTS_FIELDS.VIDEO_QUOTA_DAILY) -} - -function isUserUsernameValid (value: string) { - return exists(value) && - validator.matches(value, new RegExp(`^[a-z0-9_]+([a-z0-9_.-]+[a-z0-9_]+)?$`)) && - validator.isLength(value, USERS_CONSTRAINTS_FIELDS.USERNAME) -} - -function isUserDisplayNameValid (value: string) { - return value === null || (exists(value) && validator.isLength(value, CONSTRAINTS_FIELDS.USERS.NAME)) -} - -function isUserDescriptionValid (value: string) { - return value === null || (exists(value) && validator.isLength(value, CONSTRAINTS_FIELDS.USERS.DESCRIPTION)) -} - -function isUserEmailVerifiedValid (value: any) { - return isBooleanValid(value) -} - -const nsfwPolicies = new Set(Object.values(NSFW_POLICY_TYPES)) -function isUserNSFWPolicyValid (value: any) { - return exists(value) && nsfwPolicies.has(value) -} - -function isUserP2PEnabledValid (value: any) { - return isBooleanValid(value) -} - -function isUserVideosHistoryEnabledValid (value: any) { - return isBooleanValid(value) -} - -function isUserAutoPlayVideoValid (value: any) { - return isBooleanValid(value) -} - -function isUserVideoLanguages (value: any) { - return value === null || (isArray(value) && value.length < CONSTRAINTS_FIELDS.USERS.VIDEO_LANGUAGES.max) -} - -function isUserAdminFlagsValid (value: any) { - return exists(value) && validator.isInt('' + value) -} - -function isUserBlockedValid (value: any) { - return isBooleanValid(value) -} - -function isUserAutoPlayNextVideoValid (value: any) { - return isBooleanValid(value) -} - -function isUserAutoPlayNextVideoPlaylistValid (value: any) { - return isBooleanValid(value) -} - -function isUserEmailPublicValid (value: any) { - return isBooleanValid(value) -} - -function isUserNoModal (value: any) { - return isBooleanValid(value) -} - -function isUserBlockedReasonValid (value: any) { - return value === null || (exists(value) && validator.isLength(value, CONSTRAINTS_FIELDS.USERS.BLOCKED_REASON)) -} - -function isUserRoleValid (value: any) { - return exists(value) && validator.isInt('' + value) && [ UserRole.ADMINISTRATOR, UserRole.MODERATOR, UserRole.USER ].includes(value) -} - -// --------------------------------------------------------------------------- - -export { - isUserVideosHistoryEnabledValid, - isUserBlockedValid, - isUserPasswordValid, - isUserPasswordValidOrEmpty, - isUserVideoLanguages, - isUserBlockedReasonValid, - isUserRoleValid, - isUserVideoQuotaValid, - isUserVideoQuotaDailyValid, - isUserUsernameValid, - isUserAdminFlagsValid, - isUserEmailVerifiedValid, - isUserNSFWPolicyValid, - isUserP2PEnabledValid, - isUserAutoPlayVideoValid, - isUserAutoPlayNextVideoValid, - isUserAutoPlayNextVideoPlaylistValid, - isUserDisplayNameValid, - isUserDescriptionValid, - isUserEmailPublicValid, - isUserNoModal -} -- cgit v1.2.3