Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 14 additions & 1 deletion open-sse/handlers/chatCore.js
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,20 @@ export async function handleChatCore({ body, modelInfo, credentials, log, onCred
log?.debug?.("REQUEST", `${provider.toUpperCase()} | ${model} | ${msgCount} msgs`);

// Create stream controller for disconnect detection
const streamController = createStreamController({ onDisconnect, log, provider, model });
const streamController = createStreamController({
onDisconnect: (reason) => {
// Track request finished (disconnected)
trackPendingRequest(model, provider, connectionId, false);
if (onDisconnect) onDisconnect(reason);
},
onError: (error) => {
// Track request finished (error/zombie)
trackPendingRequest(model, provider, connectionId, false);
},
log,
provider,
model
});

// Execute request using executor (handles URL building, headers, fallback, transform)
let providerResponse;
Expand Down
6 changes: 5 additions & 1 deletion open-sse/utils/streamHandler.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function getTimeString() {
* @param {string} options.provider - Provider name
* @param {string} options.model - Model name
*/
export function createStreamController({ onDisconnect, log, provider, model } = {}) {
export function createStreamController({ onDisconnect, onError, log, provider, model } = {}) {
const abortController = new AbortController();
const startTime = Date.now();
let disconnected = false;
Expand Down Expand Up @@ -61,6 +61,9 @@ export function createStreamController({ onDisconnect, log, provider, model } =

// Call on error
handleError: (error) => {
if (disconnected) return;
disconnected = true;

if (abortTimeout) {
clearTimeout(abortTimeout);
abortTimeout = null;
Expand All @@ -72,6 +75,7 @@ export function createStreamController({ onDisconnect, log, provider, model } =
}

logStream(`error: ${error.message}`);
onError?.(error);
},

abort: () => abortController.abort()
Expand Down