qws-browser 1.1.1 → 2.0.0

package/dist/common/queue.js

@@ -1,14 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const messageencode_1 = require("../browser/messageencode");
+import { serializeMessage } from '../browser/messageencode.js';
 /**
  * FIFO data structure implementation for outgoing qws messages
  * Implements acknowledgment system, so no messages are deleted until acknowledged,
  * but new messages may be added while waiting for ack.
  */
-class QwsMessageQueue {
+export default class QwsMessageQueue {
     constructor() {
-        this.messages = {};
+        this.messages = new Map();
         this.readIdx = 0;
         this.ackIdx = 0;
         this.writeIdx = 0;
@@ -23,8 +21,8 @@ class QwsMessageQueue {
     produce(message) {
         const idx = this.writeIdx;
         message.headers.idx = idx;
-        const data = (0, messageencode_1.serializeMessage)(message);
-        this.messages[idx] = data;
+        const data = serializeMessage(message);
+        this.messages.set(idx, data);
         this.numUnsentMessages += 1;
         this.numUnsentBytes += data.size;
         this.numUnackMessages += 1;
@@ -38,7 +36,7 @@ class QwsMessageQueue {
      */
     consume() {
         const idx = this.readIdx;
-        const ret = this.messages[idx];
+        const ret = this.messages.get(idx);
         this.numUnsentMessages -= 1;
         this.numUnsentBytes -= ret.size;
         this.readIdx += 1;
@@ -50,8 +48,8 @@ class QwsMessageQueue {
     acknowledge(idx) {
         while (this.ackIdx <= idx) {
             this.numUnackMessages -= 1;
-            this.numUnackBytes -= this.messages[this.ackIdx].size;
-            delete this.messages[this.ackIdx];
+            this.numUnackBytes -= this.messages.get(this.ackIdx).size;
+            this.messages.delete(this.ackIdx);
             this.ackIdx += 1;
         }
     }
@@ -62,8 +60,8 @@ class QwsMessageQueue {
         while (this.readIdx > idx) {
             this.readIdx -= 1;
             this.numUnsentMessages += 1;
-            this.numUnsentBytes += this.messages[this.readIdx].size;
+            this.numUnsentBytes += this.messages.get(this.readIdx).size;
         }
     }
 }
-exports.default = QwsMessageQueue;
+//# sourceMappingURL=queue.js.map

package/dist/common/queue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../src/common/queue.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAG/D;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe;IAWlC;QACE,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAChB,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;QAElB,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;QACxB,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,OAA0B;QAChC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC1B,OAAO,CAAC,OAAO,CAAC,GAAG,GAAG,GAAG,CAAC;QAC1B,MAAM,IAAI,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACvC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,iBAAiB,IAAI,CAAC,CAAC;QAC5B,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,IAAI,CAAC;QACjC,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC;QAC3B,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,IAAI,CAAC;QAEhC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC;QACnB,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;;OAGG;IACH,OAAO;QACL,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC;QACzB,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;QAEpC,IAAI,CAAC,iBAAiB,IAAI,CAAC,CAAC;QAC5B,IAAI,CAAC,cAAc,IAAI,GAAG,CAAC,IAAI,CAAC;QAChC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;QAClB,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpB,CAAC;IAED;;OAEG;IACH,WAAW,CAAC,GAAW;QACrB,OAAO,IAAI,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC;YAC3B,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAE,CAAC,IAAI,CAAC;YAC3D,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC;YAC1B,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;YAClB,IAAI,CAAC,iBAAiB,IAAI,CAAC,CAAC;YAC5B,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAE,CAAC,IAAI,CAAC;QAC/D,CAAC;IACH,CAAC;CACF"}

package/dist/common/queuews.d.ts

@@ -1,19 +1,19 @@
-import RouteRecognizer from 'route-recognizer';
-import { Binary } from './discriminator';
-import { QwsMessageExtraHeaders, BinaryQwsMessageHeaders, JsonQwsMessageHeaders, ReadyQwsMessageHeaders, QwsParams } from './message';
-import WebSocketMessageQueue from './queue';
-import WrappedWebSocket from '../browser/wrappedws';
+import RouteRecognizer from './router.js';
+import { Binary } from './discriminator.js';
+import { QwsMessageExtraHeaders, BinaryQwsMessageHeaders, JsonQwsMessageHeaders, ReadyQwsMessageHeaders, QwsParams } from './message.js';
+import WebSocketMessageQueue from './queue.js';
+import WrappedWebSocket from '../browser/wrappedws.js';
 /**
  * Callback types
  */
-export declare type ConnectCallback = () => void | number | Promise<void> | Promise<number>;
-export declare type BinCallback = (body: Binary, headers?: BinaryQwsMessageHeaders, params?: QwsParams) => void | Promise<void>;
-export declare type JsonCallback<T> = (body: T, headers?: JsonQwsMessageHeaders, params?: QwsParams) => void | Promise<void>;
-export declare type ReadyCallback = (headers?: ReadyQwsMessageHeaders) => void | Promise<void>;
+export type ConnectCallback = () => void | number | Promise<void> | Promise<number>;
+export type BinCallback = (body: Binary, headers?: BinaryQwsMessageHeaders, params?: QwsParams) => void | Promise<void>;
+export type JsonCallback<T> = (body: T, headers?: JsonQwsMessageHeaders, params?: QwsParams) => void | Promise<void>;
+export type ReadyCallback = (headers?: ReadyQwsMessageHeaders) => void | Promise<void>;
 /**
  * Connection options
  */
-declare type QWebSocketOptions = {
+type QWebSocketOptions = {
     name?: string;
     extraConnectArgs?: Record<string, unknown>;
     reconnect?: boolean;
@@ -60,7 +60,7 @@ export default class QWebSocket {
     setUp(): void;
     flush(): void;
     send(body: Binary | Record<string, unknown>, extraHeaders?: QwsMessageExtraHeaders): number;
-    sendToRoute(route: string, body: Binary | Record<string, unknown>, extraHeaders?: QwsMessageExtraHeaders): number;
+    sendToRoute(route: string | undefined, body: Binary | Record<string, unknown>, extraHeaders?: QwsMessageExtraHeaders): number;
     /**
      * Closes WS and sets promise resolution as callback.
      * Overwrites any manually set up callback for onClose.
@@ -68,3 +68,4 @@ export default class QWebSocket {
     close(): Promise<void>;
 }
 export {};
+//# sourceMappingURL=queuews.d.ts.map

package/dist/common/queuews.d.ts.map

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

package/dist/common/queuews.js

@@ -1,22 +1,17 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const auto_bind_1 = __importDefault(require("auto-bind"));
-const route_recognizer_1 = __importDefault(require("route-recognizer"));
-const queue_1 = __importDefault(require("./queue"));
-const wrappedws_1 = __importDefault(require("../browser/wrappedws"));
-const queryparser_1 = require("./queryparser");
-const logger_1 = __importDefault(require("./logger"));
+import autoBind from 'auto-bind';
+import RouteRecognizer from './router.js';
+import WebSocketMessageQueue from './queue.js';
+import WrappedWebSocket from '../browser/wrappedws.js';
+import { addQueryParamsToUrl } from './queryparser.js';
+import logger from './logger.js';
 const decodeErrorMessage = (event) => {
-    if (event === null || event === void 0 ? void 0 : event.message) {
-        return event.message;
-    }
-    if (event) {
-        return event.toString();
+    const { message } = (event ?? {});
+    if (message) {
+        return message;
     }
-    return 'Unknown error';
+    // best-effort description of arbitrary error values
+    // eslint-disable-next-line @typescript-eslint/no-base-to-string
+    return event ? String(event) : 'Unknown error';
 };
 const defaultOpts = {
     extraConnectArgs: {},
@@ -27,7 +22,7 @@ const defaultOpts = {
 /**
  * Actual queued WebSocket
  */
-class QWebSocket {
+export default class QWebSocket {
     constructor(wsOrUrl, options = {}) {
         this.wsOrUrl = wsOrUrl;
         this.options = {
@@ -36,15 +31,14 @@ class QWebSocket {
         };
         this.name = options.name || 'websocket';
         this.callbacks = {
-            onBin: new route_recognizer_1.default(),
-            onJson: new route_recognizer_1.default(),
+            onBin: new RouteRecognizer(),
+            onJson: new RouteRecognizer(),
         };
-        this.queue = new queue_1.default();
+        this.queue = new WebSocketMessageQueue();
         this.reconnectionAttempts = 0;
         this.needed = true;
-        this.wws = null;
         this.ready = false;
-        (0, auto_bind_1.default)(this);
+        autoBind(this);
         this.setUp();
     }
     /**
@@ -82,7 +76,6 @@ class QWebSocket {
      */
     // eslint-disable-next-line max-lines-per-function
     setUp() {
-        var _a, _b, _c, _d;
         if (this.wws && this.wws.readyState <= 1) {
             return;
         }
@@ -90,49 +83,44 @@ class QWebSocket {
         const { reconnect, reconnectNumTries, reconnectIntervalMillis, extraConnectArgs } = this.options;
         // timeout for too many reconnection attempts
         if (reconnect && this.reconnectionAttempts > reconnectNumTries) {
-            logger_1.default.error(`${this.name}: Connection timed out, should re-connect entirely`);
-            (_b = (_a = this.callbacks).onError) === null || _b === void 0 ? void 0 : _b.call(_a, `WS connection timeout, max tries (${reconnectNumTries}) exceeded`);
+            logger.error(`${this.name}: Connection timed out, should re-connect entirely`);
+            void this.callbacks.onError?.(`WS connection timeout, max tries (${reconnectNumTries}) exceeded`);
             return;
         }
         /**
          * Actual WebSocket opening
          */
-        if (this.wsOrUrl instanceof WebSocket || ((_d = (_c = this.wsOrUrl) === null || _c === void 0 ? void 0 : _c.constructor) === null || _d === void 0 ? void 0 : _d.name) === 'WebSocket') {
+        if (this.wsOrUrl instanceof WebSocket || this.wsOrUrl?.constructor?.name === 'WebSocket') {
             const ws = this.wsOrUrl;
-            this.wws = new wrappedws_1.default(ws);
+            this.wws = new WrappedWebSocket(ws);
             // TODO what if this is a reconnect? No reconnection was attempted, it's just the old reference
         }
         else {
-            const connectUrl = (0, queryparser_1.addQueryParamsToUrl)(this.wsOrUrl, {
+            const connectUrl = addQueryParamsToUrl(this.wsOrUrl, {
                 ...extraConnectArgs,
                 idx: this.queue.ackIdx,
             });
-            this.wws = new wrappedws_1.default(connectUrl);
+            this.wws = new WrappedWebSocket(connectUrl);
         }
         this.wws.onWsError(async (event) => {
-            var _a, _b, _c, _d;
             // ws error will prompt reconnection which can time out, don't reject instantly
             const message = decodeErrorMessage(event);
-            logger_1.default.error(`${this.name}: WS error occurred: ${message}`);
+            logger.error(`${this.name}: WS error occurred: ${message}`);
             if (reconnect) {
-                await ((_b = (_a = this.callbacks).onErroneousDisconnect) === null || _b === void 0 ? void 0 : _b.call(_a, message));
+                await this.callbacks.onErroneousDisconnect?.(message);
             }
             else {
-                await ((_d = (_c = this.callbacks).onError) === null || _d === void 0 ? void 0 : _d.call(_c, message));
+                await this.callbacks.onError?.(message);
             }
         });
         this.wws.onWsOpen(async () => {
-            var _a, _b;
             this.reconnectionAttempts = 0;
-            if (reconnect) {
-                logger_1.default.info(`${this.name}: Connection established after ${this.reconnectionAttempts} tries`);
-            }
-            else {
-                logger_1.default.info(`${this.name}: Connection established`);
-            }
+            logger.info(reconnect
+                ? `${this.name}: Connection established after ${this.reconnectionAttempts} tries`
+                : `${this.name}: Connection established`);
             try {
                 // call post-connect method, this may give previously acked messages
-                const readyIdx = await ((_b = (_a = this.callbacks).onConnect) === null || _b === void 0 ? void 0 : _b.call(_a));
+                const readyIdx = await this.callbacks.onConnect?.();
                 // send back readiness ack
                 this.wws.send({
                     headers: {
@@ -141,21 +129,20 @@ class QWebSocket {
                     },
                 });
             }
-            catch (err) {
+            catch (error) {
                 // error occurred during initialization phase, send error right away, no "ready" message
                 this.wws.send({
                     headers: {
                         type: 'err',
-                        error: decodeErrorMessage(err),
+                        error: decodeErrorMessage(error),
                     },
                 });
             }
         });
         this.wws.onReady(async (message) => {
-            var _a, _b;
             // ready to send messages from given message index
             const { readyIdx } = message.headers;
-            logger_1.default.info(`${this.name}: Socket ready to send${readyIdx ? `from chunk ${readyIdx}` : ''}`);
+            logger.info(`${this.name}: Socket ready to send${readyIdx ? `from chunk ${readyIdx}` : ''}`);
             // if server sent chunk index to resume from, move queue cursors appropriately
             if (readyIdx !== undefined) {
                 this.queue.acknowledge(readyIdx - 1);
@@ -166,14 +153,14 @@ class QWebSocket {
             this.flush();
             try {
                 // call post-ready method
-                await ((_b = (_a = this.callbacks).onReady) === null || _b === void 0 ? void 0 : _b.call(_a, message.headers));
+                await this.callbacks.onReady?.(message.headers);
             }
-            catch (err) {
+            catch (error) {
                 // error occurred during initialization phase, send error right away, no "ready" message
                 this.wws.send({
                     headers: {
                         type: 'err',
-                        error: decodeErrorMessage(err),
+                        error: decodeErrorMessage(error),
                     },
                 });
             }
@@ -184,10 +171,11 @@ class QWebSocket {
             try {
                 // check callback
                 const routeResults = this.callbacks.onBin.recognize(headers.route || '');
-                if (routeResults) {
-                    const handler = routeResults[0].handler;
-                    const params = routeResults[0].params;
-                    await (handler === null || handler === void 0 ? void 0 : handler(body, headers, params));
+                const route = routeResults?.[0];
+                if (route) {
+                    const handler = route.handler;
+                    const params = route.params;
+                    await handler?.(body, headers, params);
                 }
                 // send back acknowledgment
                 this.wws.send({
@@ -197,12 +185,12 @@ class QWebSocket {
                     },
                 });
             }
-            catch (err) {
+            catch (error) {
                 // error occurred during processing binary message, send error
                 this.wws.send({
                     headers: {
                         type: 'err',
-                        error: decodeErrorMessage(err),
+                        error: decodeErrorMessage(error),
                     },
                 });
             }
@@ -213,10 +201,11 @@ class QWebSocket {
             try {
                 // check callback
                 const routeResults = this.callbacks.onJson.recognize(headers.route || '');
-                if (routeResults) {
-                    const handler = routeResults[0].handler;
-                    const params = routeResults[0].params;
-                    await (handler === null || handler === void 0 ? void 0 : handler(body, headers, params));
+                const route = routeResults?.[0];
+                if (route) {
+                    const handler = route.handler;
+                    const params = route.params;
+                    await handler?.(body, headers, params);
                 }
                 // send back acknowledgment
                 this.wws.send({
@@ -226,12 +215,12 @@ class QWebSocket {
                     },
                 });
             }
-            catch (err) {
+            catch (error) {
                 // error occurred during processing json message, send error
                 this.wws.send({
                     headers: {
                         type: 'err',
-                        error: decodeErrorMessage(err),
+                        error: decodeErrorMessage(error),
                     },
                 });
             }
@@ -244,36 +233,34 @@ class QWebSocket {
             }
         });
         this.wws.onErr(async (message) => {
-            var _a, _b;
             // handle error
-            logger_1.default.error(`${this.name}: Error occurred: ${message.headers.error}`);
-            await ((_b = (_a = this.callbacks).onError) === null || _b === void 0 ? void 0 : _b.call(_a, message.headers.error));
+            logger.error(`${this.name}: Error occurred: ${message.headers.error}`);
+            await this.callbacks.onError?.(message.headers.error);
         });
         this.wws.onWsClose(async () => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
             if (reconnect && this.needed) {
                 // if locally closed, needed should be false
                 // if it's true, it means we lost the connection and should try to re-connect
-                logger_1.default.info(`${this.name}: Closed pre-maturely, trying to reconnect after ${reconnectIntervalMillis}ms...`);
+                logger.info(`${this.name}: Closed pre-maturely, trying to reconnect after ${reconnectIntervalMillis}ms...`);
                 setTimeout(() => this.setUp(), reconnectIntervalMillis);
-                await ((_b = (_a = this.callbacks).onErroneousDisconnect) === null || _b === void 0 ? void 0 : _b.call(_a, 'Closed pre-maturely'));
+                await this.callbacks.onErroneousDisconnect?.('Closed pre-maturely');
             }
             else if (reconnect && this.queue.numUnackMessages) {
                 // if there are still messages left to be sent and we should reconnect
-                logger_1.default.info(`${this.name}: Closed with messages still in queue, reconnecting in ${reconnectIntervalMillis}ms...`);
+                logger.info(`${this.name}: Closed with messages still in queue, reconnecting in ${reconnectIntervalMillis}ms...`);
                 setTimeout(() => this.setUp(), reconnectIntervalMillis);
-                await ((_d = (_c = this.callbacks).onErroneousDisconnect) === null || _d === void 0 ? void 0 : _d.call(_c, 'Closed with messages still in queue'));
+                await this.callbacks.onErroneousDisconnect?.('Closed with messages still in queue');
             }
             else if (this.queue.numUnackMessages) {
                 // if there are still messages left to be sent, but we should not reconnect
-                logger_1.default.info(`${this.name}: Closed with messages still in queue`);
-                await ((_f = (_e = this.callbacks).onError) === null || _f === void 0 ? void 0 : _f.call(_e, 'Closed with messages still in queue'));
-                await ((_h = (_g = this.callbacks).onClose) === null || _h === void 0 ? void 0 : _h.call(_g));
+                logger.info(`${this.name}: Closed with messages still in queue`);
+                await this.callbacks.onError?.('Closed with messages still in queue');
+                await this.callbacks.onClose?.();
             }
             else {
                 // all is well
-                logger_1.default.info(`${this.name}: Closed correctly`);
-                await ((_k = (_j = this.callbacks).onClose) === null || _k === void 0 ? void 0 : _k.call(_j));
+                logger.info(`${this.name}: Closed correctly`);
+                await this.callbacks.onClose?.();
             }
         });
     }
@@ -286,13 +273,13 @@ class QWebSocket {
         if (this.queue.numUnsentMessages) {
             // pop a message
             const [idx, data] = this.queue.consume();
-            logger_1.default.debug(`${this.name}: Sending chunk ${idx} of size ${data.size}`);
+            logger.debug(`${this.name}: Sending chunk ${idx} of size ${data.size}`);
             this.wws.sendRaw(data);
-            logger_1.default.debug(`${this.name}: MQ decreased to size ${this.queue.numUnsentMessages} messages / ${this.queue.numUnsentBytes} bytes`);
+            logger.debug(`${this.name}: MQ decreased to size ${this.queue.numUnsentMessages} messages / ${this.queue.numUnsentBytes} bytes`);
             this.flush();
         }
         else {
-            logger_1.default.debug(`${this.name}: Flushing complete, no ws messages backed up`);
+            logger.debug(`${this.name}: Flushing complete, no ws messages backed up`);
             // if not needed anymore after flush, close it
             // send close event to ws, don't de-cache yet, wait for event
             if (!this.queue.numUnackMessages && !this.needed) {
@@ -330,8 +317,8 @@ class QWebSocket {
         const { numUnsentMessages } = this.queue;
         const idx = this.queue.produce(message);
         // ready state should either be CONNECTING or OPEN at this point to flush instantly
-        if (this.wws.readyState === WebSocket.OPEN && this.ready && !numUnsentMessages) {
-            this.flush();
+        if (!numUnsentMessages && this.ready && this.wws.readyState === WebSocket.OPEN) {
+            void this.flush();
         }
         return idx;
     }
@@ -345,7 +332,7 @@ class QWebSocket {
             // wrap original onClose to resolve this promise
             const { onClose } = this.callbacks;
             this.callbacks.onClose = async () => {
-                await (onClose === null || onClose === void 0 ? void 0 : onClose());
+                await onClose?.();
                 resolve();
             };
             // flush if any messages in queue
@@ -353,4 +340,4 @@ class QWebSocket {
         });
     }
 }
-exports.default = QWebSocket;
+//# sourceMappingURL=queuews.js.map

package/dist/common/queuews.js.map

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

package/dist/common/router.d.ts

@@ -0,0 +1,9 @@
+import RouteRecognizerModule from 'route-recognizer';
+/**
+ * route-recognizer is a UMD bundle: under Node.js ESM its default import is the class itself,
+ * while its typings declare an ES default export. Re-expose it with correct typing.
+ */
+declare const RouteRecognizer: typeof RouteRecognizerModule.default;
+type RouteRecognizer = InstanceType<typeof RouteRecognizer>;
+export default RouteRecognizer;
+//# sourceMappingURL=router.d.ts.map

package/dist/common/router.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/common/router.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,MAAM,kBAAkB,CAAC;AAErD;;;GAGG;AACH,QAAA,MAAM,eAAe,EAAuC,OAAO,qBAAqB,CAAC,OAAO,CAAC;AACjG,KAAK,eAAe,GAAG,YAAY,CAAC,OAAO,eAAe,CAAC,CAAC;AAE5D,eAAe,eAAe,CAAC"}

package/dist/common/router.js

@@ -0,0 +1,8 @@
+import RouteRecognizerModule from 'route-recognizer';
+/**
+ * route-recognizer is a UMD bundle: under Node.js ESM its default import is the class itself,
+ * while its typings declare an ES default export. Re-expose it with correct typing.
+ */
+const RouteRecognizer = RouteRecognizerModule;
+export default RouteRecognizer;
+//# sourceMappingURL=router.js.map

package/dist/common/router.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/common/router.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,MAAM,kBAAkB,CAAC;AAErD;;;GAGG;AACH,MAAM,eAAe,GAAG,qBAAwE,CAAC;AAGjG,eAAe,eAAe,CAAC"}

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import QWebSocket from './common/queuews';
-export * from './common/logger';
-export * from './common/message';
-export * from './common/queuews';
-export * from './browser/messageencode';
-export default QWebSocket;
+export * from './common/logger.js';
+export * from './common/message.js';
+export * from './common/queuews.js';
+export * from './browser/messageencode.js';
+export { default } from './common/queuews.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,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC"}

package/dist/index.js

@@ -1,25 +1,6 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const queuews_1 = __importDefault(require("./common/queuews"));
-__exportStar(require("./common/logger"), exports);
-__exportStar(require("./common/message"), exports);
-__exportStar(require("./common/queuews"), exports);
-__exportStar(require("./browser/messageencode"), exports);
-exports.default = queuews_1.default;
+export * from './common/logger.js';
+export * from './common/message.js';
+export * from './common/queuews.js';
+export * from './browser/messageencode.js';
+export { default } from './common/queuews.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,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC"}