@dxos/network-manager 0.8.4-main.9be5663bfe → 0.8.4-main.abd8ff62ef

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/network-manager",
-  "version": "0.8.4-main.9be5663bfe",
+  "version": "0.8.4-main.abd8ff62ef",
   "description": "Network Manager",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -62,16 +62,6 @@
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "testing": [
-        "dist/types/src/testing/index.d.ts"
-      ],
-      "transport/tcp": [
-        "dist/types/src/transport/tcp/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "testing.d.ts",
     "testing.js",
@@ -81,26 +71,26 @@
   ],
   "dependencies": {
     "node-datachannel": "^0.30.0",
-    "@dxos/async": "0.8.4-main.9be5663bfe",
-    "@dxos/codec-protobuf": "0.8.4-main.9be5663bfe",
-    "@dxos/context": "0.8.4-main.9be5663bfe",
-    "@dxos/debug": "0.8.4-main.9be5663bfe",
-    "@dxos/keys": "0.8.4-main.9be5663bfe",
-    "@dxos/log": "0.8.4-main.9be5663bfe",
-    "@dxos/messaging": "0.8.4-main.9be5663bfe",
-    "@dxos/node-std": "0.8.4-main.9be5663bfe",
-    "@dxos/protocols": "0.8.4-main.9be5663bfe",
-    "@dxos/invariant": "0.8.4-main.9be5663bfe",
-    "@dxos/teleport": "0.8.4-main.9be5663bfe",
-    "@dxos/tracing": "0.8.4-main.9be5663bfe",
-    "@dxos/rpc": "0.8.4-main.9be5663bfe",
-    "@dxos/util": "0.8.4-main.9be5663bfe"
+    "@dxos/async": "0.8.4-main.abd8ff62ef",
+    "@dxos/context": "0.8.4-main.abd8ff62ef",
+    "@dxos/codec-protobuf": "0.8.4-main.abd8ff62ef",
+    "@dxos/invariant": "0.8.4-main.abd8ff62ef",
+    "@dxos/debug": "0.8.4-main.abd8ff62ef",
+    "@dxos/keys": "0.8.4-main.abd8ff62ef",
+    "@dxos/log": "0.8.4-main.abd8ff62ef",
+    "@dxos/node-std": "0.8.4-main.abd8ff62ef",
+    "@dxos/rpc": "0.8.4-main.abd8ff62ef",
+    "@dxos/teleport": "0.8.4-main.abd8ff62ef",
+    "@dxos/protocols": "0.8.4-main.abd8ff62ef",
+    "@dxos/tracing": "0.8.4-main.abd8ff62ef",
+    "@dxos/messaging": "0.8.4-main.abd8ff62ef",
+    "@dxos/util": "0.8.4-main.abd8ff62ef"
   },
   "devDependencies": {
     "fetch-mock": "^11.0.0",
-    "@dxos/edge-client": "0.8.4-main.9be5663bfe",
-    "@dxos/keyring": "0.8.4-main.9be5663bfe",
-    "@dxos/signal": "0.8.4-main.9be5663bfe"
+    "@dxos/edge-client": "0.8.4-main.abd8ff62ef",
+    "@dxos/keyring": "0.8.4-main.abd8ff62ef",
+    "@dxos/signal": "0.8.4-main.abd8ff62ef"
   },
   "publishConfig": {
     "access": "public"

package/src/network-manager.ts

@@ -8,7 +8,6 @@ import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { Messenger, type PeerInfo, type SignalManager } from '@dxos/messaging';
-import { trace } from '@dxos/protocols';
 import { ConnectionState } from '@dxos/protocols/proto/dxos/client/services';
 import { ComplexMap } from '@dxos/util';
 
@@ -77,7 +76,6 @@ export class SwarmNetworkManager {
   private readonly _signalConnection: SignalConnection;
   private readonly _connectionLimiter: ConnectionLimiter;
   private readonly _connectionLog?: ConnectionLog;
-  private readonly _instanceId = PublicKey.random().toHex();
   private _peerInfo?: PeerInfo = undefined;
 
   private _connectionState = ConnectionState.ONLINE;
@@ -131,10 +129,10 @@ export class SwarmNetworkManager {
   }
 
   async open(): Promise<void> {
-    log.trace('dxos.mesh.network-manager.open', trace.begin({ id: this._instanceId }));
+    log('opening network manager');
     await this._messenger.open();
     await this._signalManager.open();
-    log.trace('dxos.mesh.network-manager.open', trace.end({ id: this._instanceId }));
+    log('opened network manager');
   }
 
   async close(ctx: Context): Promise<void> {

package/src/swarm/connection.ts

@@ -9,14 +9,7 @@ import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log, logInfo } from '@dxos/log';
 import { type PeerInfo } from '@dxos/messaging';
-import {
-  CancelledError,
-  ConnectionResetError,
-  ConnectivityError,
-  ProtocolError,
-  TimeoutError,
-  trace,
-} from '@dxos/protocols';
+import { CancelledError, ConnectionResetError, ConnectivityError, ProtocolError, TimeoutError } from '@dxos/protocols';
 import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
 import { type SignalMessage, type SignalMessenger } from '../signal';
@@ -113,8 +106,6 @@ export class Connection {
   readonly stateChanged = new Event<ConnectionState>();
   readonly errors = new ErrorStream();
 
-  public _instanceId = PublicKey.random().toHex();
-
   public readonly transportStats = new Event<TransportStats>();
 
   private readonly _signalSendTask = new DeferredTask(this._ctx, async () => {
@@ -165,7 +156,7 @@ export class Connection {
    */
   async openConnection(): Promise<void> {
     invariant(this._state === ConnectionState.INITIAL, 'Invalid state.');
-    log.trace('dxos.mesh.connection.open-connection', trace.begin({ id: this._instanceId }));
+    log('opening connection');
     log.trace('dxos.mesh.connection.open', {
       sessionId: this.sessionId,
       topic: this.topic,
@@ -257,7 +248,7 @@ export class Connection {
 
     this._incomingSignalBuffer = [];
 
-    log.trace('dxos.mesh.connection.open-connection', trace.end({ id: this._instanceId }));
+    log('opened connection');
   }
 
   @synchronized

package/src/swarm/swarm.ts

@@ -9,7 +9,6 @@ import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log, logInfo } from '@dxos/log';
 import { type ListeningHandle, type Messenger, type PeerInfo, PeerInfoHash, type SwarmEvent } from '@dxos/messaging';
-import { trace } from '@dxos/protocols';
 import { type Answer } from '@dxos/protocols/proto/dxos/mesh/swarm';
 import { ComplexMap, isNonNullable } from '@dxos/util';
 
@@ -85,11 +84,7 @@ export class Swarm {
     private readonly _connectionLimiter: ConnectionLimiter,
     private readonly _initiationDelay = INITIATION_DELAY,
   ) {
-    log.trace(
-      'dxos.mesh.swarm.constructor',
-      trace.begin({ id: this._instanceId, data: { topic: this._topic.toHex(), peer: this._ownPeer } }),
-    );
-    log('creating swarm', { peerId: _ownPeer });
+    log('creating swarm', { topic: this._topic.toHex(), peer: this._ownPeer });
     _topology.init(this._getSwarmController());
 
     this._swarmMessenger = new SwarmMessenger({
@@ -98,7 +93,6 @@ export class Swarm {
       onOffer: async (ctx, msg) => await this.onOffer(ctx, msg),
       topic: this._topic,
     });
-    log.trace('dxos.mesh.swarm.constructor', trace.end({ id: this._instanceId }));
   }
 
   get connections() {