crossws 0.2.1 → 0.2.3

package/dist/adapters/deno.cjs

@@ -6,7 +6,7 @@ const index = require('../index.cjs');
 const deno = types.defineWebSocketAdapter(
   (options = {}) => {
     const crossws = types.createCrossWS(options);
-    const handleUpgrade = async (req) => {
+    const handleUpgrade = async (req, info) => {
       const { headers } = await crossws.upgrade({
         url: req.url,
         headers: req.headers
@@ -16,7 +16,7 @@ const deno = types.defineWebSocketAdapter(
         headers
       });
       const peer = new DenoPeer({
-        deno: { ws: upgrade.socket, req }
+        deno: { ws: upgrade.socket, req, info }
       });
       upgrade.socket.addEventListener("open", () => {
         crossws.$callHook("deno:open", peer);

package/dist/adapters/deno.d.cts

@@ -2,13 +2,14 @@ import { A as AdapterOptions, b as Adapter } from '../shared/crossws.a2e5c71e.cj
 import * as _deno_types from '@deno/types';
 
 interface DenoAdapter {
-    handleUpgrade(req: Request): Promise<Response>;
+    handleUpgrade(req: Request, info: ServeHandlerInfo): Promise<Response>;
 }
 interface DenoOptions extends AdapterOptions {
 }
 declare global {
     const Deno: typeof _deno_types.Deno;
 }
+type ServeHandlerInfo = any;
 declare const _default: Adapter<DenoAdapter, DenoOptions>;
 
 export { type DenoAdapter, type DenoOptions, _default as default };

package/dist/adapters/deno.d.mts

@@ -2,13 +2,14 @@ import { A as AdapterOptions, b as Adapter } from '../shared/crossws.a2e5c71e.mj
 import * as _deno_types from '@deno/types';
 
 interface DenoAdapter {
-    handleUpgrade(req: Request): Promise<Response>;
+    handleUpgrade(req: Request, info: ServeHandlerInfo): Promise<Response>;
 }
 interface DenoOptions extends AdapterOptions {
 }
 declare global {
     const Deno: typeof _deno_types.Deno;
 }
+type ServeHandlerInfo = any;
 declare const _default: Adapter<DenoAdapter, DenoOptions>;
 
 export { type DenoAdapter, type DenoOptions, _default as default };

package/dist/adapters/deno.d.ts

@@ -2,13 +2,14 @@ import { A as AdapterOptions, b as Adapter } from '../shared/crossws.a2e5c71e.js
 import * as _deno_types from '@deno/types';
 
 interface DenoAdapter {
-    handleUpgrade(req: Request): Promise<Response>;
+    handleUpgrade(req: Request, info: ServeHandlerInfo): Promise<Response>;
 }
 interface DenoOptions extends AdapterOptions {
 }
 declare global {
     const Deno: typeof _deno_types.Deno;
 }
+type ServeHandlerInfo = any;
 declare const _default: Adapter<DenoAdapter, DenoOptions>;
 
 export { type DenoAdapter, type DenoOptions, _default as default };

package/dist/adapters/deno.mjs

@@ -4,7 +4,7 @@ import { WSError } from '../index.mjs';
 const deno = defineWebSocketAdapter(
   (options = {}) => {
     const crossws = createCrossWS(options);
-    const handleUpgrade = async (req) => {
+    const handleUpgrade = async (req, info) => {
       const { headers } = await crossws.upgrade({
         url: req.url,
         headers: req.headers
@@ -14,7 +14,7 @@ const deno = defineWebSocketAdapter(
         headers
       });
       const peer = new DenoPeer({
-        deno: { ws: upgrade.socket, req }
+        deno: { ws: upgrade.socket, req, info }
       });
       upgrade.socket.addEventListener("open", () => {
         crossws.$callHook("deno:open", peer);

package/dist/adapters/node.cjs

@@ -696,8 +696,13 @@ class NodePeer extends types.Peer {
     if (!socket) {
       return void 0;
     }
-    const addr = socket.remoteFamily === "IPv6" ? `[${socket.remoteAddress}]` : socket.remoteAddress;
-    return `${addr}:${socket.remotePort}`;
+    const headers = this.ctx.node.req.headers;
+    let addr = headers["x-forwarded-for"] || socket.remoteAddress || "??";
+    if (addr.includes(":")) {
+      addr = `[${addr}]`;
+    }
+    const port = headers["x-forwarded-port"] || socket.remotePort || "??";
+    return `${addr}:${port}`;
   }
   get url() {
     return this.ctx.node.req.url || "/";

package/dist/adapters/node.mjs

@@ -688,8 +688,13 @@ class NodePeer extends Peer {
     if (!socket) {
       return void 0;
     }
-    const addr = socket.remoteFamily === "IPv6" ? `[${socket.remoteAddress}]` : socket.remoteAddress;
-    return `${addr}:${socket.remotePort}`;
+    const headers = this.ctx.node.req.headers;
+    let addr = headers["x-forwarded-for"] || socket.remoteAddress || "??";
+    if (addr.includes(":")) {
+      addr = `[${addr}]`;
+    }
+    const port = headers["x-forwarded-port"] || socket.remotePort || "??";
+    return `${addr}:${port}`;
   }
   get url() {
     return this.ctx.node.req.url || "/";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crossws",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Cross-platform WebSocket Servers for Node.js, Deno, Bun and Cloudflare Workers",
   "repository": "unjs/crossws",
   "license": "MIT",