@dxos/echo-pipeline 0.8.2-main.f11618f → 0.8.2-main.fbd8ed0

package/dist/lib/node/index.cjs

@@ -28,62 +28,63 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var node_exports = {};
 __export(node_exports, {
-  AuthExtension: () => import_chunk_TC2PRBEU.AuthExtension,
-  AuthStatus: () => import_chunk_TC2PRBEU.AuthStatus,
+  AuthExtension: () => import_chunk_QD3U65NM.AuthExtension,
+  AuthStatus: () => import_chunk_QD3U65NM.AuthStatus,
   AutomergeHost: () => AutomergeHost,
-  CredentialRetrieverExtension: () => import_chunk_TC2PRBEU.CredentialRetrieverExtension,
-  CredentialServerExtension: () => import_chunk_TC2PRBEU.CredentialServerExtension,
+  CredentialRetrieverExtension: () => import_chunk_QD3U65NM.CredentialRetrieverExtension,
+  CredentialServerExtension: () => import_chunk_QD3U65NM.CredentialServerExtension,
   DataServiceImpl: () => DataServiceImpl,
   DatabaseRoot: () => DatabaseRoot,
   DocumentsSynchronizer: () => DocumentsSynchronizer,
   EchoDataMonitor: () => EchoDataMonitor,
   EchoEdgeReplicator: () => EchoEdgeReplicator,
   EchoHost: () => EchoHost,
+  FIND_PARAMS: () => FIND_PARAMS,
   LevelDBStorageAdapter: () => LevelDBStorageAdapter,
-  MOCK_AUTH_PROVIDER: () => import_chunk_TC2PRBEU.MOCK_AUTH_PROVIDER,
-  MOCK_AUTH_VERIFIER: () => import_chunk_TC2PRBEU.MOCK_AUTH_VERIFIER,
+  MOCK_AUTH_PROVIDER: () => import_chunk_QD3U65NM.MOCK_AUTH_PROVIDER,
+  MOCK_AUTH_VERIFIER: () => import_chunk_QD3U65NM.MOCK_AUTH_VERIFIER,
   MeshEchoReplicator: () => MeshEchoReplicator,
-  MetadataStore: () => import_chunk_TC2PRBEU.MetadataStore,
-  Pipeline: () => import_chunk_TC2PRBEU.Pipeline,
+  MetadataStore: () => import_chunk_QD3U65NM.MetadataStore,
+  Pipeline: () => import_chunk_QD3U65NM.Pipeline,
   QueryServiceImpl: () => QueryServiceImpl,
   QueryState: () => QueryState,
-  Space: () => import_chunk_TC2PRBEU.Space,
+  Space: () => import_chunk_QD3U65NM.Space,
   SpaceDocumentListUpdatedEvent: () => SpaceDocumentListUpdatedEvent,
-  SpaceManager: () => import_chunk_TC2PRBEU.SpaceManager,
-  SpaceProtocol: () => import_chunk_TC2PRBEU.SpaceProtocol,
-  SpaceProtocolSession: () => import_chunk_TC2PRBEU.SpaceProtocolSession,
+  SpaceManager: () => import_chunk_QD3U65NM.SpaceManager,
+  SpaceProtocol: () => import_chunk_QD3U65NM.SpaceProtocol,
+  SpaceProtocolSession: () => import_chunk_QD3U65NM.SpaceProtocolSession,
   SpaceStateManager: () => SpaceStateManager,
-  TimeframeClock: () => import_chunk_TC2PRBEU.TimeframeClock,
-  codec: () => import_chunk_TC2PRBEU.codec,
-  createIdFromSpaceKey: () => import_chunk_TC2PRBEU.createIdFromSpaceKey,
-  createMappedFeedWriter: () => import_chunk_TC2PRBEU.createMappedFeedWriter,
+  TimeframeClock: () => import_chunk_QD3U65NM.TimeframeClock,
+  codec: () => import_chunk_QD3U65NM.codec,
+  createIdFromSpaceKey: () => import_chunk_QD3U65NM.createIdFromSpaceKey,
+  createMappedFeedWriter: () => import_chunk_QD3U65NM.createMappedFeedWriter,
   deriveCollectionIdFromSpaceId: () => deriveCollectionIdFromSpaceId,
   diffCollectionState: () => diffCollectionState,
   encodingOptions: () => encodingOptions,
   findInlineObjectOfType: () => findInlineObjectOfType,
   getSpaceIdFromCollectionId: () => getSpaceIdFromCollectionId,
   getSpaceKeyFromDoc: () => getSpaceKeyFromDoc,
-  hasInvitationExpired: () => import_chunk_TC2PRBEU.hasInvitationExpired,
-  mapFeedIndexesToTimeframe: () => import_chunk_TC2PRBEU.mapFeedIndexesToTimeframe,
-  mapTimeframeToFeedIndexes: () => import_chunk_TC2PRBEU.mapTimeframeToFeedIndexes,
-  startAfter: () => import_chunk_TC2PRBEU.startAfter,
-  valueEncoding: () => import_chunk_TC2PRBEU.valueEncoding
+  hasInvitationExpired: () => import_chunk_QD3U65NM.hasInvitationExpired,
+  mapFeedIndexesToTimeframe: () => import_chunk_QD3U65NM.mapFeedIndexesToTimeframe,
+  mapTimeframeToFeedIndexes: () => import_chunk_QD3U65NM.mapTimeframeToFeedIndexes,
+  startAfter: () => import_chunk_QD3U65NM.startAfter,
+  valueEncoding: () => import_chunk_QD3U65NM.valueEncoding
 });
 module.exports = __toCommonJS(node_exports);
-var import_chunk_TC2PRBEU = require("./chunk-TC2PRBEU.cjs");
+var import_chunk_QD3U65NM = require("./chunk-QD3U65NM.cjs");
 var import_async = require("@dxos/async");
 var import_stream = require("@dxos/codec-protobuf/stream");
 var import_invariant = require("@dxos/invariant");
 var import_keys = require("@dxos/keys");
 var import_log = require("@dxos/log");
+var import_automerge = require("@automerge/automerge");
 var import_async2 = require("@dxos/async");
-var import_automerge = require("@dxos/automerge/automerge");
 var import_context = require("@dxos/context");
 var import_invariant2 = require("@dxos/invariant");
 var import_log2 = require("@dxos/log");
+var import_automerge2 = require("@automerge/automerge");
+var import_automerge_repo = require("@automerge/automerge-repo");
 var import_async3 = require("@dxos/async");
-var import_automerge2 = require("@dxos/automerge/automerge");
-var import_automerge_repo = require("@dxos/automerge/automerge-repo");
 var import_context2 = require("@dxos/context");
 var import_invariant3 = require("@dxos/invariant");
 var import_keys2 = require("@dxos/keys");
@@ -91,14 +92,14 @@ var import_log3 = require("@dxos/log");
 var import_protocols = require("@dxos/protocols");
 var import_tracing = require("@dxos/tracing");
 var import_util = require("@dxos/util");
+var import_automerge3 = require("@automerge/automerge");
 var import_async4 = require("@dxos/async");
-var import_automerge3 = require("@dxos/automerge/automerge");
 var import_context3 = require("@dxos/context");
 var import_log4 = require("@dxos/log");
 var import_tracing2 = require("@dxos/tracing");
 var import_util2 = require("@dxos/util");
+var import_automerge_repo2 = require("@automerge/automerge-repo");
 var import_async5 = require("@dxos/async");
-var import_automerge_repo2 = require("@dxos/automerge/automerge-repo");
 var import_context4 = require("@dxos/context");
 var import_invariant4 = require("@dxos/invariant");
 var import_log5 = require("@dxos/log");
@@ -110,8 +111,8 @@ 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("@dxos/automerge/automerge"));
-var import_automerge_repo3 = require("@dxos/automerge/automerge-repo");
+var A2 = __toESM(require("@automerge/automerge"));
+var import_automerge_repo3 = require("@automerge/automerge-repo");
 var import_context6 = require("@dxos/context");
 var import_invariant6 = require("@dxos/invariant");
 var import_log7 = require("@dxos/log");
@@ -127,14 +128,14 @@ var import_indexing2 = require("@dxos/indexing");
 var import_invariant8 = require("@dxos/invariant");
 var import_indexing3 = require("@dxos/protocols/proto/dxos/echo/indexing");
 var import_tracing4 = require("@dxos/tracing");
-var A3 = __toESM(require("@dxos/automerge/automerge"));
+var A3 = __toESM(require("@automerge/automerge"));
 var import_context8 = require("@dxos/context");
 var import_echo_protocol2 = require("@dxos/echo-protocol");
 var import_invariant9 = require("@dxos/invariant");
 var import_log8 = require("@dxos/log");
 var import_protocols3 = require("@dxos/protocols");
+var import_automerge4 = require("@automerge/automerge");
 var import_async6 = require("@dxos/async");
-var import_automerge4 = require("@dxos/automerge/automerge");
 var import_stream2 = require("@dxos/codec-protobuf/stream");
 var import_context9 = require("@dxos/context");
 var import_log9 = require("@dxos/log");
@@ -147,17 +148,17 @@ var import_keys5 = require("@dxos/keys");
 var import_protocols5 = require("@dxos/protocols");
 var import_tracing6 = require("@dxos/tracing");
 var import_util6 = require("@dxos/util");
+var import_automerge_repo4 = require("@automerge/automerge-repo");
 var import_lodash = __toESM(require("lodash.isequal"));
 var import_async7 = require("@dxos/async");
-var import_automerge_repo4 = require("@dxos/automerge/automerge-repo");
 var import_context11 = require("@dxos/context");
-var import_automerge_repo5 = require("@dxos/automerge/automerge-repo");
+var import_automerge_repo5 = require("@automerge/automerge-repo");
 var import_echo_protocol4 = require("@dxos/echo-protocol");
 var import_invariant11 = require("@dxos/invariant");
-var A4 = __toESM(require("@dxos/automerge/automerge"));
+var A4 = __toESM(require("@automerge/automerge"));
 var import_log10 = require("@dxos/log");
+var import_automerge_repo6 = require("@automerge/automerge-repo");
 var import_async8 = require("@dxos/async");
-var import_automerge_repo6 = require("@dxos/automerge/automerge-repo");
 var import_context12 = require("@dxos/context");
 var import_crypto = require("@dxos/crypto");
 var import_invariant12 = require("@dxos/invariant");
@@ -186,15 +187,15 @@ var DocumentsSynchronizer = class extends import_context.Resource {
         documentIds
       }, {
         F: __dxlog_file,
-        L: 49,
+        L: 50,
         S: this,
         C: (f, a) => f(...a)
       });
       return;
     }
     for (const documentId of documentIds) {
-      const doc = this._params.repo.find(documentId);
-      doc.whenReady().then(() => {
+      this._params.repo.find(documentId).then(async (doc) => {
+        await doc.whenReady();
         this._startSync(doc);
         this._pendingUpdates.add(doc.documentId);
         this._sendUpdatesJob.trigger();
@@ -204,7 +205,7 @@ var DocumentsSynchronizer = class extends import_context.Resource {
           error
         }, {
           F: __dxlog_file,
-          L: 63,
+          L: 64,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -233,7 +234,7 @@ var DocumentsSynchronizer = class extends import_context.Resource {
   update(updates) {
     for (const { documentId, mutation, isNew } of updates) {
       if (isNew) {
-        const doc = this._params.repo.find(documentId);
+        const { handle: doc } = this._params.repo.findWithProgress(documentId);
         doc.update((doc2) => import_automerge.next.loadIncremental(doc2, mutation));
         this._startSync(doc);
       } else {
@@ -247,7 +248,7 @@ var DocumentsSynchronizer = class extends import_context.Resource {
         documentId: doc.documentId
       }, {
         F: __dxlog_file,
-        L: 102,
+        L: 103,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -290,17 +291,18 @@ var DocumentsSynchronizer = class extends import_context.Resource {
     const syncState = this._syncStates.get(documentId);
     (0, import_invariant2.invariant)(syncState, "Sync state for document not found", {
       F: __dxlog_file,
-      L: 143,
+      L: 144,
       S: this,
       A: [
         "syncState",
         "'Sync state for document not found'"
       ]
     });
-    const doc = syncState.handle.docSync();
-    if (!doc) {
+    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;
@@ -312,7 +314,7 @@ var DocumentsSynchronizer = class extends import_context.Resource {
     const syncState = this._syncStates.get(documentId);
     (0, import_invariant2.invariant)(syncState, "Sync state for document not found", {
       F: __dxlog_file,
-      L: 158,
+      L: 160,
       S: this,
       A: [
         "syncState",
@@ -374,7 +376,7 @@ var CollectionSynchronizer = class extends import_context3.Resource {
       state
     }, {
       F: __dxlog_file2,
-      L: 75,
+      L: 76,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -393,7 +395,7 @@ var CollectionSynchronizer = class extends import_context3.Resource {
       collectionId
     }, {
       F: __dxlog_file2,
-      L: 89,
+      L: 90,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -476,7 +478,7 @@ var CollectionSynchronizer = class extends import_context3.Resource {
       state
     }, {
       F: __dxlog_file2,
-      L: 170,
+      L: 171,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -587,6 +589,13 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     this._connections = /* @__PURE__ */ new Map();
     this._lifecycleState = import_context4.LifecycleState.CLOSED;
     this._connected = new import_async5.Trigger();
+    this._ready = new import_async5.Trigger();
+  }
+  isReady() {
+    return this._lifecycleState === import_context4.LifecycleState.OPEN;
+  }
+  whenReady() {
+    return this._ready.wait();
   }
   connect(peerId, peerMetadata) {
     this.peerId = peerId;
@@ -603,15 +612,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       return;
     }
     this._lifecycleState = import_context4.LifecycleState.OPEN;
-    (0, import_log5.log)("emit ready", void 0, {
-      F: __dxlog_file3,
-      L: 82,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this.emit("ready", {
-      network: this
-    });
+    this._ready.wake();
   }
   async close() {
     if (this._lifecycleState === import_context4.LifecycleState.CLOSED) {
@@ -621,6 +622,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       await replicator.disconnect();
     }
     this._replicators.clear();
+    this._ready.reset();
     this._lifecycleState = import_context4.LifecycleState.CLOSED;
   }
   async whenConnected() {
@@ -631,7 +633,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,
-      L: 108,
+      L: 115,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -640,7 +642,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     });
     (0, import_invariant4.invariant)(this.peerId, void 0, {
       F: __dxlog_file3,
-      L: 109,
+      L: 116,
       S: this,
       A: [
         "this.peerId",
@@ -649,7 +651,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     });
     (0, import_invariant4.invariant)(!this._replicators.has(replicator), void 0, {
       F: __dxlog_file3,
-      L: 110,
+      L: 117,
       S: this,
       A: [
         "!this._replicators.has(replicator)",
@@ -666,14 +668,14 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       getContainingSpaceForDocument: this._params.getContainingSpaceForDocument,
       getContainingSpaceIdForDocument: async (documentId) => {
         const key = await this._params.getContainingSpaceForDocument(documentId);
-        return key ? (0, import_chunk_TC2PRBEU.createIdFromSpaceKey)(key) : null;
+        return key ? (0, import_chunk_QD3U65NM.createIdFromSpaceKey)(key) : null;
       }
     });
   }
   async removeReplicator(replicator) {
     (0, import_invariant4.invariant)(this._lifecycleState === import_context4.LifecycleState.OPEN, void 0, {
       F: __dxlog_file3,
-      L: 129,
+      L: 136,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -682,7 +684,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     });
     (0, import_invariant4.invariant)(this._replicators.has(replicator), void 0, {
       F: __dxlog_file3,
-      L: 130,
+      L: 137,
       S: this,
       A: [
         "this._replicators.has(replicator)",
@@ -738,7 +740,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       if (connectionEntry.isOpen) {
         import_log5.log.catch(err, void 0, {
           F: __dxlog_file3,
-          L: 190,
+          L: 197,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -759,13 +761,13 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file3,
-      L: 208,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant4.invariant)(!this._connections.has(connection.peerId), void 0, {
       F: __dxlog_file3,
-      L: 209,
+      L: 216,
       S: this,
       A: [
         "!this._connections.has(connection.peerId as PeerId)",
@@ -794,7 +796,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
         if (connectionEntry.isOpen) {
           import_log5.log.catch(err, void 0, {
             F: __dxlog_file3,
-            L: 228,
+            L: 235,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -805,7 +807,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file3,
-      L: 233,
+      L: 240,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -837,14 +839,14 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file3,
-      L: 261,
+      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,
-      L: 263,
+      L: 270,
       S: this,
       A: [
         "entry",
@@ -861,14 +863,14 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file3,
-      L: 269,
+      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,
-      L: 271,
+      L: 278,
       S: this,
       A: [
         "entry",
@@ -882,13 +884,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,
-      L: 277,
+      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,
-      L: 278,
+      L: 285,
       S: this,
       C: (f, a) => f(...a)
     }));
@@ -1047,6 +1049,12 @@ function _ts_decorate3(decorators, target, key, desc) {
   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 FIND_PARAMS = {
+  allowableStates: [
+    "ready",
+    "requesting"
+  ]
+};
 var AutomergeHost = class extends import_context2.Resource {
   constructor({ db, indexMetadataStore, dataMonitor, peerIdProvider, getSpaceKeyByRootDocumentId }) {
     super();
@@ -1146,7 +1154,7 @@ var AutomergeHost = class extends import_context2.Resource {
       handle = this._repo.handles[documentId];
     }
     if (!handle) {
-      handle = this._repo.find(documentId);
+      handle = await this._repo.find(documentId, FIND_PARAMS);
     }
     if (!handle.isReady()) {
       if (!opts?.timeout) {
@@ -1202,12 +1210,12 @@ var AutomergeHost = class extends import_context2.Resource {
       await Promise.all(headsToWait.map(async (entry, index) => {
         const handle = await this.loadDoc(import_context2.Context.default(void 0, {
           F: __dxlog_file4,
-          L: 282
+          L: 288
         }), entry.documentId);
         await waitForHeads(handle, entry.heads);
       }));
     }
-    await this._repo.flush(documentIds.filter((documentId) => !!this._repo.handles[documentId]));
+    await this._repo.flush(documentIds.filter((documentId) => this._repo.handles[documentId] && this._repo.handles[documentId].isReady()));
   }
   async reIndexHeads(documentIds) {
     for (const documentId of documentIds) {
@@ -1215,46 +1223,30 @@ var AutomergeHost = class extends import_context2.Resource {
         documentId
       }, {
         F: __dxlog_file4,
-        L: 294,
+        L: 302,
         S: this,
         C: (f, a) => f(...a)
       });
-      const handle = this._repo.find(documentId);
-      await handle.whenReady([
-        "ready",
-        "requesting"
-      ]);
-      if (handle.inState([
-        "requesting"
-      ])) {
+      const handle = await this._repo.find(documentId, FIND_PARAMS);
+      if (!handle.isReady()) {
         import_log3.log.warn("document is not available locally, skipping", {
           documentId
         }, {
           F: __dxlog_file4,
-          L: 298,
+          L: 305,
           S: this,
           C: (f, a) => f(...a)
         });
         continue;
       }
-      const doc = handle.docSync();
-      (0, import_invariant3.invariant)(doc, void 0, {
-        F: __dxlog_file4,
-        L: 303,
-        S: this,
-        A: [
-          "doc",
-          ""
-        ]
-      });
-      const heads = (0, import_automerge2.getHeads)(doc);
+      const heads = handle.heads();
       const batch = this._db.batch();
       this._headsStore.setHeads(documentId, heads, batch);
       await batch.write();
     }
     import_log3.log.info("done re-indexing heads", void 0, {
       F: __dxlog_file4,
-      L: 310,
+      L: 314,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1280,10 +1272,10 @@ var AutomergeHost = class extends import_context2.Resource {
   }
   async _beforeSave({ path, batch }) {
     const handle = this._repo.handles[path[0]];
-    if (!handle) {
+    if (!handle || !handle.isReady()) {
       return;
     }
-    const doc = handle.docSync();
+    const doc = handle.doc();
     if (!doc) {
       return;
     }
@@ -1317,7 +1309,7 @@ var AutomergeHost = class extends import_context2.Resource {
   async _afterSave(path) {
     this._indexMetadataStore.notifyMarkedDirty();
     const documentId = path[0];
-    const document = this._repo.handles[documentId]?.docSync();
+    const document = this._repo.handles[documentId]?.doc();
     if (document) {
       const heads = (0, import_automerge2.getHeads)(document);
       this._onHeadsChanged(documentId, heads);
@@ -1337,9 +1329,12 @@ var AutomergeHost = class extends import_context2.Resource {
     return false;
   }
   async _getContainingSpaceForDocument(documentId) {
-    const doc = this._repo.handles[documentId]?.docSync();
-    if (doc) {
-      const spaceKeyHex = getSpaceKeyFromDoc(doc);
+    const handle = this._repo.handles[documentId];
+    if (handle.state === "loading") {
+      await handle.whenReady();
+    }
+    if (handle && handle.isReady() && handle.doc()) {
+      const spaceKeyHex = getSpaceKeyFromDoc(handle.doc());
       if (spaceKeyHex) {
         return import_keys2.PublicKey.from(spaceKeyHex);
       }
@@ -1362,9 +1357,9 @@ var AutomergeHost = class extends import_context2.Resource {
     const storeRequestIds = [];
     const storeResultIndices = [];
     for (const documentId of documentIds) {
-      const doc = this._repo.handles[documentId]?.docSync();
-      if (doc) {
-        result.push((0, import_automerge2.getHeads)(doc));
+      const handle = this._repo.handles[documentId];
+      if (handle && handle.isReady() && handle.doc()) {
+        result.push((0, import_automerge2.getHeads)(handle.doc()));
       } else {
         storeRequestIds.push(documentId);
         storeResultIndices.push(result.length);
@@ -1469,12 +1464,12 @@ var AutomergeHost = class extends import_context2.Resource {
       count: toReplicate.length
     }, {
       F: __dxlog_file4,
-      L: 549,
+      L: 556,
       S: this,
       C: (f, a) => f(...a)
     });
     for (const documentId of toReplicate) {
-      this._repo.find(documentId);
+      this._repo.findWithProgress(documentId);
     }
   }
   _onHeadsChanged(documentId, heads) {
@@ -1523,7 +1518,7 @@ var waitForHeads = async (handle, heads) => {
   await handle.whenReady();
   await import_async3.Event.wrap(handle, "change").waitForCondition(() => {
     for (const changeHash of unavailableHeads.values()) {
-      if (changeIsPresentInDoc(handle.docSync(), changeHash)) {
+      if (changeIsPresentInDoc(handle.doc(), changeHash)) {
         unavailableHeads.delete(changeHash);
       }
     }
@@ -1536,7 +1531,7 @@ var changeIsPresentInDoc = (doc, changeHash) => {
 var decodeCollectionState = (state) => {
   (0, import_invariant3.invariant)(typeof state === "object" && state !== null, "Invalid state", {
     F: __dxlog_file4,
-    L: 610,
+    L: 617,
     S: void 0,
     A: [
       "typeof state === 'object' && state !== null",
@@ -1568,7 +1563,7 @@ var MeshReplicatorConnection = class extends import_context6.Resource {
       write: async (message, controller) => {
         (0, import_invariant6.invariant)(this._isEnabled, "Writing to a disabled connection", {
           F: __dxlog_file5,
-          L: 50,
+          L: 51,
           S: this,
           A: [
             "this._isEnabled",
@@ -1601,7 +1596,7 @@ var MeshReplicatorConnection = class extends import_context6.Resource {
             remotePeerId: remotePeerId.toHex()
           }, {
             F: __dxlog_file5,
-            L: 79,
+            L: 80,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1628,7 +1623,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,
-      L: 105,
+      L: 106,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1653,7 +1648,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,
-      L: 126,
+      L: 127,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1684,7 +1679,7 @@ var logSendSync = (message) => {
     };
   }, {
     F: __dxlog_file5,
-    L: 139,
+    L: 140,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -1695,7 +1690,7 @@ var getSpaceIdFromCollectionId = (collectionId) => {
   const spaceId = collectionId.split(":")[1];
   (0, import_invariant7.invariant)(import_keys4.SpaceId.isValid(spaceId), void 0, {
     F: __dxlog_file6,
-    L: 15,
+    L: 16,
     S: void 0,
     A: [
       "SpaceId.isValid(spaceId)",
@@ -1843,7 +1838,7 @@ var MeshEchoReplicator = class {
             });
             return remoteDocumentExists;
           }
-          const spaceId = await (0, import_chunk_TC2PRBEU.createIdFromSpaceKey)(spaceKey);
+          const spaceId = await (0, import_chunk_QD3U65NM.createIdFromSpaceKey)(spaceKey);
           const authorizedDevices = this._authorizedDevices.get(spaceId);
           if (!connection.remoteDeviceKey) {
             (0, import_log6.log)("device key not found for share policy check", {
@@ -1914,7 +1909,7 @@ var MeshEchoReplicator = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    const spaceId = await (0, import_chunk_TC2PRBEU.createIdFromSpaceKey)(spaceKey);
+    const spaceId = await (0, import_chunk_QD3U65NM.createIdFromSpaceKey)(spaceKey);
     (0, import_util4.defaultMap)(this._authorizedDevices, spaceId, () => new import_util4.ComplexSet(import_keys3.PublicKey.hash)).add(deviceKey);
     for (const connection of this._connections) {
       if (connection.isEnabled && connection.remoteDeviceKey && connection.remoteDeviceKey.equals(deviceKey)) {
@@ -1943,7 +1938,7 @@ var EchoDataMonitor = class {
     this._localTimeSeries = createLocalTimeSeries();
     this._storageAverages = createStorageAverages();
     this._replicationAverages = createNetworkAverages();
-    this._sizeByMessageType = {};
+    this._sizeByMessage = {};
     this._lastReceivedMessages = new import_util5.CircularBuffer(100);
     this._lastSentMessages = new import_util5.CircularBuffer(100);
     this._connectionsCount = 0;
@@ -1981,8 +1976,8 @@ var EchoDataMonitor = class {
           countPerSecond: this._replicationAverages.sentPerSecond.average(),
           failedPerSecond: this._replicationAverages.sendsFailedPerSecond.average()
         },
-        countByMessageType: this._computeMessageHistogram("type"),
-        avgSizeByMessageType: (0, import_util5.mapValues)(this._sizeByMessageType, (summary) => summary.average())
+        countByMessage: this._computeMessageHistogram("type"),
+        avgSizeByMessage: (0, import_util5.mapValues)(this._sizeByMessage, (summary) => summary.average())
       }
     };
   }
@@ -2187,7 +2182,7 @@ var EchoDataMonitor = class {
     messageCounts.failed++;
   }
   _getStatsForType(message) {
-    const messageSize = this._sizeByMessageType[message.type] ??= createSlidingWindow();
+    const messageSize = this._sizeByMessage[message.type] ??= createSlidingWindow();
     const messageCounts = this._activeCounters.byType[message.type] ??= createMessageCounter();
     return {
       messageCounts,
@@ -2301,7 +2296,7 @@ var DataServiceImpl = class {
         ready();
       }).catch((err) => import_log.log.catch(err, void 0, {
         F: __dxlog_file8,
-        L: 70,
+        L: 71,
         S: this,
         C: (f, a) => f(...a)
       }));
@@ -2312,7 +2307,7 @@ var DataServiceImpl = class {
     const synchronizer = this._subscriptions.get(request.subscriptionId);
     (0, import_invariant.invariant)(synchronizer, "Subscription not found", {
       F: __dxlog_file8,
-      L: 77,
+      L: 78,
       S: this,
       A: [
         "synchronizer",
@@ -2333,7 +2328,7 @@ var DataServiceImpl = class {
     const synchronizer = this._subscriptions.get(request.subscriptionId);
     (0, import_invariant.invariant)(synchronizer, "Subscription not found", {
       F: __dxlog_file8,
-      L: 92,
+      L: 93,
       S: this,
       A: [
         "synchronizer",
@@ -2378,7 +2373,7 @@ var DataServiceImpl = class {
       const spaceId = request.spaceId;
       (0, import_invariant.invariant)(import_keys.SpaceId.isValid(spaceId), void 0, {
         F: __dxlog_file8,
-        L: 132,
+        L: 133,
         S: this,
         A: [
           "SpaceId.isValid(spaceId)",
@@ -2431,12 +2426,12 @@ var createSelectedDocumentsIterator = (automergeHost) => (
         const { documentId, objectId } = import_protocols3.objectPointerCodec.decode(id);
         const handle = await automergeHost.loadDoc(import_context8.Context.default(void 0, {
           F: __dxlog_file9,
-          L: 30
+          L: 31
         }), documentId);
-        let doc = handle.docSync();
+        let doc = handle.doc();
         (0, import_invariant9.invariant)(doc, void 0, {
           F: __dxlog_file9,
-          L: 33,
+          L: 34,
           S: this,
           A: [
             "doc",
@@ -2455,7 +2450,7 @@ var createSelectedDocumentsIterator = (automergeHost) => (
               originalHeads: currentHeads
             }, {
               F: __dxlog_file9,
-              L: 44,
+              L: 45,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2490,7 +2485,7 @@ var createSelectedDocumentsIterator = (automergeHost) => (
           error
         }, {
           F: __dxlog_file9,
-          L: 70,
+          L: 71,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2550,12 +2545,12 @@ var QueryState = class extends import_context10.Resource {
         }
         const handle = await this._params.automergeHost.loadDoc(import_context10.Context.default(void 0, {
           F: __dxlog_file10,
-          L: 117
+          L: 118
         }), documentId);
         if (this._ctx.disposed) {
           return;
         }
-        spaceKey = getSpaceKeyFromDoc(handle.docSync());
+        spaceKey = getSpaceKeyFromDoc(handle.doc());
       }
       if (!spaceKey) {
         return;
@@ -2563,13 +2558,17 @@ var QueryState = class extends import_context10.Resource {
       if (this._params.request.filter.options?.spaces?.length && !this._params.request.filter.options.spaces.some((key) => key.equals(spaceKey))) {
         return;
       }
+      const spaceId = await (0, import_echo_protocol3.createIdFromSpaceKey)(import_keys5.PublicKey.from(spaceKey));
+      if (this._params.request.filter.options?.spaceIds?.length && !this._params.request.filter.options.spaceIds.includes(spaceId)) {
+        return;
+      }
       if (this._firstRun) {
         this.metrics.objectsReturned++;
       }
       return {
         id: objectId,
         documentId,
-        spaceId: await (0, import_echo_protocol3.createIdFromSpaceKey)(import_keys5.PublicKey.from(spaceKey)),
+        spaceId,
         spaceKey: import_keys5.PublicKey.from(spaceKey),
         rank: result.rank
       };
@@ -2625,7 +2624,7 @@ var filterToIndexQuery = (filter) => {
   const { type = [], or = [] } = filter;
   (0, import_invariant10.invariant)(!(type.length > 0 && or.length > 0), "Cannot mix type and or filters.", {
     F: __dxlog_file10,
-    L: 186,
+    L: 194,
     S: void 0,
     A: [
       "!(type.length > 0 && or.length > 0)",
@@ -2634,7 +2633,7 @@ var filterToIndexQuery = (filter) => {
   });
   (0, import_invariant10.invariant)(or.every((subFilter) => !((subFilter.type ?? []).length > 0 && (subFilter.or ?? []).length > 0)), "Cannot mix type and or filters.", {
     F: __dxlog_file10,
-    L: 187,
+    L: 195,
     S: void 0,
     A: [
       "or.every((subFilter) => !((subFilter.type ?? []).length > 0 && (subFilter.or ?? []).length > 0))",
@@ -2679,7 +2678,7 @@ var QueryServiceImpl = class extends import_context9.Resource {
         } catch (err) {
           import_log9.log.catch(err, void 0, {
             F: __dxlog_file11,
-            L: 52,
+            L: 53,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2709,7 +2708,7 @@ var QueryServiceImpl = class extends import_context9.Resource {
     if (this._params.indexer.initialized) {
       import_log9.log.warn("Indexer already initialized.", void 0, {
         F: __dxlog_file11,
-        L: 86,
+        L: 87,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2751,7 +2750,7 @@ var QueryServiceImpl = class extends import_context9.Resource {
         } catch (error) {
           import_log9.log.catch(error, void 0, {
             F: __dxlog_file11,
-            L: 123,
+            L: 124,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2766,7 +2765,7 @@ var QueryServiceImpl = class extends import_context9.Resource {
   async reindex() {
     import_log9.log.info("Reindexing all documents...", void 0, {
       F: __dxlog_file11,
-      L: 135,
+      L: 136,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2781,7 +2780,7 @@ var QueryServiceImpl = class extends import_context9.Resource {
           count: ids.size
         }, {
           F: __dxlog_file11,
-          L: 143,
+          L: 144,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2791,7 +2790,7 @@ var QueryServiceImpl = class extends import_context9.Resource {
       count: ids.size
     }, {
       F: __dxlog_file11,
-      L: 147,
+      L: 148,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2806,10 +2805,10 @@ var createDocumentsIterator = (automergeHost) => (
   async function* getAllDocuments() {
     const visited = /* @__PURE__ */ new Set();
     async function* getObjectsFromHandle(handle) {
-      if (visited.has(handle.documentId)) {
+      if (visited.has(handle.documentId) || !handle.isReady()) {
         return;
       }
-      const doc = handle.docSync();
+      const doc = handle.doc();
       const spaceKey = getSpaceKeyFromDoc(doc) ?? void 0;
       if (doc.objects) {
         yield Object.entries(doc.objects).map(([objectId, object]) => {
@@ -2832,7 +2831,7 @@ var createDocumentsIterator = (automergeHost) => (
           }
           const linkHandle = await automergeHost.loadDoc(import_context9.Context.default(void 0, {
             F: __dxlog_file11,
-            L: 189
+            L: 190
           }), urlString);
           for await (const result of getObjectsFromHandle(linkHandle)) {
             yield result;
@@ -2867,7 +2866,7 @@ var measureDocMetrics = (doc) => {
       elapsed: getAllChangesEnd - getAllChangesStart
     }, {
       F: __dxlog_file12,
-      L: 30,
+      L: 31,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -2903,47 +2902,47 @@ var DatabaseRoot = class {
     return this._rootHandle.url;
   }
   get isLoaded() {
-    return !!this._rootHandle.docSync();
+    return this._rootHandle.isReady();
   }
   get handle() {
     return this._rootHandle;
   }
-  docSync() {
-    return this._rootHandle.docSync() ?? null;
+  doc() {
+    return this._rootHandle.isReady() ? this._rootHandle.doc() : null;
   }
   getVersion() {
-    const doc = this.docSync();
+    const doc = this.doc();
     if (!doc) {
       return null;
     }
     return doc.version ?? import_echo_protocol4.SpaceDocVersion.LEGACY;
   }
   getSpaceKey() {
-    const doc = this.docSync();
+    const doc = this.doc();
     if (!doc) {
       return null;
     }
     return getSpaceKeyFromDoc(doc);
   }
   getInlineObjectCount() {
-    const doc = this.docSync();
+    const doc = this.doc();
     if (!doc) {
       return null;
     }
     return Object.keys(doc.objects ?? {}).length;
   }
   getLinkedObjectCount() {
-    const doc = this.docSync();
+    const doc = this.doc();
     if (!doc) {
       return null;
     }
     return Object.keys(doc.links ?? {}).length;
   }
   getAllLinkedDocuments() {
-    const doc = this.docSync();
+    const doc = this.doc();
     (0, import_invariant11.invariant)(doc, void 0, {
       F: __dxlog_file13,
-      L: 93,
+      L: 89,
       S: this,
       A: [
         "doc",
@@ -2953,7 +2952,7 @@ var DatabaseRoot = class {
     return Object.values(doc.links ?? {}).map((s) => s.toString());
   }
   measureMetrics() {
-    const doc = this.docSync();
+    const doc = this.doc();
     if (!doc) {
       return null;
     }
@@ -3185,7 +3184,7 @@ var EchoHost = class extends import_context7.Resource {
   async createSpaceRoot(spaceKey) {
     (0, import_invariant8.invariant)(this._lifecycleState === import_context7.LifecycleState.OPEN, void 0, {
       F: __dxlog_file15,
-      L: 224,
+      L: 226,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -3213,14 +3212,15 @@ var EchoHost = class extends import_context7.Resource {
   async openSpaceRoot(spaceId, automergeUrl) {
     (0, import_invariant8.invariant)(this._lifecycleState === import_context7.LifecycleState.OPEN, void 0, {
       F: __dxlog_file15,
-      L: 243,
+      L: 245,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
         ""
       ]
     });
-    const handle = this._automergeHost.repo.find(automergeUrl);
+    const handle = await this._automergeHost.repo.find(automergeUrl, FIND_PARAMS);
+    await handle.whenReady();
     return this._spaceStateManager.assignRootToSpace(spaceId, handle);
   }
   // TODO(dmaretskyi): Change to document id.
@@ -3374,14 +3374,14 @@ var EchoEdgeReplicator = class {
       connectedSpaces: this._connectedSpaces.size
     }, {
       F: __dxlog_file17,
-      L: 60,
+      L: 61,
       S: this,
       C: (f, a) => f(...a)
     });
     this._context = context;
     this._ctx = import_context12.Context.default(void 0, {
       F: __dxlog_file17,
-      L: 63
+      L: 64
     });
     this._ctx.onDispose(this._edgeConnection.onReconnected(() => {
       this._ctx && (0, import_async8.scheduleMicroTask)(this._ctx, () => this._handleReconnect());
@@ -3460,7 +3460,7 @@ var EchoEdgeReplicator = class {
   async _openConnection(spaceId, reconnects = 0) {
     (0, import_invariant12.invariant)(this._context, void 0, {
       F: __dxlog_file17,
-      L: 124,
+      L: 125,
       S: this,
       A: [
         "this._context",
@@ -3469,7 +3469,7 @@ var EchoEdgeReplicator = class {
     });
     (0, import_invariant12.invariant)(!this._connections.has(spaceId), void 0, {
       F: __dxlog_file17,
-      L: 125,
+      L: 126,
       S: this,
       A: [
         "!this._connections.has(spaceId)",
@@ -3499,7 +3499,7 @@ var EchoEdgeReplicator = class {
           restartDelay
         }, {
           F: __dxlog_file17,
-          L: 148,
+          L: 149,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3564,7 +3564,7 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
   async _open(ctx) {
     (0, import_log11.log)("opening...", void 0, {
       F: __dxlog_file17,
-      L: 251,
+      L: 252,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3577,7 +3577,7 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
   async _close() {
     (0, import_log11.log)("closing...", void 0, {
       F: __dxlog_file17,
-      L: 266,
+      L: 267,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3588,7 +3588,7 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
   get peerId() {
     (0, import_invariant12.invariant)(this._remotePeerId, "Not connected", {
       F: __dxlog_file17,
-      L: 275,
+      L: 276,
       S: this,
       A: [
         "this._remotePeerId",
@@ -3613,7 +3613,7 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
         remoteId: this._remotePeerId
       }, {
         F: __dxlog_file17,
-        L: 290,
+        L: 291,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3639,7 +3639,7 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
       remoteId: this._remotePeerId
     }, {
       F: __dxlog_file17,
-      L: 319,
+      L: 320,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3662,7 +3662,7 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
       remoteId: this._remotePeerId
     }, {
       F: __dxlog_file17,
-      L: 348,
+      L: 349,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3705,6 +3705,7 @@ var findInlineObjectOfType = (spaceDoc, typename) => {
   EchoDataMonitor,
   EchoEdgeReplicator,
   EchoHost,
+  FIND_PARAMS,
   LevelDBStorageAdapter,
   MOCK_AUTH_PROVIDER,
   MOCK_AUTH_VERIFIER,