improved timeout handling

Mangopay · Apr 16, 2024 · 00fb5cc · 00fb5cc
1 parent fa20851
commit 00fb5cc
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/lib/api.js b/lib/api.js
@@ -205,19 +205,24 @@ Api.prototype = {
                 // The request was made and the server responded with a status code
                 // that falls out of the range of 2xx
                 .catch(function (error) {
-                    // if (error.code === "ERR_CANCELED" && abortSignal.aborted) {
-                    //     self.errorHandler(error.code, "Request timed out");
-                    // }
+                    if (error.code === "ERR_CANCELED" && abortSignal.aborted) {
+                        var err = {
+                            Message: "Request timed out",
+                            Code: 408
+                        };
+                        self.errorHandler(err.Message, err);
+                        reject(err);
+                    } else {
+                        var resolveArgument = (resolveWithFullResponse) ?
+                            _.extend(error.response, {body: error.response.data}) : error.response.data;
 
-                    var resolveArgument = (resolveWithFullResponse) ?
-                        _.extend(error.response, {body: error.response.data}) : error.response.data;
+                        if (_.isFunction(callback)) {
+                            callback(resolveArgument, error.response);
+                        }
 
-                    if (_.isFunction(callback)) {
-                        callback(resolveArgument, error.response);
+                        self.errorHandler(error.message, error.response.data);
+                        reject(resolveArgument);
                     }
-
-                    self.errorHandler(error.message, error.response.data);
-                    reject(resolveArgument);
                 });
         });
     },