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/accounts.ts | 66 ------------------------ 1 file changed, 66 deletions(-) delete mode 100644 server/middlewares/validators/shared/accounts.ts (limited to 'server/middlewares/validators/shared/accounts.ts') diff --git a/server/middlewares/validators/shared/accounts.ts b/server/middlewares/validators/shared/accounts.ts deleted file mode 100644 index 72b0e235e..000000000 --- a/server/middlewares/validators/shared/accounts.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { Response } from 'express' -import { AccountModel } from '@server/models/account/account' -import { UserModel } from '@server/models/user/user' -import { MAccountDefault } from '@server/types/models' -import { forceNumber } from '@shared/core-utils' -import { HttpStatusCode } from '@shared/models' - -function doesAccountIdExist (id: number | string, res: Response, sendNotFound = true) { - const promise = AccountModel.load(forceNumber(id)) - - return doesAccountExist(promise, res, sendNotFound) -} - -function doesLocalAccountNameExist (name: string, res: Response, sendNotFound = true) { - const promise = AccountModel.loadLocalByName(name) - - return doesAccountExist(promise, res, sendNotFound) -} - -function doesAccountNameWithHostExist (nameWithDomain: string, res: Response, sendNotFound = true) { - const promise = AccountModel.loadByNameWithHost(nameWithDomain) - - return doesAccountExist(promise, res, sendNotFound) -} - -async function doesAccountExist (p: Promise, res: Response, sendNotFound: boolean) { - const account = await p - - if (!account) { - if (sendNotFound === true) { - res.fail({ - status: HttpStatusCode.NOT_FOUND_404, - message: 'Account not found' - }) - } - return false - } - - res.locals.account = account - return true -} - -async function doesUserFeedTokenCorrespond (id: number, token: string, res: Response) { - const user = await UserModel.loadByIdWithChannels(forceNumber(id)) - - if (token !== user.feedToken) { - res.fail({ - status: HttpStatusCode.FORBIDDEN_403, - message: 'User and token mismatch' - }) - return false - } - - res.locals.user = user - return true -} - -// --------------------------------------------------------------------------- - -export { - doesAccountIdExist, - doesLocalAccountNameExist, - doesAccountNameWithHostExist, - doesAccountExist, - doesUserFeedTokenCorrespond -} -- cgit v1.2.3