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

Fix Novel error handling

Browse Source
This commit is contained in:
Cohee
2023-08-05 21:15:49 +03:00
parent ef1f6b3143
commit 74b973c571
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
server.js
View File

@ -1791,13 +1791,12 @@ app.post("/getstatus_novelai", jsonParser, function (request, response_getstatus
const api_key_novel = readSecret(SECRET_KEYS.NOVEL); const api_key_novel = readSecret(SECRET_KEYS.NOVEL);
if (!api_key_novel) { if (!api_key_novel) {
return response_generate_novel.sendStatus(401); return response_getstatus_novel.sendStatus(401);
} }
var data = {}; var data = {};
var args = { var args = {
data: data, data: data,
headers: { "Content-Type": "application/json", "Authorization": "Bearer " + api_key_novel } headers: { "Content-Type": "application/json", "Authorization": "Bearer " + api_key_novel }
}; };
client.get(api_novelai + "/user/subscription", args, function (data, response) { client.get(api_novelai + "/user/subscription", args, function (data, response) {
@ -1805,17 +1804,15 @@ app.post("/getstatus_novelai", jsonParser, function (request, response_getstatus
//console.log(data); //console.log(data);
response_getstatus_novel.send(data);//data); response_getstatus_novel.send(data);//data);
} }
if (response.statusCode == 401) { else {
console.log('Access Token is incorrect.'); if (response.statusCode == 401) {
response_getstatus_novel.send({ error: true }); console.log('Access Token is incorrect.');
} }
if (response.statusCode == 500 || response.statusCode == 501 || response.statusCode == 501 || response.statusCode == 503 || response.statusCode == 507) {
console.log(data); console.log(data);
response_getstatus_novel.send({ error: true }); response_getstatus_novel.send({ error: true });
} }
}).on('error', function () { }).on('error', function () {
//console.log('');
//console.log('something went wrong on the request', err.request.options);
response_getstatus_novel.send({ error: true }); response_getstatus_novel.send({ error: true });
}); });
}); });
@ -1901,8 +1898,19 @@ app.post("/generate_novelai", jsonParser, async function (request, response_gene
}); });
} else { } else {
if (!response.ok) { if (!response.ok) {
console.log(`Novel API returned error: ${response.status} ${response.statusText} ${await response.text()}`); const text = await response.text();
return response.status(response.status).send({ error: true }); let message = text;
console.log(`Novel API returned error: ${response.status} ${response.statusText} ${text}`);
try {
const data = JSON.parse(text);
message = data.message;
}
catch {
// ignore
}
return response_generate_novel.status(response.status).send({ error: { message } });
} }
const data = await response.json(); const data = await response.json();