PR fixes

public/scripts/extensions/quick-reply/src/QuickReplySet.js

@@ -1,6 +1,7 @@
 import { getRequestHeaders, substituteParams } from '../../../../script.js';
 import { Popup, POPUP_RESULT, POPUP_TYPE } from '../../../popup.js';
 import { executeSlashCommandsOnChatInput, executeSlashCommandsWithOptions } from '../../../slash-commands.js';
+import { SlashCommandScope } from '../../../slash-commands/SlashCommandScope.js';
 import { SlashCommandParser } from '../../../slash-commands/SlashCommandParser.js';
 import { debounceAsync, warn } from '../index.js';
 import { QuickReply } from './QuickReply.js';

public/scripts/openai.js

@@ -1443,9 +1443,7 @@ async function sendWindowAIRequest(messages, signal, stream) {
     }
 
     const onStreamResult = (res, err) => {
-        if (err) {
+        if (err) return;
-            return;
-        }
 
         const thisContent = res?.message?.content;
 

src/endpoints/assets.js

@@ -224,9 +224,7 @@ router.post('/download', jsonParser, async (request, response) => {
         // Delete if previous download failed
         if (fs.existsSync(temp_path)) {
             fs.unlink(temp_path, (err) => {
-                if (err) {
+                if (err) throw err;
-                    throw err;
-                }
             });
         }
         const fileStream = fs.createWriteStream(destination, { flags: 'wx' });
@@ -288,9 +286,7 @@ router.post('/delete', jsonParser, async (request, response) => {
         // Delete if previous download failed
         if (fs.existsSync(file_path)) {
             fs.unlink(file_path, (err) => {
-                if (err) {
+                if (err) throw err;
-                    throw err;
-                }
             });
             console.info('Asset deleted.');
         }
@@ -317,9 +313,7 @@ router.post('/delete', jsonParser, async (request, response) => {
  * @returns {void}
  */
 router.post('/character', jsonParser, async (request, response) => {
-    if (request.query.name === undefined) {
+    if (request.query.name === undefined) return response.sendStatus(400);
-        return response.sendStatus(400);
-    }
 
     // For backwards compatibility, don't reject invalid character names, just sanitize them
     const name = sanitize(request.query.name.toString());
@@ -327,11 +321,9 @@ router.post('/character', jsonParser, async (request, response) => {
 
     // Check category
     let category = null;
-    for (let i of VALID_CATEGORIES) {
+    for (let i of VALID_CATEGORIES)
-        if (i == inputCategory) {
+        if (i == inputCategory)
             category = i;
-        }
-    }
 
     if (category === null) {
         console.error('Bad request: unsupported asset category.');
@@ -348,9 +340,7 @@ router.post('/character', jsonParser, async (request, response) => {
             if (category == 'live2d') {
                 const folders = fs.readdirSync(folderPath, { withFileTypes: true });
                 for (const folderInfo of folders) {
-                    if (!folderInfo.isDirectory()) {
+                    if (!folderInfo.isDirectory()) continue;
-                        continue;
-                    }
 
                     const modelFolder = folderInfo.name;
                     const live2dModelPath = path.join(folderPath, modelFolder);

src/endpoints/backends/chat-completions.js

@@ -418,9 +418,7 @@ async function sendMakerSuiteRequest(request, response) {
  * @param {express.Response} response Express response
  */
 async function sendAI21Request(request, response) {
-    if (!request.body) {
+    if (!request.body) return response.sendStatus(400);
-        return response.sendStatus(400);
-    }
 
     const controller = new AbortController();
     console.debug(request.body.messages);
@@ -848,7 +846,8 @@ router.post('/status', jsonParser, async function (request, response_getstatus_o
 });
 
 router.post('/bias', jsonParser, async function (request, response) {
-    if (!request.body || !Array.isArray(request.body)) return response.sendStatus(400);
+    if (!request.body || !Array.isArray(request.body))
+        return response.sendStatus(400);
 
     try {
         const result = {};

src/endpoints/backends/kobold.js

@@ -202,8 +202,7 @@ router.post('/transcribe-audio', urlencodedParser, async function (request, resp
             return response.sendStatus(400);
         }
 
-        console.info('Transcribing audio with KoboldCpp');
+        console.debug('Transcribing audio with KoboldCpp', server);
-        console.debug(server);
 
         const fileBase64 = fs.readFileSync(request.file.path).toString('base64');
         fs.rmSync(request.file.path);

src/endpoints/backends/text-completions.js

@@ -101,8 +101,7 @@ router.post('/status', jsonParser, async function (request, response) {
             request.body.api_server = request.body.api_server.replace('localhost', '127.0.0.1');
         }
 
-        console.info('Trying to connect to API');
+        console.debug('Trying to connect to API', request.body);
-        console.debug(request.body);
         const baseUrl = trimV1(request.body.api_server);
 
         const args = {
@@ -229,9 +228,7 @@ router.post('/status', jsonParser, async function (request, response) {
 });
 
 router.post('/props', jsonParser, async function (request, response) {
-    if (!request.body.api_server) {
+    if (!request.body.api_server) return response.sendStatus(400);
-        return response.sendStatus(400);
-    }
 
     try {
         const baseUrl = trimV1(request.body.api_server);
@@ -265,9 +262,7 @@ router.post('/props', jsonParser, async function (request, response) {
 });
 
 router.post('/generate', jsonParser, async function (request, response) {
-    if (!request.body) {
+    if (!request.body) return response.sendStatus(400);
-        return response.sendStatus(400);
-    }
 
     try {
         if (request.body.api_server.indexOf('localhost') !== -1) {
@@ -435,9 +430,7 @@ const ollama = express.Router();
 
 ollama.post('/download', jsonParser, async function (request, response) {
     try {
-        if (!request.body.name || !request.body.api_server) {
+        if (!request.body.name || !request.body.api_server) return response.sendStatus(400);
-            return response.sendStatus(400);
-        }
 
         const name = request.body.name;
         const url = String(request.body.api_server).replace(/\/$/, '');

src/endpoints/caption.js

@@ -20,7 +20,7 @@ router.post('/', jsonParser, async (req, res) => {
         const pipe = await getPipeline(TASK);
         const result = await pipe(rawImage);
         const text = result[0].generated_text;
-        console.debug('Image caption:', text);
+        console.info('Image caption:', text);
 
         return res.json({ caption: text });
     } catch (error) {

src/endpoints/google.js

@@ -52,7 +52,7 @@ router.post('/caption-image', jsonParser, async (request, response) => {
 
         /** @type {any} */
         const data = await result.json();
-        console.debug('Multimodal captioning response', data);
+        console.info('Multimodal captioning response', data);
 
         const candidates = data?.candidates;
         if (!candidates) {

src/endpoints/horde.js

@@ -364,12 +364,12 @@ router.post('/generate-image', jsonParser, async (request, response) => {
             return response.sendStatus(400);
         }
 
-        console.debug('Horde image generation request:', generation);
+        console.info('Horde image generation request:', generation);
 
         const controller = new AbortController();
         request.socket.removeAllListeners('close');
         request.socket.on('close', function () {
-            console.info('Horde image generation request aborted.');
+            console.warn('Horde image generation request aborted.');
             controller.abort();
             if (generation.id) ai_horde.deleteImageGenerationRequest(generation.id);
         });

src/endpoints/novelai.js

@@ -276,7 +276,7 @@ router.post('/generate', jsonParser, async function (req, res) {
 
             /** @type {any} */
             const data = await response.json();
-            console.debug('NovelAI Output', data?.output);
+            console.info('NovelAI Output', data?.output);
             return res.send(data);
         }
     } catch (error) {

src/endpoints/openai.js

@@ -164,7 +164,7 @@ router.post('/caption-image', jsonParser, async (request, response) => {
 
         /** @type {any} */
         const data = await result.json();
-        console.debug('Multimodal captioning response', data);
+        console.info('Multimodal captioning response', data);
         const caption = data?.choices[0]?.message?.content;
 
         if (!caption) {

src/endpoints/speech.js

@@ -43,8 +43,8 @@ router.post('/recognize', jsonParser, async (req, res) => {
         const start = performance.now();
         const result = await pipe(wav, { language: lang || null, task: 'transcribe' });
         const end = performance.now();
-        console.debug(`Execution duration: ${(end - start) / 1000} seconds`);
+        console.info(`Execution duration: ${(end - start) / 1000} seconds`);
-        console.debug('Transcribed audio:', result.text);
+        console.info('Transcribed audio:', result.text);
 
         return res.json({ text: result.text });
     } catch (error) {

src/endpoints/translate.js

@@ -35,7 +35,7 @@ function decodeBuffer(buffer) {
     try {
         return iconv.decode(Buffer.from(buffer), 'utf-8');
     } catch (error) {
-        console.warn('Failed to decode buffer:', error);
+        console.error('Failed to decode buffer:', error);
         return Buffer.from(buffer).toString('utf-8');
     }
 }

src/util.js

@@ -165,9 +165,7 @@ export function formatBytes(bytes) {
  */
 export async function extractFileFromZipBuffer(archiveBuffer, fileExtension) {
     return await new Promise((resolve, reject) => yauzl.fromBuffer(Buffer.from(archiveBuffer), { lazyEntries: true }, (err, zipfile) => {
-        if (err) {
+        if (err) reject(err);
-            reject(err);
-        }
 
         zipfile.readEntry();
         zipfile.on('entry', (entry) => {
@@ -469,9 +467,8 @@ export function forwardFetchResponse(from, to) {
         from.body.pipe(to);
 
         to.socket.on('close', function () {
-            if (from.body instanceof Readable) {
+            if (from.body instanceof Readable) from.body.destroy(); // Close the remote stream
-                from.body.destroy(); // Close the remote stream
+
-            }
             to.end(); // End the Express response
         });