fixup

nodejs · Feb 5, 2023 · 2750939 · 2750939
1 parent 01b972b
commit 2750939
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 48 deletions.
diff --git a/lib/timers.js b/lib/timers.js
@@ -19,7 +19,7 @@ function onTimeout () {
     }
 
     if (timer.expires === 0) {
-      timer.destroyed = true
+      timer.active = false
       if (idx !== len - 1) {
         fastTimers[idx] = fastTimers.pop()
       } else {
@@ -53,20 +53,19 @@ class Timeout {
     this.callback = callback
     this.delay = delay
     this.opaque = opaque
-    this.expires = fastNow + delay
-
-    this.destroyed = false
-    fastTimers.push(this)
+    this.expires = 0
+    this.active = false
 
-    if (!fastNowTimeout || fastTimers.length === 1) {
-      refreshTimeout()
-    }
+    this.refresh()
   }
 
   refresh () {
-    if (this.destroyed) {
-      this.destroyed = false
+    if (!this.active) {
+      this.active = true
       fastTimers.push(this)
+      if (!fastNowTimeout || fastTimers.length === 1) {
+        refreshTimeout()
+      }
     }
 
     this.expires = fastNow + this.delay

diff --git a/test/client-timeout.js b/test/client-timeout.js
@@ -7,44 +7,44 @@ const { Readable } = require('stream')
 const FakeTimers = require('@sinonjs/fake-timers')
 const timers = require('../lib/timers')
 
-// test('refresh timeout on pause', (t) => {
-//   t.plan(1)
-
-//   const server = createServer((req, res) => {
-//     res.flushHeaders()
-//   })
-//   t.teardown(server.close.bind(server))
-
-//   server.listen(0, () => {
-//     const client = new Client(`http://localhost:${server.address().port}`, {
-//       bodyTimeout: 500
-//     })
-//     t.teardown(client.destroy.bind(client))
-
-//     client.dispatch({
-//       path: '/',
-//       method: 'GET'
-//     }, {
-//       onConnect () {
-//       },
-//       onHeaders (statusCode, headers, resume) {
-//         setTimeout(() => {
-//           resume()
-//         }, 1000)
-//         return false
-//       },
-//       onData () {
-
-//       },
-//       onComplete () {
-
-//       },
-//       onError (err) {
-//         t.type(err, errors.BodyTimeoutError)
-//       }
-//     })
-//   })
-// })
+test('refresh timeout on pause', (t) => {
+  t.plan(1)
+
+  const server = createServer((req, res) => {
+    res.flushHeaders()
+  })
+  t.teardown(server.close.bind(server))
+
+  server.listen(0, () => {
+    const client = new Client(`http://localhost:${server.address().port}`, {
+      bodyTimeout: 500
+    })
+    t.teardown(client.destroy.bind(client))
+
+    client.dispatch({
+      path: '/',
+      method: 'GET'
+    }, {
+      onConnect () {
+      },
+      onHeaders (statusCode, headers, resume) {
+        setTimeout(() => {
+          resume()
+        }, 1000)
+        return false
+      },
+      onData () {
+
+      },
+      onComplete () {
+
+      },
+      onError (err) {
+        t.type(err, errors.BodyTimeoutError)
+      }
+    })
+  })
+})
 
 test('start headers timeout after request body', (t) => {
   t.plan(2)