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/pre-signed-urls.ts | 46 ---------------------------- 1 file changed, 46 deletions(-) delete mode 100644 server/lib/object-storage/pre-signed-urls.ts (limited to 'server/lib/object-storage/pre-signed-urls.ts') diff --git a/server/lib/object-storage/pre-signed-urls.ts b/server/lib/object-storage/pre-signed-urls.ts deleted file mode 100644 index caf149bb8..000000000 --- a/server/lib/object-storage/pre-signed-urls.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { GetObjectCommand } from '@aws-sdk/client-s3' -import { getSignedUrl } from '@aws-sdk/s3-request-presigner' -import { CONFIG } from '@server/initializers/config' -import { MStreamingPlaylistVideo, MVideoFile } from '@server/types/models' -import { generateHLSObjectStorageKey, generateWebVideoObjectStorageKey } from './keys' -import { buildKey, getClient } from './shared' -import { getHLSPublicFileUrl, getWebVideoPublicFileUrl } from './urls' - -export async function generateWebVideoPresignedUrl (options: { - file: MVideoFile - downloadFilename: string -}) { - const { file, downloadFilename } = options - - const key = generateWebVideoObjectStorageKey(file.filename) - - const command = new GetObjectCommand({ - Bucket: CONFIG.OBJECT_STORAGE.WEB_VIDEOS.BUCKET_NAME, - Key: buildKey(key, CONFIG.OBJECT_STORAGE.WEB_VIDEOS), - ResponseContentDisposition: `attachment; filename=${downloadFilename}` - }) - - const url = await getSignedUrl(getClient(), command, { expiresIn: 3600 * 24 }) - - return getWebVideoPublicFileUrl(url) -} - -export async function generateHLSFilePresignedUrl (options: { - streamingPlaylist: MStreamingPlaylistVideo - file: MVideoFile - downloadFilename: string -}) { - const { streamingPlaylist, file, downloadFilename } = options - - const key = generateHLSObjectStorageKey(streamingPlaylist, file.filename) - - const command = new GetObjectCommand({ - Bucket: CONFIG.OBJECT_STORAGE.STREAMING_PLAYLISTS.BUCKET_NAME, - Key: buildKey(key, CONFIG.OBJECT_STORAGE.STREAMING_PLAYLISTS), - ResponseContentDisposition: `attachment; filename=${downloadFilename}` - }) - - const url = await getSignedUrl(getClient(), command, { expiresIn: 3600 * 24 }) - - return getHLSPublicFileUrl(url) -} -- cgit v1.2.3