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) --- shared/server-commands/feeds/feeds-command.ts | 78 --------------------------- shared/server-commands/feeds/index.ts | 1 - 2 files changed, 79 deletions(-) delete mode 100644 shared/server-commands/feeds/feeds-command.ts delete mode 100644 shared/server-commands/feeds/index.ts (limited to 'shared/server-commands/feeds') diff --git a/shared/server-commands/feeds/feeds-command.ts b/shared/server-commands/feeds/feeds-command.ts deleted file mode 100644 index 26763b43e..000000000 --- a/shared/server-commands/feeds/feeds-command.ts +++ /dev/null @@ -1,78 +0,0 @@ -import { buildUUID } from '@shared/extra-utils' -import { HttpStatusCode } from '@shared/models' -import { AbstractCommand, OverrideCommandOptions } from '../shared' - -type FeedType = 'videos' | 'video-comments' | 'subscriptions' - -export class FeedCommand extends AbstractCommand { - - getXML (options: OverrideCommandOptions & { - feed: FeedType - ignoreCache: boolean - format?: string - }) { - const { feed, format, ignoreCache } = options - const path = '/feeds/' + feed + '.xml' - - const query: { [id: string]: string } = {} - - if (ignoreCache) query.v = buildUUID() - if (format) query.format = format - - return this.getRequestText({ - ...options, - - path, - query, - accept: 'application/xml', - implicitToken: false, - defaultExpectedStatus: HttpStatusCode.OK_200 - }) - } - - getPodcastXML (options: OverrideCommandOptions & { - ignoreCache: boolean - channelId: number - }) { - const { ignoreCache, channelId } = options - const path = `/feeds/podcast/videos.xml` - - const query: { [id: string]: string } = {} - - if (ignoreCache) query.v = buildUUID() - if (channelId) query.videoChannelId = channelId + '' - - return this.getRequestText({ - ...options, - - path, - query, - accept: 'application/xml', - implicitToken: false, - defaultExpectedStatus: HttpStatusCode.OK_200 - }) - } - - getJSON (options: OverrideCommandOptions & { - feed: FeedType - ignoreCache: boolean - query?: { [ id: string ]: any } - }) { - const { feed, query = {}, ignoreCache } = options - const path = '/feeds/' + feed + '.json' - - const cacheQuery = ignoreCache - ? { v: buildUUID() } - : {} - - return this.getRequestText({ - ...options, - - path, - query: { ...query, ...cacheQuery }, - accept: 'application/json', - implicitToken: false, - defaultExpectedStatus: HttpStatusCode.OK_200 - }) - } -} diff --git a/shared/server-commands/feeds/index.ts b/shared/server-commands/feeds/index.ts deleted file mode 100644 index 662a22b6f..000000000 --- a/shared/server-commands/feeds/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './feeds-command' -- cgit v1.2.3