@dxos/echo-pipeline 0.6.6-main.e1a6e1f → 0.6.6-staging.41c080b

package/dist/lib/browser/{chunk-LNIQX6PQ.mjs → chunk-P6XSIJKM.mjs}

@@ -1988,7 +1988,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     this._lifecycleState = LifecycleState2.OPEN;
     log9("emit ready", void 0, {
       F: __dxlog_file11,
-      L: 79,
+      L: 81,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2014,7 +2014,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
   async addReplicator(replicator) {
     invariant7(this._lifecycleState === LifecycleState2.OPEN, void 0, {
       F: __dxlog_file11,
-      L: 105,
+      L: 107,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -2023,7 +2023,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
     invariant7(this.peerId, void 0, {
       F: __dxlog_file11,
-      L: 106,
+      L: 108,
       S: this,
       A: [
         "this.peerId",
@@ -2032,7 +2032,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
     invariant7(!this._replicators.has(replicator), void 0, {
       F: __dxlog_file11,
-      L: 107,
+      L: 109,
       S: this,
       A: [
         "!this._replicators.has(replicator)",
@@ -2045,6 +2045,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       onConnectionOpen: this._onConnectionOpen.bind(this),
       onConnectionClosed: this._onConnectionClosed.bind(this),
       onConnectionAuthScopeChanged: this._onConnectionAuthScopeChanged.bind(this),
+      isDocumentInRemoteCollection: this._params.isDocumentInRemoteCollection,
       getContainingSpaceForDocument: this._params.getContainingSpaceForDocument,
       getContainingSpaceIdForDocument: async (documentId) => {
         const key = await this._params.getContainingSpaceForDocument(documentId);
@@ -2055,7 +2056,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
   async removeReplicator(replicator) {
     invariant7(this._lifecycleState === LifecycleState2.OPEN, void 0, {
       F: __dxlog_file11,
-      L: 125,
+      L: 128,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -2064,7 +2065,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
     invariant7(this._replicators.has(replicator), void 0, {
       F: __dxlog_file11,
-      L: 126,
+      L: 129,
       S: this,
       A: [
         "this._replicators.has(replicator)",
@@ -2120,7 +2121,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       if (connectionEntry.isOpen) {
         log9.catch(err, void 0, {
           F: __dxlog_file11,
-          L: 186,
+          L: 189,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2141,13 +2142,13 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file11,
-      L: 204,
+      L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant7(!this._connections.has(connection.peerId), void 0, {
       F: __dxlog_file11,
-      L: 205,
+      L: 208,
       S: this,
       A: [
         "!this._connections.has(connection.peerId as PeerId)",
@@ -2176,7 +2177,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
         if (connectionEntry.isOpen) {
           log9.catch(err, void 0, {
             F: __dxlog_file11,
-            L: 224,
+            L: 227,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2187,7 +2188,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file11,
-      L: 229,
+      L: 232,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2213,14 +2214,14 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file11,
-      L: 250,
+      L: 253,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
     invariant7(entry, void 0, {
       F: __dxlog_file11,
-      L: 252,
+      L: 255,
       S: this,
       A: [
         "entry",
@@ -2237,14 +2238,14 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file11,
-      L: 258,
+      L: 261,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
     invariant7(entry, void 0, {
       F: __dxlog_file11,
-      L: 260,
+      L: 263,
       S: this,
       A: [
         "entry",
@@ -2258,13 +2259,13 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     this._params.monitor?.recordPeerDisconnected(connection.peerId);
     void entry.reader.cancel().catch((err) => log9.catch(err, void 0, {
       F: __dxlog_file11,
-      L: 266,
+      L: 269,
       S: this,
       C: (f, a) => f(...a)
     }));
     void entry.writer.abort().catch((err) => log9.catch(err, void 0, {
       F: __dxlog_file11,
-      L: 267,
+      L: 270,
       S: this,
       C: (f, a) => f(...a)
     }));
@@ -2454,6 +2455,7 @@ var AutomergeHost = class extends Resource5 {
     });
     this._echoNetworkAdapter = new EchoNetworkAdapter({
       getContainingSpaceForDocument: this._getContainingSpaceForDocument.bind(this),
+      isDocumentInRemoteCollection: this._isDocumentInRemoteCollection.bind(this),
       onCollectionStateQueried: this._onCollectionStateQueried.bind(this),
       onCollectionStateReceived: this._onCollectionStateReceived.bind(this),
       monitor: dataMonitor
@@ -2561,7 +2563,7 @@ var AutomergeHost = class extends Resource5 {
       await Promise.all(headsToWait.map(async (entry, index) => {
         const handle = await this.loadDoc(Context5.default(void 0, {
           F: __dxlog_file12,
-          L: 226
+          L: 227
         }), entry.documentId);
         await waitForHeads(handle, entry.heads);
       }));
@@ -2574,7 +2576,7 @@ var AutomergeHost = class extends Resource5 {
         documentId
       }, {
         F: __dxlog_file12,
-        L: 238,
+        L: 239,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2590,7 +2592,7 @@ var AutomergeHost = class extends Resource5 {
           documentId
         }, {
           F: __dxlog_file12,
-          L: 242,
+          L: 243,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2599,7 +2601,7 @@ var AutomergeHost = class extends Resource5 {
       const doc = handle.docSync();
       invariant8(doc, void 0, {
         F: __dxlog_file12,
-        L: 247,
+        L: 248,
         S: this,
         A: [
           "doc",
@@ -2613,7 +2615,7 @@ var AutomergeHost = class extends Resource5 {
     }
     log10.info("done re-indexing heads", void 0, {
       F: __dxlog_file12,
-      L: 254,
+      L: 255,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2685,6 +2687,16 @@ var AutomergeHost = class extends Resource5 {
   _automergePeers() {
     return this._repo.peers;
   }
+  async _isDocumentInRemoteCollection(params) {
+    for (const collectionId of this._collectionSynchronizer.getRegisteredCollectionIds()) {
+      const remoteCollections = this._collectionSynchronizer.getRemoteCollectionStates(collectionId);
+      const remotePeerDocs = remoteCollections.get(params.peerId)?.documents;
+      if (remotePeerDocs && params.documentId in remotePeerDocs) {
+        return true;
+      }
+    }
+    return false;
+  }
   async _getContainingSpaceForDocument(documentId) {
     const doc = this._repo.handles[documentId]?.docSync();
     if (!doc) {
@@ -2799,7 +2811,7 @@ var AutomergeHost = class extends Resource5 {
       count: different.length
     }, {
       F: __dxlog_file12,
-      L: 463,
+      L: 475,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2859,7 +2871,7 @@ var changeIsPresentInDoc = (doc, changeHash) => {
 var decodeCollectionState = (state) => {
   invariant8(typeof state === "object" && state !== null, "Invalid state", {
     F: __dxlog_file12,
-    L: 516,
+    L: 528,
     S: void 0,
     A: [
       "typeof state === 'object' && state !== null",
@@ -2879,6 +2891,7 @@ import { log as log12 } from "@dxos/log";
 import { ComplexSet, defaultMap as defaultMap2 } from "@dxos/util";
 
 // packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator-connection.ts
+import * as A2 from "@dxos/automerge/automerge";
 import { cbor } from "@dxos/automerge/automerge-repo";
 import { Resource as Resource6 } from "@dxos/context";
 import { invariant as invariant9 } from "@dxos/invariant";
@@ -2904,7 +2917,7 @@ var MeshReplicatorConnection = class extends Resource6 {
       write: async (message, controller) => {
         invariant9(this._isEnabled, "Writing to a disabled connection", {
           F: __dxlog_file13,
-          L: 48,
+          L: 49,
           S: this,
           A: [
             "this._isEnabled",
@@ -2912,6 +2925,7 @@ var MeshReplicatorConnection = class extends Resource6 {
           ]
         });
         try {
+          logSendSync(message);
           await this.replicatorExtension.sendSyncMessage({
             payload: cbor.encode(message)
           });
@@ -2936,7 +2950,7 @@ var MeshReplicatorConnection = class extends Resource6 {
             remotePeerId: remotePeerId.toHex()
           }, {
             F: __dxlog_file13,
-            L: 82,
+            L: 84,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2963,7 +2977,7 @@ var MeshReplicatorConnection = class extends Resource6 {
   get peerId() {
     invariant9(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file13,
-      L: 108,
+      L: 110,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -2985,7 +2999,7 @@ var MeshReplicatorConnection = class extends Resource6 {
   enable() {
     invariant9(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file13,
-      L: 125,
+      L: 127,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -3001,6 +3015,26 @@ var MeshReplicatorConnection = class extends Resource6 {
     this._isEnabled = false;
   }
 };
+var logSendSync = (message) => {
+  log11("sendSyncMessage", () => {
+    const decodedSyncMessage = message.type === "sync" && message.data ? A2.decodeSyncMessage(message.data) : void 0;
+    return {
+      sync: decodedSyncMessage && {
+        headsLength: decodedSyncMessage.heads.length,
+        requesting: decodedSyncMessage.need.length > 0,
+        sendingChanges: decodedSyncMessage.changes.length > 0
+      },
+      type: message.type,
+      from: message.senderId,
+      to: message.targetId
+    };
+  }, {
+    F: __dxlog_file13,
+    L: 140,
+    S: void 0,
+    C: (f, a) => f(...a)
+  });
+};
 
 // packages/core/echo/echo-pipeline/src/automerge/space-collection.ts
 import { invariant as invariant10 } from "@dxos/invariant";
@@ -3125,16 +3159,21 @@ var MeshEchoReplicator = class {
         try {
           const spaceKey = await this._context.getContainingSpaceForDocument(params.documentId);
           if (!spaceKey) {
-            log12("space key not found for share policy check", {
+            const remoteDocumentExists = await this._context.isDocumentInRemoteCollection({
+              documentId: params.documentId,
+              peerId: connection.peerId
+            });
+            log12("document not found locally for share policy check, accepting the remote document", {
               peerId: connection.peerId,
-              documentId: params.documentId
+              documentId: params.documentId,
+              remoteDocumentExists
             }, {
               F: __dxlog_file15,
-              L: 86,
+              L: 90,
               S: this,
               C: (f, a) => f(...a)
             });
-            return false;
+            return remoteDocumentExists;
           }
           const spaceId = await createIdFromSpaceKey(spaceKey);
           const authorizedDevices = this._authorizedDevices.get(spaceId);
@@ -3144,7 +3183,7 @@ var MeshEchoReplicator = class {
               documentId: params.documentId
             }, {
               F: __dxlog_file15,
-              L: 98,
+              L: 106,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3160,7 +3199,7 @@ var MeshEchoReplicator = class {
             isAuthorized
           }, {
             F: __dxlog_file15,
-            L: 106,
+            L: 114,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3168,7 +3207,7 @@ var MeshEchoReplicator = class {
         } catch (err) {
           log12.catch(err, void 0, {
             F: __dxlog_file15,
-            L: 116,
+            L: 124,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3184,7 +3223,7 @@ var MeshEchoReplicator = class {
             collectionId
           }, {
             F: __dxlog_file15,
-            L: 126,
+            L: 134,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3203,7 +3242,7 @@ var MeshEchoReplicator = class {
       deviceKey
     }, {
       F: __dxlog_file15,
-      L: 143,
+      L: 151,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4239,4 +4278,4 @@ export {
   MetadataStore,
   hasInvitationExpired
 };
-//# sourceMappingURL=chunk-LNIQX6PQ.mjs.map
+//# sourceMappingURL=chunk-P6XSIJKM.mjs.map