@rc-ex/ws 1.3.2 → 1.3.4

package/dist/esm/subscription.js

@@ -0,0 +1,173 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import Utils from "./utils";
+var Subscription = /** @class */ (function () {
+    function Subscription(wse, eventFilters, callback) {
+        var _this = this;
+        this.enabled = true;
+        this.wse = wse;
+        this.eventFilters = eventFilters;
+        this.eventListener = function (mEvent) {
+            var event = mEvent;
+            var _a = Utils
+                .splitWsgData(event.data), meta = _a[0], body = _a[1];
+            if (_this.enabled && meta.type === "ServerNotification" &&
+                body.subscriptionId === _this.subscriptionInfo.id) {
+                callback(body);
+            }
+        };
+        this.setupWsEventListener();
+    }
+    Subscription.prototype.setupWsEventListener = function () {
+        this.wse.ws.addEventListener("message", this.eventListener);
+    };
+    Object.defineProperty(Subscription.prototype, "requestBody", {
+        get: function () {
+            return {
+                deliveryMode: { transportType: "WebSocket" }, // because WebSocket is not in spec
+                eventFilters: this.eventFilters,
+            };
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Subscription.prototype.subscribe = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this;
+                        return [4 /*yield*/, this.wse.request("POST", "/restapi/v1.0/subscription", this.requestBody)];
+                    case 1:
+                        _a.subscriptionInfo = (_b.sent()).data;
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    Subscription.prototype.refresh = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, e_1, re;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (!this.subscriptionInfo) {
+                            return [2 /*return*/];
+                        }
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 6]);
+                        _a = this;
+                        return [4 /*yield*/, this.wse.request("PUT", "/restapi/v1.0/subscription/".concat(this.subscriptionInfo.id), this.requestBody)];
+                    case 2:
+                        _a.subscriptionInfo = (_b.sent()).data;
+                        return [3 /*break*/, 6];
+                    case 3:
+                        e_1 = _b.sent();
+                        re = e_1;
+                        if (!(re.response && re.response.status === 404)) return [3 /*break*/, 5];
+                        // subscription expired
+                        return [4 /*yield*/, this.subscribe()];
+                    case 4:
+                        // subscription expired
+                        _b.sent();
+                        _b.label = 5;
+                    case 5: return [3 /*break*/, 6];
+                    case 6: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    Subscription.prototype.revoke = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var e_2, re;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!this.subscriptionInfo) {
+                            return [2 /*return*/];
+                        }
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.wse.request("DELETE", "/restapi/v1.0/subscription/".concat(this.subscriptionInfo.id))];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        e_2 = _a.sent();
+                        re = e_2;
+                        if (re.response && re.response.status === 404) {
+                            // ignore
+                            if (this.wse.options.debugMode) {
+                                console.debug("Subscription ".concat(this.subscriptionInfo.id, " doesn't exist on server side"));
+                            }
+                        }
+                        else if (re.response && re.response.status === 401) {
+                            // ignore
+                            if (this.wse.options.debugMode) {
+                                console.debug("Token invalid when trying to revoke subscription");
+                            }
+                        }
+                        else {
+                            throw e_2;
+                        }
+                        return [3 /*break*/, 4];
+                    case 4:
+                        this.remove();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    Subscription.prototype.remove = function () {
+        if (this.timeout) {
+            global.clearTimeout(this.timeout);
+            this.timeout = undefined;
+        }
+        this.enabled = false;
+        this.subscriptionInfo = undefined;
+        if (this.wse.ws) {
+            this.wse.ws.removeEventListener("message", this.eventListener);
+        }
+        this.wse.subscription = undefined;
+    };
+    return Subscription;
+}());
+export default Subscription;
+//# sourceMappingURL=subscription.js.map

package/dist/esm/subscription.js.map

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

package/{lib → dist}/esm/types.d.ts

@@ -1,5 +1,5 @@
-import type RingCentral from "@rc-ex/core";
-import type { RestMethod, RestRequestConfig, RestResponse } from "@rc-ex/core/lib/esm/types.js";
+import type RingCentral from "@rc-ex/core/index";
+import type { RestMethod, RestRequestConfig, RestResponse } from "@rc-ex/core/types";
 import type WS from "isomorphic-ws";
 export interface WsToken {
     uri: string;

package/dist/esm/types.js

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

package/dist/esm/types.js.map

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

package/{lib → dist/esm}/utils.d.ts

@@ -1,5 +1,5 @@
 import type WS from "isomorphic-ws";
-import type { WsgEvent, WsgMeta } from "./types.js";
+import type { WsgEvent, WsgMeta } from "./types";
 declare class Utils {
     static splitWsgData(wsgData: string): [WsgMeta, any];
     static debugWebSocket(_ws: WS): void;

package/dist/esm/utils.js

@@ -0,0 +1,111 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import ClosedException from "./exceptions/ClosedException";
+import TimeoutException from "./exceptions/TimeoutException";
+var Utils = /** @class */ (function () {
+    function Utils() {
+    }
+    Utils.splitWsgData = function (wsgData) {
+        if (wsgData.includes(",--Boundary")) {
+            var index = wsgData.indexOf(",--Boundary");
+            return [
+                JSON.parse(wsgData.substring(1, index)),
+                wsgData.substring(index + 1, wsgData.length - 1),
+            ];
+        }
+        return JSON.parse(wsgData);
+    };
+    Utils.debugWebSocket = function (_ws) {
+        var _this = this;
+        var ws = _ws;
+        var send = ws.send.bind(ws);
+        ws.send = function (str) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, send(str)];
+                    case 1:
+                        _a.sent();
+                        console.debug("*** WebSocket outgoing message: ***\n".concat(JSON.stringify(JSON.parse(str), null, 2), "\n******"));
+                        return [2 /*return*/];
+                }
+            });
+        }); };
+        ws.addEventListener("message", function (mEvent) {
+            var event = mEvent;
+            console.debug("*** WebSocket incoming message: ***\n".concat(JSON.stringify(JSON.parse(event.data), null, 2), "\n******"));
+        });
+        ws.addEventListener("open", function (event) {
+            console.debug("WebSocket open event:", event);
+        });
+        ws.addEventListener("error", function (event) {
+            console.debug("WebSocket error event:", event);
+        });
+        ws.addEventListener("close", function (event) {
+            console.debug("WebSocket close event:", event);
+        });
+    };
+    Utils.waitForWebSocketMessage = function (ws, matchCondition, timeout) {
+        if (timeout === void 0) { timeout = 60000; }
+        return new Promise(function (resolve, reject) {
+            var checkHandle = setInterval(function () {
+                if (ws.readyState === ws.CLOSED) {
+                    clearInterval(checkHandle);
+                    reject(new ClosedException());
+                }
+            }, 1000);
+            var timeoutHandle = setTimeout(function () {
+                ws.removeEventListener("message", handler);
+                clearInterval(checkHandle);
+                reject(new TimeoutException());
+            }, timeout);
+            var handler = function (mEvent) {
+                var event = mEvent;
+                var _a = Utils.splitWsgData(event.data), meta = _a[0], body = _a[1];
+                if (matchCondition(meta)) {
+                    ws.removeEventListener("message", handler);
+                    clearInterval(checkHandle);
+                    clearTimeout(timeoutHandle);
+                    resolve([meta, body, event]);
+                }
+            };
+            ws.addEventListener("message", handler);
+        });
+    };
+    return Utils;
+}());
+export default Utils;
+//# sourceMappingURL=utils.js.map

package/dist/esm/utils.js.map

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

package/package.json

@@ -1,13 +1,30 @@
 {
   "name": "@rc-ex/ws",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "WebSocket extension for ringcentral-extensible project",
   "author": "Tyler Liu <tyler.liu@ringcentral.com>",
   "homepage": "https://github.com/ringcentral/ringcentral-extensible/tree/master/packages/extensions/ws",
   "license": "MIT",
-  "types": "./lib/esm/index.d.ts",
-  "main": "./lib/index.js",
-  "module": "./lib/esm/index.js",
+  "main": "dist/cjs/index.js",
+  "types": "dist/cjs/index.d.ts",
+  "module": "dist/esm/index.js",
+  "exports": {
+    ".": {
+      "import": "./dist/esm/index.js",
+      "require": "./dist/cjs/index.js",
+      "types": "./dist/esm/index.d.ts"
+    },
+    "./lib/*": {
+      "import": "./dist/esm/*.js",
+      "require": "./dist/cjs/*.js",
+      "types": "./dist/esm/*.d.ts"
+    },
+    "./*": {
+      "import": "./dist/esm/*.js",
+      "require": "./dist/cjs/*.js",
+      "types": "./dist/esm/*.d.ts"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ringcentral/ringcentral-extensible.git"
@@ -26,11 +43,8 @@
     "wait-for-async": "^0.7.10",
     "ws": "^8.18.0"
   },
-  "devDependencies": {
-    "@rc-ex/core": "^1.6.2"
-  },
   "scripts": {
-    "rename-to-cjs": "find lib -type f -name '*.js' -exec sh -c 'mv \"$0\" \"${0%.js}.cjs\"' {} \\;"
+    "build": "tsc -p tsconfig.cjs.json && tsc -p tsconfig.esm.json"
   },
-  "gitHead": "3406b92ec7a43ce3aea9e2f77e9fc81a5a713fdd"
+  "gitHead": "4a3dfa3b7c78e8460c531bcdd82802c7fcf3eee3"
 }

package/src/exceptions/ConnectionException.ts

@@ -1,5 +1,5 @@
-import type { WsgError, WsgEvent, WsgMeta } from "../types.js";
-import Utils from "../utils.js";
+import type { WsgError, WsgEvent, WsgMeta } from "../types";
+import Utils from "../utils";
 
 class ConnectionException extends Error {
   public wsgEvent: WsgEvent;

package/src/index.ts

@@ -1,19 +1,19 @@
-import type RingCentral from "@rc-ex/core";
+import type RingCentral from "@rc-ex/core/index";
 import type {
   RestMethod,
   RestRequestConfig,
   RestResponse,
-} from "@rc-ex/core/lib/esm/types.js";
-import SdkExtension from "@rc-ex/core/lib/esm/SdkExtension.js";
+} from "@rc-ex/core/types";
+import SdkExtension from "@rc-ex/core/SdkExtension";
 import type { MessageEvent } from "isomorphic-ws";
 import WS from "isomorphic-ws";
 import hyperid from "hyperid";
 import { EventEmitter } from "events";
 import waitFor from "wait-for-async";
-import RestException from "@rc-ex/core/lib/esm/RestException.js";
-import type SubscriptionInfo from "@rc-ex/core/lib/esm/definitions/SubscriptionInfo.js";
+import RestException from "@rc-ex/core/RestException";
+import type SubscriptionInfo from "@rc-ex/core/definitions/SubscriptionInfo";
 
-import { request } from "./rest.js";
+import { request } from "./rest";
 import type {
   ConnectionDetails,
   WebSocketExtensionInterface,
@@ -21,10 +21,10 @@ import type {
   Wsc,
   WsgEvent,
   WsToken,
-} from "./types.js";
-import Subscription from "./subscription.js";
-import ConnectionException from "./exceptions/ConnectionException.js";
-import Utils from "./utils.js";
+} from "./types";
+import Subscription from "./subscription";
+import ConnectionException from "./exceptions/ConnectionException";
+import Utils from "./utils";
 
 const CONNECTING = 0;
 const OPEN = 1;

package/src/rest.ts

@@ -2,13 +2,13 @@ import type {
   RestMethod,
   RestRequestConfig,
   RestResponse,
-} from "@rc-ex/core/lib/esm/types.js";
-import RestException from "@rc-ex/core/lib/esm/RestException.js";
+} from "@rc-ex/core/types";
+import RestException from "@rc-ex/core/RestException";
 import hyperid from "hyperid";
 import { getReasonPhrase } from "http-status-codes";
 
-import Utils from "./utils.js";
-import type { WebSocketExtensionInterface } from "./types.js";
+import Utils from "./utils";
+import type { WebSocketExtensionInterface } from "./types";
 
 const version = "0.16";
 

package/src/subscription.ts

@@ -1,14 +1,10 @@
-import type CreateSubscriptionRequest from "@rc-ex/core/lib/esm/definitions/CreateSubscriptionRequest.js";
-import type SubscriptionInfo from "@rc-ex/core/lib/esm/definitions/SubscriptionInfo.js";
-import type { RestResponse } from "@rc-ex/core/lib/esm/types.js";
+import type CreateSubscriptionRequest from "@rc-ex/core/definitions/CreateSubscriptionRequest";
+import type SubscriptionInfo from "@rc-ex/core/definitions/SubscriptionInfo";
+import type { RestResponse } from "@rc-ex/core/types";
 import type { MessageEvent } from "ws";
 
-import type {
-  WebSocketExtensionInterface,
-  WsgEvent,
-  WsgMeta,
-} from "./types.js";
-import Utils from "./utils.js";
+import type { WebSocketExtensionInterface, WsgEvent, WsgMeta } from "./types";
+import Utils from "./utils";
 
 class Subscription {
   public subscriptionInfo?: SubscriptionInfo;

package/src/types.ts

@@ -1,9 +1,9 @@
-import type RingCentral from "@rc-ex/core";
+import type RingCentral from "@rc-ex/core/index";
 import type {
   RestMethod,
   RestRequestConfig,
   RestResponse,
-} from "@rc-ex/core/lib/esm/types.js";
+} from "@rc-ex/core/types";
 import type WS from "isomorphic-ws";
 
 export interface WsToken {

package/src/utils.ts

@@ -1,9 +1,9 @@
 import type { MessageEvent } from "isomorphic-ws";
 import type WS from "isomorphic-ws";
 
-import type { WsgEvent, WsgMeta } from "./types.js";
-import ClosedException from "./exceptions/ClosedException.js";
-import TimeoutException from "./exceptions/TimeoutException.js";
+import type { WsgEvent, WsgMeta } from "./types";
+import ClosedException from "./exceptions/ClosedException";
+import TimeoutException from "./exceptions/TimeoutException";
 
 class Utils {
   public static splitWsgData(wsgData: string): [WsgMeta, any] {

package/tsconfig.cjs.json

@@ -0,0 +1,28 @@
+{
+  "compilerOptions": {
+    "esModuleInterop": true,
+    "module": "commonjs",
+    "declaration": true,
+    "outDir": "./dist/cjs",
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "paths": {
+      "@rc-ex/core/*": [
+        "../../core/dist/cjs/*"
+      ],
+      "isomorphic-ws": [
+        "../../../node_modules/isomorphic-ws/node.js"
+      ],
+      "wait-for-async": [
+        "../../../node_modules/wait-for-async/dist/cjs/index.js"
+      ],
+      "hyperid": [
+        "../../../node_modules/hyperid/hyperid.js"
+      ],
+      "http-status-codes": [
+        "../../../node_modules/http-status-codes/build/cjs/index.js"
+      ]
+    }
+  },
+  "include": ["src/**/*.ts"]
+}

package/tsconfig.esm.json

@@ -0,0 +1,28 @@
+{
+  "compilerOptions": {
+    "esModuleInterop": true,
+    "module": "esnext",
+    "declaration": true,
+    "outDir": "./dist/esm",
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "paths": {
+      "@rc-ex/core/*": [
+        "../../core/dist/esm/*"
+      ],
+      "isomorphic-ws": [
+        "../../../node_modules/isomorphic-ws/node.js"
+      ],
+      "wait-for-async": [
+        "../../../node_modules/wait-for-async/dist/esm/index.js"
+      ],
+      "hyperid": [
+        "../../../node_modules/hyperid/hyperid.js"
+      ],
+      "http-status-codes": [
+        "../../../node_modules/http-status-codes/build/es/index.js"
+      ]
+    }
+  },
+  "include": ["src/**/*.ts"]
+}

package/lib/esm/exceptions/ClosedException.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class ClosedException extends Error {
-    constructor(message) {
-        super(message ?? "WebSocket has been closed");
-    }
-}
-exports.default = ClosedException;
-//# sourceMappingURL=ClosedException.js.map

package/lib/esm/exceptions/ClosedException.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ClosedException.js","sourceRoot":"","sources":["../../../src/exceptions/ClosedException.ts"],"names":[],"mappings":";;AAAA,MAAM,eAAgB,SAAQ,KAAK;IACjC,YAAmB,OAAgB;QACjC,KAAK,CAAC,OAAO,IAAI,2BAA2B,CAAC,CAAC;IAChD,CAAC;CACF;AAED,kBAAe,eAAe,CAAC"}

package/lib/esm/exceptions/ConnectionException.js

@@ -1,18 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils_js_1 = __importDefault(require("../utils.js"));
-class ConnectionException extends Error {
-    wsgEvent;
-    wsgError;
-    constructor(wsgEvent) {
-        const [, wsgError] = utils_js_1.default.splitWsgData(wsgEvent.data);
-        super(JSON.stringify(wsgError, null, 2));
-        this.wsgEvent = wsgEvent;
-        this.wsgError = wsgError;
-    }
-}
-exports.default = ConnectionException;
-//# sourceMappingURL=ConnectionException.js.map

package/lib/esm/exceptions/ConnectionException.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ConnectionException.js","sourceRoot":"","sources":["../../../src/exceptions/ConnectionException.ts"],"names":[],"mappings":";;;;;AACA,2DAAgC;AAEhC,MAAM,mBAAoB,SAAQ,KAAK;IAC9B,QAAQ,CAAW;IAEnB,QAAQ,CAAW;IAE1B,YAAmB,QAAkB;QACnC,MAAM,CAAC,EAAE,QAAQ,CAAC,GAAwB,kBAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5E,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;CACF;AAED,kBAAe,mBAAmB,CAAC"}

package/lib/esm/exceptions/TimeoutException.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class TimeoutException extends Error {
-    constructor(message) {
-        super(message ?? "Failed to receive expected WebSocket message in time.");
-    }
-}
-exports.default = TimeoutException;
-//# sourceMappingURL=TimeoutException.js.map

package/lib/esm/exceptions/TimeoutException.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"TimeoutException.js","sourceRoot":"","sources":["../../../src/exceptions/TimeoutException.ts"],"names":[],"mappings":";;AAAA,MAAM,gBAAiB,SAAQ,KAAK;IAClC,YAAmB,OAAgB;QACjC,KAAK,CAAC,OAAO,IAAI,uDAAuD,CAAC,CAAC;IAC5E,CAAC;CACF;AAED,kBAAe,gBAAgB,CAAC"}