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

package/dist/lib/node/index.cjs

@@ -118,7 +118,7 @@ var import_invariant5 = require("@dxos/invariant");
 var import_keys3 = require("@dxos/keys");
 var import_log6 = require("@dxos/log");
 var import_util4 = require("@dxos/util");
-var A2 = __toESM(require("@automerge/automerge"));
+var A = __toESM(require("@automerge/automerge"));
 var import_automerge_repo3 = require("@automerge/automerge-repo");
 var import_context6 = require("@dxos/context");
 var import_invariant6 = require("@dxos/invariant");
@@ -186,169 +186,13 @@ var import_async9 = require("@dxos/async");
 var import_context13 = require("@dxos/context");
 var import_log13 = require("@dxos/log");
 var import_echo_protocol7 = require("@dxos/echo-protocol");
-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 import_context.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) {
-      import_log2.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) => {
-        import_log2.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 import_async2.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) => import_automerge.next.loadIncremental(doc2, mutation));
-        this._startSync(doc);
-      } else {
-        this._writeMutation(documentId, mutation);
-      }
-    }
-  }
-  _startSync(doc) {
-    if (this._syncStates.has(doc.documentId)) {
-      import_log2.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);
-    (0, import_invariant2.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 ? import_automerge.next.saveSince(doc, syncState.lastSentHead) : import_automerge.next.save(doc);
-    if (mutation.length === 0) {
-      return;
-    }
-    syncState.lastSentHead = import_automerge.next.getHeads(doc);
-    return mutation;
-  }
-  _writeMutation(documentId, mutation) {
-    const syncState = this._syncStates.get(documentId);
-    (0, import_invariant2.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 = import_automerge.next.getHeads(doc);
-      const newDoc = import_automerge.next.loadIncremental(doc, mutation);
-      if (import_automerge.next.equals(headsBefore, syncState.lastSentHead)) {
-        syncState.lastSentHead = import_automerge.next.getHeads(newDoc);
-      }
-      return newDoc;
-    });
-  }
-};
 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 __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 import_context3.Resource {
@@ -386,7 +230,7 @@ var CollectionSynchronizer = class extends import_context3.Resource {
       collectionId,
       state
     }, {
-      F: __dxlog_file2,
+      F: __dxlog_file,
       L: 76,
       S: this,
       C: (f, a) => f(...a)
@@ -405,7 +249,7 @@ var CollectionSynchronizer = class extends import_context3.Resource {
     (0, import_log4.log)("clearLocalCollectionState", {
       collectionId
     }, {
-      F: __dxlog_file2,
+      F: __dxlog_file,
       L: 90,
       S: this,
       C: (f, a) => f(...a)
@@ -488,7 +332,7 @@ var CollectionSynchronizer = class extends import_context3.Resource {
       peerId,
       state
     }, {
-      F: __dxlog_file2,
+      F: __dxlog_file,
       L: 171,
       S: this,
       C: (f, a) => f(...a)
@@ -591,7 +435,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 import_automerge_repo2.NetworkAdapter {
   constructor(_params) {
     super(), this._params = _params, this._replicators = /* @__PURE__ */ new Set(), this._connections = /* @__PURE__ */ new Map(), this._lifecycleState = import_context4.LifecycleState.CLOSED, this._connected = new import_async5.Trigger(), this._ready = new import_async5.Trigger();
@@ -637,7 +481,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
   }
   async addReplicator(replicator) {
     (0, import_invariant4.invariant)(this._lifecycleState === import_context4.LifecycleState.OPEN, void 0, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 115,
       S: this,
       A: [
@@ -646,7 +490,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       ]
     });
     (0, import_invariant4.invariant)(this.peerId, void 0, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 116,
       S: this,
       A: [
@@ -655,7 +499,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       ]
     });
     (0, import_invariant4.invariant)(!this._replicators.has(replicator), void 0, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 117,
       S: this,
       A: [
@@ -679,7 +523,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
   }
   async removeReplicator(replicator) {
     (0, import_invariant4.invariant)(this._lifecycleState === import_context4.LifecycleState.OPEN, void 0, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 136,
       S: this,
       A: [
@@ -688,7 +532,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       ]
     });
     (0, import_invariant4.invariant)(this._replicators.has(replicator), void 0, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 137,
       S: this,
       A: [
@@ -744,7 +588,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     }).catch((err) => {
       if (connectionEntry.isOpen) {
         import_log5.log.catch(err, void 0, {
-          F: __dxlog_file3,
+          F: __dxlog_file2,
           L: 197,
           S: this,
           C: (f, a) => f(...a)
@@ -765,13 +609,13 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     (0, import_log5.log)("Connection opened", {
       peerId: connection.peerId
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant4.invariant)(!this._connections.has(connection.peerId), void 0, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 216,
       S: this,
       A: [
@@ -800,7 +644,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       } catch (err) {
         if (connectionEntry.isOpen) {
           import_log5.log.catch(err, void 0, {
-            F: __dxlog_file3,
+            F: __dxlog_file2,
             L: 235,
             S: this,
             C: (f, a) => f(...a)
@@ -811,7 +655,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     (0, import_log5.log)("emit peer-candidate", {
       peerId: connection.peerId
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 240,
       S: this,
       C: (f, a) => f(...a)
@@ -843,14 +687,14 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     (0, import_log5.log)("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);
     (0, import_invariant4.invariant)(entry, void 0, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 270,
       S: this,
       A: [
@@ -867,14 +711,14 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     (0, import_log5.log)("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);
     (0, import_invariant4.invariant)(entry, void 0, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 278,
       S: this,
       A: [
@@ -888,13 +732,13 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     });
     this._params.monitor?.recordPeerDisconnected(connection.peerId);
     void entry.reader.cancel().catch((err) => import_log5.log.catch(err, void 0, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 284,
       S: this,
       C: (f, a) => f(...a)
     }));
     void entry.writer.abort().catch((err) => import_log5.log.catch(err, void 0, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 285,
       S: this,
       C: (f, a) => f(...a)
@@ -1052,7 +896,7 @@ 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",
@@ -1213,7 +1057,7 @@ var AutomergeHost = class extends import_context2.Resource {
     if (headsToWait.length > 0) {
       await Promise.all(headsToWait.map(async (entry, index) => {
         const handle = await this.loadDoc(import_context2.Context.default(void 0, {
-          F: __dxlog_file4,
+          F: __dxlog_file3,
           L: 288
         }), entry.documentId);
         await waitForHeads(handle, entry.heads);
@@ -1226,7 +1070,7 @@ var AutomergeHost = class extends import_context2.Resource {
       import_log3.log.info("re-indexing heads for document", {
         documentId
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 302,
         S: this,
         C: (f, a) => f(...a)
@@ -1236,7 +1080,7 @@ var AutomergeHost = class extends import_context2.Resource {
         import_log3.log.warn("document is not available locally, skipping", {
           documentId
         }, {
-          F: __dxlog_file4,
+          F: __dxlog_file3,
           L: 305,
           S: this,
           C: (f, a) => f(...a)
@@ -1249,7 +1093,7 @@ var AutomergeHost = class extends import_context2.Resource {
       await batch.write();
     }
     import_log3.log.info("done re-indexing heads", void 0, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 314,
       S: this,
       C: (f, a) => f(...a)
@@ -1470,7 +1314,7 @@ var AutomergeHost = class extends import_context2.Resource {
       toReplicate,
       count: toReplicate.length
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 557,
       S: this,
       C: (f, a) => f(...a)
@@ -1530,7 +1374,7 @@ var changeIsPresentInDoc = (doc, changeHash) => {
 };
 var decodeCollectionState = (state) => {
   (0, import_invariant3.invariant)(typeof state === "object" && state !== null, "Invalid state", {
-    F: __dxlog_file4,
+    F: __dxlog_file3,
     L: 608,
     S: void 0,
     A: [
@@ -1543,7 +1387,7 @@ var decodeCollectionState = (state) => {
 var encodeCollectionState = (state) => {
   return state;
 };
-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 import_teleport_extension_automerge_replicator.AutomergeReplicator(...params);
 var MeshReplicatorConnection = class extends import_context6.Resource {
   constructor(_params) {
@@ -1558,7 +1402,7 @@ var MeshReplicatorConnection = class extends import_context6.Resource {
     this.writable = new WritableStream({
       write: async (message, controller) => {
         (0, import_invariant6.invariant)(this._isEnabled, "Writing to a disabled connection", {
-          F: __dxlog_file5,
+          F: __dxlog_file4,
           L: 51,
           S: this,
           A: [
@@ -1591,7 +1435,7 @@ var MeshReplicatorConnection = class extends import_context6.Resource {
             thisPeerId: this.peerId,
             remotePeerId: remotePeerId.toHex()
           }, {
-            F: __dxlog_file5,
+            F: __dxlog_file4,
             L: 80,
             S: this,
             C: (f, a) => f(...a)
@@ -1618,7 +1462,7 @@ var MeshReplicatorConnection = class extends import_context6.Resource {
   }
   get peerId() {
     (0, import_invariant6.invariant)(this._remotePeerId != null, "Remote peer has not connected yet.", {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 106,
       S: this,
       A: [
@@ -1643,7 +1487,7 @@ var MeshReplicatorConnection = class extends import_context6.Resource {
   */
   enable() {
     (0, import_invariant6.invariant)(this._remotePeerId != null, "Remote peer has not connected yet.", {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 127,
       S: this,
       A: [
@@ -1662,7 +1506,7 @@ var MeshReplicatorConnection = class extends import_context6.Resource {
 };
 var logSendSync = (message) => {
   (0, import_log7.log)("sendSyncMessage", () => {
-    const decodedSyncMessage = message.type === "sync" && message.data ? A2.decodeSyncMessage(message.data) : void 0;
+    const decodedSyncMessage = message.type === "sync" && message.data ? A.decodeSyncMessage(message.data) : void 0;
     return {
       sync: decodedSyncMessage && {
         headsLength: decodedSyncMessage.heads.length,
@@ -1674,18 +1518,18 @@ var logSendSync = (message) => {
       to: message.targetId
     };
   }, {
-    F: __dxlog_file5,
+    F: __dxlog_file4,
     L: 140,
     S: void 0,
     C: (f, a) => f(...a)
   });
 };
-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];
   (0, import_invariant7.invariant)(import_keys4.SpaceId.isValid(spaceId), void 0, {
-    F: __dxlog_file6,
+    F: __dxlog_file5,
     L: 16,
     S: void 0,
     A: [
@@ -1695,7 +1539,7 @@ var getSpaceIdFromCollectionId = (collectionId) => {
   });
   return spaceId;
 };
-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() {
     this._connectionsPerPeer = /* @__PURE__ */ new Map();
@@ -1721,7 +1565,7 @@ var MeshEchoReplicator = class {
   }
   createExtension(extensionFactory) {
     (0, import_invariant5.invariant)(this._context, void 0, {
-      F: __dxlog_file7,
+      F: __dxlog_file6,
       L: 67,
       S: this,
       A: [
@@ -1736,13 +1580,13 @@ var MeshEchoReplicator = class {
         (0, import_log6.log)("onRemoteConnected", {
           peerId: connection.peerId
         }, {
-          F: __dxlog_file7,
+          F: __dxlog_file6,
           L: 73,
           S: this,
           C: (f, a) => f(...a)
         });
         (0, import_invariant5.invariant)(this._context, void 0, {
-          F: __dxlog_file7,
+          F: __dxlog_file6,
           L: 74,
           S: this,
           A: [
@@ -1767,7 +1611,7 @@ var MeshEchoReplicator = class {
         (0, import_log6.log)("onRemoteDisconnected", {
           peerId: connection.peerId
         }, {
-          F: __dxlog_file7,
+          F: __dxlog_file6,
           L: 88,
           S: this,
           C: (f, a) => f(...a)
@@ -1779,7 +1623,7 @@ var MeshEchoReplicator = class {
           import_log6.log.warn("disconnected connection not found", {
             peerId: connection.peerId
           }, {
-            F: __dxlog_file7,
+            F: __dxlog_file6,
             L: 96,
             S: this,
             C: (f, a) => f(...a)
@@ -1801,13 +1645,13 @@ var MeshEchoReplicator = class {
           peerId: connection.peerId,
           documentId: params.documentId
         }, {
-          F: __dxlog_file7,
+          F: __dxlog_file6,
           L: 114,
           S: this,
           C: (f, a) => f(...a)
         });
         (0, import_invariant5.invariant)(this._context, void 0, {
-          F: __dxlog_file7,
+          F: __dxlog_file6,
           L: 115,
           S: this,
           A: [
@@ -1827,7 +1671,7 @@ var MeshEchoReplicator = class {
               documentId: params.documentId,
               acceptDocument: remoteDocumentExists
             }, {
-              F: __dxlog_file7,
+              F: __dxlog_file6,
               L: 123,
               S: this,
               C: (f, a) => f(...a)
@@ -1841,7 +1685,7 @@ var MeshEchoReplicator = class {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
-              F: __dxlog_file7,
+              F: __dxlog_file6,
               L: 139,
               S: this,
               C: (f, a) => f(...a)
@@ -1857,7 +1701,7 @@ var MeshEchoReplicator = class {
             spaceKey,
             isAuthorized
           }, {
-            F: __dxlog_file7,
+            F: __dxlog_file6,
             L: 147,
             S: this,
             C: (f, a) => f(...a)
@@ -1865,7 +1709,7 @@ var MeshEchoReplicator = class {
           return isAuthorized;
         } catch (err) {
           import_log6.log.catch(err, void 0, {
-            F: __dxlog_file7,
+            F: __dxlog_file6,
             L: 157,
             S: this,
             C: (f, a) => f(...a)
@@ -1881,7 +1725,7 @@ var MeshEchoReplicator = class {
             peerId: connection.peerId,
             collectionId
           }, {
-            F: __dxlog_file7,
+            F: __dxlog_file6,
             L: 167,
             S: this,
             C: (f, a) => f(...a)
@@ -1900,7 +1744,7 @@ var MeshEchoReplicator = class {
       spaceKey,
       deviceKey
     }, {
-      F: __dxlog_file7,
+      F: __dxlog_file6,
       L: 184,
       S: this,
       C: (f, a) => f(...a)
@@ -2273,6 +2117,162 @@ var createStorageAverages = () => ({
 var getByteCount = (message) => {
   return message.type.length + message.senderId.length + message.targetId.length + (message.data?.byteLength ?? 0) + (message.documentId?.length ?? 0);
 };
+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 import_context.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) {
+      import_log2.log.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) => {
+        import_log2.log.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 import_async2.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) => import_automerge.next.loadIncremental(doc2, mutation));
+        this._startSync(doc);
+      } else {
+        this._writeMutation(documentId, mutation);
+      }
+    }
+  }
+  _startSync(doc) {
+    if (this._syncStates.has(doc.documentId)) {
+      import_log2.log.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);
+    (0, import_invariant2.invariant)(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 ? import_automerge.next.saveSince(doc, syncState.lastSentHead) : import_automerge.next.save(doc);
+    if (mutation.length === 0) {
+      return;
+    }
+    syncState.lastSentHead = import_automerge.next.getHeads(doc);
+    return mutation;
+  }
+  _writeMutation(documentId, mutation) {
+    const syncState = this._syncStates.get(documentId);
+    (0, import_invariant2.invariant)(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 = import_automerge.next.getHeads(doc);
+      const newDoc = import_automerge.next.loadIncremental(doc, mutation);
+      if (import_automerge.next.equals(headsBefore, syncState.lastSentHead)) {
+        syncState.lastSentHead = import_automerge.next.getHeads(newDoc);
+      }
+      return newDoc;
+    });
+  }
+};
 var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/data-service.ts";
 var DataServiceImpl = class {
   constructor(params) {
@@ -2331,7 +2331,7 @@ var DataServiceImpl = class {
         "'Subscription not found'"
       ]
     });
-    synchronizer.update(request.updates);
+    await synchronizer.update(request.updates);
   }
   async flush(request) {
     await this._automergeHost.flush(request);
@@ -2967,6 +2967,7 @@ var ExecutionTrace = Object.freeze({
     return go(trace6, 0);
   }
 });
+var TRACE_QUERY_EXECUTION = false;
 var QueryExecutor = class extends import_context10.Resource {
   constructor(options) {
     super();
@@ -3006,7 +3007,7 @@ var QueryExecutor = class extends import_context10.Resource {
   async execQuery() {
     (0, import_invariant10.invariant)(this._lifecycleState === import_context10.LifecycleState.OPEN, void 0, {
       F: __dxlog_file11,
-      L: 171,
+      L: 173,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -3022,6 +3023,9 @@ var QueryExecutor = class extends import_context10.Resource {
     });
     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
     };