@pathscale/wss-adapter 1.0.6 → 1.0.9

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;
@@ -63,6 +65,7 @@ interface IStore {
     services: IServices;
     sequence: ISequence;
     sessions: ISessions;
+    subscriptions: ISubscriptions;
     pendingPromises: IPendingPromises;
     onError: (error: {
         error: number;

package/dist/wssAdapter.js

@@ -12,6 +12,7 @@ var store = {
     timeout: 0,
     errors: {},
     services: {},
+    subscriptions: {},
     sequence: {
         value: 1,
         getSeq: function () {
@@ -42,6 +43,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 +86,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,25 +99,10 @@ var sendHandler = function (serviceName, serviceConfig, methodName, params) {
     if (!methodCode) {
         throw new Error("method ".concat(methodName, " not available in ").concat(serviceName, " service"));
     }
-    var purgedParams = {};
-    if (params) {
-        if (!Object.keys(params).every(function (param) {
-            return serviceConfig.methods[methodCode].parameters.includes(param);
-        })) {
-            throw new Error("method ".concat(methodCode, " is being called with missing parameters"));
-        }
-        serviceConfig.methods[methodCode].parameters.forEach(function (k) {
-            purgedParams[k] = params[k];
-        });
-        var difference = Object.keys(params).filter(function (x) { return !serviceConfig.methods[methodCode].parameters.includes(x); });
-        if (difference.length) {
-            throw new Error("method ".concat(methodCode, " is being called with unknow parameters, ").concat(difference));
-        }
-    }
     var payload = {
         method: Number.parseInt(methodCode),
         seq: store.sequence.getSeq(),
-        params: purgedParams,
+        params: params,
     };
     console.log("".concat(serviceName, "::").concat(methodName, " sends:"), payload);
     return new Promise(function (resolve, reject) {
@@ -129,23 +119,32 @@ var sendHandler = function (serviceName, serviceConfig, methodName, params) {
 };
 var receiveHandler = function (event) {
     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(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);
+        }
+        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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pathscale/wss-adapter",
-  "version": "1.0.6",
+  "version": "1.0.9",
   "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
@@ -66,6 +70,7 @@ interface IStore {
   services: IServices
   sequence: ISequence
   sessions: ISessions
+  subscriptions: ISubscriptions
   pendingPromises: IPendingPromises
   onError: (error: { error: number; message: string }) => void
 }

package/wssAdapter.ts

@@ -14,6 +14,7 @@ const store: IStore = {
   timeout: 0,
   errors: {},
   services: {},
+  subscriptions: {},
 
   sequence: {
     value: 1,
@@ -49,6 +50,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 +116,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,38 +128,10 @@ 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(),
-    params: purgedParams,
+    params: params,
   }
 
   console.log(`${serviceName}::${methodName} sends:`, payload)
@@ -175,25 +152,36 @@ const sendHandler = (
 
 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::${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')
+
+    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)
+    }
 
-  // handle error
-  if (error) {
-    onError(response)
-  } else if (done) {
-    const code = response.method - 1
-    resolve(response, code)
+    // 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)
   }
 }