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

package/dist/lib/node/index.cjs

@@ -18,38 +18,39 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var node_exports = {};
 __export(node_exports, {
-  AuthExtension: () => import_chunk_M475BGBI.AuthExtension,
-  AuthStatus: () => import_chunk_M475BGBI.AuthStatus,
+  AuthExtension: () => import_chunk_QPCNQ4ZK.AuthExtension,
+  AuthStatus: () => import_chunk_QPCNQ4ZK.AuthStatus,
   AutomergeDocumentLoaderImpl: () => AutomergeDocumentLoaderImpl,
   AutomergeHost: () => AutomergeHost,
   AutomergeStorageAdapter: () => AutomergeStorageAdapter,
-  DataServiceImpl: () => import_chunk_M475BGBI.DataServiceImpl,
+  DataServiceImpl: () => import_chunk_QPCNQ4ZK.DataServiceImpl,
   LevelDBStorageAdapter: () => LevelDBStorageAdapter,
   LocalHostNetworkAdapter: () => LocalHostNetworkAdapter,
-  MOCK_AUTH_PROVIDER: () => import_chunk_M475BGBI.MOCK_AUTH_PROVIDER,
-  MOCK_AUTH_VERIFIER: () => import_chunk_M475BGBI.MOCK_AUTH_VERIFIER,
+  MOCK_AUTH_PROVIDER: () => import_chunk_QPCNQ4ZK.MOCK_AUTH_PROVIDER,
+  MOCK_AUTH_VERIFIER: () => import_chunk_QPCNQ4ZK.MOCK_AUTH_VERIFIER,
   MeshEchoReplicator: () => MeshEchoReplicator,
-  MetadataStore: () => import_chunk_M475BGBI.MetadataStore,
-  Pipeline: () => import_chunk_M475BGBI.Pipeline,
-  SnapshotManager: () => import_chunk_M475BGBI.SnapshotManager,
-  SnapshotStore: () => import_chunk_M475BGBI.SnapshotStore,
-  Space: () => import_chunk_M475BGBI.Space,
-  SpaceManager: () => import_chunk_M475BGBI.SpaceManager,
-  SpaceProtocol: () => import_chunk_M475BGBI.SpaceProtocol,
-  SpaceProtocolSession: () => import_chunk_M475BGBI.SpaceProtocolSession,
-  TimeframeClock: () => import_chunk_M475BGBI.TimeframeClock,
-  codec: () => import_chunk_M475BGBI.codec,
-  createMappedFeedWriter: () => import_chunk_M475BGBI.createMappedFeedWriter,
+  MetadataStore: () => import_chunk_QPCNQ4ZK.MetadataStore,
+  Pipeline: () => import_chunk_QPCNQ4ZK.Pipeline,
+  SnapshotManager: () => import_chunk_QPCNQ4ZK.SnapshotManager,
+  SnapshotStore: () => import_chunk_QPCNQ4ZK.SnapshotStore,
+  Space: () => import_chunk_QPCNQ4ZK.Space,
+  SpaceManager: () => import_chunk_QPCNQ4ZK.SpaceManager,
+  SpaceProtocol: () => import_chunk_QPCNQ4ZK.SpaceProtocol,
+  SpaceProtocolSession: () => import_chunk_QPCNQ4ZK.SpaceProtocolSession,
+  TimeframeClock: () => import_chunk_QPCNQ4ZK.TimeframeClock,
+  codec: () => import_chunk_QPCNQ4ZK.codec,
+  createIdFromSpaceKey: () => import_chunk_QPCNQ4ZK.createIdFromSpaceKey,
+  createMappedFeedWriter: () => import_chunk_QPCNQ4ZK.createMappedFeedWriter,
   encodingOptions: () => encodingOptions,
   getSpaceKeyFromDoc: () => getSpaceKeyFromDoc,
-  hasInvitationExpired: () => import_chunk_M475BGBI.hasInvitationExpired,
-  mapFeedIndexesToTimeframe: () => import_chunk_M475BGBI.mapFeedIndexesToTimeframe,
-  mapTimeframeToFeedIndexes: () => import_chunk_M475BGBI.mapTimeframeToFeedIndexes,
-  startAfter: () => import_chunk_M475BGBI.startAfter,
-  valueEncoding: () => import_chunk_M475BGBI.valueEncoding
+  hasInvitationExpired: () => import_chunk_QPCNQ4ZK.hasInvitationExpired,
+  mapFeedIndexesToTimeframe: () => import_chunk_QPCNQ4ZK.mapFeedIndexesToTimeframe,
+  mapTimeframeToFeedIndexes: () => import_chunk_QPCNQ4ZK.mapTimeframeToFeedIndexes,
+  startAfter: () => import_chunk_QPCNQ4ZK.startAfter,
+  valueEncoding: () => import_chunk_QPCNQ4ZK.valueEncoding
 });
 module.exports = __toCommonJS(node_exports);
-var import_chunk_M475BGBI = require("./chunk-M475BGBI.cjs");
+var import_chunk_QPCNQ4ZK = require("./chunk-QPCNQ4ZK.cjs");
 var import_async = require("@dxos/async");
 var import_automerge = require("@dxos/automerge/automerge");
 var import_automerge_repo = require("@dxos/automerge/automerge-repo");
@@ -205,13 +206,14 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.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) {
     (0, import_invariant2.invariant)(this._lifecycleState === import_context2.LifecycleState.OPEN, void 0, {
       F: __dxlog_file,
-      L: 102,
+      L: 103,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -220,14 +222,13 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     });
     (0, import_invariant2.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);
   }
@@ -293,27 +294,49 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.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) {
+    (0, import_log2.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);
+    (0, import_invariant2.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) {
     (0, import_log2.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);
     (0, import_invariant2.invariant)(entry, void 0, {
       F: __dxlog_file,
-      L: 157,
+      L: 163,
       S: this,
       A: [
         "entry",
@@ -326,18 +349,27 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     });
     void entry.reader.cancel().catch((err) => import_log2.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) => import_log2.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([
   import_async2.synchronized
@@ -667,7 +699,7 @@ var levelMigration = async ({ db, directory }) => {
     chunks: chunks.length
   }, {
     F: __dxlog_file3,
-    L: 36,
+    L: 37,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -701,6 +733,7 @@ var AutomergeHost = class {
     this._indexMetadataStore = indexMetadataStore;
   }
   async open() {
+    this._peerId = `host-${import_keys.PublicKey.random().toHex()}`;
     this._directory && await levelMigration({
       db: this._db,
       directory: this._directory
@@ -713,16 +746,17 @@ var AutomergeHost = class {
       }
     });
     await this._storage.open?.();
-    this._peerId = `host-${import_keys.PublicKey.random().toHex()}`;
     this._clientNetwork = new LocalHostNetworkAdapter();
     this._repo = new import_automerge_repo.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();
@@ -764,7 +798,7 @@ var AutomergeHost = class {
         isRequested
       }, {
         F: __dxlog_file4,
-        L: 149,
+        L: 156,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -850,7 +884,7 @@ var AutomergeHost = class {
     await Promise.all(states?.map(async ({ heads, documentId }) => {
       (0, import_invariant.invariant)(heads, "heads are required for flush", {
         F: __dxlog_file4,
-        L: 243,
+        L: 250,
         S: this,
         A: [
           "heads",
@@ -930,9 +964,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();
@@ -950,10 +985,10 @@ var AutomergeDocumentLoaderImpl = class {
     }
     if (!spaceState.rootUrl) {
       import_log4.log.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)
       });
@@ -963,7 +998,7 @@ var AutomergeDocumentLoaderImpl = class {
       const doc = existingDocHandle.docSync();
       (0, import_invariant4.invariant)(doc, void 0, {
         F: __dxlog_file5,
-        L: 75,
+        L: 77,
         S: this,
         A: [
           "doc",
@@ -985,7 +1020,7 @@ var AutomergeDocumentLoaderImpl = class {
     for (const objectId of objectIds) {
       (0, import_invariant4.invariant)(this._spaceRootDocHandle, void 0, {
         F: __dxlog_file5,
-        L: 88,
+        L: 90,
         S: this,
         A: [
           "this._spaceRootDocHandle",
@@ -998,7 +1033,7 @@ var AutomergeDocumentLoaderImpl = class {
       const spaceRootDoc = this._spaceRootDocHandle.docSync();
       (0, import_invariant4.invariant)(spaceRootDoc, void 0, {
         F: __dxlog_file5,
-        L: 93,
+        L: 95,
         S: this,
         A: [
           "spaceRootDoc",
@@ -1012,7 +1047,7 @@ var AutomergeDocumentLoaderImpl = class {
           objectId
         }, {
           F: __dxlog_file5,
-          L: 97,
+          L: 99,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1036,7 +1071,7 @@ var AutomergeDocumentLoaderImpl = class {
   getSpaceRootDocHandle() {
     (0, import_invariant4.invariant)(this._spaceRootDocHandle, void 0, {
       F: __dxlog_file5,
-      L: 120,
+      L: 122,
       S: this,
       A: [
         "this._spaceRootDocHandle",
@@ -1048,7 +1083,7 @@ var AutomergeDocumentLoaderImpl = class {
   createDocumentForObject(objectId) {
     (0, import_invariant4.invariant)(this._spaceRootDocHandle, void 0, {
       F: __dxlog_file5,
-      L: 125,
+      L: 127,
       S: this,
       A: [
         "this._spaceRootDocHandle",
@@ -1091,7 +1126,7 @@ var AutomergeDocumentLoaderImpl = class {
           actualDocumentUrl: objectDocumentHandle.url
         }, {
           F: __dxlog_file5,
-          L: 155,
+          L: 157,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1100,7 +1135,7 @@ var AutomergeDocumentLoaderImpl = class {
       if (objectDocumentHandle?.url === automergeUrl) {
         import_log4.log.warn("object document was already loaded", logMeta, {
           F: __dxlog_file5,
-          L: 162,
+          L: 164,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1109,7 +1144,7 @@ var AutomergeDocumentLoaderImpl = class {
       const handle = this._repo.find(automergeUrl);
       import_log4.log.debug("document loading triggered", logMeta, {
         F: __dxlog_file5,
-        L: 166,
+        L: 168,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1121,7 +1156,7 @@ var AutomergeDocumentLoaderImpl = class {
     const docHandle = this._repo.find(url);
     while (true) {
       try {
-        await (0, import_debug.warnAfterTimeout)(5e3, "Automerge root doc load timeout (AutomergeDb)", async () => {
+        await (0, import_debug.warnAfterTimeout)(5e3, "Automerge root doc load timeout (CoreDatabase)", async () => {
           await (0, import_context4.cancelWithContext)(ctx, docHandle.whenReady());
         });
         break;
@@ -1132,7 +1167,7 @@ var AutomergeDocumentLoaderImpl = class {
             state: docHandle.state
           }, {
             F: __dxlog_file5,
-            L: 182,
+            L: 184,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1174,7 +1209,7 @@ var AutomergeDocumentLoaderImpl = class {
       if (this.onObjectDocumentLoaded.listenerCount() === 0) {
         import_log4.log.info("document loaded after all listeners were removed", logMeta, {
           F: __dxlog_file5,
-          L: 218,
+          L: 220,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1184,7 +1219,7 @@ var AutomergeDocumentLoaderImpl = class {
       if (objectDocHandle?.url !== handle.url) {
         import_log4.log.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)
         });
@@ -1203,7 +1238,7 @@ var AutomergeDocumentLoaderImpl = class {
         err
       }, {
         F: __dxlog_file5,
-        L: 229,
+        L: 231,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1270,7 +1305,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);
@@ -1281,7 +1318,7 @@ var MeshEchoReplicator = class {
           peerId: connection.peerId
         }, {
           F: __dxlog_file6,
-          L: 69,
+          L: 71,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1296,13 +1333,13 @@ var MeshEchoReplicator = class {
           documentId: params.documentId
         }, {
           F: __dxlog_file6,
-          L: 76,
+          L: 78,
           S: this,
           C: (f, a) => f(...a)
         });
         (0, import_invariant5.invariant)(this._context, void 0, {
           F: __dxlog_file6,
-          L: 77,
+          L: 79,
           S: this,
           A: [
             "this._context",
@@ -1317,7 +1354,7 @@ var MeshEchoReplicator = class {
               documentId: params.documentId
             }, {
               F: __dxlog_file6,
-              L: 81,
+              L: 83,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1330,7 +1367,7 @@ var MeshEchoReplicator = class {
               documentId: params.documentId
             }, {
               F: __dxlog_file6,
-              L: 91,
+              L: 93,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1346,7 +1383,7 @@ var MeshEchoReplicator = class {
             isAuthorized
           }, {
             F: __dxlog_file6,
-            L: 99,
+            L: 101,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1354,7 +1391,7 @@ var MeshEchoReplicator = class {
         } catch (err) {
           import_log5.log.catch(err, void 0, {
             F: __dxlog_file6,
-            L: 109,
+            L: 111,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1371,7 +1408,7 @@ var MeshEchoReplicator = class {
       deviceKey
     }, {
       F: __dxlog_file6,
-      L: 120,
+      L: 122,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1413,7 +1450,7 @@ var MeshReplicatorConnection = class extends import_context5.Resource {
           remotePeerId: remotePeerId.toHex()
         }, {
           F: __dxlog_file6,
-          L: 185,
+          L: 187,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1437,7 +1474,7 @@ var MeshReplicatorConnection = class extends import_context5.Resource {
   get peerId() {
     (0, import_invariant5.invariant)(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file6,
-      L: 208,
+      L: 210,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1456,7 +1493,7 @@ var MeshReplicatorConnection = class extends import_context5.Resource {
   async enable() {
     (0, import_invariant5.invariant)(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file6,
-      L: 221,
+      L: 223,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1495,6 +1532,7 @@ var MeshReplicatorConnection = class extends import_context5.Resource {
   SpaceProtocolSession,
   TimeframeClock,
   codec,
+  createIdFromSpaceKey,
   createMappedFeedWriter,
   encodingOptions,
   getSpaceKeyFromDoc,