@dxos/echo-pipeline 0.5.9-main.a2de4fa → 0.5.9-main.a75fa71

package/dist/lib/browser/index.mjs

@@ -3,6 +3,8 @@ import {
   AuthExtension,
   AuthStatus,
   Buffer,
+  CredentialRetrieverExtension,
+  CredentialServerExtension,
   DataServiceImpl,
   MOCK_AUTH_PROVIDER,
   MOCK_AUTH_VERIFIER,
@@ -23,14 +25,13 @@ import {
   mapTimeframeToFeedIndexes,
   startAfter,
   valueEncoding
-} from "./chunk-I2J5TTHJ.mjs";
+} 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";
@@ -318,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()
     });
   }
 };
@@ -337,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";
@@ -586,7 +589,10 @@ function _ts_decorate2(decorators, target, key, desc) {
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
 var AutomergeHost = class {
   constructor({ db, indexMetadataStore }) {
-    this._ctx = new Context();
+    this._ctx = new Context(void 0, {
+      F: __dxlog_file3,
+      L: 71
+    });
     this._echoNetworkAdapter = new EchoNetworkAdapter({
       getContainingSpaceForDocument: this._getContainingSpaceForDocument.bind(this)
     });
@@ -625,6 +631,9 @@ var AutomergeHost = class {
     await this._echoNetworkAdapter.close();
     await this._ctx.dispose();
   }
+  /**
+  * @deprecated To be abstracted away.
+  */
   get repo() {
     return this._repo;
   }
@@ -634,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
@@ -646,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
       });
@@ -718,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();
   }
@@ -796,10 +843,10 @@ 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 { 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) {
@@ -846,7 +893,7 @@ var AutomergeDocumentLoaderImpl = class {
     } else {
       const existingDocHandle = await this._initDocHandle(ctx, spaceState.rootUrl);
       const doc = existingDocHandle.docSync();
-      invariant4(doc, void 0, {
+      invariant3(doc, void 0, {
         F: __dxlog_file4,
         L: 77,
         S: this,
@@ -868,7 +915,7 @@ 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,
         S: this,
@@ -881,7 +928,7 @@ var AutomergeDocumentLoaderImpl = class {
         continue;
       }
       const spaceRootDoc = this._spaceRootDocHandle.docSync();
-      invariant4(spaceRootDoc, void 0, {
+      invariant3(spaceRootDoc, void 0, {
         F: __dxlog_file4,
         L: 95,
         S: this,
@@ -919,7 +966,7 @@ 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,
       S: this,
@@ -931,7 +978,7 @@ var AutomergeDocumentLoaderImpl = class {
     return this._spaceRootDocHandle;
   }
   createDocumentForObject(objectId) {
-    invariant4(this._spaceRootDocHandle, void 0, {
+    invariant3(this._spaceRootDocHandle, void 0, {
       F: __dxlog_file4,
       L: 127,
       S: this,
@@ -1009,7 +1056,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) {
@@ -1112,7 +1159,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";
@@ -1143,7 +1190,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,
@@ -1163,7 +1210,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,
@@ -1190,8 +1237,8 @@ var MeshEchoReplicator = class {
           C: (f, a) => f(...a)
         });
         this._context?.onConnectionClosed(connection);
-        await connection.disable();
         this._connectionsPerPeer.delete(connection.peerId);
+        await connection.disable();
         this._connections.delete(connection);
       },
       shouldAdvertize: async (params) => {
@@ -1204,7 +1251,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,
@@ -1344,7 +1391,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,
@@ -1363,7 +1410,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,
@@ -1386,6 +1433,8 @@ export {
   AuthStatus,
   AutomergeDocumentLoaderImpl,
   AutomergeHost,
+  CredentialRetrieverExtension,
+  CredentialServerExtension,
   DataServiceImpl,
   LevelDBStorageAdapter,
   LocalHostNetworkAdapter,