@pathscale/wss-adapter 1.0.7 → 1.0.10

package/dist/types/index.d.ts

@@ -7,7 +7,9 @@ interface IService {
         };
     };
 }
+declare type ISubscriptions = Record<string, unknown>;
 interface IServiceConfig extends IService {
+    subscriptions?: ISubscriptions;
     onDisconnect: (event: {
         code: number;
         reason: string;
@@ -24,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>;
@@ -55,6 +53,7 @@ interface IPendingPromises {
         resolve: (payload: unknown) => void;
         reject: (error: Error) => void;
         toHandler: ReturnType<typeof setTimeout>;
+        methodName: string;
     };
 }
 interface IStore {
@@ -63,10 +62,7 @@ interface IStore {
     services: IServices;
     sequence: ISequence;
     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

@@ -12,6 +12,7 @@ var store = {
     timeout: 0,
     errors: {},
     services: {},
+    subscriptions: {},
     sequence: {
         value: 1,
         getSeq: function () {
@@ -24,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])`
@@ -42,6 +41,9 @@ wssAdapter.configure = function (configuration) {
             },
             disconnect: function () { return disconnectHandler(serviceName); },
         };
+        if (serviceConfig.subscriptions) {
+            store.subscriptions[serviceName] = serviceConfig.subscriptions;
+        }
         // construct sessions objects that contain a proxy so you can ask unknown property
         // intended use: `wssAdapter.sessions.admin.updatePassword({ newPassword: 'hotdog6737637' })`
         wssAdapter.sessions[serviceName] = new Proxy({}, {
@@ -82,6 +84,7 @@ var disconnectHandler = function (serviceName) {
 };
 var sendHandler = function (serviceName, serviceConfig, methodName, params) {
     var _a;
+    if (params === void 0) { params = {}; }
     var methodCode = (_a = Object.entries(serviceConfig.methods)
         .map(function (_a) {
         var code = _a[0], info = _a[1];
@@ -94,29 +97,6 @@ var sendHandler = function (serviceName, serviceConfig, methodName, params) {
     if (!methodCode) {
         throw new Error("method ".concat(methodName, " not available in ").concat(serviceName, " service"));
     }
-    // const purgedParams: Record<string, unknown> = {}
-    // if (params) {
-    //   if (
-    //     !Object.keys(params).every((param) =>
-    //       serviceConfig.methods[methodCode].parameters.includes(param)
-    //     )
-    //   ) {
-    //     throw new Error(
-    //       `method ${methodCode} is being called with missing parameters`
-    //     )
-    //   }
-    //   serviceConfig.methods[methodCode].parameters.forEach((k) => {
-    //     purgedParams[k] = params[k]
-    //   })
-    //   const difference = Object.keys(params).filter(
-    //     (x) => !serviceConfig.methods[methodCode].parameters.includes(x)
-    //   )
-    //   if (difference.length) {
-    //     throw new Error(
-    //       `method ${methodCode} is being called with unknow parameters, ${difference}`
-    //     )
-    //   }
-    // }
     var payload = {
         method: Number.parseInt(methodCode),
         seq: store.sequence.getSeq(),
@@ -130,44 +110,50 @@ 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);
-    console.log("app::".concat(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];
-        executor.resolve(payload);
-    };
-    // handle error
-    if (error) {
-        onError(response);
+    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 done = response.method.toString().endsWith('1');
+        var resolve = function (payload, code) {
+            var executor = store.pendingPromises[response.seq];
+            clearTimeout(store.pendingPromises[response.seq].toHandler);
+            delete store.pendingPromises[response.seq];
+            executor.resolve(payload);
+        };
+        // handle error
+        if (error) {
+            onError(response);
+        }
+        else if (done) {
+            var code = response.method - 1;
+            resolve(response, code);
+        }
     }
-    else if (done) {
-        var code = response.method - 1;
-        resolve(response, code);
+    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];
+        executor === null || executor === void 0 ? void 0 : executor(response);
     }
 };
 function onError(response) {
-    var _a, _b;
+    var _a;
     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');
     }
-    (_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]);

package/package.json

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

package/types/index.ts

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

package/wssAdapter.ts

@@ -14,6 +14,7 @@ const store: IStore = {
   timeout: 0,
   errors: {},
   services: {},
+  subscriptions: {},
 
   sequence: {
     value: 1,
@@ -28,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
@@ -49,6 +48,10 @@ wssAdapter.configure = (configuration) => {
       disconnect: () => disconnectHandler(serviceName),
     }
 
+    if (serviceConfig.subscriptions) {
+      store.subscriptions[serviceName] = serviceConfig.subscriptions
+    }
+
     // construct sessions objects that contain a proxy so you can ask unknown property
     // intended use: `wssAdapter.sessions.admin.updatePassword({ newPassword: 'hotdog6737637' })`
     wssAdapter.sessions[serviceName] = new Proxy(
@@ -111,7 +114,7 @@ const sendHandler = (
   serviceName: string,
   serviceConfig: IServiceConfig,
   methodName: string,
-  params: Record<string, unknown>
+  params: Record<string, unknown> = {}
 ) => {
   const methodCode = Object.entries(serviceConfig.methods)
     .map(([code, info]) => ({ code, info }))
@@ -123,34 +126,6 @@ const sendHandler = (
     )
   }
 
-  // const purgedParams: Record<string, unknown> = {}
-
-  // if (params) {
-  //   if (
-  //     !Object.keys(params).every((param) =>
-  //       serviceConfig.methods[methodCode].parameters.includes(param)
-  //     )
-  //   ) {
-  //     throw new Error(
-  //       `method ${methodCode} is being called with missing parameters`
-  //     )
-  //   }
-
-  //   serviceConfig.methods[methodCode].parameters.forEach((k) => {
-  //     purgedParams[k] = params[k]
-  //   })
-
-  //   const difference = Object.keys(params).filter(
-  //     (x) => !serviceConfig.methods[methodCode].parameters.includes(x)
-  //   )
-
-  //   if (difference.length) {
-  //     throw new Error(
-  //       `method ${methodCode} is being called with unknow parameters, ${difference}`
-  //     )
-  //   }
-  // }
-
   const payload = {
     method: Number.parseInt(methodCode),
     seq: store.sequence.getSeq(),
@@ -167,33 +142,49 @@ 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,
     }
   })
 }
 
 const receiveHandler = (event: { data: string }) => {
   const response = JSON.parse(event.data)
-  console.log(`app::${response.method} got:`, response)
 
-  const error = response.method === 0
-  const done = response.method.toString().endsWith('1')
+  if (response.method || response.method === 0) {
+    console.log(
+      `app::${
+        store.pendingPromises[response.seq]?.methodName || response.method
+      } got:`,
+      response
+    )
 
-  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]
-    executor.resolve(payload)
-  }
+    const error = response.method === 0
+    const done = response.method.toString().endsWith('1')
 
-  // handle error
-  if (error) {
-    onError(response)
-  } else if (done) {
-    const code = response.method - 1
-    resolve(response, code)
+    const resolve = (payload: unknown, code: number) => {
+      const executor = store.pendingPromises[response.seq]
+      clearTimeout(store.pendingPromises[response.seq].toHandler)
+      delete store.pendingPromises[response.seq]
+      executor.resolve(payload)
+    }
+
+    // handle error
+    if (error) {
+      onError(response)
+    } else if (done) {
+      const code = response.method - 1
+      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 (
+      payload: unknown
+    ) => void
+    executor?.(response)
   }
 }
 
@@ -217,11 +208,6 @@ function onError(response: IResponse) {
     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])