1 files changed, 36 insertions, 16 deletions
diff --git a/ext/web/02_timers.js b/ext/web/02_timers.js
index 559147861..a651df5a5 100644
--- a/ext/web/02_timers.js
+++ b/ext/web/02_timers.js
@@ -2,6 +2,10 @@
 
 import { core, primordials } from "ext:core/mod.js";
 import { op_defer, op_now } from "ext:core/ops";
+import {
+  getAsyncContext,
+  setAsyncContext,
+} from "ext:runtime/01_async_context.js";
 const {
   Uint8Array,
   Uint32Array,
@@ -33,14 +37,16 @@ function checkThis(thisArg) {
  * Call a callback function immediately.
  */
 function setImmediate(callback, ...args) {
-  if (args.length > 0) {
-    const unboundCallback = callback;
-    callback = () => ReflectApply(unboundCallback, globalThis, args);
-  }
-
-  return core.queueImmediate(
-    callback,
-  );
+  const asyncContext = getAsyncContext();
+  return core.queueImmediate(() => {
+    const oldContext = getAsyncContext();
+    try {
+      setAsyncContext(asyncContext);
+      return ReflectApply(callback, globalThis, args);
+    } finally {
+      setAsyncContext(oldContext);
+    }
+  });
 }
 
 /**
@@ -53,10 +59,17 @@ function setTimeout(callback, timeout = 0, ...args) {
     const unboundCallback = webidl.converters.DOMString(callback);
     callback = () => indirectEval(unboundCallback);
   }
-  if (args.length > 0) {
-    const unboundCallback = callback;
-    callback = () => ReflectApply(unboundCallback, globalThis, args);
-  }
+  const unboundCallback = callback;
+  const asyncContext = getAsyncContext();
+  callback = () => {
+    const oldContext = getAsyncContext();
+    try {
+      setAsyncContext(asyncContext);
+      ReflectApply(unboundCallback, globalThis, args);
+    } finally {
+      setAsyncContext(oldContext);
+    }
+  };
   timeout = webidl.converters.long(timeout);
   return core.queueUserTimer(
     core.getTimerDepth() + 1,
@@ -75,10 +88,17 @@ function setInterval(callback, timeout = 0, ...args) {
     const unboundCallback = webidl.converters.DOMString(callback);
     callback = () => indirectEval(unboundCallback);
   }
-  if (args.length > 0) {
-    const unboundCallback = callback;
-    callback = () => ReflectApply(unboundCallback, globalThis, args);
-  }
+  const unboundCallback = callback;
+  const asyncContext = getAsyncContext();
+  callback = () => {
+    const oldContext = getAsyncContext(asyncContext);
+    try {
+      setAsyncContext(asyncContext);
+      ReflectApply(unboundCallback, globalThis, args);
+    } finally {
+      setAsyncContext(oldContext);
+    }
+  };
   timeout = webidl.converters.long(timeout);
   return core.queueUserTimer(
     core.getTimerDepth() + 1,