Skip to content

fix(proxy): missing proxyRes error handler + SSE corruption on error after headers #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
aattaran wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −1
Draft

fix(proxy): missing proxyRes error handler + SSE corruption on error after headers #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion proxy/model-proxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,20 @@ export function startModelProxy({ targetUrl, apiKey, startPort = 3200, backends,
console.log(`[MODEL-PROXY] #${reqId} TTFB ${ttfb}ms (status ${proxyRes.statusCode})`);
}

// Without this, an upstream stream error (connection reset
// mid-response) emits an unhandled 'error' on proxyRes and
// crashes the proxy process.
proxyRes.on('error', (err) => {
const elapsed = ((Date.now() - t0) / 1000).toFixed(1);
console.error(`[MODEL-PROXY] #${reqId} upstream stream error after ${elapsed}s: ${err.message}`);
if (!clientRes.headersSent) {
clientRes.writeHead(502, { 'content-type': 'application/json' });
clientRes.end(JSON.stringify({ error: { message: 'Upstream stream error' } }));
} else {
clientRes.destroy(err);
}
});

const ct = proxyRes.headers['content-type'] || '';
const isSSE = ct.includes('text/event-stream');

Expand Down Expand Up @@ -415,8 +429,14 @@ export function startModelProxy({ targetUrl, apiKey, startPort = 3200, backends,
console.error(`[MODEL-PROXY] #${reqId} ERROR after ${elapsed}s: ${err.message}`);
if (!clientRes.headersSent) {
clientRes.writeHead(502, { 'content-type': 'application/json' });
clientRes.end(JSON.stringify({ error: { message: 'Upstream connection error' } }));
} else {
// Headers already sent (likely mid-SSE) — emitting JSON
// here would inject a non-event into the event-stream and
// break the client parser. Terminate the response so the
// client sees a clean transport error instead.
clientRes.destroy(err);
}
clientRes.end(JSON.stringify({ error: { message: 'Upstream connection error' } }));
});

proxyReq.end(body);
Expand Down