@vouchfor/sdk 1.1.34 → 1.1.35

package/lib/services/baseService.js

@@ -108,14 +108,27 @@ class BaseService {
         method,
         url,
         logger: this._logger
+      }).then((res) => {
+        if (task.id && res.task !== task.id) {
+          tasks.cancel(task.id); // our callback url was ignored
+        }
+        return res;
+      }).catch((err) => {
+        return { error: err }
       }),
       task.promise || {}
     ]);
 
-    if (res.task === task.id && task.id) {
-      res = cb.json; // we got the async response we expected
-    } else {
-      tasks.cancel(task.id); // our callback url was ignored
+    if (task.id) {
+      if (res.task === task.id) {
+        res = cb.json; // we got the async response we expected
+      } else if (res.error && cb.json) {
+        res = cb.json; // api gateway failed, use async response
+      }
+    }
+
+    if (res.error) {
+      throw res.error;
     }
 
     return res;

package/lib/shared/tasks.js

@@ -27,7 +27,7 @@ class TaskBroker {
     const timeout = setTimeout(() => {
       if (!this.pending.has(id)) return;
       this.pending.delete(id);
-      rejectFn(new Error(`Timed out waiting for ${id}`));
+      rejectFn({ status: 0, json: { error: 'TimedOut' } });
     }, timeoutMs);
 
     this.pending.set(id, {
@@ -49,7 +49,7 @@ class TaskBroker {
   cancel(id) {
     const entry = this.pending.get(id);
     if (!entry) return false;
-    entry.reject({ status: 0, json: 'cancelled' });
+    entry.resolve({ status: 0, json: { error: 'Cancelled' } });
     return true;
   }
 

package/lib/shared/utils.js

@@ -108,7 +108,7 @@ module.exports = {
 
                 const errors = [
                   502, // bad gateway, the BE is deploying
-                  504, // gatewat timeout, the BE will scale
+                  //504 gateway timeout, do not retry!!
                 ];
                 const maxAttempts = 8;
                 const interval = 1000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vouchfor/sdk",
-  "version": "1.1.34",
+  "version": "1.1.35",
   "description": "Vouch API SDK",
   "main": "lib/index.js",
   "repository": {