fix: throw timeout error in promise interface when timedout (#1510)

* fix: return timeout error in promise interface * test: timeout in promise interface
ladjs · Jan 7, 2020 · 56ce517 · 56ce517
1 parent 6cb8d95
commit 56ce517
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/request-base.js b/src/request-base.js
@@ -223,6 +223,7 @@ RequestBase.prototype._retry = function() {
 
   this._aborted = false;
   this.timedout = false;
+  this.timedoutError = null;
 
   return this._end();
 };
@@ -246,6 +247,11 @@ RequestBase.prototype.then = function(resolve, reject) {
 
     this._fullfilledPromise = new Promise((resolve, reject) => {
       self.on('abort', () => {
+        if (this.timedout && this.timedoutError) {
+          reject(this.timedoutError);
+          return;
+        }
+
         const err = new Error('Aborted');
         err.code = 'ABORTED';
         err.status = this.status;
@@ -714,6 +720,7 @@ RequestBase.prototype._timeoutError = function(reason, timeout, errno) {
   err.code = 'ECONNABORTED';
   err.errno = errno;
   this.timedout = true;
+  this.timedoutError = err;
   this.abort();
   this.callback(err);
 };

diff --git a/test/timeout.js b/test/timeout.js
@@ -24,6 +24,22 @@ describe('.timeout(ms)', function() {
         });
     });
 
+    it('should error in promise interface ', done => {
+      request
+        .get(`${base}/delay/500`)
+        .timeout(150)
+        .catch(err => {
+          assert(err, 'expected an error');
+          assert.equal(
+            'number',
+            typeof err.timeout,
+            'expected an error with .timeout'
+          );
+          assert.equal('ECONNABORTED', err.code, 'expected abort error code');
+          done();
+        });
+    });
+
     it('should handle gzip timeout', done => {
       request
         .get(`${base}/delay/zip`)