@dxos/echo-pipeline 0.6.1-main.fac53f5 → 0.6.1-main.ff751ec

package/dist/lib/browser/index.mjs

@@ -25,13 +25,13 @@ import {
   mapTimeframeToFeedIndexes,
   startAfter,
   valueEncoding
-} from "./chunk-HS77A4I4.mjs";
+} from "./chunk-O3MAK5PY.mjs";
 
 // packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts
 import { Event, asyncTimeout } from "@dxos/async";
 import { next as automerge, getBackend, getHeads, isAutomerge, save } from "@dxos/automerge/automerge";
 import { Repo } from "@dxos/automerge/automerge-repo";
-import { Context, cancelWithContext } from "@dxos/context";
+import { Resource as Resource2, cancelWithContext } from "@dxos/context";
 import { PublicKey } from "@dxos/keys";
 import { objectPointerCodec } from "@dxos/protocols";
 import { trace } from "@dxos/tracing";
@@ -87,19 +87,13 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
   disconnect() {
   }
   async open() {
-    invariant(this._lifecycleState === LifecycleState.CLOSED, void 0, {
-      F: __dxlog_file,
-      L: 60,
-      S: this,
-      A: [
-        "this._lifecycleState === LifecycleState.CLOSED",
-        ""
-      ]
-    });
+    if (this._lifecycleState === LifecycleState.OPEN) {
+      return;
+    }
     this._lifecycleState = LifecycleState.OPEN;
     log("emit ready", void 0, {
       F: __dxlog_file,
-      L: 63,
+      L: 65,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -108,15 +102,9 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
   }
   async close() {
-    invariant(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file,
-      L: 71,
-      S: this,
-      A: [
-        "this._lifecycleState === LifecycleState.OPEN",
-        ""
-      ]
-    });
+    if (this._lifecycleState === LifecycleState.CLOSED) {
+      return;
+    }
     for (const replicator of this._replicators) {
       await replicator.disconnect();
     }
@@ -131,7 +119,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
   async addReplicator(replicator) {
     invariant(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file,
-      L: 87,
+      L: 91,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -140,7 +128,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
     invariant(this.peerId, void 0, {
       F: __dxlog_file,
-      L: 88,
+      L: 92,
       S: this,
       A: [
         "this.peerId",
@@ -149,7 +137,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
     invariant(!this._replicators.has(replicator), void 0, {
       F: __dxlog_file,
-      L: 89,
+      L: 93,
       S: this,
       A: [
         "!this._replicators.has(replicator)",
@@ -168,7 +156,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
   async removeReplicator(replicator) {
     invariant(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file,
-      L: 103,
+      L: 107,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -177,7 +165,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
     invariant(this._replicators.has(replicator), void 0, {
       F: __dxlog_file,
-      L: 104,
+      L: 108,
       S: this,
       A: [
         "this._replicators.has(replicator)",
@@ -199,13 +187,13 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file,
-      L: 119,
+      L: 123,
       S: this,
       C: (f, a) => f(...a)
     });
     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)",
@@ -234,7 +222,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
         if (connectionEntry.isOpen) {
           log.catch(err, void 0, {
             F: __dxlog_file,
-            L: 139,
+            L: 143,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -245,7 +233,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file,
-      L: 144,
+      L: 148,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -260,14 +248,14 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file,
-      L: 153,
+      L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
     invariant(entry, void 0, {
       F: __dxlog_file,
-      L: 155,
+      L: 159,
       S: this,
       A: [
         "entry",
@@ -284,14 +272,14 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file,
-      L: 161,
+      L: 165,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
     invariant(entry, void 0, {
       F: __dxlog_file,
-      L: 163,
+      L: 167,
       S: this,
       A: [
         "entry",
@@ -304,13 +292,13 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
     void entry.reader.cancel().catch((err) => 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) => log.catch(err, void 0, {
       F: __dxlog_file,
-      L: 169,
+      L: 173,
       S: this,
       C: (f, a) => f(...a)
     }));
@@ -341,6 +329,34 @@ var createEchoPeerMetadata = () => ({
 });
 var isEchoPeerMetadata = (metadata) => metadata?.dxos_peerSource === "EchoNetworkAdapter";
 
+// packages/core/echo/echo-pipeline/src/automerge/heads-store.ts
+import { headsEncoding } from "@dxos/indexing";
+var HeadsStore = class {
+  constructor({ db }) {
+    this._db = db;
+  }
+  setHeads(documentId, heads, batch) {
+    batch.put(documentId, heads, {
+      sublevel: this._db,
+      keyEncoding: "utf8",
+      valueEncoding: headsEncoding
+    });
+  }
+  async getHeads(documentId) {
+    try {
+      return await this._db.get(documentId, {
+        keyEncoding: "utf8",
+        valueEncoding: headsEncoding
+      });
+    } catch (err) {
+      if (err.notFound) {
+        return void 0;
+      }
+      throw err;
+    }
+  }
+};
+
 // packages/core/echo/echo-pipeline/src/automerge/leveldb-storage-adapter.ts
 import { LifecycleState as LifecycleState2, Resource } from "@dxos/context";
 var LevelDBStorageAdapter = class extends Resource {
@@ -586,26 +602,25 @@ 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_file3 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
-var AutomergeHost = class {
+var AutomergeHost = class extends Resource2 {
   constructor({ db, indexMetadataStore }) {
-    this._ctx = new Context(void 0, {
-      F: __dxlog_file3,
-      L: 71
-    });
+    super();
     this._echoNetworkAdapter = new EchoNetworkAdapter({
       getContainingSpaceForDocument: this._getContainingSpaceForDocument.bind(this)
     });
     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-${PublicKey.random().toHex()}`;
     await this._storage.open?.();
     this._clientNetwork = new LocalHostNetworkAdapter();
@@ -625,7 +640,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();
@@ -705,7 +720,8 @@ var AutomergeHost = class {
       return;
     }
     const spaceKey = getSpaceKeyFromDoc(doc) ?? void 0;
-    const lastAvailableHash = getHeads(doc);
+    const heads = getHeads(doc);
+    this._headsStore.setHeads(handle.documentId, heads, batch);
     const objectIds = Object.keys(doc.objects ?? {});
     const encodedIds = objectIds.map((objectId) => objectPointerCodec.encode({
       documentId: handle.documentId,
@@ -714,7 +730,7 @@ var AutomergeHost = class {
     }));
     const idToLastHash = new Map(encodedIds.map((id) => [
       id,
-      lastAvailableHash
+      heads
     ]));
     this._indexMetadataStore.markDirty(idToLastHash, batch);
   }
@@ -763,18 +779,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 getHeads(doc);
+    } else {
+      return this._headsStore.getHeads(documentId);
+    }
+  }
   /**
   * Host <-> Client sync.
   */
@@ -860,7 +888,7 @@ function _ts_decorate3(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-doc-loader.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-doc-loader.ts";
 var AutomergeDocumentLoaderImpl = class {
   constructor(_spaceId, _repo, _spaceKey) {
     this._spaceId = _spaceId;
@@ -887,7 +915,7 @@ var AutomergeDocumentLoaderImpl = class {
     const existingDocHandle = await this._initDocHandle(ctx, spaceState.rootUrl);
     const doc = existingDocHandle.docSync();
     invariant3(doc, void 0, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 84,
       S: this,
       A: [
@@ -896,7 +924,7 @@ var AutomergeDocumentLoaderImpl = class {
       ]
     });
     invariant3(doc.version === SpaceDocVersion.CURRENT, void 0, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 85,
       S: this,
       A: [
@@ -917,7 +945,7 @@ var AutomergeDocumentLoaderImpl = class {
     const urlsToLoad = {};
     for (const objectId of objectIds) {
       invariant3(this._spaceRootDocHandle, void 0, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 97,
         S: this,
         A: [
@@ -930,7 +958,7 @@ var AutomergeDocumentLoaderImpl = class {
       }
       const spaceRootDoc = this._spaceRootDocHandle.docSync();
       invariant3(spaceRootDoc, void 0, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 102,
         S: this,
         A: [
@@ -944,7 +972,7 @@ var AutomergeDocumentLoaderImpl = class {
         log2.info("loading delayed until object links are initialized", {
           objectId
         }, {
-          F: __dxlog_file4,
+          F: __dxlog_file3,
           L: 106,
           S: this,
           C: (f, a) => f(...a)
@@ -960,7 +988,7 @@ var AutomergeDocumentLoaderImpl = class {
   }
   getObjectDocumentId(objectId) {
     invariant3(this._spaceRootDocHandle, void 0, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 118,
       S: this,
       A: [
@@ -970,7 +998,7 @@ var AutomergeDocumentLoaderImpl = class {
     });
     const spaceRootDoc = this._spaceRootDocHandle.docSync();
     invariant3(spaceRootDoc, void 0, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 120,
       S: this,
       A: [
@@ -994,7 +1022,7 @@ var AutomergeDocumentLoaderImpl = class {
   }
   getSpaceRootDocHandle() {
     invariant3(this._spaceRootDocHandle, void 0, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 140,
       S: this,
       A: [
@@ -1006,7 +1034,7 @@ var AutomergeDocumentLoaderImpl = class {
   }
   createDocumentForObject(objectId) {
     invariant3(this._spaceRootDocHandle, void 0, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 145,
       S: this,
       A: [
@@ -1051,7 +1079,7 @@ var AutomergeDocumentLoaderImpl = class {
           ...logMeta,
           actualDocumentUrl: objectDocumentHandle.url
         }, {
-          F: __dxlog_file4,
+          F: __dxlog_file3,
           L: 177,
           S: this,
           C: (f, a) => f(...a)
@@ -1060,7 +1088,7 @@ var AutomergeDocumentLoaderImpl = class {
       }
       if (objectDocumentHandle?.url === automergeUrl) {
         log2.warn("object document was already loaded", logMeta, {
-          F: __dxlog_file4,
+          F: __dxlog_file3,
           L: 184,
           S: this,
           C: (f, a) => f(...a)
@@ -1069,7 +1097,7 @@ var AutomergeDocumentLoaderImpl = class {
       }
       const handle = this._repo.find(automergeUrl);
       log2.debug("document loading triggered", logMeta, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 188,
         S: this,
         C: (f, a) => f(...a)
@@ -1092,7 +1120,7 @@ var AutomergeDocumentLoaderImpl = class {
             id: docHandle.documentId,
             state: docHandle.state
           }, {
-            F: __dxlog_file4,
+            F: __dxlog_file3,
             L: 204,
             S: this,
             C: (f, a) => f(...a)
@@ -1117,16 +1145,14 @@ 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) {
         log2.info("document loaded after all listeners were removed", logMeta, {
-          F: __dxlog_file4,
+          F: __dxlog_file3,
           L: 231,
           S: this,
           C: (f, a) => f(...a)
@@ -1136,7 +1162,7 @@ var AutomergeDocumentLoaderImpl = class {
       const objectDocHandle = this._objectDocumentHandles.get(objectId);
       if (objectDocHandle?.url !== handle.url) {
         log2.warn("object was rebound while a document was loading, discarding handle", logMeta, {
-          F: __dxlog_file4,
+          F: __dxlog_file3,
           L: 236,
           S: this,
           C: (f, a) => f(...a)
@@ -1155,7 +1181,7 @@ var AutomergeDocumentLoaderImpl = class {
         retryLoading: shouldRetryLoading,
         err
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file3,
         L: 242,
         S: this,
         C: (f, a) => f(...a)
@@ -1177,13 +1203,13 @@ AutomergeDocumentLoaderImpl = _ts_decorate3([
 
 // packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts
 import { cbor as cbor2 } from "@dxos/automerge/automerge-repo";
-import { Resource as Resource2 } from "@dxos/context";
+import { Resource as Resource3 } from "@dxos/context";
 import { invariant as invariant4 } from "@dxos/invariant";
 import { PublicKey as PublicKey2 } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
 import { AutomergeReplicator } from "@dxos/teleport-extension-automerge-replicator";
 import { ComplexMap, ComplexSet, defaultMap } from "@dxos/util";
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts";
 var MeshEchoReplicator = class {
   constructor() {
     this._connections = /* @__PURE__ */ new Set();
@@ -1210,7 +1236,7 @@ var MeshEchoReplicator = class {
   }
   createExtension() {
     invariant4(this._context, void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 54,
       S: this,
       A: [
@@ -1224,13 +1250,13 @@ var MeshEchoReplicator = class {
         log3("onRemoteConnected", {
           peerId: connection.peerId
         }, {
-          F: __dxlog_file5,
+          F: __dxlog_file4,
           L: 59,
           S: this,
           C: (f, a) => f(...a)
         });
         invariant4(this._context, void 0, {
-          F: __dxlog_file5,
+          F: __dxlog_file4,
           L: 60,
           S: this,
           A: [
@@ -1250,7 +1276,7 @@ var MeshEchoReplicator = class {
         log3("onRemoteDisconnected", {
           peerId: connection.peerId
         }, {
-          F: __dxlog_file5,
+          F: __dxlog_file4,
           L: 71,
           S: this,
           C: (f, a) => f(...a)
@@ -1265,13 +1291,13 @@ var MeshEchoReplicator = class {
           peerId: connection.peerId,
           documentId: params.documentId
         }, {
-          F: __dxlog_file5,
+          F: __dxlog_file4,
           L: 78,
           S: this,
           C: (f, a) => f(...a)
         });
         invariant4(this._context, void 0, {
-          F: __dxlog_file5,
+          F: __dxlog_file4,
           L: 79,
           S: this,
           A: [
@@ -1286,7 +1312,7 @@ var MeshEchoReplicator = class {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
-              F: __dxlog_file5,
+              F: __dxlog_file4,
               L: 83,
               S: this,
               C: (f, a) => f(...a)
@@ -1299,7 +1325,7 @@ var MeshEchoReplicator = class {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
-              F: __dxlog_file5,
+              F: __dxlog_file4,
               L: 93,
               S: this,
               C: (f, a) => f(...a)
@@ -1315,7 +1341,7 @@ var MeshEchoReplicator = class {
             spaceKey,
             isAuthorized
           }, {
-            F: __dxlog_file5,
+            F: __dxlog_file4,
             L: 101,
             S: this,
             C: (f, a) => f(...a)
@@ -1323,7 +1349,7 @@ var MeshEchoReplicator = class {
           return isAuthorized;
         } catch (err) {
           log3.catch(err, void 0, {
-            F: __dxlog_file5,
+            F: __dxlog_file4,
             L: 111,
             S: this,
             C: (f, a) => f(...a)
@@ -1340,7 +1366,7 @@ var MeshEchoReplicator = class {
       spaceKey,
       deviceKey
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 122,
       S: this,
       C: (f, a) => f(...a)
@@ -1353,7 +1379,7 @@ var MeshEchoReplicator = class {
     }
   }
 };
-var MeshReplicatorConnection = class extends Resource2 {
+var MeshReplicatorConnection = class extends Resource3 {
   constructor(_params) {
     super();
     this._params = _params;
@@ -1387,7 +1413,7 @@ var MeshReplicatorConnection = class extends Resource2 {
           thisPeerId: this.peerId,
           remotePeerId: remotePeerId.toHex()
         }, {
-          F: __dxlog_file5,
+          F: __dxlog_file4,
           L: 192,
           S: this,
           C: (f, a) => f(...a)
@@ -1411,7 +1437,7 @@ var MeshReplicatorConnection = class extends Resource2 {
   }
   get peerId() {
     invariant4(this._remotePeerId != null, "Remote peer has not connected yet.", {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 215,
       S: this,
       A: [
@@ -1430,7 +1456,7 @@ var MeshReplicatorConnection = class extends Resource2 {
   */
   async enable() {
     invariant4(this._remotePeerId != null, "Remote peer has not connected yet.", {
-      F: __dxlog_file5,
+      F: __dxlog_file4,
       L: 228,
       S: this,
       A: [