Archive/screentinker
1
0
Fork 0
mirror of https://github.com/screentinker/screentinker.git synced 2026-08-16 23:33:10 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: handle empty API responses in frontend and return JSON on server crash

Browse source
This commit is contained in:
xadyz1 2026-07-26 19:53:23 +01:00
parent 16fa1701d8
commit f5ed7ae491
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
frontend/js/api.js
View file

@ -99,9 +99,15 @@ export const api = {
}
xhr.onload = () => {
if (xhr.status >= 200 && xhr.status < 300) {
resolve(JSON.parse(xhr.responseText));
try {
resolve(JSON.parse(xhr.responseText));
} catch {
resolve({ ok: true }); // handle empty/non-JSON 2xx response
}
} else {
reject(new Error('Upload failed'));
let msg = 'Upload failed';
try { msg = JSON.parse(xhr.responseText).error || msg; } catch {}
reject(new Error(msg));
}
};
xhr.onerror = () => reject(new Error('Upload failed'));

9
server/server.js
View file

@ -965,6 +965,15 @@ app.get('/download/apk', (req, res) => {
res.sendFile(apk.path, (err) => { if (err) release(); });
});
// Global API error handler — prevents Express from sending HTML errors on API routes
app.use((err, req, res, next) => {
console.error('[Unhandled Express Error]', err);
if (req.path.startsWith('/api/')) {
return res.status(500).json({ error: 'Internal server error' });
}
next(err);
});
// SPA fallback for app routes. Unmatched /api/ paths return 404 so misrouted
// clients fail fast instead of hanging until Cloudflare's 15s upstream timeout.
app.get('*', (req, res) => {