modify

Author: Uzlopak

lib/core/connect.js

@@ -52,7 +52,7 @@ function buildConnector ({ allowH2, maxCachedSessions, socketPath, timeout, sess
   const sessionCache = new SessionCache(maxCachedSessions == null ? 100 : maxCachedSessions)
   timeout = timeout == null ? 10e3 : timeout
   allowH2 = allowH2 != null ? allowH2 : false
-  return function connect ({ hostname, host, protocol, port, servername, localAddress, httpSocket }, callback) {
+  return function connect ({ hostname, host, protocol, port, servername, localAddress, httpSocket, signal }, callback) {
     let socket
     if (protocol === 'https:') {
       if (!tls) {
@@ -72,6 +72,7 @@ function buildConnector ({ allowH2, maxCachedSessions, socketPath, timeout, sess
         ...options,
         servername,
         session,
+        signal,
         localAddress,
         ALPNProtocols: allowH2 ? ['http/1.1', 'h2'] : ['http/1.1'],
         socket: httpSocket, // upgrade socket connection
@@ -92,6 +93,7 @@ function buildConnector ({ allowH2, maxCachedSessions, socketPath, timeout, sess
       socket = net.connect({
         highWaterMark: 64 * 1024, // Same as nodejs fs streams.
         ...options,
+        signal,
         localAddress,
         port,
         host: hostname
@@ -106,16 +108,11 @@ function buildConnector ({ allowH2, maxCachedSessions, socketPath, timeout, sess
 
     const clearConnectTimeout = util.setupConnectTimeout(new WeakRef(socket), { timeout, hostname, port })
 
-    // Use close event for proper cleanup instead of monkey-patching destroy
-    // The close event is the canonical cleanup event in Node.js and covers all scenarios
-    socket.once('close', () => {
-      if (clearConnectTimeout && typeof clearConnectTimeout === 'function') {
-        clearConnectTimeout()
-      }
-    })
-
     socket
       .setNoDelay(true)
+      .once('close', function () {
+        queueMicrotask(clearConnectTimeout)
+      })
       .once(protocol === 'https:' ? 'secureConnect' : 'connect', function () {
         queueMicrotask(clearConnectTimeout)
 

lib/core/request.js

@@ -43,7 +43,8 @@ class Request {
     expectContinue,
     servername,
     throwOnError,
-    maxRedirections
+    maxRedirections,
+    signal
   }, handler) {
     if (typeof path !== 'string') {
       throw new InvalidArgumentError('path must be a string')
@@ -99,6 +100,8 @@ class Request {
 
     this.abort = null
 
+    this.signal = signal instanceof AbortSignal ? signal : null
+
     if (body == null) {
       this.body = null
     } else if (isStream(body)) {

lib/dispatcher/client.js

@@ -424,6 +424,7 @@ async function connect (client) {
         hostname,
         protocol,
         port,
+        signal: client[kQueue]?.[0]?.signal,
         servername: client[kServerName],
         localAddress: client[kLocalAddress]
       }, (err, socket) => {

lib/web/fetch/index.js

@@ -2057,6 +2057,7 @@ async function httpNetworkFetch (
 
     return new Promise((resolve, reject) => agent.dispatch(
       {
+        signal: request.signal,
         path: url.pathname + url.search,
         origin: url.origin,
         method: request.method,

lib/web/fetch/request.js

@@ -405,6 +405,7 @@ class Request {
     // 26. If init["signal"] exists, then set signal to it.
     if (init.signal !== undefined) {
       signal = init.signal
+      request.signal = signal
     }
 
     // 27. Set this’s request to request.
@@ -922,7 +923,8 @@ function makeRequest (init) {
     url: init.urlList[0],
     headersList: init.headersList
       ? new HeadersList(init.headersList)
-      : new HeadersList()
+      : new HeadersList(),
+    signal: init.signal ?? null
   }
 }