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/controllers/api/index.ts | 73 ----------------------------------------- 1 file changed, 73 deletions(-) delete mode 100644 server/controllers/api/index.ts (limited to 'server/controllers/api/index.ts') diff --git a/server/controllers/api/index.ts b/server/controllers/api/index.ts deleted file mode 100644 index 38bd135d0..000000000 --- a/server/controllers/api/index.ts +++ /dev/null @@ -1,73 +0,0 @@ -import cors from 'cors' -import express from 'express' -import { logger } from '@server/helpers/logger' -import { HttpStatusCode } from '../../../shared/models' -import { abuseRouter } from './abuse' -import { accountsRouter } from './accounts' -import { blocklistRouter } from './blocklist' -import { bulkRouter } from './bulk' -import { configRouter } from './config' -import { customPageRouter } from './custom-page' -import { jobsRouter } from './jobs' -import { metricsRouter } from './metrics' -import { oauthClientsRouter } from './oauth-clients' -import { overviewsRouter } from './overviews' -import { pluginRouter } from './plugins' -import { runnersRouter } from './runners' -import { searchRouter } from './search' -import { serverRouter } from './server' -import { usersRouter } from './users' -import { videoChannelRouter } from './video-channel' -import { videoChannelSyncRouter } from './video-channel-sync' -import { videoPlaylistRouter } from './video-playlist' -import { videosRouter } from './videos' - -const apiRouter = express.Router() - -apiRouter.use(cors({ - origin: '*', - exposedHeaders: 'Retry-After', - credentials: true -})) - -apiRouter.use('/server', serverRouter) -apiRouter.use('/abuses', abuseRouter) -apiRouter.use('/bulk', bulkRouter) -apiRouter.use('/oauth-clients', oauthClientsRouter) -apiRouter.use('/config', configRouter) -apiRouter.use('/users', usersRouter) -apiRouter.use('/accounts', accountsRouter) -apiRouter.use('/video-channels', videoChannelRouter) -apiRouter.use('/video-channel-syncs', videoChannelSyncRouter) -apiRouter.use('/video-playlists', videoPlaylistRouter) -apiRouter.use('/videos', videosRouter) -apiRouter.use('/jobs', jobsRouter) -apiRouter.use('/metrics', metricsRouter) -apiRouter.use('/search', searchRouter) -apiRouter.use('/overviews', overviewsRouter) -apiRouter.use('/plugins', pluginRouter) -apiRouter.use('/custom-pages', customPageRouter) -apiRouter.use('/blocklist', blocklistRouter) -apiRouter.use('/runners', runnersRouter) - -// apiRouter.use(apiRateLimiter) -apiRouter.use('/ping', pong) -apiRouter.use('/*', badRequest) - -// --------------------------------------------------------------------------- - -export { apiRouter } - -// --------------------------------------------------------------------------- - -function pong (req: express.Request, res: express.Response) { - return res.send('pong').status(HttpStatusCode.OK_200).end() -} - -function badRequest (req: express.Request, res: express.Response) { - logger.debug(`API express handler not found: bad PeerTube request for ${req.method} - ${req.originalUrl}`) - - return res.type('json') - .status(HttpStatusCode.BAD_REQUEST_400) - .end() -} -- cgit v1.2.3