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) --- .../job-queue/handlers/transcoding-job-builder.ts | 48 ---------------------- 1 file changed, 48 deletions(-) delete mode 100644 server/lib/job-queue/handlers/transcoding-job-builder.ts (limited to 'server/lib/job-queue/handlers/transcoding-job-builder.ts') diff --git a/server/lib/job-queue/handlers/transcoding-job-builder.ts b/server/lib/job-queue/handlers/transcoding-job-builder.ts deleted file mode 100644 index 8621b109f..000000000 --- a/server/lib/job-queue/handlers/transcoding-job-builder.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { Job } from 'bullmq' -import { createOptimizeOrMergeAudioJobs } from '@server/lib/transcoding/create-transcoding-job' -import { UserModel } from '@server/models/user/user' -import { VideoModel } from '@server/models/video/video' -import { VideoJobInfoModel } from '@server/models/video/video-job-info' -import { pick } from '@shared/core-utils' -import { TranscodingJobBuilderPayload } from '@shared/models' -import { logger } from '../../../helpers/logger' -import { JobQueue } from '../job-queue' - -async function processTranscodingJobBuilder (job: Job) { - const payload = job.data as TranscodingJobBuilderPayload - - logger.info('Processing transcoding job builder in job %s.', job.id) - - if (payload.optimizeJob) { - const video = await VideoModel.loadFull(payload.videoUUID) - const user = await UserModel.loadByVideoId(video.id) - const videoFile = video.getMaxQualityFile() - - await createOptimizeOrMergeAudioJobs({ - ...pick(payload.optimizeJob, [ 'isNewVideo' ]), - - video, - videoFile, - user, - videoFileAlreadyLocked: false - }) - } - - for (const job of (payload.jobs || [])) { - await JobQueue.Instance.createJob(job) - - await VideoJobInfoModel.increaseOrCreate(payload.videoUUID, 'pendingTranscode') - } - - for (const sequentialJobs of (payload.sequentialJobs || [])) { - await JobQueue.Instance.createSequentialJobFlow(...sequentialJobs) - - await VideoJobInfoModel.increaseOrCreate(payload.videoUUID, 'pendingTranscode', sequentialJobs.filter(s => !!s).length) - } -} - -// --------------------------------------------------------------------------- - -export { - processTranscodingJobBuilder -} -- cgit v1.2.3