@dxos/network-manager 0.1.58-main.4cbb52d → 0.1.58-main.4e2a73a

package/dist/lib/node/index.cjs

@@ -1073,245 +1073,13 @@ var import_log4 = require("@dxos/log");
 var import_protocols4 = require("@dxos/protocols");
 var import_util2 = require("@dxos/util");
 
-// packages/core/mesh/network-manager/src/signal/swarm-messenger.ts
+// packages/core/mesh/network-manager/src/swarm/peer.ts
+var import_async2 = require("@dxos/async");
 var import_context2 = require("@dxos/context");
 var import_invariant2 = require("@dxos/invariant");
 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 __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/signal/swarm-messenger.ts";
-var SwarmMessage = import_protocols2.schema.getCodecForType("dxos.mesh.swarm.SwarmMessage");
-var SwarmMessenger = class {
-  constructor({ sendMessage, onSignal, onOffer, topic }) {
-    this._ctx = new import_context2.Context();
-    this._offerRecords = new import_util.ComplexMap((key) => key.toHex());
-    this._sendMessage = sendMessage;
-    this._onSignal = onSignal;
-    this._onOffer = onOffer;
-    this._topic = topic;
-  }
-  async receiveMessage({ author, recipient, payload }) {
-    if (payload.type_url !== "dxos.mesh.swarm.SwarmMessage") {
-      return;
-    }
-    const message = SwarmMessage.decode(payload.value);
-    if (!this._topic.equals(message.topic)) {
-      return;
-    }
-    (0, import_log2.log)("received", {
-      from: author,
-      to: recipient,
-      msg: message
-    }, {
-      F: __dxlog_file2,
-      L: 69,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    if (message.data?.offer) {
-      await this._handleOffer({
-        author,
-        recipient,
-        message
-      });
-    } else if (message.data?.answer) {
-      await this._resolveAnswers(message);
-    } else if (message.data?.signal) {
-      await this._handleSignal({
-        author,
-        recipient,
-        message
-      });
-    } else if (message.data?.signalBatch) {
-      await this._handleSignal({
-        author,
-        recipient,
-        message
-      });
-    } else {
-      import_log2.log.warn("unknown message", {
-        message
-      }, {
-        F: __dxlog_file2,
-        L: 80,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
-  }
-  async signal(message) {
-    (0, import_invariant2.invariant)(message.data?.signal || message.data?.signalBatch, "Invalid message", {
-      F: __dxlog_file2,
-      L: 85,
-      S: this,
-      A: [
-        "message.data?.signal || message.data?.signalBatch",
-        "'Invalid message'"
-      ]
-    });
-    await this._sendReliableMessage({
-      author: message.author,
-      recipient: message.recipient,
-      message
-    });
-  }
-  async offer(message) {
-    const networkMessage = {
-      ...message,
-      messageId: import_keys2.PublicKey.random()
-    };
-    return new Promise((resolve, reject) => {
-      this._offerRecords.set(networkMessage.messageId, {
-        resolve
-      });
-      this._sendReliableMessage({
-        author: message.author,
-        recipient: message.recipient,
-        message: networkMessage
-      }).catch((err) => reject(err));
-    });
-  }
-  async _sendReliableMessage({ author, recipient, message }) {
-    const networkMessage = {
-      ...message,
-      // Setting unique message_id if it not specified yet.
-      messageId: message.messageId ?? import_keys2.PublicKey.random()
-    };
-    (0, import_log2.log)("sending", {
-      from: author,
-      to: recipient,
-      msg: networkMessage
-    }, {
-      F: __dxlog_file2,
-      L: 123,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    await this._sendMessage({
-      author,
-      recipient,
-      payload: {
-        type_url: "dxos.mesh.swarm.SwarmMessage",
-        value: SwarmMessage.encode(networkMessage)
-      }
-    });
-  }
-  async _resolveAnswers(message) {
-    (0, import_invariant2.invariant)(message.data?.answer?.offerMessageId, "No offerMessageId", {
-      F: __dxlog_file2,
-      L: 135,
-      S: this,
-      A: [
-        "message.data?.answer?.offerMessageId",
-        "'No offerMessageId'"
-      ]
-    });
-    const offerRecord = this._offerRecords.get(message.data.answer.offerMessageId);
-    if (offerRecord) {
-      this._offerRecords.delete(message.data.answer.offerMessageId);
-      (0, import_invariant2.invariant)(message.data?.answer, "No answer", {
-        F: __dxlog_file2,
-        L: 139,
-        S: this,
-        A: [
-          "message.data?.answer",
-          "'No answer'"
-        ]
-      });
-      (0, import_log2.log)("resolving", {
-        answer: message.data.answer
-      }, {
-        F: __dxlog_file2,
-        L: 140,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      offerRecord.resolve(message.data.answer);
-    }
-  }
-  async _handleOffer({ author, recipient, message }) {
-    (0, import_invariant2.invariant)(message.data.offer, "No offer", {
-      F: __dxlog_file2,
-      L: 154,
-      S: this,
-      A: [
-        "message.data.offer",
-        "'No offer'"
-      ]
-    });
-    const offerMessage = {
-      author,
-      recipient,
-      ...message,
-      data: {
-        offer: message.data.offer
-      }
-    };
-    const answer = await this._onOffer(offerMessage);
-    answer.offerMessageId = message.messageId;
-    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
-      }, {
-        F: __dxlog_file2,
-        L: 174,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
-  }
-  async _handleSignal({ author, recipient, message }) {
-    (0, import_invariant2.invariant)(message.messageId, void 0, {
-      F: __dxlog_file2,
-      L: 187,
-      S: this,
-      A: [
-        "message.messageId",
-        ""
-      ]
-    });
-    (0, import_invariant2.invariant)(message.data.signal || message.data.signalBatch, "Invalid message", {
-      F: __dxlog_file2,
-      L: 188,
-      S: this,
-      A: [
-        "message.data.signal || message.data.signalBatch",
-        "'Invalid message'"
-      ]
-    });
-    const signalMessage = {
-      author,
-      recipient,
-      ...message,
-      data: {
-        signal: message.data.signal,
-        signalBatch: message.data.signalBatch
-      }
-    };
-    await this._onSignal(signalMessage);
-  }
-};
-
-// packages/core/mesh/network-manager/src/swarm/peer.ts
-var import_async2 = require("@dxos/async");
-var import_context3 = require("@dxos/context");
-var import_invariant3 = require("@dxos/invariant");
-var import_keys3 = require("@dxos/keys");
-var import_log3 = require("@dxos/log");
-var import_protocols3 = require("@dxos/protocols");
 function _ts_decorate2(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -1322,8 +1090,8 @@ function _ts_decorate2(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 __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts";
-var ConnectionDisplacedError = class extends import_protocols3.SystemError {
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts";
+var ConnectionDisplacedError = class extends import_protocols2.SystemError {
   constructor() {
     super("Connection displaced by remote initiator.");
   }
@@ -1342,7 +1110,7 @@ var Peer = class {
     this._callbacks = _callbacks;
     this._availableAfter = 0;
     this.availableToConnect = true;
-    this._ctx = new import_context3.Context();
+    this._ctx = new import_context2.Context();
     this.advertizing = false;
     this.initiating = false;
     this.connectionDisplaced = new import_async2.Event();
@@ -1354,13 +1122,13 @@ var Peer = class {
     const remoteId = message.author;
     if (this.connection || this.initiating) {
       if (remoteId.toHex() < this.localPeerId.toHex()) {
-        (0, import_log3.log)("close local connection", {
+        (0, import_log2.log)("close local connection", {
           localPeerId: this.id,
           topic: this.topic,
           remotePeerId: this.localPeerId,
           sessionId: this.connection?.sessionId
         }, {
-          F: __dxlog_file3,
+          F: __dxlog_file2,
           L: 117,
           S: this,
           C: (f, a) => f(...a)
@@ -1376,8 +1144,8 @@ var Peer = class {
     }
     if (await this._callbacks.onOffer(remoteId)) {
       if (!this.connection) {
-        (0, import_invariant3.invariant)(message.sessionId, void 0, {
-          F: __dxlog_file3,
+        (0, import_invariant2.invariant)(message.sessionId, void 0, {
+          F: __dxlog_file2,
           L: 137,
           S: this,
           A: [
@@ -1391,14 +1159,14 @@ var Peer = class {
           connection.initiate();
           await connection.openConnection();
         } catch (err) {
-          if (!(err instanceof import_protocols3.CancelledError)) {
-            import_log3.log.warn("connection error", {
+          if (!(err instanceof import_protocols2.CancelledError)) {
+            import_log2.log.warn("connection error", {
               topic: this.topic,
               peerId: this.localPeerId,
               remoteId: this.id,
               err
             }, {
-              F: __dxlog_file3,
+              F: __dxlog_file2,
               L: 147,
               S: this,
               C: (f, a) => f(...a)
@@ -1419,8 +1187,8 @@ var Peer = class {
   * Initiate a connection to the remote peer.
   */
   async initiateConnection() {
-    (0, import_invariant3.invariant)(!this.initiating, "Initiation in progress.", {
-      F: __dxlog_file3,
+    (0, import_invariant2.invariant)(!this.initiating, "Initiation in progress.", {
+      F: __dxlog_file2,
       L: 164,
       S: this,
       A: [
@@ -1428,8 +1196,8 @@ var Peer = class {
         "'Initiation in progress.'"
       ]
     });
-    (0, import_invariant3.invariant)(!this.connection, "Already connected.", {
-      F: __dxlog_file3,
+    (0, import_invariant2.invariant)(!this.connection, "Already connected.", {
+      F: __dxlog_file2,
       L: 165,
       S: this,
       A: [
@@ -1437,14 +1205,14 @@ var Peer = class {
         "'Already connected.'"
       ]
     });
-    const sessionId = import_keys3.PublicKey.random();
-    (0, import_log3.log)("initiating...", {
+    const sessionId = import_keys2.PublicKey.random();
+    (0, import_log2.log)("initiating...", {
       id: this.id,
       topic: this.topic,
       peerId: this.id,
       sessionId
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 167,
       S: this,
       C: (f, a) => f(...a)
@@ -1463,20 +1231,20 @@ var Peer = class {
           offer: {}
         }
       });
-      (0, import_log3.log)("received", {
+      (0, import_log2.log)("received", {
         answer,
         topic: this.topic,
         ownId: this.localPeerId,
         remoteId: this.id
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file2,
         L: 183,
         S: this,
         C: (f, a) => f(...a)
       });
       if (connection.state !== ConnectionState.INITIAL) {
-        (0, import_log3.log)("ignoring response", void 0, {
-          F: __dxlog_file3,
+        (0, import_log2.log)("ignoring response", void 0, {
+          F: __dxlog_file2,
           L: 185,
           S: this,
           C: (f, a) => f(...a)
@@ -1490,18 +1258,18 @@ var Peer = class {
       await connection.openConnection();
       this._callbacks.onAccepted();
     } catch (err) {
-      (0, import_log3.log)("initiation error", {
+      (0, import_log2.log)("initiation error", {
         err,
         topic: this.topic,
         peerId: this.localPeerId,
         remoteId: this.id
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file2,
         L: 196,
         S: this,
         C: (f, a) => f(...a)
       });
-      if (err instanceof import_protocols3.TimeoutError) {
+      if (err instanceof import_protocols2.TimeoutError) {
         await connection.abort(err);
       }
       await this.closeConnection(err);
@@ -1515,20 +1283,20 @@ var Peer = class {
   * Either we're initiating a connection or creating one in response to an offer from the other peer.
   */
   _createConnection(initiator, sessionId) {
-    (0, import_log3.log)("creating connection", {
+    (0, import_log2.log)("creating connection", {
       topic: this.topic,
       peerId: this.localPeerId,
       remoteId: this.id,
       initiator,
       sessionId
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 213,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant3.invariant)(!this.connection, "Already connected.", {
-      F: __dxlog_file3,
+    (0, import_invariant2.invariant)(!this.connection, "Already connected.", {
+      F: __dxlog_file2,
       L: 220,
       S: this,
       A: [
@@ -1557,34 +1325,34 @@ var Peer = class {
           this._lastConnectionTime = Date.now();
           this._callbacks.onConnected();
           this._connectionLimiter.doneConnecting(sessionId);
-          import_log3.log.trace("dxos.mesh.connection.connected", {
+          import_log2.log.trace("dxos.mesh.connection.connected", {
             topic: this.topic,
             localPeerId: this.localPeerId,
             remotePeerId: this.id,
             sessionId,
             initiator
           }, {
-            F: __dxlog_file3,
+            F: __dxlog_file2,
             L: 239,
             S: this,
             C: (f, a) => f(...a)
           });
         },
         onClosed: (err) => {
-          (0, import_log3.log)("connection closed", {
+          (0, import_log2.log)("connection closed", {
             topic: this.topic,
             peerId: this.localPeerId,
             remoteId: this.id,
             initiator
           }, {
-            F: __dxlog_file3,
+            F: __dxlog_file2,
             L: 248,
             S: this,
             C: (f, a) => f(...a)
           });
           this._connectionLimiter.doneConnecting(sessionId);
-          (0, import_invariant3.invariant)(this.connection === connection, "Connection mismatch (race condition).", {
-            F: __dxlog_file3,
+          (0, import_invariant2.invariant)(this.connection === connection, "Connection mismatch (race condition).", {
+            F: __dxlog_file2,
             L: 253,
             S: this,
             A: [
@@ -1592,14 +1360,14 @@ var Peer = class {
               "'Connection mismatch (race condition).'"
             ]
           });
-          import_log3.log.trace("dxos.mesh.connection.closed", {
+          import_log2.log.trace("dxos.mesh.connection.closed", {
             topic: this.topic,
             localPeerId: this.localPeerId,
             remotePeerId: this.id,
             sessionId,
             initiator
           }, {
-            F: __dxlog_file3,
+            F: __dxlog_file2,
             L: 255,
             S: this,
             C: (f, a) => f(...a)
@@ -1627,19 +1395,19 @@ var Peer = class {
     void this._connectionCtx?.dispose();
     this._connectionCtx = this._ctx.derive();
     connection.errors.handle((err) => {
-      import_log3.log.warn("connection error", {
+      import_log2.log.warn("connection error", {
         topic: this.topic,
         peerId: this.localPeerId,
         remoteId: this.id,
         initiator,
         err
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file2,
         L: 295,
         S: this,
         C: (f, a) => f(...a)
       });
-      import_log3.log.trace("dxos.mesh.connection.error", {
+      import_log2.log.trace("dxos.mesh.connection.error", {
         topic: this.topic,
         localPeerId: this.localPeerId,
         remotePeerId: this.id,
@@ -1647,7 +1415,7 @@ var Peer = class {
         initiator,
         err
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file2,
         L: 296,
         S: this,
         C: (f, a) => f(...a)
@@ -1662,21 +1430,21 @@ var Peer = class {
       return;
     }
     const connection = this.connection;
-    (0, import_log3.log)("closing...", {
+    (0, import_log2.log)("closing...", {
       peerId: this.id,
       sessionId: connection.sessionId
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 321,
       S: this,
       C: (f, a) => f(...a)
     });
     await connection.close(err);
-    (0, import_log3.log)("closed", {
+    (0, import_log2.log)("closed", {
       peerId: this.id,
       sessionId: connection.sessionId
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 327,
       S: this,
       C: (f, a) => f(...a)
@@ -1684,10 +1452,10 @@ var Peer = class {
   }
   async onSignal(message) {
     if (!this.connection) {
-      (0, import_log3.log)("dropping signal message for non-existent connection", {
+      (0, import_log2.log)("dropping signal message for non-existent connection", {
         message
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file2,
         L: 332,
         S: this,
         C: (f, a) => f(...a)
@@ -1698,11 +1466,11 @@ var Peer = class {
   }
   async destroy() {
     await this._ctx.dispose();
-    (0, import_log3.log)("Destroying peer", {
+    (0, import_log2.log)("Destroying peer", {
       peerId: this.id,
       topic: this.topic
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 342,
       S: this,
       C: (f, a) => f(...a)
@@ -1726,6 +1494,238 @@ var increaseInterval = (interval) => {
   return 1e4;
 };
 
+// packages/core/mesh/network-manager/src/signal/swarm-messenger.ts
+var import_context3 = require("@dxos/context");
+var import_invariant3 = require("@dxos/invariant");
+var import_keys3 = require("@dxos/keys");
+var import_log3 = require("@dxos/log");
+var import_protocols3 = require("@dxos/protocols");
+var import_util = require("@dxos/util");
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/signal/swarm-messenger.ts";
+var SwarmMessage = import_protocols3.schema.getCodecForType("dxos.mesh.swarm.SwarmMessage");
+var SwarmMessenger = class {
+  constructor({ sendMessage, onSignal, onOffer, topic }) {
+    this._ctx = new import_context3.Context();
+    this._offerRecords = new import_util.ComplexMap((key) => key.toHex());
+    this._sendMessage = sendMessage;
+    this._onSignal = onSignal;
+    this._onOffer = onOffer;
+    this._topic = topic;
+  }
+  async receiveMessage({ author, recipient, payload }) {
+    if (payload.type_url !== "dxos.mesh.swarm.SwarmMessage") {
+      return;
+    }
+    const message = SwarmMessage.decode(payload.value);
+    if (!this._topic.equals(message.topic)) {
+      return;
+    }
+    (0, import_log3.log)("received", {
+      from: author,
+      to: recipient,
+      msg: message
+    }, {
+      F: __dxlog_file3,
+      L: 69,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    if (message.data?.offer) {
+      await this._handleOffer({
+        author,
+        recipient,
+        message
+      });
+    } else if (message.data?.answer) {
+      await this._resolveAnswers(message);
+    } else if (message.data?.signal) {
+      await this._handleSignal({
+        author,
+        recipient,
+        message
+      });
+    } else if (message.data?.signalBatch) {
+      await this._handleSignal({
+        author,
+        recipient,
+        message
+      });
+    } else {
+      import_log3.log.warn("unknown message", {
+        message
+      }, {
+        F: __dxlog_file3,
+        L: 80,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+  }
+  async signal(message) {
+    (0, import_invariant3.invariant)(message.data?.signal || message.data?.signalBatch, "Invalid message", {
+      F: __dxlog_file3,
+      L: 85,
+      S: this,
+      A: [
+        "message.data?.signal || message.data?.signalBatch",
+        "'Invalid message'"
+      ]
+    });
+    await this._sendReliableMessage({
+      author: message.author,
+      recipient: message.recipient,
+      message
+    });
+  }
+  async offer(message) {
+    const networkMessage = {
+      ...message,
+      messageId: import_keys3.PublicKey.random()
+    };
+    return new Promise((resolve, reject) => {
+      this._offerRecords.set(networkMessage.messageId, {
+        resolve
+      });
+      this._sendReliableMessage({
+        author: message.author,
+        recipient: message.recipient,
+        message: networkMessage
+      }).catch((err) => reject(err));
+    });
+  }
+  async _sendReliableMessage({ author, recipient, message }) {
+    const networkMessage = {
+      ...message,
+      // Setting unique message_id if it not specified yet.
+      messageId: message.messageId ?? import_keys3.PublicKey.random()
+    };
+    (0, import_log3.log)("sending", {
+      from: author,
+      to: recipient,
+      msg: networkMessage
+    }, {
+      F: __dxlog_file3,
+      L: 123,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    await this._sendMessage({
+      author,
+      recipient,
+      payload: {
+        type_url: "dxos.mesh.swarm.SwarmMessage",
+        value: SwarmMessage.encode(networkMessage)
+      }
+    });
+  }
+  async _resolveAnswers(message) {
+    (0, import_invariant3.invariant)(message.data?.answer?.offerMessageId, "No offerMessageId", {
+      F: __dxlog_file3,
+      L: 135,
+      S: this,
+      A: [
+        "message.data?.answer?.offerMessageId",
+        "'No offerMessageId'"
+      ]
+    });
+    const offerRecord = this._offerRecords.get(message.data.answer.offerMessageId);
+    if (offerRecord) {
+      this._offerRecords.delete(message.data.answer.offerMessageId);
+      (0, import_invariant3.invariant)(message.data?.answer, "No answer", {
+        F: __dxlog_file3,
+        L: 139,
+        S: this,
+        A: [
+          "message.data?.answer",
+          "'No answer'"
+        ]
+      });
+      (0, import_log3.log)("resolving", {
+        answer: message.data.answer
+      }, {
+        F: __dxlog_file3,
+        L: 140,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      offerRecord.resolve(message.data.answer);
+    }
+  }
+  async _handleOffer({ author, recipient, message }) {
+    (0, import_invariant3.invariant)(message.data.offer, "No offer", {
+      F: __dxlog_file3,
+      L: 154,
+      S: this,
+      A: [
+        "message.data.offer",
+        "'No offer'"
+      ]
+    });
+    const offerMessage = {
+      author,
+      recipient,
+      ...message,
+      data: {
+        offer: message.data.offer
+      }
+    };
+    const answer = await this._onOffer(offerMessage);
+    answer.offerMessageId = message.messageId;
+    try {
+      await this._sendReliableMessage({
+        author: recipient,
+        recipient: author,
+        message: {
+          topic: message.topic,
+          sessionId: message.sessionId,
+          data: {
+            answer
+          }
+        }
+      });
+    } catch (err) {
+      import_log3.log.warn("error sending answer", {
+        err
+      }, {
+        F: __dxlog_file3,
+        L: 174,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+  }
+  async _handleSignal({ author, recipient, message }) {
+    (0, import_invariant3.invariant)(message.messageId, void 0, {
+      F: __dxlog_file3,
+      L: 187,
+      S: this,
+      A: [
+        "message.messageId",
+        ""
+      ]
+    });
+    (0, import_invariant3.invariant)(message.data.signal || message.data.signalBatch, "Invalid message", {
+      F: __dxlog_file3,
+      L: 188,
+      S: this,
+      A: [
+        "message.data.signal || message.data.signalBatch",
+        "'Invalid message'"
+      ]
+    });
+    const signalMessage = {
+      author,
+      recipient,
+      ...message,
+      data: {
+        signal: message.data.signal,
+        signalBatch: message.data.signalBatch
+      }
+    };
+    await this._onSignal(signalMessage);
+  }
+};
+
 // packages/core/mesh/network-manager/src/swarm/swarm.ts
 function _ts_decorate3(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -2216,7 +2216,6 @@ var SwarmMapper = class {
   get peers() {
     return Array.from(this._peers.values());
   }
-  // prettier-ignore
   constructor(_swarm) {
     this._swarm = _swarm;
     this._subscriptions = new import_async4.EventSubscriptions();
@@ -2239,7 +2238,7 @@ var SwarmMapper = class {
   _update() {
     (0, import_log5.log)("updating swarm", void 0, {
       F: __dxlog_file5,
-      L: 75,
+      L: 72,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2263,7 +2262,7 @@ var SwarmMapper = class {
       totalPeersInSwarm: this._peers.size
     }, {
       F: __dxlog_file5,
-      L: 116,
+      L: 113,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2823,7 +2822,6 @@ var import_invariant9 = require("@dxos/invariant");
 var import_log9 = require("@dxos/log");
 var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/star-topology.ts";
 var StarTopology = class {
-  // prettier-ignore
   constructor(_centralPeer) {
     this._centralPeer = _centralPeer;
   }
@@ -2833,7 +2831,7 @@ var StarTopology = class {
   init(controller) {
     (0, import_invariant9.invariant)(!this._controller, "Already initialized.", {
       F: __dxlog_file10,
-      L: 24,
+      L: 21,
       S: this,
       A: [
         "!this._controller",
@@ -2845,7 +2843,7 @@ var StarTopology = class {
   update() {
     (0, import_invariant9.invariant)(this._controller, "Not initialized.", {
       F: __dxlog_file10,
-      L: 29,
+      L: 26,
       S: this,
       A: [
         "this._controller",
@@ -2856,7 +2854,7 @@ var StarTopology = class {
     if (!ownPeerId.equals(this._centralPeer)) {
       (0, import_log9.log)("leaf peer dropping all connections apart from central peer.", void 0, {
         F: __dxlog_file10,
-        L: 32,
+        L: 29,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2866,7 +2864,7 @@ var StarTopology = class {
             peer
           }, {
             F: __dxlog_file10,
-            L: 37,
+            L: 34,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2880,7 +2878,7 @@ var StarTopology = class {
           peer
         }, {
           F: __dxlog_file10,
-          L: 46,
+          L: 43,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2891,7 +2889,7 @@ var StarTopology = class {
   async onOffer(peer) {
     (0, import_invariant9.invariant)(this._controller, "Not initialized.", {
       F: __dxlog_file10,
-      L: 53,
+      L: 50,
       S: this,
       A: [
         "this._controller",
@@ -2905,7 +2903,7 @@ var StarTopology = class {
       isSelfCentral: ownPeerId.equals(this._centralPeer)
     }, {
       F: __dxlog_file10,
-      L: 55,
+      L: 52,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3197,9 +3195,13 @@ var SimplePeerTransport = class {
         } else {
           this.errors.raise(new import_protocols7.UnknownProtocolError("unknown RTCError", err));
         }
-      } else if (err.name === "InvalidStateError") {
-        this.errors.raise(new import_protocols7.ConnectionResetError("safari WebRTC error", err));
       } else if ("code" in err) {
+        import_log11.log.info("simple-peer error", err, {
+          F: __dxlog_file12,
+          L: 77,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         switch (err.code) {
           case "ERR_WEBRTC_SUPPORT":
             this.errors.raise(new import_protocols7.ProtocolError("WebRTC not supported", err));
@@ -3218,17 +3220,23 @@ var SimplePeerTransport = class {
             this.errors.raise(new Error("unknown simple-peer error"));
         }
       } else {
+        import_log11.log.info("unknown peer connection error", err, {
+          F: __dxlog_file12,
+          L: 96,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         this.errors.raise(err);
       }
       try {
-        if (typeof this._peer?._pc.getStats === "function") {
+        if (typeof this._peer?._pc?.getStats === "function") {
           this._peer._pc.getStats().then((stats) => {
             import_log11.log.warn("report after webrtc error", {
               config: this.params.webrtcConfig,
               stats
             }, {
               F: __dxlog_file12,
-              L: 106,
+              L: 104,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3237,7 +3245,7 @@ var SimplePeerTransport = class {
       } catch (err2) {
         import_log11.log.catch(err2, void 0, {
           F: __dxlog_file12,
-          L: 113,
+          L: 111,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3248,7 +3256,7 @@ var SimplePeerTransport = class {
       id: this._instanceId
     }), {
       F: __dxlog_file12,
-      L: 118,
+      L: 116,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3256,7 +3264,7 @@ var SimplePeerTransport = class {
   async destroy() {
     (0, import_log11.log)("closing...", void 0, {
       F: __dxlog_file12,
-      L: 122,
+      L: 120,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3266,7 +3274,7 @@ var SimplePeerTransport = class {
     this.closed.emit();
     (0, import_log11.log)("closed", void 0, {
       F: __dxlog_file12,
-      L: 127,
+      L: 125,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3299,7 +3307,6 @@ var import_bridge = require("@dxos/protocols/proto/dxos/mesh/bridge");
 var import_util8 = require("@dxos/util");
 var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/simplepeer-transport-service.ts";
 var SimplePeerTransportService = class {
-  // prettier-ignore
   constructor(_webrtcConfig) {
     this._webrtcConfig = _webrtcConfig;
     this.transports = new import_util8.ComplexMap(import_keys11.PublicKey.hash);
@@ -3379,7 +3386,7 @@ var SimplePeerTransportService = class {
   async sendSignal({ proxyId, signal }) {
     (0, import_invariant11.invariant)(this.transports.has(proxyId), void 0, {
       F: __dxlog_file13,
-      L: 113,
+      L: 110,
       S: this,
       A: [
         "this.transports.has(proxyId)",
@@ -3391,7 +3398,7 @@ var SimplePeerTransportService = class {
   async sendData({ proxyId, payload }) {
     (0, import_invariant11.invariant)(this.transports.has(proxyId), void 0, {
       F: __dxlog_file13,
-      L: 118,
+      L: 115,
       S: this,
       A: [
         "this.transports.has(proxyId)",
@@ -3412,7 +3419,7 @@ var SimplePeerTransportService = class {
     this.transports.delete(proxyId);
     (0, import_log12.log)("Closed.", void 0, {
       F: __dxlog_file13,
-      L: 132,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3432,7 +3439,6 @@ var import_bridge2 = require("@dxos/protocols/proto/dxos/mesh/bridge");
 var import_util9 = require("@dxos/util");
 var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/simplepeer-transport-proxy.ts";
 var SimplePeerTransportProxy = class {
-  // prettier-ignore
   constructor(_params) {
     this._params = _params;
     this._proxyId = import_keys12.PublicKey.random();
@@ -3449,7 +3455,7 @@ var SimplePeerTransportProxy = class {
       this._serviceStream.subscribe(async (event) => {
         (0, import_log13.log)("SimplePeerTransportProxy: event", event, {
           F: __dxlog_file14,
-          L: 58,
+          L: 55,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3478,7 +3484,7 @@ var SimplePeerTransportProxy = class {
       }));
     }, (error) => import_log13.log.catch(error, void 0, {
       F: __dxlog_file14,
-      L: 82,
+      L: 83,
       S: this,
       C: (f, a) => f(...a)
     }));
@@ -3524,7 +3530,7 @@ var SimplePeerTransportProxy = class {
     } catch (err) {
       import_log13.log.catch(err, void 0, {
         F: __dxlog_file14,
-        L: 133,
+        L: 134,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3560,7 +3566,7 @@ var SimplePeerTransportProxyFactory = class {
   createTransport(options) {
     (0, import_invariant12.invariant)(this._bridgeService, "SimplePeerTransportProxyFactory is not ready to open connections", {
       F: __dxlog_file14,
-      L: 170,
+      L: 171,
       S: this,
       A: [
         "this._bridgeService",
@@ -3578,15 +3584,15 @@ var SimplePeerTransportProxyFactory = class {
 };
 var decodeError = (err) => {
   const message = typeof err === "string" ? err : err.message;
-  if (message.includes("ConnectionResetError")) {
+  if (message.includes("CONNECTION_RESET")) {
     return new import_protocols8.ConnectionResetError(message);
-  } else if (message.includes("TimeoutError")) {
+  } else if (message.includes("TIMEOUT")) {
     return new import_protocols8.TimeoutError(message);
-  } else if (message.includes("ProtocolError")) {
+  } else if (message.includes("PROTOCOL_ERROR")) {
     return new import_protocols8.ProtocolError(message);
-  } else if (message.includes("ConnectivityError")) {
+  } else if (message.includes("CONNECTIVITY_ERROR")) {
     return new import_protocols8.ConnectivityError(message);
-  } else if (message.includes("UnknownProtocolError")) {
+  } else if (message.includes("UNKNOWN_PROTOCOL_ERROR")) {
     return new import_protocols8.UnknownProtocolError(message);
   } else {
     return typeof err === "string" ? new Error(err) : err;