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) --- .../fixtures/peertube-plugin-test-four/main.js | 201 --------------------- 1 file changed, 201 deletions(-) delete mode 100644 server/tests/fixtures/peertube-plugin-test-four/main.js (limited to 'server/tests/fixtures/peertube-plugin-test-four/main.js') diff --git a/server/tests/fixtures/peertube-plugin-test-four/main.js b/server/tests/fixtures/peertube-plugin-test-four/main.js deleted file mode 100644 index b10177b45..000000000 --- a/server/tests/fixtures/peertube-plugin-test-four/main.js +++ /dev/null @@ -1,201 +0,0 @@ -async function register ({ - peertubeHelpers, - registerHook, - getRouter -}) { - const logger = peertubeHelpers.logger - - logger.info('Hello world from plugin four') - - { - const username = 'root' - const results = await peertubeHelpers.database.query( - 'SELECT "email" from "user" WHERE "username" = $username', - { - type: 'SELECT', - bind: { username } - } - ) - - logger.info('root email is ' + results[0]['email']) - } - - { - registerHook({ - target: 'action:api.video.viewed', - handler: async ({ video }) => { - const videoFromDB1 = await peertubeHelpers.videos.loadByUrl(video.url) - const videoFromDB2 = await peertubeHelpers.videos.loadByIdOrUUID(video.id) - const videoFromDB3 = await peertubeHelpers.videos.loadByIdOrUUID(video.uuid) - - if (videoFromDB1.uuid !== videoFromDB2.uuid || videoFromDB2.uuid !== videoFromDB3.uuid) return - - logger.info('video from DB uuid is %s.', videoFromDB1.uuid) - - await peertubeHelpers.videos.removeVideo(video.id) - - logger.info('Video deleted by plugin four.') - } - }) - } - - { - const serverActor = await peertubeHelpers.server.getServerActor() - logger.info('server actor name is %s', serverActor.preferredUsername) - } - - { - logger.info('server url is %s', peertubeHelpers.config.getWebserverUrl()) - } - - { - const actions = { - blockServer, - unblockServer, - blockAccount, - unblockAccount, - blacklist, - unblacklist - } - - const router = getRouter() - router.post('/commander', async (req, res) => { - try { - await actions[req.body.command](peertubeHelpers, req.body) - - res.sendStatus(204) - } catch (err) { - logger.error('Error in commander.', { err }) - res.sendStatus(500) - } - }) - - router.get('/server-config', async (req, res) => { - const serverConfig = await peertubeHelpers.config.getServerConfig() - - return res.json({ serverConfig }) - }) - - router.get('/server-listening-config', async (req, res) => { - const config = await peertubeHelpers.config.getServerListeningConfig() - - return res.json({ config }) - }) - - router.get('/static-route', async (req, res) => { - const staticRoute = peertubeHelpers.plugin.getBaseStaticRoute() - - return res.json({ staticRoute }) - }) - - router.get('/router-route', async (req, res) => { - const routerRoute = peertubeHelpers.plugin.getBaseRouterRoute() - - return res.json({ routerRoute }) - }) - - router.get('/user/:id', async (req, res) => { - const user = await peertubeHelpers.user.loadById(req.params.id) - if (!user) return res.status(404).end() - - return res.json({ - username: user.username - }) - }) - - router.get('/user', async (req, res) => { - const user = await peertubeHelpers.user.getAuthUser(res) - if (!user) return res.sendStatus(404) - - const isAdmin = user.role === 0 - const isModerator = user.role === 1 - const isUser = user.role === 2 - - return res.json({ - id: user.id, - username: user.username, - displayName: user.Account.name, - isAdmin, - isModerator, - isUser - }) - }) - - router.get('/video-files/:id', async (req, res) => { - const details = await peertubeHelpers.videos.getFiles(req.params.id) - if (!details) return res.sendStatus(404) - - return res.json(details) - }) - - router.get('/ffprobe', async (req, res) => { - const result = await peertubeHelpers.videos.ffprobe(req.query.path) - if (!result) return res.sendStatus(404) - - return res.json(result) - }) - - router.post('/send-notification', async (req, res) => { - peertubeHelpers.socket.sendNotification(req.body.userId, { - type: 1, - userId: req.body.userId - }) - - return res.sendStatus(201) - }) - - router.post('/send-video-live-new-state/:uuid', async (req, res) => { - const video = await peertubeHelpers.videos.loadByIdOrUUID(req.params.uuid) - peertubeHelpers.socket.sendVideoLiveNewState(video) - - return res.sendStatus(201) - }) - } - -} - -async function unregister () { - return -} - -module.exports = { - register, - unregister -} - -// ########################################################################### - -async function blockServer (peertubeHelpers, body) { - const serverActor = await peertubeHelpers.server.getServerActor() - - await peertubeHelpers.moderation.blockServer({ byAccountId: serverActor.Account.id, hostToBlock: body.hostToBlock }) -} - -async function unblockServer (peertubeHelpers, body) { - const serverActor = await peertubeHelpers.server.getServerActor() - - await peertubeHelpers.moderation.unblockServer({ byAccountId: serverActor.Account.id, hostToUnblock: body.hostToUnblock }) -} - -async function blockAccount (peertubeHelpers, body) { - const serverActor = await peertubeHelpers.server.getServerActor() - - await peertubeHelpers.moderation.blockAccount({ byAccountId: serverActor.Account.id, handleToBlock: body.handleToBlock }) -} - -async function unblockAccount (peertubeHelpers, body) { - const serverActor = await peertubeHelpers.server.getServerActor() - - await peertubeHelpers.moderation.unblockAccount({ byAccountId: serverActor.Account.id, handleToUnblock: body.handleToUnblock }) -} - -async function blacklist (peertubeHelpers, body) { - await peertubeHelpers.moderation.blacklistVideo({ - videoIdOrUUID: body.videoUUID, - createOptions: body - }) -} - -async function unblacklist (peertubeHelpers, body) { - await peertubeHelpers.moderation.unblacklistVideo({ videoIdOrUUID: body.videoUUID }) -} -- cgit v1.2.3