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/activitypub/inbox.ts | 85 --------------------------------- 1 file changed, 85 deletions(-) delete mode 100644 server/controllers/activitypub/inbox.ts (limited to 'server/controllers/activitypub/inbox.ts') diff --git a/server/controllers/activitypub/inbox.ts b/server/controllers/activitypub/inbox.ts deleted file mode 100644 index 862c7baf1..000000000 --- a/server/controllers/activitypub/inbox.ts +++ /dev/null @@ -1,85 +0,0 @@ -import express from 'express' -import { InboxManager } from '@server/lib/activitypub/inbox-manager' -import { Activity, ActivityPubCollection, ActivityPubOrderedCollection, RootActivity } from '@shared/models' -import { HttpStatusCode } from '../../../shared/models/http/http-error-codes' -import { isActivityValid } from '../../helpers/custom-validators/activitypub/activity' -import { logger } from '../../helpers/logger' -import { - activityPubRateLimiter, - asyncMiddleware, - checkSignature, - ensureIsLocalChannel, - localAccountValidator, - signatureValidator, - videoChannelsNameWithHostValidator -} from '../../middlewares' -import { activityPubValidator } from '../../middlewares/validators/activitypub/activity' - -const inboxRouter = express.Router() - -inboxRouter.post('/inbox', - activityPubRateLimiter, - signatureValidator, - asyncMiddleware(checkSignature), - asyncMiddleware(activityPubValidator), - inboxController -) - -inboxRouter.post('/accounts/:name/inbox', - activityPubRateLimiter, - signatureValidator, - asyncMiddleware(checkSignature), - asyncMiddleware(localAccountValidator), - asyncMiddleware(activityPubValidator), - inboxController -) - -inboxRouter.post('/video-channels/:nameWithHost/inbox', - activityPubRateLimiter, - signatureValidator, - asyncMiddleware(checkSignature), - asyncMiddleware(videoChannelsNameWithHostValidator), - ensureIsLocalChannel, - asyncMiddleware(activityPubValidator), - inboxController -) - -// --------------------------------------------------------------------------- - -export { - inboxRouter -} - -// --------------------------------------------------------------------------- - -function inboxController (req: express.Request, res: express.Response) { - const rootActivity: RootActivity = req.body - let activities: Activity[] - - if ([ 'Collection', 'CollectionPage' ].includes(rootActivity.type)) { - activities = (rootActivity as ActivityPubCollection).items - } else if ([ 'OrderedCollection', 'OrderedCollectionPage' ].includes(rootActivity.type)) { - activities = (rootActivity as ActivityPubOrderedCollection).orderedItems - } else { - activities = [ rootActivity as Activity ] - } - - // Only keep activities we are able to process - logger.debug('Filtering %d activities...', activities.length) - activities = activities.filter(a => isActivityValid(a)) - logger.debug('We keep %d activities.', activities.length, { activities }) - - const accountOrChannel = res.locals.account || res.locals.videoChannel - - logger.info('Receiving inbox requests for %d activities by %s.', activities.length, res.locals.signature.actor.url) - - InboxManager.Instance.addInboxMessage({ - activities, - signatureActor: res.locals.signature.actor, - inboxActor: accountOrChannel - ? accountOrChannel.Actor - : undefined - }) - - return res.status(HttpStatusCode.NO_CONTENT_204).end() -} -- cgit v1.2.3