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/api/runners/runner-socket.ts | 120 ------------------------------ 1 file changed, 120 deletions(-) delete mode 100644 server/tests/api/runners/runner-socket.ts (limited to 'server/tests/api/runners/runner-socket.ts') diff --git a/server/tests/api/runners/runner-socket.ts b/server/tests/api/runners/runner-socket.ts deleted file mode 100644 index 215164e48..000000000 --- a/server/tests/api/runners/runner-socket.ts +++ /dev/null @@ -1,120 +0,0 @@ -/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ - -import { expect } from 'chai' -import { wait } from '@shared/core-utils' -import { - cleanupTests, - createSingleServer, - PeerTubeServer, - setAccessTokensToServers, - setDefaultVideoChannel, - waitJobs -} from '@shared/server-commands' - -describe('Test runner socket', function () { - let server: PeerTubeServer - let runnerToken: string - - before(async function () { - this.timeout(120_000) - - server = await createSingleServer(1) - - await setAccessTokensToServers([ server ]) - await setDefaultVideoChannel([ server ]) - - await server.config.enableTranscoding({ hls: true, webVideo: true }) - await server.config.enableRemoteTranscoding() - runnerToken = await server.runners.autoRegisterRunner() - }) - - it('Should throw an error without runner token', function (done) { - const localSocket = server.socketIO.getRunnersSocket({ runnerToken: null }) - localSocket.on('connect_error', err => { - expect(err.message).to.contain('No runner token provided') - done() - }) - }) - - it('Should throw an error with a bad runner token', function (done) { - const localSocket = server.socketIO.getRunnersSocket({ runnerToken: 'ergag' }) - localSocket.on('connect_error', err => { - expect(err.message).to.contain('Invalid runner token') - done() - }) - }) - - it('Should not send ping if there is no available jobs', async function () { - let pings = 0 - const localSocket = server.socketIO.getRunnersSocket({ runnerToken }) - localSocket.on('available-jobs', () => pings++) - - expect(pings).to.equal(0) - }) - - it('Should send a ping on available job', async function () { - let pings = 0 - const localSocket = server.socketIO.getRunnersSocket({ runnerToken }) - localSocket.on('available-jobs', () => pings++) - - await server.videos.quickUpload({ name: 'video1' }) - await waitJobs([ server ]) - - // eslint-disable-next-line no-unmodified-loop-condition - while (pings !== 1) { - await wait(500) - } - - await server.videos.quickUpload({ name: 'video2' }) - await waitJobs([ server ]) - - // eslint-disable-next-line no-unmodified-loop-condition - while ((pings as number) !== 2) { - await wait(500) - } - - await server.runnerJobs.cancelAllJobs() - }) - - it('Should send a ping when a child is ready', async function () { - let pings = 0 - const localSocket = server.socketIO.getRunnersSocket({ runnerToken }) - localSocket.on('available-jobs', () => pings++) - - await server.videos.quickUpload({ name: 'video3' }) - await waitJobs([ server ]) - - // eslint-disable-next-line no-unmodified-loop-condition - while (pings !== 1) { - await wait(500) - } - - await server.runnerJobs.autoProcessWebVideoJob(runnerToken) - await waitJobs([ server ]) - - // eslint-disable-next-line no-unmodified-loop-condition - while ((pings as number) !== 2) { - await wait(500) - } - }) - - it('Should not send a ping if the ended job does not have a child', async function () { - let pings = 0 - const localSocket = server.socketIO.getRunnersSocket({ runnerToken }) - localSocket.on('available-jobs', () => pings++) - - const { availableJobs } = await server.runnerJobs.request({ runnerToken }) - const job = availableJobs.find(j => j.type === 'vod-web-video-transcoding') - await server.runnerJobs.autoProcessWebVideoJob(runnerToken, job.uuid) - - // Wait for debounce - await wait(1000) - await waitJobs([ server ]) - - expect(pings).to.equal(0) - }) - - after(async function () { - await cleanupTests([ server ]) - }) -}) -- cgit v1.2.3