@pathscale/wss-adapter 2.0.2 → 2.0.4

package/dist/index.d.ts

@@ -0,0 +1,4 @@
+export { default } from './wss-adapter.js';
+export { default as wssAdapter } from './wss-adapter.js';
+export type { IWssAdapter, IConfiguration, IServiceConfig, IServiceAdapter, IMethodInfo, IErrors, IStore, ApiMethods, ServiceName, } from './types.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACzD,YAAY,EACV,WAAW,EACX,cAAc,EACd,cAAc,EACd,eAAe,EACf,WAAW,EACX,OAAO,EACP,MAAM,EACN,UAAU,EACV,WAAW,GACZ,MAAM,YAAY,CAAC"}

package/dist/index.js

@@ -0,0 +1,3 @@
+export { default } from './wss-adapter.js';
+export { default as wssAdapter } from './wss-adapter.js';
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/types.d.ts

@@ -0,0 +1,57 @@
+export interface IMethodInfo {
+    name: string;
+    parameters: string[];
+}
+export interface IServiceConfig {
+    remote: string;
+    methods: Record<string, IMethodInfo>;
+    subscriptions?: Record<string, (data: any) => void>;
+    onDisconnect?: (event: CloseEvent) => void;
+}
+export interface IErrorCode {
+    code: number;
+    message: string;
+}
+export interface IErrors {
+    language: string;
+    codes: IErrorCode[];
+}
+export interface IConfiguration {
+    timeout: number;
+    services: Record<string, IServiceConfig>;
+    errors: IErrors;
+    onError?: (message: string) => void;
+}
+export interface IStore {
+    timeout: number;
+    errors: IErrors;
+    services: Record<string, IServiceConfig>;
+    subscriptions: Record<string, Record<string, (data: any) => void>>;
+    sequence: {
+        value: number;
+        getSeq(): number;
+        decreaseSeq(): void;
+    };
+    sessions: Record<string, WebSocket>;
+    pendingPromises: Record<number, {
+        resolve: (value: any) => void;
+        reject: (reason: any) => void;
+        toHandler: number;
+        methodName: string;
+    }>;
+    onError?: (message: string) => void;
+}
+export interface IServiceAdapter {
+    connect: <T>(payload?: string | string[], remote?: string) => Promise<T>;
+    disconnect: () => void;
+}
+export type ServiceName = "app";
+export type ApiMethods = {
+    app: Record<string, (params?: any) => Promise<any>>;
+};
+export interface IWssAdapter {
+    services: Record<ServiceName, IServiceAdapter>;
+    sessions: ApiMethods;
+    configure: (configuration: IConfiguration) => void;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AACA,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC,CAAC;IACpD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC;CAC5C;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,OAAO;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,UAAU,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACzC,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC;AAED,MAAM,WAAW,MAAM;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACzC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC;IACnE,QAAQ,EAAE;QACR,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,IAAI,MAAM,CAAC;QACjB,WAAW,IAAI,IAAI,CAAC;KACrB,CAAC;IACF,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,eAAe,EAAE,MAAM,CACrB,MAAM,EACN;QACE,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;QAC9B,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;QAC9B,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;KACpB,CACF,CAAC;IACF,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IACzE,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB;AAED,MAAM,MAAM,WAAW,GAAG,KAAK,CAAC;AAEhC,MAAM,MAAM,UAAU,GAAG;IACvB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;CACrD,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IAC/C,QAAQ,EAAE,UAAU,CAAC;IACrB,SAAS,EAAE,CAAC,aAAa,EAAE,cAAc,KAAK,IAAI,CAAC;CACpD"}

package/dist/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}

package/dist/wss-adapter.d.ts

@@ -0,0 +1,4 @@
+import type { IWssAdapter } from './types.js';
+declare const wssAdapter: IWssAdapter;
+export default wssAdapter;
+//# sourceMappingURL=wss-adapter.d.ts.map

package/dist/wss-adapter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wss-adapter.d.ts","sourceRoot":"","sources":["../src/wss-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAKV,WAAW,EAEZ,MAAM,YAAY,CAAC;AACpB,QAAA,MAAM,UAAU,EAAE,WAIjB,CAAC;AAsRF,eAAe,UAAU,CAAC"}

package/dist/wss-adapter.js

@@ -0,0 +1,203 @@
+const wssAdapter = {
+    services: {},
+    sessions: {},
+    configure() { },
+};
+const store = {
+    timeout: 0,
+    errors: {
+        language: "en",
+        codes: [],
+    },
+    services: {},
+    subscriptions: {},
+    sequence: {
+        value: 1,
+        getSeq() {
+            store.sequence.value += 1;
+            return store.sequence.value;
+        },
+        decreaseSeq() {
+            store.sequence.value -= 1;
+        },
+    },
+    sessions: {},
+    pendingPromises: {},
+};
+wssAdapter.configure = (configuration) => {
+    const { timeout, services, errors, onError } = configuration;
+    store.timeout = timeout;
+    store.errors = errors;
+    store.services = services;
+    if (onError !== undefined) {
+        store.onError = onError;
+    }
+    for (const [serviceName, serviceConfig] of Object.entries(services)) {
+        const serviceNameTyped = serviceName;
+        wssAdapter.services[serviceNameTyped] = {
+            connect: (payload, remote) => connectHandler(serviceName, serviceConfig, payload, remote),
+            disconnect: () => disconnectHandler(serviceName),
+        };
+        if (serviceConfig.subscriptions) {
+            store.subscriptions[serviceName] = serviceConfig.subscriptions;
+        }
+        wssAdapter.sessions[serviceName] = new Proxy({}, {
+            get: (_target, methodName) => (payload) => sendHandler(serviceName, serviceConfig, methodName, payload),
+        });
+    }
+};
+const connectHandler = (serviceName, serviceConfig, payload, remote) => {
+    return new Promise((resolve, reject) => {
+        if (!payload || !Array.isArray(payload)) {
+            reject(new Error("WebSocket protocols required for authentication"));
+            return;
+        }
+        const protocols = payload;
+        const wsConnection = new WebSocket(remote || serviceConfig.remote, protocols);
+        store.sessions[serviceName] = wsConnection;
+        wsConnection.onmessage = (event) => {
+            const response = JSON.parse(event.data);
+            if (response.type === "Immediate" &&
+                response.method === 20000 &&
+                response.params?.accessToken) {
+                const session = store.sessions[serviceName];
+                if (session) {
+                    session.onmessage = receiveHandler;
+                }
+                resolve(response.params);
+                return;
+            }
+            if (response.type === "Error" || response.code) {
+                const error = store.errors.codes.find((c) => c.code === response.code);
+                const errorMsg = response.params || error?.message || response.code;
+                if (store.onError) {
+                    store.onError(String(errorMsg));
+                }
+                reject(new Error(String(errorMsg)));
+                return;
+            }
+            const session = store.sessions[serviceName];
+            if (session) {
+                session.onmessage = receiveHandler;
+            }
+            resolve(response.params);
+        };
+        wsConnection.onclose = (event) => {
+            if (!event.wasClean) {
+                reject(new Error(`WebSocket closed unexpectedly (code ${event.code || "unknown"})`));
+            }
+            serviceConfig.onDisconnect?.(event);
+        };
+        wsConnection.onerror = (event) => {
+            console.error("WebSocket error:", event);
+            reject(new Error("WebSocket connection failed"));
+        };
+    });
+};
+const disconnectHandler = (serviceName) => {
+    const session = store.sessions[serviceName];
+    if (session) {
+        session.close();
+    }
+};
+const sendHandler = (serviceName, serviceConfig, methodName, params = {}) => {
+    const methodEntry = Object.entries(serviceConfig.methods)
+        .map(([code, info]) => ({ code, info }))
+        .find(({ info }) => info.name === methodName);
+    if (!methodEntry) {
+        throw new Error(`method ${methodName} not available in ${serviceName} service`);
+    }
+    const methodCode = methodEntry.code;
+    const methodInfo = serviceConfig.methods[methodCode];
+    if (!methodInfo) {
+        throw new Error(`method configuration missing for ${methodName} in ${serviceName} service`);
+    }
+    const paramsArray = methodInfo.parameters.map((paramName) => params[paramName]);
+    const payload = {
+        method: Number.parseInt(methodCode),
+        seq: store.sequence.getSeq(),
+        params: paramsArray,
+    };
+    return new Promise((resolve, reject) => {
+        const session = store.sessions[serviceName];
+        if (!session) {
+            reject(new Error(`No active session for service ${serviceName}`));
+            return;
+        }
+        session.send(JSON.stringify(payload));
+        store.pendingPromises[payload.seq] = {
+            resolve,
+            reject,
+            toHandler: setTimeout(() => {
+                reject(new Error(`${methodName} took too long, aborting`));
+            }, store.timeout),
+            methodName,
+        };
+    });
+};
+const receiveHandler = (event) => {
+    const response = JSON.parse(event.data);
+    if (response.type === "Immediate" ||
+        (response.type === "Error" && response.method) ||
+        response.method === 0) {
+        const error = response.code ||
+            response.params?.success === false ||
+            response.params?.error;
+        const resolve = (payload) => {
+            const executor = store.pendingPromises[response.seq];
+            if (executor) {
+                clearTimeout(executor.toHandler);
+                delete store.pendingPromises[response.seq];
+                executor.resolve(payload);
+            }
+        };
+        if (error) {
+            onError(response);
+        }
+        else {
+            resolve(response);
+        }
+    }
+    else if (response.type === "Stream") {
+        console.log("Stream response:", response);
+    }
+};
+function onError(response) {
+    const error = store.errors.codes.find((c) => c.code === response.code);
+    const params = typeof response.params === "object" && response.params !== null
+        ? response.params
+        : {};
+    const errorMsg = params.reason ||
+        params.error ||
+        response.params ||
+        error?.message;
+    const errorCode = response.code ?? "Error";
+    let methodName = "";
+    if (response.method) {
+        for (const serviceConfig of Object.values(store.services)) {
+            const methodKey = response.method.toString();
+            const method = serviceConfig.methods[methodKey];
+            if (method) {
+                methodName = method.name;
+                break;
+            }
+        }
+    }
+    const fullErrorMsg = methodName
+        ? `[${errorCode}]: ${methodName}: ${errorMsg}`
+        : String(errorMsg);
+    if (store.onError) {
+        store.onError(fullErrorMsg);
+    }
+    const executor = store.pendingPromises[response.seq];
+    if (executor) {
+        clearTimeout(executor.toHandler);
+        executor.reject(new Error(`${executor.methodName || ""}: ${errorMsg}`, { cause: errorCode }));
+        delete store.pendingPromises[response.seq];
+    }
+    else {
+        throw new Error("Unknown request failed");
+    }
+}
+export default wssAdapter;
+//# sourceMappingURL=wss-adapter.js.map

package/dist/wss-adapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wss-adapter.js","sourceRoot":"","sources":["../src/wss-adapter.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pathscale/wss-adapter",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "Modern WebSocket adapter for PathScale WSS services",
   "type": "module",
   "main": "dist/index.js",

package/dist/types/index.d.ts

@@ -1,68 +0,0 @@
-interface IService {
-    remote: string;
-    methods: {
-        [methodCode: string]: {
-            name: string;
-            parameters: string[];
-        };
-    };
-}
-declare type ISubscriptions = Record<string, unknown>;
-interface IServiceConfig extends IService {
-    subscriptions?: ISubscriptions;
-    onDisconnect: (event: {
-        code: number;
-        reason: string;
-        wasClean: boolean;
-    }) => void | null;
-}
-interface IServices {
-    [serviceName: string]: IServiceConfig;
-}
-interface IErrors {
-    [errorCode: number]: string;
-}
-interface IConfiguration {
-    timeout: number;
-    services: IServices;
-    errors: IErrors;
-}
-interface IServiceConnect {
-    connect<T>(payload: string | string[] | undefined, remote?: string): Promise<T>;
-    disconnect: () => void;
-}
-interface IWssAdapter {
-    services: {
-        [serviceName: string]: IServiceConnect;
-    };
-    sessions: {
-        [serviceName: string]: Record<string, <Response, Params = {}>(payload?: Params) => Promise<Response>>;
-    };
-    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;
-        reject: (error: Error) => void;
-        toHandler: ReturnType<typeof setTimeout>;
-        methodName: string;
-    };
-}
-interface IStore {
-    timeout: number;
-    errors: IErrors;
-    services: IServices;
-    sequence: ISequence;
-    sessions: ISessions;
-    subscriptions: ISubscriptions;
-    pendingPromises: IPendingPromises;
-}
-export { IStore, IWssAdapter, IServiceConfig, IConfiguration, IErrors, IServices, IService, };

package/dist/types/index.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/wssAdapter.d.ts

@@ -1,3 +0,0 @@
-import { IWssAdapter } from './types';
-declare const wssAdapter: IWssAdapter;
-export default wssAdapter;

package/dist/wssAdapter.js

@@ -1,174 +0,0 @@
-"use strict";
-/* eslint-disable compat/compat */
-/* eslint-disable promise/avoid-new */
-/* eslint-disable @typescript-eslint/no-empty-function */
-Object.defineProperty(exports, "__esModule", { value: true });
-var wssAdapter = {
-    services: {},
-    sessions: {},
-    configure: function () { },
-};
-var store = {
-    timeout: 0,
-    errors: {},
-    services: {},
-    subscriptions: {},
-    sequence: {
-        value: 1,
-        getSeq: function () {
-            store.sequence.value += 1;
-            return store.sequence.value;
-        },
-        decreaseSeq: function () {
-            store.sequence.value -= 1;
-        },
-    },
-    sessions: {},
-    pendingPromises: {},
-};
-wssAdapter.configure = function (configuration) {
-    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;
-    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])`
-        wssAdapter.services[serviceName] = {
-            connect: function (payload, remote) {
-                return connectHandler(serviceName, serviceConfig, payload, remote);
-            },
-            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({}, {
-            get: function (target, methodName) { return function (payload) {
-                return sendHandler(serviceName, serviceConfig, methodName, payload);
-            }; },
-        });
-    };
-    for (var _i = 0, _a = Object.entries(services); _i < _a.length; _i++) {
-        var _b = _a[_i], serviceName = _b[0], serviceConfig = _b[1];
-        _loop_1(serviceName, serviceConfig);
-    }
-};
-var connectHandler = function (serviceName, serviceConfig, payload, remote) {
-    return new Promise(function (resolve, reject) {
-        store.sessions[serviceName] = new WebSocket(remote || serviceConfig.remote, payload);
-        store.sessions[serviceName].onmessage = function (event) {
-            var _a;
-            var response = JSON.parse(event.data);
-            console.log(response);
-            if (response.params.error) {
-                reject(new Error((_a = store.errors[response.params.error]) !== null && _a !== void 0 ? _a : response.params.error));
-                return;
-            }
-            store.sessions[serviceName].onmessage = receiveHandler;
-            resolve(response.params);
-        };
-        store.sessions[serviceName].onclose = function (event) {
-            var _a;
-            (_a = serviceConfig.onDisconnect) === null || _a === void 0 ? void 0 : _a.call(serviceConfig, event);
-            reject(new Error("code: ".concat(event.code, ", reason: ").concat(event.reason, ", wasClean: ").concat(event.wasClean)));
-        };
-    });
-};
-var disconnectHandler = function (serviceName) {
-    var _a;
-    (_a = store.sessions[serviceName]) === null || _a === void 0 ? void 0 : _a.close();
-};
-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];
-        return ({ code: code, info: info });
-    })
-        .find(function (_a) {
-        var info = _a.info;
-        return info.name === methodName;
-    })) === null || _a === void 0 ? void 0 : _a.code;
-    if (!methodCode) {
-        throw new Error("method ".concat(methodName, " not available in ").concat(serviceName, " service"));
-    }
-    var payload = {
-        method: Number.parseInt(methodCode),
-        seq: store.sequence.getSeq(),
-        params: params,
-    };
-    console.log("".concat(serviceName, "::").concat(methodName, " sends:"), payload);
-    return new Promise(function (resolve, reject) {
-        store.sessions[serviceName].send(JSON.stringify(payload));
-        // save executor so that when response for this request comes the promise can be resolved
-        store.pendingPromises[payload.seq] = {
-            resolve: resolve,
-            reject: reject,
-            toHandler: setTimeout(function () {
-                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(((_a = store.pendingPromises[response.seq]) === null || _a === void 0 ? void 0 : _a.methodName) || response.method, " got:"), response);
-        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];
-            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 (response.resource) {
-        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 errorCode = response.params.error;
-    var errorMsg = (_a = store.errors[errorCode]) !== null && _a !== void 0 ? _a : errorCode;
-    if ([45349638, 45349637].includes(errorCode)) {
-        store.sequence.decreaseSeq();
-    }
-    // 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');
-    }
-}
-exports.default = wssAdapter;