crossws 0.3.2 → 0.3.4

package/dist/adapters/node.mjs

@@ -1,5 +1,5 @@
-import { M as Message, P as Peer, t as toBufferLike } from '../shared/crossws.DLRVRjZs.mjs';
-import { d as defineWebSocketAdapter, a as adapterUtils, A as AdapterHookable } from '../shared/crossws.BcEs6ZHK.mjs';
+import { M as Message, P as Peer, t as toBufferLike } from '../shared/crossws.BS81iGZK.mjs';
+import { a as adapterUtils, A as AdapterHookable } from '../shared/crossws.D9ehKjSh.mjs';
 import { W as WSError } from '../shared/crossws.By9qWDAI.mjs';
 import 'stream';
 import { _ as _WebSocketServer } from '../shared/crossws.DelSCW9g.mjs';
@@ -14,68 +14,66 @@ import 'net';
 import 'tls';
 import 'url';
 
-const node = defineWebSocketAdapter(
-  (options = {}) => {
-    const hooks = new AdapterHookable(options);
-    const peers = /* @__PURE__ */ new Set();
-    const wss = options.wss || new _WebSocketServer({
-      noServer: true,
-      ...options.serverOptions
+const nodeAdapter = (options = {}) => {
+  const hooks = new AdapterHookable(options);
+  const peers = /* @__PURE__ */ new Set();
+  const wss = options.wss || new _WebSocketServer({
+    noServer: true,
+    ...options.serverOptions
+  });
+  wss.on("connection", (ws, nodeReq) => {
+    const request = new NodeReqProxy(nodeReq);
+    const peer = new NodePeer({ ws, request, peers, nodeReq });
+    peers.add(peer);
+    hooks.callHook("open", peer);
+    ws.on("message", (data) => {
+      if (Array.isArray(data)) {
+        data = Buffer.concat(data);
+      }
+      hooks.callHook("message", peer, new Message(data, peer));
     });
-    wss.on("connection", (ws, nodeReq) => {
-      const request = new NodeReqProxy(nodeReq);
-      const peer = new NodePeer({ ws, request, peers, nodeReq });
-      peers.add(peer);
-      hooks.callHook("open", peer);
-      ws.on("message", (data) => {
-        if (Array.isArray(data)) {
-          data = Buffer.concat(data);
-        }
-        hooks.callHook("message", peer, new Message(data, peer));
-      });
-      ws.on("error", (error) => {
-        peers.delete(peer);
-        hooks.callHook("error", peer, new WSError(error));
-      });
-      ws.on("close", (code, reason) => {
-        peers.delete(peer);
-        hooks.callHook("close", peer, {
-          code,
-          reason: reason?.toString()
-        });
+    ws.on("error", (error) => {
+      peers.delete(peer);
+      hooks.callHook("error", peer, new WSError(error));
+    });
+    ws.on("close", (code, reason) => {
+      peers.delete(peer);
+      hooks.callHook("close", peer, {
+        code,
+        reason: reason?.toString()
       });
     });
-    wss.on("headers", (outgoingHeaders, req) => {
-      const upgradeHeaders = req._upgradeHeaders;
-      if (upgradeHeaders) {
-        for (const [key, value] of new Headers(upgradeHeaders)) {
-          outgoingHeaders.push(`${key}: ${value}`);
-        }
+  });
+  wss.on("headers", (outgoingHeaders, req) => {
+    const upgradeHeaders = req._upgradeHeaders;
+    if (upgradeHeaders) {
+      for (const [key, value] of new Headers(upgradeHeaders)) {
+        outgoingHeaders.push(`${key}: ${value}`);
       }
-    });
-    return {
-      ...adapterUtils(peers),
-      handleUpgrade: async (nodeReq, socket, head) => {
-        const request = new NodeReqProxy(nodeReq);
-        const { upgradeHeaders, endResponse, context } = await hooks.upgrade(request);
-        if (endResponse) {
-          return sendResponse(socket, endResponse);
-        }
-        nodeReq._request = request;
-        nodeReq._upgradeHeaders = upgradeHeaders;
-        nodeReq._context = context;
-        wss.handleUpgrade(nodeReq, socket, head, (ws) => {
-          wss.emit("connection", ws, nodeReq);
-        });
-      },
-      closeAll: (code, data) => {
-        for (const client of wss.clients) {
-          client.close(code, data);
-        }
+    }
+  });
+  return {
+    ...adapterUtils(peers),
+    handleUpgrade: async (nodeReq, socket, head) => {
+      const request = new NodeReqProxy(nodeReq);
+      const { upgradeHeaders, endResponse, context } = await hooks.upgrade(request);
+      if (endResponse) {
+        return sendResponse(socket, endResponse);
       }
-    };
-  }
-);
+      nodeReq._request = request;
+      nodeReq._upgradeHeaders = upgradeHeaders;
+      nodeReq._context = context;
+      wss.handleUpgrade(nodeReq, socket, head, (ws) => {
+        wss.emit("connection", ws, nodeReq);
+      });
+    },
+    closeAll: (code, data) => {
+      for (const client of wss.clients) {
+        client.close(code, data);
+      }
+    }
+  };
+};
 class NodePeer extends Peer {
   get remoteAddress() {
     return this._internal.nodeReq.socket?.remoteAddress;
@@ -85,7 +83,7 @@ class NodePeer extends Peer {
   }
   send(data, options) {
     const dataBuff = toBufferLike(data);
-    const isBinary = typeof data !== "string";
+    const isBinary = typeof dataBuff !== "string";
     this._internal.ws.send(dataBuff, {
       compress: options?.compress,
       binary: isBinary,
@@ -155,4 +153,4 @@ async function sendResponse(socket, res) {
   });
 }
 
-export { node as default };
+export { nodeAdapter as default };

package/dist/adapters/sse.d.mts

@@ -7,6 +7,6 @@ interface SSEAdapter extends AdapterInstance {
 interface SSEOptions extends AdapterOptions {
     bidir?: boolean;
 }
-declare const _default: Adapter<SSEAdapter, SSEOptions>;
+declare const sseAdapter: Adapter<SSEAdapter, SSEOptions>;
 
-export { type SSEAdapter, type SSEOptions, _default as default };
+export { type SSEAdapter, type SSEOptions, sseAdapter as default };

package/dist/adapters/sse.d.ts

@@ -7,6 +7,6 @@ interface SSEAdapter extends AdapterInstance {
 interface SSEOptions extends AdapterOptions {
     bidir?: boolean;
 }
-declare const _default: Adapter<SSEAdapter, SSEOptions>;
+declare const sseAdapter: Adapter<SSEAdapter, SSEOptions>;
 
-export { type SSEAdapter, type SSEOptions, _default as default };
+export { type SSEAdapter, type SSEOptions, sseAdapter as default };

package/dist/adapters/sse.mjs

@@ -1,8 +1,8 @@
-import { M as Message, P as Peer, a as toString } from '../shared/crossws.DLRVRjZs.mjs';
-import { d as defineWebSocketAdapter, a as adapterUtils, A as AdapterHookable } from '../shared/crossws.BcEs6ZHK.mjs';
+import { M as Message, P as Peer, a as toString } from '../shared/crossws.BS81iGZK.mjs';
+import { a as adapterUtils, A as AdapterHookable } from '../shared/crossws.D9ehKjSh.mjs';
 import 'uncrypto';
 
-const sse = defineWebSocketAdapter((opts = {}) => {
+const sseAdapter = (opts = {}) => {
   const hooks = new AdapterHookable(opts);
   const peers = /* @__PURE__ */ new Set();
   const peersMap = opts.bidir ? /* @__PURE__ */ new Map() : undefined;
@@ -63,7 +63,7 @@ const sse = defineWebSocketAdapter((opts = {}) => {
       return new Response(peer._sseStream, { headers });
     }
   };
-});
+};
 class SSEPeer extends Peer {
   _sseStream;
   // server -> client
@@ -118,4 +118,4 @@ class SSEWebSocketStub {
   readyState;
 }
 
-export { sse as default };
+export { sseAdapter as default };

package/dist/adapters/uws.d.mts

@@ -17,7 +17,7 @@ interface UWSAdapter extends AdapterInstance {
 interface UWSOptions extends AdapterOptions {
     uws?: Exclude<uws.WebSocketBehavior<any>, "close" | "drain" | "message" | "open" | "ping" | "pong" | "subscription" | "upgrade">;
 }
-declare const _default: Adapter<UWSAdapter, UWSOptions>;
+declare const uwsAdapter: Adapter<UWSAdapter, UWSOptions>;
 
 declare class UWSPeer extends Peer<{
     peers: Set<UWSPeer>;
@@ -32,6 +32,7 @@ declare class UWSPeer extends Peer<{
         compress?: boolean;
     }): number;
     subscribe(topic: string): void;
+    unsubscribe(topic: string): void;
     publish(topic: string, message: string, options?: {
         compress?: boolean;
     }): number;
@@ -54,4 +55,4 @@ declare class UwsWebSocketProxy implements Partial<WebSocket> {
     get extensions(): string;
 }
 
-export { type UWSAdapter, type UWSOptions, _default as default };
+export { type UWSAdapter, type UWSOptions, uwsAdapter as default };

package/dist/adapters/uws.d.ts

@@ -17,7 +17,7 @@ interface UWSAdapter extends AdapterInstance {
 interface UWSOptions extends AdapterOptions {
     uws?: Exclude<uws.WebSocketBehavior<any>, "close" | "drain" | "message" | "open" | "ping" | "pong" | "subscription" | "upgrade">;
 }
-declare const _default: Adapter<UWSAdapter, UWSOptions>;
+declare const uwsAdapter: Adapter<UWSAdapter, UWSOptions>;
 
 declare class UWSPeer extends Peer<{
     peers: Set<UWSPeer>;
@@ -32,6 +32,7 @@ declare class UWSPeer extends Peer<{
         compress?: boolean;
     }): number;
     subscribe(topic: string): void;
+    unsubscribe(topic: string): void;
     publish(topic: string, message: string, options?: {
         compress?: boolean;
     }): number;
@@ -54,4 +55,4 @@ declare class UwsWebSocketProxy implements Partial<WebSocket> {
     get extensions(): string;
 }
 
-export { type UWSAdapter, type UWSOptions, _default as default };
+export { type UWSAdapter, type UWSOptions, uwsAdapter as default };

package/dist/adapters/uws.mjs

@@ -1,91 +1,89 @@
-import { M as Message, P as Peer, t as toBufferLike } from '../shared/crossws.DLRVRjZs.mjs';
-import { d as defineWebSocketAdapter, a as adapterUtils, A as AdapterHookable } from '../shared/crossws.BcEs6ZHK.mjs';
+import { M as Message, P as Peer, t as toBufferLike } from '../shared/crossws.BS81iGZK.mjs';
+import { a as adapterUtils, A as AdapterHookable } from '../shared/crossws.D9ehKjSh.mjs';
 import 'uncrypto';
 
-const uws = defineWebSocketAdapter(
-  (options = {}) => {
-    const hooks = new AdapterHookable(options);
-    const peers = /* @__PURE__ */ new Set();
-    return {
-      ...adapterUtils(peers),
-      websocket: {
-        ...options.uws,
-        close(ws, code, message) {
-          const peer = getPeer(ws, peers);
-          peer._internal.ws.readyState = 2;
-          peers.delete(peer);
-          hooks.callHook("close", peer, {
-            code,
-            reason: message?.toString()
-          });
-          peer._internal.ws.readyState = 3;
-        },
-        message(ws, message, isBinary) {
-          const peer = getPeer(ws, peers);
-          hooks.callHook("message", peer, new Message(message, peer));
-        },
-        open(ws) {
-          const peer = getPeer(ws, peers);
-          peers.add(peer);
-          hooks.callHook("open", peer);
-        },
-        async upgrade(res, req, uwsContext) {
-          let aborted = false;
-          res.onAborted(() => {
-            aborted = true;
-          });
-          const { upgradeHeaders, endResponse, context } = await hooks.upgrade(
-            new UWSReqProxy(req)
-          );
-          if (endResponse) {
-            res.writeStatus(`${endResponse.status} ${endResponse.statusText}`);
-            for (const [key, value] of endResponse.headers) {
-              res.writeHeader(key, value);
-            }
-            if (endResponse.body) {
-              for await (const chunk of endResponse.body) {
-                if (aborted) break;
-                res.write(chunk);
-              }
-            }
-            if (!aborted) {
-              res.end();
+const uwsAdapter = (options = {}) => {
+  const hooks = new AdapterHookable(options);
+  const peers = /* @__PURE__ */ new Set();
+  return {
+    ...adapterUtils(peers),
+    websocket: {
+      ...options.uws,
+      close(ws, code, message) {
+        const peer = getPeer(ws, peers);
+        peer._internal.ws.readyState = 2;
+        peers.delete(peer);
+        hooks.callHook("close", peer, {
+          code,
+          reason: message?.toString()
+        });
+        peer._internal.ws.readyState = 3;
+      },
+      message(ws, message, isBinary) {
+        const peer = getPeer(ws, peers);
+        hooks.callHook("message", peer, new Message(message, peer));
+      },
+      open(ws) {
+        const peer = getPeer(ws, peers);
+        peers.add(peer);
+        hooks.callHook("open", peer);
+      },
+      async upgrade(res, req, uwsContext) {
+        let aborted = false;
+        res.onAborted(() => {
+          aborted = true;
+        });
+        const { upgradeHeaders, endResponse, context } = await hooks.upgrade(
+          new UWSReqProxy(req)
+        );
+        if (endResponse) {
+          res.writeStatus(`${endResponse.status} ${endResponse.statusText}`);
+          for (const [key, value] of endResponse.headers) {
+            res.writeHeader(key, value);
+          }
+          if (endResponse.body) {
+            for await (const chunk of endResponse.body) {
+              if (aborted) break;
+              res.write(chunk);
             }
-            return;
           }
-          if (aborted) {
-            return;
+          if (!aborted) {
+            res.end();
           }
-          res.writeStatus("101 Switching Protocols");
-          if (upgradeHeaders) {
-            const headers = upgradeHeaders instanceof Headers ? upgradeHeaders : new Headers(upgradeHeaders);
-            for (const [key, value] of headers) {
-              res.writeHeader(key, value);
-            }
+          return;
+        }
+        if (aborted) {
+          return;
+        }
+        res.writeStatus("101 Switching Protocols");
+        if (upgradeHeaders) {
+          const headers = upgradeHeaders instanceof Headers ? upgradeHeaders : new Headers(upgradeHeaders);
+          for (const [key, value] of headers) {
+            res.writeHeader(key, value);
           }
-          res.cork(() => {
-            const key = req.getHeader("sec-websocket-key");
-            const protocol = req.getHeader("sec-websocket-protocol");
-            const extensions = req.getHeader("sec-websocket-extensions");
-            res.upgrade(
-              {
-                req,
-                res,
-                protocol,
-                extensions,
-                context
-              },
-              key,
+        }
+        res.cork(() => {
+          const key = req.getHeader("sec-websocket-key");
+          const protocol = req.getHeader("sec-websocket-protocol");
+          const extensions = req.getHeader("sec-websocket-extensions");
+          res.upgrade(
+            {
+              req,
+              res,
               protocol,
               extensions,
-              uwsContext
-            );
-          });
-        }
+              context
+            },
+            key,
+            protocol,
+            extensions,
+            uwsContext
+          );
+        });
       }
-    };
-  }
-);
+    }
+  };
+};
 function getPeer(uws, peers) {
   const uwsData = uws.getUserData();
   if (uwsData.peer) {
@@ -116,12 +114,17 @@ class UWSPeer extends Peer {
   }
   send(data, options) {
     const dataBuff = toBufferLike(data);
-    const isBinary = typeof data !== "string";
+    const isBinary = typeof dataBuff !== "string";
     return this._internal.uws.send(dataBuff, isBinary, options?.compress);
   }
   subscribe(topic) {
+    this._topics.add(topic);
     this._internal.uws.subscribe(topic);
   }
+  unsubscribe(topic) {
+    this._topics.delete(topic);
+    this._internal.uws.unsubscribe(topic);
+  }
   publish(topic, message, options) {
     const data = toBufferLike(message);
     const isBinary = typeof data !== "string";
@@ -177,4 +180,4 @@ class UwsWebSocketProxy {
   }
 }
 
-export { uws as default };
+export { uwsAdapter as default };

package/dist/index.d.mts

@@ -1,5 +1,7 @@
 import { W as WebSocket } from './shared/crossws.ChIJSJVK.mjs';
 
+declare const kNodeInspect: unique symbol;
+
 interface AdapterInternal {
     ws: unknown;
     request: UpgradeRequest;
@@ -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;

package/dist/index.d.ts

@@ -1,5 +1,7 @@
 import { W as WebSocket } from './shared/crossws.ChIJSJVK.js';
 
+declare const kNodeInspect: unique symbol;
+
 interface AdapterInternal {
     ws: unknown;
     request: UpgradeRequest;
@@ -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;

package/dist/index.mjs

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

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

@@ -1,5 +1,8 @@
 import { randomUUID } from 'uncrypto';
 
+const kNodeInspect = /* @__PURE__ */ Symbol.for(
+  "nodejs.util.inspect.custom"
+);
 function toBufferLike(val) {
   if (val === undefined || val === null) {
     return "";
@@ -206,7 +209,7 @@ class Message {
   [Symbol.toPrimitive]() {
     return this.text();
   }
-  [Symbol.for("nodejs.util.inspect.custom")]() {
+  [kNodeInspect]() {
     return { data: this.rawData };
   }
 }
@@ -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],

package/dist/shared/{crossws.BcEs6ZHK.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",
@@ -38,8 +45,12 @@ class AdapterHookable {
         };
       }
     } catch (error) {
-      if (error instanceof Response) {
-        return { context, endResponse: error };
+      const errResponse = error.response || error;
+      if (errResponse instanceof Response) {
+        return {
+          context,
+          endResponse: errResponse
+        };
       }
       throw error;
     }
@@ -54,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);
       }
     }
   };
@@ -66,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/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 };