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) --- .../video-previews-simple-file-cache.ts | 58 ---------------------- 1 file changed, 58 deletions(-) delete mode 100644 server/lib/files-cache/video-previews-simple-file-cache.ts (limited to 'server/lib/files-cache/video-previews-simple-file-cache.ts') diff --git a/server/lib/files-cache/video-previews-simple-file-cache.ts b/server/lib/files-cache/video-previews-simple-file-cache.ts deleted file mode 100644 index a05e80e16..000000000 --- a/server/lib/files-cache/video-previews-simple-file-cache.ts +++ /dev/null @@ -1,58 +0,0 @@ -import { join } from 'path' -import { FILES_CACHE } from '../../initializers/constants' -import { VideoModel } from '../../models/video/video' -import { AbstractSimpleFileCache } from './shared/abstract-simple-file-cache' -import { doRequestAndSaveToFile } from '@server/helpers/requests' -import { ThumbnailModel } from '@server/models/video/thumbnail' -import { ThumbnailType } from '@shared/models' -import { logger } from '@server/helpers/logger' - -class VideoPreviewsSimpleFileCache extends AbstractSimpleFileCache { - - private static instance: VideoPreviewsSimpleFileCache - - private constructor () { - super() - } - - static get Instance () { - return this.instance || (this.instance = new this()) - } - - async getFilePathImpl (filename: string) { - const thumbnail = await ThumbnailModel.loadWithVideoByFilename(filename, ThumbnailType.PREVIEW) - if (!thumbnail) return undefined - - if (thumbnail.Video.isOwned()) return { isOwned: true, path: thumbnail.getPath() } - - return this.loadRemoteFile(thumbnail.Video.uuid) - } - - // Key is the video UUID - protected async loadRemoteFile (key: string) { - const video = await VideoModel.loadFull(key) - if (!video) return undefined - - if (video.isOwned()) throw new Error('Cannot load remote preview of owned video.') - - const preview = video.getPreview() - const destPath = join(FILES_CACHE.PREVIEWS.DIRECTORY, preview.filename) - const remoteUrl = preview.getOriginFileUrl(video) - - try { - await doRequestAndSaveToFile(remoteUrl, destPath) - - logger.debug('Fetched remote preview %s to %s.', remoteUrl, destPath) - - return { isOwned: false, path: destPath } - } catch (err) { - logger.info('Cannot fetch remote preview file %s.', remoteUrl, { err }) - - return undefined - } - } -} - -export { - VideoPreviewsSimpleFileCache -} -- cgit v1.2.3