@dxos/echo-pipeline 0.5.8 → 0.5.9-main.0a0e87d

package/dist/lib/browser/index.mjs

@@ -16,13 +16,14 @@ import {
   SpaceProtocolSession,
   TimeframeClock,
   codec,
+  createIdFromSpaceKey,
   createMappedFeedWriter,
   hasInvitationExpired,
   mapFeedIndexesToTimeframe,
   mapTimeframeToFeedIndexes,
   startAfter,
   valueEncoding
-} from "./chunk-GANAND63.mjs";
+} from "./chunk-I2J5TTHJ.mjs";
 
 // packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts
 import { Event } from "@dxos/async";
@@ -160,13 +161,14 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: this.peerId,
       onConnectionOpen: this._onConnectionOpen.bind(this),
       onConnectionClosed: this._onConnectionClosed.bind(this),
+      onConnectionAuthScopeChanged: this._onConnectionAuthScopeChanged.bind(this),
       getContainingSpaceForDocument: this._params.getContainingSpaceForDocument
     });
   }
   async removeReplicator(replicator) {
     invariant(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file,
-      L: 102,
+      L: 103,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -175,14 +177,13 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
     invariant(this._replicators.has(replicator), void 0, {
       F: __dxlog_file,
-      L: 103,
+      L: 104,
       S: this,
       A: [
         "this._replicators.has(replicator)",
         ""
       ]
     });
-    "";
     await replicator.disconnect();
     this._replicators.delete(replicator);
   }
@@ -248,27 +249,49 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       S: this,
       C: (f, a) => f(...a)
     });
-    this.emit("peer-candidate", {
-      peerId: connection.peerId,
-      peerMetadata: {
-        // TODO(dmaretskyi): Refactor this.
-        dxos_peerSource: "EchoNetworkAdapter"
-      }
+    this._emitPeerCandidate(connection);
+  }
+  /**
+  * Trigger doc-synchronizer shared documents set recalculation. Happens on peer-candidate.
+  * TODO(y): replace with a proper API call when sharePolicy update becomes supported by automerge-repo
+  */
+  _onConnectionAuthScopeChanged(connection) {
+    log("Connection auth scope changed", {
+      peerId: connection.peerId
+    }, {
+      F: __dxlog_file,
+      L: 153,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    const entry = this._connections.get(connection.peerId);
+    invariant(entry, void 0, {
+      F: __dxlog_file,
+      L: 155,
+      S: this,
+      A: [
+        "entry",
+        ""
+      ]
     });
+    this.emit("peer-disconnected", {
+      peerId: connection.peerId
+    });
+    this._emitPeerCandidate(connection);
   }
   _onConnectionClosed(connection) {
     log("Connection closed", {
       peerId: connection.peerId
     }, {
       F: __dxlog_file,
-      L: 155,
+      L: 161,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
     invariant(entry, void 0, {
       F: __dxlog_file,
-      L: 157,
+      L: 163,
       S: this,
       A: [
         "entry",
@@ -281,18 +304,27 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
     void entry.reader.cancel().catch((err) => log.catch(err, void 0, {
       F: __dxlog_file,
-      L: 162,
+      L: 168,
       S: this,
       C: (f, a) => f(...a)
     }));
     void entry.writer.abort().catch((err) => log.catch(err, void 0, {
       F: __dxlog_file,
-      L: 163,
+      L: 169,
       S: this,
       C: (f, a) => f(...a)
     }));
     this._connections.delete(connection.peerId);
   }
+  _emitPeerCandidate(connection) {
+    this.emit("peer-candidate", {
+      peerId: connection.peerId,
+      peerMetadata: {
+        // TODO(dmaretskyi): Refactor this.
+        dxos_peerSource: "EchoNetworkAdapter"
+      }
+    });
+  }
 };
 _ts_decorate([
   synchronized
@@ -641,7 +673,7 @@ var levelMigration = async ({ db, directory }) => {
     chunks: chunks.length
   }, {
     F: __dxlog_file3,
-    L: 36,
+    L: 37,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -677,6 +709,7 @@ var AutomergeHost = class {
     this._indexMetadataStore = indexMetadataStore;
   }
   async open() {
+    this._peerId = `host-${PublicKey.random().toHex()}`;
     this._directory && await levelMigration({
       db: this._db,
       directory: this._directory
@@ -689,16 +722,17 @@ var AutomergeHost = class {
       }
     });
     await this._storage.open?.();
-    this._peerId = `host-${PublicKey.random().toHex()}`;
     this._clientNetwork = new LocalHostNetworkAdapter();
     this._repo = new Repo({
       peerId: this._peerId,
+      sharePolicy: this._sharePolicy.bind(this),
+      storage: this._storage,
       network: [
+        // Downstream client.
         this._clientNetwork,
+        // Upstream swarm.
         this._echoNetworkAdapter
-      ],
-      storage: this._storage,
-      sharePolicy: this._sharePolicy.bind(this)
+      ]
     });
     this._clientNetwork.ready();
     await this._echoNetworkAdapter.open();
@@ -740,7 +774,7 @@ var AutomergeHost = class {
         isRequested
       }, {
         F: __dxlog_file4,
-        L: 149,
+        L: 156,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -826,7 +860,7 @@ var AutomergeHost = class {
     await Promise.all(states?.map(async ({ heads, documentId }) => {
       invariant3(heads, "heads are required for flush", {
         F: __dxlog_file4,
-        L: 243,
+        L: 250,
         S: this,
         A: [
           "heads",
@@ -914,9 +948,10 @@ function _ts_decorate3(decorators, target, key, desc) {
 }
 var __dxlog_file5 = "/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;
+  constructor(_spaceId, _repo, _spaceKey) {
+    this._spaceId = _spaceId;
     this._repo = _repo;
+    this._spaceKey = _spaceKey;
     this._spaceRootDocHandle = null;
     this._objectDocumentHandles = /* @__PURE__ */ new Map();
     this._objectsPendingDocumentLoad = /* @__PURE__ */ new Set();
@@ -934,10 +969,10 @@ var AutomergeDocumentLoaderImpl = class {
     }
     if (!spaceState.rootUrl) {
       log4.error("Database opened with no rootUrl", {
-        spaceKey: this._spaceKey
+        spaceId: this._spaceId
       }, {
         F: __dxlog_file5,
-        L: 70,
+        L: 72,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -947,7 +982,7 @@ var AutomergeDocumentLoaderImpl = class {
       const doc = existingDocHandle.docSync();
       invariant4(doc, void 0, {
         F: __dxlog_file5,
-        L: 75,
+        L: 77,
         S: this,
         A: [
           "doc",
@@ -969,7 +1004,7 @@ var AutomergeDocumentLoaderImpl = class {
     for (const objectId of objectIds) {
       invariant4(this._spaceRootDocHandle, void 0, {
         F: __dxlog_file5,
-        L: 88,
+        L: 90,
         S: this,
         A: [
           "this._spaceRootDocHandle",
@@ -982,7 +1017,7 @@ var AutomergeDocumentLoaderImpl = class {
       const spaceRootDoc = this._spaceRootDocHandle.docSync();
       invariant4(spaceRootDoc, void 0, {
         F: __dxlog_file5,
-        L: 93,
+        L: 95,
         S: this,
         A: [
           "spaceRootDoc",
@@ -996,7 +1031,7 @@ var AutomergeDocumentLoaderImpl = class {
           objectId
         }, {
           F: __dxlog_file5,
-          L: 97,
+          L: 99,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1020,7 +1055,7 @@ var AutomergeDocumentLoaderImpl = class {
   getSpaceRootDocHandle() {
     invariant4(this._spaceRootDocHandle, void 0, {
       F: __dxlog_file5,
-      L: 120,
+      L: 122,
       S: this,
       A: [
         "this._spaceRootDocHandle",
@@ -1032,7 +1067,7 @@ var AutomergeDocumentLoaderImpl = class {
   createDocumentForObject(objectId) {
     invariant4(this._spaceRootDocHandle, void 0, {
       F: __dxlog_file5,
-      L: 125,
+      L: 127,
       S: this,
       A: [
         "this._spaceRootDocHandle",
@@ -1075,7 +1110,7 @@ var AutomergeDocumentLoaderImpl = class {
           actualDocumentUrl: objectDocumentHandle.url
         }, {
           F: __dxlog_file5,
-          L: 155,
+          L: 157,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1084,7 +1119,7 @@ var AutomergeDocumentLoaderImpl = class {
       if (objectDocumentHandle?.url === automergeUrl) {
         log4.warn("object document was already loaded", logMeta, {
           F: __dxlog_file5,
-          L: 162,
+          L: 164,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1093,7 +1128,7 @@ var AutomergeDocumentLoaderImpl = class {
       const handle = this._repo.find(automergeUrl);
       log4.debug("document loading triggered", logMeta, {
         F: __dxlog_file5,
-        L: 166,
+        L: 168,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1105,7 +1140,7 @@ var AutomergeDocumentLoaderImpl = class {
     const docHandle = this._repo.find(url);
     while (true) {
       try {
-        await warnAfterTimeout(5e3, "Automerge root doc load timeout (AutomergeDb)", async () => {
+        await warnAfterTimeout(5e3, "Automerge root doc load timeout (CoreDatabase)", async () => {
           await cancelWithContext(ctx, docHandle.whenReady());
         });
         break;
@@ -1116,7 +1151,7 @@ var AutomergeDocumentLoaderImpl = class {
             state: docHandle.state
           }, {
             F: __dxlog_file5,
-            L: 182,
+            L: 184,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1158,7 +1193,7 @@ var AutomergeDocumentLoaderImpl = class {
       if (this.onObjectDocumentLoaded.listenerCount() === 0) {
         log4.info("document loaded after all listeners were removed", logMeta, {
           F: __dxlog_file5,
-          L: 218,
+          L: 220,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1168,7 +1203,7 @@ var AutomergeDocumentLoaderImpl = class {
       if (objectDocHandle?.url !== handle.url) {
         log4.warn("object was rebound while a document was loading, discarding handle", logMeta, {
           F: __dxlog_file5,
-          L: 223,
+          L: 225,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1187,7 +1222,7 @@ var AutomergeDocumentLoaderImpl = class {
         err
       }, {
         F: __dxlog_file5,
-        L: 229,
+        L: 231,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1269,7 +1304,9 @@ var MeshEchoReplicator = class {
             ""
           ]
         });
-        if (!this._connectionsPerPeer.has(connection.peerId)) {
+        if (this._connectionsPerPeer.has(connection.peerId)) {
+          this._context.onConnectionAuthScopeChanged(connection);
+        } else {
           this._connectionsPerPeer.set(connection.peerId, connection);
           await connection.enable();
           this._context.onConnectionOpen(connection);
@@ -1280,7 +1317,7 @@ var MeshEchoReplicator = class {
           peerId: connection.peerId
         }, {
           F: __dxlog_file6,
-          L: 69,
+          L: 71,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1295,13 +1332,13 @@ var MeshEchoReplicator = class {
           documentId: params.documentId
         }, {
           F: __dxlog_file6,
-          L: 76,
+          L: 78,
           S: this,
           C: (f, a) => f(...a)
         });
         invariant5(this._context, void 0, {
           F: __dxlog_file6,
-          L: 77,
+          L: 79,
           S: this,
           A: [
             "this._context",
@@ -1316,7 +1353,7 @@ var MeshEchoReplicator = class {
               documentId: params.documentId
             }, {
               F: __dxlog_file6,
-              L: 81,
+              L: 83,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1329,7 +1366,7 @@ var MeshEchoReplicator = class {
               documentId: params.documentId
             }, {
               F: __dxlog_file6,
-              L: 91,
+              L: 93,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1345,7 +1382,7 @@ var MeshEchoReplicator = class {
             isAuthorized
           }, {
             F: __dxlog_file6,
-            L: 99,
+            L: 101,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1353,7 +1390,7 @@ var MeshEchoReplicator = class {
         } catch (err) {
           log5.catch(err, void 0, {
             F: __dxlog_file6,
-            L: 109,
+            L: 111,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1370,7 +1407,7 @@ var MeshEchoReplicator = class {
       deviceKey
     }, {
       F: __dxlog_file6,
-      L: 120,
+      L: 122,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1412,7 +1449,7 @@ var MeshReplicatorConnection = class extends Resource2 {
           remotePeerId: remotePeerId.toHex()
         }, {
           F: __dxlog_file6,
-          L: 185,
+          L: 187,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1436,7 +1473,7 @@ var MeshReplicatorConnection = class extends Resource2 {
   get peerId() {
     invariant5(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file6,
-      L: 208,
+      L: 210,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1455,7 +1492,7 @@ var MeshReplicatorConnection = class extends Resource2 {
   async enable() {
     invariant5(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file6,
-      L: 221,
+      L: 223,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1493,6 +1530,7 @@ export {
   SpaceProtocolSession,
   TimeframeClock,
   codec,
+  createIdFromSpaceKey,
   createMappedFeedWriter,
   encodingOptions,
   getSpaceKeyFromDoc,