rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1456 from valadaptive/extensions-router

Browse Source 
Use Express router for extensions endpoint
This commit is contained in:
Cohee
2023-12-04 21:55:22 +02:00
committed by GitHub
parent 0b13033ab8 aff821aa07
commit 2a44af7ff4
2 changed files with 185 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server.js
View File

@@ -3594,7 +3594,7 @@ require('./src/endpoints/thumbnails').registerEndpoints(app, jsonParser);
require('./src/endpoints/novelai').registerEndpoints(app, jsonParser);
// Third-party extensions
require('./src/endpoints/extensions').registerEndpoints(app, jsonParser);
app.use('/api/extensions', require('./src/endpoints/extensions').router);
// Asset management
app.use('/api/assets', require('./src/endpoints/assets').router);

26
src/endpoints/extensions.js
View File

@@ -1,8 +1,10 @@
const path = require('path');
const fs = require('fs');
const express = require('express');
const { default: simpleGit } = require('simple-git');
const sanitize = require('sanitize-filename');
const { DIRECTORIES } = require('../constants');
const { jsonParser } = require('../express-common');
/**
* This function extracts the extension information from the manifest file.
@@ -45,12 +47,8 @@ async function checkIfRepoIsUpToDate(extensionPath) {
};
}
/**
* Registers the endpoints for the third-party extensions API.
* @param {import('express').Express} app - Express app
* @param {any} jsonParser - JSON parser middleware
*/
function registerEndpoints(app, jsonParser) {
const router = express.Router();
/**
* HTTP POST handler function to clone a git repository from a provided URL, read the extension manifest,
* and return extension information and path.
@@ -60,7 +58,7 @@ function registerEndpoints(app, jsonParser) {
*
* @returns {void}
*/
app.post('/api/extensions/install', jsonParser, async (request, response) => {
router.post('/install', jsonParser, async (request, response) => {
if (!request.body.url) {
return response.status(400).send('Bad Request: URL is required in the request body.');
}
@@ -105,7 +103,7 @@ function registerEndpoints(app, jsonParser) {
*
* @returns {void}
*/
app.post('/api/extensions/update', jsonParser, async (request, response) => {
router.post('/update', jsonParser, async (request, response) => {
const git = simpleGit();
if (!request.body.extensionName) {
return response.status(400).send('Bad Request: extensionName is required in the request body.');
@@ -150,7 +148,7 @@ function registerEndpoints(app, jsonParser) {
*
* @returns {void}
*/
app.post('/api/extensions/version', jsonParser, async (request, response) => {
router.post('/version', jsonParser, async (request, response) => {
const git = simpleGit();
if (!request.body.extensionName) {
return response.status(400).send('Bad Request: extensionName is required in the request body.');
@@ -188,7 +186,7 @@ function registerEndpoints(app, jsonParser) {
*
* @returns {void}
*/
app.post('/api/extensions/delete', jsonParser, async (request, response) => {
router.post('/delete', jsonParser, async (request, response) => {
if (!request.body.extensionName) {
return response.status(400).send('Bad Request: extensionName is required in the request body.');
}
@@ -218,8 +216,7 @@ function registerEndpoints(app, jsonParser) {
* Discover the extension folders
* If the folder is called third-party, search for subfolders instead
*/
app.get('/api/extensions/discover', jsonParser, function (_, response) {
router.get('/discover', jsonParser, function (_, response) {
// get all folders in the extensions folder, except third-party
const extensions = fs
.readdirSync(DIRECTORIES.extensions)
@@ -243,8 +240,5 @@ function registerEndpoints(app, jsonParser) {
return response.send(extensions);
});
}
module.exports = {
registerEndpoints,
};
module.exports = { router };