From 9290322052a929cb8c68770cfee452cee3468159 Mon Sep 17 00:00:00 2001
From: Matteo Collina <hello@matteocollina.com>
Date: Tue, 9 Jun 2026 13:25:09 +0000
Subject: [PATCH] fix: keep idle validation on global timers

Signed-off-by: Matteo Collina <hello@matteocollina.com>
---
 lib/dispatcher/client-h1.js |  5 ++---
 test/interceptors/cache.js  | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/lib/dispatcher/client-h1.js b/lib/dispatcher/client-h1.js
index 88bf134e98d..dfedeb49c7b 100644
--- a/lib/dispatcher/client-h1.js
+++ b/lib/dispatcher/client-h1.js
@@ -3,7 +3,6 @@
 /* global WebAssembly */
 
 const assert = require('node:assert')
-const { setTimeout: setTimeoutNative, clearTimeout: clearTimeoutNative } = require('node:timers')
 const util = require('../core/util.js')
 const { channels } = require('../core/diagnostics.js')
 const timers = require('../util/timers.js')
@@ -1028,7 +1027,7 @@ function onSocketClose () {
 
 function clearIdleSocketValidation (socket) {
   if (socket[kIdleSocketValidationTimeout]) {
-    clearTimeoutNative(socket[kIdleSocketValidationTimeout])
+    clearTimeout(socket[kIdleSocketValidationTimeout])
     socket[kIdleSocketValidationTimeout] = null
   }
 
@@ -1037,7 +1036,7 @@ function clearIdleSocketValidation (socket) {
 
 function scheduleIdleSocketValidation (client, socket) {
   socket[kIdleSocketValidation] = 1
-  socket[kIdleSocketValidationTimeout] = setTimeoutNative(() => {
+  socket[kIdleSocketValidationTimeout] = setTimeout(() => {
     socket[kIdleSocketValidationTimeout] = null
     socket[kIdleSocketValidation] = 2
 
diff --git a/test/interceptors/cache.js b/test/interceptors/cache.js
index 65e0f879751..17fb078ac87 100644
--- a/test/interceptors/cache.js
+++ b/test/interceptors/cache.js
@@ -172,7 +172,7 @@ describe('Cache Interceptor', () => {
 
   test('expires caching', async () => {
     const clock = FakeTimers.install({
-      shouldClearNativeTimers: true
+      toFake: ['Date']
     })
 
     let requestsToOrigin = 0
@@ -249,7 +249,7 @@ describe('Cache Interceptor', () => {
 
   test('expires caching with Etag', async () => {
     const clock = FakeTimers.install({
-      shouldClearNativeTimers: true
+      toFake: ['Date']
     })
 
     let requestsToOrigin = 0
@@ -327,7 +327,7 @@ describe('Cache Interceptor', () => {
 
   test('max-age caching', async () => {
     const clock = FakeTimers.install({
-      shouldClearNativeTimers: true
+      toFake: ['Date']
     })
 
     let requestsToOrigin = 0
@@ -391,7 +391,7 @@ describe('Cache Interceptor', () => {
 
   test('vary headers are present in revalidation request', async () => {
     const clock = FakeTimers.install({
-      shouldClearNativeTimers: true
+      toFake: ['Date']
     })
 
     let requestsToOrigin = 0
@@ -670,7 +670,7 @@ describe('Cache Interceptor', () => {
 
   test('stale-if-error (response)', async () => {
     const clock = FakeTimers.install({
-      shouldClearNativeTimers: true
+      toFake: ['Date']
     })
 
     let requestsToOrigin = 0
@@ -752,7 +752,7 @@ describe('Cache Interceptor', () => {
   describe('Client-side directives', () => {
     test('max-age', async () => {
       const clock = FakeTimers.install({
-        shouldClearNativeTimers: true
+        toFake: ['Date']
       })
 
       let requestsToOrigin = 0
@@ -813,7 +813,7 @@ describe('Cache Interceptor', () => {
 
     test('max-stale', async () => {
       const clock = FakeTimers.install({
-        shouldClearNativeTimers: true
+        toFake: ['Date']
       })
 
       let requestsToOrigin = 0
@@ -886,7 +886,7 @@ describe('Cache Interceptor', () => {
 
     test('min-fresh', async () => {
       const clock = FakeTimers.install({
-        shouldClearNativeTimers: true
+        toFake: ['Date']
       })
 
       let requestsToOrigin = 0
@@ -1104,7 +1104,7 @@ describe('Cache Interceptor', () => {
 
     test('stale-if-error', async () => {
       const clock = FakeTimers.install({
-        shouldClearNativeTimers: true
+        toFake: ['Date']
       })
 
       let requestsToOrigin = 0
@@ -1989,7 +1989,7 @@ describe('Cache Interceptor', () => {
 
   describe('determineDeleteAt', () => {
     test('max-age response has deleteAt proportional to freshness lifetime, not 1 year', async () => {
-      const clock = FakeTimers.install({ now: 1000 })
+      const clock = FakeTimers.install({ now: 1000, toFake: ['Date'] })
       after(() => clock.uninstall())
 
       const store = new MemoryCacheStore()
@@ -2025,7 +2025,7 @@ describe('Cache Interceptor', () => {
     })
 
     test('sqlite store keeps short-lived entries past Date header precision loss so they can revalidate', { skip: runtimeFeatures.has('sqlite') === false }, async () => {
-      const clock = FakeTimers.install({ now: 1000, shouldClearNativeTimers: true })
+      const clock = FakeTimers.install({ now: 1000, toFake: ['Date'] })
       const store = new SqliteCacheStore()
       let requestsToOrigin = 0
       let revalidationHeaders
@@ -2101,7 +2101,7 @@ describe('Cache Interceptor', () => {
     })
 
     test('immutable response has deleteAt of ~1 year', async () => {
-      const clock = FakeTimers.install({ now: 1000 })
+      const clock = FakeTimers.install({ now: 1000, toFake: ['Date'] })
       after(() => clock.uninstall())
 
       const store = new MemoryCacheStore()
@@ -2137,7 +2137,7 @@ describe('Cache Interceptor', () => {
     })
 
     test('stale-while-revalidate extends deleteAt beyond staleAt', async () => {
-      const clock = FakeTimers.install({ now: 1000 })
+      const clock = FakeTimers.install({ now: 1000, toFake: ['Date'] })
       after(() => clock.uninstall())
 
       const store = new MemoryCacheStore()