From dfd78077eccb5e70f865bc54cf74c12b5fd17b8c Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Thu, 17 Apr 2025 13:39:09 +0000
Subject: [PATCH] Prevent fetch response status forwarding Fixes #3864

---
 src/endpoints/backends/chat-completions.js | 4 ++--
 src/endpoints/backends/text-completions.js | 6 +++---
 src/endpoints/google.js                    | 2 +-
 src/endpoints/novelai.js                   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/endpoints/backends/chat-completions.js b/src/endpoints/backends/chat-completions.js
index dc0fd0f64..53c249e26 100644
--- a/src/endpoints/backends/chat-completions.js
+++ b/src/endpoints/backends/chat-completions.js
@@ -250,7 +250,7 @@ async function sendClaudeRequest(request, response) {
             if (!generateResponse.ok) {
                 const generateResponseText = await generateResponse.text();
                 console.warn(color.red(`Claude API returned error: ${generateResponse.status} ${generateResponse.statusText}\n${generateResponseText}\n${divider}`));
-                return response.status(generateResponse.status).send({ error: true });
+                return response.status(500).send({ error: true });
             }
 
             /** @type {any} */
@@ -463,7 +463,7 @@ async function sendMakerSuiteRequest(request, response) {
         } else {
             if (!generateResponse.ok) {
                 console.warn(`Google AI Studio API returned error: ${generateResponse.status} ${generateResponse.statusText} ${await generateResponse.text()}`);
-                return response.status(generateResponse.status).send({ error: true });
+                return response.status(500).send({ error: true });
             }
 
             /** @type {any} */
diff --git a/src/endpoints/backends/text-completions.js b/src/endpoints/backends/text-completions.js
index 290142e5e..cdd670454 100644
--- a/src/endpoints/backends/text-completions.js
+++ b/src/endpoints/backends/text-completions.js
@@ -450,7 +450,7 @@ ollama.post('/download', async function (request, response) {
 
         if (!fetchResponse.ok) {
             console.error('Download error:', fetchResponse.status, fetchResponse.statusText);
-            return response.status(fetchResponse.status).send({ error: true });
+            return response.status(500).send({ error: true });
         }
 
         console.debug('Ollama pull response:', await fetchResponse.json());
@@ -659,14 +659,14 @@ tabby.post('/download', async function (request, response) {
             }
         } else {
             console.error('API Permission error:', permissionResponse.status, permissionResponse.statusText);
-            return response.status(permissionResponse.status).send({ error: true });
+            return response.status(500).send({ error: true });
         }
 
         const fetchResponse = await fetch(`${baseUrl}/v1/download`, args);
 
         if (!fetchResponse.ok) {
             console.error('Download error:', fetchResponse.status, fetchResponse.statusText);
-            return response.status(fetchResponse.status).send({ error: true });
+            return response.status(500).send({ error: true });
         }
 
         return response.send({ ok: true });
diff --git a/src/endpoints/google.js b/src/endpoints/google.js
index fcd253417..fa8a8b5f8 100644
--- a/src/endpoints/google.js
+++ b/src/endpoints/google.js
@@ -45,7 +45,7 @@ router.post('/caption-image', async (request, response) => {
         if (!result.ok) {
             const error = await result.json();
             console.error(`Google AI Studio API returned error: ${result.status} ${result.statusText}`, error);
-            return response.status(result.status).send({ error: true });
+            return response.status(500).send({ error: true });
         }
 
         /** @type {any} */
diff --git a/src/endpoints/novelai.js b/src/endpoints/novelai.js
index e007d8e5c..bae2c9032 100644
--- a/src/endpoints/novelai.js
+++ b/src/endpoints/novelai.js
@@ -270,7 +270,7 @@ router.post('/generate', async function (req, res) {
                     // ignore
                 }
 
-                return res.status(response.status).send({ error: { message } });
+                return res.status(500).send({ error: { message } });
             }
 
             /** @type {any} */