@pathscale/wss-adapter 1.0.2 → 1.0.5

package/dist/types/index.d.ts

@@ -30,7 +30,7 @@ interface IConfiguration {
     }) => void;
 }
 interface IServiceConnect {
-    connect<T>(payload: string | string[] | undefined): Promise<T>;
+    connect<T>(payload: string | string[] | undefined, remote?: string): Promise<T>;
     disconnect: () => void;
 }
 interface IWssAdapter {
@@ -38,7 +38,7 @@ interface IWssAdapter {
         [serviceName: string]: IServiceConnect;
     };
     sessions: {
-        [serviceName: string]: unknown;
+        [serviceName: string]: any;
     };
     configure: (configuration: IConfiguration) => void;
 }

package/dist/wssAdapter.js

@@ -37,8 +37,8 @@ wssAdapter.configure = function (configuration) {
         // construct services objects with two simple functions
         // intended use: `wssAdapter.services.admin.connect([1, 2, 3])` or `wssAdapter.services.auth.connect([1, 2, 3])`
         wssAdapter.services[serviceName] = {
-            connect: function (payload) {
-                return connectHandler(serviceName, serviceConfig, payload);
+            connect: function (payload, remote) {
+                return connectHandler(serviceName, serviceConfig, payload, remote);
             },
             disconnect: function () { return disconnectHandler(serviceName); },
         };
@@ -55,9 +55,9 @@ wssAdapter.configure = function (configuration) {
         _loop_1(serviceName, serviceConfig);
     }
 };
-var connectHandler = function (serviceName, serviceConfig, payload) {
+var connectHandler = function (serviceName, serviceConfig, payload, remote) {
     return new Promise(function (resolve, reject) {
-        store.sessions[serviceName] = new WebSocket(serviceConfig.remote, payload);
+        store.sessions[serviceName] = new WebSocket(remote || serviceConfig.remote, payload);
         store.sessions[serviceName].onmessage = function (event) {
             var _a;
             var response = JSON.parse(event.data);
@@ -94,18 +94,20 @@ var sendHandler = function (serviceName, serviceConfig, methodName, params) {
     if (!methodCode) {
         throw new Error("method ".concat(methodName, " not available in ").concat(serviceName, " service"));
     }
-    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"));
-    }
     var purgedParams = {};
-    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));
+    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),
@@ -149,7 +151,7 @@ var receiveHandler = function (event) {
 function onError(response) {
     var _a, _b;
     var errorCode = response.params.error;
-    var errorMsg = (_a = store.errors[errorCode]) !== null && _a !== void 0 ? _a : 'Something went wrong';
+    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');

package/package.json

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

package/types/index.ts

@@ -7,7 +7,6 @@ interface IService {
     }
   }
 }
-
 interface IServiceConfig extends IService {
   onDisconnect: (event: {
     code: number
@@ -15,47 +14,42 @@ interface IServiceConfig extends IService {
     wasClean: boolean
   }) => void | null
 }
-
 interface IServices {
   [serviceName: string]: IServiceConfig
 }
-
 interface IErrors {
   [errorCode: number]: string
 }
-
 interface IConfiguration {
   timeout: number
   services: IServices
   errors: IErrors
   onError: (error: { error: number; message: string }) => void
 }
-
 interface IServiceConnect {
-  connect<T>(payload: string | string[] | undefined): Promise<T>
+  connect<T>(
+    payload: string | string[] | undefined,
+    remote?: string
+  ): Promise<T>
   disconnect: () => void
 }
-
 interface IWssAdapter {
   services: {
     [serviceName: string]: IServiceConnect
   }
   sessions: {
-    [serviceName: string]: unknown
+    [serviceName: string]: any
   }
   configure: (configuration: IConfiguration) => void
 }
-
 interface ISequence {
   value: number
   getSeq: () => number
   decreaseSeq: () => void
 }
-
 interface ISessions {
   [serviceName: string]: WebSocket
 }
-
 interface IPendingPromises {
   [seq: number]: {
     resolve: (payload: unknown) => void
@@ -63,7 +57,6 @@ interface IPendingPromises {
     toHandler: ReturnType<typeof setTimeout>
   }
 }
-
 interface IStore {
   timeout: number
   errors: IErrors
@@ -73,7 +66,6 @@ interface IStore {
   pendingPromises: IPendingPromises
   onError: (error: { error: number; message: string }) => void
 }
-
 export {
   IStore,
   IWssAdapter,

package/wssAdapter.ts

@@ -44,8 +44,8 @@ wssAdapter.configure = (configuration) => {
     // construct services objects with two simple functions
     // intended use: `wssAdapter.services.admin.connect([1, 2, 3])` or `wssAdapter.services.auth.connect([1, 2, 3])`
     wssAdapter.services[serviceName] = {
-      connect: <T>(payload: string | string[] | undefined) =>
-        connectHandler<T>(serviceName, serviceConfig, payload),
+      connect: <T>(payload: string | string[] | undefined, remote?: string) =>
+        connectHandler<T>(serviceName, serviceConfig, payload, remote),
       disconnect: () => disconnectHandler(serviceName),
     }
 
@@ -65,10 +65,14 @@ wssAdapter.configure = (configuration) => {
 const connectHandler = <T>(
   serviceName: string,
   serviceConfig: IServiceConfig,
-  payload: string | string[] | undefined
+  payload: string | string[] | undefined,
+  remote?: string
 ) => {
   return new Promise((resolve, reject) => {
-    store.sessions[serviceName] = new WebSocket(serviceConfig.remote, payload)
+    store.sessions[serviceName] = new WebSocket(
+      remote || serviceConfig.remote,
+      payload
+    )
 
     store.sessions[serviceName].onmessage = function (event: { data: string }) {
       const response = JSON.parse(event.data)
@@ -119,29 +123,32 @@ const sendHandler = (
     )
   }
 
-  if (
-    !Object.keys(params).every((param) =>
-      serviceConfig.methods[methodCode].parameters.includes(param)
-    )
-  ) {
-    throw new Error(
-      `method ${methodCode} is being called with missing parameters`
-    )
-  }
-
   const purgedParams: Record<string, unknown> = {}
-  serviceConfig.methods[methodCode].parameters.forEach((k) => {
-    purgedParams[k] = params[k]
-  })
 
-  const difference = Object.keys(params).filter(
-    (x) => !serviceConfig.methods[methodCode].parameters.includes(x)
-  )
+  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`
+      )
+    }
 
-  if (difference.length) {
-    throw new Error(
-      `method ${methodCode} is being called with unknow parameters, ${difference}`
+    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 = {
@@ -203,7 +210,7 @@ interface IResponse {
 
 function onError(response: IResponse) {
   const { error: errorCode } = response.params
-  const errorMsg = store.errors[errorCode] ?? 'Something went wrong'
+  const errorMsg = store.errors[errorCode] ?? errorCode
 
   if ([45349638, 45349637].includes(errorCode)) {
     store.sequence.decreaseSeq()