@seriousme/opifex 2.3.0 → 2.4.1

package/dist/node/nodeSocketToNext.js

@@ -1,161 +1,105 @@
-/** wrapper class */
-export class NodeSocketConnNextWrapper {
-    endPoint;
-    closed;
-    leftover = new Uint8Array(0);
-    // Store bound event listeners so we can cleanly remove them later
-    onClose = () => {
-        this.closed = true;
-    };
-    onError = () => {
-        this.closed = true;
-    };
-    /** Create a new ConnNext object from a Webstream */
-    constructor(endPoint) {
-        this.endPoint = endPoint;
-        this.closed = false;
-        this.endPoint;
+import { BaseConnNext } from "../connNext/baseConnNext.js";
+export class NodeSocketConnNext extends BaseConnNext {
+    socket;
+    constructor(socket) {
+        super();
+        this.socket = socket;
+        const markClosed = () => {
+            this.closed = true;
+        };
+        this.socket.on("end", markClosed);
+        this.socket.on("close", markClosed);
+        this.socket.on("error", markClosed);
     }
-    async read(length) {
-        if (this.closed || (length ?? 0) < 0) {
-            return null;
-        }
-        // If no specific byte length is requested, read whatever is available
-        if (length === undefined) {
-            const chunk = this.endPoint.read();
-            return chunk
-                ? Promise.resolve(new Uint8Array(chunk.buffer, chunk.byteOffset, chunk.byteLength))
-                : Promise.resolve(null);
-        }
-        if (length === 0) {
-            return new Uint8Array(0);
-        }
-        const result = new Uint8Array(length);
-        let bytesAccumulated = 0;
-        // 1. Process leftover data from the previous read operation
-        if (this.leftover.byteLength > 0) {
-            const take = Math.min(this.leftover.byteLength, length);
-            result.set(this.leftover.subarray(0, take), bytesAccumulated);
-            bytesAccumulated += take;
-            this.leftover = this.leftover.subarray(take);
-        }
-        // 2. Loop until the requested number of bytes is accumulated
-        while (bytesAccumulated < length) {
-            if (this.closed || !this.endPoint.readable) {
-                break;
-            }
-            const chunk = this.endPoint.read();
-            if (chunk === null) {
-                await new Promise((resolve) => {
-                    const cleanup = () => {
-                        this.endPoint.off("readable", onEvent);
-                        this.endPoint.off("end", onEvent);
-                        this.endPoint.off("error", onEvent);
-                        this.endPoint.off("close", onEvent);
-                    };
-                    const onEvent = () => {
-                        cleanup();
-                        resolve();
-                    };
-                    this.endPoint.on("readable", onEvent);
-                    this.endPoint.on("end", onEvent);
-                    this.endPoint.on("error", onEvent);
-                    this.endPoint.on("close", onEvent);
-                });
-                continue;
-            }
-            // 3. Process the retrieved chunk
-            const chunkLength = chunk.byteLength;
-            const needed = length - bytesAccumulated;
-            if (chunkLength <= needed) {
-                result.set(chunk, bytesAccumulated);
-                bytesAccumulated += chunkLength;
+    get localAddr() {
+        return this.socket.localAddress
+            ? {
+                transport: "tcp",
+                hostname: this.socket.localAddress,
+                port: this.socket.localPort ?? 0,
             }
-            else {
-                result.set(chunk.subarray(0, needed), bytesAccumulated);
-                bytesAccumulated += needed;
-                this.leftover = chunk.subarray(needed);
+            : undefined;
+    }
+    get remoteAddr() {
+        return this.socket.remoteAddress
+            ? {
+                transport: "tcp",
+                hostname: this.socket.remoteAddress,
+                port: this.socket.remotePort ?? 0,
             }
+            : undefined;
+    }
+    /**
+     * Haalt direct op verzoek een chunk op via Node's ingebouwde socket.read() mechanisme.
+     */
+    pullNextChunk() {
+        if (this.closed || !this.socket.readable) {
+            return Promise.resolve(null);
         }
-        if (bytesAccumulated < length) {
-            return null;
+        // Vraag direct om data uit de Node socket buffer
+        const chunk = this.socket.read();
+        if (chunk !== null) {
+            return Promise.resolve(new Uint8Array(chunk.buffer, chunk.byteOffset, chunk.byteLength));
         }
-        return result;
+        // Als er nog geen data is ('null'), wachten we op het 'readable' (of 'end'/'close') event van Node
+        return new Promise((resolve) => {
+            const cleanup = () => {
+                this.socket.off("readable", onReadable);
+                this.socket.off("end", onEnd);
+                this.socket.off("error", onClose);
+                this.socket.off("close", onClose);
+            };
+            const onReadable = () => {
+                cleanup();
+                // Roep zichzelf direct weer aan om de data op te halen
+                resolve(this.pullNextChunk());
+            };
+            const onEnd = () => {
+                cleanup();
+                this.closed = true;
+                resolve(null);
+            };
+            const onClose = () => {
+                cleanup();
+                this.closed = true;
+                resolve(null);
+            };
+            this.socket.on("readable", onReadable);
+            this.socket.on("end", onEnd);
+            this.socket.on("error", onClose);
+            this.socket.on("close", onClose);
+        });
     }
     write(data) {
-        if (this.closed || !this.endPoint.writable) {
-            return Promise.reject(new Error("Stream is closed or not writable"));
+        if (this.isClosed() || !this.socket.writable) {
+            return Promise.reject(new Error("Socket is closed or not writable"));
         }
         return new Promise((resolve, reject) => {
-            // 1. Fire the write command and catch any immediate/async errors via the callback
-            const canWriteMore = this.endPoint.write(data, (err) => {
-                if (err) {
+            const canWriteMore = this.socket.write(data, (err) => {
+                if (err)
                     reject(err);
-                }
             });
-            // 2. Determine when to resolve based on the return value of write()
             if (canWriteMore) {
-                // If the buffer is not full, we can resolve immediately
                 resolve();
             }
             else {
-                // If backpressure is triggered, we must wait for the 'drain' event
-                this.endPoint.once("drain", () => {
-                    resolve();
-                });
+                this.socket.once("drain", resolve);
             }
         });
     }
     close() {
         if (!this.closed) {
             this.closed = true;
-            // Clean up permanent event listeners to prevent memory leaks
-            this.endPoint.off("close", this.onClose);
-            this.endPoint.off("error", this.onError);
-            // Safely destroy the stream first, then trigger the closer callback
             try {
-                this.endPoint.destroy();
-                // deno-coverage-ignore
-            }
-            catch (_) {
-                // Suppress stream destruction errors
-                // deno-coverage-ignore
+                this.socket.destroy();
             }
-        }
-    }
-    async *[Symbol.asyncIterator]() {
-        while (true) {
-            const chunk = await this.read();
-            if (chunk === null) {
-                break;
+            catch {
+                /* swallow */
             }
-            yield chunk;
-        }
-    }
-    // Convert addresses to custom ConnAddr format
-    get localAddr() {
-        if (this.endPoint.localAddress) {
-            return {
-                transport: "tcp",
-                hostname: this.endPoint.localAddress,
-                port: this.endPoint.localPort ?? 0,
-            };
-        }
-        return undefined;
-    }
-    get remoteAddr() {
-        if (this.endPoint.remoteAddress) {
-            return {
-                transport: "tcp",
-                hostname: this.endPoint.remoteAddress,
-                port: this.endPoint.remotePort ?? 0,
-            };
         }
-        return undefined;
     }
 }
 export function nodeSocketToNext(socket) {
-    const connNext = new NodeSocketConnNextWrapper(socket);
-    return connNext;
+    return new NodeSocketConnNext(socket);
 }
 //# sourceMappingURL=nodeSocketToNext.js.map

package/dist/node/nodeSocketToNext.js.map

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

package/dist/web/webSocketToNext.d.ts

@@ -1,3 +1,20 @@
 import type { ConnAddr, ConnNext } from "../connNext/connNext.ts";
-export declare function webSocketToNext(ws: WebSocket, remoteAddr?: ConnAddr): Promise<ConnNext>;
+import { BaseConnNext } from "../connNext/baseConnNext.ts";
+export declare class WebSocketConnNext extends BaseConnNext {
+    localAddr: undefined;
+    remoteAddr?: ConnAddr;
+    private ws;
+    private messageQueue;
+    private maxBufferSize;
+    private currentBufferSize;
+    private readResolvers;
+    constructor(ws: WebSocket, remoteAddr?: ConnAddr, maxBufferSize?: number);
+    private notifyWaiters;
+    private waitForData;
+    ensureOpen(): Promise<void>;
+    protected pullNextChunk(): Promise<Uint8Array | null>;
+    write(data: Uint8Array): Promise<void>;
+    close(): void;
+}
+export declare function webSocketToNext(ws: WebSocket, remoteAddr?: ConnAddr, maxBufferSize?: number): Promise<ConnNext>;
 //# sourceMappingURL=webSocketToNext.d.ts.map

package/dist/web/webSocketToNext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webSocketToNext.d.ts","sourceRoot":"","sources":["../../web/webSocketToNext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAElE,wBAAsB,eAAe,CACnC,EAAE,EAAE,SAAS,EACb,UAAU,CAAC,EAAE,QAAQ,GACpB,OAAO,CAAC,QAAQ,CAAC,CAiLnB"}
+{"version":3,"file":"webSocketToNext.d.ts","sourceRoot":"","sources":["../../web/webSocketToNext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAG3D,qBAAa,iBAAkB,SAAQ,YAAY;IACjD,SAAS,YAAa;IACtB,UAAU,CAAC,EAAE,QAAQ,CAAC;IAEtB,OAAO,CAAC,EAAE,CAAY;IACtB,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,aAAa,CAAyB;IAE9C,YACE,EAAE,EAAE,SAAS,EACb,UAAU,CAAC,EAAE,QAAQ,EACrB,aAAa,SAAkB,EAqChC;IAED,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,WAAW;IAMnB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CA8B1B;IAED,UAAgB,aAAa,IAAI,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAU1D;IAEK,KAAK,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAU3C;IAED,KAAK,IAAI,IAAI,CASZ;CACF;AAED,wBAAsB,eAAe,CACnC,EAAE,EAAE,SAAS,EACb,UAAU,CAAC,EAAE,QAAQ,EACrB,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,QAAQ,CAAC,CAInB"}

package/dist/web/webSocketToNext.js

@@ -1,20 +1,62 @@
-export async function webSocketToNext(ws, remoteAddr) {
-    ws.binaryType = "arraybuffer";
-    const messageQueue = [];
-    let queueOffset = 0;
-    const readResolvers = [];
-    const notifyWaiters = () => {
-        while (readResolvers.length > 0) {
-            const resolve = readResolvers.shift();
+import { BaseConnNext } from "../connNext/baseConnNext.js";
+import { delay } from "../utils/utils.js";
+export class WebSocketConnNext extends BaseConnNext {
+    localAddr = undefined;
+    remoteAddr;
+    ws;
+    messageQueue = [];
+    maxBufferSize;
+    currentBufferSize = 0;
+    readResolvers = [];
+    constructor(ws, remoteAddr, maxBufferSize = 1 * 1024 * 1024) {
+        super();
+        this.ws = ws;
+        this.remoteAddr = remoteAddr;
+        this.maxBufferSize = maxBufferSize;
+        this.ws.binaryType = "arraybuffer";
+        this.ws.addEventListener("message", (event) => {
+            let chunk;
+            if (typeof event.data === "string") {
+                chunk = new TextEncoder().encode(event.data);
+            }
+            else if (event.data instanceof ArrayBuffer) {
+                chunk = new Uint8Array(event.data);
+            }
+            else {
+                return;
+            }
+            // Check the bufferlimit (Throttling / Overflow protection)
+            if (this.currentBufferSize + chunk.byteLength > this.maxBufferSize) {
+                this.close();
+                throw new Error("WebSocket buffer overflow: Too much unread data from push source");
+            }
+            this.messageQueue.push(chunk);
+            this.currentBufferSize += chunk.byteLength;
+            this.notifyWaiters();
+        });
+        const onClose = () => {
+            this.closed = true;
+            this.notifyWaiters();
+        };
+        this.ws.addEventListener("close", onClose);
+        this.ws.addEventListener("error", onClose);
+    }
+    notifyWaiters() {
+        while (this.readResolvers.length > 0) {
+            const resolve = this.readResolvers.shift();
             resolve?.();
         }
-    };
-    // helper to check if websocket is Open
-    const ensureOpen = () => {
-        if (ws.readyState === WebSocket.OPEN) {
+    }
+    waitForData() {
+        return new Promise((resolve) => {
+            this.readResolvers.push(resolve);
+        });
+    }
+    ensureOpen() {
+        if (this.ws.readyState === WebSocket.OPEN) {
             return Promise.resolve();
         }
-        if (ws.readyState >= WebSocket.CLOSING) {
+        if (this.ws.readyState >= WebSocket.CLOSING) {
             return Promise.reject(new Error("WebSocket is closing or closed"));
         }
         return new Promise((resolve, reject) => {
@@ -31,130 +73,53 @@ export async function webSocketToNext(ws, remoteAddr) {
                 reject(new Error("WebSocket closed before opening"));
             };
             const cleanup = () => {
-                ws.removeEventListener("open", onOpen);
-                ws.removeEventListener("error", onError);
-                ws.removeEventListener("close", onClose);
+                this.ws.removeEventListener("open", onOpen);
+                this.ws.removeEventListener("error", onError);
+                this.ws.removeEventListener("close", onClose);
             };
-            ws.addEventListener("open", onOpen);
-            ws.addEventListener("error", onError);
-            ws.addEventListener("close", onClose);
+            this.ws.addEventListener("open", onOpen);
+            this.ws.addEventListener("error", onError);
+            this.ws.addEventListener("close", onClose);
         });
-    };
-    ws.addEventListener("message", (event) => {
-        let chunk;
-        if (typeof event.data === "string") {
-            chunk = new TextEncoder().encode(event.data);
-        }
-        else if (event.data instanceof ArrayBuffer) {
-            chunk = new Uint8Array(event.data);
+    }
+    async pullNextChunk() {
+        if (this.messageQueue.length === 0) {
+            await this.waitForData();
         }
-        else {
-            return;
+        if (this.closed) {
+            return null;
         }
-        messageQueue.push(chunk);
-        notifyWaiters();
-    });
-    ws.addEventListener("close", notifyWaiters);
-    ws.addEventListener("error", notifyWaiters);
-    const getBufferedBytes = () => {
-        let total = 0;
-        for (let i = 0; i < messageQueue.length; i++) {
-            total += i === 0
-                ? messageQueue[i].byteLength - queueOffset
-                : messageQueue[i].byteLength;
+        const chunk = this.messageQueue.shift();
+        this.currentBufferSize -= chunk.byteLength;
+        return chunk;
+    }
+    async write(data) {
+        if (this.isClosed())
+            throw new Error("WebSocket is closed");
+        this.ws.send(data.buffer);
+        // Check WebSocket bufferedAmount for write-backpressure
+        const HIGH_WATER_MARK = 64 * 1024;
+        while (this.ws.bufferedAmount > HIGH_WATER_MARK) {
+            if (this.isClosed())
+                throw new Error("WebSocket closed while writing");
+            await delay(10);
         }
-        return total;
-    };
-    const waitForData = () => {
-        return new Promise((resolve) => {
-            readResolvers.push(resolve);
-        });
-    };
-    const connNext = {
-        remoteAddr,
-        localAddr: undefined,
-        async read(length) {
+    }
+    close() {
+        if (!this.closed) {
+            this.closed = true;
             try {
-                await ensureOpen();
-            }
-            catch {
-                return null;
-            }
-            if (getBufferedBytes() === 0 && ws.readyState >= WebSocket.CLOSING) {
-                return null;
-            }
-            while (getBufferedBytes() === 0) {
-                if (ws.readyState >= WebSocket.CLOSING)
-                    return null;
-                await waitForData();
-            }
-            if (length === undefined) {
-                const firstChunk = messageQueue.shift();
-                const result = firstChunk.subarray(queueOffset);
-                queueOffset = 0;
-                return result;
-            }
-            while (getBufferedBytes() < length) {
-                if (ws.readyState >= WebSocket.CLOSING) {
-                    return null;
-                }
-                await waitForData();
-            }
-            const result = new Uint8Array(length);
-            let bytesCopied = 0;
-            while (bytesCopied < length && messageQueue.length > 0) {
-                const currentChunk = messageQueue[0];
-                const bytesNeeded = length - bytesCopied;
-                const bytesAvailable = currentChunk.byteLength - queueOffset;
-                if (bytesAvailable <= bytesNeeded) {
-                    result.set(currentChunk.subarray(queueOffset), bytesCopied);
-                    bytesCopied += bytesAvailable;
-                    messageQueue.shift();
-                    queueOffset = 0;
-                }
-                else {
-                    result.set(currentChunk.subarray(queueOffset, queueOffset + bytesNeeded), bytesCopied);
-                    bytesCopied += bytesNeeded;
-                    queueOffset += bytesNeeded;
-                }
-            }
-            return result;
-        },
-        async write(data) {
-            await ensureOpen();
-            if (data instanceof Uint8Array) {
-                ws.send(data.buffer);
-            }
-            else {
-                ws.send(data);
-            }
-            const HIGH_WATER_MARK = 64 * 1024;
-            while (ws.bufferedAmount > HIGH_WATER_MARK) {
-                if (ws.readyState >= WebSocket.CLOSING) {
-                    throw new Error("WebSocket closed while writing");
-                }
-                await new Promise((resolve) => setTimeout(resolve, 10));
-            }
-        },
-        close() {
-            try {
-                ws.close();
+                this.ws.close();
             }
             catch {
                 /* swallow */
             }
-            notifyWaiters();
-        },
-        async *[Symbol.asyncIterator]() {
-            while (true) {
-                const chunk = await this.read();
-                if (chunk === null)
-                    break;
-                yield chunk;
-            }
-        },
-    };
-    await ensureOpen();
+        }
+    }
+}
+export async function webSocketToNext(ws, remoteAddr, maxBufferSize) {
+    const connNext = new WebSocketConnNext(ws, remoteAddr, maxBufferSize);
+    await connNext.ensureOpen();
     return connNext;
 }
 //# sourceMappingURL=webSocketToNext.js.map

package/dist/web/webSocketToNext.js.map

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

package/dist/web/wsClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsClient.d.ts","sourceRoot":"","sources":["../../web/wsClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,OAAO,KAAK,EAAE,QAAQ,EAAW,MAAM,mBAAmB,CAAC;AAG3D;;;;GAIG;AACH,qBAAa,QAAS,SAAQ,MAAM;IAClC,mDAAmD;YACrC,eAAe;IAmB7B,iEAAiE;IACjE,UAAmB,UAAU,IAAI,OAAO,CAAC,QAAQ,CAAC,CAUjD;CACF"}
+{"version":3,"file":"wsClient.d.ts","sourceRoot":"","sources":["../../web/wsClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,OAAO,KAAK,EAAE,QAAQ,EAAW,MAAM,mBAAmB,CAAC;AAG3D;;;;GAIG;AACH,qBAAa,QAAS,SAAQ,MAAM;IAClC,mDAAmD;YACrC,eAAe;IAsB7B,iEAAiE;IACjE,UAAmB,UAAU,IAAI,OAAO,CAAC,QAAQ,CAAC,CAcjD;CACF"}

package/dist/web/wsClient.js

@@ -13,7 +13,7 @@ import { webSocketToNext } from "./webSocketToNext.js";
  */
 export class WsClient extends Client {
     /** create a websocket and wrap it in a ConnNext */
-    async establishSocket(url) {
+    async establishSocket(url, maxBufferSize) {
         try {
             const urlObj = new URL(url);
             const remoteAddr = {
@@ -22,7 +22,7 @@ export class WsClient extends Client {
                 port: Number(urlObj.port || 0),
             };
             const ws = new WebSocket(url);
-            const connNext = await webSocketToNext(ws, remoteAddr);
+            const connNext = await webSocketToNext(ws, remoteAddr, maxBufferSize);
             return connNext;
         }
         catch (error) {
@@ -37,9 +37,10 @@ export class WsClient extends Client {
         const { protocol, hostname, port: portStr, pathname } = this.connectUrl;
         const port = portStr ? Number(portStr) : (protocol === "wss:" ? 443 : 80);
         const path = pathname || "/mqtt";
+        const maxBufferSize = this.maxBufferSize;
         logger.debug({ hostname, port, path });
         if (protocol === "ws:" || protocol === "wss:") {
-            return this.establishSocket(`${protocol}//${hostname}:${port}${path}`);
+            return this.establishSocket(`${protocol}//${hostname}:${port}${path}`, maxBufferSize);
         }
         throw new Error(`Unsupported protocol: ${protocol}`);
     }

package/dist/web/wsClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"wsClient.js","sourceRoot":"","sources":["../../web/wsClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;GAIG;AACH,MAAM,OAAO,QAAS,SAAQ,MAAM;IAClC,mDAAmD;IAC3C,KAAK,CAAC,eAAe,CAAC,GAAW;QACvC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;YAC5B,MAAM,UAAU,GAAY;gBAC1B,SAAS,EAAE,KAAK;gBAChB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC;aAC/B,CAAC;YACF,MAAM,EAAE,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC;YAC9B,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;YACvD,OAAO,QAAQ,CAAC;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,KAAK,YAAY,UAAU;gBACzC,CAAC,CAAC,eAAe,KAAK,CAAC,OAAO,EAAE;gBAChC,CAAC,CAAC,EAAE,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,qCAAqC,GAAG,GAAG,OAAO,EAAE,CAAC,CAAC;QACxE,CAAC;IACH,CAAC;IAED,iEAAiE;IAC9C,UAAU;QAC3B,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;QACxE,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC1E,MAAM,IAAI,GAAG,QAAQ,IAAI,OAAO,CAAC;QAEjC,MAAM,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACvC,IAAI,QAAQ,KAAK,KAAK,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;YAC9C,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,QAAQ,KAAK,QAAQ,IAAI,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC;QACzE,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAC;IACvD,CAAC;CACF"}
+{"version":3,"file":"wsClient.js","sourceRoot":"","sources":["../../web/wsClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;GAIG;AACH,MAAM,OAAO,QAAS,SAAQ,MAAM;IAClC,mDAAmD;IAC3C,KAAK,CAAC,eAAe,CAC3B,GAAW,EACX,aAAsB;QAEtB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;YAC5B,MAAM,UAAU,GAAY;gBAC1B,SAAS,EAAE,KAAK;gBAChB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC;aAC/B,CAAC;YACF,MAAM,EAAE,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC;YAC9B,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,EAAE,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;YACtE,OAAO,QAAQ,CAAC;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,KAAK,YAAY,UAAU;gBACzC,CAAC,CAAC,eAAe,KAAK,CAAC,OAAO,EAAE;gBAChC,CAAC,CAAC,EAAE,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,qCAAqC,GAAG,GAAG,OAAO,EAAE,CAAC,CAAC;QACxE,CAAC;IACH,CAAC;IAED,iEAAiE;IAC9C,UAAU;QAC3B,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;QACxE,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC1E,MAAM,IAAI,GAAG,QAAQ,IAAI,OAAO,CAAC;QACjC,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QAEzC,MAAM,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACvC,IAAI,QAAQ,KAAK,KAAK,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;YAC9C,OAAO,IAAI,CAAC,eAAe,CACzB,GAAG,QAAQ,KAAK,QAAQ,IAAI,IAAI,GAAG,IAAI,EAAE,EACzC,aAAa,CACd,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAC;IACvD,CAAC;CACF"}

package/examples/mqtt+mqtts.test.ts

@@ -14,7 +14,7 @@ test("Test pubSub using TLS client and a TCP client", async function () {
   // the localhost certs generate here are great for testing but lack securiity
   // use something like LetsEncrypt for any serious server
   // generateLocalhostCerts is a dev tool and relies on node-forge as a (dev)dependency
-  const { key, cert, caCert } = generateLocalhostCerts();
+  const { key, cert, caCert } = await generateLocalhostCerts();
   // first create the mqttServer, so we can pass it to multiple protocol servers
   const mqttServer = new MqttServer({});