Skip to content
Merged
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
21 changes: 13 additions & 8 deletions langchain-core/src/runnables/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -931,8 +931,10 @@ export abstract class Runnable<
// add each chunk to the output stream
const outerThis = this;
async function consumeRunnableStream() {
let signal;
let listener: (() => void) | null = null;

try {
let signal;
if (options?.signal) {
if ("any" in AbortSignal) {
// Use native AbortSignal.any() if available (Node 19+)
Expand All @@ -945,13 +947,12 @@ export abstract class Runnable<
// Fallback for Node 18 and below - just use the provided signal
signal = options.signal;
// Ensure we still abort our controller when the parent signal aborts
options.signal.addEventListener(
"abort",
() => {
abortController.abort();
},
{ once: true }
);

listener = () => {
abortController.abort();
};

options.signal.addEventListener("abort", listener, { once: true });
}
} else {
signal = abortController.signal;
Expand All @@ -971,6 +972,10 @@ export abstract class Runnable<
}
} finally {
await eventStreamer.finish();

if (signal && listener) {
signal.removeEventListener("abort", listener);
}
}
}
const runnableStreamConsumePromise = consumeRunnableStream();
Expand Down
Loading