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/users/my-subscriptions.ts | 193 ----------------------- 1 file changed, 193 deletions(-) delete mode 100644 server/controllers/api/users/my-subscriptions.ts (limited to 'server/controllers/api/users/my-subscriptions.ts') diff --git a/server/controllers/api/users/my-subscriptions.ts b/server/controllers/api/users/my-subscriptions.ts deleted file mode 100644 index c4360f59d..000000000 --- a/server/controllers/api/users/my-subscriptions.ts +++ /dev/null @@ -1,193 +0,0 @@ -import 'multer' -import express from 'express' -import { handlesToNameAndHost } from '@server/helpers/actors' -import { pickCommonVideoQuery } from '@server/helpers/query' -import { sendUndoFollow } from '@server/lib/activitypub/send' -import { Hooks } from '@server/lib/plugins/hooks' -import { VideoChannelModel } from '@server/models/video/video-channel' -import { HttpStatusCode } from '../../../../shared/models/http/http-error-codes' -import { buildNSFWFilter, getCountVideos } from '../../../helpers/express-utils' -import { getFormattedObjects } from '../../../helpers/utils' -import { sequelizeTypescript } from '../../../initializers/database' -import { JobQueue } from '../../../lib/job-queue' -import { - asyncMiddleware, - asyncRetryTransactionMiddleware, - authenticate, - commonVideosFiltersValidator, - paginationValidator, - setDefaultPagination, - setDefaultSort, - setDefaultVideosSort, - userSubscriptionAddValidator, - userSubscriptionGetValidator -} from '../../../middlewares' -import { - areSubscriptionsExistValidator, - userSubscriptionListValidator, - userSubscriptionsSortValidator, - videosSortValidator -} from '../../../middlewares/validators' -import { ActorFollowModel } from '../../../models/actor/actor-follow' -import { guessAdditionalAttributesFromQuery } from '../../../models/video/formatter' -import { VideoModel } from '../../../models/video/video' - -const mySubscriptionsRouter = express.Router() - -mySubscriptionsRouter.get('/me/subscriptions/videos', - authenticate, - paginationValidator, - videosSortValidator, - setDefaultVideosSort, - setDefaultPagination, - commonVideosFiltersValidator, - asyncMiddleware(getUserSubscriptionVideos) -) - -mySubscriptionsRouter.get('/me/subscriptions/exist', - authenticate, - areSubscriptionsExistValidator, - asyncMiddleware(areSubscriptionsExist) -) - -mySubscriptionsRouter.get('/me/subscriptions', - authenticate, - paginationValidator, - userSubscriptionsSortValidator, - setDefaultSort, - setDefaultPagination, - userSubscriptionListValidator, - asyncMiddleware(getUserSubscriptions) -) - -mySubscriptionsRouter.post('/me/subscriptions', - authenticate, - userSubscriptionAddValidator, - addUserSubscription -) - -mySubscriptionsRouter.get('/me/subscriptions/:uri', - authenticate, - userSubscriptionGetValidator, - asyncMiddleware(getUserSubscription) -) - -mySubscriptionsRouter.delete('/me/subscriptions/:uri', - authenticate, - userSubscriptionGetValidator, - asyncRetryTransactionMiddleware(deleteUserSubscription) -) - -// --------------------------------------------------------------------------- - -export { - mySubscriptionsRouter -} - -// --------------------------------------------------------------------------- - -async function areSubscriptionsExist (req: express.Request, res: express.Response) { - const uris = req.query.uris as string[] - const user = res.locals.oauth.token.User - - const sanitizedHandles = handlesToNameAndHost(uris) - - const results = await ActorFollowModel.listSubscriptionsOf(user.Account.Actor.id, sanitizedHandles) - - const existObject: { [id: string ]: boolean } = {} - for (const sanitizedHandle of sanitizedHandles) { - const obj = results.find(r => { - const server = r.ActorFollowing.Server - - return r.ActorFollowing.preferredUsername.toLowerCase() === sanitizedHandle.name.toLowerCase() && - ( - (!server && !sanitizedHandle.host) || - (server.host === sanitizedHandle.host) - ) - }) - - existObject[sanitizedHandle.handle] = obj !== undefined - } - - return res.json(existObject) -} - -function addUserSubscription (req: express.Request, res: express.Response) { - const user = res.locals.oauth.token.User - const [ name, host ] = req.body.uri.split('@') - - const payload = { - name, - host, - assertIsChannel: true, - followerActorId: user.Account.Actor.id - } - - JobQueue.Instance.createJobAsync({ type: 'activitypub-follow', payload }) - - return res.status(HttpStatusCode.NO_CONTENT_204).end() -} - -async function getUserSubscription (req: express.Request, res: express.Response) { - const subscription = res.locals.subscription - const videoChannel = await VideoChannelModel.loadAndPopulateAccount(subscription.ActorFollowing.VideoChannel.id) - - return res.json(videoChannel.toFormattedJSON()) -} - -async function deleteUserSubscription (req: express.Request, res: express.Response) { - const subscription = res.locals.subscription - - await sequelizeTypescript.transaction(async t => { - if (subscription.state === 'accepted') { - sendUndoFollow(subscription, t) - } - - return subscription.destroy({ transaction: t }) - }) - - return res.type('json') - .status(HttpStatusCode.NO_CONTENT_204) - .end() -} - -async function getUserSubscriptions (req: express.Request, res: express.Response) { - const user = res.locals.oauth.token.User - const actorId = user.Account.Actor.id - - const resultList = await ActorFollowModel.listSubscriptionsForApi({ - actorId, - start: req.query.start, - count: req.query.count, - sort: req.query.sort, - search: req.query.search - }) - - return res.json(getFormattedObjects(resultList.data, resultList.total)) -} - -async function getUserSubscriptionVideos (req: express.Request, res: express.Response) { - const user = res.locals.oauth.token.User - const countVideos = getCountVideos(req) - const query = pickCommonVideoQuery(req.query) - - const apiOptions = await Hooks.wrapObject({ - ...query, - - displayOnlyForFollower: { - actorId: user.Account.Actor.id, - orLocalVideos: false - }, - nsfw: buildNSFWFilter(res, query.nsfw), - user, - countVideos - }, 'filter:api.user.me.subscription-videos.list.params') - - const resultList = await Hooks.wrapPromiseFun( - VideoModel.listForApi, - apiOptions, - 'filter:api.user.me.subscription-videos.list.result' - ) - - return res.json(getFormattedObjects(resultList.data, resultList.total, guessAdditionalAttributesFromQuery(query))) -} -- cgit v1.2.3