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/middlewares/validators/videos/shared | |
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/middlewares/validators/videos/shared')
3 files changed, 0 insertions, 141 deletions
diff --git a/server/middlewares/validators/videos/shared/index.ts b/server/middlewares/validators/videos/shared/index.ts deleted file mode 100644 index eb11dcc6a..000000000 --- a/server/middlewares/validators/videos/shared/index.ts +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | export * from './upload' | ||
2 | export * from './video-validators' | ||
diff --git a/server/middlewares/validators/videos/shared/upload.ts b/server/middlewares/validators/videos/shared/upload.ts deleted file mode 100644 index ea0dddc3c..000000000 --- a/server/middlewares/validators/videos/shared/upload.ts +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | import express from 'express' | ||
2 | import { logger } from '@server/helpers/logger' | ||
3 | import { getVideoStreamDuration } from '@shared/ffmpeg' | ||
4 | import { HttpStatusCode } from '@shared/models' | ||
5 | |||
6 | export async function addDurationToVideoFileIfNeeded (options: { | ||
7 | res: express.Response | ||
8 | videoFile: { path: string, duration?: number } | ||
9 | middlewareName: string | ||
10 | }) { | ||
11 | const { res, middlewareName, videoFile } = options | ||
12 | |||
13 | try { | ||
14 | if (!videoFile.duration) await addDurationToVideo(videoFile) | ||
15 | } catch (err) { | ||
16 | logger.error('Invalid input file in ' + middlewareName, { err }) | ||
17 | |||
18 | res.fail({ | ||
19 | status: HttpStatusCode.UNPROCESSABLE_ENTITY_422, | ||
20 | message: 'Video file unreadable.' | ||
21 | }) | ||
22 | return false | ||
23 | } | ||
24 | |||
25 | return true | ||
26 | } | ||
27 | |||
28 | // --------------------------------------------------------------------------- | ||
29 | // Private | ||
30 | // --------------------------------------------------------------------------- | ||
31 | |||
32 | async function addDurationToVideo (videoFile: { path: string, duration?: number }) { | ||
33 | const duration = await getVideoStreamDuration(videoFile.path) | ||
34 | |||
35 | // FFmpeg may not be able to guess video duration | ||
36 | // For example with m2v files: https://trac.ffmpeg.org/ticket/9726#comment:2 | ||
37 | if (isNaN(duration)) videoFile.duration = 0 | ||
38 | else videoFile.duration = duration | ||
39 | } | ||
diff --git a/server/middlewares/validators/videos/shared/video-validators.ts b/server/middlewares/validators/videos/shared/video-validators.ts deleted file mode 100644 index 95e4fef11..000000000 --- a/server/middlewares/validators/videos/shared/video-validators.ts +++ /dev/null | |||
@@ -1,100 +0,0 @@ | |||
1 | import express from 'express' | ||
2 | import { isVideoFileMimeTypeValid, isVideoFileSizeValid } from '@server/helpers/custom-validators/videos' | ||
3 | import { logger } from '@server/helpers/logger' | ||
4 | import { CONSTRAINTS_FIELDS } from '@server/initializers/constants' | ||
5 | import { isLocalVideoFileAccepted } from '@server/lib/moderation' | ||
6 | import { Hooks } from '@server/lib/plugins/hooks' | ||
7 | import { MUserAccountId, MVideo } from '@server/types/models' | ||
8 | import { HttpStatusCode, ServerErrorCode, ServerFilterHookName, VideoState } from '@shared/models' | ||
9 | import { checkUserQuota } from '../../shared' | ||
10 | |||
11 | export async function commonVideoFileChecks (options: { | ||
12 | res: express.Response | ||
13 | user: MUserAccountId | ||
14 | videoFileSize: number | ||
15 | files: express.UploadFilesForCheck | ||
16 | }): Promise<boolean> { | ||
17 | const { res, user, videoFileSize, files } = options | ||
18 | |||
19 | if (!isVideoFileMimeTypeValid(files)) { | ||
20 | res.fail({ | ||
21 | status: HttpStatusCode.UNSUPPORTED_MEDIA_TYPE_415, | ||
22 | message: 'This file is not supported. Please, make sure it is of the following type: ' + | ||
23 | CONSTRAINTS_FIELDS.VIDEOS.EXTNAME.join(', ') | ||
24 | }) | ||
25 | return false | ||
26 | } | ||
27 | |||
28 | if (!isVideoFileSizeValid(videoFileSize.toString())) { | ||
29 | res.fail({ | ||
30 | status: HttpStatusCode.PAYLOAD_TOO_LARGE_413, | ||
31 | message: 'This file is too large. It exceeds the maximum file size authorized.', | ||
32 | type: ServerErrorCode.MAX_FILE_SIZE_REACHED | ||
33 | }) | ||
34 | return false | ||
35 | } | ||
36 | |||
37 | if (await checkUserQuota(user, videoFileSize, res) === false) return false | ||
38 | |||
39 | return true | ||
40 | } | ||
41 | |||
42 | export async function isVideoFileAccepted (options: { | ||
43 | req: express.Request | ||
44 | res: express.Response | ||
45 | videoFile: express.VideoUploadFile | ||
46 | hook: Extract<ServerFilterHookName, 'filter:api.video.upload.accept.result' | 'filter:api.video.update-file.accept.result'> | ||
47 | }) { | ||
48 | const { req, res, videoFile, hook } = options | ||
49 | |||
50 | // Check we accept this video | ||
51 | const acceptParameters = { | ||
52 | videoBody: req.body, | ||
53 | videoFile, | ||
54 | user: res.locals.oauth.token.User | ||
55 | } | ||
56 | const acceptedResult = await Hooks.wrapFun(isLocalVideoFileAccepted, acceptParameters, hook) | ||
57 | |||
58 | if (!acceptedResult || acceptedResult.accepted !== true) { | ||
59 | logger.info('Refused local video file.', { acceptedResult, acceptParameters }) | ||
60 | res.fail({ | ||
61 | status: HttpStatusCode.FORBIDDEN_403, | ||
62 | message: acceptedResult.errorMessage || 'Refused local video file' | ||
63 | }) | ||
64 | return false | ||
65 | } | ||
66 | |||
67 | return true | ||
68 | } | ||
69 | |||
70 | export function checkVideoFileCanBeEdited (video: MVideo, res: express.Response) { | ||
71 | if (video.isLive) { | ||
72 | res.fail({ | ||
73 | status: HttpStatusCode.BAD_REQUEST_400, | ||
74 | message: 'Cannot edit a live video' | ||
75 | }) | ||
76 | |||
77 | return false | ||
78 | } | ||
79 | |||
80 | if (video.state === VideoState.TO_TRANSCODE || video.state === VideoState.TO_EDIT) { | ||
81 | res.fail({ | ||
82 | status: HttpStatusCode.CONFLICT_409, | ||
83 | message: 'Cannot edit video that is already waiting for transcoding/edition' | ||
84 | }) | ||
85 | |||
86 | return false | ||
87 | } | ||
88 | |||
89 | const validStates = new Set([ VideoState.PUBLISHED, VideoState.TO_MOVE_TO_EXTERNAL_STORAGE_FAILED, VideoState.TRANSCODING_FAILED ]) | ||
90 | if (!validStates.has(video.state)) { | ||
91 | res.fail({ | ||
92 | status: HttpStatusCode.BAD_REQUEST_400, | ||
93 | message: 'Video state is not compatible with edition' | ||
94 | }) | ||
95 | |||
96 | return false | ||
97 | } | ||
98 | |||
99 | return true | ||
100 | } | ||