admin/Moltbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: use structural typing instead of instanceof for AbortSignal check

Browse Source 
Address P1 review feedback from Greptile: instanceof AbortSignal may be
unreliable across different realms (VM, iframe, etc.) where the AbortSignal
constructor may differ. Use structural typing (checking for aborted property
and addEventListener method) for more robust cross-realm compatibility.
This commit is contained in:
Elarwei
2026-02-03 01:12:48 +08:00
committed by Shakker
parent a63ec41a7b
commit 88e29c728c
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/agents/pi-tools.abort.ts
View File

@@ -6,6 +6,19 @@ function throwAbortError(): never {
throw err;
}
/**
* Checks if an object is a valid AbortSignal using structural typing.
* This is more reliable than `instanceof` across different realms (VM, iframe, etc.)
* where the AbortSignal constructor may differ.
*/
function isAbortSignal(obj: unknown): obj is AbortSignal {
if (!obj || typeof obj !== "object") {
return false;
}
const signal = obj as Record<string, unknown>;
return typeof signal.aborted === "boolean" && typeof signal.addEventListener === "function";
}
function combineAbortSignals(a?: AbortSignal, b?: AbortSignal): AbortSignal | undefined {
if (!a && !b) {
return undefined;
@@ -22,11 +35,7 @@ function combineAbortSignals(a?: AbortSignal, b?: AbortSignal): AbortSignal | un
if (b?.aborted) {
return b;
}
if (
typeof AbortSignal.any === "function" &&
a instanceof AbortSignal &&
b instanceof AbortSignal
) {
if (typeof AbortSignal.any === "function" && isAbortSignal(a) && isAbortSignal(b)) {
return AbortSignal.any([a, b]);
}