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) --- server/tests/peertube-runner/studio-transcoding.ts | 124 --------------------- 1 file changed, 124 deletions(-) delete mode 100644 server/tests/peertube-runner/studio-transcoding.ts (limited to 'server/tests/peertube-runner/studio-transcoding.ts') diff --git a/server/tests/peertube-runner/studio-transcoding.ts b/server/tests/peertube-runner/studio-transcoding.ts deleted file mode 100644 index 56bfef897..000000000 --- a/server/tests/peertube-runner/studio-transcoding.ts +++ /dev/null @@ -1,124 +0,0 @@ - -import { expect } from 'chai' -import { checkPeerTubeRunnerCacheIsEmpty, checkVideoDuration, expectStartWith, PeerTubeRunnerProcess } from '@server/tests/shared' -import { areMockObjectStorageTestsDisabled, getAllFiles, wait } from '@shared/core-utils' -import { - cleanupTests, - createMultipleServers, - doubleFollow, - ObjectStorageCommand, - PeerTubeServer, - setAccessTokensToServers, - setDefaultVideoChannel, - VideoStudioCommand, - waitJobs -} from '@shared/server-commands' - -describe('Test studio transcoding in peertube-runner program', function () { - let servers: PeerTubeServer[] = [] - let peertubeRunner: PeerTubeRunnerProcess - - function runSuite (options: { - objectStorage?: ObjectStorageCommand - } = {}) { - const { objectStorage } = options - - it('Should run a complex studio transcoding', async function () { - this.timeout(120000) - - const { uuid } = await servers[0].videos.quickUpload({ name: 'mp4', fixture: 'video_short.mp4' }) - await waitJobs(servers) - - const video = await servers[0].videos.get({ id: uuid }) - const oldFileUrls = getAllFiles(video).map(f => f.fileUrl) - - await servers[0].videoStudio.createEditionTasks({ videoId: uuid, tasks: VideoStudioCommand.getComplexTask() }) - await waitJobs(servers, { runnerJobs: true }) - - for (const server of servers) { - const video = await server.videos.get({ id: uuid }) - const files = getAllFiles(video) - - for (const f of files) { - expect(oldFileUrls).to.not.include(f.fileUrl) - } - - if (objectStorage) { - for (const webVideoFile of video.files) { - expectStartWith(webVideoFile.fileUrl, objectStorage.getMockWebVideosBaseUrl()) - } - - for (const hlsFile of video.streamingPlaylists[0].files) { - expectStartWith(hlsFile.fileUrl, objectStorage.getMockPlaylistBaseUrl()) - } - } - - await checkVideoDuration(server, uuid, 9) - } - }) - } - - before(async function () { - this.timeout(120_000) - - servers = await createMultipleServers(2) - - await setAccessTokensToServers(servers) - await setDefaultVideoChannel(servers) - - await doubleFollow(servers[0], servers[1]) - - await servers[0].config.enableTranscoding({ hls: true, webVideo: true }) - await servers[0].config.enableStudio() - await servers[0].config.enableRemoteStudio() - - const registrationToken = await servers[0].runnerRegistrationTokens.getFirstRegistrationToken() - - peertubeRunner = new PeerTubeRunnerProcess(servers[0]) - await peertubeRunner.runServer() - await peertubeRunner.registerPeerTubeInstance({ registrationToken, runnerName: 'runner' }) - }) - - describe('With videos on local filesystem storage', function () { - runSuite() - }) - - describe('With videos on object storage', function () { - if (areMockObjectStorageTestsDisabled()) return - - const objectStorage = new ObjectStorageCommand() - - before(async function () { - await objectStorage.prepareDefaultMockBuckets() - - await servers[0].kill() - - await servers[0].run(objectStorage.getDefaultMockConfig()) - - // Wait for peertube runner socket reconnection - await wait(1500) - }) - - runSuite({ objectStorage }) - - after(async function () { - await objectStorage.cleanupMock() - }) - }) - - describe('Check cleanup', function () { - - it('Should have an empty cache directory', async function () { - await checkPeerTubeRunnerCacheIsEmpty(peertubeRunner) - }) - }) - - after(async function () { - if (peertubeRunner) { - await peertubeRunner.unregisterPeerTubeInstance({ runnerName: 'runner' }) - peertubeRunner.kill() - } - - await cleanupTests(servers) - }) -}) -- cgit v1.2.3