@dxos/echo-pipeline 0.6.0 → 0.6.1-main.04e8aa0

package/dist/lib/node/index.cjs

@@ -18,71 +18,74 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var node_exports = {};
 __export(node_exports, {
-  AuthExtension: () => import_chunk_Y5U7UXEL.AuthExtension,
-  AuthStatus: () => import_chunk_Y5U7UXEL.AuthStatus,
+  AuthExtension: () => import_chunk_GHBIMYZK.AuthExtension,
+  AuthStatus: () => import_chunk_GHBIMYZK.AuthStatus,
   AutomergeDocumentLoaderImpl: () => AutomergeDocumentLoaderImpl,
   AutomergeHost: () => AutomergeHost,
-  CredentialRetrieverExtension: () => import_chunk_Y5U7UXEL.CredentialRetrieverExtension,
-  CredentialServerExtension: () => import_chunk_Y5U7UXEL.CredentialServerExtension,
-  DataServiceImpl: () => import_chunk_Y5U7UXEL.DataServiceImpl,
+  CredentialRetrieverExtension: () => import_chunk_GHBIMYZK.CredentialRetrieverExtension,
+  CredentialServerExtension: () => import_chunk_GHBIMYZK.CredentialServerExtension,
+  DataServiceImpl: () => import_chunk_GHBIMYZK.DataServiceImpl,
   LevelDBStorageAdapter: () => LevelDBStorageAdapter,
   LocalHostNetworkAdapter: () => LocalHostNetworkAdapter,
-  MOCK_AUTH_PROVIDER: () => import_chunk_Y5U7UXEL.MOCK_AUTH_PROVIDER,
-  MOCK_AUTH_VERIFIER: () => import_chunk_Y5U7UXEL.MOCK_AUTH_VERIFIER,
+  MOCK_AUTH_PROVIDER: () => import_chunk_GHBIMYZK.MOCK_AUTH_PROVIDER,
+  MOCK_AUTH_VERIFIER: () => import_chunk_GHBIMYZK.MOCK_AUTH_VERIFIER,
   MeshEchoReplicator: () => MeshEchoReplicator,
-  MetadataStore: () => import_chunk_Y5U7UXEL.MetadataStore,
-  Pipeline: () => import_chunk_Y5U7UXEL.Pipeline,
-  SnapshotManager: () => import_chunk_Y5U7UXEL.SnapshotManager,
-  SnapshotStore: () => import_chunk_Y5U7UXEL.SnapshotStore,
-  Space: () => import_chunk_Y5U7UXEL.Space,
-  SpaceManager: () => import_chunk_Y5U7UXEL.SpaceManager,
-  SpaceProtocol: () => import_chunk_Y5U7UXEL.SpaceProtocol,
-  SpaceProtocolSession: () => import_chunk_Y5U7UXEL.SpaceProtocolSession,
-  TimeframeClock: () => import_chunk_Y5U7UXEL.TimeframeClock,
-  codec: () => import_chunk_Y5U7UXEL.codec,
-  createIdFromSpaceKey: () => import_chunk_Y5U7UXEL.createIdFromSpaceKey,
-  createMappedFeedWriter: () => import_chunk_Y5U7UXEL.createMappedFeedWriter,
+  MetadataStore: () => import_chunk_GHBIMYZK.MetadataStore,
+  Pipeline: () => import_chunk_GHBIMYZK.Pipeline,
+  SnapshotManager: () => import_chunk_GHBIMYZK.SnapshotManager,
+  SnapshotStore: () => import_chunk_GHBIMYZK.SnapshotStore,
+  Space: () => import_chunk_GHBIMYZK.Space,
+  SpaceManager: () => import_chunk_GHBIMYZK.SpaceManager,
+  SpaceProtocol: () => import_chunk_GHBIMYZK.SpaceProtocol,
+  SpaceProtocolSession: () => import_chunk_GHBIMYZK.SpaceProtocolSession,
+  TimeframeClock: () => import_chunk_GHBIMYZK.TimeframeClock,
+  codec: () => import_chunk_GHBIMYZK.codec,
+  createIdFromSpaceKey: () => import_chunk_GHBIMYZK.createIdFromSpaceKey,
+  createMappedFeedWriter: () => import_chunk_GHBIMYZK.createMappedFeedWriter,
   encodingOptions: () => encodingOptions,
   getSpaceKeyFromDoc: () => getSpaceKeyFromDoc,
-  hasInvitationExpired: () => import_chunk_Y5U7UXEL.hasInvitationExpired,
-  mapFeedIndexesToTimeframe: () => import_chunk_Y5U7UXEL.mapFeedIndexesToTimeframe,
-  mapTimeframeToFeedIndexes: () => import_chunk_Y5U7UXEL.mapTimeframeToFeedIndexes,
-  startAfter: () => import_chunk_Y5U7UXEL.startAfter,
-  valueEncoding: () => import_chunk_Y5U7UXEL.valueEncoding
+  hasInvitationExpired: () => import_chunk_GHBIMYZK.hasInvitationExpired,
+  mapFeedIndexesToTimeframe: () => import_chunk_GHBIMYZK.mapFeedIndexesToTimeframe,
+  mapTimeframeToFeedIndexes: () => import_chunk_GHBIMYZK.mapTimeframeToFeedIndexes,
+  startAfter: () => import_chunk_GHBIMYZK.startAfter,
+  valueEncoding: () => import_chunk_GHBIMYZK.valueEncoding
 });
 module.exports = __toCommonJS(node_exports);
-var import_chunk_Y5U7UXEL = require("./chunk-Y5U7UXEL.cjs");
+var import_chunk_GHBIMYZK = require("./chunk-GHBIMYZK.cjs");
 var import_async = require("@dxos/async");
 var import_automerge = require("@dxos/automerge/automerge");
 var import_automerge_repo = require("@dxos/automerge/automerge-repo");
 var import_context = require("@dxos/context");
+var import_invariant = require("@dxos/invariant");
 var import_keys = require("@dxos/keys");
+var import_log = require("@dxos/log");
 var import_protocols = require("@dxos/protocols");
 var import_tracing = require("@dxos/tracing");
 var import_util = require("@dxos/util");
 var import_async2 = require("@dxos/async");
 var import_automerge_repo2 = require("@dxos/automerge/automerge-repo");
 var import_context2 = require("@dxos/context");
-var import_invariant = require("@dxos/invariant");
-var import_log = require("@dxos/log");
+var import_invariant2 = require("@dxos/invariant");
+var import_log2 = require("@dxos/log");
+var import_indexing = require("@dxos/indexing");
 var import_context3 = require("@dxos/context");
 var import_async3 = require("@dxos/async");
 var import_automerge_repo3 = require("@dxos/automerge/automerge-repo");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
-var import_invariant2 = require("@dxos/invariant");
+var import_invariant3 = require("@dxos/invariant");
 var import_async4 = require("@dxos/async");
 var import_automerge_repo4 = require("@dxos/automerge/automerge-repo");
 var import_context4 = require("@dxos/context");
 var import_debug = require("@dxos/debug");
 var import_echo_protocol = require("@dxos/echo-protocol");
-var import_invariant3 = require("@dxos/invariant");
-var import_log2 = require("@dxos/log");
+var import_invariant4 = require("@dxos/invariant");
+var import_log3 = require("@dxos/log");
 var import_tracing2 = require("@dxos/tracing");
 var import_automerge_repo5 = require("@dxos/automerge/automerge-repo");
 var import_context5 = require("@dxos/context");
-var import_invariant4 = require("@dxos/invariant");
+var import_invariant5 = require("@dxos/invariant");
 var import_keys2 = require("@dxos/keys");
-var import_log3 = require("@dxos/log");
+var import_log4 = require("@dxos/log");
 var import_teleport_extension_automerge_replicator = require("@dxos/teleport-extension-automerge-replicator");
 var import_util2 = require("@dxos/util");
 function _ts_decorate(decorators, target, key, desc) {
@@ -117,7 +120,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     }
     connectionEntry.writer.write(message).catch((err) => {
       if (connectionEntry.isOpen) {
-        import_log.log.catch(err, void 0, {
+        import_log2.log.catch(err, void 0, {
           F: __dxlog_file,
           L: 49,
           S: this,
@@ -129,19 +132,13 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
   disconnect() {
   }
   async open() {
-    (0, import_invariant.invariant)(this._lifecycleState === import_context2.LifecycleState.CLOSED, void 0, {
-      F: __dxlog_file,
-      L: 60,
-      S: this,
-      A: [
-        "this._lifecycleState === LifecycleState.CLOSED",
-        ""
-      ]
-    });
+    if (this._lifecycleState === import_context2.LifecycleState.OPEN) {
+      return;
+    }
     this._lifecycleState = import_context2.LifecycleState.OPEN;
-    (0, import_log.log)("emit ready", void 0, {
+    (0, import_log2.log)("emit ready", void 0, {
       F: __dxlog_file,
-      L: 63,
+      L: 65,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -150,15 +147,9 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     });
   }
   async close() {
-    (0, import_invariant.invariant)(this._lifecycleState === import_context2.LifecycleState.OPEN, void 0, {
-      F: __dxlog_file,
-      L: 71,
-      S: this,
-      A: [
-        "this._lifecycleState === LifecycleState.OPEN",
-        ""
-      ]
-    });
+    if (this._lifecycleState === import_context2.LifecycleState.CLOSED) {
+      return;
+    }
     for (const replicator of this._replicators) {
       await replicator.disconnect();
     }
@@ -171,27 +162,27 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     });
   }
   async addReplicator(replicator) {
-    (0, import_invariant.invariant)(this._lifecycleState === import_context2.LifecycleState.OPEN, void 0, {
+    (0, import_invariant2.invariant)(this._lifecycleState === import_context2.LifecycleState.OPEN, void 0, {
       F: __dxlog_file,
-      L: 87,
+      L: 91,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
         ""
       ]
     });
-    (0, import_invariant.invariant)(this.peerId, void 0, {
+    (0, import_invariant2.invariant)(this.peerId, void 0, {
       F: __dxlog_file,
-      L: 88,
+      L: 92,
       S: this,
       A: [
         "this.peerId",
         ""
       ]
     });
-    (0, import_invariant.invariant)(!this._replicators.has(replicator), void 0, {
+    (0, import_invariant2.invariant)(!this._replicators.has(replicator), void 0, {
       F: __dxlog_file,
-      L: 89,
+      L: 93,
       S: this,
       A: [
         "!this._replicators.has(replicator)",
@@ -208,18 +199,18 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     });
   }
   async removeReplicator(replicator) {
-    (0, import_invariant.invariant)(this._lifecycleState === import_context2.LifecycleState.OPEN, void 0, {
+    (0, import_invariant2.invariant)(this._lifecycleState === import_context2.LifecycleState.OPEN, void 0, {
       F: __dxlog_file,
-      L: 103,
+      L: 107,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
         ""
       ]
     });
-    (0, import_invariant.invariant)(this._replicators.has(replicator), void 0, {
+    (0, import_invariant2.invariant)(this._replicators.has(replicator), void 0, {
       F: __dxlog_file,
-      L: 104,
+      L: 108,
       S: this,
       A: [
         "this._replicators.has(replicator)",
@@ -234,20 +225,20 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     if (!connection) {
       return false;
     }
-    return connection.connection.shouldAdvertize(params);
+    return connection.connection.shouldAdvertise(params);
   }
   _onConnectionOpen(connection) {
-    (0, import_log.log)("Connection opened", {
+    (0, import_log2.log)("Connection opened", {
       peerId: connection.peerId
     }, {
       F: __dxlog_file,
-      L: 119,
+      L: 123,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant.invariant)(!this._connections.has(connection.peerId), void 0, {
+    (0, import_invariant2.invariant)(!this._connections.has(connection.peerId), void 0, {
       F: __dxlog_file,
-      L: 120,
+      L: 124,
       S: this,
       A: [
         "!this._connections.has(connection.peerId as PeerId)",
@@ -274,20 +265,20 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
         }
       } catch (err) {
         if (connectionEntry.isOpen) {
-          import_log.log.catch(err, void 0, {
+          import_log2.log.catch(err, void 0, {
             F: __dxlog_file,
-            L: 139,
+            L: 143,
             S: this,
             C: (f, a) => f(...a)
           });
         }
       }
     });
-    (0, import_log.log)("emit peer-candidate", {
+    (0, import_log2.log)("emit peer-candidate", {
       peerId: connection.peerId
     }, {
       F: __dxlog_file,
-      L: 144,
+      L: 148,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -298,18 +289,18 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
   * TODO(y): replace with a proper API call when sharePolicy update becomes supported by automerge-repo
   */
   _onConnectionAuthScopeChanged(connection) {
-    (0, import_log.log)("Connection auth scope changed", {
+    (0, import_log2.log)("Connection auth scope changed", {
       peerId: connection.peerId
     }, {
       F: __dxlog_file,
-      L: 153,
+      L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
-    (0, import_invariant.invariant)(entry, void 0, {
+    (0, import_invariant2.invariant)(entry, void 0, {
       F: __dxlog_file,
-      L: 155,
+      L: 159,
       S: this,
       A: [
         "entry",
@@ -322,18 +313,18 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     this._emitPeerCandidate(connection);
   }
   _onConnectionClosed(connection) {
-    (0, import_log.log)("Connection closed", {
+    (0, import_log2.log)("Connection closed", {
       peerId: connection.peerId
     }, {
       F: __dxlog_file,
-      L: 161,
+      L: 165,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
-    (0, import_invariant.invariant)(entry, void 0, {
+    (0, import_invariant2.invariant)(entry, void 0, {
       F: __dxlog_file,
-      L: 163,
+      L: 167,
       S: this,
       A: [
         "entry",
@@ -344,15 +335,15 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     this.emit("peer-disconnected", {
       peerId: connection.peerId
     });
-    void entry.reader.cancel().catch((err) => import_log.log.catch(err, void 0, {
+    void entry.reader.cancel().catch((err) => import_log2.log.catch(err, void 0, {
       F: __dxlog_file,
-      L: 168,
+      L: 172,
       S: this,
       C: (f, a) => f(...a)
     }));
-    void entry.writer.abort().catch((err) => import_log.log.catch(err, void 0, {
+    void entry.writer.abort().catch((err) => import_log2.log.catch(err, void 0, {
       F: __dxlog_file,
-      L: 169,
+      L: 173,
       S: this,
       C: (f, a) => f(...a)
     }));
@@ -382,6 +373,31 @@ var createEchoPeerMetadata = () => ({
   dxos_peerSource: "EchoNetworkAdapter"
 });
 var isEchoPeerMetadata = (metadata) => metadata?.dxos_peerSource === "EchoNetworkAdapter";
+var HeadsStore = class {
+  constructor({ db }) {
+    this._db = db;
+  }
+  setHeads(documentId, heads, batch) {
+    batch.put(documentId, heads, {
+      sublevel: this._db,
+      keyEncoding: "utf8",
+      valueEncoding: import_indexing.headsEncoding
+    });
+  }
+  async getHeads(documentId) {
+    try {
+      return await this._db.get(documentId, {
+        keyEncoding: "utf8",
+        valueEncoding: import_indexing.headsEncoding
+      });
+    } catch (err) {
+      if (err.notFound) {
+        return void 0;
+      }
+      throw err;
+    }
+  }
+};
 var LevelDBStorageAdapter = class extends import_context3.Resource {
   constructor(_params) {
     super();
@@ -503,7 +519,7 @@ var LocalHostNetworkAdapter = class extends import_automerge_repo3.NetworkAdapte
   }
   send(message) {
     const peer = this._peers.get(message.targetId);
-    (0, import_invariant2.invariant)(peer, "Peer not found.", {
+    (0, import_invariant3.invariant)(peer, "Peer not found.", {
       F: __dxlog_file2,
       L: 51,
       S: this,
@@ -528,7 +544,7 @@ var LocalHostNetworkAdapter = class extends import_automerge_repo3.NetworkAdapte
   syncRepo({ id, syncMessage }) {
     const peerId = this._getPeerId(id);
     return new import_codec_protobuf.Stream(({ next, close }) => {
-      (0, import_invariant2.invariant)(!this._peers.has(peerId), "Peer already connected.", {
+      (0, import_invariant3.invariant)(!this._peers.has(peerId), "Peer already connected.", {
         F: __dxlog_file2,
         L: 73,
         S: this,
@@ -552,7 +568,7 @@ var LocalHostNetworkAdapter = class extends import_automerge_repo3.NetworkAdapte
           });
         }
       });
-      (0, import_invariant2.invariant)(this._isConnected, void 0, {
+      (0, import_invariant3.invariant)(this._isConnected, void 0, {
         F: __dxlog_file2,
         L: 90,
         S: this,
@@ -568,7 +584,7 @@ var LocalHostNetworkAdapter = class extends import_automerge_repo3.NetworkAdapte
     });
   }
   async sendSyncMessage({ id, syncMessage }) {
-    (0, import_invariant2.invariant)(this._isConnected, void 0, {
+    (0, import_invariant3.invariant)(this._isConnected, void 0, {
       F: __dxlog_file2,
       L: 99,
       S: this,
@@ -581,7 +597,7 @@ var LocalHostNetworkAdapter = class extends import_automerge_repo3.NetworkAdapte
     this.emit("message", message);
   }
   async getHostInfo() {
-    (0, import_invariant2.invariant)(this._isConnected, void 0, {
+    (0, import_invariant3.invariant)(this._isConnected, void 0, {
       F: __dxlog_file2,
       L: 105,
       S: this,
@@ -590,7 +606,7 @@ var LocalHostNetworkAdapter = class extends import_automerge_repo3.NetworkAdapte
         ""
       ]
     });
-    (0, import_invariant2.invariant)(this.peerId, "Peer id not set.", {
+    (0, import_invariant3.invariant)(this.peerId, "Peer id not set.", {
       F: __dxlog_file2,
       L: 106,
       S: this,
@@ -618,25 +634,26 @@ function _ts_decorate2(decorators, target, key, desc) {
   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/automerge-host.ts";
-var AutomergeHost = class {
+var AutomergeHost = class extends import_context.Resource {
   constructor({ db, indexMetadataStore }) {
-    this._ctx = new import_context.Context(void 0, {
-      F: __dxlog_file3,
-      L: 71
-    });
+    super();
     this._echoNetworkAdapter = new EchoNetworkAdapter({
       getContainingSpaceForDocument: this._getContainingSpaceForDocument.bind(this)
     });
+    this._db = db;
     this._storage = new LevelDBStorageAdapter({
-      db,
+      db: db.sublevel("automerge"),
       callbacks: {
         beforeSave: async (params) => this._beforeSave(params),
         afterSave: async () => this._afterSave()
       }
     });
+    this._headsStore = new HeadsStore({
+      db: db.sublevel("heads")
+    });
     this._indexMetadataStore = indexMetadataStore;
   }
-  async open() {
+  async _open() {
     this._peerId = `host-${import_keys.PublicKey.random().toHex()}`;
     await this._storage.open?.();
     this._clientNetwork = new LocalHostNetworkAdapter();
@@ -656,7 +673,7 @@ var AutomergeHost = class {
     await this._clientNetwork.whenConnected();
     await this._echoNetworkAdapter.whenConnected();
   }
-  async close() {
+  async _close() {
     await this._storage.close?.();
     await this._clientNetwork.close();
     await this._echoNetworkAdapter.close();
@@ -707,6 +724,56 @@ var AutomergeHost = class {
       return this._repo.create(initialValue);
     }
   }
+  async reIndexHeads(documentIds) {
+    for (const documentId of documentIds) {
+      import_log.log.info("reindexing heads for document", {
+        documentId
+      }, {
+        F: __dxlog_file3,
+        L: 191,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      const handle = this._repo.find(documentId);
+      await handle.whenReady([
+        "ready",
+        "requesting"
+      ]);
+      if (handle.inState([
+        "requesting"
+      ])) {
+        import_log.log.warn("document is not available locally, skipping", {
+          documentId
+        }, {
+          F: __dxlog_file3,
+          L: 195,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        continue;
+      }
+      const doc = handle.docSync();
+      (0, import_invariant.invariant)(doc, void 0, {
+        F: __dxlog_file3,
+        L: 200,
+        S: this,
+        A: [
+          "doc",
+          ""
+        ]
+      });
+      const heads = (0, import_automerge.getHeads)(doc);
+      const batch = this._db.batch();
+      this._headsStore.setHeads(documentId, heads, batch);
+      await batch.write();
+    }
+    import_log.log.info("done reindexing heads", void 0, {
+      F: __dxlog_file3,
+      L: 207,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
   // TODO(dmaretskyi): Share based on HALO permissions and space affinity.
   // Hosts, running in the worker, don't share documents unless requested by other peers.
   // NOTE: If both peers return sharePolicy=false the replication will not happen
@@ -736,7 +803,8 @@ var AutomergeHost = class {
       return;
     }
     const spaceKey = getSpaceKeyFromDoc(doc) ?? void 0;
-    const lastAvailableHash = (0, import_automerge.getHeads)(doc);
+    const heads = (0, import_automerge.getHeads)(doc);
+    this._headsStore.setHeads(handle.documentId, heads, batch);
     const objectIds = Object.keys(doc.objects ?? {});
     const encodedIds = objectIds.map((objectId) => import_protocols.objectPointerCodec.encode({
       documentId: handle.documentId,
@@ -745,7 +813,7 @@ var AutomergeHost = class {
     }));
     const idToLastHash = new Map(encodedIds.map((id) => [
       id,
-      lastAvailableHash
+      heads
     ]));
     this._indexMetadataStore.markDirty(idToLastHash, batch);
   }
@@ -794,18 +862,30 @@ var AutomergeHost = class {
   /**
   * Flush documents to disk.
   */
-  async flush({ states }) {
+  async flush({ states } = {}) {
     if (states) {
       await Promise.all(states.map(async ({ heads, documentId }) => {
         if (!heads) {
           return;
         }
-        const handle = this.repo.handles[documentId] ?? this._repo.find(documentId);
+        const handle = this._repo.handles[documentId] ?? this._repo.find(documentId);
         await waitForHeads(handle, heads);
       }) ?? []);
     }
     await this._repo.flush(states?.map(({ documentId }) => documentId));
   }
+  async getHeads(documentId) {
+    const handle = this._repo.handles[documentId];
+    if (handle) {
+      const doc = handle.docSync();
+      if (!doc) {
+        return void 0;
+      }
+      return (0, import_automerge.getHeads)(doc);
+    } else {
+      return this._headsStore.getHeads(documentId);
+    }
+  }
   /**
   * Host <-> Client sync.
   */
@@ -907,7 +987,7 @@ var AutomergeDocumentLoaderImpl = class {
     }
     const existingDocHandle = await this._initDocHandle(ctx, spaceState.rootUrl);
     const doc = existingDocHandle.docSync();
-    (0, import_invariant3.invariant)(doc, void 0, {
+    (0, import_invariant4.invariant)(doc, void 0, {
       F: __dxlog_file4,
       L: 84,
       S: this,
@@ -916,7 +996,7 @@ var AutomergeDocumentLoaderImpl = class {
         ""
       ]
     });
-    (0, import_invariant3.invariant)(doc.version === import_echo_protocol.SpaceDocVersion.CURRENT, void 0, {
+    (0, import_invariant4.invariant)(doc.version === import_echo_protocol.SpaceDocVersion.CURRENT, void 0, {
       F: __dxlog_file4,
       L: 85,
       S: this,
@@ -937,7 +1017,7 @@ var AutomergeDocumentLoaderImpl = class {
     let hasUrlsToLoad = false;
     const urlsToLoad = {};
     for (const objectId of objectIds) {
-      (0, import_invariant3.invariant)(this._spaceRootDocHandle, void 0, {
+      (0, import_invariant4.invariant)(this._spaceRootDocHandle, void 0, {
         F: __dxlog_file4,
         L: 97,
         S: this,
@@ -950,7 +1030,7 @@ var AutomergeDocumentLoaderImpl = class {
         continue;
       }
       const spaceRootDoc = this._spaceRootDocHandle.docSync();
-      (0, import_invariant3.invariant)(spaceRootDoc, void 0, {
+      (0, import_invariant4.invariant)(spaceRootDoc, void 0, {
         F: __dxlog_file4,
         L: 102,
         S: this,
@@ -962,7 +1042,7 @@ var AutomergeDocumentLoaderImpl = class {
       const documentUrl = (spaceRootDoc.links ?? {})[objectId];
       if (documentUrl == null) {
         this._objectsPendingDocumentLoad.add(objectId);
-        import_log2.log.info("loading delayed until object links are initialized", {
+        import_log3.log.info("loading delayed until object links are initialized", {
           objectId
         }, {
           F: __dxlog_file4,
@@ -980,7 +1060,7 @@ var AutomergeDocumentLoaderImpl = class {
     }
   }
   getObjectDocumentId(objectId) {
-    (0, import_invariant3.invariant)(this._spaceRootDocHandle, void 0, {
+    (0, import_invariant4.invariant)(this._spaceRootDocHandle, void 0, {
       F: __dxlog_file4,
       L: 118,
       S: this,
@@ -990,7 +1070,7 @@ var AutomergeDocumentLoaderImpl = class {
       ]
     });
     const spaceRootDoc = this._spaceRootDocHandle.docSync();
-    (0, import_invariant3.invariant)(spaceRootDoc, void 0, {
+    (0, import_invariant4.invariant)(spaceRootDoc, void 0, {
       F: __dxlog_file4,
       L: 120,
       S: this,
@@ -1014,7 +1094,7 @@ var AutomergeDocumentLoaderImpl = class {
     linksAwaitingLoad.forEach(([objectId]) => this._objectsPendingDocumentLoad.delete(objectId));
   }
   getSpaceRootDocHandle() {
-    (0, import_invariant3.invariant)(this._spaceRootDocHandle, void 0, {
+    (0, import_invariant4.invariant)(this._spaceRootDocHandle, void 0, {
       F: __dxlog_file4,
       L: 140,
       S: this,
@@ -1026,7 +1106,7 @@ var AutomergeDocumentLoaderImpl = class {
     return this._spaceRootDocHandle;
   }
   createDocumentForObject(objectId) {
-    (0, import_invariant3.invariant)(this._spaceRootDocHandle, void 0, {
+    (0, import_invariant4.invariant)(this._spaceRootDocHandle, void 0, {
       F: __dxlog_file4,
       L: 145,
       S: this,
@@ -1068,7 +1148,7 @@ var AutomergeDocumentLoaderImpl = class {
       };
       const objectDocumentHandle = this._objectDocumentHandles.get(objectId);
       if (objectDocumentHandle != null && objectDocumentHandle.url !== automergeUrl) {
-        import_log2.log.warn("object already inlined in a different document, ignoring the link", {
+        import_log3.log.warn("object already inlined in a different document, ignoring the link", {
           ...logMeta,
           actualDocumentUrl: objectDocumentHandle.url
         }, {
@@ -1080,7 +1160,7 @@ var AutomergeDocumentLoaderImpl = class {
         continue;
       }
       if (objectDocumentHandle?.url === automergeUrl) {
-        import_log2.log.warn("object document was already loaded", logMeta, {
+        import_log3.log.warn("object document was already loaded", logMeta, {
           F: __dxlog_file4,
           L: 184,
           S: this,
@@ -1089,7 +1169,7 @@ var AutomergeDocumentLoaderImpl = class {
         continue;
       }
       const handle = this._repo.find(automergeUrl);
-      import_log2.log.debug("document loading triggered", logMeta, {
+      import_log3.log.debug("document loading triggered", logMeta, {
         F: __dxlog_file4,
         L: 188,
         S: this,
@@ -1109,7 +1189,7 @@ var AutomergeDocumentLoaderImpl = class {
         break;
       } catch (err) {
         if (`${err}`.includes("Timeout")) {
-          import_log2.log.info("wraparound", {
+          import_log3.log.info("wraparound", {
             id: docHandle.documentId,
             state: docHandle.state
           }, {
@@ -1138,15 +1218,13 @@ var AutomergeDocumentLoaderImpl = class {
   }
   async _createObjectOnDocumentLoad(handle, objectId) {
     try {
-      await handle.doc([
-        "ready"
-      ]);
+      await handle.whenReady();
       const logMeta = {
         objectId,
         docUrl: handle.url
       };
       if (this.onObjectDocumentLoaded.listenerCount() === 0) {
-        import_log2.log.info("document loaded after all listeners were removed", logMeta, {
+        import_log3.log.info("document loaded after all listeners were removed", logMeta, {
           F: __dxlog_file4,
           L: 231,
           S: this,
@@ -1156,7 +1234,7 @@ var AutomergeDocumentLoaderImpl = class {
       }
       const objectDocHandle = this._objectDocumentHandles.get(objectId);
       if (objectDocHandle?.url !== handle.url) {
-        import_log2.log.warn("object was rebound while a document was loading, discarding handle", logMeta, {
+        import_log3.log.warn("object was rebound while a document was loading, discarding handle", logMeta, {
           F: __dxlog_file4,
           L: 236,
           S: this,
@@ -1170,7 +1248,7 @@ var AutomergeDocumentLoaderImpl = class {
       });
     } catch (err) {
       const shouldRetryLoading = this.onObjectDocumentLoaded.listenerCount() > 0;
-      import_log2.log.warn("failed to load a document", {
+      import_log3.log.warn("failed to load a document", {
         objectId,
         automergeUrl: handle.url,
         retryLoading: shouldRetryLoading,
@@ -1215,7 +1293,7 @@ var MeshEchoReplicator = class {
     this._context = null;
   }
   createExtension() {
-    (0, import_invariant4.invariant)(this._context, void 0, {
+    (0, import_invariant5.invariant)(this._context, void 0, {
       F: __dxlog_file5,
       L: 54,
       S: this,
@@ -1227,7 +1305,7 @@ var MeshEchoReplicator = class {
     const connection = new MeshReplicatorConnection({
       ownPeerId: this._context.peerId,
       onRemoteConnected: async () => {
-        (0, import_log3.log)("onRemoteConnected", {
+        (0, import_log4.log)("onRemoteConnected", {
           peerId: connection.peerId
         }, {
           F: __dxlog_file5,
@@ -1235,7 +1313,7 @@ var MeshEchoReplicator = class {
           S: this,
           C: (f, a) => f(...a)
         });
-        (0, import_invariant4.invariant)(this._context, void 0, {
+        (0, import_invariant5.invariant)(this._context, void 0, {
           F: __dxlog_file5,
           L: 60,
           S: this,
@@ -1253,7 +1331,7 @@ var MeshEchoReplicator = class {
         }
       },
       onRemoteDisconnected: async () => {
-        (0, import_log3.log)("onRemoteDisconnected", {
+        (0, import_log4.log)("onRemoteDisconnected", {
           peerId: connection.peerId
         }, {
           F: __dxlog_file5,
@@ -1267,7 +1345,7 @@ var MeshEchoReplicator = class {
         this._connections.delete(connection);
       },
       shouldAdvertize: async (params) => {
-        (0, import_log3.log)("shouldAdvertize", {
+        (0, import_log4.log)("shouldAdvertize", {
           peerId: connection.peerId,
           documentId: params.documentId
         }, {
@@ -1276,7 +1354,7 @@ var MeshEchoReplicator = class {
           S: this,
           C: (f, a) => f(...a)
         });
-        (0, import_invariant4.invariant)(this._context, void 0, {
+        (0, import_invariant5.invariant)(this._context, void 0, {
           F: __dxlog_file5,
           L: 79,
           S: this,
@@ -1288,7 +1366,7 @@ var MeshEchoReplicator = class {
         try {
           const spaceKey = await this._context.getContainingSpaceForDocument(params.documentId);
           if (!spaceKey) {
-            (0, import_log3.log)("space key not found for share policy check", {
+            (0, import_log4.log)("space key not found for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
@@ -1301,7 +1379,7 @@ var MeshEchoReplicator = class {
           }
           const authorizedDevices = this._authorizedDevices.get(spaceKey);
           if (!connection.remoteDeviceKey) {
-            (0, import_log3.log)("device key not found for share policy check", {
+            (0, import_log4.log)("device key not found for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
@@ -1313,7 +1391,7 @@ var MeshEchoReplicator = class {
             return false;
           }
           const isAuthorized = authorizedDevices?.has(connection.remoteDeviceKey) ?? false;
-          (0, import_log3.log)("share policy check", {
+          (0, import_log4.log)("share policy check", {
             localPeer: this._context.peerId,
             remotePeer: connection.peerId,
             documentId: params.documentId,
@@ -1328,7 +1406,7 @@ var MeshEchoReplicator = class {
           });
           return isAuthorized;
         } catch (err) {
-          import_log3.log.catch(err, void 0, {
+          import_log4.log.catch(err, void 0, {
             F: __dxlog_file5,
             L: 111,
             S: this,
@@ -1342,7 +1420,7 @@ var MeshEchoReplicator = class {
     return connection.replicatorExtension;
   }
   authorizeDevice(spaceKey, deviceKey) {
-    (0, import_log3.log)("authorizeDevice", {
+    (0, import_log4.log)("authorizeDevice", {
       spaceKey,
       deviceKey
     }, {
@@ -1388,7 +1466,7 @@ var MeshReplicatorConnection = class extends import_context5.Resource {
       onStartReplication: async (info, remotePeerId) => {
         this.remoteDeviceKey = remotePeerId;
         this._remotePeerId = info.id;
-        (0, import_log3.log)("onStartReplication", {
+        (0, import_log4.log)("onStartReplication", {
           id: info.id,
           thisPeerId: this.peerId,
           remotePeerId: remotePeerId.toHex()
@@ -1416,7 +1494,7 @@ var MeshReplicatorConnection = class extends import_context5.Resource {
     });
   }
   get peerId() {
-    (0, import_invariant4.invariant)(this._remotePeerId != null, "Remote peer has not connected yet.", {
+    (0, import_invariant5.invariant)(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file5,
       L: 215,
       S: this,
@@ -1427,7 +1505,7 @@ var MeshReplicatorConnection = class extends import_context5.Resource {
     });
     return this._remotePeerId;
   }
-  async shouldAdvertize(params) {
+  async shouldAdvertise(params) {
     return this._params.shouldAdvertize(params);
   }
   /**
@@ -1435,7 +1513,7 @@ var MeshReplicatorConnection = class extends import_context5.Resource {
   * Call after the remote peer has connected.
   */
   async enable() {
-    (0, import_invariant4.invariant)(this._remotePeerId != null, "Remote peer has not connected yet.", {
+    (0, import_invariant5.invariant)(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file5,
       L: 228,
       S: this,