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/lib/object-storage/urls.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/lib/object-storage/urls.ts')
-rw-r--r-- | server/lib/object-storage/urls.ts | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/server/lib/object-storage/urls.ts b/server/lib/object-storage/urls.ts deleted file mode 100644 index 40619cd5a..000000000 --- a/server/lib/object-storage/urls.ts +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | import { CONFIG } from '@server/initializers/config' | ||
2 | import { OBJECT_STORAGE_PROXY_PATHS, WEBSERVER } from '@server/initializers/constants' | ||
3 | import { MVideoUUID } from '@server/types/models' | ||
4 | import { BucketInfo, buildKey, getEndpointParsed } from './shared' | ||
5 | |||
6 | function getInternalUrl (config: BucketInfo, keyWithoutPrefix: string) { | ||
7 | return getBaseUrl(config) + buildKey(keyWithoutPrefix, config) | ||
8 | } | ||
9 | |||
10 | // --------------------------------------------------------------------------- | ||
11 | |||
12 | function getWebVideoPublicFileUrl (fileUrl: string) { | ||
13 | const baseUrl = CONFIG.OBJECT_STORAGE.WEB_VIDEOS.BASE_URL | ||
14 | if (!baseUrl) return fileUrl | ||
15 | |||
16 | return replaceByBaseUrl(fileUrl, baseUrl) | ||
17 | } | ||
18 | |||
19 | function getHLSPublicFileUrl (fileUrl: string) { | ||
20 | const baseUrl = CONFIG.OBJECT_STORAGE.STREAMING_PLAYLISTS.BASE_URL | ||
21 | if (!baseUrl) return fileUrl | ||
22 | |||
23 | return replaceByBaseUrl(fileUrl, baseUrl) | ||
24 | } | ||
25 | |||
26 | // --------------------------------------------------------------------------- | ||
27 | |||
28 | function getHLSPrivateFileUrl (video: MVideoUUID, filename: string) { | ||
29 | return WEBSERVER.URL + OBJECT_STORAGE_PROXY_PATHS.STREAMING_PLAYLISTS.PRIVATE_HLS + video.uuid + `/${filename}` | ||
30 | } | ||
31 | |||
32 | function getWebVideoPrivateFileUrl (filename: string) { | ||
33 | return WEBSERVER.URL + OBJECT_STORAGE_PROXY_PATHS.PRIVATE_WEB_VIDEOS + filename | ||
34 | } | ||
35 | |||
36 | // --------------------------------------------------------------------------- | ||
37 | |||
38 | export { | ||
39 | getInternalUrl, | ||
40 | |||
41 | getWebVideoPublicFileUrl, | ||
42 | getHLSPublicFileUrl, | ||
43 | |||
44 | getHLSPrivateFileUrl, | ||
45 | getWebVideoPrivateFileUrl, | ||
46 | |||
47 | replaceByBaseUrl | ||
48 | } | ||
49 | |||
50 | // --------------------------------------------------------------------------- | ||
51 | |||
52 | function getBaseUrl (bucketInfo: BucketInfo, baseUrl?: string) { | ||
53 | if (baseUrl) return baseUrl | ||
54 | |||
55 | return `${getEndpointParsed().protocol}//${bucketInfo.BUCKET_NAME}.${getEndpointParsed().host}/` | ||
56 | } | ||
57 | |||
58 | const regex = new RegExp('https?://[^/]+') | ||
59 | function replaceByBaseUrl (fileUrl: string, baseUrl: string) { | ||
60 | if (!fileUrl) return fileUrl | ||
61 | |||
62 | return fileUrl.replace(regex, baseUrl) | ||
63 | } | ||