crossws 0.2.3 → 0.3.0

package/dist/websocket/{index.d.mts → native.d.mts}

@@ -1,5 +1,5 @@
 declare const _default: {
-    new (url: string | URL, protocols?: string | string[] | undefined): WebSocket;
+    new (url: string | URL, protocols?: string | string[]): WebSocket;
     prototype: WebSocket;
     readonly CONNECTING: 0;
     readonly OPEN: 1;

package/dist/websocket/{node.d.cts → native.d.ts}

@@ -1,5 +1,5 @@
 declare const _default: {
-    new (url: string | URL, protocols?: string | string[] | undefined): WebSocket;
+    new (url: string | URL, protocols?: string | string[]): WebSocket;
     prototype: WebSocket;
     readonly CONNECTING: 0;
     readonly OPEN: 1;

package/dist/websocket/native.mjs

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

package/dist/websocket/node.d.mts

@@ -1,5 +1,5 @@
 declare const _default: {
-    new (url: string | URL, protocols?: string | string[] | undefined): WebSocket;
+    new (url: string | URL, protocols?: string | string[]): WebSocket;
     prototype: WebSocket;
     readonly CONNECTING: 0;
     readonly OPEN: 1;

package/dist/websocket/node.d.ts

@@ -1,5 +1,5 @@
 declare const _default: {
-    new (url: string | URL, protocols?: string | string[] | undefined): WebSocket;
+    new (url: string | URL, protocols?: string | string[]): WebSocket;
     prototype: WebSocket;
     readonly CONNECTING: 0;
     readonly OPEN: 1;

package/dist/websocket/node.mjs

@@ -1,5 +1,5 @@
 import 'stream';
-import { _ as _WebSocket } from '../shared/crossws.a5db571c.mjs';
+import { _ as _WebSocket } from '../shared/crossws.YgHWLi0G.mjs';
 import 'events';
 import 'http';
 import 'crypto';

package/dist/websocket/sse.d.mts

@@ -0,0 +1,41 @@
+import { W as WebSocket, C as CloseEvent, E as Event, M as MessageEvent, a as EventTarget } from '../shared/crossws.ChIJSJVK.mjs';
+
+type Ctor<T> = {
+    prototype: T;
+    new (): T;
+};
+declare const _EventTarget: Ctor<EventTarget>;
+interface WebSocketSSEOptions {
+    protocols?: string | string[];
+    /** enabled by default */
+    bidir?: boolean;
+    /** enabled by default */
+    stream?: boolean;
+    headers?: HeadersInit;
+}
+declare class WebSocketSSE extends _EventTarget implements WebSocket {
+    #private;
+    static CONNECTING: number;
+    static OPEN: number;
+    static CLOSING: number;
+    static CLOSED: number;
+    readonly CONNECTING = 0;
+    readonly OPEN = 1;
+    readonly CLOSING = 2;
+    readonly CLOSED = 3;
+    onclose: ((this: WebSocket, ev: CloseEvent) => any) | null;
+    onerror: ((this: WebSocket, ev: Event) => any) | null;
+    onopen: ((this: WebSocket, ev: Event) => any) | null;
+    onmessage: ((this: WebSocket, ev: MessageEvent<any>) => any) | null;
+    binaryType: BinaryType;
+    readyState: number;
+    readonly url: string;
+    readonly protocol: string;
+    readonly extensions: string;
+    readonly bufferedAmount: number;
+    constructor(url: string, init?: string | string[] | WebSocketSSEOptions);
+    close(_code?: number, _reason?: string): void;
+    send(data: any): Promise<void>;
+}
+
+export { WebSocketSSE, type WebSocketSSEOptions };

package/dist/websocket/sse.d.ts

@@ -0,0 +1,41 @@
+import { W as WebSocket, C as CloseEvent, E as Event, M as MessageEvent, a as EventTarget } from '../shared/crossws.ChIJSJVK.js';
+
+type Ctor<T> = {
+    prototype: T;
+    new (): T;
+};
+declare const _EventTarget: Ctor<EventTarget>;
+interface WebSocketSSEOptions {
+    protocols?: string | string[];
+    /** enabled by default */
+    bidir?: boolean;
+    /** enabled by default */
+    stream?: boolean;
+    headers?: HeadersInit;
+}
+declare class WebSocketSSE extends _EventTarget implements WebSocket {
+    #private;
+    static CONNECTING: number;
+    static OPEN: number;
+    static CLOSING: number;
+    static CLOSED: number;
+    readonly CONNECTING = 0;
+    readonly OPEN = 1;
+    readonly CLOSING = 2;
+    readonly CLOSED = 3;
+    onclose: ((this: WebSocket, ev: CloseEvent) => any) | null;
+    onerror: ((this: WebSocket, ev: Event) => any) | null;
+    onopen: ((this: WebSocket, ev: Event) => any) | null;
+    onmessage: ((this: WebSocket, ev: MessageEvent<any>) => any) | null;
+    binaryType: BinaryType;
+    readyState: number;
+    readonly url: string;
+    readonly protocol: string;
+    readonly extensions: string;
+    readonly bufferedAmount: number;
+    constructor(url: string, init?: string | string[] | WebSocketSSEOptions);
+    close(_code?: number, _reason?: string): void;
+    send(data: any): Promise<void>;
+}
+
+export { WebSocketSSE, type WebSocketSSEOptions };

package/dist/websocket/sse.mjs

@@ -0,0 +1,127 @@
+const _EventTarget = EventTarget;
+const defaultOptions = Object.freeze({
+  bidir: true,
+  stream: true
+});
+class WebSocketSSE extends _EventTarget {
+  static CONNECTING = 0;
+  static OPEN = 1;
+  static CLOSING = 2;
+  static CLOSED = 3;
+  CONNECTING = 0;
+  OPEN = 1;
+  CLOSING = 2;
+  CLOSED = 3;
+  /* eslint-disable unicorn/no-null */
+  onclose = null;
+  onerror = null;
+  onopen = null;
+  onmessage = null;
+  /* eslint-enable unicorn/no-null */
+  binaryType = "blob";
+  readyState = WebSocketSSE.CONNECTING;
+  url;
+  protocol = "";
+  extensions = "";
+  bufferedAmount = 0;
+  #options = {};
+  #sse;
+  #id;
+  #sendController;
+  #queue = [];
+  constructor(url, init) {
+    super();
+    this.url = url.replace(/^ws/, "http");
+    if (typeof init === "string") {
+      this.#options = { ...defaultOptions, protocols: init };
+    } else if (Array.isArray(init)) {
+      this.#options = { ...defaultOptions, protocols: init };
+    } else {
+      this.#options = { ...defaultOptions, ...init };
+    }
+    this.#sse = new EventSource(this.url);
+    this.#sse.addEventListener("open", (_sseEvent) => {
+      this.readyState = WebSocketSSE.OPEN;
+      const event = new Event("open");
+      this.onopen?.(event);
+      this.dispatchEvent(event);
+    });
+    this.#sse.addEventListener("message", (sseEvent) => {
+      const _event = new MessageEvent("message", {
+        data: sseEvent.data
+      });
+      this.onmessage?.(_event);
+      this.dispatchEvent(_event);
+    });
+    if (this.#options.bidir) {
+      this.#sse.addEventListener("crossws-id", (sseEvent) => {
+        this.#id = sseEvent.data;
+        if (this.#options.stream) {
+          fetch(this.url, {
+            method: "POST",
+            // @ts-expect-error
+            duplex: "half",
+            headers: {
+              "content-type": "application/octet-stream",
+              "x-crossws-id": this.#id
+            },
+            body: new ReadableStream({
+              start: (controller) => {
+                this.#sendController = controller;
+              },
+              cancel: () => {
+                this.#sendController = void 0;
+              }
+            }).pipeThrough(new TextEncoderStream())
+          }).catch(() => {
+          });
+        }
+        for (const data of this.#queue) {
+          this.send(data);
+        }
+        this.#queue = [];
+      });
+    }
+    this.#sse.addEventListener("error", (_sseEvent) => {
+      const event = new Event("error");
+      this.onerror?.(event);
+      this.dispatchEvent(event);
+    });
+    this.#sse.addEventListener("close", (_sseEvent) => {
+      this.readyState = WebSocketSSE.CLOSED;
+      const event = new Event("close");
+      this.onclose?.(event);
+      this.dispatchEvent(event);
+    });
+  }
+  close(_code, _reason) {
+    this.readyState = WebSocketSSE.CLOSING;
+    this.#sse.close();
+    this.readyState = WebSocketSSE.CLOSED;
+  }
+  async send(data) {
+    if (!this.#options.bidir) {
+      throw new Error("bdir option is not enabled!");
+    }
+    if (this.readyState !== WebSocketSSE.OPEN) {
+      throw new Error("WebSocket is not open!");
+    }
+    if (!this.#id) {
+      this.#queue.push(data);
+      return;
+    }
+    if (this.#sendController) {
+      this.#sendController.enqueue(data);
+      return;
+    }
+    await fetch(this.url, {
+      method: "POST",
+      headers: {
+        "x-crossws-id": this.#id
+      },
+      body: data
+    });
+  }
+}
+
+export { WebSocketSSE };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crossws",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "description": "Cross-platform WebSocket Servers for Node.js, Deno, Bun and Cloudflare Workers",
   "repository": "unjs/crossws",
   "license": "MIT",
@@ -8,57 +8,56 @@
   "type": "module",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.cjs"
-    },
-    "./websocket": {
-      "types": {
-        "import": "./dist/websocket/index.d.mts",
-        "require": "./dist/websocket/index.d.cts"
-      },
-      "browser": "./dist/websocket/index.mjs",
-      "worker": "./dist/websocket/index.mjs",
-      "bun": "./dist/websocket/index.mjs",
-      "deno": "./dist/websocket/index.mjs",
-      "edge-light": "./dist/websocket/index.mjs",
-      "workerd": "./dist/websocket/index.mjs",
-      "node": {
-        "import": "./dist/websocket/node.mjs",
-        "require": "./dist/websocket/node.cjs"
-      },
-      "import": "./dist/websocket/index.mjs",
-      "require": "./dist/websocket/index.cjs"
+      "types": "./dist/index.d.mts",
+      "default": "./dist/index.mjs"
     },
     "./adapters/bun": {
-      "types": "./dist/adapters/bun.d.ts",
-      "import": "./dist/adapters/bun.mjs",
-      "require": "./dist/adapters/bun.cjs"
+      "types": "./dist/adapters/bun.d.mts",
+      "default": "./dist/adapters/bun.mjs"
     },
     "./adapters/deno": {
-      "types": "./dist/adapters/deno.d.ts",
-      "import": "./dist/adapters/deno.mjs",
-      "require": "./dist/adapters/deno.cjs"
+      "types": "./dist/adapters/deno.d.mts",
+      "default": "./dist/adapters/deno.mjs"
     },
     "./adapters/cloudflare": {
-      "types": "./dist/adapters/cloudflare.d.ts",
-      "import": "./dist/adapters/cloudflare.mjs",
-      "require": "./dist/adapters/cloudflare.cjs"
+      "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.ts",
-      "import": "./dist/adapters/node.mjs",
-      "require": "./dist/adapters/node.cjs"
+      "types": "./dist/adapters/node.d.mts",
+      "default": "./dist/adapters/node.mjs"
     },
     "./adapters/uws": {
-      "types": "./dist/adapters/uws.d.ts",
-      "import": "./dist/adapters/uws.mjs",
-      "require": "./dist/adapters/uws.cjs"
+      "types": "./dist/adapters/uws.d.mts",
+      "default": "./dist/adapters/uws.mjs"
+    },
+    "./websocket": {
+      "types": "./dist/websocket/native.d.mts",
+      "browser": "./dist/websocket/native.mjs",
+      "worker": "./dist/websocket/native.mjs",
+      "bun": "./dist/websocket/native.mjs",
+      "deno": "./dist/websocket/native.mjs",
+      "edge-light": "./dist/websocket/native.mjs",
+      "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.cjs",
+  "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
+  "types": "./dist/index.d.mts",
   "files": [
     "dist",
     "adapters",
@@ -66,51 +65,55 @@
   ],
   "scripts": {
     "build": "unbuild",
-    "dev": "pnpm play:node",
-    "lint": "eslint --cache --ext .ts,.js,.mjs,.cjs . && prettier -c src",
-    "lint:fix": "eslint --cache --ext .ts,.js,.mjs,.cjs . --fix && prettier -c src -w",
+    "dev": "vitest",
+    "lint": "eslint --cache . && prettier -c src test",
+    "lint:fix": "eslint --cache . --fix && prettier -w src test",
     "prepack": "pnpm run build",
-    "play:bun": "bun playground/bun.ts",
-    "play:cf": "wrangler dev --port 3001",
-    "play:deno": "deno run --unstable-sloppy-imports -A playground/deno.ts",
-    "play:node": "jiti playground/node.ts",
-    "play:uws": "jiti playground/uws.ts",
+    "play:bun": "bun --watch test/fixture/bun.ts",
+    "play:cf": "wrangler dev --port 3001 -c test/fixture/wrangler.toml",
+    "play:cf-durable": "wrangler dev --port 3001 -c test/fixture/wrangler-durable.toml",
+    "play:deno": "deno run --watch --unstable-byonm -A test/fixture/deno.ts",
+    "play:node": "jiti test/fixture/node.ts",
+    "play:sse": "deno run --unstable-byonm -A --watch test/fixture/sse.ts",
+    "play:uws": "jiti test/fixture/uws.ts",
     "release": "pnpm test && pnpm build && changelogen --release && npm publish && git push --follow-tags",
-    "test": "pnpm lint && pnpm test:types",
+    "test": "pnpm lint && pnpm test:types && vitest run --coverage",
     "test:types": "tsc --noEmit --skipLibCheck"
   },
   "resolutions": {
     "crossws": "workspace:*"
   },
+  "dependencies": {
+    "uncrypto": "^0.1.3"
+  },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20240117.0",
+    "@cloudflare/workers-types": "^4.20240821.1",
     "@deno/types": "^0.0.1",
-    "@types/bun": "^1.0.4",
-    "@types/node": "^20.11.10",
-    "@types/web": "^0.0.135",
-    "@types/ws": "^8.5.10",
-    "automd": "^0.3.6",
+    "@types/bun": "^1.1.8",
+    "@types/eventsource": "^1.1.15",
+    "@types/node": "^22.5.1",
+    "@types/web": "^0.0.158",
+    "@types/ws": "^8.5.12",
+    "@vitest/coverage-v8": "^2.0.5",
+    "automd": "^0.3.8",
     "changelogen": "^0.5.5",
     "consola": "^3.2.3",
-    "eslint": "^8.56.0",
-    "eslint-config-unjs": "^0.2.1",
-    "h3": "^1.10.1",
-    "jiti": "^1.21.0",
-    "listhen": "^1.7.0",
-    "prettier": "^3.2.4",
-    "typescript": "^5.3.3",
-    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.33.0",
-    "unbuild": "^2.0.0",
-    "wrangler": "^3.25.0",
-    "ws": "^8.16.0"
-  },
-  "peerDependencies": {
-    "uWebSockets.js": "*"
-  },
-  "peerDependenciesMeta": {
-    "uWebSockets.js": {
-      "optional": true
-    }
+    "eslint": "^9.9.1",
+    "eslint-config-unjs": "^0.3.2",
+    "eventsource": "^2.0.2",
+    "execa": "^9.3.1",
+    "get-port-please": "^3.1.2",
+    "h3": "^1.12.0",
+    "jiti": "2.0.0-beta.3",
+    "listhen": "^1.7.2",
+    "prettier": "^3.3.3",
+    "typescript": "^5.5.4",
+    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.44.0",
+    "unbuild": "3.0.0-rc.7",
+    "undici": "^6.19.8",
+    "vitest": "^2.0.5",
+    "wrangler": "^3.73.0",
+    "ws": "^8.18.0"
   },
-  "packageManager": "pnpm@8.15.0"
-}
+  "packageManager": "pnpm@9.9.0"
+}

package/dist/adapters/bun.cjs

@@ -1,95 +0,0 @@
-'use strict';
-
-const types = require('../shared/crossws.c13afbe7.cjs');
-
-const bun = types.defineWebSocketAdapter(
-  (options = {}) => {
-    const crossws = types.createCrossWS(options);
-    const getPeer = (ws) => {
-      if (ws.data?._peer) {
-        return ws.data._peer;
-      }
-      const peer = new BunPeer({ bun: { ws } });
-      ws.data = ws.data || {};
-      ws.data._peer = peer;
-      return peer;
-    };
-    return {
-      async handleUpgrade(req, server) {
-        const { headers } = await crossws.upgrade({
-          url: req.url,
-          headers: req.headers
-        });
-        return server.upgrade(req, {
-          data: { req, server },
-          headers
-        });
-      },
-      websocket: {
-        message: (ws, message) => {
-          const peer = getPeer(ws);
-          crossws.$callHook("bun:message", peer, ws, message);
-          crossws.callHook("message", peer, new types.Message(message));
-        },
-        open: (ws) => {
-          const peer = getPeer(ws);
-          crossws.$callHook("bun:open", peer, ws);
-          crossws.callHook("open", peer);
-        },
-        close: (ws) => {
-          const peer = getPeer(ws);
-          crossws.$callHook("bun:close", peer, ws);
-          crossws.callHook("close", peer, {});
-        },
-        drain: (ws) => {
-          const peer = getPeer(ws);
-          crossws.$callHook("bun:drain", peer);
-        },
-        ping(ws, data) {
-          const peer = getPeer(ws);
-          crossws.$callHook("bun:ping", peer, ws, data);
-        },
-        pong(ws, data) {
-          const peer = getPeer(ws);
-          crossws.$callHook("bun:pong", peer, ws, data);
-        }
-      }
-    };
-  }
-);
-class BunPeer extends types.Peer {
-  get id() {
-    let addr = this.ctx.bun.ws.remoteAddress;
-    if (addr.includes(":")) {
-      addr = `[${addr}]`;
-    }
-    return addr;
-  }
-  get readyState() {
-    return this.ctx.bun.ws.readyState;
-  }
-  get url() {
-    return this.ctx.bun.ws.data.req?.url || "/";
-  }
-  get headers() {
-    return this.ctx.bun.ws.data.req?.headers || new Headers();
-  }
-  send(message, options) {
-    return this.ctx.bun.ws.send(types.toBufferLike(message), options?.compress);
-  }
-  publish(topic, message, options) {
-    return this.ctx.bun.ws.publish(
-      topic,
-      types.toBufferLike(message),
-      options?.compress
-    );
-  }
-  subscribe(topic) {
-    this.ctx.bun.ws.subscribe(topic);
-  }
-  unsubscribe(topic) {
-    this.ctx.bun.ws.unsubscribe(topic);
-  }
-}
-
-module.exports = bun;

package/dist/adapters/bun.d.cts

@@ -1,17 +0,0 @@
-import { A as AdapterOptions, P as Peer, b as Adapter } from '../shared/crossws.a2e5c71e.cjs';
-import { WebSocketHandler, Server } from 'bun';
-
-interface BunAdapter {
-    websocket: WebSocketHandler<ContextData>;
-    handleUpgrade(req: Request, server: Server): Promise<boolean>;
-}
-interface BunOptions extends AdapterOptions {
-}
-type ContextData = {
-    _peer?: Peer;
-    req?: Request;
-    server?: Server;
-};
-declare const _default: Adapter<BunAdapter, BunOptions>;
-
-export { type BunAdapter, type BunOptions, _default as default };

package/dist/adapters/cloudflare.cjs

@@ -1,65 +0,0 @@
-'use strict';
-
-const types = require('../shared/crossws.c13afbe7.cjs');
-const index = require('../index.cjs');
-
-const cloudflare = types.defineWebSocketAdapter(
-  (options = {}) => {
-    const crossws = types.createCrossWS(options);
-    const handleUpgrade = async (req, env, context) => {
-      const pair = new WebSocketPair();
-      const client = pair[0];
-      const server = pair[1];
-      const peer = new CloudflarePeer({
-        cloudflare: { client, server, req, env, context }
-      });
-      const { headers } = await crossws.upgrade(peer);
-      server.accept();
-      crossws.$callHook("cloudflare:accept", peer);
-      crossws.callHook("open", peer);
-      server.addEventListener("message", (event) => {
-        crossws.$callHook("cloudflare:message", peer, event);
-        crossws.callHook("message", peer, new types.Message(event.data));
-      });
-      server.addEventListener("error", (event) => {
-        crossws.$callHook("cloudflare:error", peer, event);
-        crossws.callHook("error", peer, new index.WSError(event.error));
-      });
-      server.addEventListener("close", (event) => {
-        crossws.$callHook("cloudflare:close", peer, event);
-        crossws.callHook("close", peer, {
-          code: event.code,
-          reason: event.reason
-        });
-      });
-      return new Response(null, {
-        status: 101,
-        webSocket: client,
-        headers
-      });
-    };
-    return {
-      handleUpgrade
-    };
-  }
-);
-class CloudflarePeer extends types.Peer {
-  get id() {
-    return void 0;
-  }
-  get url() {
-    return this.ctx.cloudflare.req.url;
-  }
-  get headers() {
-    return this.ctx.cloudflare.req.headers;
-  }
-  get readyState() {
-    return this.ctx.cloudflare.client.readyState;
-  }
-  send(message) {
-    this.ctx.cloudflare.server.send(types.toBufferLike(message));
-    return 0;
-  }
-}
-
-module.exports = cloudflare;

package/dist/adapters/cloudflare.d.cts

@@ -1,12 +0,0 @@
-import { A as AdapterOptions, b as Adapter } from '../shared/crossws.a2e5c71e.cjs';
-import * as _cf from '@cloudflare/workers-types';
-
-type Env = Record<string, any>;
-interface CloudflareAdapter {
-    handleUpgrade(req: _cf.Request, env: Env, context: _cf.ExecutionContext): Promise<_cf.Response>;
-}
-interface CloudflareOptions extends AdapterOptions {
-}
-declare const _default: Adapter<CloudflareAdapter, CloudflareOptions>;
-
-export { type CloudflareAdapter, type CloudflareOptions, _default as default };