From 3a4992633ee62d5edfbb484d9c6bcb3cf158489d Mon Sep 17 00:00:00 2001 From: Chocobozzz <me@florianbigard.com> 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/api/videos/files.ts | 122 --------------------------------- 1 file changed, 122 deletions(-) delete mode 100644 server/controllers/api/videos/files.ts (limited to 'server/controllers/api/videos/files.ts') diff --git a/server/controllers/api/videos/files.ts b/server/controllers/api/videos/files.ts deleted file mode 100644 index 67b60ff63..000000000 --- a/server/controllers/api/videos/files.ts +++ /dev/null @@ -1,122 +0,0 @@ -import express from 'express' -import toInt from 'validator/lib/toInt' -import { logger, loggerTagsFactory } from '@server/helpers/logger' -import { federateVideoIfNeeded } from '@server/lib/activitypub/videos' -import { updatePlaylistAfterFileChange } from '@server/lib/hls' -import { removeAllWebVideoFiles, removeHLSFile, removeHLSPlaylist, removeWebVideoFile } from '@server/lib/video-file' -import { VideoFileModel } from '@server/models/video/video-file' -import { HttpStatusCode, UserRight } from '@shared/models' -import { - asyncMiddleware, - authenticate, - ensureUserHasRight, - videoFileMetadataGetValidator, - videoFilesDeleteHLSFileValidator, - videoFilesDeleteHLSValidator, - videoFilesDeleteWebVideoFileValidator, - videoFilesDeleteWebVideoValidator, - videosGetValidator -} from '../../../middlewares' - -const lTags = loggerTagsFactory('api', 'video') -const filesRouter = express.Router() - -filesRouter.get('/:id/metadata/:videoFileId', - asyncMiddleware(videosGetValidator), - asyncMiddleware(videoFileMetadataGetValidator), - asyncMiddleware(getVideoFileMetadata) -) - -filesRouter.delete('/:id/hls', - authenticate, - ensureUserHasRight(UserRight.MANAGE_VIDEO_FILES), - asyncMiddleware(videoFilesDeleteHLSValidator), - asyncMiddleware(removeHLSPlaylistController) -) -filesRouter.delete('/:id/hls/:videoFileId', - authenticate, - ensureUserHasRight(UserRight.MANAGE_VIDEO_FILES), - asyncMiddleware(videoFilesDeleteHLSFileValidator), - asyncMiddleware(removeHLSFileController) -) - -filesRouter.delete( - [ '/:id/webtorrent', '/:id/web-videos' ], // TODO: remove webtorrent in V7 - authenticate, - ensureUserHasRight(UserRight.MANAGE_VIDEO_FILES), - asyncMiddleware(videoFilesDeleteWebVideoValidator), - asyncMiddleware(removeAllWebVideoFilesController) -) -filesRouter.delete( - [ '/:id/webtorrent/:videoFileId', '/:id/web-videos/:videoFileId' ], // TODO: remove webtorrent in V7 - authenticate, - ensureUserHasRight(UserRight.MANAGE_VIDEO_FILES), - asyncMiddleware(videoFilesDeleteWebVideoFileValidator), - asyncMiddleware(removeWebVideoFileController) -) - -// --------------------------------------------------------------------------- - -export { - filesRouter -} - -// --------------------------------------------------------------------------- - -async function getVideoFileMetadata (req: express.Request, res: express.Response) { - const videoFile = await VideoFileModel.loadWithMetadata(toInt(req.params.videoFileId)) - - return res.json(videoFile.metadata) -} - -// --------------------------------------------------------------------------- - -async function removeHLSPlaylistController (req: express.Request, res: express.Response) { - const video = res.locals.videoAll - - logger.info('Deleting HLS playlist of %s.', video.url, lTags(video.uuid)) - await removeHLSPlaylist(video) - - await federateVideoIfNeeded(video, false, undefined) - - return res.sendStatus(HttpStatusCode.NO_CONTENT_204) -} - -async function removeHLSFileController (req: express.Request, res: express.Response) { - const video = res.locals.videoAll - const videoFileId = +req.params.videoFileId - - logger.info('Deleting HLS file %d of %s.', videoFileId, video.url, lTags(video.uuid)) - - const playlist = await removeHLSFile(video, videoFileId) - if (playlist) await updatePlaylistAfterFileChange(video, playlist) - - await federateVideoIfNeeded(video, false, undefined) - - return res.sendStatus(HttpStatusCode.NO_CONTENT_204) -} - -// --------------------------------------------------------------------------- - -async function removeAllWebVideoFilesController (req: express.Request, res: express.Response) { - const video = res.locals.videoAll - - logger.info('Deleting Web Video files of %s.', video.url, lTags(video.uuid)) - - await removeAllWebVideoFiles(video) - await federateVideoIfNeeded(video, false, undefined) - - return res.sendStatus(HttpStatusCode.NO_CONTENT_204) -} - -async function removeWebVideoFileController (req: express.Request, res: express.Response) { - const video = res.locals.videoAll - - const videoFileId = +req.params.videoFileId - logger.info('Deleting Web Video file %d of %s.', videoFileId, video.url, lTags(video.uuid)) - - await removeWebVideoFile(video, videoFileId) - await federateVideoIfNeeded(video, false, undefined) - - return res.sendStatus(HttpStatusCode.NO_CONTENT_204) -} -- cgit v1.2.3