@dxos/echo-pipeline 0.5.9-main.a50ff17 → 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,16 +25,14 @@ 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 { log as log2 } from "@dxos/log";
 import { objectPointerCodec } from "@dxos/protocols";
 import { trace } from "@dxos/tracing";
 import { mapValues } from "@dxos/util";
@@ -319,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()
     });
   }
 };
@@ -338,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";
@@ -587,11 +589,13 @@ 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)
     });
-    this._requestedDocs = /* @__PURE__ */ new Set();
     this._storage = new LevelDBStorageAdapter({
       db,
       callbacks: {
@@ -627,6 +631,9 @@ var AutomergeHost = class {
     await this._echoNetworkAdapter.close();
     await this._ctx.dispose();
   }
+  /**
+  * @deprecated To be abstracted away.
+  */
   get repo() {
     return this._repo;
   }
@@ -636,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
@@ -647,23 +687,8 @@ var AutomergeHost = class {
     if (!documentId) {
       return false;
     }
-    const doc = this._repo.handles[documentId]?.docSync();
-    if (!doc) {
-      const isRequested = this._requestedDocs.has(`automerge:${documentId}`);
-      log2("doc share policy check", {
-        peerId,
-        documentId,
-        isRequested
-      }, {
-        F: __dxlog_file3,
-        L: 143,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      return isRequested;
-    }
     const peerMetadata = this.repo.peerMetadataByPeerId[peerId];
-    if (peerMetadata?.dxos_peerSource === "EchoNetworkAdapter") {
+    if (isEchoPeerMetadata(peerMetadata)) {
       return this._echoNetworkAdapter.shouldAdvertize(peerId, {
         documentId
       });
@@ -735,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: 237,
-        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();
   }
@@ -813,11 +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 { 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 { log as log3 } from "@dxos/log";
+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) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -851,7 +881,7 @@ var AutomergeDocumentLoaderImpl = class {
       return;
     }
     if (!spaceState.rootUrl) {
-      log3.error("Database opened with no rootUrl", {
+      log2.error("Database opened with no rootUrl", {
         spaceId: this._spaceId
       }, {
         F: __dxlog_file4,
@@ -863,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,
@@ -885,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,
@@ -898,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,
@@ -910,7 +940,7 @@ var AutomergeDocumentLoaderImpl = class {
       const documentUrl = (spaceRootDoc.links ?? {})[objectId];
       if (documentUrl == null) {
         this._objectsPendingDocumentLoad.add(objectId);
-        log3.info("loading delayed until object links are initialized", {
+        log2.info("loading delayed until object links are initialized", {
           objectId
         }, {
           F: __dxlog_file4,
@@ -936,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,
@@ -948,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,
@@ -990,7 +1020,7 @@ var AutomergeDocumentLoaderImpl = class {
       };
       const objectDocumentHandle = this._objectDocumentHandles.get(objectId);
       if (objectDocumentHandle != null && objectDocumentHandle.url !== automergeUrl) {
-        log3.warn("object already inlined in a different document, ignoring the link", {
+        log2.warn("object already inlined in a different document, ignoring the link", {
           ...logMeta,
           actualDocumentUrl: objectDocumentHandle.url
         }, {
@@ -1002,7 +1032,7 @@ var AutomergeDocumentLoaderImpl = class {
         continue;
       }
       if (objectDocumentHandle?.url === automergeUrl) {
-        log3.warn("object document was already loaded", logMeta, {
+        log2.warn("object document was already loaded", logMeta, {
           F: __dxlog_file4,
           L: 166,
           S: this,
@@ -1011,7 +1041,7 @@ var AutomergeDocumentLoaderImpl = class {
         continue;
       }
       const handle = this._repo.find(automergeUrl);
-      log3.debug("document loading triggered", logMeta, {
+      log2.debug("document loading triggered", logMeta, {
         F: __dxlog_file4,
         L: 170,
         S: this,
@@ -1026,12 +1056,12 @@ 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) {
         if (`${err}`.includes("Timeout")) {
-          log3.info("wraparound", {
+          log2.info("wraparound", {
             id: docHandle.documentId,
             state: docHandle.state
           }, {
@@ -1076,7 +1106,7 @@ var AutomergeDocumentLoaderImpl = class {
         docUrl: handle.url
       };
       if (this.onObjectDocumentLoaded.listenerCount() === 0) {
-        log3.info("document loaded after all listeners were removed", logMeta, {
+        log2.info("document loaded after all listeners were removed", logMeta, {
           F: __dxlog_file4,
           L: 222,
           S: this,
@@ -1086,7 +1116,7 @@ var AutomergeDocumentLoaderImpl = class {
       }
       const objectDocHandle = this._objectDocumentHandles.get(objectId);
       if (objectDocHandle?.url !== handle.url) {
-        log3.warn("object was rebound while a document was loading, discarding handle", logMeta, {
+        log2.warn("object was rebound while a document was loading, discarding handle", logMeta, {
           F: __dxlog_file4,
           L: 227,
           S: this,
@@ -1100,7 +1130,7 @@ var AutomergeDocumentLoaderImpl = class {
       });
     } catch (err) {
       const shouldRetryLoading = this.onObjectDocumentLoaded.listenerCount() > 0;
-      log3.warn("failed to load a document", {
+      log2.warn("failed to load a document", {
         objectId,
         automergeUrl: handle.url,
         retryLoading: shouldRetryLoading,
@@ -1129,9 +1159,9 @@ 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 log4 } from "@dxos/log";
+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";
@@ -1160,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,
@@ -1172,7 +1202,7 @@ var MeshEchoReplicator = class {
     const connection = new MeshReplicatorConnection({
       ownPeerId: this._context.peerId,
       onRemoteConnected: async () => {
-        log4("onRemoteConnected", {
+        log3("onRemoteConnected", {
           peerId: connection.peerId
         }, {
           F: __dxlog_file5,
@@ -1180,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,
@@ -1198,7 +1228,7 @@ var MeshEchoReplicator = class {
         }
       },
       onRemoteDisconnected: async () => {
-        log4("onRemoteDisconnected", {
+        log3("onRemoteDisconnected", {
           peerId: connection.peerId
         }, {
           F: __dxlog_file5,
@@ -1207,12 +1237,12 @@ 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) => {
-        log4("shouldAdvertize", {
+        log3("shouldAdvertize", {
           peerId: connection.peerId,
           documentId: params.documentId
         }, {
@@ -1221,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,
@@ -1233,7 +1263,7 @@ var MeshEchoReplicator = class {
         try {
           const spaceKey = await this._context.getContainingSpaceForDocument(params.documentId);
           if (!spaceKey) {
-            log4("space key not found for share policy check", {
+            log3("space key not found for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
@@ -1246,7 +1276,7 @@ var MeshEchoReplicator = class {
           }
           const authorizedDevices = this._authorizedDevices.get(spaceKey);
           if (!connection.remoteDeviceKey) {
-            log4("device key not found for share policy check", {
+            log3("device key not found for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
@@ -1258,7 +1288,7 @@ var MeshEchoReplicator = class {
             return false;
           }
           const isAuthorized = authorizedDevices?.has(connection.remoteDeviceKey) ?? false;
-          log4("share policy check", {
+          log3("share policy check", {
             localPeer: this._context.peerId,
             remotePeer: connection.peerId,
             documentId: params.documentId,
@@ -1273,7 +1303,7 @@ var MeshEchoReplicator = class {
           });
           return isAuthorized;
         } catch (err) {
-          log4.catch(err, void 0, {
+          log3.catch(err, void 0, {
             F: __dxlog_file5,
             L: 111,
             S: this,
@@ -1287,7 +1317,7 @@ var MeshEchoReplicator = class {
     return connection.replicatorExtension;
   }
   authorizeDevice(spaceKey, deviceKey) {
-    log4("authorizeDevice", {
+    log3("authorizeDevice", {
       spaceKey,
       deviceKey
     }, {
@@ -1297,6 +1327,11 @@ var MeshEchoReplicator = class {
       C: (f, a) => f(...a)
     });
     defaultMap(this._authorizedDevices, spaceKey, () => new ComplexSet(PublicKey2.hash)).add(deviceKey);
+    for (const connection of this._connections) {
+      if (connection.remoteDeviceKey && connection.remoteDeviceKey.equals(deviceKey)) {
+        this._context?.onConnectionAuthScopeChanged(connection);
+      }
+    }
   }
 };
 var MeshReplicatorConnection = class extends Resource2 {
@@ -1328,13 +1363,13 @@ var MeshReplicatorConnection = class extends Resource2 {
       onStartReplication: async (info, remotePeerId) => {
         this.remoteDeviceKey = remotePeerId;
         this._remotePeerId = info.id;
-        log4("onStartReplication", {
+        log3("onStartReplication", {
           id: info.id,
           thisPeerId: this.peerId,
           remotePeerId: remotePeerId.toHex()
         }, {
           F: __dxlog_file5,
-          L: 187,
+          L: 192,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1356,9 +1391,9 @@ 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: 210,
+      L: 215,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1375,9 +1410,9 @@ 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: 223,
+      L: 228,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1398,6 +1433,8 @@ export {
   AuthStatus,
   AutomergeDocumentLoaderImpl,
   AutomergeHost,
+  CredentialRetrieverExtension,
+  CredentialServerExtension,
   DataServiceImpl,
   LevelDBStorageAdapter,
   LocalHostNetworkAdapter,