diff options
author | Chocobozzz <me@florianbigard.com> | 2023-07-31 14:34:36 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-08-11 15:02:33 +0200 |
commit | 3a4992633ee62d5edfbb484d9c6bcb3cf158489d (patch) | |
tree | e4510b39bdac9c318fdb4b47018d08f15368b8f0 /server/controllers/object-storage-proxy.ts | |
parent | 04d1da5621d25d59bd5fa1543b725c497bf5d9a8 (diff) | |
download | PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.tar.gz PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.tar.zst PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.zip |
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)
Diffstat (limited to 'server/controllers/object-storage-proxy.ts')
-rw-r--r-- | server/controllers/object-storage-proxy.ts | 60 |
1 files changed, 0 insertions, 60 deletions
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 @@ | |||
1 | import cors from 'cors' | ||
2 | import express from 'express' | ||
3 | import { OBJECT_STORAGE_PROXY_PATHS } from '@server/initializers/constants' | ||
4 | import { proxifyHLS, proxifyWebVideoFile } from '@server/lib/object-storage' | ||
5 | import { | ||
6 | asyncMiddleware, | ||
7 | ensureCanAccessPrivateVideoHLSFiles, | ||
8 | ensureCanAccessVideoPrivateWebVideoFiles, | ||
9 | ensurePrivateObjectStorageProxyIsEnabled, | ||
10 | optionalAuthenticate | ||
11 | } from '@server/middlewares' | ||
12 | import { doReinjectVideoFileToken } from './shared/m3u8-playlist' | ||
13 | |||
14 | const objectStorageProxyRouter = express.Router() | ||
15 | |||
16 | objectStorageProxyRouter.use(cors()) | ||
17 | |||
18 | objectStorageProxyRouter.get( | ||
19 | [ OBJECT_STORAGE_PROXY_PATHS.PRIVATE_WEB_VIDEOS + ':filename', OBJECT_STORAGE_PROXY_PATHS.LEGACY_PRIVATE_WEB_VIDEOS + ':filename' ], | ||
20 | ensurePrivateObjectStorageProxyIsEnabled, | ||
21 | optionalAuthenticate, | ||
22 | asyncMiddleware(ensureCanAccessVideoPrivateWebVideoFiles), | ||
23 | asyncMiddleware(proxifyWebVideoController) | ||
24 | ) | ||
25 | |||
26 | objectStorageProxyRouter.get(OBJECT_STORAGE_PROXY_PATHS.STREAMING_PLAYLISTS.PRIVATE_HLS + ':videoUUID/:filename', | ||
27 | ensurePrivateObjectStorageProxyIsEnabled, | ||
28 | optionalAuthenticate, | ||
29 | asyncMiddleware(ensureCanAccessPrivateVideoHLSFiles), | ||
30 | asyncMiddleware(proxifyHLSController) | ||
31 | ) | ||
32 | |||
33 | // --------------------------------------------------------------------------- | ||
34 | |||
35 | export { | ||
36 | objectStorageProxyRouter | ||
37 | } | ||
38 | |||
39 | function proxifyWebVideoController (req: express.Request, res: express.Response) { | ||
40 | const filename = req.params.filename | ||
41 | |||
42 | return proxifyWebVideoFile({ req, res, filename }) | ||
43 | } | ||
44 | |||
45 | function proxifyHLSController (req: express.Request, res: express.Response) { | ||
46 | const playlist = res.locals.videoStreamingPlaylist | ||
47 | const video = res.locals.onlyVideo | ||
48 | const filename = req.params.filename | ||
49 | |||
50 | const reinjectVideoFileToken = filename.endsWith('.m3u8') && doReinjectVideoFileToken(req) | ||
51 | |||
52 | return proxifyHLS({ | ||
53 | req, | ||
54 | res, | ||
55 | playlist, | ||
56 | video, | ||
57 | filename, | ||
58 | reinjectVideoFileToken | ||
59 | }) | ||
60 | } | ||