forked from evanp/inference-coop-copilot
fix: abort in-flight chat requests on cancellation
Cancellation was only checked at POST time; once the SSE stream was open the reader loop never looked at the token again, so a stopped chat kept generating server-side (and billing) until the response ended. Wire an AbortController to token.onCancellationRequested, pass its signal to fetch, and check token.isCancellationRequested at the top of the reader loop so the connection closes as soon as the user stops the request. AbortError is swallowed (a stop is not a failure); real HTTP errors still surface, and the cancellation listener is disposed in a finally.
This commit is contained in:
1 parent
e9a060af0f
commit
8f1d71d913
1 file changed
+34
-1
+34
-1
@@ -109,6 +109,19 @@ export function activate(context: vscode.ExtensionContext) {
|
||||
body.tool_choice = "auto";
|
||||
}
|
||||
|
||||
if (token.isCancellationRequested) {
|
||||
out.appendLine(" request cancelled before it started");
|
||||
return;
|
||||
}
|
||||
|
||||
// Abort the request as soon as the user cancels, so a cancelled chat
|
||||
// stops generating (and stops billing) server-side.
|
||||
const abort = new AbortController();
|
||||
const cancelSubscription = token.onCancellationRequested(() =>
|
||||
abort.abort(),
|
||||
);
|
||||
|
||||
try {
|
||||
const res = await fetch(`${BASE_URL}/chat/completions`, {
|
||||
method: "POST",
|
||||
headers: {
|
||||
@@ -116,7 +129,7 @@ export function activate(context: vscode.ExtensionContext) {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify(body),
|
||||
signal: token.isCancellationRequested ? AbortSignal.abort() : undefined,
|
||||
signal: abort.signal,
|
||||
});
|
||||
out.appendLine(` /chat/completions status: ${res.status}`);
|
||||
if (!res.ok || !res.body) {
|
||||
@@ -157,6 +170,11 @@ export function activate(context: vscode.ExtensionContext) {
|
||||
};
|
||||
|
||||
while (true) {
|
||||
if (token.isCancellationRequested) {
|
||||
out.appendLine(" cancelled mid-stream; aborting request");
|
||||
abort.abort(); // close the connection so the gateway stops generating
|
||||
return;
|
||||
}
|
||||
const { done, value } = await reader.read();
|
||||
if (done) {
|
||||
break;
|
||||
@@ -221,6 +239,21 @@ export function activate(context: vscode.ExtensionContext) {
|
||||
flushTools();
|
||||
}
|
||||
out.appendLine(` stream ended, ${textChunks} text chunks`);
|
||||
} catch (e) {
|
||||
// A cancellation aborts fetch (before headers) or the pending stream
|
||||
// read (mid-response) - both surface as AbortError. That is the user
|
||||
// pressing stop, not a failure: stop quietly instead of erroring.
|
||||
if (
|
||||
token.isCancellationRequested ||
|
||||
(e instanceof Error && e.name === "AbortError")
|
||||
) {
|
||||
out.appendLine(" stream aborted after cancellation");
|
||||
return;
|
||||
}
|
||||
throw e;
|
||||
} finally {
|
||||
cancelSubscription.dispose();
|
||||
}
|
||||
},
|
||||
|
||||
async provideTokenCount() {
|
||||
|
||||
Reference in new issue
Block a user