fix: handle stream complete/finish events uniformly on errors

`teeny-request` and `request` emit different calls when an error occurs.
googleapis · Oct 11, 2023 · a150c4f · a150c4f
1 parent 47d5f59
commit a150c4f
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -130,9 +130,17 @@ function retryRequest(requestOpts, opts, callback) {
   }
 
   function makeRequest() {
+    let finishHandled = false;
     currentRetryAttempt++;
     debug(`Current retry attempt: ${currentRetryAttempt}`);
 
+    function handleFinish(args = []) {
+      if (!finishHandled) {
+        finishHandled = true;
+        retryStream.emit('complete', ...args);
+      }
+    }
+
     if (streamMode) {
       streamResponseHandled = false;
 
@@ -163,7 +171,8 @@ function retryRequest(requestOpts, opts, callback) {
           streamResponseHandled = true;
           onResponse(null, resp, body);
         })
-        .on('complete', retryStream.emit.bind(retryStream, 'complete'));
+        .on('complete', (...params) => handleFinish(params))
+        .on('finish', (...params) => handleFinish(params));
 
       requestStream.pipe(delayStream);
     } else {