@seriousme/opifex 2.2.0 → 2.3.0

package/web/wsClient.ts

@@ -6,8 +6,8 @@
 
 import { Client } from "../client/client.ts";
 import { logger } from "../client/deps.ts";
-import type { SockConn } from "../client/deps.ts";
-import { wrapWebSocket } from "./wrapWebSocket.ts";
+import type { ConnNext, NetAddr } from "../client/deps.ts";
+import { webSocketToNext } from "./webSocketToNext.ts";
 
 /**
  * WsClient extends the Client class to provide WebSocket based clients
@@ -15,15 +15,28 @@ import { wrapWebSocket } from "./wrapWebSocket.ts";
  * see the /examples folder for an example
  */
 export class WsClient extends Client {
-  /** create a websocket and wrap it in a SockConn */
-  private async establishSocket(url: string): Promise<SockConn> {
-    const ws = new WebSocket(url);
-    const conn = await wrapWebSocket(ws);
-    return conn;
+  /** create a websocket and wrap it in a ConnNext */
+  private async establishSocket(url: string): Promise<ConnNext> {
+    try {
+      const urlObj = new URL(url);
+      const remoteAddr: NetAddr = {
+        transport: "tcp",
+        hostname: urlObj.hostname,
+        port: Number(urlObj.port || 0),
+      };
+      const ws = new WebSocket(url);
+      const connNext = await webSocketToNext(ws, remoteAddr);
+      return connNext;
+    } catch (error) {
+      const message = error instanceof ErrorEvent
+        ? ` because of ${error.message}`
+        : "";
+      throw new Error(`Failed to connect to WebSocket at ${url}${message}`);
+    }
   }
 
   /** createConn provides support for both "ws:" and "wss:" URLs */
-  protected override createConn(): Promise<SockConn> {
+  protected override createConn(): Promise<ConnNext> {
     const { protocol, hostname, port: portStr, pathname } = this.connectUrl;
     const port = portStr ? Number(portStr) : (protocol === "wss:" ? 443 : 80);
     const path = pathname || "/mqtt";

package/dist/node/wrapNodeSocket.d.ts

@@ -1,12 +0,0 @@
-/**
- * Utility functions for wrapping Node.js sockets into standard web streams.
- */
-import type { Socket } from "node:net";
-import type { SockConn } from "../socket/socket.ts";
-/**
- * Wraps a Node.js socket into a standard web streams-based socket connection
- * @param socket - The Node.js socket to wrap
- * @returns A socket connection object with readable/writable streams and close method
- */
-export declare function wrapNodeSocket(socket: Socket): SockConn;
-//# sourceMappingURL=wrapNodeSocket.d.ts.map

package/dist/node/wrapNodeSocket.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"wrapNodeSocket.d.ts","sourceRoot":"","sources":["../../node/wrapNodeSocket.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,OAAO,KAAK,EAAW,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAc7D;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAmBvD"}

package/dist/node/wrapNodeSocket.js

@@ -1,36 +0,0 @@
-import { Readable, Writable } from "node:stream";
-/**
- * Closes a Node.js socket if it is not already closed
- * @param sock - The Node.js socket to close
- */
-function closer(sock) {
-    // deno-coverage-ignore-start
-    if (!sock.closed) {
-        sock.end();
-    }
-    // deno-coverage-ignore-stop
-}
-/**
- * Wraps a Node.js socket into a standard web streams-based socket connection
- * @param socket - The Node.js socket to wrap
- * @returns A socket connection object with readable/writable streams and close method
- */
-export function wrapNodeSocket(socket) {
-    const readable = Readable.toWeb(socket);
-    const writable = Writable.toWeb(socket);
-    // deno-coverage-ignore-start
-    const remoteAddr = {
-        hostname: socket.remoteAddress || "",
-        port: socket.remotePort || 0,
-        transport: "tcp",
-    };
-    // deno-coverage-ignore-stop
-    const conn = {
-        readable: readable,
-        writable: writable,
-        close: () => closer(socket),
-        remoteAddr,
-    };
-    return conn;
-}
-//# sourceMappingURL=wrapNodeSocket.js.map

package/dist/node/wrapNodeSocket.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"wrapNodeSocket.js","sourceRoot":"","sources":["../../node/wrapNodeSocket.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGjD;;;GAGG;AACH,SAAS,MAAM,CAAC,IAAY;IAC1B,6BAA6B;IAC7B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,IAAI,CAAC,GAAG,EAAE,CAAC;IACb,CAAC;IACD,4BAA4B;AAC9B,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,MAAc;IAC3C,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAExC,6BAA6B;IAC7B,MAAM,UAAU,GAAY;QAC1B,QAAQ,EAAE,MAAM,CAAC,aAAa,IAAI,EAAE;QACpC,IAAI,EAAE,MAAM,CAAC,UAAU,IAAI,CAAC;QAC5B,SAAS,EAAE,KAAK;KACjB,CAAC;IACF,4BAA4B;IAE5B,MAAM,IAAI,GAAa;QACrB,QAAQ,EAAE,QAAsC;QAChD,QAAQ,EAAE,QAAsC;QAChD,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;QAC3B,UAAU;KACX,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/socket/socket.d.ts

@@ -1,58 +0,0 @@
-/** Net addresses */
-export type NetAddr = {
-    /** The IP-based transport protocol */
-    transport: "tcp" | "udp";
-    /** The hostname */
-    hostname: string;
-    /** The port number */
-    port: number;
-};
-/** Unix addresses */
-export type UnixAddr = {
-    /** The Unix domain socket transport protocol */
-    transport: "unix" | "unixpacket";
-    /** The file system path to the socket to connect to */
-    path: string;
-};
-/** vSock addresses */
-export type VsockAddr = {
-    /** The VSOCK transport protocol */
-    transport: "vsock";
-    /** The context identifier (CID) of the peer */
-    cid: number;
-    /** The port number */
-    port: number;
-};
-/** Socket addresses */
-export type SockAddr = NetAddr | UnixAddr | VsockAddr;
-/** Socket connection descriptor. */
-export type SockConn = {
-    /** The stream to read from */
-    readable: ReadableStream<Uint8Array>;
-    /** The stream to write to */
-    writable: WritableStream<Uint8Array>;
-    /** The callback to call on close */
-    close: () => void;
-    /** The local address of the connection */
-    localAddr?: SockAddr;
-    /** The remote address of the connection */
-    remoteAddr?: SockAddr;
-};
-/** Connection class */
-export declare class Conn {
-    reader: ReadableStreamDefaultReader<Uint8Array>;
-    writer: WritableStreamDefaultWriter<Uint8Array>;
-    closed: boolean;
-    remoteAddr: SockAddr | undefined;
-    closer: () => void;
-    private leftover;
-    /** Create a new Conn object from a SockConn */
-    constructor(sockConn: SockConn);
-    /** Read bytes from the connection */
-    read(length: number): Promise<Uint8Array | null>;
-    /** Write bytes to the connection */
-    write(data: Uint8Array): Promise<number>;
-    /** close the connection */
-    close(): void;
-}
-//# sourceMappingURL=socket.d.ts.map

package/dist/socket/socket.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../socket/socket.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB,MAAM,MAAM,OAAO,GAAG;IACpB,sCAAsC;IACtC,SAAS,EAAE,KAAK,GAAG,KAAK,CAAC;IACzB,mBAAmB;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,sBAAsB;IACtB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AACF,qBAAqB;AACrB,MAAM,MAAM,QAAQ,GAAG;IACrB,gDAAgD;IAChD,SAAS,EAAE,MAAM,GAAG,YAAY,CAAC;IACjC,uDAAuD;IACvD,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AACF,sBAAsB;AACtB,MAAM,MAAM,SAAS,GAAG;IACtB,mCAAmC;IACnC,SAAS,EAAE,OAAO,CAAC;IACnB,+CAA+C;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,sBAAsB;IACtB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AACF,uBAAuB;AACvB,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAC;AACtD,oCAAoC;AACpC,MAAM,MAAM,QAAQ,GAAG;IACrB,8BAA8B;IAC9B,QAAQ,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;IACrC,6BAA6B;IAC7B,QAAQ,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;IACrC,oCAAoC;IACpC,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,0CAA0C;IAC1C,SAAS,CAAC,EAAE,QAAQ,CAAC;IACrB,2CAA2C;IAC3C,UAAU,CAAC,EAAE,QAAQ,CAAC;CACvB,CAAC;AAEF,uBAAuB;AACvB,qBAAa,IAAI;IACf,MAAM,EAAE,2BAA2B,CAAC,UAAU,CAAC,CAAC;IAChD,MAAM,EAAE,2BAA2B,CAAC,UAAU,CAAC,CAAC;IAChD,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,QAAQ,GAAG,SAAS,CAAC;IACjC,MAAM,EAAE,MAAM,IAAI,CAAC;IAEnB,OAAO,CAAC,QAAQ,CAAiC;IAEjD,+CAA+C;IAC/C,YAAY,QAAQ,EAAE,QAAQ,EAQ7B;IAED,qCAAqC;IAC/B,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CA6CrD;IAED,oCAAoC;IAC9B,KAAK,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAW7C;IAED,2BAA2B;IAC3B,KAAK,SAsBJ;CACF"}

package/dist/socket/socket.js

@@ -1,99 +0,0 @@
-/** Connection class */
-export class Conn {
-    reader;
-    writer;
-    closed;
-    remoteAddr;
-    closer;
-    leftover = new Uint8Array(0);
-    /** Create a new Conn object from a SockConn */
-    constructor(sockConn) {
-        this.closed = false;
-        this.reader = sockConn.readable.getReader();
-        this.writer = sockConn.writable.getWriter();
-        this.closer = sockConn.close.bind(sockConn);
-        this.reader.closed.catch(() => { });
-        this.writer.closed.catch(() => { });
-        this.remoteAddr = sockConn.remoteAddr;
-    }
-    /** Read bytes from the connection */
-    async read(length) {
-        if (this.closed || length < 0) {
-            return null;
-        }
-        if (length === 0) {
-            return new Uint8Array(0);
-        }
-        const result = new Uint8Array(length);
-        let bytesAccumulated = 0;
-        // Do we have data from the previous read()
-        if (this.leftover.length > 0) {
-            const take = Math.min(this.leftover.length, length);
-            result.set(this.leftover.subarray(0, take), bytesAccumulated);
-            bytesAccumulated += take;
-            this.leftover = this.leftover.subarray(take);
-        }
-        // Keep readin until we have enough data
-        while (bytesAccumulated < length) {
-            const { value, done } = await this.reader.read();
-            if (value) {
-                const needed = length - bytesAccumulated;
-                if (value.length <= needed) {
-                    // We need the whole chunk
-                    result.set(value, bytesAccumulated);
-                    bytesAccumulated += value.length;
-                }
-                else {
-                    // Chunk is bigger than what we need
-                    result.set(value.subarray(0, needed), bytesAccumulated);
-                    bytesAccumulated += needed;
-                    // Save the rest for the next read() call
-                    this.leftover = value.subarray(needed);
-                }
-            }
-            if (done) {
-                // if the stream closed and not enough data was returned, return null
-                return null;
-            }
-        }
-        return result;
-    }
-    /** Write bytes to the connection */
-    async write(data) {
-        if (this.closed) {
-            return Promise.reject(new Error("Connection closed"));
-        }
-        try {
-            await this.writer.write(data);
-            return data.length;
-        }
-        catch (err) {
-            this.closed = true;
-            throw err;
-        }
-    }
-    /** close the connection */
-    close() {
-        if (!this.closed) {
-            this.closed = true;
-            // deno-coverage-ignore-start
-            void this.writer.close().catch(() => {
-                // ignore duplicate/late close attempts; the stream may already be closed
-            });
-            // deno-coverage-ignore-stop
-            try {
-                void this.reader.cancel().catch(() => {
-                    // ignore duplicate/late cancel attempts; the stream may already be closed
-                });
-                this.reader?.releaseLock();
-                // deno-coverage-ignore
-            }
-            catch (_err) { /* swallow */ }
-            try {
-                this.closer();
-            }
-            catch (_err) { /* swallow */ }
-        }
-    }
-}
-//# sourceMappingURL=socket.js.map

package/dist/socket/socket.js.map

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

package/dist/web/webSocketStream.d.ts

@@ -1,29 +0,0 @@
-/**
- * Utility functions for wrapping standard WebSockets into standard web streams.
- */
-export interface WebSocketConnection<T extends Uint8Array | string = Uint8Array | string> {
-    readable: ReadableStream<T>;
-    writable: WritableStream<T>;
-    protocol: string;
-    extensions: string;
-}
-export interface WebSocketCloseInfo {
-    closeCode?: number;
-    reason?: string;
-}
-export interface WebSocketStreamOptions {
-    protocols?: string[];
-    signal?: AbortSignal;
-}
-/**
- * [WebSocket](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket) with [Streams API](https://developer.mozilla.org/en-US/docs/Web/API/Streams_API)
- *
- * @see https://web.dev/websocketstream/
- */
-export declare class WebSocketStream<T extends Uint8Array | string = Uint8Array | string> {
-    readonly opened: Promise<WebSocketConnection<T>>;
-    readonly closed: Promise<WebSocketCloseInfo>;
-    readonly close: (closeInfo?: WebSocketCloseInfo) => void;
-    constructor(ws: WebSocket, options?: WebSocketStreamOptions);
-}
-//# sourceMappingURL=webSocketStream.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"webSocketStream.d.ts","sourceRoot":"","sources":["../../web/webSocketStream.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,WAAW,mBAAmB,CAClC,CAAC,SAAS,UAAU,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM;IAEnD,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;IAC5B,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED;;;;GAIG;AACH,qBAAa,eAAe,CAC1B,CAAC,SAAS,UAAU,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM;IAEnD,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjD,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAE7C,QAAQ,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAEzD,YAAY,EAAE,EAAE,SAAS,EAAE,OAAO,GAAE,sBAA2B,EA0D9D;CACF"}

package/dist/web/webSocketStream.js

@@ -1,69 +0,0 @@
-/**
- * Utility functions for wrapping standard WebSockets into standard web streams.
- */
-/**
- * [WebSocket](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket) with [Streams API](https://developer.mozilla.org/en-US/docs/Web/API/Streams_API)
- *
- * @see https://web.dev/websocketstream/
- */
-export class WebSocketStream {
-    opened;
-    closed;
-    close;
-    constructor(ws, options = {}) {
-        if (options.signal?.aborted) {
-            throw new DOMException("This operation was aborted", "AbortError");
-        }
-        const closeWithInfo = ({ closeCode: code, reason } = {}) => ws.close(code, reason);
-        this.opened = new Promise((resolve, reject) => {
-            ws.onopen = () => {
-                resolve({
-                    readable: new ReadableStream({
-                        start(controller) {
-                            ws.onmessage = ({ data }) => {
-                                if (data instanceof ArrayBuffer) {
-                                    controller.enqueue(new Uint8Array(data));
-                                }
-                                else {
-                                    controller.enqueue(data);
-                                }
-                            };
-                            ws.onerror = (e) => controller.error(e);
-                        },
-                        cancel: closeWithInfo,
-                    }),
-                    writable: new WritableStream({
-                        write(chunk) {
-                            if (chunk instanceof Uint8Array) {
-                                ws.send(chunk.buffer);
-                            }
-                            else {
-                                ws.send(chunk);
-                            }
-                        },
-                        abort() {
-                            ws.close();
-                        },
-                        close: closeWithInfo,
-                    }),
-                    protocol: ws.protocol,
-                    extensions: ws.extensions,
-                });
-                ws.removeEventListener("error", reject);
-            };
-            ws.addEventListener("error", reject);
-        });
-        this.closed = new Promise((resolve, reject) => {
-            ws.onclose = ({ code, reason }) => {
-                resolve({ closeCode: code, reason });
-                ws.removeEventListener("error", reject);
-            };
-            ws.addEventListener("error", reject);
-        });
-        if (options.signal) {
-            options.signal.onabort = () => ws.close();
-        }
-        this.close = closeWithInfo;
-    }
-}
-//# sourceMappingURL=webSocketStream.js.map

package/dist/web/webSocketStream.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"webSocketStream.js","sourceRoot":"","sources":["../../web/webSocketStream.ts"],"names":[],"mappings":"AAAA;;GAEG;AAqBH;;;;GAIG;AACH,MAAM,OAAO,eAAe;IAGjB,MAAM,CAAkC;IAExC,MAAM,CAA8B;IAEpC,KAAK,CAA2C;IAEzD,YAAY,EAAa,EAAE,OAAO,GAA2B,EAAE;QAC7D,IAAI,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;YAC5B,MAAM,IAAI,YAAY,CAAC,4BAA4B,EAAE,YAAY,CAAC,CAAC;QACrE,CAAC;QACD,MAAM,aAAa,GAAG,CACpB,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAuB,EAAE,EACpD,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE5B,IAAI,CAAC,MAAM,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC5C,EAAE,CAAC,MAAM,GAAG,GAAG,EAAE;gBACf,OAAO,CAAC;oBACN,QAAQ,EAAE,IAAI,cAAc,CAAI;wBAC9B,KAAK,CAAC,UAAU;4BACd,EAAE,CAAC,SAAS,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;gCAC1B,IAAI,IAAI,YAAY,WAAW,EAAE,CAAC;oCAChC,UAAU,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,IAAI,CAAM,CAAC,CAAC;gCAChD,CAAC;qCAAM,CAAC;oCACN,UAAU,CAAC,OAAO,CAAC,IAAS,CAAC,CAAC;gCAChC,CAAC;4BACH,CAAC,CAAC;4BACF,EAAE,CAAC,OAAO,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBAC1C,CAAC;wBACD,MAAM,EAAE,aAAa;qBACtB,CAAC;oBACF,QAAQ,EAAE,IAAI,cAAc,CAAI;wBAC9B,KAAK,CAAC,KAAK;4BACT,IAAI,KAAK,YAAY,UAAU,EAAE,CAAC;gCAChC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAqB,CAAC,CAAC;4BACvC,CAAC;iCAAM,CAAC;gCACN,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;4BACjB,CAAC;wBACH,CAAC;wBACD,KAAK;4BACH,EAAE,CAAC,KAAK,EAAE,CAAC;wBACb,CAAC;wBACD,KAAK,EAAE,aAAa;qBACrB,CAAC;oBACF,QAAQ,EAAE,EAAE,CAAC,QAAQ;oBACrB,UAAU,EAAE,EAAE,CAAC,UAAU;iBAC1B,CAAC,CAAC;gBACH,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC1C,CAAC,CAAC;YACF,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,GAAG,IAAI,OAAO,CAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAChE,EAAE,CAAC,OAAO,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE;gBAChC,OAAO,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;gBACrC,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC1C,CAAC,CAAC;YACF,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,CAAC,MAAM,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,aAAa,CAAC;IAC7B,CAAC;CACF"}

package/dist/web/wrapWebSocket.d.ts

@@ -1,12 +0,0 @@
-import type { SockConn } from "../socket/socket.ts";
-export type HostnamePort = {
-    hostname?: string;
-    port?: string | number;
-};
-/**
- * Wraps a WebSocketStream socket into a standard web streams-based socket connection
- * @param ws - The WebSocket to wrap
- * @returns A SockConn object
- */
-export declare function wrapWebSocket(ws: WebSocket, remoteAddr?: HostnamePort): Promise<SockConn>;
-//# sourceMappingURL=wrapWebSocket.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"wrapWebSocket.d.ts","sourceRoot":"","sources":["../../web/wrapWebSocket.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAGpD,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACxB,CAAC;AAYF;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,EAAE,EAAE,SAAS,EACb,UAAU,CAAC,EAAE,YAAY,GACxB,OAAO,CAAC,QAAQ,CAAC,CAqBnB"}

package/dist/web/wrapWebSocket.js

@@ -1,41 +0,0 @@
-/**
- * Utility functions for wrapping WebSocketStream sockets into standard web streams.
- */
-import { WebSocketStream } from "./webSocketStream.js";
-import { logger } from "../utils/logger.js";
-/**
- * Closes a WebSocketStream socket if it is not already closed
- * @param sock - The WebSocketStream socket to close
- */
-async function closer(stream) {
-    if (!await stream.closed) {
-        stream.close();
-    }
-}
-/**
- * Wraps a WebSocketStream socket into a standard web streams-based socket connection
- * @param ws - The WebSocket to wrap
- * @returns A SockConn object
- */
-export async function wrapWebSocket(ws, remoteAddr) {
-    ws.binaryType = "arraybuffer";
-    const wsstream = new WebSocketStream(ws);
-    logger.debug("created wsstream");
-    const stream = await wsstream.opened;
-    logger.debug("wsstream is opened");
-    const readable = stream.readable;
-    const writable = stream.writable;
-    const { hostname = "localhost", port = 0 } = remoteAddr || {};
-    const conn = {
-        readable: readable,
-        writable: writable,
-        close: () => closer(wsstream),
-        remoteAddr: {
-            hostname,
-            port: Number(port),
-            transport: "tcp",
-        },
-    };
-    return conn;
-}
-//# sourceMappingURL=wrapWebSocket.js.map

package/dist/web/wrapWebSocket.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"wrapWebSocket.js","sourceRoot":"","sources":["../../web/wrapWebSocket.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAO5C;;;GAGG;AACH,KAAK,UAAU,MAAM,CAAC,MAAuB;IAC3C,IAAI,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;QACzB,MAAM,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,EAAa,EACb,UAAyB;IAEzB,EAAE,CAAC,UAAU,GAAG,aAAa,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAa,EAAE,CAAC,CAAC;IACrD,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACjC,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;IACrC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IACjC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IACjC,MAAM,EAAE,QAAQ,GAAG,WAAW,EAAE,IAAI,GAAG,CAAC,EAAE,GAAG,UAAU,IAAI,EAAE,CAAC;IAE9D,MAAM,IAAI,GAAa;QACrB,QAAQ,EAAE,QAAsC;QAChD,QAAQ,EAAE,QAAsC;QAChD,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC;QAC7B,UAAU,EAAE;YACV,QAAQ;YACR,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;YAClB,SAAS,EAAE,KAAK;SACjB;KACF,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC"}