Merge pull request #1455 from valadaptive/content-manager-router

Use Express router for content endpoint

server.js

@@ -3606,7 +3606,7 @@ app.use('/api/files', require('./src/endpoints/files').router);
 require('./src/endpoints/sprites').registerEndpoints(app, jsonParser, urlencodedParser);
 
 // Custom content management
-require('./src/endpoints/content-manager').registerEndpoints(app, jsonParser);
+app.use('/api/content', require('./src/endpoints/content-manager').router);
 
 // Stable Diffusion generation
 require('./src/endpoints/stable-diffusion').registerEndpoints(app, jsonParser);

src/endpoints/content-manager.js

@@ -1,8 +1,10 @@
 const fs = require('fs');
 const path = require('path');
+const express = require('express');
 const fetch = require('node-fetch').default;
 const sanitize = require('sanitize-filename');
 const { getConfigValue } = require('../util');
+const { jsonParser } = require('../express-common');
 const contentDirectory = path.join(process.cwd(), 'default/content');
 const contentLogPath = path.join(contentDirectory, 'content.log');
 const contentIndexPath = path.join(contentDirectory, 'index.json');
@@ -302,13 +304,9 @@ function parseJannyUrl(url) {
     return uuid;
 }
 
-/**
- * Registers endpoints for custom content management
- * @param {import('express').Express} app Express app
- * @param {any} jsonParser JSON parser middleware
- */
-function registerEndpoints(app, jsonParser) {
-    app.post('/api/content/import', jsonParser, async (request, response) => {
+const router = express.Router();
+
+router.post('/import', jsonParser, async (request, response) => {
     if (!request.body.url) {
         return response.sendStatus(400);
     }
@@ -352,12 +350,11 @@ function registerEndpoints(app, jsonParser) {
         console.log('Importing custom content failed', error);
         return response.sendStatus(500);
     }
-    });
-}
+});
 
 module.exports = {
     checkForNewContent,
-    registerEndpoints,
     getDefaultPresets,
     getDefaultPresetFile,
+    router,
 };