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/lib/object-storage/shared/client.ts | 71 ------------------------------ 1 file changed, 71 deletions(-) delete mode 100644 server/lib/object-storage/shared/client.ts (limited to 'server/lib/object-storage/shared/client.ts') diff --git a/server/lib/object-storage/shared/client.ts b/server/lib/object-storage/shared/client.ts deleted file mode 100644 index d5cb074df..000000000 --- a/server/lib/object-storage/shared/client.ts +++ /dev/null @@ -1,71 +0,0 @@ -import { S3Client } from '@aws-sdk/client-s3' -import { NodeHttpHandler } from '@aws-sdk/node-http-handler' -import { logger } from '@server/helpers/logger' -import { isProxyEnabled } from '@server/helpers/proxy' -import { getAgent } from '@server/helpers/requests' -import { CONFIG } from '@server/initializers/config' -import { lTags } from './logger' - -function getProxyRequestHandler () { - if (!isProxyEnabled()) return null - - const { agent } = getAgent() - - return new NodeHttpHandler({ - httpAgent: agent.http, - httpsAgent: agent.https - }) -} - -let endpointParsed: URL -function getEndpointParsed () { - if (endpointParsed) return endpointParsed - - endpointParsed = new URL(getEndpoint()) - - return endpointParsed -} - -let s3Client: S3Client -function getClient () { - if (s3Client) return s3Client - - const OBJECT_STORAGE = CONFIG.OBJECT_STORAGE - - s3Client = new S3Client({ - endpoint: getEndpoint(), - region: OBJECT_STORAGE.REGION, - credentials: OBJECT_STORAGE.CREDENTIALS.ACCESS_KEY_ID - ? { - accessKeyId: OBJECT_STORAGE.CREDENTIALS.ACCESS_KEY_ID, - secretAccessKey: OBJECT_STORAGE.CREDENTIALS.SECRET_ACCESS_KEY - } - : undefined, - requestHandler: getProxyRequestHandler() - }) - - logger.info('Initialized S3 client %s with region %s.', getEndpoint(), OBJECT_STORAGE.REGION, lTags()) - - return s3Client -} - -// --------------------------------------------------------------------------- - -export { - getEndpointParsed, - getClient -} - -// --------------------------------------------------------------------------- - -let endpoint: string -function getEndpoint () { - if (endpoint) return endpoint - - const endpointConfig = CONFIG.OBJECT_STORAGE.ENDPOINT - endpoint = endpointConfig.startsWith('http://') || endpointConfig.startsWith('https://') - ? CONFIG.OBJECT_STORAGE.ENDPOINT - : 'https://' + CONFIG.OBJECT_STORAGE.ENDPOINT - - return endpoint -} -- cgit v1.2.3