@dxos/echo-pipeline 0.8.1-staging.391c573 → 0.8.1-staging.97aedb1

package/dist/lib/browser/index.mjs

@@ -205,7 +205,7 @@ import { invariant as invariant3 } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
 import { log as log4 } from "@dxos/log";
 import { objectPointerCodec } from "@dxos/protocols";
-import { trace } from "@dxos/tracing";
+import { trace as trace2 } from "@dxos/tracing";
 import { bufferToArray } from "@dxos/util";
 
 // packages/core/echo/echo-pipeline/src/automerge/collection-synchronizer.ts
@@ -213,7 +213,14 @@ import { asyncReturn, Event, scheduleTask, scheduleTaskInterval } from "@dxos/as
 import { next as am } from "@dxos/automerge/automerge";
 import { Resource as Resource2 } from "@dxos/context";
 import { log as log2 } from "@dxos/log";
+import { trace } from "@dxos/tracing";
 import { defaultMap } from "@dxos/util";
+function _ts_decorate(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") r = Reflect.decorate(decorators, target, key, desc);
+  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) 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_file2 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/collection-synchronizer.ts";
 var MIN_QUERY_INTERVAL = 5e3;
 var POLL_INTERVAL = 3e4;
@@ -256,7 +263,7 @@ var CollectionSynchronizer = class extends Resource2 {
       state
     }, {
       F: __dxlog_file2,
-      L: 73,
+      L: 75,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -275,7 +282,7 @@ var CollectionSynchronizer = class extends Resource2 {
       collectionId
     }, {
       F: __dxlog_file2,
-      L: 87,
+      L: 89,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -305,6 +312,17 @@ var CollectionSynchronizer = class extends Resource2 {
   * Callback when a connection to a peer is established.
   */
   onConnectionOpen(peerId) {
+    const spanId = getSpanName(peerId);
+    trace.spanStart({
+      id: spanId,
+      methodName: spanId,
+      instance: this,
+      parentCtx: this._ctx,
+      showInBrowserTimeline: true,
+      attributes: {
+        peerId
+      }
+    });
     this._connectedPeers.add(peerId);
     queueMicrotask(async () => {
       if (this._ctx.disposed) {
@@ -347,7 +365,7 @@ var CollectionSynchronizer = class extends Resource2 {
       state
     }, {
       F: __dxlog_file2,
-      L: 159,
+      L: 170,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -357,6 +375,21 @@ var CollectionSynchronizer = class extends Resource2 {
       documents: {}
     };
     const diff = diffCollectionState(existingState, state);
+    const spanId = getSpanName(peerId);
+    if (diff.different.length === 0) {
+      trace.spanEnd(spanId);
+    } else {
+      trace.spanStart({
+        id: spanId,
+        methodName: spanId,
+        instance: this,
+        parentCtx: this._ctx,
+        showInBrowserTimeline: true,
+        attributes: {
+          peerId
+        }
+      });
+    }
     if (diff.missingOnLocal.length > 0 || diff.different.length > 0) {
       perCollectionState.remoteStates.set(peerId, state);
       this.remoteStateUpdated.emit({
@@ -384,6 +417,9 @@ var CollectionSynchronizer = class extends Resource2 {
     }
   }
 };
+CollectionSynchronizer = _ts_decorate([
+  trace.resource()
+], CollectionSynchronizer);
 var diffCollectionState = (local, remote) => {
   const allDocuments = /* @__PURE__ */ new Set([
     ...Object.keys(local.documents),
@@ -420,6 +456,9 @@ var validateCollectionState = (state) => {
 var isValidDocumentId = (documentId) => {
   return typeof documentId === "string" && !documentId.includes(":");
 };
+var getSpanName = (peerId) => {
+  return `collection-sync-${peerId}`;
+};
 
 // packages/core/echo/echo-pipeline/src/automerge/echo-network-adapter.ts
 import { synchronized, Trigger } from "@dxos/async";
@@ -435,7 +474,7 @@ var isCollectionQueryMessage = (message) => message.type === MESSAGE_TYPE_COLLEC
 var isCollectionStateMessage = (message) => message.type === MESSAGE_TYPE_COLLECTION_STATE;
 
 // packages/core/echo/echo-pipeline/src/automerge/echo-network-adapter.ts
-function _ts_decorate(decorators, target, key, desc) {
+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") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -764,16 +803,16 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
   }
 };
-_ts_decorate([
+_ts_decorate2([
   synchronized
 ], EchoNetworkAdapter.prototype, "open", null);
-_ts_decorate([
+_ts_decorate2([
   synchronized
 ], EchoNetworkAdapter.prototype, "close", null);
-_ts_decorate([
+_ts_decorate2([
   synchronized
 ], EchoNetworkAdapter.prototype, "addReplicator", null);
-_ts_decorate([
+_ts_decorate2([
   synchronized
 ], EchoNetworkAdapter.prototype, "removeReplicator", null);
 var createEchoPeerMetadata = () => ({
@@ -911,7 +950,7 @@ var encodingOptions = {
 var isLevelDbNotFoundError = (err) => err.code === "LEVEL_NOT_FOUND";
 
 // packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts
-function _ts_decorate2(decorators, target, key, desc) {
+function _ts_decorate3(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") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -1366,21 +1405,21 @@ var AutomergeHost = class extends Resource4 {
     }
   }
 };
-_ts_decorate2([
-  trace.info()
+_ts_decorate3([
+  trace2.info()
 ], AutomergeHost.prototype, "_peerId", void 0);
-_ts_decorate2([
-  trace.info({
+_ts_decorate3([
+  trace2.info({
     depth: null
   })
 ], AutomergeHost.prototype, "_automergePeers", null);
-_ts_decorate2([
-  trace.span({
+_ts_decorate3([
+  trace2.span({
     showInBrowserTimeline: true
   })
 ], AutomergeHost.prototype, "flush", null);
-AutomergeHost = _ts_decorate2([
-  trace.resource()
+AutomergeHost = _ts_decorate3([
+  trace2.resource()
 ], AutomergeHost);
 var getSpaceKeyFromDoc = (doc) => {
   const rawSpaceKey = doc.access?.spaceKey ?? doc.experimental_spaceKey;
@@ -1486,7 +1525,7 @@ var MeshReplicatorConnection = class extends Resource5 {
             remotePeerId: remotePeerId.toHex()
           }, {
             F: __dxlog_file5,
-            L: 85,
+            L: 79,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1513,7 +1552,7 @@ var MeshReplicatorConnection = class extends Resource5 {
   get peerId() {
     invariant4(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file5,
-      L: 111,
+      L: 105,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1522,6 +1561,9 @@ var MeshReplicatorConnection = class extends Resource5 {
     });
     return this._remotePeerId;
   }
+  get isEnabled() {
+    return this._isEnabled;
+  }
   async shouldAdvertise(params) {
     return this._params.shouldAdvertise(params);
   }
@@ -1535,7 +1577,7 @@ var MeshReplicatorConnection = class extends Resource5 {
   enable() {
     invariant4(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file5,
-      L: 128,
+      L: 126,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1566,7 +1608,7 @@ var logSendSync = (message) => {
     };
   }, {
     F: __dxlog_file5,
-    L: 141,
+    L: 139,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -1595,12 +1637,18 @@ var getSpaceIdFromCollectionId = (collectionId) => {
 var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts";
 var MeshEchoReplicator = class {
   constructor() {
-    this._connections = /* @__PURE__ */ new Set();
     /**
-    * Using automerge peerId as a key.
+    * We might have multiple connections open with a peer (one per space), but there'll be only one enabled
+    * connection at any given moment, because there's a single repo for all the spaces.
+    * When a connection closes (space was closed) it gets removed from the list and the next connection
+    * in the line gets enabled.
     */
     this._connectionsPerPeer = /* @__PURE__ */ new Map();
     /**
+    * A set of all connections (enabled and disabled).
+    */
+    this._connections = /* @__PURE__ */ new Set();
+    /**
     * spaceId -> deviceKey[]
     */
     this._authorizedDevices = /* @__PURE__ */ new Map();
@@ -1610,8 +1658,10 @@ var MeshEchoReplicator = class {
     this._context = context;
   }
   async disconnect() {
-    for (const connection of this._connectionsPerPeer.values()) {
-      this._context?.onConnectionClosed(connection);
+    for (const connection of this._connections) {
+      if (connection.isEnabled) {
+        this._context?.onConnectionClosed(connection);
+      }
     }
     for (const connection of this._connections) {
       await connection.close();
@@ -1623,7 +1673,7 @@ var MeshEchoReplicator = class {
   createExtension(extensionFactory) {
     invariant6(this._context, void 0, {
       F: __dxlog_file7,
-      L: 57,
+      L: 67,
       S: this,
       A: [
         "this._context",
@@ -1638,23 +1688,28 @@ var MeshEchoReplicator = class {
           peerId: connection.peerId
         }, {
           F: __dxlog_file7,
-          L: 63,
+          L: 73,
           S: this,
           C: (f, a) => f(...a)
         });
         invariant6(this._context, void 0, {
           F: __dxlog_file7,
-          L: 64,
+          L: 74,
           S: this,
           A: [
             "this._context",
             ""
           ]
         });
-        if (this._connectionsPerPeer.has(connection.peerId)) {
-          this._context.onConnectionAuthScopeChanged(connection);
+        const existingConnections = this._connectionsPerPeer.get(connection.peerId);
+        if (existingConnections?.length) {
+          const enabledConnection = existingConnections[0];
+          this._context.onConnectionAuthScopeChanged(enabledConnection);
+          existingConnections.push(connection);
         } else {
-          this._connectionsPerPeer.set(connection.peerId, connection);
+          this._connectionsPerPeer.set(connection.peerId, [
+            connection
+          ]);
           this._context.onConnectionOpen(connection);
           connection.enable();
         }
@@ -1664,14 +1719,33 @@ var MeshEchoReplicator = class {
           peerId: connection.peerId
         }, {
           F: __dxlog_file7,
-          L: 75,
+          L: 88,
           S: this,
           C: (f, a) => f(...a)
         });
-        this._context?.onConnectionClosed(connection);
-        this._connectionsPerPeer.delete(connection.peerId);
-        connection.disable();
         this._connections.delete(connection);
+        const existingConnections = this._connectionsPerPeer.get(connection.peerId) ?? [];
+        const index = existingConnections.indexOf(connection);
+        if (index < 0) {
+          log6.warn("disconnected connection not found", {
+            peerId: connection.peerId
+          }, {
+            F: __dxlog_file7,
+            L: 96,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          return;
+        }
+        existingConnections.splice(index, 1);
+        if (connection.isEnabled) {
+          this._context?.onConnectionClosed(connection);
+          connection.disable();
+          if (existingConnections.length > 0) {
+            this._context?.onConnectionOpen(existingConnections[0]);
+            existingConnections[0].enable();
+          }
+        }
       },
       shouldAdvertise: async (params) => {
         log6("shouldAdvertise", {
@@ -1679,13 +1753,13 @@ var MeshEchoReplicator = class {
           documentId: params.documentId
         }, {
           F: __dxlog_file7,
-          L: 82,
+          L: 114,
           S: this,
           C: (f, a) => f(...a)
         });
         invariant6(this._context, void 0, {
           F: __dxlog_file7,
-          L: 83,
+          L: 115,
           S: this,
           A: [
             "this._context",
@@ -1705,7 +1779,7 @@ var MeshEchoReplicator = class {
               acceptDocument: remoteDocumentExists
             }, {
               F: __dxlog_file7,
-              L: 91,
+              L: 123,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1719,7 +1793,7 @@ var MeshEchoReplicator = class {
               documentId: params.documentId
             }, {
               F: __dxlog_file7,
-              L: 107,
+              L: 139,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1735,7 +1809,7 @@ var MeshEchoReplicator = class {
             isAuthorized
           }, {
             F: __dxlog_file7,
-            L: 115,
+            L: 147,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1743,7 +1817,7 @@ var MeshEchoReplicator = class {
         } catch (err) {
           log6.catch(err, void 0, {
             F: __dxlog_file7,
-            L: 125,
+            L: 157,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1759,7 +1833,7 @@ var MeshEchoReplicator = class {
             collectionId
           }, {
             F: __dxlog_file7,
-            L: 135,
+            L: 167,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1778,14 +1852,14 @@ var MeshEchoReplicator = class {
       deviceKey
     }, {
       F: __dxlog_file7,
-      L: 152,
+      L: 184,
       S: this,
       C: (f, a) => f(...a)
     });
     const spaceId = await createIdFromSpaceKey(spaceKey);
     defaultMap2(this._authorizedDevices, spaceId, () => new ComplexSet(PublicKey2.hash)).add(deviceKey);
     for (const connection of this._connections) {
-      if (connection.remoteDeviceKey && connection.remoteDeviceKey.equals(deviceKey)) {
+      if (connection.isEnabled && connection.remoteDeviceKey && connection.remoteDeviceKey.equals(deviceKey)) {
         if (this._connectionsPerPeer.has(connection.peerId)) {
           this._context?.onConnectionAuthScopeChanged(connection);
         }
@@ -1795,9 +1869,9 @@ var MeshEchoReplicator = class {
 };
 
 // packages/core/echo/echo-pipeline/src/automerge/echo-data-monitor.ts
-import { trace as trace2 } from "@dxos/tracing";
+import { trace as trace3 } from "@dxos/tracing";
 import { CircularBuffer, mapValues, SlidingWindowSummary } from "@dxos/util";
-function _ts_decorate3(decorators, target, key, desc) {
+function _ts_decorate4(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") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -1930,14 +2004,14 @@ var EchoDataMonitor = class {
     for (const [metricName, metric, summary] of toReport) {
       summary.record(metric);
       if (metric > 0) {
-        trace2.metrics.distribution(`dxos.echo.${metricName}-rate`, metric);
-        trace2.metrics.increment(`dxos.echo.${metricName}`, 1, {
+        trace3.metrics.distribution(`dxos.echo.${metricName}-rate`, metric);
+        trace3.metrics.increment(`dxos.echo.${metricName}`, 1, {
           tags: {
             status: "busy"
           }
         });
       } else {
-        trace2.metrics.increment(`dxos.echo.${metricName}`, 1, {
+        trace3.metrics.increment(`dxos.echo.${metricName}`, 1, {
           tags: {
             status: "idle"
           }
@@ -1958,7 +2032,7 @@ var EchoDataMonitor = class {
     this._activeCounters.storage.storedChunks++;
     this._activeCounters.storage.storedBytes += count;
     this._storageAverages.storedChunkSize.record(count);
-    trace2.metrics.distribution("dxos.echo.storage.bytes-stored", count, {
+    trace3.metrics.distribution("dxos.echo.storage.bytes-stored", count, {
       unit: "bytes"
     });
   }
@@ -1972,7 +2046,7 @@ var EchoDataMonitor = class {
     this._activeCounters.storage.loadedChunks++;
     this._activeCounters.storage.loadedBytes += count;
     this._storageAverages.loadedChunkSize.record(count);
-    trace2.metrics.distribution("dxos.echo.storage.bytes-loaded", count, {
+    trace3.metrics.distribution("dxos.echo.storage.bytes-loaded", count, {
       unit: "bytes"
     });
   }
@@ -1990,15 +2064,15 @@ var EchoDataMonitor = class {
     } else {
       metricsGroupName = "collection-sync";
     }
-    trace2.metrics.distribution(`dxos.echo.${metricsGroupName}.bytes-sent`, bytes, {
+    trace3.metrics.distribution(`dxos.echo.${metricsGroupName}.bytes-sent`, bytes, {
       unit: "bytes",
       tags
     });
-    trace2.metrics.distribution(`dxos.echo.${metricsGroupName}.send-duration`, duration, {
+    trace3.metrics.distribution(`dxos.echo.${metricsGroupName}.send-duration`, duration, {
       unit: "millisecond",
       tags
     });
-    trace2.metrics.increment(`dxos.echo.${metricsGroupName}.send-status`, 1, {
+    trace3.metrics.increment(`dxos.echo.${metricsGroupName}.send-status`, 1, {
       tags: {
         ...tags,
         success: true
@@ -2020,12 +2094,12 @@ var EchoDataMonitor = class {
     if (isAutomergeProtocolMessage(message)) {
       this._activeCounters.replication.received++;
       this._replicationAverages.receivedMessageSize.record(bytes);
-      trace2.metrics.distribution("dxos.echo.replication.bytes-received", bytes, {
+      trace3.metrics.distribution("dxos.echo.replication.bytes-received", bytes, {
         unit: "bytes",
         tags
       });
     } else {
-      trace2.metrics.distribution("dxos.echo.collection-sync.bytes-received", bytes, {
+      trace3.metrics.distribution("dxos.echo.collection-sync.bytes-received", bytes, {
         unit: "bytes",
         tags
       });
@@ -2045,12 +2119,12 @@ var EchoDataMonitor = class {
     };
     if (isAutomergeProtocolMessage(message)) {
       this._activeCounters.replication.failed++;
-      trace2.metrics.increment("dxos.echo.replication.send-status", 1, {
+      trace3.metrics.increment("dxos.echo.replication.send-status", 1, {
         unit: "bytes",
         tags
       });
     } else {
-      trace2.metrics.increment("dxos.echo.collection-sync.send-status", 1, {
+      trace3.metrics.increment("dxos.echo.collection-sync.send-status", 1, {
         unit: "bytes",
         tags
       });
@@ -2085,8 +2159,8 @@ var EchoDataMonitor = class {
     return result;
   }
 };
-EchoDataMonitor = _ts_decorate3([
-  trace2.resource()
+EchoDataMonitor = _ts_decorate4([
+  trace3.resource()
 ], EchoDataMonitor);
 var isAutomergeProtocolMessage = (message) => {
   return !(isCollectionQueryMessage(message) || isCollectionStateMessage(message));
@@ -2304,7 +2378,7 @@ import { createIdFromSpaceKey as createIdFromSpaceKey3, SpaceDocVersion as Space
 import { IndexMetadataStore, IndexStore, Indexer } from "@dxos/indexing";
 import { invariant as invariant11 } from "@dxos/invariant";
 import { IndexKind } from "@dxos/protocols/proto/dxos/echo/indexing";
-import { trace as trace5 } from "@dxos/tracing";
+import { trace as trace6 } from "@dxos/tracing";
 
 // packages/core/echo/echo-pipeline/src/db-host/documents-iterator.ts
 import * as A3 from "@dxos/automerge/automerge";
@@ -2401,7 +2475,7 @@ import { Stream as Stream2 } from "@dxos/codec-protobuf/stream";
 import { Context as Context4, Resource as Resource7 } from "@dxos/context";
 import { log as log9 } from "@dxos/log";
 import { objectPointerCodec as objectPointerCodec4 } from "@dxos/protocols";
-import { trace as trace4 } from "@dxos/tracing";
+import { trace as trace5 } from "@dxos/tracing";
 
 // packages/core/echo/echo-pipeline/src/db-host/query-state.ts
 import { Context as Context3, LifecycleState as LifecycleState3, Resource as Resource6 } from "@dxos/context";
@@ -2409,9 +2483,9 @@ import { createIdFromSpaceKey as createIdFromSpaceKey2 } from "@dxos/echo-protoc
 import { invariant as invariant9 } from "@dxos/invariant";
 import { DXN, PublicKey as PublicKey3 } from "@dxos/keys";
 import { objectPointerCodec as objectPointerCodec3 } from "@dxos/protocols";
-import { trace as trace3 } from "@dxos/tracing";
+import { trace as trace4 } from "@dxos/tracing";
 import { isNonNullable as isNonNullable2 } from "@dxos/util";
-function _ts_decorate4(decorators, target, key, desc) {
+function _ts_decorate5(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") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -2511,19 +2585,19 @@ var QueryState = class extends Resource6 {
     };
   }
 };
-_ts_decorate4([
-  trace3.info({
+_ts_decorate5([
+  trace4.info({
     depth: null
   })
 ], QueryState.prototype, "filter", void 0);
-_ts_decorate4([
-  trace3.info()
+_ts_decorate5([
+  trace4.info()
 ], QueryState.prototype, "metrics", void 0);
-_ts_decorate4([
-  trace3.info()
+_ts_decorate5([
+  trace4.info()
 ], QueryState.prototype, "active", null);
-_ts_decorate4([
-  trace3.span({
+_ts_decorate5([
+  trace4.span({
     showInBrowserTimeline: true,
     op: "db.query",
     attributes: {
@@ -2531,8 +2605,8 @@ _ts_decorate4([
     }
   })
 ], QueryState.prototype, "execQuery", null);
-QueryState = _ts_decorate4([
-  trace3.resource()
+QueryState = _ts_decorate5([
+  trace4.resource()
 ], QueryState);
 var filterToIndexQuery = (filter) => {
   invariant9(!(filter.type && (filter.or ?? []).length > 0), "Cannot mix type and or filters.", {
@@ -2600,7 +2674,7 @@ var QueryServiceImpl = class extends Resource7 {
         }
       }));
     });
-    trace4.diagnostic({
+    trace5.diagnostic({
       id: "active-queries",
       name: "Active Queries",
       fetch: () => {
@@ -3015,7 +3089,7 @@ var EchoHost = class extends Resource9 {
         await this._indexer.updateIndexes();
       }
     });
-    trace5.diagnostic({
+    trace6.diagnostic({
       id: "echo-stats",
       name: "Echo Stats",
       fetch: async () => {
@@ -3025,7 +3099,7 @@ var EchoHost = class extends Resource9 {
         };
       }
     });
-    trace5.diagnostic({
+    trace6.diagnostic({
       id: "database-roots",
       name: "Database Roots",
       fetch: async () => {
@@ -3038,7 +3112,7 @@ var EchoHost = class extends Resource9 {
         }));
       }
     });
-    trace5.diagnostic({
+    trace6.diagnostic({
       id: "database-root-metrics",
       name: "Database Roots (with metrics)",
       fetch: async () => {
@@ -3323,7 +3397,7 @@ var EchoEdgeReplicator = class {
     this._sharePolicyEnabled = !disableSharePolicy;
   }
   async connect(context) {
-    log12.info("connect", {
+    log12.info("connecting...", {
       peerId: context.peerId,
       connectedSpaces: this._connectedSpaces.size
     }, {
@@ -3516,7 +3590,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
     });
   }
   async _open(ctx) {
-    log12("open", void 0, {
+    log12("opening...", void 0, {
       F: __dxlog_file17,
       L: 251,
       S: this,
@@ -3529,7 +3603,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
     await this._onRemoteConnected();
   }
   async _close() {
-    log12("close", void 0, {
+    log12("closing...", void 0, {
       F: __dxlog_file17,
       L: 266,
       S: this,
@@ -3561,7 +3635,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
         documentId: params.documentId,
         peerId: this._remotePeerId
       });
-      log12.verbose("edge-replicator document not found locally for share policy check", {
+      log12.verbose("document not found locally for share policy check", {
         documentId: params.documentId,
         acceptDocument: remoteDocumentExists,
         remoteId: this._remotePeerId
@@ -3587,7 +3661,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
       return;
     }
     const payload = cbor2.decode(message.payload.value);
-    log12.verbose("edge replicator receive", {
+    log12.verbose("received", {
       type: payload.type,
       documentId: payload.type === "sync" && payload.documentId,
       remoteId: this._remotePeerId
@@ -3610,7 +3684,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
   }
   async _sendMessage(message) {
     message.targetId = this._targetServiceId;
-    log12.verbose("edge replicator send", {
+    log12.verbose("sending...", {
       type: message.type,
       documentId: message.type === "sync" && message.documentId,
       remoteId: this._remotePeerId