@dxos/network-manager 0.1.49-next.fdd6c88 → 0.1.49

package/dist/lib/node/index.cjs

@@ -61,7 +61,9 @@ var import_util4 = require("@dxos/util");
 // packages/core/mesh/network-manager/src/swarm/connection.ts
 var import_node_assert = __toESM(require("node:assert"));
 var import_async = require("@dxos/async");
+var import_context = require("@dxos/context");
 var import_debug = require("@dxos/debug");
+var import_errors = require("@dxos/errors");
 var import_keys = require("@dxos/keys");
 var import_log = require("@dxos/log");
 var import_protocols = require("@dxos/protocols");
@@ -75,6 +77,8 @@ var __decorate = function(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var STARTING_SIGNALLING_DELAY = 10;
+var MAX_SIGNALLING_DELAY = 300;
 var ConnectionState;
 (function(ConnectionState5) {
   ConnectionState5[
@@ -119,11 +123,17 @@ var Connection = class {
     this._signalMessaging = _signalMessaging;
     this._protocol = _protocol;
     this._transportFactory = _transportFactory;
+    this._ctx = new import_context.Context();
     this._state = ConnectionState.INITIAL;
-    this._bufferedSignals = [];
+    this._incomingSignalBuffer = [];
+    this._outgoingSignalBuffer = [];
     this.stateChanged = new import_async.Event();
     this.errors = new import_debug.ErrorStream();
     this._instanceId = import_keys.PublicKey.random().toHex();
+    this._signalSendTask = new import_async.DeferredTask(this._ctx, async () => {
+      await this._flushSignalBuffer();
+    });
+    this._signallingDelay = STARTING_SIGNALLING_DELAY;
   }
   get state() {
     return this._state;
@@ -144,7 +154,7 @@ var Connection = class {
       id: this._instanceId
     }), {
       file: "connection.ts",
-      line: 92,
+      line: 115,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -155,7 +165,7 @@ var Connection = class {
     this._protocol.stream.on("close", () => {
       (0, import_log.log)("protocol stream closed", {}, {
         file: "connection.ts",
-        line: 103,
+        line: 126,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -165,29 +175,7 @@ var Connection = class {
     this._transport = this._transportFactory.createTransport({
       initiator: this.initiator,
       stream: this._protocol.stream,
-      sendSignal: async (signal) => {
-        try {
-          await this._signalMessaging.signal({
-            author: this.ownId,
-            recipient: this.remoteId,
-            sessionId: this.sessionId,
-            topic: this.topic,
-            data: {
-              signal
-            }
-          });
-        } catch (err) {
-          (0, import_log.log)("Signal failed", {
-            err
-          }, {
-            file: "connection.ts",
-            line: 122,
-            scope: this,
-            callSite: (f, a) => f(...a)
-          });
-          await this.close();
-        }
-      }
+      sendSignal: async (signal) => this._sendSignal(signal)
     });
     this._transport.connected.once(() => {
       this._changeState(ConnectionState.CONNECTED);
@@ -201,15 +189,15 @@ var Connection = class {
         this.errors.raise(err);
       }
     });
-    for (const signal of this._bufferedSignals) {
+    for (const signal of this._incomingSignalBuffer) {
       void this._transport.signal(signal);
     }
-    this._bufferedSignals = [];
+    this._incomingSignalBuffer = [];
     import_log.log.trace("dxos.mesh.connection.open-connection", import_protocols.trace.end({
       id: this._instanceId
     }), {
       file: "connection.ts",
-      line: 150,
+      line: 159,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -220,11 +208,12 @@ var Connection = class {
       return;
     }
     this._changeState(ConnectionState.CLOSING);
+    await this._ctx.dispose();
     (0, import_log.log)("closing...", {
       peerId: this.ownId
     }, {
       file: "connection.ts",
-      line: 160,
+      line: 171,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -233,7 +222,7 @@ var Connection = class {
     } catch (err) {
       import_log.log.catch(err, {}, {
         file: "connection.ts",
-        line: 166,
+        line: 177,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -243,7 +232,7 @@ var Connection = class {
     } catch (err1) {
       import_log.log.catch(err1, {}, {
         file: "connection.ts",
-        line: 173,
+        line: 184,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -252,53 +241,105 @@ var Connection = class {
       peerId: this.ownId
     }, {
       file: "connection.ts",
-      line: 176,
+      line: 187,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     this._changeState(ConnectionState.CLOSED);
   }
+  _sendSignal(signal) {
+    this._outgoingSignalBuffer.push(signal);
+    this._signalSendTask.schedule();
+  }
+  async _flushSignalBuffer() {
+    if (this._outgoingSignalBuffer.length === 0) {
+      return;
+    }
+    try {
+      await (0, import_context.cancelWithContext)(this._ctx, (0, import_async.sleep)(this._signallingDelay));
+      this._signallingDelay = Math.min(this._signallingDelay * 2, MAX_SIGNALLING_DELAY);
+      const signals = [
+        ...this._outgoingSignalBuffer
+      ];
+      this._outgoingSignalBuffer.length = 0;
+      await this._signalMessaging.signal({
+        author: this.ownId,
+        recipient: this.remoteId,
+        sessionId: this.sessionId,
+        topic: this.topic,
+        data: {
+          signalBatch: {
+            signals
+          }
+        }
+      });
+    } catch (err) {
+      if (err instanceof import_errors.CancelledError) {
+        return;
+      }
+      import_log.log.warn("Signal failed", {
+        err
+      }, {
+        file: "connection.ts",
+        line: 221,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+      await this.close();
+    }
+  }
+  /**
+  * Receive a signal from the remote peer.
+  */
   async signal(msg) {
-    var _a, _b;
+    var _a, _b, _c;
     (0, import_node_assert.default)(msg.sessionId);
     if (!msg.sessionId.equals(this.sessionId)) {
       (0, import_log.log)("dropping signal for incorrect session id", {}, {
         file: "connection.ts",
-        line: 183,
+        line: 232,
         scope: this,
         callSite: (f, a) => f(...a)
       });
       return;
     }
-    (0, import_node_assert.default)(msg.data.signal);
+    (0, import_node_assert.default)(msg.data.signal || msg.data.signalBatch);
     (0, import_node_assert.default)((_a = msg.author) == null ? void 0 : _a.equals(this.remoteId));
     (0, import_node_assert.default)((_b = msg.recipient) == null ? void 0 : _b.equals(this.ownId));
-    if (this._state === ConnectionState.INITIAL) {
-      (0, import_log.log)("buffered signal", {
-        peerId: this.ownId,
-        remoteId: this.remoteId,
-        msg: msg.data
-      }, {
-        file: "connection.ts",
-        line: 191,
-        scope: this,
-        callSite: (f, a) => f(...a)
-      });
-      this._bufferedSignals.push(msg.data.signal);
-      return;
+    const signals = msg.data.signalBatch ? (_c = msg.data.signalBatch.signals) != null ? _c : [] : [
+      msg.data.signal
+    ];
+    for (const signal of signals) {
+      if (!signal) {
+        continue;
+      }
+      if (this._state === ConnectionState.INITIAL) {
+        (0, import_log.log)("buffered signal", {
+          peerId: this.ownId,
+          remoteId: this.remoteId,
+          msg: msg.data
+        }, {
+          file: "connection.ts",
+          line: 246,
+          scope: this,
+          callSite: (f, a) => f(...a)
+        });
+        this._incomingSignalBuffer.push(signal);
+      } else {
+        (0, import_node_assert.default)(this._transport, "Connection not ready to accept signals.");
+        (0, import_log.log)("received signal", {
+          peerId: this.ownId,
+          remoteId: this.remoteId,
+          msg: msg.data
+        }, {
+          file: "connection.ts",
+          line: 250,
+          scope: this,
+          callSite: (f, a) => f(...a)
+        });
+        await this._transport.signal(signal);
+      }
     }
-    (0, import_node_assert.default)(this._transport, "Connection not ready to accept signals.");
-    (0, import_log.log)("received signal", {
-      peerId: this.ownId,
-      remoteId: this.remoteId,
-      msg: msg.data
-    }, {
-      file: "connection.ts",
-      line: 197,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-    await this._transport.signal(msg.data.signal);
   }
   _changeState(state) {
     (0, import_log.log)("stateChanged", {
@@ -307,7 +348,7 @@ var Connection = class {
       peerId: this.ownId
     }, {
       file: "connection.ts",
-      line: 202,
+      line: 257,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -323,7 +364,7 @@ __decorate([
 // packages/core/mesh/network-manager/src/swarm/swarm.ts
 var import_node_assert4 = __toESM(require("node:assert"));
 var import_async3 = require("@dxos/async");
-var import_context3 = require("@dxos/context");
+var import_context4 = require("@dxos/context");
 var import_debug2 = require("@dxos/debug");
 var import_keys4 = require("@dxos/keys");
 var import_log4 = require("@dxos/log");
@@ -332,14 +373,14 @@ var import_util2 = require("@dxos/util");
 
 // packages/core/mesh/network-manager/src/signal/swarm-messenger.ts
 var import_node_assert2 = __toESM(require("node:assert"));
-var import_context = require("@dxos/context");
+var import_context2 = require("@dxos/context");
 var import_keys2 = require("@dxos/keys");
 var import_log2 = require("@dxos/log");
 var import_protocols2 = require("@dxos/protocols");
 var import_util = require("@dxos/util");
 var SwarmMessenger = class {
   constructor({ sendMessage, onSignal, onOffer, topic }) {
-    this._ctx = new import_context.Context();
+    this._ctx = new import_context2.Context();
     this._offerRecords = new import_util.ComplexMap((key) => key.toHex());
     this._sendMessage = sendMessage;
     this._onSignal = onSignal;
@@ -347,7 +388,7 @@ var SwarmMessenger = class {
     this._topic = topic;
   }
   async receiveMessage({ author, recipient, payload }) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (payload.type_url !== "dxos.mesh.swarm.SwarmMessage") {
       return;
     }
@@ -379,11 +420,26 @@ var SwarmMessenger = class {
         recipient,
         message
       });
+    } else if ((_d = message.data) == null ? void 0 : _d.signalBatch) {
+      await this._handleSignal({
+        author,
+        recipient,
+        message
+      });
+    } else {
+      import_log2.log.warn("unknown message", {
+        message
+      }, {
+        file: "swarm-messenger.ts",
+        line: 79,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
     }
   }
   async signal(message) {
-    var _a;
-    (0, import_node_assert2.default)((_a = message.data) == null ? void 0 : _a.signal);
+    var _a, _b;
+    (0, import_node_assert2.default)(((_a = message.data) == null ? void 0 : _a.signal) || ((_b = message.data) == null ? void 0 : _b.signalBatch), "Invalid message");
     await this._sendReliableMessage({
       author: message.author,
       recipient: message.recipient,
@@ -419,7 +475,7 @@ var SwarmMessenger = class {
       msg: networkMessage
     }, {
       file: "swarm-messenger.ts",
-      line: 118,
+      line: 122,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -443,7 +499,7 @@ var SwarmMessenger = class {
         answer: message.data.answer
       }, {
         file: "swarm-messenger.ts",
-        line: 135,
+        line: 139,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -462,27 +518,39 @@ var SwarmMessenger = class {
     };
     const answer = await this._onOffer(offerMessage);
     answer.offerMessageId = message.messageId;
-    await this._sendReliableMessage({
-      author: recipient,
-      recipient: author,
-      message: {
-        topic: message.topic,
-        sessionId: message.sessionId,
-        data: {
-          answer
+    try {
+      await this._sendReliableMessage({
+        author: recipient,
+        recipient: author,
+        message: {
+          topic: message.topic,
+          sessionId: message.sessionId,
+          data: {
+            answer
+          }
         }
-      }
-    });
+      });
+    } catch (err) {
+      import_log2.log.warn("error sending answer", {
+        err
+      }, {
+        file: "swarm-messenger.ts",
+        line: 173,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+    }
   }
   async _handleSignal({ author, recipient, message }) {
     (0, import_node_assert2.default)(message.messageId);
-    (0, import_node_assert2.default)(message.data.signal, "No Signal");
+    (0, import_node_assert2.default)(message.data.signal || message.data.signalBatch, "Invalid message");
     const signalMessage = {
       author,
       recipient,
       ...message,
       data: {
-        signal: message.data.signal
+        signal: message.data.signal,
+        signalBatch: message.data.signalBatch
       }
     };
     await this._onSignal(signalMessage);
@@ -492,7 +560,7 @@ var SwarmMessenger = class {
 // packages/core/mesh/network-manager/src/swarm/peer.ts
 var import_node_assert3 = __toESM(require("node:assert"));
 var import_async2 = require("@dxos/async");
-var import_context2 = require("@dxos/context");
+var import_context3 = require("@dxos/context");
 var import_keys3 = require("@dxos/keys");
 var import_log3 = require("@dxos/log");
 var __decorate2 = function(decorators, target, key, desc) {
@@ -517,7 +585,7 @@ var Peer = class {
     this._callbacks = _callbacks;
     this._availableAfter = 0;
     this.availableToConnect = true;
-    this._ctx = new import_context2.Context();
+    this._ctx = new import_context3.Context();
     this.advertizing = false;
     this.initiating = false;
   }
@@ -838,7 +906,8 @@ var Swarm = class {
     this._transportFactory = _transportFactory;
     this._label = _label;
     this._peers = new import_util2.ComplexMap(import_keys4.PublicKey.hash);
-    this._ctx = new import_context3.Context();
+    this._ctx = new import_context4.Context();
+    this._listeningHandle = void 0;
     this.connectionAdded = new import_async3.Event();
     this.disconnected = new import_async3.Event();
     this.connected = new import_async3.Event();
@@ -852,7 +921,7 @@ var Swarm = class {
       }
     }), {
       file: "swarm.ts",
-      line: 84,
+      line: 86,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -860,7 +929,7 @@ var Swarm = class {
       peerId: _ownPeerId
     }, {
       file: "swarm.ts",
-      line: 88,
+      line: 90,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -871,30 +940,11 @@ var Swarm = class {
       onOffer: async (msg) => await this.onOffer(msg),
       topic: this._topic
     });
-    this._messenger.listen({
-      peerId: this._ownPeerId,
-      payloadType: "dxos.mesh.swarm.SwarmMessage",
-      onMessage: async (message) => {
-        await this._swarmMessenger.receiveMessage(message).catch((err) => (0, import_log4.log)("Error while receiving message", {
-          err
-        }, {
-          file: "swarm.ts",
-          line: 105,
-          scope: this,
-          callSite: (f, a) => f(...a)
-        }));
-      }
-    }).catch((error) => import_log4.log.catch(error, {}, {
-      file: "swarm.ts",
-      line: 108,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    }));
     import_log4.log.trace("dxos.mesh.swarm.constructor", import_protocols3.trace.end({
       id: this._instanceId
     }), {
       file: "swarm.ts",
-      line: 110,
+      line: 99,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -914,20 +964,39 @@ var Swarm = class {
   get topic() {
     return this._topic;
   }
-  // TODO(burdon): async open?
+  async open() {
+    (0, import_node_assert4.default)(!this._listeningHandle);
+    this._listeningHandle = await this._messenger.listen({
+      peerId: this._ownPeerId,
+      payloadType: "dxos.mesh.swarm.SwarmMessage",
+      onMessage: async (message) => {
+        await this._swarmMessenger.receiveMessage(message).catch((err) => import_log4.log.warn("Error while receiving message", {
+          err
+        }, {
+          file: "swarm.ts",
+          line: 133,
+          scope: this,
+          callSite: (f, a) => f(...a)
+        }));
+      }
+    });
+  }
   async destroy() {
+    var _a;
     (0, import_log4.log)("destroying...", {}, {
       file: "swarm.ts",
-      line: 138,
+      line: 139,
       scope: this,
       callSite: (f, a) => f(...a)
     });
+    await ((_a = this._listeningHandle) == null ? void 0 : _a.unsubscribe());
+    this._listeningHandle = void 0;
     await this._ctx.dispose();
     await this._topology.destroy();
     await Promise.all(Array.from(this._peers.keys()).map((key) => this._destroyPeer(key)));
     (0, import_log4.log)("destroyed", {}, {
       file: "swarm.ts",
-      line: 142,
+      line: 146,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -942,7 +1011,7 @@ var Swarm = class {
       topology: getClassName(topology)
     }, {
       file: "swarm.ts",
-      line: 150,
+      line: 154,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -957,14 +1026,14 @@ var Swarm = class {
       swarmEvent
     }, {
       file: "swarm.ts",
-      line: 163,
+      line: 167,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       (0, import_log4.log)("swarm event ignored for disposed swarm", {}, {
         file: "swarm.ts",
-        line: 166,
+        line: 170,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -976,7 +1045,7 @@ var Swarm = class {
         peerId
       }, {
         file: "swarm.ts",
-        line: 172,
+        line: 176,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -991,7 +1060,7 @@ var Swarm = class {
         if (((_a = peer1.connection) == null ? void 0 : _a.state) !== ConnectionState.CONNECTED) {
           void this._destroyPeer(peer1.id).catch((err) => import_log4.log.catch(err, {}, {
             file: "swarm.ts",
-            line: 183,
+            line: 187,
             scope: this,
             callSite: (f, a) => f(...a)
           }));
@@ -1006,14 +1075,14 @@ var Swarm = class {
       message
     }, {
       file: "swarm.ts",
-      line: 193,
+      line: 197,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       (0, import_log4.log)("ignored for disposed swarm", {}, {
         file: "swarm.ts",
-        line: 195,
+        line: 199,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1027,7 +1096,7 @@ var Swarm = class {
         message
       }, {
         file: "swarm.ts",
-        line: 202,
+        line: 206,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1040,7 +1109,7 @@ var Swarm = class {
         message
       }, {
         file: "swarm.ts",
-        line: 206,
+        line: 210,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1059,14 +1128,14 @@ var Swarm = class {
       message
     }, {
       file: "swarm.ts",
-      line: 218,
+      line: 222,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       import_log4.log.info("ignored for offline swarm", {}, {
         file: "swarm.ts",
-        line: 220,
+        line: 224,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1087,7 +1156,7 @@ var Swarm = class {
   }
   // For debug purposes
   async goOnline() {
-    this._ctx = new import_context3.Context();
+    this._ctx = new import_context4.Context();
   }
   _getOrCreatePeer(peerId) {
     let peer = this._peers.get(peerId);
@@ -1147,7 +1216,7 @@ var Swarm = class {
           } catch (err) {
             (0, import_log4.log)("initiation error", err, {
               file: "swarm.ts",
-              line: 323,
+              line: 327,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1175,7 +1244,7 @@ var Swarm = class {
         remoteId
       }, {
         file: "swarm.ts",
-        line: 350,
+        line: 354,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1192,7 +1261,7 @@ var Swarm = class {
       remoteId
     }, {
       file: "swarm.ts",
-      line: 364,
+      line: 368,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1202,7 +1271,7 @@ var Swarm = class {
       remoteId
     }, {
       file: "swarm.ts",
-      line: 367,
+      line: 371,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1490,16 +1559,17 @@ var NetworkManager = class {
       });
     });
     this._swarms.set(topic, swarm);
+    this._mappers.set(topic, new SwarmMapper(swarm));
+    await swarm.open();
     this._signalConnection.join({
       topic,
       peerId
     }).catch((error) => import_log6.log.catch(error, {}, {
       file: "network-manager.ts",
-      line: 169,
+      line: 174,
       scope: this,
       callSite: (f, a) => f(...a)
     }));
-    this._mappers.set(topic, new SwarmMapper(swarm));
     this.topicsUpdated.emit();
     (_a = this._connectionLog) == null ? void 0 : _a.joinedSwarm(swarm);
     (0, import_log6.log)("joined", {
@@ -1507,7 +1577,7 @@ var NetworkManager = class {
       count: this._swarms.size
     }, {
       file: "network-manager.ts",
-      line: 174,
+      line: 178,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1527,7 +1597,7 @@ var NetworkManager = class {
       topic: import_keys7.PublicKey.from(topic)
     }, {
       file: "network-manager.ts",
-      line: 190,
+      line: 194,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1548,7 +1618,7 @@ var NetworkManager = class {
       count: this._swarms.size
     }, {
       file: "network-manager.ts",
-      line: 204,
+      line: 208,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2170,7 +2240,7 @@ var WebRTCTransportService = class {
 // packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts
 var import_node_assert12 = __toESM(require("node:assert"));
 var import_async9 = require("@dxos/async");
-var import_context4 = require("@dxos/context");
+var import_context5 = require("@dxos/context");
 var import_debug6 = require("@dxos/debug");
 var import_keys11 = require("@dxos/keys");
 var import_log12 = require("@dxos/log");
@@ -2180,7 +2250,7 @@ var WebRTCTransportProxy = class {
   constructor(_params) {
     this._params = _params;
     this._proxyId = import_keys11.PublicKey.random();
-    this._ctx = new import_context4.Context();
+    this._ctx = new import_context5.Context();
     this.closed = new import_async9.Event();
     this._closed = false;
     this.connected = new import_async9.Event();