From d1800f2cf82812477aac0ed6f8c8432f2531c2dd Mon Sep 17 00:00:00 2001
From: Haram Jeong <91401364+haramj@users.noreply.github.com>
Date: Fri, 1 Aug 2025 14:03:07 +0000
Subject: [PATCH 1/3] http: add Agent.agentKeepAliveTimeoutBuffer option

---
 doc/api/http.md                               | 10 +++++
 lib/_http_agent.js                            | 13 ++++--
 ...st-http-agent-keep-alive-timeout-buffer.js | 44 +++++++++++++++++++
 3 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 test/parallel/test-http-agent-keep-alive-timeout-buffer.js

diff --git a/doc/api/http.md b/doc/api/http.md
index 4a3e6ef8d2aa9c..e99ab3e8482a44 100644
--- a/doc/api/http.md
+++ b/doc/api/http.md
@@ -116,6 +116,10 @@ http.get({
 <!-- YAML
 added: v0.3.4
 changes:
+  - version:
+    - REPLACEME
+    pr-url: "REPLACEME"
+    description: Add support for `agentKeepAliveTimeoutBuffer`.
   - version:
     - v24.5.0
     pr-url: https://github.com/nodejs/node/pull/58980
@@ -156,6 +160,12 @@ changes:
     the [initial delay][]
     for TCP Keep-Alive packets. Ignored when the
     `keepAlive` option is `false` or `undefined`. **Default:** `1000`.
+  * `agentKeepAliveTimeoutBuffer` {number} Milliseconds to subtract from
+    the server-provided `keep-alive: timeout=...` hint when determining socket
+    expiration time. This buffer helps ensure the agent closes the socket
+    slightly before the server does, reducing the chance of sending a request
+    on a socket that’s about to be closed by the server.
+    **Default:** `1000`.
   * `maxSockets` {number} Maximum number of sockets to allow per host.
     If the same host opens multiple concurrent connections, each request
     will use new socket until the `maxSockets` value is reached.
diff --git a/lib/_http_agent.js b/lib/_http_agent.js
index ddb6cd7d9a4c03..28006353a35f34 100644
--- a/lib/_http_agent.js
+++ b/lib/_http_agent.js
@@ -22,6 +22,7 @@
 'use strict';
 
 const {
+  NumberIsFinite,
   NumberParseInt,
   ObjectKeys,
   ObjectSetPrototypeOf,
@@ -60,8 +61,6 @@ const kOnKeylog = Symbol('onkeylog');
 const kRequestOptions = Symbol('requestOptions');
 const kRequestAsyncResource = Symbol('requestAsyncResource');
 
-// TODO(jazelly): make this configurable
-const HTTP_AGENT_KEEP_ALIVE_TIMEOUT_BUFFER = 1000;
 // New Agent code.
 
 // The largest departure from the previous implementation is that
@@ -114,6 +113,14 @@ function Agent(options) {
   this.scheduling = this.options.scheduling || 'lifo';
   this.maxTotalSockets = this.options.maxTotalSockets;
   this.totalSocketCount = 0;
+
+  this.agentKeepAliveTimeoutBuffer =
+    typeof this.options.agentKeepAliveTimeoutBuffer === 'number' &&
+    this.options.agentKeepAliveTimeoutBuffer >= 0 &&
+    NumberIsFinite(this.options.agentKeepAliveTimeoutBuffer) ?
+      this.options.agentKeepAliveTimeoutBuffer :
+      1000;
+
   const proxyEnv = this.options.proxyEnv;
   if (typeof proxyEnv === 'object' && proxyEnv !== null) {
     this[kProxyConfig] = parseProxyConfigFromEnv(proxyEnv, this.protocol, this.keepAlive);
@@ -559,7 +566,7 @@ Agent.prototype.keepSocketAlive = function keepSocketAlive(socket) {
       if (hint) {
         // Let the timer expire before the announced timeout to reduce
         // the likelihood of ECONNRESET errors
-        let serverHintTimeout = (NumberParseInt(hint) * 1000) - HTTP_AGENT_KEEP_ALIVE_TIMEOUT_BUFFER;
+        let serverHintTimeout = (NumberParseInt(hint) * 1000) - this.agentKeepAliveTimeoutBuffer;
         serverHintTimeout = serverHintTimeout > 0 ? serverHintTimeout : 0;
         if (serverHintTimeout === 0) {
           // Cannot safely reuse the socket because the server timeout is
diff --git a/test/parallel/test-http-agent-keep-alive-timeout-buffer.js b/test/parallel/test-http-agent-keep-alive-timeout-buffer.js
new file mode 100644
index 00000000000000..d7ec5df9b86c31
--- /dev/null
+++ b/test/parallel/test-http-agent-keep-alive-timeout-buffer.js
@@ -0,0 +1,44 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const http = require('http');
+
+// Ensure agentKeepAliveTimeoutBuffer option sets the correct value or falls back to default.
+{
+  const agent1 = new http.Agent({ agentKeepAliveTimeoutBuffer: 1500, keepAlive: true });
+  assert.strictEqual(agent1.agentKeepAliveTimeoutBuffer, 1500);
+
+  const agent2 = new http.Agent({ agentKeepAliveTimeoutBuffer: -100, keepAlive: true });
+  assert.strictEqual(agent2.agentKeepAliveTimeoutBuffer, 1000);
+
+  const agent3 = new http.Agent({ agentKeepAliveTimeoutBuffer: Infinity, keepAlive: true });
+  assert.strictEqual(agent3.agentKeepAliveTimeoutBuffer, 1000);
+
+  const agent4 = new http.Agent({ keepAlive: true });
+  assert.strictEqual(agent4.agentKeepAliveTimeoutBuffer, 1000);
+}
+
+// Integration test with server sending Keep-Alive timeout header.
+{
+  const SERVER_TIMEOUT = 3;
+  const BUFFER = 1500;
+
+  const server = http.createServer((req, res) => {
+    res.setHeader('Keep-Alive', `timeout=${SERVER_TIMEOUT}`);
+    res.end('ok');
+  });
+
+  server.listen(0, common.mustCall(() => {
+    const agent = new http.Agent({ agentKeepAliveTimeoutBuffer: BUFFER, keepAlive: true });
+    assert.strictEqual(agent.agentKeepAliveTimeoutBuffer, BUFFER);
+
+    http.get({ port: server.address().port, agent }, (res) => {
+      res.resume();
+      res.on('end', () => {
+        agent.destroy();
+        server.close();
+      });
+    });
+  }));
+}

From 0dd0fb2f94e653a4d7b4f254c31ab23d31e2d377 Mon Sep 17 00:00:00 2001
From: Haram Jeong <91401364+haramj@users.noreply.github.com>
Date: Fri, 1 Aug 2025 14:13:43 +0000
Subject: [PATCH 2/3] doc: update YAML metadata with PR-URL

---
 doc/api/http.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/http.md b/doc/api/http.md
index e99ab3e8482a44..bdb18a453d5263 100644
--- a/doc/api/http.md
+++ b/doc/api/http.md
@@ -118,7 +118,7 @@ added: v0.3.4
 changes:
   - version:
     - REPLACEME
-    pr-url: "REPLACEME"
+    pr-url: "https://github.com/nodejs/node/pull/59315"
     description: Add support for `agentKeepAliveTimeoutBuffer`.
   - version:
     - v24.5.0

From ba735c21b6abddc2cd5d56ddbf802993fedb9e54 Mon Sep 17 00:00:00 2001
From: Haram Jeong <91401364+haramj@users.noreply.github.com>
Date: Sat, 2 Aug 2025 22:36:00 +0900
Subject: [PATCH 3/3] doc: remove quotes from pr-url metadata

---
 doc/api/http.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/http.md b/doc/api/http.md
index bdb18a453d5263..a1738cd6fc8ea9 100644
--- a/doc/api/http.md
+++ b/doc/api/http.md
@@ -118,7 +118,7 @@ added: v0.3.4
 changes:
   - version:
     - REPLACEME
-    pr-url: "https://github.com/nodejs/node/pull/59315"
+    pr-url: https://github.com/nodejs/node/pull/59315
     description: Add support for `agentKeepAliveTimeoutBuffer`.
   - version:
     - v24.5.0