@dxos/echo-pipeline 0.5.9-main.c34beda → 0.5.9-main.c837b46

package/dist/lib/browser/index.mjs

@@ -28,11 +28,10 @@ import {
 } from "./chunk-HS77A4I4.mjs";
 
 // packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts
-import { Event } from "@dxos/async";
-import { next as automerge, getBackend, getHeads } from "@dxos/automerge/automerge";
+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 } from "@dxos/context";
-import { invariant as invariant3 } from "@dxos/invariant";
+import { Context, cancelWithContext } from "@dxos/context";
 import { PublicKey } from "@dxos/keys";
 import { objectPointerCodec } from "@dxos/protocols";
 import { trace } from "@dxos/tracing";
@@ -320,10 +319,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
   _emitPeerCandidate(connection) {
     this.emit("peer-candidate", {
       peerId: connection.peerId,
-      peerMetadata: {
-        // TODO(dmaretskyi): Refactor this.
-        dxos_peerSource: "EchoNetworkAdapter"
-      }
+      peerMetadata: createEchoPeerMetadata()
     });
   }
 };
@@ -339,6 +335,11 @@ _ts_decorate([
 _ts_decorate([
   synchronized
 ], EchoNetworkAdapter.prototype, "removeReplicator", null);
+var createEchoPeerMetadata = () => ({
+  // TODO(dmaretskyi): Refactor this.
+  dxos_peerSource: "EchoNetworkAdapter"
+});
+var isEchoPeerMetadata = (metadata) => metadata?.dxos_peerSource === "EchoNetworkAdapter";
 
 // packages/core/echo/echo-pipeline/src/automerge/leveldb-storage-adapter.ts
 import { LifecycleState as LifecycleState2, Resource } from "@dxos/context";
@@ -590,7 +591,7 @@ var AutomergeHost = class {
   constructor({ db, indexMetadataStore }) {
     this._ctx = new Context(void 0, {
       F: __dxlog_file3,
-      L: 49
+      L: 71
     });
     this._echoNetworkAdapter = new EchoNetworkAdapter({
       getContainingSpaceForDocument: this._getContainingSpaceForDocument.bind(this)
@@ -630,6 +631,9 @@ var AutomergeHost = class {
     await this._echoNetworkAdapter.close();
     await this._ctx.dispose();
   }
+  /**
+  * @deprecated To be abstracted away.
+  */
   get repo() {
     return this._repo;
   }
@@ -639,6 +643,39 @@ var AutomergeHost = class {
   async removeReplicator(replicator) {
     await this._echoNetworkAdapter.removeReplicator(replicator);
   }
+  /**
+  * Loads the document handle from the repo and waits for it to be ready.
+  */
+  async loadDoc(ctx, documentId, opts) {
+    let handle;
+    if (typeof documentId === "string") {
+      handle = this._repo.handles[documentId];
+    }
+    if (!handle) {
+      handle = this._repo.find(documentId);
+    }
+    if (!handle.isReady()) {
+      if (!opts?.timeout) {
+        await cancelWithContext(ctx, handle.whenReady());
+      } else {
+        await cancelWithContext(ctx, asyncTimeout(handle.whenReady(), opts.timeout));
+      }
+    }
+    return handle;
+  }
+  /**
+  * Create new persisted document.
+  */
+  createDoc(initialValue, opts) {
+    if (opts?.preserveHistory) {
+      if (!isAutomerge(initialValue)) {
+        throw new TypeError("Initial value must be an Automerge document");
+      }
+      return this._repo.import(save(initialValue));
+    } else {
+      return this._repo.create(initialValue);
+    }
+  }
   // 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
@@ -651,7 +688,7 @@ var AutomergeHost = class {
       return false;
     }
     const peerMetadata = this.repo.peerMetadataByPeerId[peerId];
-    if (peerMetadata?.dxos_peerSource === "EchoNetworkAdapter") {
+    if (isEchoPeerMetadata(peerMetadata)) {
       return this._echoNetworkAdapter.shouldAdvertize(peerId, {
         documentId
       });
@@ -723,31 +760,36 @@ var AutomergeHost = class {
     }
     return PublicKey.from(spaceKeyHex);
   }
-  //
-  // Methods for client-services.
-  //
+  /**
+  * Flush documents to disk.
+  */
   async flush({ states }) {
-    await Promise.all(states?.map(async ({ heads, documentId }) => {
-      invariant3(heads, "heads are required for flush", {
-        F: __dxlog_file3,
-        L: 223,
-        S: this,
-        A: [
-          "heads",
-          "'heads are required for flush'"
-        ]
-      });
-      const handle = this.repo.handles[documentId] ?? this._repo.find(documentId);
-      await waitForHeads(handle, heads);
-    }) ?? []);
+    if (states) {
+      await Promise.all(states.map(async ({ heads, documentId }) => {
+        if (!heads) {
+          return;
+        }
+        const handle = this.repo.handles[documentId] ?? this._repo.find(documentId);
+        await waitForHeads(handle, heads);
+      }) ?? []);
+    }
     await this._repo.flush(states?.map(({ documentId }) => documentId));
   }
+  /**
+  * Host <-> Client sync.
+  */
   syncRepo(request) {
     return this._clientNetwork.syncRepo(request);
   }
+  /**
+  * Host <-> Client sync.
+  */
   sendSyncMessage(request) {
     return this._clientNetwork.sendSyncMessage(request);
   }
+  /**
+  * Host <-> Client sync.
+  */
   async getHostInfo() {
     return this._clientNetwork.getHostInfo();
   }
@@ -801,10 +843,11 @@ var changeIsPresentInDoc = (doc, changeHash) => {
 
 // packages/core/echo/echo-pipeline/src/automerge/automerge-doc-loader.ts
 import { Event as Event2 } from "@dxos/async";
-import { cancelWithContext } from "@dxos/context";
+import { interpretAsDocumentId } from "@dxos/automerge/automerge-repo";
+import { cancelWithContext as cancelWithContext2 } from "@dxos/context";
 import { warnAfterTimeout } from "@dxos/debug";
 import { SpaceDocVersion } from "@dxos/echo-protocol";
-import { invariant as invariant4 } from "@dxos/invariant";
+import { invariant as invariant3 } from "@dxos/invariant";
 import { log as log2 } from "@dxos/log";
 import { trace as trace2 } from "@dxos/tracing";
 function _ts_decorate3(decorators, target, key, desc) {
@@ -839,32 +882,32 @@ var AutomergeDocumentLoaderImpl = class {
       return;
     }
     if (!spaceState.rootUrl) {
-      log2.error("Database opened with no rootUrl", {
-        spaceId: this._spaceId
-      }, {
-        F: __dxlog_file4,
-        L: 72,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      this._createContextBoundSpaceRootDocument(ctx);
-    } else {
-      const existingDocHandle = await this._initDocHandle(ctx, spaceState.rootUrl);
-      const doc = existingDocHandle.docSync();
-      invariant4(doc, void 0, {
-        F: __dxlog_file4,
-        L: 77,
-        S: this,
-        A: [
-          "doc",
-          ""
-        ]
-      });
-      if (doc.access == null) {
-        this._initDocAccess(existingDocHandle);
-      }
-      this._spaceRootDocHandle = existingDocHandle;
+      throw new Error("Database opened with no rootUrl");
     }
+    const existingDocHandle = await this._initDocHandle(ctx, spaceState.rootUrl);
+    const doc = existingDocHandle.docSync();
+    invariant3(doc, void 0, {
+      F: __dxlog_file4,
+      L: 84,
+      S: this,
+      A: [
+        "doc",
+        ""
+      ]
+    });
+    invariant3(doc.version === SpaceDocVersion.CURRENT, void 0, {
+      F: __dxlog_file4,
+      L: 85,
+      S: this,
+      A: [
+        "doc.version === SpaceDocVersion.CURRENT",
+        ""
+      ]
+    });
+    if (doc.access == null) {
+      this._initDocAccess(existingDocHandle);
+    }
+    this._spaceRootDocHandle = existingDocHandle;
   }
   loadObjectDocument(objectIdOrMany) {
     const objectIds = Array.isArray(objectIdOrMany) ? objectIdOrMany : [
@@ -873,9 +916,9 @@ var AutomergeDocumentLoaderImpl = class {
     let hasUrlsToLoad = false;
     const urlsToLoad = {};
     for (const objectId of objectIds) {
-      invariant4(this._spaceRootDocHandle, void 0, {
+      invariant3(this._spaceRootDocHandle, void 0, {
         F: __dxlog_file4,
-        L: 90,
+        L: 97,
         S: this,
         A: [
           "this._spaceRootDocHandle",
@@ -886,9 +929,9 @@ var AutomergeDocumentLoaderImpl = class {
         continue;
       }
       const spaceRootDoc = this._spaceRootDocHandle.docSync();
-      invariant4(spaceRootDoc, void 0, {
+      invariant3(spaceRootDoc, void 0, {
         F: __dxlog_file4,
-        L: 95,
+        L: 102,
         S: this,
         A: [
           "spaceRootDoc",
@@ -902,7 +945,7 @@ var AutomergeDocumentLoaderImpl = class {
           objectId
         }, {
           F: __dxlog_file4,
-          L: 99,
+          L: 106,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -915,6 +958,32 @@ var AutomergeDocumentLoaderImpl = class {
       this._loadLinkedObjects(urlsToLoad);
     }
   }
+  getObjectDocumentId(objectId) {
+    invariant3(this._spaceRootDocHandle, void 0, {
+      F: __dxlog_file4,
+      L: 118,
+      S: this,
+      A: [
+        "this._spaceRootDocHandle",
+        ""
+      ]
+    });
+    const spaceRootDoc = this._spaceRootDocHandle.docSync();
+    invariant3(spaceRootDoc, void 0, {
+      F: __dxlog_file4,
+      L: 120,
+      S: this,
+      A: [
+        "spaceRootDoc",
+        ""
+      ]
+    });
+    if (spaceRootDoc.objects?.[objectId]) {
+      return this._spaceRootDocHandle.documentId;
+    }
+    const documentUrl = (spaceRootDoc.links ?? {})[objectId];
+    return documentUrl && interpretAsDocumentId(documentUrl);
+  }
   onObjectLinksUpdated(links) {
     if (!links) {
       return;
@@ -924,9 +993,9 @@ var AutomergeDocumentLoaderImpl = class {
     linksAwaitingLoad.forEach(([objectId]) => this._objectsPendingDocumentLoad.delete(objectId));
   }
   getSpaceRootDocHandle() {
-    invariant4(this._spaceRootDocHandle, void 0, {
+    invariant3(this._spaceRootDocHandle, void 0, {
       F: __dxlog_file4,
-      L: 122,
+      L: 140,
       S: this,
       A: [
         "this._spaceRootDocHandle",
@@ -936,9 +1005,9 @@ var AutomergeDocumentLoaderImpl = class {
     return this._spaceRootDocHandle;
   }
   createDocumentForObject(objectId) {
-    invariant4(this._spaceRootDocHandle, void 0, {
+    invariant3(this._spaceRootDocHandle, void 0, {
       F: __dxlog_file4,
-      L: 127,
+      L: 145,
       S: this,
       A: [
         "this._spaceRootDocHandle",
@@ -983,7 +1052,7 @@ var AutomergeDocumentLoaderImpl = class {
           actualDocumentUrl: objectDocumentHandle.url
         }, {
           F: __dxlog_file4,
-          L: 159,
+          L: 177,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -992,7 +1061,7 @@ var AutomergeDocumentLoaderImpl = class {
       if (objectDocumentHandle?.url === automergeUrl) {
         log2.warn("object document was already loaded", logMeta, {
           F: __dxlog_file4,
-          L: 166,
+          L: 184,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1001,7 +1070,7 @@ var AutomergeDocumentLoaderImpl = class {
       const handle = this._repo.find(automergeUrl);
       log2.debug("document loading triggered", logMeta, {
         F: __dxlog_file4,
-        L: 170,
+        L: 188,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1014,7 +1083,7 @@ var AutomergeDocumentLoaderImpl = class {
     while (true) {
       try {
         await warnAfterTimeout(5e3, "Automerge root doc load timeout (CoreDatabase)", async () => {
-          await cancelWithContext(ctx, docHandle.whenReady());
+          await cancelWithContext2(ctx, docHandle.whenReady());
         });
         break;
       } catch (err) {
@@ -1024,7 +1093,7 @@ var AutomergeDocumentLoaderImpl = class {
             state: docHandle.state
           }, {
             F: __dxlog_file4,
-            L: 186,
+            L: 204,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1038,14 +1107,6 @@ var AutomergeDocumentLoaderImpl = class {
     }
     return docHandle;
   }
-  _createContextBoundSpaceRootDocument(ctx) {
-    const docHandle = this._repo.create();
-    this._spaceRootDocHandle = docHandle;
-    ctx.onDispose(() => {
-      docHandle.delete();
-      this._spaceRootDocHandle = null;
-    });
-  }
   _initDocAccess(handle) {
     handle.change((newDoc) => {
       newDoc.access ??= {
@@ -1066,7 +1127,7 @@ var AutomergeDocumentLoaderImpl = class {
       if (this.onObjectDocumentLoaded.listenerCount() === 0) {
         log2.info("document loaded after all listeners were removed", logMeta, {
           F: __dxlog_file4,
-          L: 222,
+          L: 231,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1076,7 +1137,7 @@ var AutomergeDocumentLoaderImpl = class {
       if (objectDocHandle?.url !== handle.url) {
         log2.warn("object was rebound while a document was loading, discarding handle", logMeta, {
           F: __dxlog_file4,
-          L: 227,
+          L: 236,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1095,7 +1156,7 @@ var AutomergeDocumentLoaderImpl = class {
         err
       }, {
         F: __dxlog_file4,
-        L: 233,
+        L: 242,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1117,7 +1178,7 @@ 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 { invariant as invariant5 } from "@dxos/invariant";
+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";
@@ -1148,7 +1209,7 @@ var MeshEchoReplicator = class {
     this._context = null;
   }
   createExtension() {
-    invariant5(this._context, void 0, {
+    invariant4(this._context, void 0, {
       F: __dxlog_file5,
       L: 54,
       S: this,
@@ -1168,7 +1229,7 @@ var MeshEchoReplicator = class {
           S: this,
           C: (f, a) => f(...a)
         });
-        invariant5(this._context, void 0, {
+        invariant4(this._context, void 0, {
           F: __dxlog_file5,
           L: 60,
           S: this,
@@ -1181,8 +1242,8 @@ var MeshEchoReplicator = class {
           this._context.onConnectionAuthScopeChanged(connection);
         } else {
           this._connectionsPerPeer.set(connection.peerId, connection);
-          await connection.enable();
           this._context.onConnectionOpen(connection);
+          await connection.enable();
         }
       },
       onRemoteDisconnected: async () => {
@@ -1209,7 +1270,7 @@ var MeshEchoReplicator = class {
           S: this,
           C: (f, a) => f(...a)
         });
-        invariant5(this._context, void 0, {
+        invariant4(this._context, void 0, {
           F: __dxlog_file5,
           L: 79,
           S: this,
@@ -1349,7 +1410,7 @@ var MeshReplicatorConnection = class extends Resource2 {
     });
   }
   get peerId() {
-    invariant5(this._remotePeerId != null, "Remote peer has not connected yet.", {
+    invariant4(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file5,
       L: 215,
       S: this,
@@ -1368,7 +1429,7 @@ var MeshReplicatorConnection = class extends Resource2 {
   * Call after the remote peer has connected.
   */
   async enable() {
-    invariant5(this._remotePeerId != null, "Remote peer has not connected yet.", {
+    invariant4(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file5,
       L: 228,
       S: this,