@dxos/echo-pipeline 0.8.2 → 0.8.3-main.672df60

package/dist/lib/browser/index.mjs

@@ -36,177 +36,21 @@ import { SpaceId as SpaceId2 } from "@dxos/keys";
 import { log as log7 } from "@dxos/log";
 
 // packages/core/echo/echo-pipeline/src/db-host/documents-synchronizer.ts
-import { next as A } from "@automerge/automerge";
+import { next as A2 } from "@automerge/automerge";
 import { UpdateScheduler } from "@dxos/async";
-import { Resource } from "@dxos/context";
-import { invariant } from "@dxos/invariant";
-import { log } from "@dxos/log";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/documents-synchronizer.ts";
-var MAX_UPDATE_FREQ = 10;
-var DocumentsSynchronizer = class extends Resource {
-  constructor(_params) {
-    super(), this._params = _params, this._syncStates = /* @__PURE__ */ new Map(), this._pendingUpdates = /* @__PURE__ */ new Set(), this._sendUpdatesJob = void 0;
-  }
-  addDocuments(documentIds, retryCounter = 0) {
-    if (retryCounter > 3) {
-      log.warn("Failed to load document, retry limit reached", {
-        documentIds
-      }, {
-        F: __dxlog_file,
-        L: 50,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      return;
-    }
-    for (const documentId of documentIds) {
-      this._params.repo.find(documentId).then(async (doc) => {
-        await doc.whenReady();
-        this._startSync(doc);
-        this._pendingUpdates.add(doc.documentId);
-        this._sendUpdatesJob.trigger();
-      }).catch((error) => {
-        log.warn("Failed to load document, wraparound", {
-          documentId,
-          error
-        }, {
-          F: __dxlog_file,
-          L: 64,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        this.addDocuments([
-          documentId
-        ], retryCounter + 1);
-      });
-    }
-  }
-  removeDocuments(documentIds) {
-    for (const documentId of documentIds) {
-      this._syncStates.get(documentId)?.clearSubscriptions?.();
-      this._syncStates.delete(documentId);
-      this._pendingUpdates.delete(documentId);
-    }
-  }
-  async _open() {
-    this._sendUpdatesJob = new UpdateScheduler(this._ctx, this._checkAndSendUpdates.bind(this), {
-      maxFrequency: MAX_UPDATE_FREQ
-    });
-  }
-  async _close() {
-    await this._sendUpdatesJob.join();
-    this._syncStates.clear();
-  }
-  update(updates) {
-    for (const { documentId, mutation, isNew } of updates) {
-      if (isNew) {
-        const { handle: doc } = this._params.repo.findWithProgress(documentId);
-        doc.update((doc2) => A.loadIncremental(doc2, mutation));
-        this._startSync(doc);
-      } else {
-        this._writeMutation(documentId, mutation);
-      }
-    }
-  }
-  _startSync(doc) {
-    if (this._syncStates.has(doc.documentId)) {
-      log.info("Document already being synced", {
-        documentId: doc.documentId
-      }, {
-        F: __dxlog_file,
-        L: 103,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      return;
-    }
-    const syncState = {
-      handle: doc
-    };
-    this._subscribeForChanges(syncState);
-    this._syncStates.set(doc.documentId, syncState);
-  }
-  _subscribeForChanges(syncState) {
-    const handler = () => {
-      this._pendingUpdates.add(syncState.handle.documentId);
-      this._sendUpdatesJob.trigger();
-    };
-    syncState.handle.on("heads-changed", handler);
-    syncState.clearSubscriptions = () => syncState.handle.off("heads-changed", handler);
-  }
-  async _checkAndSendUpdates() {
-    const updates = [];
-    const docsWithPendingUpdates = Array.from(this._pendingUpdates);
-    this._pendingUpdates.clear();
-    for (const documentId of docsWithPendingUpdates) {
-      const update = this._getPendingChanges(documentId);
-      if (update) {
-        updates.push({
-          documentId,
-          mutation: update
-        });
-      }
-    }
-    if (updates.length > 0) {
-      this._params.sendUpdates({
-        updates
-      });
-    }
-  }
-  _getPendingChanges(documentId) {
-    const syncState = this._syncStates.get(documentId);
-    invariant(syncState, "Sync state for document not found", {
-      F: __dxlog_file,
-      L: 144,
-      S: this,
-      A: [
-        "syncState",
-        "'Sync state for document not found'"
-      ]
-    });
-    const handle = syncState.handle;
-    if (!handle || !handle.isReady() || !handle.doc()) {
-      return;
-    }
-    const doc = handle.doc();
-    const mutation = syncState.lastSentHead ? A.saveSince(doc, syncState.lastSentHead) : A.save(doc);
-    if (mutation.length === 0) {
-      return;
-    }
-    syncState.lastSentHead = A.getHeads(doc);
-    return mutation;
-  }
-  _writeMutation(documentId, mutation) {
-    const syncState = this._syncStates.get(documentId);
-    invariant(syncState, "Sync state for document not found", {
-      F: __dxlog_file,
-      L: 160,
-      S: this,
-      A: [
-        "syncState",
-        "'Sync state for document not found'"
-      ]
-    });
-    syncState.handle.update((doc) => {
-      const headsBefore = A.getHeads(doc);
-      const newDoc = A.loadIncremental(doc, mutation);
-      if (A.equals(headsBefore, syncState.lastSentHead)) {
-        syncState.lastSentHead = A.getHeads(newDoc);
-      }
-      return newDoc;
-    });
-  }
-};
+import { Resource as Resource5 } from "@dxos/context";
+import { invariant as invariant6 } from "@dxos/invariant";
+import { log as log6 } from "@dxos/log";
 
 // packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts
 import { getBackend, getHeads, isAutomerge, equals as headsEquals, save } from "@automerge/automerge";
 import { Repo, interpretAsDocumentId } from "@automerge/automerge-repo";
 import { Event as Event2, asyncTimeout } from "@dxos/async";
-import { Context, Resource as Resource4, cancelWithContext } from "@dxos/context";
+import { Context, Resource as Resource3, cancelWithContext } from "@dxos/context";
 import { DatabaseDirectory } from "@dxos/echo-protocol";
-import { invariant as invariant3 } from "@dxos/invariant";
+import { invariant as invariant2 } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
-import { log as log4 } from "@dxos/log";
+import { log as log3 } from "@dxos/log";
 import { objectPointerCodec } from "@dxos/protocols";
 import { trace as trace2 } from "@dxos/tracing";
 import { bufferToArray } from "@dxos/util";
@@ -214,8 +58,8 @@ import { bufferToArray } from "@dxos/util";
 // packages/core/echo/echo-pipeline/src/automerge/collection-synchronizer.ts
 import { next as am } from "@automerge/automerge";
 import { asyncReturn, Event, scheduleTask, scheduleTaskInterval } from "@dxos/async";
-import { Resource as Resource2 } from "@dxos/context";
-import { log as log2 } from "@dxos/log";
+import { Resource } from "@dxos/context";
+import { log } from "@dxos/log";
 import { trace } from "@dxos/tracing";
 import { defaultMap } from "@dxos/util";
 function _ts_decorate(decorators, target, key, desc) {
@@ -224,10 +68,10 @@ function _ts_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 __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/collection-synchronizer.ts";
 var MIN_QUERY_INTERVAL = 5e3;
 var POLL_INTERVAL = 3e4;
-var CollectionSynchronizer = class extends Resource2 {
+var CollectionSynchronizer = class extends Resource {
   constructor(params) {
     super();
     /**
@@ -261,11 +105,11 @@ var CollectionSynchronizer = class extends Resource2 {
   }
   setLocalCollectionState(collectionId, state) {
     this._activeCollections.add(collectionId);
-    log2("setLocalCollectionState", {
+    log("setLocalCollectionState", {
       collectionId,
       state
     }, {
-      F: __dxlog_file2,
+      F: __dxlog_file,
       L: 76,
       S: this,
       C: (f, a) => f(...a)
@@ -281,10 +125,10 @@ var CollectionSynchronizer = class extends Resource2 {
   clearLocalCollectionState(collectionId) {
     this._activeCollections.delete(collectionId);
     this._perCollectionStates.delete(collectionId);
-    log2("clearLocalCollectionState", {
+    log("clearLocalCollectionState", {
       collectionId
     }, {
-      F: __dxlog_file2,
+      F: __dxlog_file,
       L: 90,
       S: this,
       C: (f, a) => f(...a)
@@ -362,12 +206,12 @@ var CollectionSynchronizer = class extends Resource2 {
   * Callback when a peer sends the state of a collection.
   */
   onRemoteStateReceived(collectionId, peerId, state) {
-    log2("onRemoteStateReceived", {
+    log("onRemoteStateReceived", {
       collectionId,
       peerId,
       state
     }, {
-      F: __dxlog_file2,
+      F: __dxlog_file,
       L: 171,
       S: this,
       C: (f, a) => f(...a)
@@ -467,8 +311,8 @@ var getSpanName = (peerId) => {
 import { NetworkAdapter } from "@automerge/automerge-repo";
 import { synchronized, Trigger } from "@dxos/async";
 import { LifecycleState } from "@dxos/context";
-import { invariant as invariant2 } from "@dxos/invariant";
-import { log as log3 } from "@dxos/log";
+import { invariant } from "@dxos/invariant";
+import { log as log2 } from "@dxos/log";
 import { isNonNullable } from "@dxos/util";
 
 // packages/core/echo/echo-pipeline/src/automerge/network-protocol.ts
@@ -483,7 +327,7 @@ function _ts_decorate2(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_file3 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/echo-network-adapter.ts";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/echo-network-adapter.ts";
 var EchoNetworkAdapter = class extends NetworkAdapter {
   constructor(_params) {
     super(), this._params = _params, this._replicators = /* @__PURE__ */ new Set(), this._connections = /* @__PURE__ */ new Map(), this._lifecycleState = LifecycleState.CLOSED, this._connected = new Trigger(), this._ready = new Trigger();
@@ -528,8 +372,8 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
   }
   async addReplicator(replicator) {
-    invariant2(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file3,
+    invariant(this._lifecycleState === LifecycleState.OPEN, void 0, {
+      F: __dxlog_file2,
       L: 115,
       S: this,
       A: [
@@ -537,8 +381,8 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
         ""
       ]
     });
-    invariant2(this.peerId, void 0, {
-      F: __dxlog_file3,
+    invariant(this.peerId, void 0, {
+      F: __dxlog_file2,
       L: 116,
       S: this,
       A: [
@@ -546,8 +390,8 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
         ""
       ]
     });
-    invariant2(!this._replicators.has(replicator), void 0, {
-      F: __dxlog_file3,
+    invariant(!this._replicators.has(replicator), void 0, {
+      F: __dxlog_file2,
       L: 117,
       S: this,
       A: [
@@ -570,8 +414,8 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
   }
   async removeReplicator(replicator) {
-    invariant2(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file3,
+    invariant(this._lifecycleState === LifecycleState.OPEN, void 0, {
+      F: __dxlog_file2,
       L: 136,
       S: this,
       A: [
@@ -579,8 +423,8 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
         ""
       ]
     });
-    invariant2(this._replicators.has(replicator), void 0, {
-      F: __dxlog_file3,
+    invariant(this._replicators.has(replicator), void 0, {
+      F: __dxlog_file2,
       L: 137,
       S: this,
       A: [
@@ -635,8 +479,8 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       this._params.monitor?.recordMessageSent(message, durationMs);
     }).catch((err) => {
       if (connectionEntry.isOpen) {
-        log3.catch(err, void 0, {
-          F: __dxlog_file3,
+        log2.catch(err, void 0, {
+          F: __dxlog_file2,
           L: 197,
           S: this,
           C: (f, a) => f(...a)
@@ -654,16 +498,16 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     }).filter(isNonNullable);
   }
   _onConnectionOpen(connection) {
-    log3("Connection opened", {
+    log2("Connection opened", {
       peerId: connection.peerId
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant2(!this._connections.has(connection.peerId), void 0, {
-      F: __dxlog_file3,
+    invariant(!this._connections.has(connection.peerId), void 0, {
+      F: __dxlog_file2,
       L: 216,
       S: this,
       A: [
@@ -691,8 +535,8 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
         }
       } catch (err) {
         if (connectionEntry.isOpen) {
-          log3.catch(err, void 0, {
-            F: __dxlog_file3,
+          log2.catch(err, void 0, {
+            F: __dxlog_file2,
             L: 235,
             S: this,
             C: (f, a) => f(...a)
@@ -700,10 +544,10 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
         }
       }
     });
-    log3("emit peer-candidate", {
+    log2("emit peer-candidate", {
       peerId: connection.peerId
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 240,
       S: this,
       C: (f, a) => f(...a)
@@ -732,17 +576,17 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
   * TODO(y): replace with a proper API call when sharePolicy update becomes supported by automerge-repo
   */
   _onConnectionAuthScopeChanged(connection) {
-    log3("Connection auth scope changed", {
+    log2("Connection auth scope changed", {
       peerId: connection.peerId
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 268,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
-    invariant2(entry, void 0, {
-      F: __dxlog_file3,
+    invariant(entry, void 0, {
+      F: __dxlog_file2,
       L: 270,
       S: this,
       A: [
@@ -756,17 +600,17 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     this._emitPeerCandidate(connection);
   }
   _onConnectionClosed(connection) {
-    log3("Connection closed", {
+    log2("Connection closed", {
       peerId: connection.peerId
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 276,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
-    invariant2(entry, void 0, {
-      F: __dxlog_file3,
+    invariant(entry, void 0, {
+      F: __dxlog_file2,
       L: 278,
       S: this,
       A: [
@@ -779,14 +623,14 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     });
     this._params.monitor?.recordPeerDisconnected(connection.peerId);
-    void entry.reader.cancel().catch((err) => log3.catch(err, void 0, {
-      F: __dxlog_file3,
+    void entry.reader.cancel().catch((err) => log2.catch(err, void 0, {
+      F: __dxlog_file2,
       L: 284,
       S: this,
       C: (f, a) => f(...a)
     }));
-    void entry.writer.abort().catch((err) => log3.catch(err, void 0, {
-      F: __dxlog_file3,
+    void entry.writer.abort().catch((err) => log2.catch(err, void 0, {
+      F: __dxlog_file2,
       L: 285,
       S: this,
       C: (f, a) => f(...a)
@@ -841,8 +685,8 @@ var HeadsStore = class {
 };
 
 // packages/core/echo/echo-pipeline/src/automerge/leveldb-storage-adapter.ts
-import { LifecycleState as LifecycleState2, Resource as Resource3 } from "@dxos/context";
-var LevelDBStorageAdapter = class extends Resource3 {
+import { LifecycleState as LifecycleState2, Resource as Resource2 } from "@dxos/context";
+var LevelDBStorageAdapter = class extends Resource2 {
   constructor(_params) {
     super(), this._params = _params;
   }
@@ -952,14 +796,14 @@ function _ts_decorate3(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_file4 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
 var FIND_PARAMS = {
   allowableStates: [
     "ready",
     "requesting"
   ]
 };
-var AutomergeHost = class extends Resource4 {
+var AutomergeHost = class extends Resource3 {
   constructor({ db, indexMetadataStore, dataMonitor, peerIdProvider, getSpaceKeyByRootDocumentId }) {
     super();
     this._collectionSynchronizer = new CollectionSynchronizer({
@@ -1113,7 +957,7 @@ var AutomergeHost = class extends Resource4 {
     if (headsToWait.length > 0) {
       await Promise.all(headsToWait.map(async (entry, index) => {
         const handle = await this.loadDoc(Context.default(void 0, {
-          F: __dxlog_file4,
+          F: __dxlog_file3,
           L: 288
         }), entry.documentId);
         await waitForHeads(handle, entry.heads);
@@ -1123,20 +967,20 @@ var AutomergeHost = class extends Resource4 {
   }
   async reIndexHeads(documentIds) {
     for (const documentId of documentIds) {
-      log4.info("re-indexing heads for document", {
+      log3.info("re-indexing heads for document", {
         documentId
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 302,
         S: this,
         C: (f, a) => f(...a)
       });
       const handle = await this._repo.find(documentId, FIND_PARAMS);
       if (!handle.isReady()) {
-        log4.warn("document is not available locally, skipping", {
+        log3.warn("document is not available locally, skipping", {
           documentId
         }, {
-          F: __dxlog_file4,
+          F: __dxlog_file3,
           L: 305,
           S: this,
           C: (f, a) => f(...a)
@@ -1148,8 +992,8 @@ var AutomergeHost = class extends Resource4 {
       this._headsStore.setHeads(documentId, heads, batch);
       await batch.write();
     }
-    log4.info("done re-indexing heads", void 0, {
-      F: __dxlog_file4,
+    log3.info("done re-indexing heads", void 0, {
+      F: __dxlog_file3,
       L: 314,
       S: this,
       C: (f, a) => f(...a)
@@ -1364,13 +1208,13 @@ var AutomergeHost = class extends Resource4 {
     if (toReplicate.length === 0) {
       return;
     }
-    log4.info("replicating documents after collection sync", {
+    log3.info("replicating documents after collection sync", {
       collectionId,
       peerId,
       toReplicate,
       count: toReplicate.length
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 557,
       S: this,
       C: (f, a) => f(...a)
@@ -1429,8 +1273,8 @@ var changeIsPresentInDoc = (doc, changeHash) => {
   return !!getBackend(doc).getChangeByHash(changeHash);
 };
 var decodeCollectionState = (state) => {
-  invariant3(typeof state === "object" && state !== null, "Invalid state", {
-    F: __dxlog_file4,
+  invariant2(typeof state === "object" && state !== null, "Invalid state", {
+    F: __dxlog_file3,
     L: 608,
     S: void 0,
     A: [
@@ -1445,21 +1289,21 @@ var encodeCollectionState = (state) => {
 };
 
 // packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts
-import { invariant as invariant6 } from "@dxos/invariant";
+import { invariant as invariant5 } from "@dxos/invariant";
 import { PublicKey as PublicKey2 } from "@dxos/keys";
-import { log as log6 } from "@dxos/log";
+import { log as log5 } from "@dxos/log";
 import { ComplexSet, defaultMap as defaultMap2 } from "@dxos/util";
 
 // packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator-connection.ts
-import * as A2 from "@automerge/automerge";
+import * as A from "@automerge/automerge";
 import { cbor } from "@automerge/automerge-repo";
-import { Resource as Resource5 } from "@dxos/context";
-import { invariant as invariant4 } from "@dxos/invariant";
-import { log as log5 } from "@dxos/log";
+import { Resource as Resource4 } from "@dxos/context";
+import { invariant as invariant3 } from "@dxos/invariant";
+import { log as log4 } from "@dxos/log";
 import { AutomergeReplicator } from "@dxos/teleport-extension-automerge-replicator";
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator-connection.ts";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator-connection.ts";
 var DEFAULT_FACTORY = (params) => new AutomergeReplicator(...params);
-var MeshReplicatorConnection = class extends Resource5 {
+var MeshReplicatorConnection = class extends Resource4 {
   constructor(_params) {
     super(), this._params = _params, this.remoteDeviceKey = null, this._remotePeerId = null, this._isEnabled = false;
     let readableStreamController;
@@ -1471,8 +1315,8 @@ var MeshReplicatorConnection = class extends Resource5 {
     });
     this.writable = new WritableStream({
       write: async (message, controller) => {
-        invariant4(this._isEnabled, "Writing to a disabled connection", {
-          F: __dxlog_file5,
+        invariant3(this._isEnabled, "Writing to a disabled connection", {
+          F: __dxlog_file4,
           L: 51,
           S: this,
           A: [
@@ -1500,12 +1344,12 @@ var MeshReplicatorConnection = class extends Resource5 {
         onStartReplication: async (info, remotePeerId) => {
           this.remoteDeviceKey = remotePeerId;
           this._remotePeerId = info.id;
-          log5("onStartReplication", {
+          log4("onStartReplication", {
             id: info.id,
             thisPeerId: this.peerId,
             remotePeerId: remotePeerId.toHex()
           }, {
-            F: __dxlog_file5,
+            F: __dxlog_file4,
             L: 80,
             S: this,
             C: (f, a) => f(...a)
@@ -1531,8 +1375,8 @@ var MeshReplicatorConnection = class extends Resource5 {
     }
   }
   get peerId() {
-    invariant4(this._remotePeerId != null, "Remote peer has not connected yet.", {
-      F: __dxlog_file5,
+    invariant3(this._remotePeerId != null, "Remote peer has not connected yet.", {
+      F: __dxlog_file4,
       L: 106,
       S: this,
       A: [
@@ -1556,8 +1400,8 @@ var MeshReplicatorConnection = class extends Resource5 {
   * Call after the remote peer has connected.
   */
   enable() {
-    invariant4(this._remotePeerId != null, "Remote peer has not connected yet.", {
-      F: __dxlog_file5,
+    invariant3(this._remotePeerId != null, "Remote peer has not connected yet.", {
+      F: __dxlog_file4,
       L: 127,
       S: this,
       A: [
@@ -1575,8 +1419,8 @@ var MeshReplicatorConnection = class extends Resource5 {
   }
 };
 var logSendSync = (message) => {
-  log5("sendSyncMessage", () => {
-    const decodedSyncMessage = message.type === "sync" && message.data ? A2.decodeSyncMessage(message.data) : void 0;
+  log4("sendSyncMessage", () => {
+    const decodedSyncMessage = message.type === "sync" && message.data ? A.decodeSyncMessage(message.data) : void 0;
     return {
       sync: decodedSyncMessage && {
         headsLength: decodedSyncMessage.heads.length,
@@ -1588,7 +1432,7 @@ var logSendSync = (message) => {
       to: message.targetId
     };
   }, {
-    F: __dxlog_file5,
+    F: __dxlog_file4,
     L: 140,
     S: void 0,
     C: (f, a) => f(...a)
@@ -1596,14 +1440,14 @@ var logSendSync = (message) => {
 };
 
 // packages/core/echo/echo-pipeline/src/automerge/space-collection.ts
-import { invariant as invariant5 } from "@dxos/invariant";
+import { invariant as invariant4 } from "@dxos/invariant";
 import { SpaceId } from "@dxos/keys";
-var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/space-collection.ts";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/space-collection.ts";
 var deriveCollectionIdFromSpaceId = (spaceId, rootDocumentId) => rootDocumentId ? `space:${spaceId}:${rootDocumentId}` : `space:${spaceId}`;
 var getSpaceIdFromCollectionId = (collectionId) => {
   const spaceId = collectionId.split(":")[1];
-  invariant5(SpaceId.isValid(spaceId), void 0, {
-    F: __dxlog_file6,
+  invariant4(SpaceId.isValid(spaceId), void 0, {
+    F: __dxlog_file5,
     L: 16,
     S: void 0,
     A: [
@@ -1615,7 +1459,7 @@ var getSpaceIdFromCollectionId = (collectionId) => {
 };
 
 // packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts
-var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts";
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts";
 var MeshEchoReplicator = class {
   constructor() {
     /**
@@ -1652,8 +1496,8 @@ var MeshEchoReplicator = class {
     this._context = null;
   }
   createExtension(extensionFactory) {
-    invariant6(this._context, void 0, {
-      F: __dxlog_file7,
+    invariant5(this._context, void 0, {
+      F: __dxlog_file6,
       L: 67,
       S: this,
       A: [
@@ -1665,16 +1509,16 @@ var MeshEchoReplicator = class {
       ownPeerId: this._context.peerId,
       replicatorFactory: extensionFactory,
       onRemoteConnected: async () => {
-        log6("onRemoteConnected", {
+        log5("onRemoteConnected", {
           peerId: connection.peerId
         }, {
-          F: __dxlog_file7,
+          F: __dxlog_file6,
           L: 73,
           S: this,
           C: (f, a) => f(...a)
         });
-        invariant6(this._context, void 0, {
-          F: __dxlog_file7,
+        invariant5(this._context, void 0, {
+          F: __dxlog_file6,
           L: 74,
           S: this,
           A: [
@@ -1696,10 +1540,10 @@ var MeshEchoReplicator = class {
         }
       },
       onRemoteDisconnected: async () => {
-        log6("onRemoteDisconnected", {
+        log5("onRemoteDisconnected", {
           peerId: connection.peerId
         }, {
-          F: __dxlog_file7,
+          F: __dxlog_file6,
           L: 88,
           S: this,
           C: (f, a) => f(...a)
@@ -1708,10 +1552,10 @@ var MeshEchoReplicator = class {
         const existingConnections = this._connectionsPerPeer.get(connection.peerId) ?? [];
         const index = existingConnections.indexOf(connection);
         if (index < 0) {
-          log6.warn("disconnected connection not found", {
+          log5.warn("disconnected connection not found", {
             peerId: connection.peerId
           }, {
-            F: __dxlog_file7,
+            F: __dxlog_file6,
             L: 96,
             S: this,
             C: (f, a) => f(...a)
@@ -1729,17 +1573,17 @@ var MeshEchoReplicator = class {
         }
       },
       shouldAdvertise: async (params) => {
-        log6("shouldAdvertise", {
+        log5("shouldAdvertise", {
           peerId: connection.peerId,
           documentId: params.documentId
         }, {
-          F: __dxlog_file7,
+          F: __dxlog_file6,
           L: 114,
           S: this,
           C: (f, a) => f(...a)
         });
-        invariant6(this._context, void 0, {
-          F: __dxlog_file7,
+        invariant5(this._context, void 0, {
+          F: __dxlog_file6,
           L: 115,
           S: this,
           A: [
@@ -1754,12 +1598,12 @@ var MeshEchoReplicator = class {
               documentId: params.documentId,
               peerId: connection.peerId
             });
-            log6("document not found locally for share policy check", {
+            log5("document not found locally for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId,
               acceptDocument: remoteDocumentExists
             }, {
-              F: __dxlog_file7,
+              F: __dxlog_file6,
               L: 123,
               S: this,
               C: (f, a) => f(...a)
@@ -1769,11 +1613,11 @@ var MeshEchoReplicator = class {
           const spaceId = await createIdFromSpaceKey(spaceKey);
           const authorizedDevices = this._authorizedDevices.get(spaceId);
           if (!connection.remoteDeviceKey) {
-            log6("device key not found for share policy check", {
+            log5("device key not found for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
-              F: __dxlog_file7,
+              F: __dxlog_file6,
               L: 139,
               S: this,
               C: (f, a) => f(...a)
@@ -1781,7 +1625,7 @@ var MeshEchoReplicator = class {
             return false;
           }
           const isAuthorized = authorizedDevices?.has(connection.remoteDeviceKey) ?? false;
-          log6("share policy check", {
+          log5("share policy check", {
             localPeer: this._context.peerId,
             remotePeer: connection.peerId,
             documentId: params.documentId,
@@ -1789,15 +1633,15 @@ var MeshEchoReplicator = class {
             spaceKey,
             isAuthorized
           }, {
-            F: __dxlog_file7,
+            F: __dxlog_file6,
             L: 147,
             S: this,
             C: (f, a) => f(...a)
           });
           return isAuthorized;
         } catch (err) {
-          log6.catch(err, void 0, {
-            F: __dxlog_file7,
+          log5.catch(err, void 0, {
+            F: __dxlog_file6,
             L: 157,
             S: this,
             C: (f, a) => f(...a)
@@ -1809,11 +1653,11 @@ var MeshEchoReplicator = class {
         const spaceId = getSpaceIdFromCollectionId(collectionId);
         const authorizedDevices = this._authorizedDevices.get(spaceId);
         if (!connection.remoteDeviceKey) {
-          log6("device key not found for collection sync check", {
+          log5("device key not found for collection sync check", {
             peerId: connection.peerId,
             collectionId
           }, {
-            F: __dxlog_file7,
+            F: __dxlog_file6,
             L: 167,
             S: this,
             C: (f, a) => f(...a)
@@ -1828,11 +1672,11 @@ var MeshEchoReplicator = class {
     return connection.replicatorExtension;
   }
   async authorizeDevice(spaceKey, deviceKey) {
-    log6("authorizeDevice", {
+    log5("authorizeDevice", {
       spaceKey,
       deviceKey
     }, {
-      F: __dxlog_file7,
+      F: __dxlog_file6,
       L: 184,
       S: this,
       C: (f, a) => f(...a)
@@ -2210,6 +2054,164 @@ var getByteCount = (message) => {
   return message.type.length + message.senderId.length + message.targetId.length + (message.data?.byteLength ?? 0) + (message.documentId?.length ?? 0);
 };
 
+// packages/core/echo/echo-pipeline/src/db-host/documents-synchronizer.ts
+var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/documents-synchronizer.ts";
+var MAX_UPDATE_FREQ = 10;
+var DocumentsSynchronizer = class extends Resource5 {
+  constructor(_params) {
+    super(), this._params = _params, this._syncStates = /* @__PURE__ */ new Map(), this._pendingUpdates = /* @__PURE__ */ new Set(), this._sendUpdatesJob = void 0;
+  }
+  addDocuments(documentIds, retryCounter = 0) {
+    if (retryCounter > 3) {
+      log6.warn("Failed to load document, retry limit reached", {
+        documentIds
+      }, {
+        F: __dxlog_file7,
+        L: 52,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
+    for (const documentId of documentIds) {
+      this._params.repo.find(documentId).then(async (doc) => {
+        await doc.whenReady();
+        this._startSync(doc);
+        this._pendingUpdates.add(doc.documentId);
+        this._sendUpdatesJob.trigger();
+      }).catch((error) => {
+        log6.warn("Failed to load document, wraparound", {
+          documentId,
+          error
+        }, {
+          F: __dxlog_file7,
+          L: 66,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        this.addDocuments([
+          documentId
+        ], retryCounter + 1);
+      });
+    }
+  }
+  removeDocuments(documentIds) {
+    for (const documentId of documentIds) {
+      this._syncStates.get(documentId)?.clearSubscriptions?.();
+      this._syncStates.delete(documentId);
+      this._pendingUpdates.delete(documentId);
+    }
+  }
+  async _open() {
+    this._sendUpdatesJob = new UpdateScheduler(this._ctx, this._checkAndSendUpdates.bind(this), {
+      maxFrequency: MAX_UPDATE_FREQ
+    });
+  }
+  async _close() {
+    await this._sendUpdatesJob.join();
+    this._syncStates.clear();
+  }
+  async update(updates) {
+    for (const { documentId, mutation, isNew } of updates) {
+      if (isNew) {
+        const doc = await this._params.repo.find(documentId, FIND_PARAMS);
+        doc.update((doc2) => A2.loadIncremental(doc2, mutation));
+        this._startSync(doc);
+      } else {
+        this._writeMutation(documentId, mutation);
+      }
+    }
+  }
+  _startSync(doc) {
+    if (this._syncStates.has(doc.documentId)) {
+      log6.info("Document already being synced", {
+        documentId: doc.documentId
+      }, {
+        F: __dxlog_file7,
+        L: 105,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
+    const syncState = {
+      handle: doc
+    };
+    this._subscribeForChanges(syncState);
+    this._syncStates.set(doc.documentId, syncState);
+  }
+  _subscribeForChanges(syncState) {
+    const handler = () => {
+      this._pendingUpdates.add(syncState.handle.documentId);
+      this._sendUpdatesJob.trigger();
+    };
+    syncState.handle.on("heads-changed", handler);
+    syncState.clearSubscriptions = () => syncState.handle.off("heads-changed", handler);
+  }
+  async _checkAndSendUpdates() {
+    const updates = [];
+    const docsWithPendingUpdates = Array.from(this._pendingUpdates);
+    this._pendingUpdates.clear();
+    for (const documentId of docsWithPendingUpdates) {
+      const update = this._getPendingChanges(documentId);
+      if (update) {
+        updates.push({
+          documentId,
+          mutation: update
+        });
+      }
+    }
+    if (updates.length > 0) {
+      this._params.sendUpdates({
+        updates
+      });
+    }
+  }
+  _getPendingChanges(documentId) {
+    const syncState = this._syncStates.get(documentId);
+    invariant6(syncState, "Sync state for document not found", {
+      F: __dxlog_file7,
+      L: 146,
+      S: this,
+      A: [
+        "syncState",
+        "'Sync state for document not found'"
+      ]
+    });
+    const handle = syncState.handle;
+    if (!handle || !handle.isReady() || !handle.doc()) {
+      return;
+    }
+    const doc = handle.doc();
+    const mutation = syncState.lastSentHead ? A2.saveSince(doc, syncState.lastSentHead) : A2.save(doc);
+    if (mutation.length === 0) {
+      return;
+    }
+    syncState.lastSentHead = A2.getHeads(doc);
+    return mutation;
+  }
+  _writeMutation(documentId, mutation) {
+    const syncState = this._syncStates.get(documentId);
+    invariant6(syncState, "Sync state for document not found", {
+      F: __dxlog_file7,
+      L: 162,
+      S: this,
+      A: [
+        "syncState",
+        "'Sync state for document not found'"
+      ]
+    });
+    syncState.handle.update((doc) => {
+      const headsBefore = A2.getHeads(doc);
+      const newDoc = A2.loadIncremental(doc, mutation);
+      if (A2.equals(headsBefore, syncState.lastSentHead)) {
+        syncState.lastSentHead = A2.getHeads(newDoc);
+      }
+      return newDoc;
+    });
+  }
+};
+
 // packages/core/echo/echo-pipeline/src/db-host/data-service.ts
 var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/data-service.ts";
 var DataServiceImpl = class {
@@ -2273,7 +2275,7 @@ var DataServiceImpl = class {
         "'Subscription not found'"
       ]
     });
-    synchronizer.update(request.updates);
+    await synchronizer.update(request.updates);
   }
   async flush(request) {
     await this._automergeHost.flush(request);
@@ -2961,6 +2963,7 @@ var ExecutionTrace = Object.freeze({
     return go(trace6, 0);
   }
 });
+var TRACE_QUERY_EXECUTION = false;
 var QueryExecutor = class extends Resource6 {
   constructor(options) {
     super();
@@ -3000,7 +3003,7 @@ var QueryExecutor = class extends Resource6 {
   async execQuery() {
     invariant10(this._lifecycleState === LifecycleState3.OPEN, void 0, {
       F: __dxlog_file11,
-      L: 171,
+      L: 173,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -3016,6 +3019,9 @@ var QueryExecutor = class extends Resource6 {
     });
     this._trace = trace6;
     const changed = prevResultSet.length !== workingSet.length || prevResultSet.some((item, index) => workingSet[index].objectId !== item.objectId || workingSet[index].spaceId !== item.spaceId || workingSet[index].documentId !== item.documentId);
+    if (TRACE_QUERY_EXECUTION) {
+      console.log(ExecutionTrace.format(trace6));
+    }
     return {
       changed
     };