Routers in separate files.

server/lib/routers/index.ts

@@ -0,0 +1,24 @@
+import type { NextFunction, Request, Response } from 'express'
+import { initWebchatRouter } from './webchat'
+
+type InitRoutersOptions = Pick<RegisterServerOptions, 'settingsManager' | 'getRouter' | 'peertubeHelpers'>
+
+async function initRouters ({
+  settingsManager,
+  getRouter,
+  peertubeHelpers
+}: InitRoutersOptions): Promise<void> {
+  const router = getRouter()
+  router.get('/ping', (req: Request, res: Response, _next: NextFunction) => res.json({ message: 'pong' }))
+
+  router.use('/webchat', await initWebchatRouter({
+    getRouter,
+    peertubeHelpers,
+    settingsManager
+  }))
+}
+
+export {
+  InitRoutersOptions,
+  initRouters
+}

server/lib/routers/webchat.ts

@@ -1,19 +1,17 @@
+import type { InitRoutersOptions } from './index'
+import type { Router, Request, Response, NextFunction } from 'express'
 import * as path from 'path'
-import type { NextFunction, Request, Response } from 'express'
 const fs = require('fs').promises
 
-type InitRoutersOptions = Pick<RegisterServerOptions, 'settingsManager' | 'getRouter' | 'peertubeHelpers'>
+async function initWebchatRouter ({
-
-export async function initRouters ({
-  settingsManager,
   getRouter,
-  peertubeHelpers
+  peertubeHelpers,
-}: InitRoutersOptions): Promise<void> {
+  settingsManager
-  const converseJSIndex = await fs.readFile(path.resolve(__dirname, '../conversejs/index.html'))
+}: InitRoutersOptions): Promise<Router> {
+  const converseJSIndex = await fs.readFile(path.resolve(__dirname, '../../conversejs/index.html'))
 
   const router = getRouter()
-  router.get('/ping', (req: Request, res: Response) => res.json({ message: 'pong' }))
+  router.get('/', async (req: Request, res: Response, next: NextFunction) => {
-  router.get('/webchat', async (req: Request, res: Response, next: NextFunction) => {
     try {
       const settings = await settingsManager.getSettings([
         'chat-use-builtin', 'chat-room', 'chat-server',
@@ -70,4 +68,9 @@ export async function initRouters ({
       return next(error)
     }
   })
+  return router
+}
+
+export {
+  initWebchatRouter
 }

server/main.ts

@@ -1,5 +1,5 @@
 import { initSettings } from './lib/settings'
-import { initRouters } from './lib/routers'
+import { initRouters } from './lib/routers/index'
 import type { Logger } from 'winston'
 import decache from 'decache'