@dxos/network-manager 0.1.41 → 0.1.45-next.45667d4

package/dist/lib/browser/{chunk-JAQBUAX3.mjs → chunk-UTCOIPSK.mjs}

@@ -73,9 +73,6 @@ var Connection = class {
     this.stateChanged = new Event();
     this.errors = new ErrorStream();
     this._instanceId = PublicKey.random().toHex();
-    this._performance = {
-      signalsSent: 0
-    };
   }
   get state() {
     return this._state;
@@ -92,23 +89,22 @@ var Connection = class {
   // TODO(burdon): Make async?
   openConnection() {
     assert(this._state === ConnectionState.INITIAL, "Invalid state.");
-    this._changeState(ConnectionState.CONNECTING);
-    log.trace("dxos.mesh.connection", trace.begin({
-      id: this._instanceId,
-      parentId: this._traceParent
+    log.trace("dxos.mesh.connection.open-connection", trace.begin({
+      id: this._instanceId
     }), {
       file: "connection.ts",
-      line: 97,
+      line: 92,
       scope: this,
       callSite: (f, a) => f(...a)
     });
+    this._changeState(ConnectionState.CONNECTING);
     this._protocol.initialize().catch((err) => {
       this.errors.raise(err);
     });
     this._protocol.stream.on("close", () => {
       log("protocol stream closed", {}, {
         file: "connection.ts",
-        line: 106,
+        line: 103,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -118,18 +114,15 @@ var Connection = class {
     this._transport = this._transportFactory.createTransport({
       initiator: this.initiator,
       stream: this._protocol.stream,
-      sendSignal: async (signal) => {
-        this._performance.signalsSent++;
-        await this._signalMessaging.signal({
-          author: this.ownId,
-          recipient: this.remoteId,
-          sessionId: this.sessionId,
-          topic: this.topic,
-          data: {
-            signal
-          }
-        });
-      }
+      sendSignal: async (signal) => this._signalMessaging.signal({
+        author: this.ownId,
+        recipient: this.remoteId,
+        sessionId: this.sessionId,
+        topic: this.topic,
+        data: {
+          signal
+        }
+      })
     });
     this._transport.connected.once(() => {
       this._changeState(ConnectionState.CONNECTED);
@@ -147,6 +140,14 @@ var Connection = class {
       void this._transport.signal(signal);
     }
     this._bufferedSignals = [];
+    log.trace("dxos.mesh.connection.open-connection", trace.end({
+      id: this._instanceId
+    }), {
+      file: "connection.ts",
+      line: 143,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
   }
   async close() {
     var _a;
@@ -158,7 +159,7 @@ var Connection = class {
       peerId: this.ownId
     }, {
       file: "connection.ts",
-      line: 156,
+      line: 153,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -167,7 +168,7 @@ var Connection = class {
     } catch (err) {
       log.catch(err, {}, {
         file: "connection.ts",
-        line: 162,
+        line: 159,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -177,7 +178,7 @@ var Connection = class {
     } catch (err1) {
       log.catch(err1, {}, {
         file: "connection.ts",
-        line: 169,
+        line: 166,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -186,23 +187,11 @@ var Connection = class {
       peerId: this.ownId
     }, {
       file: "connection.ts",
-      line: 172,
+      line: 169,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     this._changeState(ConnectionState.CLOSED);
-    log.trace("dxos.mesh.connection", trace.end({
-      id: this._instanceId,
-      status: "ok",
-      data: {
-        performance: this._performance
-      }
-    }), {
-      file: "connection.ts",
-      line: 174,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
   }
   async signal(msg) {
     var _a, _b;
@@ -210,7 +199,7 @@ var Connection = class {
     if (!msg.sessionId.equals(this.sessionId)) {
       log("dropping signal for incorrect session id", {}, {
         file: "connection.ts",
-        line: 183,
+        line: 176,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -226,7 +215,7 @@ var Connection = class {
         msg: msg.data
       }, {
         file: "connection.ts",
-        line: 191,
+        line: 184,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -240,7 +229,7 @@ var Connection = class {
       msg: msg.data
     }, {
       file: "connection.ts",
-      line: 197,
+      line: 190,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -253,7 +242,7 @@ var Connection = class {
       peerId: this.ownId
     }, {
       file: "connection.ts",
-      line: 202,
+      line: 195,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -486,7 +475,7 @@ var Peer = class {
           peerId: this.localPeerId
         }, {
           file: "peer.ts",
-          line: 107,
+          line: 105,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -513,7 +502,7 @@ var Peer = class {
             err
           }, {
             file: "peer.ts",
-            line: 131,
+            line: 129,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -542,7 +531,7 @@ var Peer = class {
       sessionId
     }, {
       file: "peer.ts",
-      line: 149,
+      line: 147,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -565,14 +554,14 @@ var Peer = class {
         remoteId: this.id
       }, {
         file: "peer.ts",
-        line: 161,
+        line: 159,
         scope: this,
         callSite: (f, a) => f(...a)
       });
       if (connection.state !== ConnectionState.INITIAL) {
         log3("ignoring response", {}, {
           file: "peer.ts",
-          line: 163,
+          line: 161,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -592,7 +581,7 @@ var Peer = class {
         err
       }, {
         file: "peer.ts",
-        line: 174,
+        line: 172,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -616,7 +605,7 @@ var Peer = class {
       sessionId
     }, {
       file: "peer.ts",
-      line: 188,
+      line: 186,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -637,7 +626,6 @@ var Peer = class {
       }),
       this._transportFactory
     );
-    connection._traceParent = this._traceParent;
     this._callbacks.onInitiated(connection);
     void ((_a = this._connectionCtx) == null ? void 0 : _a.dispose());
     this._connectionCtx = this._ctx.derive();
@@ -657,7 +645,7 @@ var Peer = class {
             initiator
           }, {
             file: "peer.ts",
-            line: 224,
+            line: 221,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -687,7 +675,7 @@ var Peer = class {
         err
       }, {
         file: "peer.ts",
-        line: 252,
+        line: 249,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -706,7 +694,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       file: "peer.ts",
-      line: 268,
+      line: 265,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -716,7 +704,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       file: "peer.ts",
-      line: 274,
+      line: 271,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -727,7 +715,7 @@ var Peer = class {
         message
       }, {
         file: "peer.ts",
-        line: 279,
+        line: 276,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -743,7 +731,7 @@ var Peer = class {
       topic: this.topic
     }, {
       file: "peer.ts",
-      line: 288,
+      line: 285,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -797,11 +785,23 @@ var Swarm = class {
     this.connected = new Event2();
     this.errors = new ErrorStream2();
     this._instanceId = PublicKey4.random().toHex();
+    log4.trace("dxos.mesh.swarm.constructor", trace2.begin({
+      id: this._instanceId,
+      data: {
+        topic: this._topic.toHex(),
+        peerId: this._ownPeerId.toHex()
+      }
+    }), {
+      file: "swarm.ts",
+      line: 84,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
     log4("creating swarm", {
       peerId: _ownPeerId
     }, {
       file: "swarm.ts",
-      line: 84,
+      line: 88,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -818,19 +818,15 @@ var Swarm = class {
       onMessage: async (message) => await this._swarmMessenger.receiveMessage(message)
     }).catch((error) => log4.catch(error, {}, {
       file: "swarm.ts",
-      line: 100,
+      line: 104,
       scope: this,
       callSite: (f, a) => f(...a)
     }));
-    log4.trace("dxos.mesh.swarm", trace2.begin({
-      id: this._instanceId,
-      data: {
-        topic: this._topic.toHex(),
-        peerId: this._ownPeerId.toHex()
-      }
+    log4.trace("dxos.mesh.swarm.constructor", trace2.end({
+      id: this._instanceId
     }), {
       file: "swarm.ts",
-      line: 102,
+      line: 106,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -854,7 +850,7 @@ var Swarm = class {
   async destroy() {
     log4("destroying...", {}, {
       file: "swarm.ts",
-      line: 133,
+      line: 134,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -862,14 +858,6 @@ var Swarm = class {
     await this._topology.destroy();
     await Promise.all(Array.from(this._peers.keys()).map((key) => this._destroyPeer(key)));
     log4("destroyed", {}, {
-      file: "swarm.ts",
-      line: 137,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-    log4.trace("dxos.mesh.swarm", trace2.end({
-      id: this._instanceId
-    }), {
       file: "swarm.ts",
       line: 138,
       scope: this,
@@ -1065,7 +1053,6 @@ var Swarm = class {
           this._topology.update();
         }
       });
-      peer._traceParent = this._instanceId;
       this._peers.set(peerId, peer);
     }
     return peer;
@@ -1092,7 +1079,7 @@ var Swarm = class {
           } catch (err) {
             log4.warn("initiation error", err, {
               file: "swarm.ts",
-              line: 320,
+              line: 319,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1120,7 +1107,7 @@ var Swarm = class {
         remoteId
       }, {
         file: "swarm.ts",
-        line: 347,
+        line: 346,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1137,7 +1124,7 @@ var Swarm = class {
       remoteId
     }, {
       file: "swarm.ts",
-      line: 361,
+      line: 360,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1147,7 +1134,7 @@ var Swarm = class {
       remoteId
     }, {
       file: "swarm.ts",
-      line: 364,
+      line: 363,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1337,7 +1324,6 @@ var NetworkManager = class {
     this.connectionStateChanged = new Event5();
     this.topicsUpdated = new Event5();
     this._instanceId = PublicKey7.random().toHex();
-    signalManager._traceParent = this._instanceId;
     this._transportFactory = transportFactory;
     this._signalManager = signalManager;
     this._signalManager.swarmEvent.on(({ topic, swarmEvent: event }) => {
@@ -1347,7 +1333,6 @@ var NetworkManager = class {
     this._messenger = new Messenger({
       signalManager: this._signalManager
     });
-    this._messenger._traceParent = this._instanceId;
     this._signalConnection = {
       join: (opts) => this._signalManager.join(opts),
       leave: (opts) => this._signalManager.leave(opts)
@@ -1360,10 +1345,6 @@ var NetworkManager = class {
   get connectionLog() {
     return this._connectionLog;
   }
-  // TODO(burdon): Remove access (Devtools only).
-  get signalManager() {
-    return this._signalManager;
-  }
   get connectionState() {
     return this._connectionState;
   }
@@ -1378,24 +1359,31 @@ var NetworkManager = class {
     return this._swarms.get(topic);
   }
   async open() {
-    log6.trace("dxos.mesh.network-manager", trace3.begin({
-      id: this._instanceId,
-      parentId: this._traceParent
+    log6.trace("dxos.mesh.network-manager.open", trace3.begin({
+      id: this._instanceId
     }), {
       file: "network-manager.ts",
-      line: 135,
+      line: 127,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     await this._messenger.open();
     await this._signalManager.open();
+    log6.trace("dxos.mesh.network-manager.open", trace3.end({
+      id: this._instanceId
+    }), {
+      file: "network-manager.ts",
+      line: 130,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
   }
   async close() {
     for (const topic of this._swarms.keys()) {
       await this.leaveSwarm(topic).catch((err) => {
         log6(err, {}, {
           file: "network-manager.ts",
-          line: 143,
+          line: 136,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -1403,14 +1391,6 @@ var NetworkManager = class {
     }
     await this._messenger.close();
     await this._signalManager.close();
-    log6.trace("dxos.mesh.network-manager", trace3.end({
-      id: this._instanceId
-    }), {
-      file: "network-manager.ts",
-      line: 149,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
   }
   /**
   * Join the swarm.
@@ -1430,7 +1410,7 @@ var NetworkManager = class {
       topology: topology.toString()
     }, {
       file: "network-manager.ts",
-      line: 170,
+      line: 162,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1440,7 +1420,7 @@ var NetworkManager = class {
         error
       }, {
         file: "network-manager.ts",
-        line: 173,
+        line: 165,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1451,7 +1431,7 @@ var NetworkManager = class {
       peerId
     }).catch((error) => log6.catch(error, {}, {
       file: "network-manager.ts",
-      line: 177,
+      line: 169,
       scope: this,
       callSite: (f, a) => f(...a)
     }));
@@ -1463,7 +1443,7 @@ var NetworkManager = class {
       count: this._swarms.size
     }, {
       file: "network-manager.ts",
-      line: 182,
+      line: 174,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1477,21 +1457,13 @@ var NetworkManager = class {
   async leaveSwarm(topic) {
     var _a;
     if (!this._swarms.has(topic)) {
-      log6.warn("swarm not open", {
-        topic: PublicKey7.from(topic).truncate()
-      }, {
-        file: "network-manager.ts",
-        line: 194,
-        scope: this,
-        callSite: (f, a) => f(...a)
-      });
       return;
     }
     log6("leaving", {
       topic: PublicKey7.from(topic)
     }, {
       file: "network-manager.ts",
-      line: 198,
+      line: 190,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1512,7 +1484,7 @@ var NetworkManager = class {
       count: this._swarms.size
     }, {
       file: "network-manager.ts",
-      line: 212,
+      line: 204,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1913,21 +1885,17 @@ var WebRTCTransport = class {
     this.connected = new Event7();
     this.errors = new ErrorStream4();
     this._instanceId = PublicKey9.random().toHex();
-    this._performance = {
-      bytesSent: 0,
-      bytesReceived: 0
-    };
-    log10.trace("dxos.mesh.webrtc-transport", trace4.begin({
+    log10.trace("dxos.mesh.webrtc-transport.constructor", trace4.begin({
       id: this._instanceId
     }), {
       file: "webrtc-transport.ts",
-      line: 43,
+      line: 39,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     log10("created connection", params, {
       file: "webrtc-transport.ts",
-      line: 44,
+      line: 40,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1939,7 +1907,7 @@ var WebRTCTransport = class {
     this._peer.on("signal", async (data) => {
       log10("signal", data, {
         file: "webrtc-transport.ts",
-        line: 52,
+        line: 48,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1952,7 +1920,7 @@ var WebRTCTransport = class {
     this._peer.on("connect", () => {
       log10("connected", {}, {
         file: "webrtc-transport.ts",
-        line: 57,
+        line: 53,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1962,7 +1930,7 @@ var WebRTCTransport = class {
     this._peer.on("close", async () => {
       log10("closed", {}, {
         file: "webrtc-transport.ts",
-        line: 63,
+        line: 59,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1980,7 +1948,7 @@ var WebRTCTransport = class {
               stats
             }, {
               file: "webrtc-transport.ts",
-              line: 75,
+              line: 71,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1990,11 +1958,19 @@ var WebRTCTransport = class {
       }
       await this.destroy();
     });
+    log10.trace("dxos.mesh.webrtc-transport.constructor", trace4.end({
+      id: this._instanceId
+    }), {
+      file: "webrtc-transport.ts",
+      line: 81,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
   }
   async destroy() {
     log10("closing...", {}, {
       file: "webrtc-transport.ts",
-      line: 88,
+      line: 85,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2004,18 +1980,7 @@ var WebRTCTransport = class {
     this.closed.emit();
     log10("closed", {}, {
       file: "webrtc-transport.ts",
-      line: 93,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-    log10.trace("dxos.mesh.webrtc-transport", trace4.end({
-      id: this._instanceId,
-      data: {
-        performance: this._performance
-      }
-    }), {
-      file: "webrtc-transport.ts",
-      line: 94,
+      line: 90,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2327,4 +2292,4 @@ export {
   WebRTCTransportProxyFactory,
   createTeleportProtocolFactory
 };
-//# sourceMappingURL=chunk-JAQBUAX3.mjs.map
+//# sourceMappingURL=chunk-UTCOIPSK.mjs.map