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) --- .../peertube-plugin-test-id-pass-auth-two/main.js | 65 ---------------------- 1 file changed, 65 deletions(-) delete mode 100644 server/tests/fixtures/peertube-plugin-test-id-pass-auth-two/main.js (limited to 'server/tests/fixtures/peertube-plugin-test-id-pass-auth-two/main.js') diff --git a/server/tests/fixtures/peertube-plugin-test-id-pass-auth-two/main.js b/server/tests/fixtures/peertube-plugin-test-id-pass-auth-two/main.js deleted file mode 100644 index fad5abf60..000000000 --- a/server/tests/fixtures/peertube-plugin-test-id-pass-auth-two/main.js +++ /dev/null @@ -1,65 +0,0 @@ -async function register ({ - registerIdAndPassAuth, - peertubeHelpers -}) { - registerIdAndPassAuth({ - authName: 'laguna-auth', - - onLogout: () => { - peertubeHelpers.logger.info('On logout for auth 2 - 1') - }, - - getWeight: () => 30, - - hookTokenValidity: (options) => { - if (options.type === 'refresh') { - return { valid: false } - } - - if (options.type === 'access') { - const token = options.token - const now = new Date() - now.setTime(now.getTime() - 5000) - - const createdAt = new Date(token.createdAt) - - return { valid: createdAt.getTime() >= now.getTime() } - } - - return { valid: true } - }, - - login (body) { - if (body.id === 'laguna' && body.password === 'laguna password') { - return Promise.resolve({ - username: 'laguna', - email: 'laguna@example.com', - displayName: 'Laguna Loire', - adminFlags: 1, - videoQuota: 42000, - videoQuotaDaily: 42100, - - // Always use new value except for videoQuotaDaily field - userUpdater: ({ fieldName, currentValue, newValue }) => { - if (fieldName === 'videoQuotaDaily') return currentValue - - return newValue - } - }) - } - - return null - } - }) -} - -async function unregister () { - return -} - -module.exports = { - register, - unregister -} - -// ########################################################################### -- cgit v1.2.3