crossws 0.3.5 → 0.4.1

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

@@ -6,7 +6,8 @@ class AdapterHookable {
   callHook(name, arg1, arg2) {
     const globalHook = this.options.hooks?.[name];
     const globalPromise = globalHook?.(arg1, arg2);
-    const resolveHooksPromise = this.options.resolve?.(arg1);
+    const request = arg1.request || arg1;
+    const resolveHooksPromise = this.options.resolve?.(request);
     if (!resolveHooksPromise) {
       return globalPromise;
     }
@@ -19,28 +20,32 @@ class AdapterHookable {
     );
   }
   async upgrade(request) {
-    let context = request.context;
-    if (!context) {
-      context = {};
-      Object.defineProperty(request, "context", {
-        enumerable: true,
-        value: context
-      });
-    }
+    let namespace = this.options.getNamespace?.(request) ?? new URL(request.url).pathname;
+    const context = request.context || {};
     try {
       const res = await this.callHook(
         "upgrade",
         request
       );
       if (!res) {
-        return { context };
+        return { context, namespace };
+      }
+      if (res.namespace) {
+        namespace = res.namespace;
       }
-      if (res.ok === false) {
-        return { context, endResponse: res };
+      if (res.context) {
+        Object.assign(
+          context,
+          res.context
+        );
+      }
+      if (res instanceof Response) {
+        return { context, namespace, endResponse: res };
       }
       if (res.headers) {
         return {
           context,
+          namespace,
           upgradeHeaders: res.headers
         };
       }
@@ -49,38 +54,52 @@ class AdapterHookable {
       if (errResponse instanceof Response) {
         return {
           context,
+          namespace,
           endResponse: errResponse
         };
       }
       throw error;
     }
-    return { context };
+    return { context, namespace };
   }
 }
 function defineHooks(hooks) {
   return hooks;
 }
 
-function adapterUtils(peers) {
+function adapterUtils(globalPeers) {
   return {
-    peers,
+    peers: globalPeers,
     publish(topic, message, options) {
-      let firstPeerWithTopic;
-      for (const peer of peers) {
-        if (peer.topics.has(topic)) {
-          firstPeerWithTopic = peer;
-          break;
+      for (const peers of options?.namespace ? [globalPeers.get(options.namespace) || []] : globalPeers.values()) {
+        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);
         }
-      }
-      if (firstPeerWithTopic) {
-        firstPeerWithTopic.send(message, options);
-        firstPeerWithTopic.publish(topic, message, options);
       }
     }
   };
 }
+function getPeers(globalPeers, namespace) {
+  if (!namespace) {
+    throw new Error("Websocket publish namespace missing.");
+  }
+  let peers = globalPeers.get(namespace);
+  if (!peers) {
+    peers = /* @__PURE__ */ new Set();
+    globalPeers.set(namespace, peers);
+  }
+  return peers;
+}
 function defineWebSocketAdapter(factory) {
   return factory;
 }
 
-export { AdapterHookable as A, adapterUtils as a, defineWebSocketAdapter as b, defineHooks as d };
+export { AdapterHookable as A, adapterUtils as a, defineWebSocketAdapter as b, defineHooks as d, getPeers as g };

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

@@ -1,5 +1,3 @@
-import { randomUUID } from 'uncrypto';
-
 const kNodeInspect = /* @__PURE__ */ Symbol.for(
   "nodejs.util.inspect.custom"
 );
@@ -76,7 +74,7 @@ class Message {
    */
   get id() {
     if (!this.#id) {
-      this.#id = randomUUID();
+      this.#id = crypto.randomUUID();
     }
     return this.#id;
   }
@@ -210,7 +208,13 @@ class Message {
     return this.text();
   }
   [kNodeInspect]() {
-    return { data: this.rawData };
+    return {
+      message: {
+        id: this.id,
+        peer: this.peer,
+        text: this.text()
+      }
+    };
   }
 }
 
@@ -226,12 +230,15 @@ class Peer {
   get context() {
     return this._internal.context ??= {};
   }
+  get namespace() {
+    return this._internal.namespace;
+  }
   /**
    * Unique random [uuid v4](https://developer.mozilla.org/en-US/docs/Glossary/UUID) identifier for the peer.
    */
   get id() {
     if (!this._id) {
-      this._id = randomUUID();
+      this._id = crypto.randomUUID();
     }
     return this._id;
   }
@@ -290,14 +297,12 @@ class Peer {
     return "WebSocket";
   }
   [kNodeInspect]() {
-    return Object.fromEntries(
-      [
-        ["id", this.id],
-        ["remoteAddress", this.remoteAddress],
-        ["peers", this.peers],
-        ["webSocket", this.websocket]
-      ].filter((p) => p[1])
-    );
+    return {
+      peer: {
+        id: this.id,
+        ip: this.remoteAddress
+      }
+    };
   }
 }
 function createWsProxy(ws, request) {

package/package.json

@@ -1,47 +1,32 @@
 {
   "name": "crossws",
-  "version": "0.3.5",
+  "version": "0.4.1",
   "description": "Cross-platform WebSocket Servers for Node.js, Deno, Bun and Cloudflare Workers",
-  "repository": "h3js/crossws",
   "homepage": "https://crossws.h3.dev",
+  "repository": "h3js/crossws",
   "license": "MIT",
   "sideEffects": false,
   "type": "module",
   "exports": {
-    ".": {
-      "types": "./dist/index.d.mts",
-      "default": "./dist/index.mjs"
-    },
-    "./adapters/bun": {
-      "types": "./dist/adapters/bun.d.mts",
-      "default": "./dist/adapters/bun.mjs"
-    },
-    "./adapters/deno": {
-      "types": "./dist/adapters/deno.d.mts",
-      "default": "./dist/adapters/deno.mjs"
-    },
-    "./adapters/cloudflare": {
-      "types": "./dist/adapters/cloudflare.d.mts",
-      "default": "./dist/adapters/cloudflare.mjs"
-    },
-    "./adapters/cloudflare-durable": {
-      "types": "./dist/adapters/cloudflare-durable.d.mts",
-      "default": "./dist/adapters/cloudflare-durable.mjs"
-    },
-    "./adapters/sse": {
-      "types": "./dist/adapters/sse.d.mts",
-      "default": "./dist/adapters/sse.mjs"
-    },
-    "./adapters/node": {
-      "types": "./dist/adapters/node.d.mts",
-      "default": "./dist/adapters/node.mjs"
-    },
-    "./adapters/uws": {
-      "types": "./dist/adapters/uws.d.mts",
-      "default": "./dist/adapters/uws.mjs"
+    ".": "./dist/index.mjs",
+    "./adapters/bun": "./dist/adapters/bun.mjs",
+    "./adapters/deno": "./dist/adapters/deno.mjs",
+    "./adapters/cloudflare": "./dist/adapters/cloudflare.mjs",
+    "./adapters/sse": "./dist/adapters/sse.mjs",
+    "./adapters/node": "./dist/adapters/node.mjs",
+    "./adapters/uws": "./dist/adapters/uws.mjs",
+    "./server/bun": "./dist/server/bun.mjs",
+    "./server/deno": "./dist/server/deno.mjs",
+    "./server/node": "./dist/server/node.mjs",
+    "./server": {
+      "deno": "./dist/server/deno.mjs",
+      "bun": "./dist/server/bun.mjs",
+      "workerd": "./dist/server/cloudflare.mjs",
+      "node": "./dist/server/node.mjs",
+      "default": "./dist/server/default.mjs"
     },
+    "./websocket/sse": "./dist/websocket/sse.mjs",
     "./websocket": {
-      "types": "./dist/websocket/native.d.mts",
       "browser": "./dist/websocket/native.mjs",
       "worker": "./dist/websocket/native.mjs",
       "bun": "./dist/websocket/native.mjs",
@@ -50,10 +35,6 @@
       "workerd": "./dist/websocket/native.mjs",
       "node": "./dist/websocket/node.mjs",
       "default": "./dist/websocket/native.mjs"
-    },
-    "./websocket/sse": {
-      "types": "./dist/websocket/sse.d.mts",
-      "default": "./dist/websocket/sse.mjs"
     }
   },
   "main": "./dist/index.mjs",
@@ -62,6 +43,8 @@
   "files": [
     "dist",
     "adapters",
+    "websocket",
+    "server",
     "*.d.ts"
   ],
   "scripts": {
@@ -84,38 +67,44 @@
   "resolutions": {
     "crossws": "workspace:*"
   },
-  "dependencies": {
-    "uncrypto": "^0.1.3"
-  },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250506.0",
-    "@types/bun": "^1.2.12",
+    "@cloudflare/workers-types": "^4.20250523.0",
+    "@types/bun": "^1.2.14",
     "@types/deno": "^2.3.0",
-    "@types/node": "^22.15.14",
-    "@types/web": "^0.0.232",
+    "@types/node": "^22.15.21",
+    "@types/web": "^0.0.235",
     "@types/ws": "^8.18.1",
-    "@vitest/coverage-v8": "^3.1.3",
+    "@vitest/coverage-v8": "^3.1.4",
     "automd": "^0.4.0",
     "changelogen": "^0.6.1",
     "consola": "^3.4.2",
-    "eslint": "^9.26.0",
+    "eslint": "^9.27.0",
     "eslint-config-unjs": "^0.4.2",
-    "eventsource": "^3.0.6",
-    "execa": "^9.5.2",
+    "eventsource": "^4.0.0",
+    "execa": "^9.5.3",
     "get-port-please": "^3.1.2",
     "h3": "^1.15.3",
     "jiti": "^2.4.2",
     "listhen": "^1.9.0",
     "prettier": "^3.5.3",
+    "srvx": "^0.7.1",
     "typescript": "^5.8.3",
     "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.44.0",
     "unbuild": "^3.5.0",
-    "undici": "^7.8.0",
-    "vitest": "^3.1.3",
-    "wrangler": "^4.14.1",
+    "undici": "^7.10.0",
+    "vitest": "^3.1.4",
+    "wrangler": "^4.16.1",
     "ws": "^8.18.2"
   },
-  "packageManager": "pnpm@10.10.0",
+  "peerDependencies": {
+    "srvx": ">=0.7.1"
+  },
+  "peerDependenciesMeta": {
+    "srvx": {
+      "optional": true
+    }
+  },
+  "packageManager": "pnpm@10.11.0",
   "pnpm": {
     "ignoredBuiltDependencies": [
       "@parcel/watcher",

package/server/bun.d.ts

@@ -0,0 +1,2 @@
+export * from "../dist/server/bun.mjs";
+export { default } from "../dist/server/bun.mjs";

package/server/deno.d.ts

@@ -0,0 +1,2 @@
+export * from "../dist/server/deno.mjs";
+export { default } from "../dist/server/deno.mjs";

package/server/node.d.ts

@@ -0,0 +1,2 @@
+export * from "../dist/server/node.mjs";
+export { default } from "../dist/server/node.mjs";

package/server.d.ts

@@ -0,0 +1,2 @@
+export * from "./dist/server/node.mjs";
+export { default } from "./dist/server/node.mjs";

package/websocket/sse.d.ts

@@ -0,0 +1,2 @@
+export * from "../dist/websocket/sse.mjs";
+export { default } from "../dist/websocket/sse.mjs";

package/websocket.d.ts

@@ -1,2 +1,2 @@
-export * from "./dist/websocket";
-export { default } from "./dist/websocket";
+export * from "./dist/websocket/native.mjs";
+export { default } from "./dist/websocket/native.mjs";

package/dist/adapters/bun.d.ts

@@ -1,39 +0,0 @@
-import { WebSocketHandler, ServerWebSocket, Server } from 'bun';
-import { Adapter, AdapterInstance, Peer, AdapterOptions } from '../index.js';
-import '../shared/crossws.BQXMA5bH.js';
-
-interface BunAdapter extends AdapterInstance {
-    websocket: WebSocketHandler<ContextData>;
-    handleUpgrade(req: Request, server: Server): Promise<Response | undefined>;
-}
-interface BunOptions extends AdapterOptions {
-}
-type ContextData = {
-    peer?: BunPeer;
-    request: Request;
-    server?: Server;
-    context: Peer["context"];
-};
-declare const bunAdapter: Adapter<BunAdapter, BunOptions>;
-
-declare class BunPeer extends Peer<{
-    ws: ServerWebSocket<ContextData>;
-    request: Request;
-    peers: Set<BunPeer>;
-}> {
-    get remoteAddress(): string;
-    get context(): Peer["context"];
-    send(data: unknown, options?: {
-        compress?: boolean;
-    }): number;
-    publish(topic: string, data: unknown, options?: {
-        compress?: boolean;
-    }): number;
-    subscribe(topic: string): void;
-    unsubscribe(topic: string): void;
-    close(code?: number, reason?: string): void;
-    terminate(): void;
-}
-
-export { bunAdapter as default };
-export type { BunAdapter, BunOptions };

package/dist/adapters/cloudflare-durable.d.mts

@@ -1,42 +0,0 @@
-import * as CF from '@cloudflare/workers-types';
-import { DurableObject } from 'cloudflare:workers';
-import { Adapter, AdapterInstance, AdapterOptions } from '../index.mjs';
-import { W as WebSocket$1 } from '../shared/crossws.BQXMA5bH.mjs';
-
-type ResolveDurableStub = (req: CF.Request, env: unknown, context: CF.ExecutionContext) => CF.DurableObjectStub | Promise<CF.DurableObjectStub>;
-interface CloudflareOptions extends AdapterOptions {
-    /**
-     * Durable Object binding name from environment.
-     *
-     * **Note:** This option will be ignored if `resolveDurableStub` is provided.
-     *
-     * @default "$DurableObject"
-     */
-    bindingName?: string;
-    /**
-     * Durable Object instance name.
-     *
-     * **Note:** This option will be ignored if `resolveDurableStub` is provided.
-     *
-     * @default "crossws"
-     */
-    instanceName?: string;
-    /**
-     * Custom function that resolves Durable Object binding to handle the WebSocket upgrade.
-     *
-     * **Note:** This option will override `bindingName` and `instanceName`.
-     */
-    resolveDurableStub?: ResolveDurableStub;
-}
-declare const cloudflareDurableAdapter: Adapter<CloudflareDurableAdapter, CloudflareOptions>;
-
-interface CloudflareDurableAdapter extends AdapterInstance {
-    handleUpgrade(req: Request | CF.Request, env: unknown, context: CF.ExecutionContext): Promise<Response>;
-    handleDurableInit(obj: DurableObject, state: DurableObjectState, env: unknown): void;
-    handleDurableUpgrade(obj: DurableObject, req: Request | CF.Request): Promise<Response>;
-    handleDurableMessage(obj: DurableObject, ws: WebSocket | CF.WebSocket | WebSocket$1, message: ArrayBuffer | string): Promise<void>;
-    handleDurableClose(obj: DurableObject, ws: WebSocket | CF.WebSocket | WebSocket$1, code: number, reason: string, wasClean: boolean): Promise<void>;
-}
-
-export { cloudflareDurableAdapter as default };
-export type { CloudflareDurableAdapter, CloudflareOptions };

package/dist/adapters/cloudflare-durable.d.ts

@@ -1,42 +0,0 @@
-import * as CF from '@cloudflare/workers-types';
-import { DurableObject } from 'cloudflare:workers';
-import { Adapter, AdapterInstance, AdapterOptions } from '../index.js';
-import { W as WebSocket$1 } from '../shared/crossws.BQXMA5bH.js';
-
-type ResolveDurableStub = (req: CF.Request, env: unknown, context: CF.ExecutionContext) => CF.DurableObjectStub | Promise<CF.DurableObjectStub>;
-interface CloudflareOptions extends AdapterOptions {
-    /**
-     * Durable Object binding name from environment.
-     *
-     * **Note:** This option will be ignored if `resolveDurableStub` is provided.
-     *
-     * @default "$DurableObject"
-     */
-    bindingName?: string;
-    /**
-     * Durable Object instance name.
-     *
-     * **Note:** This option will be ignored if `resolveDurableStub` is provided.
-     *
-     * @default "crossws"
-     */
-    instanceName?: string;
-    /**
-     * Custom function that resolves Durable Object binding to handle the WebSocket upgrade.
-     *
-     * **Note:** This option will override `bindingName` and `instanceName`.
-     */
-    resolveDurableStub?: ResolveDurableStub;
-}
-declare const cloudflareDurableAdapter: Adapter<CloudflareDurableAdapter, CloudflareOptions>;
-
-interface CloudflareDurableAdapter extends AdapterInstance {
-    handleUpgrade(req: Request | CF.Request, env: unknown, context: CF.ExecutionContext): Promise<Response>;
-    handleDurableInit(obj: DurableObject, state: DurableObjectState, env: unknown): void;
-    handleDurableUpgrade(obj: DurableObject, req: Request | CF.Request): Promise<Response>;
-    handleDurableMessage(obj: DurableObject, ws: WebSocket | CF.WebSocket | WebSocket$1, message: ArrayBuffer | string): Promise<void>;
-    handleDurableClose(obj: DurableObject, ws: WebSocket | CF.WebSocket | WebSocket$1, code: number, reason: string, wasClean: boolean): Promise<void>;
-}
-
-export { cloudflareDurableAdapter as default };
-export type { CloudflareDurableAdapter, CloudflareOptions };

package/dist/adapters/cloudflare-durable.mjs

@@ -1,141 +0,0 @@
-import { M as Message, P as Peer, t as toBufferLike } from '../shared/crossws.DfCzGthR.mjs';
-import { a as adapterUtils, A as AdapterHookable } from '../shared/crossws.D9ehKjSh.mjs';
-import 'uncrypto';
-
-const cloudflareDurableAdapter = (opts = {}) => {
-  const hooks = new AdapterHookable(opts);
-  const peers = /* @__PURE__ */ new Set();
-  const resolveDurableStub = opts.resolveDurableStub || ((_req, env, _context) => {
-    const bindingName = opts.bindingName || "$DurableObject";
-    const binding = env[bindingName];
-    if (!binding) {
-      throw new Error(
-        `Durable Object binding "${bindingName}" not available`
-      );
-    }
-    const instanceId = binding.idFromName(opts.instanceName || "crossws");
-    return binding.get(instanceId);
-  });
-  return {
-    ...adapterUtils(peers),
-    handleUpgrade: async (req, env, context) => {
-      const stub = await resolveDurableStub(req, env, context);
-      return stub.fetch(req);
-    },
-    handleDurableInit: async (obj, state, env) => {
-    },
-    handleDurableUpgrade: async (obj, request) => {
-      const { upgradeHeaders, endResponse } = await hooks.upgrade(
-        request
-      );
-      if (endResponse) {
-        return endResponse;
-      }
-      const pair = new WebSocketPair();
-      const client = pair[0];
-      const server = pair[1];
-      const peer = CloudflareDurablePeer._restore(
-        obj,
-        server,
-        request
-      );
-      peers.add(peer);
-      obj.ctx.acceptWebSocket(server);
-      await hooks.callHook("open", peer);
-      return new Response(null, {
-        status: 101,
-        webSocket: client,
-        headers: upgradeHeaders
-      });
-    },
-    handleDurableMessage: async (obj, ws, message) => {
-      const peer = CloudflareDurablePeer._restore(obj, ws);
-      await hooks.callHook("message", peer, new Message(message, peer));
-    },
-    handleDurableClose: async (obj, ws, code, reason, wasClean) => {
-      const peer = CloudflareDurablePeer._restore(obj, ws);
-      peers.delete(peer);
-      const details = { code, reason, wasClean };
-      await hooks.callHook("close", peer, details);
-    }
-  };
-};
-class CloudflareDurablePeer extends Peer {
-  get peers() {
-    return new Set(
-      this.#getwebsockets().map(
-        (ws) => CloudflareDurablePeer._restore(this._internal.durable, ws)
-      )
-    );
-  }
-  #getwebsockets() {
-    return this._internal.durable.ctx.getWebSockets();
-  }
-  send(data) {
-    return this._internal.ws.send(toBufferLike(data));
-  }
-  subscribe(topic) {
-    super.subscribe(topic);
-    const state = getAttachedState(this._internal.ws);
-    if (!state.t) {
-      state.t = /* @__PURE__ */ new Set();
-    }
-    state.t.add(topic);
-    setAttachedState(this._internal.ws, state);
-  }
-  publish(topic, data) {
-    const websockets = this.#getwebsockets();
-    if (websockets.length < 2) {
-      return;
-    }
-    const dataBuff = toBufferLike(data);
-    for (const ws of websockets) {
-      if (ws === this._internal.ws) {
-        continue;
-      }
-      const state = getAttachedState(ws);
-      if (state.t?.has(topic)) {
-        ws.send(dataBuff);
-      }
-    }
-  }
-  close(code, reason) {
-    this._internal.ws.close(code, reason);
-  }
-  static _restore(durable, ws, request) {
-    let peer = ws._crosswsPeer;
-    if (peer) {
-      return peer;
-    }
-    const state = ws.deserializeAttachment() || {};
-    peer = ws._crosswsPeer = new CloudflareDurablePeer({
-      ws,
-      request: request || { url: state.u },
-      durable
-    });
-    if (state.i) {
-      peer._id = state.i;
-    }
-    if (request?.url) {
-      state.u = request.url;
-    }
-    state.i = peer.id;
-    setAttachedState(ws, state);
-    return peer;
-  }
-}
-function getAttachedState(ws) {
-  let state = ws._crosswsState;
-  if (state) {
-    return state;
-  }
-  state = ws.deserializeAttachment() || {};
-  ws._crosswsState = state;
-  return state;
-}
-function setAttachedState(ws, state) {
-  ws._crosswsState = state;
-  ws.serializeAttachment(state);
-}
-
-export { cloudflareDurableAdapter as default };

package/dist/adapters/cloudflare.d.ts

@@ -1,13 +0,0 @@
-import { Adapter, AdapterInstance, AdapterOptions } from '../index.js';
-import * as CF from '@cloudflare/workers-types';
-import '../shared/crossws.BQXMA5bH.js';
-
-interface CloudflareAdapter extends AdapterInstance {
-    handleUpgrade(req: CF.Request, env: unknown, context: CF.ExecutionContext): Promise<CF.Response>;
-}
-interface CloudflareOptions extends AdapterOptions {
-}
-declare const cloudflareAdapter: Adapter<CloudflareAdapter, CloudflareOptions>;
-
-export { cloudflareAdapter as default };
-export type { CloudflareAdapter, CloudflareOptions };

package/dist/adapters/deno.d.ts

@@ -1,19 +0,0 @@
-import { Adapter, AdapterInstance, AdapterOptions } from '../index.js';
-import '../shared/crossws.BQXMA5bH.js';
-
-interface DenoAdapter extends AdapterInstance {
-    handleUpgrade(req: Request, info: ServeHandlerInfo): Promise<Response>;
-}
-interface DenoOptions extends AdapterOptions {
-}
-type ServeHandlerInfo = {
-    remoteAddr?: {
-        transport: string;
-        hostname: string;
-        port: number;
-    };
-};
-declare const denoAdapter: Adapter<DenoAdapter, DenoOptions>;
-
-export { denoAdapter as default };
-export type { DenoAdapter, DenoOptions };