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

package/dist/lib/node/index.cjs

@@ -124,9 +124,6 @@ var Connection = class {
     this.stateChanged = new import_async.Event();
     this.errors = new import_debug.ErrorStream();
     this._instanceId = import_keys.PublicKey.random().toHex();
-    this._performance = {
-      signalsSent: 0
-    };
   }
   get state() {
     return this._state;
@@ -143,23 +140,22 @@ var Connection = class {
   // TODO(burdon): Make async?
   openConnection() {
     (0, import_node_assert.default)(this._state === ConnectionState.INITIAL, "Invalid state.");
-    this._changeState(ConnectionState.CONNECTING);
-    import_log.log.trace("dxos.mesh.connection", import_protocols.trace.begin({
-      id: this._instanceId,
-      parentId: this._traceParent
+    import_log.log.trace("dxos.mesh.connection.open-connection", import_protocols.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", () => {
       (0, import_log.log)("protocol stream closed", {}, {
         file: "connection.ts",
-        line: 106,
+        line: 103,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -169,18 +165,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);
@@ -198,6 +191,14 @@ var Connection = class {
       void this._transport.signal(signal);
     }
     this._bufferedSignals = [];
+    import_log.log.trace("dxos.mesh.connection.open-connection", import_protocols.trace.end({
+      id: this._instanceId
+    }), {
+      file: "connection.ts",
+      line: 143,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
   }
   async close() {
     var _a;
@@ -209,7 +210,7 @@ var Connection = class {
       peerId: this.ownId
     }, {
       file: "connection.ts",
-      line: 156,
+      line: 153,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -218,7 +219,7 @@ var Connection = class {
     } catch (err) {
       import_log.log.catch(err, {}, {
         file: "connection.ts",
-        line: 162,
+        line: 159,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -228,7 +229,7 @@ var Connection = class {
     } catch (err1) {
       import_log.log.catch(err1, {}, {
         file: "connection.ts",
-        line: 169,
+        line: 166,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -237,23 +238,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);
-    import_log.log.trace("dxos.mesh.connection", import_protocols.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;
@@ -261,7 +250,7 @@ var Connection = class {
     if (!msg.sessionId.equals(this.sessionId)) {
       (0, import_log.log)("dropping signal for incorrect session id", {}, {
         file: "connection.ts",
-        line: 183,
+        line: 176,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -277,7 +266,7 @@ var Connection = class {
         msg: msg.data
       }, {
         file: "connection.ts",
-        line: 191,
+        line: 184,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -291,7 +280,7 @@ var Connection = class {
       msg: msg.data
     }, {
       file: "connection.ts",
-      line: 197,
+      line: 190,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -304,7 +293,7 @@ var Connection = class {
       peerId: this.ownId
     }, {
       file: "connection.ts",
-      line: 202,
+      line: 195,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -537,7 +526,7 @@ var Peer = class {
           peerId: this.localPeerId
         }, {
           file: "peer.ts",
-          line: 107,
+          line: 105,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -564,7 +553,7 @@ var Peer = class {
             err
           }, {
             file: "peer.ts",
-            line: 131,
+            line: 129,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -593,7 +582,7 @@ var Peer = class {
       sessionId
     }, {
       file: "peer.ts",
-      line: 149,
+      line: 147,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -616,14 +605,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) {
         (0, import_log3.log)("ignoring response", {}, {
           file: "peer.ts",
-          line: 163,
+          line: 161,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -643,7 +632,7 @@ var Peer = class {
         err
       }, {
         file: "peer.ts",
-        line: 174,
+        line: 172,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -667,7 +656,7 @@ var Peer = class {
       sessionId
     }, {
       file: "peer.ts",
-      line: 188,
+      line: 186,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -688,7 +677,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();
@@ -708,7 +696,7 @@ var Peer = class {
             initiator
           }, {
             file: "peer.ts",
-            line: 224,
+            line: 221,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -738,7 +726,7 @@ var Peer = class {
         err
       }, {
         file: "peer.ts",
-        line: 252,
+        line: 249,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -757,7 +745,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       file: "peer.ts",
-      line: 268,
+      line: 265,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -767,7 +755,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       file: "peer.ts",
-      line: 274,
+      line: 271,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -778,7 +766,7 @@ var Peer = class {
         message
       }, {
         file: "peer.ts",
-        line: 279,
+        line: 276,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -794,7 +782,7 @@ var Peer = class {
       topic: this.topic
     }, {
       file: "peer.ts",
-      line: 288,
+      line: 285,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -848,11 +836,23 @@ var Swarm = class {
     this.connected = new import_async3.Event();
     this.errors = new import_debug2.ErrorStream();
     this._instanceId = import_keys4.PublicKey.random().toHex();
+    import_log4.log.trace("dxos.mesh.swarm.constructor", import_protocols3.trace.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)
+    });
     (0, import_log4.log)("creating swarm", {
       peerId: _ownPeerId
     }, {
       file: "swarm.ts",
-      line: 84,
+      line: 88,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -869,19 +869,15 @@ var Swarm = class {
       onMessage: async (message) => await this._swarmMessenger.receiveMessage(message)
     }).catch((error) => import_log4.log.catch(error, {}, {
       file: "swarm.ts",
-      line: 100,
+      line: 104,
       scope: this,
       callSite: (f, a) => f(...a)
     }));
-    import_log4.log.trace("dxos.mesh.swarm", import_protocols3.trace.begin({
-      id: this._instanceId,
-      data: {
-        topic: this._topic.toHex(),
-        peerId: this._ownPeerId.toHex()
-      }
+    import_log4.log.trace("dxos.mesh.swarm.constructor", import_protocols3.trace.end({
+      id: this._instanceId
     }), {
       file: "swarm.ts",
-      line: 102,
+      line: 106,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -905,7 +901,7 @@ var Swarm = class {
   async destroy() {
     (0, import_log4.log)("destroying...", {}, {
       file: "swarm.ts",
-      line: 133,
+      line: 134,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -913,14 +909,6 @@ var Swarm = class {
     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: 137,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-    import_log4.log.trace("dxos.mesh.swarm", import_protocols3.trace.end({
-      id: this._instanceId
-    }), {
       file: "swarm.ts",
       line: 138,
       scope: this,
@@ -1116,7 +1104,6 @@ var Swarm = class {
           this._topology.update();
         }
       });
-      peer._traceParent = this._instanceId;
       this._peers.set(peerId, peer);
     }
     return peer;
@@ -1143,7 +1130,7 @@ var Swarm = class {
           } catch (err) {
             import_log4.log.warn("initiation error", err, {
               file: "swarm.ts",
-              line: 320,
+              line: 319,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1171,7 +1158,7 @@ var Swarm = class {
         remoteId
       }, {
         file: "swarm.ts",
-        line: 347,
+        line: 346,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1188,7 +1175,7 @@ var Swarm = class {
       remoteId
     }, {
       file: "swarm.ts",
-      line: 361,
+      line: 360,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1198,7 +1185,7 @@ var Swarm = class {
       remoteId
     }, {
       file: "swarm.ts",
-      line: 364,
+      line: 363,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1384,7 +1371,6 @@ var NetworkManager = class {
     this.connectionStateChanged = new import_async6.Event();
     this.topicsUpdated = new import_async6.Event();
     this._instanceId = import_keys7.PublicKey.random().toHex();
-    signalManager._traceParent = this._instanceId;
     this._transportFactory = transportFactory;
     this._signalManager = signalManager;
     this._signalManager.swarmEvent.on(({ topic, swarmEvent: event }) => {
@@ -1394,7 +1380,6 @@ var NetworkManager = class {
     this._messenger = new import_messaging.Messenger({
       signalManager: this._signalManager
     });
-    this._messenger._traceParent = this._instanceId;
     this._signalConnection = {
       join: (opts) => this._signalManager.join(opts),
       leave: (opts) => this._signalManager.leave(opts)
@@ -1407,10 +1392,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;
   }
@@ -1425,24 +1406,31 @@ var NetworkManager = class {
     return this._swarms.get(topic);
   }
   async open() {
-    import_log6.log.trace("dxos.mesh.network-manager", import_protocols4.trace.begin({
-      id: this._instanceId,
-      parentId: this._traceParent
+    import_log6.log.trace("dxos.mesh.network-manager.open", import_protocols4.trace.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();
+    import_log6.log.trace("dxos.mesh.network-manager.open", import_protocols4.trace.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) => {
         (0, import_log6.log)(err, {}, {
           file: "network-manager.ts",
-          line: 143,
+          line: 136,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -1450,14 +1438,6 @@ var NetworkManager = class {
     }
     await this._messenger.close();
     await this._signalManager.close();
-    import_log6.log.trace("dxos.mesh.network-manager", import_protocols4.trace.end({
-      id: this._instanceId
-    }), {
-      file: "network-manager.ts",
-      line: 149,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
   }
   /**
   * Join the swarm.
@@ -1477,7 +1457,7 @@ var NetworkManager = class {
       topology: topology.toString()
     }, {
       file: "network-manager.ts",
-      line: 170,
+      line: 162,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1487,7 +1467,7 @@ var NetworkManager = class {
         error
       }, {
         file: "network-manager.ts",
-        line: 173,
+        line: 165,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1498,7 +1478,7 @@ var NetworkManager = class {
       peerId
     }).catch((error) => import_log6.log.catch(error, {}, {
       file: "network-manager.ts",
-      line: 177,
+      line: 169,
       scope: this,
       callSite: (f, a) => f(...a)
     }));
@@ -1510,7 +1490,7 @@ var NetworkManager = class {
       count: this._swarms.size
     }, {
       file: "network-manager.ts",
-      line: 182,
+      line: 174,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1524,21 +1504,13 @@ var NetworkManager = class {
   async leaveSwarm(topic) {
     var _a;
     if (!this._swarms.has(topic)) {
-      import_log6.log.warn("swarm not open", {
-        topic: import_keys7.PublicKey.from(topic).truncate()
-      }, {
-        file: "network-manager.ts",
-        line: 194,
-        scope: this,
-        callSite: (f, a) => f(...a)
-      });
       return;
     }
     (0, import_log6.log)("leaving", {
       topic: import_keys7.PublicKey.from(topic)
     }, {
       file: "network-manager.ts",
-      line: 198,
+      line: 190,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1559,7 +1531,7 @@ var NetworkManager = class {
       count: this._swarms.size
     }, {
       file: "network-manager.ts",
-      line: 212,
+      line: 204,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1960,21 +1932,17 @@ var WebRTCTransport = class {
     this.connected = new import_async8.Event();
     this.errors = new import_debug5.ErrorStream();
     this._instanceId = import_keys9.PublicKey.random().toHex();
-    this._performance = {
-      bytesSent: 0,
-      bytesReceived: 0
-    };
-    import_log10.log.trace("dxos.mesh.webrtc-transport", import_protocols5.trace.begin({
+    import_log10.log.trace("dxos.mesh.webrtc-transport.constructor", import_protocols5.trace.begin({
       id: this._instanceId
     }), {
       file: "webrtc-transport.ts",
-      line: 43,
+      line: 39,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     (0, import_log10.log)("created connection", params, {
       file: "webrtc-transport.ts",
-      line: 44,
+      line: 40,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1986,7 +1954,7 @@ var WebRTCTransport = class {
     this._peer.on("signal", async (data) => {
       (0, import_log10.log)("signal", data, {
         file: "webrtc-transport.ts",
-        line: 52,
+        line: 48,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1999,7 +1967,7 @@ var WebRTCTransport = class {
     this._peer.on("connect", () => {
       (0, import_log10.log)("connected", {}, {
         file: "webrtc-transport.ts",
-        line: 57,
+        line: 53,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -2009,7 +1977,7 @@ var WebRTCTransport = class {
     this._peer.on("close", async () => {
       (0, import_log10.log)("closed", {}, {
         file: "webrtc-transport.ts",
-        line: 63,
+        line: 59,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -2027,7 +1995,7 @@ var WebRTCTransport = class {
               stats
             }, {
               file: "webrtc-transport.ts",
-              line: 75,
+              line: 71,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -2037,11 +2005,19 @@ var WebRTCTransport = class {
       }
       await this.destroy();
     });
+    import_log10.log.trace("dxos.mesh.webrtc-transport.constructor", import_protocols5.trace.end({
+      id: this._instanceId
+    }), {
+      file: "webrtc-transport.ts",
+      line: 81,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
   }
   async destroy() {
     (0, import_log10.log)("closing...", {}, {
       file: "webrtc-transport.ts",
-      line: 88,
+      line: 85,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2051,18 +2027,7 @@ var WebRTCTransport = class {
     this.closed.emit();
     (0, import_log10.log)("closed", {}, {
       file: "webrtc-transport.ts",
-      line: 93,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-    import_log10.log.trace("dxos.mesh.webrtc-transport", import_protocols5.trace.end({
-      id: this._instanceId,
-      data: {
-        performance: this._performance
-      }
-    }), {
-      file: "webrtc-transport.ts",
-      line: 94,
+      line: 90,
       scope: this,
       callSite: (f, a) => f(...a)
     });