Prevent fetch response status forwarding

Fixes #3864
This commit is contained in:
Cohee
2025-04-17 13:39:09 +00:00
parent 7b2f1f7c7a
commit dfd78077ec
4 changed files with 7 additions and 7 deletions

View File

@ -250,7 +250,7 @@ async function sendClaudeRequest(request, response) {
if (!generateResponse.ok) { if (!generateResponse.ok) {
const generateResponseText = await generateResponse.text(); const generateResponseText = await generateResponse.text();
console.warn(color.red(`Claude API returned error: ${generateResponse.status} ${generateResponse.statusText}\n${generateResponseText}\n${divider}`)); 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} */ /** @type {any} */
@ -463,7 +463,7 @@ async function sendMakerSuiteRequest(request, response) {
} else { } else {
if (!generateResponse.ok) { if (!generateResponse.ok) {
console.warn(`Google AI Studio API returned error: ${generateResponse.status} ${generateResponse.statusText} ${await generateResponse.text()}`); 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} */ /** @type {any} */

View File

@ -450,7 +450,7 @@ ollama.post('/download', async function (request, response) {
if (!fetchResponse.ok) { if (!fetchResponse.ok) {
console.error('Download error:', fetchResponse.status, fetchResponse.statusText); 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()); console.debug('Ollama pull response:', await fetchResponse.json());
@ -659,14 +659,14 @@ tabby.post('/download', async function (request, response) {
} }
} else { } else {
console.error('API Permission error:', permissionResponse.status, permissionResponse.statusText); 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); const fetchResponse = await fetch(`${baseUrl}/v1/download`, args);
if (!fetchResponse.ok) { if (!fetchResponse.ok) {
console.error('Download error:', fetchResponse.status, fetchResponse.statusText); 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 }); return response.send({ ok: true });

View File

@ -45,7 +45,7 @@ router.post('/caption-image', async (request, response) => {
if (!result.ok) { if (!result.ok) {
const error = await result.json(); const error = await result.json();
console.error(`Google AI Studio API returned error: ${result.status} ${result.statusText}`, error); 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} */ /** @type {any} */

View File

@ -270,7 +270,7 @@ router.post('/generate', async function (req, res) {
// ignore // ignore
} }
return res.status(response.status).send({ error: { message } }); return res.status(500).send({ error: { message } });
} }
/** @type {any} */ /** @type {any} */