Merge pull request hapijs#267 from kanongil/use-abort

Refactor early abort detection to use the 'abort' event
kodeniks · Jan 4, 2020 · 3fe90e3 · 3fe90e3
2 parents f4dc437 + 6175453
commit 3fe90e3
Showing 1 changed file with 13 additions and 21 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -191,6 +191,17 @@ internals.Client = class {
             return finishOnce(Boom.badGateway('Client request error', err));
         };
 
+        const onAbort = () => {
+
+            if (!req.socket) {
+                // Fake an ECONNRESET error on early abort
+
+                const error = new Error('socket hang up');
+                error.code = 'ECONNRESET';
+                finishOnce(error);
+            }
+        };
+
         req.once('error', onError);
 
         const onResponse = (res) => {
@@ -250,9 +261,9 @@ internals.Client = class {
                 req.abort();
             }
 
-            req.abort = _abort;                             // Restore original function to release memory
             req.removeListener('response', onResponse);
             req.removeListener('error', onError);
+            req.removeListener('abort', onAbort);
             req.on('error', Hoek.ignore);
 
             clearTimeout(timeoutId);
@@ -271,26 +282,7 @@ internals.Client = class {
             delete options.timeout;
         }
 
-        // Custom abort method to detect early aborts
-
-        const _abort = req.abort;
-        let aborted = false;
-        req.abort = () => {
-
-            if (!aborted && !req.res && !req.socket) {
-                process.nextTick(() => {
-
-                    // Fake an ECONNRESET error
-
-                    const error = new Error('socket hang up');
-                    error.code = 'ECONNRESET';
-                    finishOnce(error);
-                });
-            }
-
-            aborted = true;
-            return _abort.call(req);
-        };
+        req.on('abort', onAbort);
 
         // Write payload