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) --- shared/core-utils/plugins/hooks.ts | 61 -------------------------------------- 1 file changed, 61 deletions(-) delete mode 100644 shared/core-utils/plugins/hooks.ts (limited to 'shared/core-utils/plugins/hooks.ts') diff --git a/shared/core-utils/plugins/hooks.ts b/shared/core-utils/plugins/hooks.ts deleted file mode 100644 index 96bcc945e..000000000 --- a/shared/core-utils/plugins/hooks.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { RegisteredExternalAuthConfig } from '@shared/models' -import { HookType } from '../../models/plugins/hook-type.enum' -import { isCatchable, isPromise } from '../common/promises' - -function getHookType (hookName: string) { - if (hookName.startsWith('filter:')) return HookType.FILTER - if (hookName.startsWith('action:')) return HookType.ACTION - - return HookType.STATIC -} - -async function internalRunHook (options: { - handler: Function - hookType: HookType - result: T - params: any - onError: (err: Error) => void -}) { - const { handler, hookType, result, params, onError } = options - - try { - if (hookType === HookType.FILTER) { - const p = handler(result, params) - - const newResult = isPromise(p) - ? await p - : p - - return newResult - } - - // Action/static hooks do not have result value - const p = handler(params) - - if (hookType === HookType.STATIC) { - if (isPromise(p)) await p - - return undefined - } - - if (hookType === HookType.ACTION) { - if (isCatchable(p)) p.catch((err: any) => onError(err)) - - return undefined - } - } catch (err) { - onError(err) - } - - return result -} - -function getExternalAuthHref (apiUrl: string, auth: RegisteredExternalAuthConfig) { - return apiUrl + `/plugins/${auth.name}/${auth.version}/auth/${auth.authName}` -} - -export { - getHookType, - internalRunHook, - getExternalAuthHref -} -- cgit v1.2.3