@dxos/echo-pipeline 0.5.0 → 0.5.1-main.0ba1ecb

package/dist/lib/browser/index.mjs

@@ -22,20 +22,243 @@ import {
   mapTimeframeToFeedIndexes,
   startAfter,
   valueEncoding
-} from "./chunk-KMWJLYEQ.mjs";
+} from "./chunk-VQQD32DM.mjs";
 
 // packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts
-import { asyncTimeout } from "@dxos/async";
-import { next as automerge } from "@dxos/automerge/automerge";
+import { Event } from "@dxos/async";
+import { next as automerge, getBackend, getHeads } from "@dxos/automerge/automerge";
 import { Repo } from "@dxos/automerge/automerge-repo";
 import { Context } from "@dxos/context";
+import { invariant as invariant4 } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
-import { log as log3 } from "@dxos/log";
+import { log as log4 } from "@dxos/log";
+import { idCodec } from "@dxos/protocols";
 import { trace } from "@dxos/tracing";
 import { ComplexMap, ComplexSet, defaultMap, mapValues } from "@dxos/util";
 
+// packages/core/echo/echo-pipeline/src/automerge/echo-network-adapter.ts
+import { Trigger, synchronized } from "@dxos/async";
+import { NetworkAdapter } from "@dxos/automerge/automerge-repo";
+import { LifecycleState } from "@dxos/context";
+import { invariant } from "@dxos/invariant";
+import { log } from "@dxos/log";
+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_file = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/echo-network-adapter.ts";
+var EchoNetworkAdapter = class extends NetworkAdapter {
+  constructor() {
+    super(...arguments);
+    this._replicators = /* @__PURE__ */ new Set();
+    /**
+    * Remote peer id -> connection.
+    */
+    this._connections = /* @__PURE__ */ new Map();
+    this._lifecycleState = LifecycleState.CLOSED;
+    this._connected = new Trigger();
+  }
+  connect(peerId, peerMetadata) {
+    this.peerId = peerId;
+    this.peerMetadata = peerMetadata;
+    this._connected.wake();
+  }
+  send(message) {
+    const connectionEntry = this._connections.get(message.targetId);
+    if (!connectionEntry) {
+      throw new Error("Connection not found.");
+    }
+    connectionEntry.writer.write(message).catch((err) => {
+      if (connectionEntry.isOpen) {
+        log.catch(err, void 0, {
+          F: __dxlog_file,
+          L: 40,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+    });
+  }
+  disconnect() {
+  }
+  async open() {
+    invariant(this._lifecycleState === LifecycleState.CLOSED, void 0, {
+      F: __dxlog_file,
+      L: 51,
+      S: this,
+      A: [
+        "this._lifecycleState === LifecycleState.CLOSED",
+        ""
+      ]
+    });
+    this._lifecycleState = LifecycleState.OPEN;
+    this.emit("ready", {
+      network: this
+    });
+  }
+  async close() {
+    invariant(this._lifecycleState === LifecycleState.OPEN, void 0, {
+      F: __dxlog_file,
+      L: 61,
+      S: this,
+      A: [
+        "this._lifecycleState === LifecycleState.OPEN",
+        ""
+      ]
+    });
+    for (const replicator of this._replicators) {
+      await replicator.disconnect();
+    }
+    this._replicators.clear();
+    this._lifecycleState = LifecycleState.CLOSED;
+  }
+  async whenConnected() {
+    await this._connected.wait({
+      timeout: 1e4
+    });
+  }
+  async addReplicator(replicator) {
+    invariant(this.peerId, void 0, {
+      F: __dxlog_file,
+      L: 77,
+      S: this,
+      A: [
+        "this.peerId",
+        ""
+      ]
+    });
+    invariant(!this._replicators.has(replicator), void 0, {
+      F: __dxlog_file,
+      L: 78,
+      S: this,
+      A: [
+        "!this._replicators.has(replicator)",
+        ""
+      ]
+    });
+    await replicator.connect({
+      peerId: this.peerId,
+      onConnectionOpen: this._onConnectionOpen.bind(this),
+      onConnectionClosed: this._onConnectionClosed.bind(this)
+    });
+  }
+  async removeReplicator(replicator) {
+    invariant(this._replicators.has(replicator), void 0, {
+      F: __dxlog_file,
+      L: 89,
+      S: this,
+      A: [
+        "this._replicators.has(replicator)",
+        ""
+      ]
+    });
+    await replicator.disconnect();
+  }
+  async shouldAdvertize(peerId, params) {
+    const connection = this._connections.get(peerId);
+    if (!connection) {
+      return false;
+    }
+    return connection.connection.shouldAdvertize(params);
+  }
+  _onConnectionOpen(connection) {
+    invariant(!this._connections.has(connection.peerId), void 0, {
+      F: __dxlog_file,
+      L: 103,
+      S: this,
+      A: [
+        "!this._connections.has(connection.peerId as PeerId)",
+        ""
+      ]
+    });
+    const reader = connection.readable.getReader();
+    const writer = connection.writable.getWriter();
+    const connectionEntry = {
+      connection,
+      reader,
+      writer,
+      isOpen: true
+    };
+    this._connections.set(connection.peerId, connectionEntry);
+    queueMicrotask(async () => {
+      try {
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) {
+            break;
+          }
+          this.emit("message", value);
+        }
+      } catch (err) {
+        if (connectionEntry.isOpen) {
+          log.catch(err, void 0, {
+            F: __dxlog_file,
+            L: 122,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+        }
+      }
+    });
+    this.emit("peer-candidate", {
+      peerId: connection.peerId,
+      peerMetadata: {
+        // TODO(dmaretskyi): Refactor this.
+        dxos_peerSource: "EchoNetworkAdapter"
+      }
+    });
+  }
+  _onConnectionClosed(connection) {
+    const entry = this._connections.get(connection.peerId);
+    invariant(entry, void 0, {
+      F: __dxlog_file,
+      L: 138,
+      S: this,
+      A: [
+        "entry",
+        ""
+      ]
+    });
+    entry.isOpen = false;
+    this.emit("peer-disconnected", {
+      peerId: connection.peerId
+    });
+    void entry.reader.cancel().catch((err) => log.catch(err, void 0, {
+      F: __dxlog_file,
+      L: 143,
+      S: this,
+      C: (f, a) => f(...a)
+    }));
+    void entry.writer.abort().catch((err) => log.catch(err, void 0, {
+      F: __dxlog_file,
+      L: 144,
+      S: this,
+      C: (f, a) => f(...a)
+    }));
+    this._connections.delete(connection.peerId);
+  }
+};
+_ts_decorate([
+  synchronized
+], EchoNetworkAdapter.prototype, "open", null);
+_ts_decorate([
+  synchronized
+], EchoNetworkAdapter.prototype, "close", null);
+_ts_decorate([
+  synchronized
+], EchoNetworkAdapter.prototype, "addReplicator", null);
+_ts_decorate([
+  synchronized
+], EchoNetworkAdapter.prototype, "removeReplicator", null);
+
 // packages/core/echo/echo-pipeline/src/automerge/leveldb-storage-adapter.ts
-import { LifecycleState, Resource } from "@dxos/context";
+import { LifecycleState as LifecycleState2, Resource } from "@dxos/context";
 var LevelDBStorageAdapter = class extends Resource {
   constructor(_params) {
     super();
@@ -43,7 +266,7 @@ var LevelDBStorageAdapter = class extends Resource {
   }
   async load(keyArray) {
     try {
-      if (this._lifecycleState !== LifecycleState.OPEN) {
+      if (this._lifecycleState !== LifecycleState2.OPEN) {
         return void 0;
       }
       return await this._params.db.get(keyArray, {
@@ -57,7 +280,7 @@ var LevelDBStorageAdapter = class extends Resource {
     }
   }
   async save(keyArray, binary) {
-    if (this._lifecycleState !== LifecycleState.OPEN) {
+    if (this._lifecycleState !== LifecycleState2.OPEN) {
       return void 0;
     }
     const batch = this._params.db.batch();
@@ -72,7 +295,7 @@ var LevelDBStorageAdapter = class extends Resource {
     await this._params.callbacks?.afterSave?.(keyArray);
   }
   async remove(keyArray) {
-    if (this._lifecycleState !== LifecycleState.OPEN) {
+    if (this._lifecycleState !== LifecycleState2.OPEN) {
       return void 0;
     }
     await this._params.db.del(keyArray, {
@@ -80,7 +303,7 @@ var LevelDBStorageAdapter = class extends Resource {
     });
   }
   async loadRange(keyPrefix) {
-    if (this._lifecycleState !== LifecycleState.OPEN) {
+    if (this._lifecycleState !== LifecycleState2.OPEN) {
       return [];
     }
     const result = [];
@@ -100,7 +323,7 @@ var LevelDBStorageAdapter = class extends Resource {
     return result;
   }
   async removeRange(keyPrefix) {
-    if (this._lifecycleState !== LifecycleState.OPEN) {
+    if (this._lifecycleState !== LifecycleState2.OPEN) {
       return void 0;
     }
     const batch = this._params.db.batch();
@@ -121,7 +344,8 @@ var LevelDBStorageAdapter = class extends Resource {
 };
 var keyEncoder = {
   encode: (key) => Buffer.from(key.map((k) => k.replaceAll("%", "%25").replaceAll("-", "%2D")).join("-")),
-  decode: (key) => Buffer.from(key).toString().split("-").map((k) => k.replaceAll("%2D", "-").replaceAll("%25", "%"))
+  decode: (key) => Buffer.from(key).toString().split("-").map((k) => k.replaceAll("%2D", "-").replaceAll("%25", "%")),
+  format: "buffer"
 };
 var encodingOptions = {
   keyEncoding: keyEncoder,
@@ -130,16 +354,16 @@ var encodingOptions = {
 var isLevelDbNotFoundError = (err) => err.code === "LEVEL_NOT_FOUND";
 
 // packages/core/echo/echo-pipeline/src/automerge/local-host-network-adapter.ts
-import { Trigger } from "@dxos/async";
-import { NetworkAdapter, cbor } from "@dxos/automerge/automerge-repo";
+import { Trigger as Trigger2 } from "@dxos/async";
+import { NetworkAdapter as NetworkAdapter2, cbor } from "@dxos/automerge/automerge-repo";
 import { Stream } from "@dxos/codec-protobuf";
-import { invariant } from "@dxos/invariant";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/local-host-network-adapter.ts";
-var LocalHostNetworkAdapter = class extends NetworkAdapter {
+import { invariant as invariant2 } from "@dxos/invariant";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/local-host-network-adapter.ts";
+var LocalHostNetworkAdapter = class extends NetworkAdapter2 {
   constructor() {
     super(...arguments);
     this._peers = /* @__PURE__ */ new Map();
-    this._connected = new Trigger();
+    this._connected = new Trigger2();
     this._isConnected = false;
   }
   /**
@@ -162,8 +386,8 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter {
   }
   send(message) {
     const peer = this._peers.get(message.targetId);
-    invariant(peer, "Peer not found.", {
-      F: __dxlog_file,
+    invariant2(peer, "Peer not found.", {
+      F: __dxlog_file2,
       L: 51,
       S: this,
       A: [
@@ -187,8 +411,8 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter {
   syncRepo({ id, syncMessage }) {
     const peerId = this._getPeerId(id);
     return new Stream(({ next, close }) => {
-      invariant(!this._peers.has(peerId), "Peer already connected.", {
-        F: __dxlog_file,
+      invariant2(!this._peers.has(peerId), "Peer already connected.", {
+        F: __dxlog_file2,
         L: 73,
         S: this,
         A: [
@@ -211,8 +435,8 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter {
           });
         }
       });
-      invariant(this._isConnected, void 0, {
-        F: __dxlog_file,
+      invariant2(this._isConnected, void 0, {
+        F: __dxlog_file2,
         L: 90,
         S: this,
         A: [
@@ -227,8 +451,8 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter {
     });
   }
   async sendSyncMessage({ id, syncMessage }) {
-    invariant(this._isConnected, void 0, {
-      F: __dxlog_file,
+    invariant2(this._isConnected, void 0, {
+      F: __dxlog_file2,
       L: 99,
       S: this,
       A: [
@@ -240,8 +464,8 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter {
     this.emit("message", message);
   }
   async getHostInfo() {
-    invariant(this._isConnected, void 0, {
-      F: __dxlog_file,
+    invariant2(this._isConnected, void 0, {
+      F: __dxlog_file2,
       L: 105,
       S: this,
       A: [
@@ -249,8 +473,8 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter {
         ""
       ]
     });
-    invariant(this.peerId, "Peer id not set.", {
-      F: __dxlog_file,
+    invariant2(this.peerId, "Peer id not set.", {
+      F: __dxlog_file2,
       L: 106,
       S: this,
       A: [
@@ -268,17 +492,17 @@ var LocalHostNetworkAdapter = class extends NetworkAdapter {
 };
 
 // packages/core/echo/echo-pipeline/src/automerge/mesh-network-adapter.ts
-import { Trigger as Trigger2 } from "@dxos/async";
-import { NetworkAdapter as NetworkAdapter2, cbor as cbor2 } from "@dxos/automerge/automerge-repo";
-import { invariant as invariant2 } from "@dxos/invariant";
-import { log } from "@dxos/log";
+import { Trigger as Trigger3 } from "@dxos/async";
+import { NetworkAdapter as NetworkAdapter3, cbor as cbor2 } from "@dxos/automerge/automerge-repo";
+import { invariant as invariant3 } from "@dxos/invariant";
+import { log as log2 } from "@dxos/log";
 import { AutomergeReplicator } from "@dxos/teleport-extension-automerge-replicator";
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-network-adapter.ts";
-var MeshNetworkAdapter = class extends NetworkAdapter2 {
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-network-adapter.ts";
+var MeshNetworkAdapter = class extends NetworkAdapter3 {
   constructor() {
     super(...arguments);
     this._extensions = /* @__PURE__ */ new Map();
-    this._connected = new Trigger2();
+    this._connected = new Trigger3();
   }
   /**
   * Emits `ready` event. That signals to `Repo` that it can start using the adapter.
@@ -295,8 +519,8 @@ var MeshNetworkAdapter = class extends NetworkAdapter2 {
   send(message) {
     const receiverId = message.targetId;
     const extension = this._extensions.get(receiverId);
-    invariant2(extension, "Extension not found.", {
-      F: __dxlog_file2,
+    invariant3(extension, "Extension not found.", {
+      F: __dxlog_file3,
       L: 38,
       S: this,
       A: [
@@ -306,8 +530,8 @@ var MeshNetworkAdapter = class extends NetworkAdapter2 {
     });
     extension.sendSyncMessage({
       payload: cbor2.encode(message)
-    }).catch((err) => log.catch(err, void 0, {
-      F: __dxlog_file2,
+    }).catch((err) => log2.catch(err, void 0, {
+      F: __dxlog_file3,
       L: 39,
       S: this,
       C: (f, a) => f(...a)
@@ -316,8 +540,8 @@ var MeshNetworkAdapter = class extends NetworkAdapter2 {
   disconnect() {
   }
   createExtension() {
-    invariant2(this.peerId, "Peer id not set.", {
-      F: __dxlog_file2,
+    invariant3(this.peerId, "Peer id not set.", {
+      F: __dxlog_file3,
       L: 47,
       S: this,
       A: [
@@ -331,12 +555,12 @@ var MeshNetworkAdapter = class extends NetworkAdapter2 {
     }, {
       onStartReplication: async (info, remotePeerId) => {
         await this._connected.wait();
-        log("onStartReplication", {
+        log2("onStartReplication", {
           id: info.id,
           thisPeerId: this.peerId,
           remotePeerId: remotePeerId.toHex()
         }, {
-          F: __dxlog_file2,
+          F: __dxlog_file3,
           L: 70,
           S: this,
           C: (f, a) => f(...a)
@@ -344,12 +568,12 @@ var MeshNetworkAdapter = class extends NetworkAdapter2 {
         if (!this._extensions.has(info.id)) {
           peerInfo = info;
           this._extensions.set(info.id, extension);
-          log("peer-candidate", {
+          log2("peer-candidate", {
             id: info.id,
             thisPeerId: this.peerId,
             remotePeerId: remotePeerId.toHex()
           }, {
-            F: __dxlog_file2,
+            F: __dxlog_file3,
             L: 76,
             S: this,
             C: (f, a) => f(...a)
@@ -386,7 +610,7 @@ var MeshNetworkAdapter = class extends NetworkAdapter2 {
 
 // packages/core/echo/echo-pipeline/src/automerge/migrations.ts
 import { IndexedDBStorageAdapter } from "@dxos/automerge/automerge-repo-storage-indexeddb";
-import { log as log2 } from "@dxos/log";
+import { log as log3 } from "@dxos/log";
 import { StorageType } from "@dxos/random-access-storage";
 
 // packages/core/echo/echo-pipeline/src/automerge/automerge-storage-adapter.ts
@@ -466,7 +690,7 @@ var AutomergeStorageAdapter = class {
 };
 
 // packages/core/echo/echo-pipeline/src/automerge/migrations.ts
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/migrations.ts";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/migrations.ts";
 var levelMigration = async ({ db, directory }) => {
   const isNewLevel = !await db.iterator({
     ...encodingOptions
@@ -480,10 +704,10 @@ var levelMigration = async ({ db, directory }) => {
     return;
   }
   const batch = db.batch();
-  log2.info("found chunks on old storage adapter", {
+  log3.info("found chunks on old storage adapter", {
     chunks: chunks.length
   }, {
-    F: __dxlog_file3,
+    F: __dxlog_file4,
     L: 36,
     S: void 0,
     C: (f, a) => f(...a)
@@ -497,7 +721,7 @@ var levelMigration = async ({ db, directory }) => {
 };
 
 // packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts
-function _ts_decorate(decorators, target, key, desc) {
+function _ts_decorate2(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
     r = Reflect.decorate(decorators, target, key, desc);
@@ -507,10 +731,11 @@ function _ts_decorate(decorators, target, key, desc) {
         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_file5 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
 var AutomergeHost = class {
-  constructor({ directory, db, storageCallbacks }) {
+  constructor({ directory, db, indexMetadataStore }) {
     this._ctx = new Context();
+    this._echoNetworkAdapter = new EchoNetworkAdapter();
     /**
     * spaceKey -> deviceKey[]
     */
@@ -518,7 +743,7 @@ var AutomergeHost = class {
     this._requestedDocs = /* @__PURE__ */ new Set();
     this._directory = directory;
     this._db = db;
-    this._storageCallbacks = storageCallbacks;
+    this._indexMetadataStore = indexMetadataStore;
   }
   async open() {
     this._directory && await levelMigration({
@@ -527,7 +752,10 @@ var AutomergeHost = class {
     });
     this._storage = new LevelDBStorageAdapter({
       db: this._db,
-      callbacks: this._storageCallbacks
+      callbacks: {
+        beforeSave: async (params) => this._beforeSave(params),
+        afterSave: async () => this._afterSave()
+      }
     });
     await this._storage.open?.();
     this._peerId = `host-${PublicKey.random().toHex()}`;
@@ -537,7 +765,8 @@ var AutomergeHost = class {
       peerId: this._peerId,
       network: [
         this._clientNetwork,
-        this._meshNetwork
+        this._meshNetwork,
+        this._echoNetworkAdapter
       ],
       storage: this._storage,
       // TODO(dmaretskyi): Share based on HALO permissions and space affinity.
@@ -549,16 +778,22 @@ var AutomergeHost = class {
         if (!documentId) {
           return false;
         }
+        const peerMetadata = this.repo.peerMetadataByPeerId[peerId];
+        if (peerMetadata?.dxos_peerSource === "EchoNetworkAdapter") {
+          return this._echoNetworkAdapter.shouldAdvertize(peerId, {
+            documentId
+          });
+        }
         const doc = this._repo.handles[documentId]?.docSync();
         if (!doc) {
           const isRequested = this._requestedDocs.has(`automerge:${documentId}`);
-          log3("doc share policy check", {
+          log4("doc share policy check", {
             peerId,
             documentId,
             isRequested
           }, {
-            F: __dxlog_file4,
-            L: 100,
+            F: __dxlog_file5,
+            L: 124,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -567,26 +802,26 @@ var AutomergeHost = class {
         try {
           const spaceKey = getSpaceKeyFromDoc(doc);
           if (!spaceKey) {
-            log3("space key not found for share policy check", {
+            log4("space key not found for share policy check", {
               peerId,
               documentId
             }, {
-              F: __dxlog_file4,
-              L: 107,
+              F: __dxlog_file5,
+              L: 131,
               S: this,
               C: (f, a) => f(...a)
             });
             return false;
           }
           const authorizedDevices = this._authorizedDevices.get(PublicKey.from(spaceKey));
-          const deviceKeyHex = this.repo.peerMetadataByPeerId[peerId]?.dxos_deviceKey;
+          const deviceKeyHex = peerMetadata?.dxos_deviceKey;
           if (!deviceKeyHex) {
-            log3("device key not found for share policy check", {
+            log4("device key not found for share policy check", {
               peerId,
               documentId
             }, {
-              F: __dxlog_file4,
-              L: 116,
+              F: __dxlog_file5,
+              L: 140,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -594,7 +829,7 @@ var AutomergeHost = class {
           }
           const deviceKey = PublicKey.from(deviceKeyHex);
           const isAuthorized = authorizedDevices?.has(deviceKey) ?? false;
-          log3("share policy check", {
+          log4("share policy check", {
             localPeer: this._peerId,
             remotePeer: peerId,
             documentId,
@@ -602,16 +837,16 @@ var AutomergeHost = class {
             spaceKey,
             isAuthorized
           }, {
-            F: __dxlog_file4,
-            L: 122,
+            F: __dxlog_file5,
+            L: 146,
             S: this,
             C: (f, a) => f(...a)
           });
           return isAuthorized;
         } catch (err) {
-          log3.catch(err, void 0, {
-            F: __dxlog_file4,
-            L: 132,
+          log4.catch(err, void 0, {
+            F: __dxlog_file5,
+            L: 156,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -621,16 +856,52 @@ var AutomergeHost = class {
     });
     this._clientNetwork.ready();
     this._meshNetwork.ready();
+    await this._echoNetworkAdapter.open();
     await this._clientNetwork.whenConnected();
+    await this._echoNetworkAdapter.whenConnected();
   }
   async close() {
     await this._storage.close?.();
     await this._clientNetwork.close();
+    await this._echoNetworkAdapter.close();
     await this._ctx.dispose();
   }
   get repo() {
     return this._repo;
   }
+  async addReplicator(replicator) {
+    await this._echoNetworkAdapter.addReplicator(replicator);
+  }
+  async removeReplicator(replicator) {
+    await this._echoNetworkAdapter.removeReplicator(replicator);
+  }
+  async _beforeSave({ path, batch }) {
+    const handle = this._repo.handles[path[0]];
+    if (!handle) {
+      return;
+    }
+    const doc = handle.docSync();
+    if (!doc) {
+      return;
+    }
+    const lastAvailableHash = getHeads(doc);
+    const objectIds = Object.keys(doc.objects ?? {});
+    const encodedIds = objectIds.map((objectId) => idCodec.encode({
+      documentId: handle.documentId,
+      objectId
+    }));
+    const idToLastHash = new Map(encodedIds.map((id) => [
+      id,
+      lastAvailableHash
+    ]));
+    this._indexMetadataStore.markDirty(idToLastHash, batch);
+  }
+  /**
+  * Called by AutomergeStorageAdapter after levelDB batch commit.
+  */
+  async _afterSave() {
+    this._indexMetadataStore.notifyMarkedDirty();
+  }
   _automergeDocs() {
     return mapValues(this._repo.handles, (handle) => ({
       state: handle.state,
@@ -659,21 +930,21 @@ var AutomergeHost = class {
   //
   // Methods for client-services.
   //
-  async flush({ documentIds }) {
-    await Promise.all(documentIds?.map((id) => this._repo.find(id).whenReady()) ?? []);
-    try {
-      await asyncTimeout(this._repo.flush(documentIds), 500);
-    } catch (err) {
-      log3.warn("flush error", {
-        documentIds,
-        err
-      }, {
-        F: __dxlog_file4,
-        L: 196,
+  async flush({ states }) {
+    await Promise.all(states?.map(async ({ heads, documentId }) => {
+      invariant4(heads, "heads are required for flush", {
+        F: __dxlog_file5,
+        L: 252,
         S: this,
-        C: (f, a) => f(...a)
+        A: [
+          "heads",
+          "'heads are required for flush'"
+        ]
       });
-    }
+      const handle = this.repo.handles[documentId] ?? this._repo.find(documentId);
+      await waitForHeads(handle, heads);
+    }) ?? []);
+    await this._repo.flush(states?.map(({ documentId }) => documentId));
   }
   syncRepo(request) {
     return this._clientNetwork.syncRepo(request);
@@ -691,37 +962,37 @@ var AutomergeHost = class {
     return this._meshNetwork.createExtension();
   }
   authorizeDevice(spaceKey, deviceKey) {
-    log3("authorizeDevice", {
+    log4("authorizeDevice", {
       spaceKey,
       deviceKey
     }, {
-      F: __dxlog_file4,
-      L: 221,
+      F: __dxlog_file5,
+      L: 282,
       S: this,
       C: (f, a) => f(...a)
     });
     defaultMap(this._authorizedDevices, spaceKey, () => new ComplexSet(PublicKey.hash)).add(deviceKey);
   }
 };
-_ts_decorate([
+_ts_decorate2([
   trace.info()
 ], AutomergeHost.prototype, "_peerId", void 0);
-_ts_decorate([
+_ts_decorate2([
   trace.info({
     depth: null
   })
 ], AutomergeHost.prototype, "_automergeDocs", null);
-_ts_decorate([
+_ts_decorate2([
   trace.info({
     depth: null
   })
 ], AutomergeHost.prototype, "_automergePeers", null);
-_ts_decorate([
+_ts_decorate2([
   trace.span({
     showInBrowserTimeline: true
   })
 ], AutomergeHost.prototype, "flush", null);
-AutomergeHost = _ts_decorate([
+AutomergeHost = _ts_decorate2([
   trace.resource()
 ], AutomergeHost);
 var getSpaceKeyFromDoc = (doc) => {
@@ -731,15 +1002,33 @@ var getSpaceKeyFromDoc = (doc) => {
   }
   return String(rawSpaceKey);
 };
+var waitForHeads = async (handle, heads) => {
+  await handle.whenReady();
+  const unavailableHeads = new Set(heads);
+  await Event.wrap(handle, "change").waitForCondition(() => {
+    for (const changeHash of unavailableHeads.values()) {
+      if (changeIsPresentInDoc(handle.docSync(), changeHash)) {
+        unavailableHeads.delete(changeHash);
+      }
+    }
+    if (unavailableHeads.size === 0) {
+      return true;
+    }
+    return false;
+  });
+};
+var changeIsPresentInDoc = (doc, changeHash) => {
+  return !!getBackend(doc).getChangeByHash(changeHash);
+};
 
 // packages/core/echo/echo-pipeline/src/automerge/automerge-doc-loader.ts
-import { Event } from "@dxos/async";
+import { Event as Event2 } from "@dxos/async";
 import { cancelWithContext } from "@dxos/context";
 import { warnAfterTimeout } from "@dxos/debug";
-import { invariant as invariant3 } from "@dxos/invariant";
-import { log as log4 } from "@dxos/log";
+import { invariant as invariant5 } from "@dxos/invariant";
+import { log as log5 } from "@dxos/log";
 import { trace as trace2 } from "@dxos/tracing";
-function _ts_decorate2(decorators, target, key, desc) {
+function _ts_decorate3(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
     r = Reflect.decorate(decorators, target, key, desc);
@@ -749,7 +1038,7 @@ function _ts_decorate2(decorators, target, key, desc) {
         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_file5 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-doc-loader.ts";
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-doc-loader.ts";
 var AutomergeDocumentLoaderImpl = class {
   constructor(_spaceKey, _repo) {
     this._spaceKey = _spaceKey;
@@ -757,23 +1046,24 @@ var AutomergeDocumentLoaderImpl = class {
     this._spaceRootDocHandle = null;
     this._objectDocumentHandles = /* @__PURE__ */ new Map();
     this._objectsPendingDocumentLoad = /* @__PURE__ */ new Set();
-    this.onObjectDocumentLoaded = new Event();
+    this.onObjectDocumentLoaded = new Event2();
   }
   getAllHandles() {
-    return [
+    return this._spaceRootDocHandle != null ? [
+      this._spaceRootDocHandle,
       ...new Set(this._objectDocumentHandles.values())
-    ];
+    ] : [];
   }
   async loadSpaceRootDocHandle(ctx, spaceState) {
     if (this._spaceRootDocHandle != null) {
       return;
     }
     if (!spaceState.rootUrl) {
-      log4.error("Database opened with no rootUrl", {
+      log5.error("Database opened with no rootUrl", {
         spaceKey: this._spaceKey
       }, {
-        F: __dxlog_file5,
-        L: 69,
+        F: __dxlog_file6,
+        L: 70,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -781,9 +1071,9 @@ var AutomergeDocumentLoaderImpl = class {
     } else {
       const existingDocHandle = await this._initDocHandle(ctx, spaceState.rootUrl);
       const doc = existingDocHandle.docSync();
-      invariant3(doc, void 0, {
-        F: __dxlog_file5,
-        L: 74,
+      invariant5(doc, void 0, {
+        F: __dxlog_file6,
+        L: 75,
         S: this,
         A: [
           "doc",
@@ -796,45 +1086,54 @@ var AutomergeDocumentLoaderImpl = class {
       this._spaceRootDocHandle = existingDocHandle;
     }
   }
-  loadObjectDocument(objectId) {
-    invariant3(this._spaceRootDocHandle, void 0, {
-      F: __dxlog_file5,
-      L: 83,
-      S: this,
-      A: [
-        "this._spaceRootDocHandle",
-        ""
-      ]
-    });
-    if (this._objectDocumentHandles.has(objectId) || this._objectsPendingDocumentLoad.has(objectId)) {
-      return;
-    }
-    const spaceRootDoc = this._spaceRootDocHandle.docSync();
-    invariant3(spaceRootDoc, void 0, {
-      F: __dxlog_file5,
-      L: 88,
-      S: this,
-      A: [
-        "spaceRootDoc",
-        ""
-      ]
-    });
-    const documentUrl = (spaceRootDoc.links ?? {})[objectId];
-    if (documentUrl == null) {
-      this._objectsPendingDocumentLoad.add(objectId);
-      log4.info("loading delayed until object links are initialized", {
-        objectId
-      }, {
-        F: __dxlog_file5,
-        L: 92,
+  loadObjectDocument(objectIdOrMany) {
+    const objectIds = Array.isArray(objectIdOrMany) ? objectIdOrMany : [
+      objectIdOrMany
+    ];
+    let hasUrlsToLoad = false;
+    const urlsToLoad = {};
+    for (const objectId of objectIds) {
+      invariant5(this._spaceRootDocHandle, void 0, {
+        F: __dxlog_file6,
+        L: 88,
         S: this,
-        C: (f, a) => f(...a)
+        A: [
+          "this._spaceRootDocHandle",
+          ""
+        ]
       });
-      return;
+      if (this._objectDocumentHandles.has(objectId) || this._objectsPendingDocumentLoad.has(objectId)) {
+        continue;
+      }
+      const spaceRootDoc = this._spaceRootDocHandle.docSync();
+      invariant5(spaceRootDoc, void 0, {
+        F: __dxlog_file6,
+        L: 93,
+        S: this,
+        A: [
+          "spaceRootDoc",
+          ""
+        ]
+      });
+      const documentUrl = (spaceRootDoc.links ?? {})[objectId];
+      if (documentUrl == null) {
+        this._objectsPendingDocumentLoad.add(objectId);
+        log5.info("loading delayed until object links are initialized", {
+          objectId
+        }, {
+          F: __dxlog_file6,
+          L: 97,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      } else {
+        urlsToLoad[objectId] = documentUrl;
+        hasUrlsToLoad = true;
+      }
+    }
+    if (hasUrlsToLoad) {
+      this._loadLinkedObjects(urlsToLoad);
     }
-    this._loadLinkedObjects({
-      [objectId]: documentUrl
-    });
   }
   onObjectLinksUpdated(links) {
     if (!links) {
@@ -845,9 +1144,9 @@ var AutomergeDocumentLoaderImpl = class {
     linksAwaitingLoad.forEach(([objectId]) => this._objectsPendingDocumentLoad.delete(objectId));
   }
   getSpaceRootDocHandle() {
-    invariant3(this._spaceRootDocHandle, void 0, {
-      F: __dxlog_file5,
-      L: 110,
+    invariant5(this._spaceRootDocHandle, void 0, {
+      F: __dxlog_file6,
+      L: 120,
       S: this,
       A: [
         "this._spaceRootDocHandle",
@@ -857,9 +1156,9 @@ var AutomergeDocumentLoaderImpl = class {
     return this._spaceRootDocHandle;
   }
   createDocumentForObject(objectId) {
-    invariant3(this._spaceRootDocHandle, void 0, {
-      F: __dxlog_file5,
-      L: 115,
+    invariant5(this._spaceRootDocHandle, void 0, {
+      F: __dxlog_file6,
+      L: 125,
       S: this,
       A: [
         "this._spaceRootDocHandle",
@@ -897,30 +1196,30 @@ var AutomergeDocumentLoaderImpl = class {
       };
       const objectDocumentHandle = this._objectDocumentHandles.get(objectId);
       if (objectDocumentHandle != null && objectDocumentHandle.url !== automergeUrl) {
-        log4.warn("object already inlined in a different document, ignoring the link", {
+        log5.warn("object already inlined in a different document, ignoring the link", {
           ...logMeta,
           actualDocumentUrl: objectDocumentHandle.url
         }, {
-          F: __dxlog_file5,
-          L: 145,
+          F: __dxlog_file6,
+          L: 155,
           S: this,
           C: (f, a) => f(...a)
         });
         continue;
       }
       if (objectDocumentHandle?.url === automergeUrl) {
-        log4.warn("object document was already loaded", logMeta, {
-          F: __dxlog_file5,
-          L: 152,
+        log5.warn("object document was already loaded", logMeta, {
+          F: __dxlog_file6,
+          L: 162,
           S: this,
           C: (f, a) => f(...a)
         });
         continue;
       }
       const handle = this._repo.find(automergeUrl);
-      log4.debug("document loading triggered", logMeta, {
-        F: __dxlog_file5,
-        L: 156,
+      log5.debug("document loading triggered", logMeta, {
+        F: __dxlog_file6,
+        L: 166,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -938,12 +1237,12 @@ var AutomergeDocumentLoaderImpl = class {
         break;
       } catch (err) {
         if (`${err}`.includes("Timeout")) {
-          log4.info("wraparound", {
+          log5.info("wraparound", {
             id: docHandle.documentId,
             state: docHandle.state
           }, {
-            F: __dxlog_file5,
-            L: 172,
+            F: __dxlog_file6,
+            L: 182,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -983,9 +1282,9 @@ var AutomergeDocumentLoaderImpl = class {
         docUrl: handle.url
       };
       if (this.onObjectDocumentLoaded.listenerCount() === 0) {
-        log4.info("document loaded after all listeners were removed", logMeta, {
-          F: __dxlog_file5,
-          L: 208,
+        log5.info("document loaded after all listeners were removed", logMeta, {
+          F: __dxlog_file6,
+          L: 218,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -993,9 +1292,9 @@ var AutomergeDocumentLoaderImpl = class {
       }
       const objectDocHandle = this._objectDocumentHandles.get(objectId);
       if (objectDocHandle?.url !== handle.url) {
-        log4.warn("object was rebound while a document was loading, discarding handle", logMeta, {
-          F: __dxlog_file5,
-          L: 213,
+        log5.warn("object was rebound while a document was loading, discarding handle", logMeta, {
+          F: __dxlog_file6,
+          L: 223,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1007,14 +1306,14 @@ var AutomergeDocumentLoaderImpl = class {
       });
     } catch (err) {
       const shouldRetryLoading = this.onObjectDocumentLoaded.listenerCount() > 0;
-      log4.warn("failed to load a document", {
+      log5.warn("failed to load a document", {
         objectId,
         automergeUrl: handle.url,
         retryLoading: shouldRetryLoading,
         err
       }, {
-        F: __dxlog_file5,
-        L: 219,
+        F: __dxlog_file6,
+        L: 229,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1024,27 +1323,14 @@ var AutomergeDocumentLoaderImpl = class {
     }
   }
 };
-_ts_decorate2([
+_ts_decorate3([
   trace2.span({
     showInBrowserTimeline: true
   })
 ], AutomergeDocumentLoaderImpl.prototype, "loadSpaceRootDocHandle", null);
-AutomergeDocumentLoaderImpl = _ts_decorate2([
+AutomergeDocumentLoaderImpl = _ts_decorate3([
   trace2.resource()
 ], AutomergeDocumentLoaderImpl);
-
-// packages/core/echo/echo-pipeline/src/automerge/reference.ts
-import { Reference } from "@dxos/echo-schema";
-var REFERENCE_TYPE_TAG = "dxos.echo.model.document.Reference";
-var encodeReference = (reference) => ({
-  "@type": REFERENCE_TYPE_TAG,
-  // NOTE: Automerge do not support undefined values, so we need to use null instead.
-  itemId: reference.itemId ?? null,
-  protocol: reference.protocol ?? null,
-  host: reference.host ?? null
-});
-var decodeReference = (value) => new Reference(value.itemId, value.protocol ?? void 0, value.host ?? void 0);
-var isEncodedReferenceObject = (value) => typeof value === "object" && value !== null && value["@type"] === REFERENCE_TYPE_TAG;
 export {
   AuthExtension,
   AuthStatus,
@@ -1059,7 +1345,6 @@ export {
   MeshNetworkAdapter,
   MetadataStore,
   Pipeline,
-  REFERENCE_TYPE_TAG,
   SnapshotManager,
   SnapshotStore,
   Space,
@@ -1069,12 +1354,9 @@ export {
   TimeframeClock,
   codec,
   createMappedFeedWriter,
-  decodeReference,
-  encodeReference,
   encodingOptions,
   getSpaceKeyFromDoc,
   hasInvitationExpired,
-  isEncodedReferenceObject,
   mapFeedIndexesToTimeframe,
   mapTimeframeToFeedIndexes,
   startAfter,