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/models/videos/file/index.ts | 3 --- .../videos/file/video-file-metadata.model.ts | 13 ------------ shared/models/videos/file/video-file.model.ts | 23 ---------------------- shared/models/videos/file/video-resolution.enum.ts | 11 ----------- 4 files changed, 50 deletions(-) delete mode 100644 shared/models/videos/file/index.ts delete mode 100644 shared/models/videos/file/video-file-metadata.model.ts delete mode 100644 shared/models/videos/file/video-file.model.ts delete mode 100644 shared/models/videos/file/video-resolution.enum.ts (limited to 'shared/models/videos/file') diff --git a/shared/models/videos/file/index.ts b/shared/models/videos/file/index.ts deleted file mode 100644 index 78a784a3c..000000000 --- a/shared/models/videos/file/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './video-file-metadata.model' -export * from './video-file.model' -export * from './video-resolution.enum' diff --git a/shared/models/videos/file/video-file-metadata.model.ts b/shared/models/videos/file/video-file-metadata.model.ts deleted file mode 100644 index 8f527c0a7..000000000 --- a/shared/models/videos/file/video-file-metadata.model.ts +++ /dev/null @@ -1,13 +0,0 @@ -export class VideoFileMetadata { - streams: { [x: string]: any, [x: number]: any }[] - format: { [x: string]: any, [x: number]: any } - chapters: any[] - - constructor (hash: { chapters: any[], format: any, streams: any[] }) { - this.chapters = hash.chapters - this.format = hash.format - this.streams = hash.streams - - delete this.format.filename - } -} diff --git a/shared/models/videos/file/video-file.model.ts b/shared/models/videos/file/video-file.model.ts deleted file mode 100644 index 2bbff48eb..000000000 --- a/shared/models/videos/file/video-file.model.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { VideoConstant } from '../video-constant.model' -import { VideoFileMetadata } from './video-file-metadata.model' -import { VideoResolution } from './video-resolution.enum' - -export interface VideoFile { - id: number - - resolution: VideoConstant - size: number // Bytes - - torrentUrl: string - torrentDownloadUrl: string - - fileUrl: string - fileDownloadUrl: string - - fps: number - - metadata?: VideoFileMetadata - metadataUrl?: string - - magnetUri: string | null -} diff --git a/shared/models/videos/file/video-resolution.enum.ts b/shared/models/videos/file/video-resolution.enum.ts deleted file mode 100644 index 5b48ad353..000000000 --- a/shared/models/videos/file/video-resolution.enum.ts +++ /dev/null @@ -1,11 +0,0 @@ -export const enum VideoResolution { - H_NOVIDEO = 0, - H_144P = 144, - H_240P = 240, - H_360P = 360, - H_480P = 480, - H_720P = 720, - H_1080P = 1080, - H_1440P = 1440, - H_4K = 2160 -} -- cgit v1.2.3