Skip to content

Fix AsyncLocalStorage context loss in thenables returned from async functions #34277

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

Closed
robobun wants to merge 2 commits into from
+25 −1
Closed

Fix AsyncLocalStorage context loss in thenables returned from async functions #34277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c08806
Fix AsyncLocalStorage context loss in thenables returned from async f…
robobun Jul 15, 2026
cf8c0d4
ci: retrigger
robobun Jul 15, 2026
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
2 changes: 1 addition & 1 deletion scripts/build/deps/webkit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// -lto variants built with ThinLTO (per-module summaries for cross-language
// importing), and the Windows ICU data table filtered + per-item zstd
// compressed (lazily decompressed via bun_icu_decompress.cpp).
export const WEBKIT_VERSION = "4895f45dfbd0d1226c4d41799887bc0ecb9f341b";
export const WEBKIT_VERSION = "autobuild-preview-pr-295-ff8154f3";

/**
* WebKit (JavaScriptCore) — the JS engine.
Expand Down
24 changes: 24 additions & 0 deletions test/js/node/async_hooks/async-local-storage-thenable.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,30 @@ test("Returning a thenable in an async function", async done => {
});
});

// https://github.com/oven-sh/bun/issues/34266
test("Returning a thenable in an async function after an await", async done => {
const { mustCall } = createCallCheckCtx(done);
const then: Function = mustCall(cb => {
assert.strictEqual(store.getStore(), data);
process.nextTick(cb);
}, 1);

function thenable() {
return {
get then() {
assert.strictEqual(store.getStore(), data);
return then;
},
};
}

await store.run(data, async () => {
await null;
assert.strictEqual(store.getStore(), data);
return thenable();
});
});

test("Resolving a thenable", async done => {
const { mustCall } = createCallCheckCtx(done);
const then: Function = mustCall(cb => {
Expand Down
Loading