crossws 0.3.3 → 0.3.5

package/dist/index.d.ts

@@ -1,4 +1,6 @@
-import { W as WebSocket } from './shared/crossws.ChIJSJVK.js';
+import { W as WebSocket } from './shared/crossws.BQXMA5bH.js';
+
+declare const kNodeInspect: unique symbol;
 
 interface AdapterInternal {
     ws: unknown;
@@ -32,6 +34,8 @@ declare abstract class Peer<Internal extends AdapterInternal = AdapterInternal>
     get websocket(): Partial<WebSocket>;
     /** All connected peers to the server */
     get peers(): Set<Peer>;
+    /** All topics, this peer has been subscribed to. */
+    get topics(): Set<string>;
     abstract close(code?: number, reason?: string): void;
     /** Abruptly close the connection */
     terminate(): void;
@@ -49,7 +53,8 @@ declare abstract class Peer<Internal extends AdapterInternal = AdapterInternal>
     }): void;
     toString(): string;
     [Symbol.toPrimitive](): string;
-    [Symbol.toStringTag](): string;
+    [Symbol.toStringTag](): "WebSocket";
+    [kNodeInspect](): Record<string, unknown>;
 }
 
 interface AdapterInstance {
@@ -85,7 +90,7 @@ declare class Message implements Partial<MessageEvent> {
      *
      * If raw data is in any other format or string, it will be automatically converted and encoded.
      */
-    uint8Array(): Uint8Array<ArrayBufferLike>;
+    uint8Array(): Uint8Array;
     /**
      * Get data as [ArrayBuffer](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/ArrayBuffer) or [SharedArrayBuffer](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer) value.
      *
@@ -113,6 +118,9 @@ declare class Message implements Partial<MessageEvent> {
     get data(): unknown;
     toString(): string;
     [Symbol.toPrimitive](): string;
+    [kNodeInspect](): {
+        data: unknown;
+    };
 }
 
 declare function defineHooks<T extends Partial<Hooks> = Partial<Hooks>>(hooks: T): T;
@@ -145,4 +153,5 @@ interface Hooks {
     error: (peer: Peer, error: WSError) => MaybePromise<void>;
 }
 
-export { type Adapter, type AdapterInstance, type AdapterOptions, type Hooks, Message, Peer, type ResolveHooks, WSError, defineHooks, defineWebSocketAdapter };
+export { Message, Peer, WSError, defineHooks, defineWebSocketAdapter };
+export type { Adapter, AdapterInstance, AdapterInternal, AdapterOptions, Hooks, ResolveHooks };

package/dist/index.mjs

@@ -1 +1 @@
-export { b as defineHooks, d as defineWebSocketAdapter } from './shared/crossws.CB4awDDj.mjs';
+export { d as defineHooks, b as defineWebSocketAdapter } from './shared/crossws.D9ehKjSh.mjs';

package/dist/shared/{crossws.ChIJSJVK.d.mts → crossws.BQXMA5bH.d.mts}

@@ -294,4 +294,4 @@ interface WebSocket extends EventTarget {
     removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
 }
 
-export type { CloseEvent as C, Event as E, MessageEvent as M, WebSocket as W, EventTarget as a };
+export type { CloseEvent as C, EventTarget as E, MessageEvent as M, WebSocket as W, Event as a };

package/dist/shared/{crossws.ChIJSJVK.d.ts → crossws.BQXMA5bH.d.ts}

@@ -294,4 +294,4 @@ interface WebSocket extends EventTarget {
     removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
 }
 
-export type { CloseEvent as C, Event as E, MessageEvent as M, WebSocket as W, EventTarget as a };
+export type { CloseEvent as C, EventTarget as E, MessageEvent as M, WebSocket as W, Event as a };

package/dist/shared/{crossws.DelSCW9g.mjs → crossws.CipVM6lf.mjs}

@@ -1,6 +1,6 @@
+import require$$0$2 from 'stream';
 import require$$0$3 from 'events';
 import require$$2 from 'http';
-import require$$0$2 from 'stream';
 import require$$1 from 'crypto';
 import require$$0$1 from 'buffer';
 import require$$0 from 'zlib';
@@ -743,6 +743,14 @@ function requirePermessageDeflate () {
 	  this[kError].code = 'WS_ERR_UNSUPPORTED_MESSAGE_LENGTH';
 	  this[kError][kStatusCode] = 1009;
 	  this.removeListener('data', inflateOnData);
+
+	  //
+	  // The choice to employ `zlib.reset()` over `zlib.close()` is dictated by the
+	  // fact that in Node.js versions prior to 13.10.0, the callback for
+	  // `zlib.flush()` is not called if `zlib.close()` is used. Utilizing
+	  // `zlib.reset()` ensures that either the callback is invoked or an error is
+	  // emitted.
+	  //
 	  this.reset();
 	}
 
@@ -758,6 +766,12 @@ function requirePermessageDeflate () {
 	  // closed when an error is emitted.
 	  //
 	  this[kPerMessageDeflate]._inflate = null;
+
+	  if (this[kError]) {
+	    this[kCallback](this[kError]);
+	    return;
+	  }
+
 	  err[kStatusCode] = 1007;
 	  this[kCallback](err);
 	}
@@ -1639,8 +1653,6 @@ function requireReceiver () {
 	return receiver;
 }
 
-requireReceiver();
-
 /* eslint no-unused-vars: ["error", { "varsIgnorePattern": "^Duplex" }] */
 
 var sender;
@@ -1649,6 +1661,8 @@ var hasRequiredSender;
 function requireSender () {
 	if (hasRequiredSender) return sender;
 	hasRequiredSender = 1;
+
+	const { Duplex } = require$$0$2;
 	const { randomFillSync } = require$$1;
 
 	const PerMessageDeflate = requirePermessageDeflate();
@@ -2197,7 +2211,7 @@ function requireSender () {
 	  /**
 	   * Sends a frame.
 	   *
-	   * @param {Buffer[]} list The frame to send
+	   * @param {(Buffer | String)[]} list The frame to send
 	   * @param {Function} [cb] Callback
 	   * @private
 	   */
@@ -2249,8 +2263,6 @@ function requireSender () {
 	return sender;
 }
 
-requireSender();
-
 var eventTarget;
 var hasRequiredEventTarget;
 
@@ -2777,6 +2789,7 @@ function requireWebsocket () {
 	const net = require$$3;
 	const tls = require$$4;
 	const { randomBytes, createHash } = require$$1;
+	const { Duplex, Readable } = require$$0$2;
 	const { URL } = require$$7;
 
 	const PerMessageDeflate = requirePermessageDeflate();
@@ -3476,7 +3489,7 @@ function requireWebsocket () {
 	  if (parsedUrl.protocol !== 'ws:' && !isSecure && !isIpcUrl) {
 	    invalidUrlMessage =
 	      'The URL\'s protocol must be one of "ws:", "wss:", ' +
-	      '"http:", "https", or "ws+unix:"';
+	      '"http:", "https:", or "ws+unix:"';
 	  } else if (isIpcUrl && !parsedUrl.pathname) {
 	    invalidUrlMessage = "The URL's pathname is empty";
 	  } else if (parsedUrl.hash) {
@@ -4157,6 +4170,182 @@ function requireWebsocket () {
 	return websocket;
 }
 
+/* eslint no-unused-vars: ["error", { "varsIgnorePattern": "^WebSocket$" }] */
+
+var stream;
+var hasRequiredStream;
+
+function requireStream () {
+	if (hasRequiredStream) return stream;
+	hasRequiredStream = 1;
+
+	requireWebsocket();
+	const { Duplex } = require$$0$2;
+
+	/**
+	 * Emits the `'close'` event on a stream.
+	 *
+	 * @param {Duplex} stream The stream.
+	 * @private
+	 */
+	function emitClose(stream) {
+	  stream.emit('close');
+	}
+
+	/**
+	 * The listener of the `'end'` event.
+	 *
+	 * @private
+	 */
+	function duplexOnEnd() {
+	  if (!this.destroyed && this._writableState.finished) {
+	    this.destroy();
+	  }
+	}
+
+	/**
+	 * The listener of the `'error'` event.
+	 *
+	 * @param {Error} err The error
+	 * @private
+	 */
+	function duplexOnError(err) {
+	  this.removeListener('error', duplexOnError);
+	  this.destroy();
+	  if (this.listenerCount('error') === 0) {
+	    // Do not suppress the throwing behavior.
+	    this.emit('error', err);
+	  }
+	}
+
+	/**
+	 * Wraps a `WebSocket` in a duplex stream.
+	 *
+	 * @param {WebSocket} ws The `WebSocket` to wrap
+	 * @param {Object} [options] The options for the `Duplex` constructor
+	 * @return {Duplex} The duplex stream
+	 * @public
+	 */
+	function createWebSocketStream(ws, options) {
+	  let terminateOnDestroy = true;
+
+	  const duplex = new Duplex({
+	    ...options,
+	    autoDestroy: false,
+	    emitClose: false,
+	    objectMode: false,
+	    writableObjectMode: false
+	  });
+
+	  ws.on('message', function message(msg, isBinary) {
+	    const data =
+	      !isBinary && duplex._readableState.objectMode ? msg.toString() : msg;
+
+	    if (!duplex.push(data)) ws.pause();
+	  });
+
+	  ws.once('error', function error(err) {
+	    if (duplex.destroyed) return;
+
+	    // Prevent `ws.terminate()` from being called by `duplex._destroy()`.
+	    //
+	    // - If the `'error'` event is emitted before the `'open'` event, then
+	    //   `ws.terminate()` is a noop as no socket is assigned.
+	    // - Otherwise, the error is re-emitted by the listener of the `'error'`
+	    //   event of the `Receiver` object. The listener already closes the
+	    //   connection by calling `ws.close()`. This allows a close frame to be
+	    //   sent to the other peer. If `ws.terminate()` is called right after this,
+	    //   then the close frame might not be sent.
+	    terminateOnDestroy = false;
+	    duplex.destroy(err);
+	  });
+
+	  ws.once('close', function close() {
+	    if (duplex.destroyed) return;
+
+	    duplex.push(null);
+	  });
+
+	  duplex._destroy = function (err, callback) {
+	    if (ws.readyState === ws.CLOSED) {
+	      callback(err);
+	      process.nextTick(emitClose, duplex);
+	      return;
+	    }
+
+	    let called = false;
+
+	    ws.once('error', function error(err) {
+	      called = true;
+	      callback(err);
+	    });
+
+	    ws.once('close', function close() {
+	      if (!called) callback(err);
+	      process.nextTick(emitClose, duplex);
+	    });
+
+	    if (terminateOnDestroy) ws.terminate();
+	  };
+
+	  duplex._final = function (callback) {
+	    if (ws.readyState === ws.CONNECTING) {
+	      ws.once('open', function open() {
+	        duplex._final(callback);
+	      });
+	      return;
+	    }
+
+	    // If the value of the `_socket` property is `null` it means that `ws` is a
+	    // client websocket and the handshake failed. In fact, when this happens, a
+	    // socket is never assigned to the websocket. Wait for the `'error'` event
+	    // that will be emitted by the websocket.
+	    if (ws._socket === null) return;
+
+	    if (ws._socket._writableState.finished) {
+	      callback();
+	      if (duplex._readableState.endEmitted) duplex.destroy();
+	    } else {
+	      ws._socket.once('finish', function finish() {
+	        // `duplex` is not destroyed here because the `'end'` event will be
+	        // emitted on `duplex` after this `'finish'` event. The EOF signaling
+	        // `null` chunk is, in fact, pushed when the websocket emits `'close'`.
+	        callback();
+	      });
+	      ws.close();
+	    }
+	  };
+
+	  duplex._read = function () {
+	    if (ws.isPaused) ws.resume();
+	  };
+
+	  duplex._write = function (chunk, encoding, callback) {
+	    if (ws.readyState === ws.CONNECTING) {
+	      ws.once('open', function open() {
+	        duplex._write(chunk, encoding, callback);
+	      });
+	      return;
+	    }
+
+	    ws.send(chunk, callback);
+	  };
+
+	  duplex.on('end', duplexOnEnd);
+	  duplex.on('error', duplexOnError);
+	  return duplex;
+	}
+
+	stream = createWebSocketStream;
+	return stream;
+}
+
+requireStream();
+
+requireReceiver();
+
+requireSender();
+
 var websocketExports = requireWebsocket();
 const _WebSocket = /*@__PURE__*/getDefaultExportFromCjs(websocketExports);
 
@@ -4241,6 +4430,7 @@ function requireWebsocketServer () {
 
 	const EventEmitter = require$$0$3;
 	const http = require$$2;
+	const { Duplex } = require$$0$2;
 	const { createHash } = require$$1;
 
 	const extension = requireExtension();

package/dist/shared/{crossws.CB4awDDj.mjs → crossws.D9ehKjSh.mjs}

@@ -19,7 +19,14 @@ class AdapterHookable {
     );
   }
   async upgrade(request) {
-    const context = request.context ??= {};
+    let context = request.context;
+    if (!context) {
+      context = {};
+      Object.defineProperty(request, "context", {
+        enumerable: true,
+        value: context
+      });
+    }
     try {
       const res = await this.callHook(
         "upgrade",
@@ -58,10 +65,16 @@ function adapterUtils(peers) {
   return {
     peers,
     publish(topic, message, options) {
-      const firstPeer = peers.values().next().value;
-      if (firstPeer) {
-        firstPeer.send(message, options);
-        firstPeer.publish(topic, message, options);
+      let firstPeerWithTopic;
+      for (const peer of peers) {
+        if (peer.topics.has(topic)) {
+          firstPeerWithTopic = peer;
+          break;
+        }
+      }
+      if (firstPeerWithTopic) {
+        firstPeerWithTopic.send(message, options);
+        firstPeerWithTopic.publish(topic, message, options);
       }
     }
   };
@@ -70,4 +83,4 @@ function defineWebSocketAdapter(factory) {
   return factory;
 }
 
-export { AdapterHookable as A, adapterUtils as a, defineHooks as b, defineWebSocketAdapter as d };
+export { AdapterHookable as A, adapterUtils as a, defineWebSocketAdapter as b, defineHooks as d };

package/dist/shared/{crossws.DLRVRjZs.mjs → crossws.DfCzGthR.mjs}

@@ -1,7 +1,10 @@
 import { randomUUID } from 'uncrypto';
 
+const kNodeInspect = /* @__PURE__ */ Symbol.for(
+  "nodejs.util.inspect.custom"
+);
 function toBufferLike(val) {
-  if (val === undefined || val === null) {
+  if (val === void 0 || val === null) {
     return "";
   }
   const type = typeof val;
@@ -206,7 +209,7 @@ class Message {
   [Symbol.toPrimitive]() {
     return this.text();
   }
-  [Symbol.for("nodejs.util.inspect.custom")]() {
+  [kNodeInspect]() {
     return { data: this.rawData };
   }
 }
@@ -234,7 +237,7 @@ class Peer {
   }
   /** IP address of the peer */
   get remoteAddress() {
-    return undefined;
+    return void 0;
   }
   /** upgrade request */
   get request() {
@@ -260,6 +263,10 @@ class Peer {
   get peers() {
     return this._internal.peers || /* @__PURE__ */ new Set();
   }
+  /** All topics, this peer has been subscribed to. */
+  get topics() {
+    return this._topics;
+  }
   /** Abruptly close the connection */
   terminate() {
     this.close();
@@ -282,7 +289,7 @@ class Peer {
   [Symbol.toStringTag]() {
     return "WebSocket";
   }
-  [Symbol.for("nodejs.util.inspect.custom")]() {
+  [kNodeInspect]() {
     return Object.fromEntries(
       [
         ["id", this.id],
@@ -306,7 +313,7 @@ function createWsProxy(ws, request) {
             return request?.headers?.get("sec-websocket-extensions") || "";
           }
           case "url": {
-            return request?.url?.replace(/^http/, "ws") || undefined;
+            return request?.url?.replace(/^http/, "ws") || void 0;
           }
         }
       }

package/dist/websocket/native.d.mts

@@ -1,10 +1,3 @@
-declare const _default: {
-    new (url: string | URL, protocols?: string | string[]): WebSocket;
-    prototype: WebSocket;
-    readonly CONNECTING: 0;
-    readonly OPEN: 1;
-    readonly CLOSING: 2;
-    readonly CLOSED: 3;
-};
+declare const WebSocket: typeof globalThis.WebSocket;
 
-export { _default as default };
+export { WebSocket as default };

package/dist/websocket/native.d.ts

@@ -1,10 +1,3 @@
-declare const _default: {
-    new (url: string | URL, protocols?: string | string[]): WebSocket;
-    prototype: WebSocket;
-    readonly CONNECTING: 0;
-    readonly OPEN: 1;
-    readonly CLOSING: 2;
-    readonly CLOSED: 3;
-};
+declare const WebSocket: typeof globalThis.WebSocket;
 
-export { _default as default };
+export { WebSocket as default };

package/dist/websocket/native.mjs

@@ -1,3 +1,3 @@
-const native = globalThis.WebSocket;
+const WebSocket = globalThis.WebSocket;
 
-export { native as default };
+export { WebSocket as default };

package/dist/websocket/node.d.mts

@@ -1,10 +1,3 @@
-declare const _default: {
-    new (url: string | URL, protocols?: string | string[]): WebSocket;
-    prototype: WebSocket;
-    readonly CONNECTING: 0;
-    readonly OPEN: 1;
-    readonly CLOSING: 2;
-    readonly CLOSED: 3;
-};
+declare const Websocket: typeof globalThis.WebSocket;
 
-export { _default as default };
+export { Websocket as default };

package/dist/websocket/node.d.ts

@@ -1,10 +1,3 @@
-declare const _default: {
-    new (url: string | URL, protocols?: string | string[]): WebSocket;
-    prototype: WebSocket;
-    readonly CONNECTING: 0;
-    readonly OPEN: 1;
-    readonly CLOSING: 2;
-    readonly CLOSED: 3;
-};
+declare const Websocket: typeof globalThis.WebSocket;
 
-export { _default as default };
+export { Websocket as default };

package/dist/websocket/node.mjs

@@ -1,5 +1,5 @@
+import { a as _WebSocket } from '../shared/crossws.CipVM6lf.mjs';
 import 'stream';
-import { a as _WebSocket } from '../shared/crossws.DelSCW9g.mjs';
 import 'events';
 import 'http';
 import 'crypto';
@@ -10,6 +10,6 @@ import 'net';
 import 'tls';
 import 'url';
 
-const node = globalThis.WebSocket || _WebSocket;
+const Websocket = globalThis.WebSocket || _WebSocket;
 
-export { node as default };
+export { Websocket as default };

package/dist/websocket/sse.d.mts

@@ -1,4 +1,4 @@
-import { W as WebSocket, C as CloseEvent, E as Event, M as MessageEvent, a as EventTarget } from '../shared/crossws.ChIJSJVK.mjs';
+import { E as EventTarget, W as WebSocket, C as CloseEvent, a as Event, M as MessageEvent } from '../shared/crossws.BQXMA5bH.mjs';
 
 type Ctor<T> = {
     prototype: T;
@@ -38,4 +38,5 @@ declare class WebSocketSSE extends _EventTarget implements WebSocket {
     send(data: any): Promise<void>;
 }
 
-export { WebSocketSSE, type WebSocketSSEOptions };
+export { WebSocketSSE };
+export type { WebSocketSSEOptions };

package/dist/websocket/sse.d.ts

@@ -1,4 +1,4 @@
-import { W as WebSocket, C as CloseEvent, E as Event, M as MessageEvent, a as EventTarget } from '../shared/crossws.ChIJSJVK.js';
+import { E as EventTarget, W as WebSocket, C as CloseEvent, a as Event, M as MessageEvent } from '../shared/crossws.BQXMA5bH.js';
 
 type Ctor<T> = {
     prototype: T;
@@ -38,4 +38,5 @@ declare class WebSocketSSE extends _EventTarget implements WebSocket {
     send(data: any): Promise<void>;
 }
 
-export { WebSocketSSE, type WebSocketSSEOptions };
+export { WebSocketSSE };
+export type { WebSocketSSEOptions };

package/dist/websocket/sse.mjs

@@ -70,7 +70,7 @@ class WebSocketSSE extends _EventTarget {
                 this.#sendController = controller;
               },
               cancel: () => {
-                this.#sendController = undefined;
+                this.#sendController = void 0;
               }
             }).pipeThrough(new TextEncoderStream())
           }).catch(() => {

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "crossws",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "Cross-platform WebSocket Servers for Node.js, Deno, Bun and Cloudflare Workers",
-  "repository": "unjs/crossws",
+  "repository": "h3js/crossws",
+  "homepage": "https://crossws.h3.dev",
   "license": "MIT",
   "sideEffects": false,
   "type": "module",
@@ -87,33 +88,40 @@
     "uncrypto": "^0.1.3"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250124.3",
-    "@types/bun": "^1.2.0",
-    "@types/deno": "^2.0.0",
-    "@types/eventsource": "^1.1.15",
-    "@types/node": "^22.10.10",
-    "@types/web": "^0.0.198",
-    "@types/ws": "^8.5.14",
-    "@vitest/coverage-v8": "^3.0.4",
-    "automd": "^0.3.12",
-    "changelogen": "^0.5.7",
-    "consola": "^3.4.0",
-    "eslint": "^9.18.0",
+    "@cloudflare/workers-types": "^4.20250506.0",
+    "@types/bun": "^1.2.12",
+    "@types/deno": "^2.3.0",
+    "@types/node": "^22.15.14",
+    "@types/web": "^0.0.232",
+    "@types/ws": "^8.18.1",
+    "@vitest/coverage-v8": "^3.1.3",
+    "automd": "^0.4.0",
+    "changelogen": "^0.6.1",
+    "consola": "^3.4.2",
+    "eslint": "^9.26.0",
     "eslint-config-unjs": "^0.4.2",
-    "eventsource": "^3.0.2",
+    "eventsource": "^3.0.6",
     "execa": "^9.5.2",
     "get-port-please": "^3.1.2",
-    "h3": "^1.14.0",
+    "h3": "^1.15.3",
     "jiti": "^2.4.2",
     "listhen": "^1.9.0",
-    "prettier": "^3.4.2",
-    "typescript": "^5.7.3",
+    "prettier": "^3.5.3",
+    "typescript": "^5.8.3",
     "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.44.0",
-    "unbuild": "^3.3.1",
-    "undici": "^7.3.0",
-    "vitest": "^3.0.4",
-    "wrangler": "^3.105.1",
-    "ws": "^8.18.0"
+    "unbuild": "^3.5.0",
+    "undici": "^7.8.0",
+    "vitest": "^3.1.3",
+    "wrangler": "^4.14.1",
+    "ws": "^8.18.2"
   },
-  "packageManager": "pnpm@9.15.4"
+  "packageManager": "pnpm@10.10.0",
+  "pnpm": {
+    "ignoredBuiltDependencies": [
+      "@parcel/watcher",
+      "esbuild",
+      "sharp",
+      "workerd"
+    ]
+  }
 }