@pathscale/wss-adapter 1.0.10 → 1.0.13

package/dist/wssAdapter.js

@@ -121,7 +121,7 @@ var receiveHandler = function (event) {
     var response = JSON.parse(event.data);
     if (response.method || response.method === 0) {
         console.log("app::".concat(((_a = store.pendingPromises[response.seq]) === null || _a === void 0 ? void 0 : _a.methodName) || response.method, " got:"), response);
-        var error = response.method === 0;
+        var error = response.method === 0 || response.params.error;
         var done = response.method.toString().endsWith('1');
         var resolve = function (payload, code) {
             var executor = store.pendingPromises[response.seq];
@@ -139,7 +139,6 @@ var receiveHandler = function (event) {
         }
     }
     else if (response.resource) {
-        console.log("app::".concat(response.resource, " got:"), response);
         var resource = response.resource.split('@')[0];
         //@ts-ignore
         var executor = store.subscriptions.app[resource];
@@ -147,20 +146,26 @@ var receiveHandler = function (event) {
     }
 };
 function onError(response) {
-    var _a;
+    var _a, _b;
     var errorCode = response.params.error;
     var errorMsg = (_a = store.errors[errorCode]) !== null && _a !== void 0 ? _a : errorCode;
     if ([45349638, 45349637].includes(errorCode)) {
         store.sequence.decreaseSeq();
-        console.log('seq has been decreased because of error');
     }
     // if there was only one executor saved in store.pendingPromises, then it was that request that failed
     if (Object.keys(store.pendingPromises).length === 1) {
         var onlyKey = Number.parseInt(Object.keys(store.pendingPromises)[0]);
         clearTimeout(store.pendingPromises[onlyKey].toHandler);
         store.pendingPromises[onlyKey].reject(new Error(errorMsg));
+        console.error(store.pendingPromises[onlyKey].methodName + ' failed');
         delete store.pendingPromises[onlyKey];
     }
+    else if (response.seq > 1 && store.pendingPromises[response.seq]) {
+        var executor = store.pendingPromises[response.seq];
+        clearTimeout(executor.toHandler);
+        executor.reject(new Error("".concat((_b = executor.methodName) !== null && _b !== void 0 ? _b : '', ": ").concat(errorCode || JSON.stringify(response.params))));
+        delete store.pendingPromises[response.seq];
+    }
     // if there were more than one, there is no way of knowing who failed
     else {
         throw new Error('Unkown request failed');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pathscale/wss-adapter",
-  "version": "1.0.10",
+  "version": "1.0.13",
   "description": "Websocket adapter for the Pathscale WSS",
   "main": "dist/wssAdapter.js",
   "types": "dist/wssAdapter.d.ts",

package/wssAdapter.ts

@@ -160,7 +160,7 @@ const receiveHandler = (event: { data: string }) => {
       response
     )
 
-    const error = response.method === 0
+    const error = response.method === 0 || response.params.error
     const done = response.method.toString().endsWith('1')
 
     const resolve = (payload: unknown, code: number) => {
@@ -178,7 +178,6 @@ const receiveHandler = (event: { data: string }) => {
       resolve(response, code)
     }
   } else if (response.resource) {
-    console.log(`app::${response.resource} got:`, response)
     const resource = response.resource.split('@')[0]
     //@ts-ignore
     const executor = store.subscriptions.app[resource] as (
@@ -197,6 +196,7 @@ interface IResponse {
   params: {
     error: number
   }
+  seq: number
 }
 
 function onError(response: IResponse) {
@@ -205,7 +205,6 @@ function onError(response: IResponse) {
 
   if ([45349638, 45349637].includes(errorCode)) {
     store.sequence.decreaseSeq()
-    console.log('seq has been decreased because of error')
   }
 
   // if there was only one executor saved in store.pendingPromises, then it was that request that failed
@@ -213,9 +212,21 @@ function onError(response: IResponse) {
     const onlyKey = Number.parseInt(Object.keys(store.pendingPromises)[0])
     clearTimeout(store.pendingPromises[onlyKey].toHandler)
     store.pendingPromises[onlyKey].reject(new Error(errorMsg))
+    console.error(store.pendingPromises[onlyKey].methodName + ' failed')
     delete store.pendingPromises[onlyKey]
+  } else if (response.seq > 1 && store.pendingPromises[response.seq]) {
+    const executor = store.pendingPromises[response.seq]
+
+    clearTimeout(executor.toHandler)
+    executor.reject(
+      new Error(
+        `${executor.methodName ?? ''}: ${
+          errorCode || JSON.stringify(response.params)
+        }`
+      )
+    )
+    delete store.pendingPromises[response.seq]
   }
-
   // if there were more than one, there is no way of knowing who failed
   else {
     throw new Error('Unkown request failed')