crossws 0.1.1 → 0.1.2

package/dist/adapters/cloudflare.cjs

@@ -1,34 +1,38 @@
 'use strict';
 
-const peer = require('../shared/crossws.21e14e0d.cjs');
+const peer = require('../shared/crossws.6009d265.cjs');
+const error = require('../shared/crossws.deae10fd.cjs');
 
 const cloudflare = peer.defineWebSocketAdapter(
-  (hooks, opts = {}) => {
-    const handleUpgrade = (request, env, context) => {
+  (hooks, options = {}) => {
+    const crossws = peer.createCrossWS(hooks, options);
+    const handleUpgrade = async (req, env, context) => {
       const pair = new WebSocketPair();
       const client = pair[0];
       const server = pair[1];
-      const peer$1 = new CloudflareWebSocketPeer({
-        cloudflare: { client, server, request, env, context }
+      const peer$1 = new CloudflarePeer({
+        cloudflare: { client, server, req, env, context }
       });
+      const { headers } = await crossws.upgrade(peer$1);
       server.accept();
-      hooks["cloudflare:accept"]?.(peer$1);
-      hooks.open?.(peer$1);
+      crossws.$("cloudflare:accept", peer$1);
+      crossws.open(peer$1);
       server.addEventListener("message", (event) => {
-        hooks["cloudflare:message"]?.(peer$1, event);
-        hooks.message?.(peer$1, new peer.WebSocketMessage(event.data));
+        crossws.$("cloudflare:message", peer$1, event);
+        crossws.message(peer$1, new peer.WSMessage(event.data));
       });
       server.addEventListener("error", (event) => {
-        hooks["cloudflare:error"]?.(peer$1, event);
-        hooks.error?.(peer$1, new peer.WebSocketError(event.error));
+        crossws.$("cloudflare:error", peer$1, event);
+        crossws.error(peer$1, new error.WebSocketError(event.error));
       });
       server.addEventListener("close", (event) => {
-        hooks["cloudflare:close"]?.(peer$1, event);
-        hooks.close?.(peer$1, { code: event.code, reason: event.reason });
+        crossws.$("cloudflare:close", peer$1, event);
+        crossws.close(peer$1, { code: event.code, reason: event.reason });
       });
       return new Response(null, {
         status: 101,
-        webSocket: client
+        webSocket: client,
+        headers
       });
     };
     return {
@@ -36,15 +40,21 @@ const cloudflare = peer.defineWebSocketAdapter(
     };
   }
 );
-class CloudflareWebSocketPeer extends peer.WebSocketPeerBase {
+class CloudflarePeer extends peer.WSPeer {
   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(message);
+    this.ctx.cloudflare.server.send(peer.toBufferLike(message));
     return 0;
   }
 }

package/dist/adapters/cloudflare.d.cts

@@ -1,11 +1,11 @@
-import { WebSocketAdapter } from '../index.cjs';
+import { CrossWSOptions, WebSocketAdapter } from '../index.cjs';
 import * as _cf from '@cloudflare/workers-types';
 
 type Env = Record<string, any>;
-interface AdapterOptions {
+interface AdapterOptions extends CrossWSOptions {
 }
 interface Adapter {
-    handleUpgrade(req: _cf.Request, env: Env, context: _cf.ExecutionContext): _cf.Response;
+    handleUpgrade(req: _cf.Request, env: Env, context: _cf.ExecutionContext): Promise<_cf.Response>;
 }
 declare const _default: WebSocketAdapter<Adapter, AdapterOptions>;
 

package/dist/adapters/cloudflare.d.mts

@@ -1,11 +1,11 @@
-import { WebSocketAdapter } from '../index.mjs';
+import { CrossWSOptions, WebSocketAdapter } from '../index.mjs';
 import * as _cf from '@cloudflare/workers-types';
 
 type Env = Record<string, any>;
-interface AdapterOptions {
+interface AdapterOptions extends CrossWSOptions {
 }
 interface Adapter {
-    handleUpgrade(req: _cf.Request, env: Env, context: _cf.ExecutionContext): _cf.Response;
+    handleUpgrade(req: _cf.Request, env: Env, context: _cf.ExecutionContext): Promise<_cf.Response>;
 }
 declare const _default: WebSocketAdapter<Adapter, AdapterOptions>;
 

package/dist/adapters/cloudflare.d.ts

@@ -1,11 +1,11 @@
-import { WebSocketAdapter } from '../index.js';
+import { CrossWSOptions, WebSocketAdapter } from '../index.js';
 import * as _cf from '@cloudflare/workers-types';
 
 type Env = Record<string, any>;
-interface AdapterOptions {
+interface AdapterOptions extends CrossWSOptions {
 }
 interface Adapter {
-    handleUpgrade(req: _cf.Request, env: Env, context: _cf.ExecutionContext): _cf.Response;
+    handleUpgrade(req: _cf.Request, env: Env, context: _cf.ExecutionContext): Promise<_cf.Response>;
 }
 declare const _default: WebSocketAdapter<Adapter, AdapterOptions>;
 

package/dist/adapters/cloudflare.mjs

@@ -1,32 +1,36 @@
-import { d as defineWebSocketAdapter, a as WebSocketMessage, W as WebSocketError, b as WebSocketPeerBase } from '../shared/crossws.9536f626.mjs';
+import { d as defineWebSocketAdapter, c as createCrossWS, W as WSMessage, a as WSPeer, t as toBufferLike } from '../shared/crossws.a6b0a7cc.mjs';
+import { W as WebSocketError } from '../shared/crossws.6f7f02b3.mjs';
 
 const cloudflare = defineWebSocketAdapter(
-  (hooks, opts = {}) => {
-    const handleUpgrade = (request, env, context) => {
+  (hooks, options = {}) => {
+    const crossws = createCrossWS(hooks, options);
+    const handleUpgrade = async (req, env, context) => {
       const pair = new WebSocketPair();
       const client = pair[0];
       const server = pair[1];
-      const peer = new CloudflareWebSocketPeer({
-        cloudflare: { client, server, request, env, context }
+      const peer = new CloudflarePeer({
+        cloudflare: { client, server, req, env, context }
       });
+      const { headers } = await crossws.upgrade(peer);
       server.accept();
-      hooks["cloudflare:accept"]?.(peer);
-      hooks.open?.(peer);
+      crossws.$("cloudflare:accept", peer);
+      crossws.open(peer);
       server.addEventListener("message", (event) => {
-        hooks["cloudflare:message"]?.(peer, event);
-        hooks.message?.(peer, new WebSocketMessage(event.data));
+        crossws.$("cloudflare:message", peer, event);
+        crossws.message(peer, new WSMessage(event.data));
       });
       server.addEventListener("error", (event) => {
-        hooks["cloudflare:error"]?.(peer, event);
-        hooks.error?.(peer, new WebSocketError(event.error));
+        crossws.$("cloudflare:error", peer, event);
+        crossws.error(peer, new WebSocketError(event.error));
       });
       server.addEventListener("close", (event) => {
-        hooks["cloudflare:close"]?.(peer, event);
-        hooks.close?.(peer, { code: event.code, reason: event.reason });
+        crossws.$("cloudflare:close", peer, event);
+        crossws.close(peer, { code: event.code, reason: event.reason });
       });
       return new Response(null, {
         status: 101,
-        webSocket: client
+        webSocket: client,
+        headers
       });
     };
     return {
@@ -34,15 +38,21 @@ const cloudflare = defineWebSocketAdapter(
     };
   }
 );
-class CloudflareWebSocketPeer extends WebSocketPeerBase {
+class CloudflarePeer extends WSPeer {
   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(message);
+    this.ctx.cloudflare.server.send(toBufferLike(message));
     return 0;
   }
 }

package/dist/adapters/deno.cjs

@@ -1,29 +1,38 @@
 'use strict';
 
-const peer = require('../shared/crossws.21e14e0d.cjs');
+const peer = require('../shared/crossws.6009d265.cjs');
+const error = require('../shared/crossws.deae10fd.cjs');
 
 const deno = peer.defineWebSocketAdapter(
-  (hooks, opts = {}) => {
-    const handleUpgrade = (request) => {
-      const upgrade = Deno.upgradeWebSocket(request);
-      const peer$1 = new DenoWebSocketPeer({
-        deno: { ws: upgrade.socket, request }
+  (hooks, options = {}) => {
+    const crossws = peer.createCrossWS(hooks, options);
+    const handleUpgrade = async (req) => {
+      const { headers } = await crossws.upgrade({
+        url: req.url,
+        headers: req.headers
+      });
+      const upgrade = Deno.upgradeWebSocket(req, {
+        // @ts-expect-error https://github.com/denoland/deno/pull/22242
+        headers
+      });
+      const peer$1 = new DenoWSPeer({
+        deno: { ws: upgrade.socket, req }
       });
       upgrade.socket.addEventListener("open", () => {
-        hooks["deno:open"]?.(peer$1);
-        hooks.open?.(peer$1);
+        crossws.$("deno:open", peer$1);
+        crossws.open(peer$1);
       });
       upgrade.socket.addEventListener("message", (event) => {
-        hooks["deno:message"]?.(peer$1, event);
-        hooks.message?.(peer$1, new peer.WebSocketMessage(event.data));
+        crossws.$("deno:message", peer$1, event);
+        crossws.message(peer$1, new peer.WSMessage(event.data));
       });
       upgrade.socket.addEventListener("close", () => {
-        hooks["deno:close"]?.(peer$1);
-        hooks.close?.(peer$1, {});
+        crossws.$("deno:close", peer$1);
+        crossws.close(peer$1, {});
       });
-      upgrade.socket.addEventListener("error", (error) => {
-        hooks["deno:error"]?.(peer$1, error);
-        hooks.error?.(peer$1, new peer.WebSocketError(error));
+      upgrade.socket.addEventListener("error", (error$1) => {
+        crossws.$("deno:error", peer$1, error$1);
+        crossws.error(peer$1, new error.WebSocketError(error$1));
       });
       return upgrade.response;
     };
@@ -32,15 +41,21 @@ const deno = peer.defineWebSocketAdapter(
     };
   }
 );
-class DenoWebSocketPeer extends peer.WebSocketPeerBase {
+class DenoWSPeer extends peer.WSPeer {
   get id() {
     return this.ctx.deno.ws.remoteAddress;
   }
   get readyState() {
     return this.ctx.deno.ws.readyState;
   }
+  get url() {
+    return this.ctx.deno.req.url;
+  }
+  get headers() {
+    return this.ctx.deno.req.headers || new Headers();
+  }
   send(message) {
-    this.ctx.deno.ws.send(message);
+    this.ctx.deno.ws.send(peer.toBufferLike(message));
     return 0;
   }
 }

package/dist/adapters/deno.d.cts

@@ -1,9 +1,13 @@
-import { WebSocketAdapter } from '../index.cjs';
+import { CrossWSOptions, WebSocketAdapter } from '../index.cjs';
+import * as _deno_types from '@deno/types';
 
-interface AdapterOptions {
+interface AdapterOptions extends CrossWSOptions {
 }
 interface Adapter {
-    handleUpgrade(req: Request): Response;
+    handleUpgrade(req: Request): Promise<Response>;
+}
+declare global {
+    const Deno: typeof _deno_types.Deno;
 }
 declare const _default: WebSocketAdapter<Adapter, AdapterOptions>;
 

package/dist/adapters/deno.d.mts

@@ -1,9 +1,13 @@
-import { WebSocketAdapter } from '../index.mjs';
+import { CrossWSOptions, WebSocketAdapter } from '../index.mjs';
+import * as _deno_types from '@deno/types';
 
-interface AdapterOptions {
+interface AdapterOptions extends CrossWSOptions {
 }
 interface Adapter {
-    handleUpgrade(req: Request): Response;
+    handleUpgrade(req: Request): Promise<Response>;
+}
+declare global {
+    const Deno: typeof _deno_types.Deno;
 }
 declare const _default: WebSocketAdapter<Adapter, AdapterOptions>;
 

package/dist/adapters/deno.d.ts

@@ -1,9 +1,13 @@
-import { WebSocketAdapter } from '../index.js';
+import { CrossWSOptions, WebSocketAdapter } from '../index.js';
+import * as _deno_types from '@deno/types';
 
-interface AdapterOptions {
+interface AdapterOptions extends CrossWSOptions {
 }
 interface Adapter {
-    handleUpgrade(req: Request): Response;
+    handleUpgrade(req: Request): Promise<Response>;
+}
+declare global {
+    const Deno: typeof _deno_types.Deno;
 }
 declare const _default: WebSocketAdapter<Adapter, AdapterOptions>;
 

package/dist/adapters/deno.mjs

@@ -1,27 +1,36 @@
-import { d as defineWebSocketAdapter, a as WebSocketMessage, W as WebSocketError, b as WebSocketPeerBase } from '../shared/crossws.9536f626.mjs';
+import { d as defineWebSocketAdapter, c as createCrossWS, W as WSMessage, a as WSPeer, t as toBufferLike } from '../shared/crossws.a6b0a7cc.mjs';
+import { W as WebSocketError } from '../shared/crossws.6f7f02b3.mjs';
 
 const deno = defineWebSocketAdapter(
-  (hooks, opts = {}) => {
-    const handleUpgrade = (request) => {
-      const upgrade = Deno.upgradeWebSocket(request);
-      const peer = new DenoWebSocketPeer({
-        deno: { ws: upgrade.socket, request }
+  (hooks, options = {}) => {
+    const crossws = createCrossWS(hooks, options);
+    const handleUpgrade = async (req) => {
+      const { headers } = await crossws.upgrade({
+        url: req.url,
+        headers: req.headers
+      });
+      const upgrade = Deno.upgradeWebSocket(req, {
+        // @ts-expect-error https://github.com/denoland/deno/pull/22242
+        headers
+      });
+      const peer = new DenoWSPeer({
+        deno: { ws: upgrade.socket, req }
       });
       upgrade.socket.addEventListener("open", () => {
-        hooks["deno:open"]?.(peer);
-        hooks.open?.(peer);
+        crossws.$("deno:open", peer);
+        crossws.open(peer);
       });
       upgrade.socket.addEventListener("message", (event) => {
-        hooks["deno:message"]?.(peer, event);
-        hooks.message?.(peer, new WebSocketMessage(event.data));
+        crossws.$("deno:message", peer, event);
+        crossws.message(peer, new WSMessage(event.data));
       });
       upgrade.socket.addEventListener("close", () => {
-        hooks["deno:close"]?.(peer);
-        hooks.close?.(peer, {});
+        crossws.$("deno:close", peer);
+        crossws.close(peer, {});
       });
       upgrade.socket.addEventListener("error", (error) => {
-        hooks["deno:error"]?.(peer, error);
-        hooks.error?.(peer, new WebSocketError(error));
+        crossws.$("deno:error", peer, error);
+        crossws.error(peer, new WebSocketError(error));
       });
       return upgrade.response;
     };
@@ -30,15 +39,21 @@ const deno = defineWebSocketAdapter(
     };
   }
 );
-class DenoWebSocketPeer extends WebSocketPeerBase {
+class DenoWSPeer extends WSPeer {
   get id() {
     return this.ctx.deno.ws.remoteAddress;
   }
   get readyState() {
     return this.ctx.deno.ws.readyState;
   }
+  get url() {
+    return this.ctx.deno.req.url;
+  }
+  get headers() {
+    return this.ctx.deno.req.headers || new Headers();
+  }
   send(message) {
-    this.ctx.deno.ws.send(message);
+    this.ctx.deno.ws.send(toBufferLike(message));
     return 0;
   }
 }

package/dist/adapters/node.cjs

@@ -5,7 +5,8 @@ const websocket = require('../shared/crossws.2ed26345.cjs');
 const require$$0 = require('events');
 const require$$2 = require('http');
 const require$$1 = require('crypto');
-const peer = require('../shared/crossws.21e14e0d.cjs');
+const peer = require('../shared/crossws.6009d265.cjs');
+const error = require('../shared/crossws.deae10fd.cjs');
 require('https');
 require('net');
 require('tls');
@@ -620,53 +621,68 @@ function abortHandshakeOrEmitwsClientError(server, req, socket, code, message) {
 const _WebSocketServer = /*@__PURE__*/websocket.getDefaultExportFromCjs(websocketServer);
 
 const node = peer.defineWebSocketAdapter(
-  (hooks, opts = {}) => {
-    const wss = opts.wss || new _WebSocketServer({
+  (hooks, options = {}) => {
+    const crossws = peer.createCrossWS(hooks, options);
+    const wss = options.wss || new _WebSocketServer({
       noServer: true,
-      ...opts.serverOptions
+      ...options.serverOptions
     });
     wss.on("connection", (ws, req) => {
-      const peer$1 = new NodeWebSocketPeer({ node: { ws, req, server: wss } });
-      hooks.open?.(peer$1);
+      const peer$1 = new NodeWSPeer({ node: { ws, req, server: wss } });
+      crossws.open(peer$1);
       ws.on("message", (data, isBinary) => {
-        hooks["node:message"]?.(peer$1, data, isBinary);
+        crossws.$("node:message", peer$1, data, isBinary);
         if (Array.isArray(data)) {
           data = Buffer.concat(data);
         }
-        hooks.message?.(peer$1, new peer.WebSocketMessage(data, isBinary));
+        crossws.message(peer$1, new peer.WSMessage(data, isBinary));
       });
-      ws.on("error", (error) => {
-        hooks["node:error"]?.(peer$1, error);
-        hooks.error?.(peer$1, new peer.WebSocketError(error));
+      ws.on("error", (error$1) => {
+        crossws.$("node:error", peer$1, error$1);
+        crossws.error(peer$1, new error.WebSocketError(error$1));
       });
       ws.on("close", (code, reason) => {
-        hooks["node:close"]?.(peer$1, code, reason);
-        hooks.close?.(peer$1, {
+        crossws.$("node:close", peer$1, code, reason);
+        crossws.close(peer$1, {
           code,
           reason: reason?.toString()
         });
       });
       ws.on("open", () => {
-        hooks["node:open"]?.(peer$1);
+        crossws.$("node:open", peer$1);
       });
       ws.on("ping", (data) => {
-        hooks["node:ping"]?.(peer$1, data);
+        crossws.$("node:ping", peer$1, data);
       });
       ws.on("pong", (data) => {
-        hooks["node:pong"]?.(peer$1, data);
+        crossws.$("node:pong", peer$1, data);
       });
       ws.on(
         "unexpected-response",
         (req2, res) => {
-          hooks["node:unexpected-response"]?.(peer$1, req2, res);
+          crossws.$("node:unexpected-response", peer$1, req2, res);
         }
       );
       ws.on("upgrade", (req2) => {
-        hooks["node:upgrade"]?.(peer$1, req2);
+        crossws.$("node:upgrade", peer$1, req2);
       });
     });
+    wss.on("headers", function(outgoingHeaders, req) {
+      const upgradeHeaders = req._upgradeHeaders;
+      if (upgradeHeaders) {
+        const _headers = new Headers(upgradeHeaders);
+        for (const [key, value] of _headers) {
+          outgoingHeaders.push(`${key}: ${value}`);
+        }
+      }
+    });
     return {
-      handleUpgrade: (req, socket, head) => {
+      handleUpgrade: async (req, socket, head) => {
+        const { headers } = await crossws.upgrade({
+          url: req.url || "",
+          headers: req.headers
+        });
+        req._upgradeHeaders = headers;
         wss.handleUpgrade(req, socket, head, (ws) => {
           wss.emit("connection", ws, req);
         });
@@ -674,7 +690,7 @@ const node = peer.defineWebSocketAdapter(
     };
   }
 );
-class NodeWebSocketPeer extends peer.WebSocketPeerBase {
+class NodeWSPeer extends peer.WSPeer {
   get id() {
     const socket = this.ctx.node.req.socket;
     if (!socket) {
@@ -683,11 +699,21 @@ class NodeWebSocketPeer extends peer.WebSocketPeerBase {
     const addr = socket.remoteFamily === "IPv6" ? `[${socket.remoteAddress}]` : socket.remoteAddress;
     return `${addr}:${socket.remotePort}`;
   }
+  get url() {
+    return this.ctx.node.req.url || "/";
+  }
+  get headers() {
+    return this.ctx.node.req.headers;
+  }
   get readyState() {
     return this.ctx.node.ws.readyState;
   }
-  send(message, compress) {
-    this.ctx.node.ws.send(message, { compress });
+  send(message, options) {
+    this.ctx.node.ws.send(peer.toBufferLike(message), {
+      compress: options?.compress,
+      binary: options?.binary,
+      ...options
+    });
     return 0;
   }
 }

package/dist/adapters/node.d.cts

@@ -1,4 +1,4 @@
-import { WebSocketAdapter } from '../index.cjs';
+import { CrossWSOptions, WebSocketAdapter } from '../index.cjs';
 import { IncomingMessage as IncomingMessage$1 } from 'node:http';
 import { Duplex as Duplex$1 } from 'node:stream';
 import { EventEmitter } from 'events';
@@ -286,7 +286,7 @@ declare class Server<T extends typeof WebSocket = typeof WebSocket, U extends ty
 type WebSocketServer = Server;
 declare function createWebSocketStream(websocket: WebSocket, options?: DuplexOptions): Duplex;
 
-interface AdapterOptions {
+interface AdapterOptions extends CrossWSOptions {
     wss?: WebSocketServer;
     serverOptions?: ServerOptions;
 }

package/dist/adapters/node.d.mts

@@ -1,4 +1,4 @@
-import { WebSocketAdapter } from '../index.mjs';
+import { CrossWSOptions, WebSocketAdapter } from '../index.mjs';
 import { IncomingMessage as IncomingMessage$1 } from 'node:http';
 import { Duplex as Duplex$1 } from 'node:stream';
 import { EventEmitter } from 'events';
@@ -286,7 +286,7 @@ declare class Server<T extends typeof WebSocket = typeof WebSocket, U extends ty
 type WebSocketServer = Server;
 declare function createWebSocketStream(websocket: WebSocket, options?: DuplexOptions): Duplex;
 
-interface AdapterOptions {
+interface AdapterOptions extends CrossWSOptions {
     wss?: WebSocketServer;
     serverOptions?: ServerOptions;
 }

package/dist/adapters/node.d.ts

@@ -1,4 +1,4 @@
-import { WebSocketAdapter } from '../index.js';
+import { CrossWSOptions, WebSocketAdapter } from '../index.js';
 import { IncomingMessage as IncomingMessage$1 } from 'node:http';
 import { Duplex as Duplex$1 } from 'node:stream';
 import { EventEmitter } from 'events';
@@ -286,7 +286,7 @@ declare class Server<T extends typeof WebSocket = typeof WebSocket, U extends ty
 type WebSocketServer = Server;
 declare function createWebSocketStream(websocket: WebSocket, options?: DuplexOptions): Duplex;
 
-interface AdapterOptions {
+interface AdapterOptions extends CrossWSOptions {
     wss?: WebSocketServer;
     serverOptions?: ServerOptions;
 }