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

more poe errorlog fixes

Browse Source
This commit is contained in:
RossAscends
2023-07-10 16:14:49 +09:00
parent 210abe452c
commit 3ade04ed68
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/poe-client.js
View File

@@ -267,9 +267,9 @@ function generate_payload(query, variables) {
async function request_with_retries(method, attempts = 10) { async function request_with_retries(method, attempts = 10) {
for (let i = 0; i < attempts; i++) { for (let i = 0; i < attempts; i++) {
var ResponseHasFreeSocket = false;
try {
try {
var ResponseHasFreeSocket = false;
const response = await method(); const response = await method();
if (response.status === 200) { if (response.status === 200) {
@@ -287,7 +287,8 @@ async function request_with_retries(method, attempts = 10) {
if (typeof value === 'object' && value !== null) { if (typeof value === 'object' && value !== null) {
return Array.isArray(value) ? value : { ...value }; return Array.isArray(value) ? value : { ...value };
} }
if (key === "freeSockets" && value.length) {
if (key === "freeSockets" && key.length) {
ResponseHasFreeSocket = true; ResponseHasFreeSocket = true;
} }
if (key === "Cookie" || key === "set-cookie" || key === "Set-Cookie") { if (key === "Cookie" || key === "set-cookie" || key === "Set-Cookie") {
@@ -324,6 +325,7 @@ async function request_with_retries(method, attempts = 10) {
//this never actually gets seen as any non-200 response jumps to the catch code //this never actually gets seen as any non-200 response jumps to the catch code
logger.warn(`Server returned a status code of ${response.status} while downloading. Retrying (${i + 1}/${attempts})...`); logger.warn(`Server returned a status code of ${response.status} while downloading. Retrying (${i + 1}/${attempts})...`);
} catch (err) { } catch (err) {
var ErrorHasFreeSocket = false;
const circularReference = new Set(); const circularReference = new Set();
const errString = JSON.stringify(err, function (key, value) { const errString = JSON.stringify(err, function (key, value) {
if (key === 'data' && Array.isArray(value)) { if (key === 'data' && Array.isArray(value)) {
@@ -334,17 +336,33 @@ async function request_with_retries(method, attempts = 10) {
} }
circularReference.add(value); circularReference.add(value);
} }
if (key === "Cookie") { if (key === "Cookie" || key === "set-cookie" || key === "Set-Cookie") {
return "[COOKIE REDACTED BY ST CODE]" return "[PB COOKIE DATA REDACTED BY ST CODE]"
} }
if (key === "freeSockets" && value.length) { if (typeof value === 'string' && value.includes('p-b=')) {
ResponseHasFreeSocket = true; const startIndex = value.indexOf('p-b=');
const endIndex = value.indexOf(';', startIndex);
if (endIndex === -1) {
return value.substring(0, startIndex) + '[P-B COOKIE REDACTED BY ST]';
}
return value.substring(0, startIndex) + '[P-B COOKIE REDACTED BY ST]' + value.substring(endIndex);
}
if (typeof value === 'string' && value.includes('__cf_bm=')) {
const startIndex = value.indexOf('__cf_bm=');
const endIndex = value.indexOf(';', startIndex);
if (endIndex === -1) {
return value.substring(0, startIndex) + '[Cloudflare COOKIE REDACTED BY ST]';
}
return value.substring(0, startIndex) + '[CloudFlare COOKIE REDACTED BY ST]' + value.substring(endIndex);
}
if (key === "freeSockets" && key.length) {
ErrorHasFreeSocket = true;
} }
return value; return value;
}, 4); }, 4);
fs.writeFile('poe-error.log', errString, 'utf-8', (err) => { fs.writeFile('poe-error.log', errString, 'utf-8', (err) => {
if (err) throw err; if (err) throw err;
console.log(`Error saved to poe-error.log Free socket?${ResponseHasFreeSocket}`); console.log(`Error saved to poe-error.log Free socket? ${ErrorHasFreeSocket}`);
}); });
await delay(100) await delay(100)
} }