Skip to content

Make passing an signal: AbortSignal.timeout to fetch implicitly set timeout: false #16859

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

Open
Jarred-Sumner wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −0
Open

Make passing an signal: AbortSignal.timeout to fetch implicitly set timeout: false #16859

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions src/bun.js/bindings/bindings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5839,6 +5839,12 @@ extern "C" void JSC__JSGlobalObject__queueMicrotaskJob(JSC__JSGlobalObject* arg0
WTFMove(microtaskArgs[3]));
}

extern "C" bool WebCore__AbortSignal__isTimeout(const WebCore__AbortSignal* arg0)
{
const WebCore::AbortSignal* abortSignal = reinterpret_cast<const WebCore::AbortSignal*>(arg0);
return abortSignal->hasActiveTimeoutTimer();
}

extern "C" WebCore::AbortSignal* WebCore__AbortSignal__new(JSC__JSGlobalObject* globalObject)
{
Zig::GlobalObject* thisObject = JSC::jsCast<Zig::GlobalObject*>(globalObject);
Expand Down
5 changes: 5 additions & 0 deletions src/bun.js/bindings/bindings.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2224,6 +2224,11 @@ pub const AbortSignal = extern opaque {
pub const name = "WebCore::AbortSignal";
pub const namespace = "WebCore";

extern fn WebCore__AbortSignal__isTimeout(*const AbortSignal) bool;
pub fn isTimeout(this: *const AbortSignal) bool {
return WebCore__AbortSignal__isTimeout(this);
}

pub fn listen(
this: *AbortSignal,
comptime Context: type,
Expand Down
11 changes: 11 additions & 0 deletions src/bun.js/webcore/response.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3006,6 +3006,17 @@ pub const Fetch = struct {
return JSPromise.rejectedPromiseValue(globalThis, err);
}

// If you do AbortSignal.timeout
// and you don't set `timeout: false`
// you probably meant to use the AbortSignal's timeout instead.
if (!disable_timeout) {
if (signal) |signal_| {
if (signal_.isTimeout()) {
disable_timeout = true;
}
}
}

if (globalThis.hasException()) {
is_error = true;
return .zero;
Expand Down