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/shared/client.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/shared/client.ts')
-rw-r--r-- | server/lib/object-storage/shared/client.ts | 71 |
1 files changed, 0 insertions, 71 deletions
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 @@ | |||
1 | import { S3Client } from '@aws-sdk/client-s3' | ||
2 | import { NodeHttpHandler } from '@aws-sdk/node-http-handler' | ||
3 | import { logger } from '@server/helpers/logger' | ||
4 | import { isProxyEnabled } from '@server/helpers/proxy' | ||
5 | import { getAgent } from '@server/helpers/requests' | ||
6 | import { CONFIG } from '@server/initializers/config' | ||
7 | import { lTags } from './logger' | ||
8 | |||
9 | function getProxyRequestHandler () { | ||
10 | if (!isProxyEnabled()) return null | ||
11 | |||
12 | const { agent } = getAgent() | ||
13 | |||
14 | return new NodeHttpHandler({ | ||
15 | httpAgent: agent.http, | ||
16 | httpsAgent: agent.https | ||
17 | }) | ||
18 | } | ||
19 | |||
20 | let endpointParsed: URL | ||
21 | function getEndpointParsed () { | ||
22 | if (endpointParsed) return endpointParsed | ||
23 | |||
24 | endpointParsed = new URL(getEndpoint()) | ||
25 | |||
26 | return endpointParsed | ||
27 | } | ||
28 | |||
29 | let s3Client: S3Client | ||
30 | function getClient () { | ||
31 | if (s3Client) return s3Client | ||
32 | |||
33 | const OBJECT_STORAGE = CONFIG.OBJECT_STORAGE | ||
34 | |||
35 | s3Client = new S3Client({ | ||
36 | endpoint: getEndpoint(), | ||
37 | region: OBJECT_STORAGE.REGION, | ||
38 | credentials: OBJECT_STORAGE.CREDENTIALS.ACCESS_KEY_ID | ||
39 | ? { | ||
40 | accessKeyId: OBJECT_STORAGE.CREDENTIALS.ACCESS_KEY_ID, | ||
41 | secretAccessKey: OBJECT_STORAGE.CREDENTIALS.SECRET_ACCESS_KEY | ||
42 | } | ||
43 | : undefined, | ||
44 | requestHandler: getProxyRequestHandler() | ||
45 | }) | ||
46 | |||
47 | logger.info('Initialized S3 client %s with region %s.', getEndpoint(), OBJECT_STORAGE.REGION, lTags()) | ||
48 | |||
49 | return s3Client | ||
50 | } | ||
51 | |||
52 | // --------------------------------------------------------------------------- | ||
53 | |||
54 | export { | ||
55 | getEndpointParsed, | ||
56 | getClient | ||
57 | } | ||
58 | |||
59 | // --------------------------------------------------------------------------- | ||
60 | |||
61 | let endpoint: string | ||
62 | function getEndpoint () { | ||
63 | if (endpoint) return endpoint | ||
64 | |||
65 | const endpointConfig = CONFIG.OBJECT_STORAGE.ENDPOINT | ||
66 | endpoint = endpointConfig.startsWith('http://') || endpointConfig.startsWith('https://') | ||
67 | ? CONFIG.OBJECT_STORAGE.ENDPOINT | ||
68 | : 'https://' + CONFIG.OBJECT_STORAGE.ENDPOINT | ||
69 | |||
70 | return endpoint | ||
71 | } | ||