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/controllers/object-storage-proxy.ts | 60 ------------------------------ 1 file changed, 60 deletions(-) delete mode 100644 server/controllers/object-storage-proxy.ts (limited to 'server/controllers/object-storage-proxy.ts') diff --git a/server/controllers/object-storage-proxy.ts b/server/controllers/object-storage-proxy.ts deleted file mode 100644 index d0c59bf93..000000000 --- a/server/controllers/object-storage-proxy.ts +++ /dev/null @@ -1,60 +0,0 @@ -import cors from 'cors' -import express from 'express' -import { OBJECT_STORAGE_PROXY_PATHS } from '@server/initializers/constants' -import { proxifyHLS, proxifyWebVideoFile } from '@server/lib/object-storage' -import { - asyncMiddleware, - ensureCanAccessPrivateVideoHLSFiles, - ensureCanAccessVideoPrivateWebVideoFiles, - ensurePrivateObjectStorageProxyIsEnabled, - optionalAuthenticate -} from '@server/middlewares' -import { doReinjectVideoFileToken } from './shared/m3u8-playlist' - -const objectStorageProxyRouter = express.Router() - -objectStorageProxyRouter.use(cors()) - -objectStorageProxyRouter.get( - [ OBJECT_STORAGE_PROXY_PATHS.PRIVATE_WEB_VIDEOS + ':filename', OBJECT_STORAGE_PROXY_PATHS.LEGACY_PRIVATE_WEB_VIDEOS + ':filename' ], - ensurePrivateObjectStorageProxyIsEnabled, - optionalAuthenticate, - asyncMiddleware(ensureCanAccessVideoPrivateWebVideoFiles), - asyncMiddleware(proxifyWebVideoController) -) - -objectStorageProxyRouter.get(OBJECT_STORAGE_PROXY_PATHS.STREAMING_PLAYLISTS.PRIVATE_HLS + ':videoUUID/:filename', - ensurePrivateObjectStorageProxyIsEnabled, - optionalAuthenticate, - asyncMiddleware(ensureCanAccessPrivateVideoHLSFiles), - asyncMiddleware(proxifyHLSController) -) - -// --------------------------------------------------------------------------- - -export { - objectStorageProxyRouter -} - -function proxifyWebVideoController (req: express.Request, res: express.Response) { - const filename = req.params.filename - - return proxifyWebVideoFile({ req, res, filename }) -} - -function proxifyHLSController (req: express.Request, res: express.Response) { - const playlist = res.locals.videoStreamingPlaylist - const video = res.locals.onlyVideo - const filename = req.params.filename - - const reinjectVideoFileToken = filename.endsWith('.m3u8') && doReinjectVideoFileToken(req) - - return proxifyHLS({ - req, - res, - playlist, - video, - filename, - reinjectVideoFileToken - }) -} -- cgit v1.2.3