fix(ext/web): fix AbortSignal.timeout() leak (#23842)

Fixes #20663. --------- Co-authored-by: Asher Gomez <[email protected]> Co-authored-by: Divy Srivastava <[email protected]>
denoland · Jun 18, 2024 · 5289c69 · 5289c69
1 parent cba212b
commit 5289c69
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -368,3 368,6 @@ opt-level = 3
 opt-level = 3
 [profile.release.package.base64-simd]
 opt-level = 3
 
 [patch.crates-io]
 deno_core = { git = "https://github.com/denoland/deno_core" }
diff --git a/ext/web/03_abort_signal.js b/ext/web/03_abort_signal.js
@@ -3,7 3,7 @@
 // @ts-check
 /// <reference path="../../core/internal.d.ts" />
 
-import { primordials } from "ext:core/mod.js";
 import { core, primordials } from "ext:core/mod.js";
 const {
  ArrayPrototypeEvery,
  ArrayPrototypePush,
@@ -33,7 33,7 @@ import {
  listenerCount,
  setIsTrusted,
 } from "./02_event.js";
-import { refTimer, setTimeout, unrefTimer } from "./02_timers.js";
 import { clearTimeout, refTimer, unrefTimer } from "./02_timers.js";
 
 // Since WeakSet is not a iterable, WeakRefSet class is provided to store and
 // iterate objects.
@@ -118,14 118,17 @@ class AbortSignal extends EventTarget {
  );
 
  const signal = new AbortSignal(illegalConstructorKey);
- signal[timerId] = setTimeout(
  signal[timerId] = core.queueSystemTimer(
  undefined,
  false,
  millis,
  () => {
  clearTimeout(signal[timerId]);
  signal[timerId] = null;
  signal[signalAbort](
  new DOMException("Signal timed out.", "TimeoutError"),
  );
  },
- millis,
  );
  unrefTimer(signal[timerId]);
  return signal;

diff --git a/tests/unit/timers_test.ts b/tests/unit/timers_test.ts
@@ -767,3 767,11 @@ Deno.test({
  assert(result >= 1000);
  },
 });
 
 // Regression test for https://github.com/denoland/deno/issues/20663
 Deno.test({
  name: "regression for #20663",
  fn: () => {
  AbortSignal.timeout(2000);
  },
 });