From 3a4992633ee62d5edfbb484d9c6bcb3cf158489d Mon Sep 17 00:00:00 2001 From: Chocobozzz 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) --- .../vod-web-video-transcoding-job-handler.ts | 84 ---------------------- 1 file changed, 84 deletions(-) delete mode 100644 server/lib/runners/job-handlers/vod-web-video-transcoding-job-handler.ts (limited to 'server/lib/runners/job-handlers/vod-web-video-transcoding-job-handler.ts') diff --git a/server/lib/runners/job-handlers/vod-web-video-transcoding-job-handler.ts b/server/lib/runners/job-handlers/vod-web-video-transcoding-job-handler.ts deleted file mode 100644 index 9ee8ab88e..000000000 --- a/server/lib/runners/job-handlers/vod-web-video-transcoding-job-handler.ts +++ /dev/null @@ -1,84 +0,0 @@ -import { logger } from '@server/helpers/logger' -import { VideoJobInfoModel } from '@server/models/video/video-job-info' -import { MVideo } from '@server/types/models' -import { MRunnerJob } from '@server/types/models/runners' -import { pick } from '@shared/core-utils' -import { buildUUID } from '@shared/extra-utils' -import { - RunnerJobUpdatePayload, - RunnerJobVODWebVideoTranscodingPayload, - RunnerJobVODWebVideoTranscodingPrivatePayload, - VODWebVideoTranscodingSuccess -} from '@shared/models' -import { generateRunnerTranscodingVideoInputFileUrl } from '../runner-urls' -import { AbstractVODTranscodingJobHandler } from './abstract-vod-transcoding-job-handler' -import { loadTranscodingRunnerVideo, onVODWebVideoOrAudioMergeTranscodingJob } from './shared' - -type CreateOptions = { - video: MVideo - isNewVideo: boolean - resolution: number - fps: number - priority: number - dependsOnRunnerJob?: MRunnerJob -} - -// eslint-disable-next-line max-len -export class VODWebVideoTranscodingJobHandler extends AbstractVODTranscodingJobHandler { - - async create (options: CreateOptions) { - const { video, resolution, fps, priority, dependsOnRunnerJob } = options - - const jobUUID = buildUUID() - const payload: RunnerJobVODWebVideoTranscodingPayload = { - input: { - videoFileUrl: generateRunnerTranscodingVideoInputFileUrl(jobUUID, video.uuid) - }, - output: { - resolution, - fps - } - } - - const privatePayload: RunnerJobVODWebVideoTranscodingPrivatePayload = { - ...pick(options, [ 'isNewVideo' ]), - - videoUUID: video.uuid - } - - const job = await this.createRunnerJob({ - type: 'vod-web-video-transcoding', - jobUUID, - payload, - privatePayload, - dependsOnRunnerJob, - priority - }) - - await VideoJobInfoModel.increaseOrCreate(video.uuid, 'pendingTranscode') - - return job - } - - // --------------------------------------------------------------------------- - - protected async specificComplete (options: { - runnerJob: MRunnerJob - resultPayload: VODWebVideoTranscodingSuccess - }) { - const { runnerJob, resultPayload } = options - const privatePayload = runnerJob.privatePayload as RunnerJobVODWebVideoTranscodingPrivatePayload - - const video = await loadTranscodingRunnerVideo(runnerJob, this.lTags) - if (!video) return - - const videoFilePath = resultPayload.videoFile as string - - await onVODWebVideoOrAudioMergeTranscodingJob({ video, videoFilePath, privatePayload }) - - logger.info( - 'Runner VOD web video transcoding job %s for %s ended.', - runnerJob.uuid, video.uuid, this.lTags(video.uuid, runnerJob.uuid) - ) - } -} -- cgit v1.2.3