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/middlewares/validators/oembed.ts | 158 -------------------------------- 1 file changed, 158 deletions(-) delete mode 100644 server/middlewares/validators/oembed.ts (limited to 'server/middlewares/validators/oembed.ts') diff --git a/server/middlewares/validators/oembed.ts b/server/middlewares/validators/oembed.ts deleted file mode 100644 index ef9a227a0..000000000 --- a/server/middlewares/validators/oembed.ts +++ /dev/null @@ -1,158 +0,0 @@ -import express from 'express' -import { query } from 'express-validator' -import { join } from 'path' -import { loadVideo } from '@server/lib/model-loaders' -import { VideoPlaylistModel } from '@server/models/video/video-playlist' -import { VideoPlaylistPrivacy, VideoPrivacy } from '@shared/models' -import { HttpStatusCode } from '../../../shared/models/http/http-error-codes' -import { isTestOrDevInstance } from '../../helpers/core-utils' -import { isIdOrUUIDValid, isUUIDValid, toCompleteUUID } from '../../helpers/custom-validators/misc' -import { WEBSERVER } from '../../initializers/constants' -import { areValidationErrors } from './shared' - -const playlistPaths = [ - join('videos', 'watch', 'playlist'), - join('w', 'p') -] - -const videoPaths = [ - join('videos', 'watch'), - 'w' -] - -function buildUrls (paths: string[]) { - return paths.map(p => WEBSERVER.SCHEME + '://' + join(WEBSERVER.HOST, p) + '/') -} - -const startPlaylistURLs = buildUrls(playlistPaths) -const startVideoURLs = buildUrls(videoPaths) - -const isURLOptions = { - require_host: true, - require_tld: true -} - -// We validate 'localhost', so we don't have the top level domain -if (isTestOrDevInstance()) { - isURLOptions.require_tld = false -} - -const oembedValidator = [ - query('url') - .isURL(isURLOptions), - query('maxwidth') - .optional() - .isInt(), - query('maxheight') - .optional() - .isInt(), - query('format') - .optional() - .isIn([ 'xml', 'json' ]), - - async (req: express.Request, res: express.Response, next: express.NextFunction) => { - if (areValidationErrors(req, res)) return - - if (req.query.format !== undefined && req.query.format !== 'json') { - return res.fail({ - status: HttpStatusCode.NOT_IMPLEMENTED_501, - message: 'Requested format is not implemented on server.', - data: { - format: req.query.format - } - }) - } - - const url = req.query.url as string - - let urlPath: string - - try { - urlPath = new URL(url).pathname - } catch (err) { - return res.fail({ - status: HttpStatusCode.BAD_REQUEST_400, - message: err.message, - data: { - url - } - }) - } - - const isPlaylist = startPlaylistURLs.some(u => url.startsWith(u)) - const isVideo = isPlaylist ? false : startVideoURLs.some(u => url.startsWith(u)) - - const startIsOk = isVideo || isPlaylist - - const parts = urlPath.split('/') - - if (startIsOk === false || parts.length === 0) { - return res.fail({ - status: HttpStatusCode.BAD_REQUEST_400, - message: 'Invalid url.', - data: { - url - } - }) - } - - const elementId = toCompleteUUID(parts.pop()) - if (isIdOrUUIDValid(elementId) === false) { - return res.fail({ message: 'Invalid video or playlist id.' }) - } - - if (isVideo) { - const video = await loadVideo(elementId, 'all') - - if (!video) { - return res.fail({ - status: HttpStatusCode.NOT_FOUND_404, - message: 'Video not found' - }) - } - - if ( - video.privacy === VideoPrivacy.PUBLIC || - (video.privacy === VideoPrivacy.UNLISTED && isUUIDValid(elementId) === true) - ) { - res.locals.videoAll = video - return next() - } - - return res.fail({ - status: HttpStatusCode.FORBIDDEN_403, - message: 'Video is not publicly available' - }) - } - - // Is playlist - - const videoPlaylist = await VideoPlaylistModel.loadWithAccountAndChannelSummary(elementId, undefined) - if (!videoPlaylist) { - return res.fail({ - status: HttpStatusCode.NOT_FOUND_404, - message: 'Video playlist not found' - }) - } - - if ( - videoPlaylist.privacy === VideoPlaylistPrivacy.PUBLIC || - (videoPlaylist.privacy === VideoPlaylistPrivacy.UNLISTED && isUUIDValid(elementId)) - ) { - res.locals.videoPlaylistSummary = videoPlaylist - return next() - } - - return res.fail({ - status: HttpStatusCode.FORBIDDEN_403, - message: 'Playlist is not public' - }) - } - -] - -// --------------------------------------------------------------------------- - -export { - oembedValidator -} -- cgit v1.2.3