@pathscale/wss-adapter 1.0.9 → 1.0.12

package/dist/types/index.d.ts

@@ -9,7 +9,7 @@ interface IService {
 }
 declare type ISubscriptions = Record<string, unknown>;
 interface IServiceConfig extends IService {
-    subscriptions: ISubscriptions;
+    subscriptions?: ISubscriptions;
     onDisconnect: (event: {
         code: number;
         reason: string;
@@ -26,10 +26,6 @@ interface IConfiguration {
     timeout: number;
     services: IServices;
     errors: IErrors;
-    onError: (error: {
-        error: number;
-        message: string;
-    }) => void;
 }
 interface IServiceConnect {
     connect<T>(payload: string | string[] | undefined, remote?: string): Promise<T>;
@@ -57,6 +53,7 @@ interface IPendingPromises {
         resolve: (payload: unknown) => void;
         reject: (error: Error) => void;
         toHandler: ReturnType<typeof setTimeout>;
+        methodName: string;
     };
 }
 interface IStore {
@@ -67,9 +64,5 @@ interface IStore {
     sessions: ISessions;
     subscriptions: ISubscriptions;
     pendingPromises: IPendingPromises;
-    onError: (error: {
-        error: number;
-        message: string;
-    }) => void;
 }
 export { IStore, IWssAdapter, IServiceConfig, IConfiguration, IErrors, IServices, IService, };

package/dist/wssAdapter.js

@@ -25,15 +25,13 @@ var store = {
     },
     sessions: {},
     pendingPromises: {},
-    onError: function () { },
 };
 wssAdapter.configure = function (configuration) {
-    var timeout = configuration.timeout, services = configuration.services, errors = configuration.errors, onError = configuration.onError;
+    var timeout = configuration.timeout, services = configuration.services, errors = configuration.errors;
     // save some stuff for later retrieval
     store.timeout = timeout;
     store.errors = errors;
     store.services = services;
-    store.onError = onError;
     var _loop_1 = function (serviceName, serviceConfig) {
         // construct services objects with two simple functions
         // intended use: `wssAdapter.services.admin.connect([1, 2, 3])` or `wssAdapter.services.auth.connect([1, 2, 3])`
@@ -112,19 +110,20 @@ var sendHandler = function (serviceName, serviceConfig, methodName, params) {
             resolve: resolve,
             reject: reject,
             toHandler: setTimeout(function () {
-                reject(new Error(methodCode.toString() + ' took to long, aborting'));
+                reject(new Error(methodName + ' took to long, aborting'));
             }, store.timeout),
+            methodName: methodName,
         };
     });
 };
 var receiveHandler = function (event) {
+    var _a;
     var response = JSON.parse(event.data);
     if (response.method || response.method === 0) {
-        console.log("app::".concat(response.method, " got:"), response);
+        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 done = response.method.toString().endsWith('1');
         var resolve = function (payload, code) {
-            console.log(code);
             var executor = store.pendingPromises[response.seq];
             clearTimeout(store.pendingPromises[response.seq].toHandler);
             delete store.pendingPromises[response.seq];
@@ -140,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];
@@ -153,19 +151,21 @@ function onError(response) {
     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');
     }
-    (_b = store.onError) === null || _b === void 0 ? void 0 : _b.call(store, {
-        error: errorCode,
-        message: errorMsg,
-    });
     // 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.9",
+  "version": "1.0.12",
   "description": "Websocket adapter for the Pathscale WSS",
   "main": "dist/wssAdapter.js",
   "types": "dist/wssAdapter.d.ts",

package/types/index.ts

@@ -11,7 +11,7 @@ interface IService {
 type ISubscriptions = Record<string, unknown>
 
 interface IServiceConfig extends IService {
-  subscriptions: ISubscriptions
+  subscriptions?: ISubscriptions
   onDisconnect: (event: {
     code: number
     reason: string
@@ -28,7 +28,6 @@ interface IConfiguration {
   timeout: number
   services: IServices
   errors: IErrors
-  onError: (error: { error: number; message: string }) => void
 }
 interface IServiceConnect {
   connect<T>(
@@ -62,6 +61,7 @@ interface IPendingPromises {
     resolve: (payload: unknown) => void
     reject: (error: Error) => void
     toHandler: ReturnType<typeof setTimeout>
+    methodName: string
   }
 }
 interface IStore {
@@ -72,7 +72,6 @@ interface IStore {
   sessions: ISessions
   subscriptions: ISubscriptions
   pendingPromises: IPendingPromises
-  onError: (error: { error: number; message: string }) => void
 }
 export {
   IStore,

package/wssAdapter.ts

@@ -29,17 +29,15 @@ const store: IStore = {
 
   sessions: {},
   pendingPromises: {},
-  onError() {},
 }
 
 wssAdapter.configure = (configuration) => {
-  const { timeout, services, errors, onError } = configuration
+  const { timeout, services, errors } = configuration
 
   // save some stuff for later retrieval
   store.timeout = timeout
   store.errors = errors
   store.services = services
-  store.onError = onError
 
   for (const [serviceName, serviceConfig] of Object.entries(services)) {
     // construct services objects with two simple functions
@@ -144,8 +142,9 @@ const sendHandler = (
       resolve,
       reject,
       toHandler: setTimeout(() => {
-        reject(new Error(methodCode.toString() + ' took to long, aborting'))
+        reject(new Error(methodName + ' took to long, aborting'))
       }, store.timeout),
+      methodName,
     }
   })
 }
@@ -154,13 +153,17 @@ const receiveHandler = (event: { data: string }) => {
   const response = JSON.parse(event.data)
 
   if (response.method || response.method === 0) {
-    console.log(`app::${response.method} got:`, response)
+    console.log(
+      `app::${
+        store.pendingPromises[response.seq]?.methodName || response.method
+      } got:`,
+      response
+    )
 
     const error = response.method === 0
     const done = response.method.toString().endsWith('1')
 
     const resolve = (payload: unknown, code: number) => {
-      console.log(code)
       const executor = store.pendingPromises[response.seq]
       clearTimeout(store.pendingPromises[response.seq].toHandler)
       delete store.pendingPromises[response.seq]
@@ -175,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 (
@@ -194,6 +196,7 @@ interface IResponse {
   params: {
     error: number
   }
+  seq: number
 }
 
 function onError(response: IResponse) {
@@ -202,22 +205,28 @@ function onError(response: IResponse) {
 
   if ([45349638, 45349637].includes(errorCode)) {
     store.sequence.decreaseSeq()
-    console.log('seq has been decreased because of error')
   }
 
-  store.onError?.({
-    error: errorCode,
-    message: errorMsg,
-  })
-
   // if there was only one executor saved in store.pendingPromises, then it was that request that failed
   if (Object.keys(store.pendingPromises).length === 1) {
     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')