crossws 0.2.2 → 0.2.4

package/dist/adapters/bun.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const types = require('../shared/crossws.c13afbe7.cjs');
+const types = require('../shared/crossws.36b9e66f.cjs');
 
 const bun = types.defineWebSocketAdapter(
   (options = {}) => {
@@ -58,7 +58,7 @@ const bun = types.defineWebSocketAdapter(
   }
 );
 class BunPeer extends types.Peer {
-  get id() {
+  get addr() {
     let addr = this.ctx.bun.ws.remoteAddress;
     if (addr.includes(":")) {
       addr = `[${addr}]`;

package/dist/adapters/bun.d.cts

@@ -1,4 +1,4 @@
-import { A as AdapterOptions, P as Peer, b as Adapter } from '../shared/crossws.a2e5c71e.cjs';
+import { A as AdapterOptions, P as Peer, b as Adapter } from '../shared/crossws.381454fe.cjs';
 import { WebSocketHandler, Server } from 'bun';
 
 interface BunAdapter {

package/dist/adapters/bun.d.mts

@@ -1,4 +1,4 @@
-import { A as AdapterOptions, P as Peer, b as Adapter } from '../shared/crossws.a2e5c71e.mjs';
+import { A as AdapterOptions, P as Peer, b as Adapter } from '../shared/crossws.381454fe.mjs';
 import { WebSocketHandler, Server } from 'bun';
 
 interface BunAdapter {

package/dist/adapters/bun.d.ts

@@ -1,4 +1,4 @@
-import { A as AdapterOptions, P as Peer, b as Adapter } from '../shared/crossws.a2e5c71e.js';
+import { A as AdapterOptions, P as Peer, b as Adapter } from '../shared/crossws.381454fe.js';
 import { WebSocketHandler, Server } from 'bun';
 
 interface BunAdapter {

package/dist/adapters/bun.mjs

@@ -1,4 +1,4 @@
-import { d as defineWebSocketAdapter, M as Message, c as createCrossWS, P as Peer, t as toBufferLike } from '../shared/crossws.34cfc8d0.mjs';
+import { d as defineWebSocketAdapter, M as Message, c as createCrossWS, P as Peer, t as toBufferLike } from '../shared/crossws.77e89680.mjs';
 
 const bun = defineWebSocketAdapter(
   (options = {}) => {
@@ -56,7 +56,7 @@ const bun = defineWebSocketAdapter(
   }
 );
 class BunPeer extends Peer {
-  get id() {
+  get addr() {
     let addr = this.ctx.bun.ws.remoteAddress;
     if (addr.includes(":")) {
       addr = `[${addr}]`;

package/dist/adapters/cloudflare.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const types = require('../shared/crossws.c13afbe7.cjs');
+const types = require('../shared/crossws.36b9e66f.cjs');
 const index = require('../index.cjs');
 
 const cloudflare = types.defineWebSocketAdapter(
@@ -44,7 +44,7 @@ const cloudflare = types.defineWebSocketAdapter(
   }
 );
 class CloudflarePeer extends types.Peer {
-  get id() {
+  get addr() {
     return void 0;
   }
   get url() {

package/dist/adapters/cloudflare.d.cts

@@ -1,4 +1,4 @@
-import { A as AdapterOptions, b as Adapter } from '../shared/crossws.a2e5c71e.cjs';
+import { A as AdapterOptions, b as Adapter } from '../shared/crossws.381454fe.cjs';
 import * as _cf from '@cloudflare/workers-types';
 
 type Env = Record<string, any>;

package/dist/adapters/cloudflare.d.mts

@@ -1,4 +1,4 @@
-import { A as AdapterOptions, b as Adapter } from '../shared/crossws.a2e5c71e.mjs';
+import { A as AdapterOptions, b as Adapter } from '../shared/crossws.381454fe.mjs';
 import * as _cf from '@cloudflare/workers-types';
 
 type Env = Record<string, any>;

package/dist/adapters/cloudflare.d.ts

@@ -1,4 +1,4 @@
-import { A as AdapterOptions, b as Adapter } from '../shared/crossws.a2e5c71e.js';
+import { A as AdapterOptions, b as Adapter } from '../shared/crossws.381454fe.js';
 import * as _cf from '@cloudflare/workers-types';
 
 type Env = Record<string, any>;

package/dist/adapters/cloudflare.mjs

@@ -1,4 +1,4 @@
-import { d as defineWebSocketAdapter, M as Message, P as Peer, t as toBufferLike, c as createCrossWS } from '../shared/crossws.34cfc8d0.mjs';
+import { d as defineWebSocketAdapter, M as Message, P as Peer, t as toBufferLike, c as createCrossWS } from '../shared/crossws.77e89680.mjs';
 import { WSError } from '../index.mjs';
 
 const cloudflare = defineWebSocketAdapter(
@@ -42,7 +42,7 @@ const cloudflare = defineWebSocketAdapter(
   }
 );
 class CloudflarePeer extends Peer {
-  get id() {
+  get addr() {
     return void 0;
   }
   get url() {

package/dist/adapters/deno.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const types = require('../shared/crossws.c13afbe7.cjs');
+const types = require('../shared/crossws.36b9e66f.cjs');
 const index = require('../index.cjs');
 
 const deno = types.defineWebSocketAdapter(
@@ -42,7 +42,7 @@ const deno = types.defineWebSocketAdapter(
   }
 );
 class DenoPeer extends types.Peer {
-  get id() {
+  get addr() {
     return this.ctx.deno.ws.remoteAddress;
   }
   get readyState() {

package/dist/adapters/deno.d.cts

@@ -1,4 +1,4 @@
-import { A as AdapterOptions, b as Adapter } from '../shared/crossws.a2e5c71e.cjs';
+import { A as AdapterOptions, b as Adapter } from '../shared/crossws.381454fe.cjs';
 import * as _deno_types from '@deno/types';
 
 interface DenoAdapter {

package/dist/adapters/deno.d.mts

@@ -1,4 +1,4 @@
-import { A as AdapterOptions, b as Adapter } from '../shared/crossws.a2e5c71e.mjs';
+import { A as AdapterOptions, b as Adapter } from '../shared/crossws.381454fe.mjs';
 import * as _deno_types from '@deno/types';
 
 interface DenoAdapter {

package/dist/adapters/deno.d.ts

@@ -1,4 +1,4 @@
-import { A as AdapterOptions, b as Adapter } from '../shared/crossws.a2e5c71e.js';
+import { A as AdapterOptions, b as Adapter } from '../shared/crossws.381454fe.js';
 import * as _deno_types from '@deno/types';
 
 interface DenoAdapter {

package/dist/adapters/deno.mjs

@@ -1,4 +1,4 @@
-import { d as defineWebSocketAdapter, M as Message, P as Peer, t as toBufferLike, c as createCrossWS } from '../shared/crossws.34cfc8d0.mjs';
+import { d as defineWebSocketAdapter, M as Message, P as Peer, t as toBufferLike, c as createCrossWS } from '../shared/crossws.77e89680.mjs';
 import { WSError } from '../index.mjs';
 
 const deno = defineWebSocketAdapter(
@@ -40,7 +40,7 @@ const deno = defineWebSocketAdapter(
   }
 );
 class DenoPeer extends Peer {
-  get id() {
+  get addr() {
     return this.ctx.deno.ws.remoteAddress;
   }
   get readyState() {

package/dist/adapters/node.cjs

@@ -5,7 +5,7 @@ const websocket = require('../shared/crossws.2ed26345.cjs');
 const require$$0 = require('events');
 const require$$2 = require('http');
 const require$$1 = require('crypto');
-const types = require('../shared/crossws.c13afbe7.cjs');
+const types = require('../shared/crossws.36b9e66f.cjs');
 const index = require('../index.cjs');
 require('https');
 require('net');
@@ -691,13 +691,22 @@ const node = types.defineWebSocketAdapter(
   }
 );
 class NodePeer extends types.Peer {
-  get id() {
+  constructor(ctx) {
+    super(ctx);
+    ctx.node.ws._peer = this;
+  }
+  get addr() {
     const socket = this.ctx.node.req.socket;
     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 || "/";
@@ -716,6 +725,15 @@ class NodePeer extends types.Peer {
     });
     return 0;
   }
+  publish(topic, message) {
+    message = types.toBufferLike(message);
+    for (const client of this.ctx.node.server.clients) {
+      const peer = client._peer;
+      if (peer && peer !== this && peer._subscriptions.has(topic)) {
+        peer.send(message);
+      }
+    }
+  }
 }
 
 module.exports = node;

package/dist/adapters/node.d.cts

@@ -1,4 +1,4 @@
-import { A as AdapterOptions, b as Adapter } from '../shared/crossws.a2e5c71e.cjs';
+import { A as AdapterOptions, b as Adapter } from '../shared/crossws.381454fe.cjs';
 import { IncomingMessage as IncomingMessage$1 } from 'node:http';
 import { Duplex as Duplex$1 } from 'node:stream';
 import { EventEmitter } from 'events';

package/dist/adapters/node.d.mts

@@ -1,4 +1,4 @@
-import { A as AdapterOptions, b as Adapter } from '../shared/crossws.a2e5c71e.mjs';
+import { A as AdapterOptions, b as Adapter } from '../shared/crossws.381454fe.mjs';
 import { IncomingMessage as IncomingMessage$1 } from 'node:http';
 import { Duplex as Duplex$1 } from 'node:stream';
 import { EventEmitter } from 'events';

package/dist/adapters/node.d.ts

@@ -1,4 +1,4 @@
-import { A as AdapterOptions, b as Adapter } from '../shared/crossws.a2e5c71e.js';
+import { A as AdapterOptions, b as Adapter } from '../shared/crossws.381454fe.js';
 import { IncomingMessage as IncomingMessage$1 } from 'node:http';
 import { Duplex as Duplex$1 } from 'node:stream';
 import { EventEmitter } from 'events';

package/dist/adapters/node.mjs

@@ -3,7 +3,7 @@ import { v as validationExports, g as getDefaultExportFromCjs, e as extension$1,
 import require$$0 from 'events';
 import require$$2 from 'http';
 import require$$1 from 'crypto';
-import { d as defineWebSocketAdapter, M as Message, P as Peer, t as toBufferLike, c as createCrossWS } from '../shared/crossws.34cfc8d0.mjs';
+import { d as defineWebSocketAdapter, M as Message, P as Peer, t as toBufferLike, c as createCrossWS } from '../shared/crossws.77e89680.mjs';
 import { WSError } from '../index.mjs';
 import 'https';
 import 'net';
@@ -683,13 +683,22 @@ const node = defineWebSocketAdapter(
   }
 );
 class NodePeer extends Peer {
-  get id() {
+  constructor(ctx) {
+    super(ctx);
+    ctx.node.ws._peer = this;
+  }
+  get addr() {
     const socket = this.ctx.node.req.socket;
     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 || "/";
@@ -708,6 +717,15 @@ class NodePeer extends Peer {
     });
     return 0;
   }
+  publish(topic, message) {
+    message = toBufferLike(message);
+    for (const client of this.ctx.node.server.clients) {
+      const peer = client._peer;
+      if (peer && peer !== this && peer._subscriptions.has(topic)) {
+        peer.send(message);
+      }
+    }
+  }
 }
 
 export { node as default };

package/dist/adapters/uws.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const types = require('../shared/crossws.c13afbe7.cjs');
+const types = require('../shared/crossws.36b9e66f.cjs');
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -107,7 +107,7 @@ class UWSPeer extends types.Peer {
     __publicField(this, "_headers");
     __publicField(this, "_decoder", new TextDecoder());
   }
-  get id() {
+  get addr() {
     try {
       const addr = this._decoder.decode(
         this.ctx.uws.ws?.getRemoteAddressAsText()

package/dist/adapters/uws.d.cts

@@ -1,4 +1,4 @@
-import { A as AdapterOptions, b as Adapter } from '../shared/crossws.a2e5c71e.cjs';
+import { A as AdapterOptions, b as Adapter } from '../shared/crossws.381454fe.cjs';
 import { WebSocketBehavior, HttpRequest, HttpResponse } from 'uWebSockets.js';
 
 type UserData = {

package/dist/adapters/uws.d.mts

@@ -1,4 +1,4 @@
-import { A as AdapterOptions, b as Adapter } from '../shared/crossws.a2e5c71e.mjs';
+import { A as AdapterOptions, b as Adapter } from '../shared/crossws.381454fe.mjs';
 import { WebSocketBehavior, HttpRequest, HttpResponse } from 'uWebSockets.js';
 
 type UserData = {

package/dist/adapters/uws.d.ts

@@ -1,4 +1,4 @@
-import { A as AdapterOptions, b as Adapter } from '../shared/crossws.a2e5c71e.js';
+import { A as AdapterOptions, b as Adapter } from '../shared/crossws.381454fe.js';
 import { WebSocketBehavior, HttpRequest, HttpResponse } from 'uWebSockets.js';
 
 type UserData = {

package/dist/adapters/uws.mjs

@@ -1,4 +1,4 @@
-import { d as defineWebSocketAdapter, c as createCrossWS, M as Message, P as Peer, t as toBufferLike } from '../shared/crossws.34cfc8d0.mjs';
+import { d as defineWebSocketAdapter, c as createCrossWS, M as Message, P as Peer, t as toBufferLike } from '../shared/crossws.77e89680.mjs';
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -105,7 +105,7 @@ class UWSPeer extends Peer {
     __publicField(this, "_headers");
     __publicField(this, "_decoder", new TextDecoder());
   }
-  get id() {
+  get addr() {
     try {
       const addr = this._decoder.decode(
         this.ctx.uws.ws?.getRemoteAddressAsText()

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const types = require('./shared/crossws.c13afbe7.cjs');
+const types = require('./shared/crossws.36b9e66f.cjs');
 
 class WSError extends Error {
   constructor(...args) {

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { A as AdapterOptions, C as CrossWS } from './shared/crossws.a2e5c71e.cjs';
-export { b as Adapter, f as AdapterHooks, a as Caller, H as Hooks, M as Message, P as Peer, R as ResolveHooks, W as WSError, c as WSRequest, e as defineHooks, d as defineWebSocketAdapter } from './shared/crossws.a2e5c71e.cjs';
+import { A as AdapterOptions, C as CrossWS } from './shared/crossws.381454fe.cjs';
+export { b as Adapter, f as AdapterHooks, a as Caller, H as Hooks, M as Message, P as Peer, R as ResolveHooks, W as WSError, c as WSRequest, e as defineHooks, d as defineWebSocketAdapter } from './shared/crossws.381454fe.cjs';
 
 declare function createCrossWS(opts?: AdapterOptions): CrossWS;
 

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { A as AdapterOptions, C as CrossWS } from './shared/crossws.a2e5c71e.mjs';
-export { b as Adapter, f as AdapterHooks, a as Caller, H as Hooks, M as Message, P as Peer, R as ResolveHooks, W as WSError, c as WSRequest, e as defineHooks, d as defineWebSocketAdapter } from './shared/crossws.a2e5c71e.mjs';
+import { A as AdapterOptions, C as CrossWS } from './shared/crossws.381454fe.mjs';
+export { b as Adapter, f as AdapterHooks, a as Caller, H as Hooks, M as Message, P as Peer, R as ResolveHooks, W as WSError, c as WSRequest, e as defineHooks, d as defineWebSocketAdapter } from './shared/crossws.381454fe.mjs';
 
 declare function createCrossWS(opts?: AdapterOptions): CrossWS;
 

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { A as AdapterOptions, C as CrossWS } from './shared/crossws.a2e5c71e.js';
-export { b as Adapter, f as AdapterHooks, a as Caller, H as Hooks, M as Message, P as Peer, R as ResolveHooks, W as WSError, c as WSRequest, e as defineHooks, d as defineWebSocketAdapter } from './shared/crossws.a2e5c71e.js';
+import { A as AdapterOptions, C as CrossWS } from './shared/crossws.381454fe.js';
+export { b as Adapter, f as AdapterHooks, a as Caller, H as Hooks, M as Message, P as Peer, R as ResolveHooks, W as WSError, c as WSRequest, e as defineHooks, d as defineWebSocketAdapter } from './shared/crossws.381454fe.js';
 
 declare function createCrossWS(opts?: AdapterOptions): CrossWS;
 

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { M as Message, P as Peer, c as createCrossWS, a as defineHooks, d as defineWebSocketAdapter } from './shared/crossws.34cfc8d0.mjs';
+export { M as Message, P as Peer, c as createCrossWS, a as defineHooks, d as defineWebSocketAdapter } from './shared/crossws.77e89680.mjs';
 
 class WSError extends Error {
   constructor(...args) {

package/dist/shared/{crossws.c13afbe7.cjs → crossws.36b9e66f.cjs}

@@ -98,13 +98,18 @@ const ReadyStateMap = {
   2: "closing",
   3: "closed"
 };
-class Peer {
+const _Peer = class _Peer {
   constructor(ctx) {
     this.ctx = ctx;
     __publicField(this, "_subscriptions", /* @__PURE__ */ new Set());
+    __publicField(this, "_id");
+    this._id = ++_Peer._idCounter + "";
   }
   get id() {
-    return "??";
+    return this._id.toString();
+  }
+  get addr() {
+    return void 0;
   }
   get url() {
     return "/";
@@ -124,12 +129,17 @@ class Peer {
     this._subscriptions.delete(topic);
   }
   toString() {
-    return `${this.id || ""}${this.readyState === 1 || this.readyState === -1 ? "" : ` [${ReadyStateMap[this.readyState]}]`}`;
+    return `#${this.id}`;
   }
   [Symbol.for("nodejs.util.inspect.custom")]() {
-    return this.toString();
+    const _id = this.toString();
+    const _addr = this.addr ? ` (${this.addr})` : "";
+    const _state = this.readyState === 1 || this.readyState === -1 ? "" : ` [${ReadyStateMap[this.readyState]}]`;
+    return `${_id}${_addr}${_state}`;
   }
-}
+};
+__publicField(_Peer, "_idCounter", 0);
+let Peer = _Peer;
 
 function defineWebSocketAdapter(factory) {
   return factory;

package/dist/shared/{crossws.a2e5c71e.d.cts → crossws.381454fe.d.cts}

@@ -14,8 +14,11 @@ type ReadyState = 0 | 1 | 2 | 3;
 declare abstract class Peer<AdapterContext = any> implements WSRequest {
     ctx: AdapterContext;
     _subscriptions: Set<string>;
+    static _idCounter: number;
+    private _id;
     constructor(ctx: AdapterContext);
-    get id(): string | undefined;
+    get id(): string;
+    get addr(): string | undefined;
     get url(): string;
     get headers(): HeadersInit;
     get readyState(): ReadyState | -1;

package/dist/shared/{crossws.a2e5c71e.d.mts → crossws.381454fe.d.mts}

@@ -14,8 +14,11 @@ type ReadyState = 0 | 1 | 2 | 3;
 declare abstract class Peer<AdapterContext = any> implements WSRequest {
     ctx: AdapterContext;
     _subscriptions: Set<string>;
+    static _idCounter: number;
+    private _id;
     constructor(ctx: AdapterContext);
-    get id(): string | undefined;
+    get id(): string;
+    get addr(): string | undefined;
     get url(): string;
     get headers(): HeadersInit;
     get readyState(): ReadyState | -1;

package/dist/shared/{crossws.a2e5c71e.d.ts → crossws.381454fe.d.ts}

@@ -14,8 +14,11 @@ type ReadyState = 0 | 1 | 2 | 3;
 declare abstract class Peer<AdapterContext = any> implements WSRequest {
     ctx: AdapterContext;
     _subscriptions: Set<string>;
+    static _idCounter: number;
+    private _id;
     constructor(ctx: AdapterContext);
-    get id(): string | undefined;
+    get id(): string;
+    get addr(): string | undefined;
     get url(): string;
     get headers(): HeadersInit;
     get readyState(): ReadyState | -1;

package/dist/shared/{crossws.34cfc8d0.mjs → crossws.77e89680.mjs}

@@ -96,13 +96,18 @@ const ReadyStateMap = {
   2: "closing",
   3: "closed"
 };
-class Peer {
+const _Peer = class _Peer {
   constructor(ctx) {
     this.ctx = ctx;
     __publicField(this, "_subscriptions", /* @__PURE__ */ new Set());
+    __publicField(this, "_id");
+    this._id = ++_Peer._idCounter + "";
   }
   get id() {
-    return "??";
+    return this._id.toString();
+  }
+  get addr() {
+    return void 0;
   }
   get url() {
     return "/";
@@ -122,12 +127,17 @@ class Peer {
     this._subscriptions.delete(topic);
   }
   toString() {
-    return `${this.id || ""}${this.readyState === 1 || this.readyState === -1 ? "" : ` [${ReadyStateMap[this.readyState]}]`}`;
+    return `#${this.id}`;
   }
   [Symbol.for("nodejs.util.inspect.custom")]() {
-    return this.toString();
+    const _id = this.toString();
+    const _addr = this.addr ? ` (${this.addr})` : "";
+    const _state = this.readyState === 1 || this.readyState === -1 ? "" : ` [${ReadyStateMap[this.readyState]}]`;
+    return `${_id}${_addr}${_state}`;
   }
-}
+};
+__publicField(_Peer, "_idCounter", 0);
+let Peer = _Peer;
 
 function defineWebSocketAdapter(factory) {
   return factory;

package/package.json

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