@rljson/server 0.0.3 → 0.0.5

package/dist/server.js

@@ -743,21 +743,23 @@ class BsPeerBridge {
     this._socket = _socket;
   }
   _eventHandlers = /* @__PURE__ */ new Map();
+  _handleConnectBound = this._handleConnect.bind(this);
+  _handleDisconnectBound = this._handleDisconnect.bind(this);
   /**
    * Starts the bridge by setting up connection event handlers and
    * automatically registering all Bs methods.
    */
   start() {
-    this._socket.on("connect", () => this._handleConnect());
-    this._socket.on("disconnect", () => this._handleDisconnect());
+    this._socket.on("connect", this._handleConnectBound);
+    this._socket.on("disconnect", this._handleDisconnectBound);
     this._registerBsMethods();
   }
   /**
    * Stops the bridge by removing all event handlers.
    */
   stop() {
-    this._socket.off("connect", () => this._handleConnect());
-    this._socket.off("disconnect", () => this._handleDisconnect());
+    this._socket.off("connect", this._handleConnectBound);
+    this._socket.off("disconnect", this._handleDisconnectBound);
     for (const [eventName, handler] of this._eventHandlers) {
       this._socket.off(eventName, handler);
     }
@@ -768,14 +770,11 @@ class BsPeerBridge {
    */
   _registerBsMethods() {
     const bsMethods = [
-      "setBlob",
       "getBlob",
       "getBlobStream",
-      "deleteBlob",
       "blobExists",
       "getBlobProperties",
-      "listBlobs",
-      "generateSignedUrl"
+      "listBlobs"
     ];
     for (const methodName of bsMethods) {
       this.registerEvent(methodName);
@@ -797,17 +796,17 @@ class BsPeerBridge {
           `Method "${methodName}" not found on Bs instance`
         );
         if (typeof callback === "function") {
-          callback(null, error);
+          callback(error, null);
         }
         return;
       }
       bsMethod.apply(this._bs, methodArgs).then((result) => {
         if (typeof callback === "function") {
-          callback(result, null);
+          callback(null, result);
         }
       }).catch((error) => {
         if (typeof callback === "function") {
-          callback(null, error);
+          callback(error, null);
         }
       });
     };
@@ -855,9 +854,9 @@ class BsPeerBridge {
         throw new Error(`Method "${bsMethodName}" not found on Bs instance`);
       }
       const result = await bsMethod.apply(this._bs, args);
-      this._socket.emit(socketEventName, result, null);
+      this._socket.emit(socketEventName, null, result);
     } catch (error) {
-      this._socket.emit(socketEventName, null, error);
+      this._socket.emit(socketEventName, error, null);
     }
   }
   /* v8 ignore next -- @preserve */
@@ -978,11 +977,24 @@ class BaseNode {
     await this._localDb.core.import(data);
   }
 }
+function normalizeSocketBundle(socket) {
+  const bundle = socket;
+  if (bundle.ioUp && bundle.ioDown && bundle.bsUp && bundle.bsDown) {
+    return bundle;
+  }
+  const single = socket;
+  return {
+    ioUp: single,
+    ioDown: single,
+    bsUp: single,
+    bsDown: single
+  };
+}
 class Client extends BaseNode {
   // ...........................................................................
   /**
    * Creates a Client instance
-   * @param _socketToServer - Socket to connect to server
+   * @param _socketToServer - Socket or namespace bundle to connect to server
    * @param _localIo - Local Io for local storage
    * @param _localBs - Local Bs for local blob storage
    */
@@ -1043,6 +1055,7 @@ class Client extends BaseNode {
    * Builds the Io multi with local and peer layers.
    */
   async _setupIo() {
+    const sockets = normalizeSocketBundle(this._socketToServer);
     this._ioMultiIos.push({
       io: this._localIo,
       dump: true,
@@ -1050,9 +1063,9 @@ class Client extends BaseNode {
       write: true,
       priority: 1
     });
-    const ioPeerBridge = new IoPeerBridge(this._localIo, this._socketToServer);
+    const ioPeerBridge = new IoPeerBridge(this._localIo, sockets.ioUp);
     ioPeerBridge.start();
-    const ioPeer = await this._createIoPeer();
+    const ioPeer = await this._createIoPeer(sockets.ioDown);
     this._ioMultiIos.push({
       io: ioPeer,
       dump: false,
@@ -1068,15 +1081,16 @@ class Client extends BaseNode {
    * Builds the Bs multi with local and peer layers.
    */
   async _setupBs() {
+    const sockets = normalizeSocketBundle(this._socketToServer);
     this._bsMultiBss.push({
       bs: this._localBs,
       read: true,
       write: true,
       priority: 1
     });
-    const bsPeerBridge = new BsPeerBridge(this._localBs, this._socketToServer);
+    const bsPeerBridge = new BsPeerBridge(this._localBs, sockets.bsUp);
     bsPeerBridge.start();
-    const bsPeer = await this._createBsPeer();
+    const bsPeer = await this._createBsPeer(sockets.bsDown);
     this._bsMultiBss.push({
       bs: bsPeer,
       read: true,
@@ -1088,18 +1102,20 @@ class Client extends BaseNode {
   }
   /**
    * Creates and initializes a downstream Io peer.
+   * @param socket - Downstream socket to the server Io namespace.
    */
-  async _createIoPeer() {
-    const ioPeer = new IoPeer(this._socketToServer);
+  async _createIoPeer(socket) {
+    const ioPeer = new IoPeer(socket);
     await ioPeer.init();
     await ioPeer.isReady();
     return ioPeer;
   }
   /**
    * Creates and initializes a downstream Bs peer.
+   * @param socket - Downstream socket to the server Bs namespace.
    */
-  async _createBsPeer() {
-    const bsPeer = new BsPeer(this._socketToServer);
+  async _createBsPeer(socket) {
+    const bsPeer = new BsPeer(socket);
     await bsPeer.init();
     return bsPeer;
   }
@@ -1167,12 +1183,25 @@ class Server extends BaseNode {
    * @returns The server instance.
    */
   async addSocket(socket) {
+    const sockets = normalizeSocketBundle(socket);
     const clientId = `client_${this._clients.size}_${Math.random().toString(36).slice(2)}`;
-    socket.__clientId = clientId;
-    const ioPeer = await this._createIoPeer(socket);
-    const bsPeer = await this._createBsPeer(socket);
-    this._registerClient(clientId, socket, ioPeer, bsPeer);
-    this._pendingSockets.push(socket);
+    const ioUp = sockets.ioUp;
+    const ioDown = sockets.ioDown;
+    const bsUp = sockets.bsUp;
+    const bsDown = sockets.bsDown;
+    ioUp.__clientId = clientId;
+    ioDown.__clientId = clientId;
+    bsUp.__clientId = clientId;
+    bsDown.__clientId = clientId;
+    const ioPeer = await this._createIoPeer(ioUp);
+    const bsPeer = await this._createBsPeer(bsUp);
+    this._registerClient(
+      clientId,
+      { ioUp, ioDown, bsUp, bsDown },
+      ioPeer,
+      bsPeer
+    );
+    this._pendingSockets.push({ ioDown, bsDown });
     this._queueIoPeer(ioPeer);
     this._queueBsPeer(bsPeer);
     await this._queueRefresh();
@@ -1185,16 +1214,17 @@ class Server extends BaseNode {
    * Removes all listeners from all connected clients.
    */
   _removeAllListeners() {
-    for (const { socket } of this._clients.values()) {
-      socket.removeAllListeners(this._route.flat);
+    for (const { ioUp } of this._clients.values()) {
+      ioUp.removeAllListeners(this._route.flat);
     }
   }
   // ...........................................................................
   /**
    * Broadcasts incoming payloads from any client to all other connected clients.
+   * Ensures the sender is filtered out when broadcasting.
    */
   _multicastRefs = () => {
-    for (const { socket: socketA } of this._clients.values()) {
+    for (const [clientIdA, { ioUp: socketA }] of this._clients.entries()) {
       socketA.on(this._route.flat, (payload) => {
         const ref = payload.r;
         if (this._multicastedRefs.has(ref)) {
@@ -1205,10 +1235,13 @@ class Server extends BaseNode {
         if (p && p.__origin) {
           return;
         }
-        for (const { socket: socketB } of this._clients.values()) {
-          if (socketA !== socketB) {
+        for (const [
+          clientIdB,
+          { ioDown: socketB }
+        ] of this._clients.entries()) {
+          if (clientIdA !== clientIdB) {
             const forwarded = Object.assign({}, payload, {
-              __origin: socketA.__clientId
+              __origin: clientIdA
             });
             socketB.emit(this._route.flat, forwarded);
           }
@@ -1259,13 +1292,16 @@ class Server extends BaseNode {
   /**
    * Registers the client socket and peers.
    * @param clientId - Stable client identifier.
-   * @param socket - Client socket to register.
+   * @param sockets - Directional sockets to register.
    * @param io - Io peer associated with the client.
    * @param bs - Bs peer associated with the client.
    */
-  _registerClient(clientId, socket, io, bs) {
+  _registerClient(clientId, sockets, io, bs) {
     this._clients.set(clientId, {
-      socket,
+      ioUp: sockets.ioUp,
+      ioDown: sockets.ioDown,
+      bsUp: sockets.bsUp,
+      bsDown: sockets.bsDown,
       io,
       bs
     });
@@ -1311,9 +1347,9 @@ class Server extends BaseNode {
   async _refreshServers() {
     this._ioServer._io = this._ioMulti;
     this._bsServer._bs = this._bsMulti;
-    for (const socket of this._pendingSockets) {
-      await this._ioServer.addSocket(socket);
-      await this._bsServer.addSocket(socket);
+    for (const pending of this._pendingSockets) {
+      await this._ioServer.addSocket(pending.ioDown);
+      await this._bsServer.addSocket(pending.bsDown);
     }
     this._pendingSockets = [];
   }

package/dist/socket-bundle.d.ts

@@ -0,0 +1,16 @@
+import { Socket } from '@rljson/io';
+export type SocketNamespaceBundle = {
+    ioUp: Socket;
+    ioDown: Socket;
+    bsUp: Socket;
+    bsDown: Socket;
+};
+export type SocketLike = Socket | SocketNamespaceBundle;
+/**
+ * Normalizes a socket input into a full namespace bundle used by the server/client constructors.
+ * - If you pass a single Socket (classic setup), it is reused for all namespaces (ioUp/ioDown/bsUp/bsDown).
+ * - If you pass an explicit bundle (namespaces already split), the bundle is returned as-is.
+ * @param socket - Single socket or pre-split namespace bundle.
+ * @returns Normalized namespace bundle for Io/Bs up/down channels.
+ */
+export declare function normalizeSocketBundle(socket: SocketLike): SocketNamespaceBundle;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rljson/server",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Rljson server description",
   "homepage": "https://github.com/rljson/server",
   "bugs": "https://github.com/rljson/server/issues",
@@ -20,35 +20,35 @@
   ],
   "type": "module",
   "devDependencies": {
-    "@types/node": "^25.0.10",
-    "@typescript-eslint/eslint-plugin": "^8.53.1",
-    "@typescript-eslint/parser": "^8.53.1",
+    "@types/node": "^25.1.0",
+    "@typescript-eslint/eslint-plugin": "^8.54.0",
+    "@typescript-eslint/parser": "^8.54.0",
     "@vitest/coverage-v8": "^4.0.18",
     "cross-env": "^10.1.0",
     "eslint": "^9.39.2",
-    "eslint-plugin-jsdoc": "^62.3.1",
+    "eslint-plugin-jsdoc": "^62.5.0",
     "eslint-plugin-tsdoc": "^0.5.0",
-    "globals": "^17.1.0",
+    "globals": "^17.2.0",
     "jsdoc": "^4.0.5",
     "read-pkg": "^10.0.0",
     "socket.io": "^4.8.3",
     "socket.io-client": "^4.8.3",
     "typescript": "~5.9.3",
-    "typescript-eslint": "^8.53.1",
+    "typescript-eslint": "^8.54.0",
     "vite": "^7.3.1",
     "vite-node": "^5.3.0",
     "vite-plugin-dts": "^4.5.4",
-    "vite-tsconfig-paths": "^6.0.4",
+    "vite-tsconfig-paths": "^6.0.5",
     "vitest": "^4.0.18",
     "vitest-dom": "^0.1.1"
   },
   "dependencies": {
-    "@rljson/bs": "^0.0.19",
-    "@rljson/db": "^0.0.12",
+    "@rljson/bs": "^0.0.20",
+    "@rljson/db": "^0.0.13",
     "@rljson/hash": "^0.0.18",
-    "@rljson/io": "^0.0.64",
+    "@rljson/io": "^0.0.65",
     "@rljson/json": "^0.0.23",
-    "@rljson/rljson": "^0.0.74"
+    "@rljson/rljson": "^0.0.75"
   },
   "scripts": {
     "build": "pnpx vite build && tsc && node scripts/copy-readme-to-dist.js",