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/metrics.ts | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 server/controllers/api/metrics.ts (limited to 'server/controllers/api/metrics.ts') diff --git a/server/controllers/api/metrics.ts b/server/controllers/api/metrics.ts deleted file mode 100644 index 909963fa7..000000000 --- a/server/controllers/api/metrics.ts +++ /dev/null @@ -1,34 +0,0 @@ -import express from 'express' -import { CONFIG } from '@server/initializers/config' -import { OpenTelemetryMetrics } from '@server/lib/opentelemetry/metrics' -import { HttpStatusCode, PlaybackMetricCreate } from '@shared/models' -import { addPlaybackMetricValidator, apiRateLimiter, asyncMiddleware } from '../../middlewares' - -const metricsRouter = express.Router() - -metricsRouter.use(apiRateLimiter) - -metricsRouter.post('/playback', - asyncMiddleware(addPlaybackMetricValidator), - addPlaybackMetric -) - -// --------------------------------------------------------------------------- - -export { - metricsRouter -} - -// --------------------------------------------------------------------------- - -function addPlaybackMetric (req: express.Request, res: express.Response) { - if (!CONFIG.OPEN_TELEMETRY.METRICS.ENABLED) { - return res.sendStatus(HttpStatusCode.FORBIDDEN_403) - } - - const body: PlaybackMetricCreate = req.body - - OpenTelemetryMetrics.Instance.observePlaybackMetric(res.locals.onlyImmutableVideo, body) - - return res.sendStatus(HttpStatusCode.NO_CONTENT_204) -} -- cgit v1.2.3