@dxos/echo-pipeline 0.7.4 → 0.7.5-main.9cb18ac

package/dist/lib/node/index.cjs

@@ -28,11 +28,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var node_exports = {};
 __export(node_exports, {
-  AuthExtension: () => import_chunk_MACQJ2EP.AuthExtension,
-  AuthStatus: () => import_chunk_MACQJ2EP.AuthStatus,
+  AuthExtension: () => import_chunk_SXCQEIFA.AuthExtension,
+  AuthStatus: () => import_chunk_SXCQEIFA.AuthStatus,
   AutomergeHost: () => AutomergeHost,
-  CredentialRetrieverExtension: () => import_chunk_MACQJ2EP.CredentialRetrieverExtension,
-  CredentialServerExtension: () => import_chunk_MACQJ2EP.CredentialServerExtension,
+  CredentialRetrieverExtension: () => import_chunk_SXCQEIFA.CredentialRetrieverExtension,
+  CredentialServerExtension: () => import_chunk_SXCQEIFA.CredentialServerExtension,
   DataServiceImpl: () => DataServiceImpl,
   DatabaseRoot: () => DatabaseRoot,
   DocumentsSynchronizer: () => DocumentsSynchronizer,
@@ -40,37 +40,37 @@ __export(node_exports, {
   EchoEdgeReplicator: () => EchoEdgeReplicator,
   EchoHost: () => EchoHost,
   LevelDBStorageAdapter: () => LevelDBStorageAdapter,
-  MOCK_AUTH_PROVIDER: () => import_chunk_MACQJ2EP.MOCK_AUTH_PROVIDER,
-  MOCK_AUTH_VERIFIER: () => import_chunk_MACQJ2EP.MOCK_AUTH_VERIFIER,
+  MOCK_AUTH_PROVIDER: () => import_chunk_SXCQEIFA.MOCK_AUTH_PROVIDER,
+  MOCK_AUTH_VERIFIER: () => import_chunk_SXCQEIFA.MOCK_AUTH_VERIFIER,
   MeshEchoReplicator: () => MeshEchoReplicator,
-  MetadataStore: () => import_chunk_MACQJ2EP.MetadataStore,
-  Pipeline: () => import_chunk_MACQJ2EP.Pipeline,
+  MetadataStore: () => import_chunk_SXCQEIFA.MetadataStore,
+  Pipeline: () => import_chunk_SXCQEIFA.Pipeline,
   QueryServiceImpl: () => QueryServiceImpl,
   QueryState: () => QueryState,
-  Space: () => import_chunk_MACQJ2EP.Space,
+  Space: () => import_chunk_SXCQEIFA.Space,
   SpaceDocumentListUpdatedEvent: () => SpaceDocumentListUpdatedEvent,
-  SpaceManager: () => import_chunk_MACQJ2EP.SpaceManager,
-  SpaceProtocol: () => import_chunk_MACQJ2EP.SpaceProtocol,
-  SpaceProtocolSession: () => import_chunk_MACQJ2EP.SpaceProtocolSession,
+  SpaceManager: () => import_chunk_SXCQEIFA.SpaceManager,
+  SpaceProtocol: () => import_chunk_SXCQEIFA.SpaceProtocol,
+  SpaceProtocolSession: () => import_chunk_SXCQEIFA.SpaceProtocolSession,
   SpaceStateManager: () => SpaceStateManager,
-  TimeframeClock: () => import_chunk_MACQJ2EP.TimeframeClock,
-  codec: () => import_chunk_MACQJ2EP.codec,
-  createIdFromSpaceKey: () => import_chunk_MACQJ2EP.createIdFromSpaceKey,
-  createMappedFeedWriter: () => import_chunk_MACQJ2EP.createMappedFeedWriter,
+  TimeframeClock: () => import_chunk_SXCQEIFA.TimeframeClock,
+  codec: () => import_chunk_SXCQEIFA.codec,
+  createIdFromSpaceKey: () => import_chunk_SXCQEIFA.createIdFromSpaceKey,
+  createMappedFeedWriter: () => import_chunk_SXCQEIFA.createMappedFeedWriter,
   deriveCollectionIdFromSpaceId: () => deriveCollectionIdFromSpaceId,
   diffCollectionState: () => diffCollectionState,
   encodingOptions: () => encodingOptions,
   findInlineObjectOfType: () => findInlineObjectOfType,
   getSpaceIdFromCollectionId: () => getSpaceIdFromCollectionId,
   getSpaceKeyFromDoc: () => getSpaceKeyFromDoc,
-  hasInvitationExpired: () => import_chunk_MACQJ2EP.hasInvitationExpired,
-  mapFeedIndexesToTimeframe: () => import_chunk_MACQJ2EP.mapFeedIndexesToTimeframe,
-  mapTimeframeToFeedIndexes: () => import_chunk_MACQJ2EP.mapTimeframeToFeedIndexes,
-  startAfter: () => import_chunk_MACQJ2EP.startAfter,
-  valueEncoding: () => import_chunk_MACQJ2EP.valueEncoding
+  hasInvitationExpired: () => import_chunk_SXCQEIFA.hasInvitationExpired,
+  mapFeedIndexesToTimeframe: () => import_chunk_SXCQEIFA.mapFeedIndexesToTimeframe,
+  mapTimeframeToFeedIndexes: () => import_chunk_SXCQEIFA.mapTimeframeToFeedIndexes,
+  startAfter: () => import_chunk_SXCQEIFA.startAfter,
+  valueEncoding: () => import_chunk_SXCQEIFA.valueEncoding
 });
 module.exports = __toCommonJS(node_exports);
-var import_chunk_MACQJ2EP = require("./chunk-MACQJ2EP.cjs");
+var import_chunk_SXCQEIFA = require("./chunk-SXCQEIFA.cjs");
 var import_async = require("@dxos/async");
 var import_stream = require("@dxos/codec-protobuf/stream");
 var import_invariant = require("@dxos/invariant");
@@ -154,7 +154,6 @@ var import_invariant11 = require("@dxos/invariant");
 var A4 = __toESM(require("@dxos/automerge/automerge"));
 var import_log10 = require("@dxos/log");
 var import_async8 = require("@dxos/async");
-var A5 = __toESM(require("@dxos/automerge/automerge"));
 var import_automerge_repo5 = require("@dxos/automerge/automerge-repo");
 var import_context12 = require("@dxos/context");
 var import_crypto = require("@dxos/crypto");
@@ -418,7 +417,7 @@ var CollectionSynchronizer = class extends import_context3.Resource {
         return;
       }
       for (const [collectionId, state] of this._perCollectionStates.entries()) {
-        if (this._shouldSyncCollection(collectionId, peerId)) {
+        if (this._activeCollections.has(collectionId) && this._shouldSyncCollection(collectionId, peerId)) {
           state.interestedPeers.add(peerId);
           state.lastQueried.set(peerId, Date.now());
           this._queryCollectionState(collectionId, peerId);
@@ -460,11 +459,18 @@ var CollectionSynchronizer = class extends import_context3.Resource {
     });
     validateCollectionState(state);
     const perCollectionState = this._getOrCreatePerCollectionState(collectionId);
-    perCollectionState.remoteStates.set(peerId, state);
-    this.remoteStateUpdated.emit({
-      peerId,
-      collectionId
-    });
+    const existingState = perCollectionState.remoteStates.get(peerId) ?? {
+      documents: {}
+    };
+    const diff = diffCollectionState(existingState, state);
+    if (diff.missingOnLocal.length > 0 || diff.different.length > 0) {
+      perCollectionState.remoteStates.set(peerId, state);
+      this.remoteStateUpdated.emit({
+        peerId,
+        collectionId,
+        newDocsAppeared: diff.missingOnLocal.length > 0
+      });
+    }
   }
   _getOrCreatePerCollectionState(collectionId) {
     return (0, import_util.defaultMap)(this._perCollectionStates, collectionId, () => ({
@@ -616,7 +622,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       getContainingSpaceForDocument: this._params.getContainingSpaceForDocument,
       getContainingSpaceIdForDocument: async (documentId) => {
         const key = await this._params.getContainingSpaceForDocument(documentId);
-        return key ? (0, import_chunk_MACQJ2EP.createIdFromSpaceKey)(key) : null;
+        return key ? (0, import_chunk_SXCQEIFA.createIdFromSpaceKey)(key) : null;
       }
     });
   }
@@ -772,6 +778,12 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     }
     this._params.monitor?.recordMessageReceived(message);
   }
+  onConnectionAuthScopeChanged(peer) {
+    const entry = this._connections.get(peer);
+    if (entry) {
+      this._onConnectionAuthScopeChanged(entry.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
@@ -781,14 +793,14 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file3,
-      L: 254,
+      L: 261,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
     (0, import_invariant4.invariant)(entry, void 0, {
       F: __dxlog_file3,
-      L: 256,
+      L: 263,
       S: this,
       A: [
         "entry",
@@ -805,14 +817,14 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file3,
-      L: 262,
+      L: 269,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
     (0, import_invariant4.invariant)(entry, void 0, {
       F: __dxlog_file3,
-      L: 264,
+      L: 271,
       S: this,
       A: [
         "entry",
@@ -826,13 +838,13 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     this._params.monitor?.recordPeerDisconnected(connection.peerId);
     void entry.reader.cancel().catch((err) => import_log5.log.catch(err, void 0, {
       F: __dxlog_file3,
-      L: 270,
+      L: 277,
       S: this,
       C: (f, a) => f(...a)
     }));
     void entry.writer.abort().catch((err) => import_log5.log.catch(err, void 0, {
       F: __dxlog_file3,
-      L: 271,
+      L: 278,
       S: this,
       C: (f, a) => f(...a)
     }));
@@ -992,7 +1004,7 @@ function _ts_decorate2(decorators, target, key, desc) {
 }
 var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
 var AutomergeHost = class extends import_context2.Resource {
-  constructor({ db, indexMetadataStore, dataMonitor, peerIdProvider }) {
+  constructor({ db, indexMetadataStore, dataMonitor, peerIdProvider, getSpaceKeyByRootDocumentId }) {
     super();
     this._collectionSynchronizer = new CollectionSynchronizer({
       queryCollectionState: this._queryCollectionState.bind(this),
@@ -1021,6 +1033,7 @@ var AutomergeHost = class extends import_context2.Resource {
     });
     this._indexMetadataStore = indexMetadataStore;
     this._peerIdProvider = peerIdProvider;
+    this._getSpaceKeyByRootDocumentId = getSpaceKeyByRootDocumentId;
   }
   async _open() {
     this._peerId = `host-${this._peerIdProvider?.() ?? import_keys2.PublicKey.random().toHex()}`;
@@ -1034,13 +1047,22 @@ var AutomergeHost = class extends import_context2.Resource {
         this._echoNetworkAdapter
       ]
     });
-    import_async3.Event.wrap(this._echoNetworkAdapter, "peer-candidate").on(this._ctx, (e) => this._onPeerConnected(e.peerId));
-    import_async3.Event.wrap(this._echoNetworkAdapter, "peer-disconnected").on(this._ctx, (e) => this._onPeerDisconnected(e.peerId));
-    this._collectionSynchronizer.remoteStateUpdated.on(this._ctx, ({ collectionId, peerId }) => {
+    let updatingAuthScope = false;
+    import_async3.Event.wrap(this._echoNetworkAdapter, "peer-candidate").on(this._ctx, (e) => !updatingAuthScope && this._onPeerConnected(e.peerId));
+    import_async3.Event.wrap(this._echoNetworkAdapter, "peer-disconnected").on(this._ctx, (e) => !updatingAuthScope && this._onPeerDisconnected(e.peerId));
+    this._collectionSynchronizer.remoteStateUpdated.on(this._ctx, ({ collectionId, peerId, newDocsAppeared }) => {
       this._onRemoteCollectionStateUpdated(collectionId, peerId);
       this.collectionStateUpdated.emit({
         collectionId
       });
+      if (newDocsAppeared) {
+        updatingAuthScope = true;
+        try {
+          this._echoNetworkAdapter.onConnectionAuthScopeChanged(peerId);
+        } finally {
+          updatingAuthScope = false;
+        }
+      }
     });
     await this._echoNetworkAdapter.open();
     await this._collectionSynchronizer.open();
@@ -1123,7 +1145,7 @@ var AutomergeHost = class extends import_context2.Resource {
       await Promise.all(headsToWait.map(async (entry, index) => {
         const handle = await this.loadDoc(import_context2.Context.default(void 0, {
           F: __dxlog_file4,
-          L: 239
+          L: 264
         }), entry.documentId);
         await waitForHeads(handle, entry.heads);
       }));
@@ -1136,7 +1158,7 @@ var AutomergeHost = class extends import_context2.Resource {
         documentId
       }, {
         F: __dxlog_file4,
-        L: 251,
+        L: 276,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1152,7 +1174,7 @@ var AutomergeHost = class extends import_context2.Resource {
           documentId
         }, {
           F: __dxlog_file4,
-          L: 255,
+          L: 280,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1161,7 +1183,7 @@ var AutomergeHost = class extends import_context2.Resource {
       const doc = handle.docSync();
       (0, import_invariant3.invariant)(doc, void 0, {
         F: __dxlog_file4,
-        L: 260,
+        L: 285,
         S: this,
         A: [
           "doc",
@@ -1175,7 +1197,7 @@ var AutomergeHost = class extends import_context2.Resource {
     }
     import_log3.log.info("done re-indexing heads", void 0, {
       F: __dxlog_file4,
-      L: 267,
+      L: 292,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1259,14 +1281,17 @@ var AutomergeHost = class extends import_context2.Resource {
   }
   async _getContainingSpaceForDocument(documentId) {
     const doc = this._repo.handles[documentId]?.docSync();
-    if (!doc) {
-      return null;
+    if (doc) {
+      const spaceKeyHex = getSpaceKeyFromDoc(doc);
+      if (spaceKeyHex) {
+        return import_keys2.PublicKey.from(spaceKeyHex);
+      }
     }
-    const spaceKeyHex = getSpaceKeyFromDoc(doc);
-    if (!spaceKeyHex) {
-      return null;
+    const rootDocSpaceKey = this._getSpaceKeyByRootDocumentId?.(documentId);
+    if (rootDocSpaceKey) {
+      return rootDocSpaceKey;
     }
-    return import_keys2.PublicKey.from(spaceKeyHex);
+    return null;
   }
   /**
   * Flush documents to disk.
@@ -1380,11 +1405,14 @@ var AutomergeHost = class extends import_context2.Resource {
     if (toReplicate.length === 0) {
       return;
     }
-    import_log3.log.info("replication documents after collection sync", {
+    import_log3.log.info("replicating documents after collection sync", {
+      collectionId,
+      peerId,
+      toReplicate,
       count: toReplicate.length
     }, {
       F: __dxlog_file4,
-      L: 499,
+      L: 531,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1451,7 +1479,7 @@ var changeIsPresentInDoc = (doc, changeHash) => {
 var decodeCollectionState = (state) => {
   (0, import_invariant3.invariant)(typeof state === "object" && state !== null, "Invalid state", {
     F: __dxlog_file4,
-    L: 557,
+    L: 592,
     S: void 0,
     A: [
       "typeof state === 'object' && state !== null",
@@ -1717,10 +1745,10 @@ var MeshEchoReplicator = class {
               documentId: params.documentId,
               peerId: connection.peerId
             });
-            (0, import_log6.log)("document not found locally for share policy check, accepting the remote document", {
+            (0, import_log6.log)("document not found locally for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId,
-              remoteDocumentExists
+              acceptDocument: remoteDocumentExists
             }, {
               F: __dxlog_file7,
               L: 91,
@@ -1729,7 +1757,7 @@ var MeshEchoReplicator = class {
             });
             return remoteDocumentExists;
           }
-          const spaceId = await (0, import_chunk_MACQJ2EP.createIdFromSpaceKey)(spaceKey);
+          const spaceId = await (0, import_chunk_SXCQEIFA.createIdFromSpaceKey)(spaceKey);
           const authorizedDevices = this._authorizedDevices.get(spaceId);
           if (!connection.remoteDeviceKey) {
             (0, import_log6.log)("device key not found for share policy check", {
@@ -1800,7 +1828,7 @@ var MeshEchoReplicator = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    const spaceId = await (0, import_chunk_MACQJ2EP.createIdFromSpaceKey)(spaceKey);
+    const spaceId = await (0, import_chunk_SXCQEIFA.createIdFromSpaceKey)(spaceKey);
     (0, import_util3.defaultMap)(this._authorizedDevices, spaceId, () => new import_util3.ComplexSet(import_keys3.PublicKey.hash)).add(deviceKey);
     for (const connection of this._connections) {
       if (connection.remoteDeviceKey && connection.remoteDeviceKey.equals(deviceKey)) {
@@ -2917,7 +2945,7 @@ var INDEXER_CONFIG = {
   ]
 };
 var EchoHost = class extends import_context7.Resource {
-  constructor({ kv, peerIdProvider }) {
+  constructor({ kv, peerIdProvider, getSpaceKeyByRootDocumentId }) {
     super();
     this._spaceStateManager = new SpaceStateManager();
     this._indexMetadataStore = new import_indexing2.IndexMetadataStore({
@@ -2928,7 +2956,8 @@ var EchoHost = class extends import_context7.Resource {
       db: kv,
       dataMonitor: this._echoDataMonitor,
       indexMetadataStore: this._indexMetadataStore,
-      peerIdProvider
+      peerIdProvider,
+      getSpaceKeyByRootDocumentId
     });
     this._indexer = new import_indexing2.Indexer({
       db: kv,
@@ -3053,7 +3082,7 @@ var EchoHost = class extends import_context7.Resource {
   async createSpaceRoot(spaceKey) {
     (0, import_invariant8.invariant)(this._lifecycleState === import_context7.LifecycleState.OPEN, void 0, {
       F: __dxlog_file15,
-      L: 217,
+      L: 220,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -3081,7 +3110,7 @@ var EchoHost = class extends import_context7.Resource {
   async openSpaceRoot(spaceId, automergeUrl) {
     (0, import_invariant8.invariant)(this._lifecycleState === import_context7.LifecycleState.OPEN, void 0, {
       F: __dxlog_file15,
-      L: 236,
+      L: 239,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -3191,14 +3220,14 @@ var EchoEdgeReplicator = class {
       connectedSpaces: this._connectedSpaces.size
     }, {
       F: __dxlog_file16,
-      L: 60,
+      L: 59,
       S: this,
       C: (f, a) => f(...a)
     });
     this._context = context;
     this._ctx = import_context12.Context.default(void 0, {
       F: __dxlog_file16,
-      L: 63
+      L: 62
     });
     this._ctx.onDispose(this._edgeConnection.onReconnected(() => {
       this._ctx && (0, import_async8.scheduleMicroTask)(this._ctx, () => this._handleReconnect());
@@ -3277,7 +3306,7 @@ var EchoEdgeReplicator = class {
   async _openConnection(spaceId, reconnects = 0) {
     (0, import_invariant12.invariant)(this._context, void 0, {
       F: __dxlog_file16,
-      L: 124,
+      L: 123,
       S: this,
       A: [
         "this._context",
@@ -3286,7 +3315,7 @@ var EchoEdgeReplicator = class {
     });
     (0, import_invariant12.invariant)(!this._connections.has(spaceId), void 0, {
       F: __dxlog_file16,
-      L: 125,
+      L: 124,
       S: this,
       A: [
         "!this._connections.has(spaceId)",
@@ -3316,7 +3345,7 @@ var EchoEdgeReplicator = class {
           restartDelay
         }, {
           F: __dxlog_file16,
-          L: 148,
+          L: 147,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3347,10 +3376,13 @@ var EchoEdgeReplicator = class {
     await connection.open();
   }
 };
+var MAX_INFLIGHT_REQUESTS = 5;
 var EdgeReplicatorConnection = class extends import_context12.Resource {
   constructor({ edgeConnection, spaceId, context, sharedPolicyEnabled, onRemoteConnected, onRemoteDisconnected, onRestartRequested }) {
     super();
     this._remotePeerId = null;
+    this._outgoingRequestsBarrier = new import_async8.Trigger();
+    this._inflightRequests = 0;
     this._edgeConnection = edgeConnection;
     this._spaceId = spaceId;
     this._context = context;
@@ -3360,6 +3392,7 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
     this._onRemoteConnected = onRemoteConnected;
     this._onRemoteDisconnected = onRemoteDisconnected;
     this._onRestartRequested = onRestartRequested;
+    this._outgoingRequestsBarrier.wake();
     this.readable = new ReadableStream({
       start: (controller) => {
         this._readableStreamController = controller;
@@ -3367,6 +3400,11 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
     });
     this.writable = new WritableStream({
       write: async (message, controller) => {
+        await this._outgoingRequestsBarrier.wait();
+        this._inflightRequests++;
+        if (this._inflightRequests === MAX_INFLIGHT_REQUESTS) {
+          this._outgoingRequestsBarrier.reset();
+        }
         await this._sendMessage(message);
       }
     });
@@ -3374,7 +3412,7 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
   async _open(ctx) {
     (0, import_log11.log)("open", void 0, {
       F: __dxlog_file16,
-      L: 242,
+      L: 261,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3386,17 +3424,18 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
   async _close() {
     (0, import_log11.log)("close", void 0, {
       F: __dxlog_file16,
-      L: 254,
+      L: 273,
       S: this,
       C: (f, a) => f(...a)
     });
     this._readableStreamController.close();
+    this._outgoingRequestsBarrier.throw(new Error("Connection closed."));
     await this._onRemoteDisconnected();
   }
   get peerId() {
     (0, import_invariant12.invariant)(this._remotePeerId, "Not connected", {
       F: __dxlog_file16,
-      L: 260,
+      L: 282,
       S: this,
       A: [
         "this._remotePeerId",
@@ -3415,12 +3454,13 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
         documentId: params.documentId,
         peerId: this._remotePeerId
       });
-      import_log11.log.info("document not found locally for share policy check, accepting the remote document", {
+      import_log11.log.verbose("edge-replicator document not found locally for share policy check", {
         documentId: params.documentId,
-        remoteDocumentExists
+        acceptDocument: remoteDocumentExists,
+        remoteId: this._remotePeerId
       }, {
         F: __dxlog_file16,
-        L: 275,
+        L: 297,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3433,23 +3473,20 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
       return true;
     }
     const spaceId = getSpaceIdFromCollectionId(params.collectionId);
-    return spaceId === this._spaceId;
+    return spaceId === this._spaceId && params.collectionId.split(":").length === 3;
   }
   _onMessage(message) {
     if (message.serviceId !== this._targetServiceId) {
       return;
     }
     const payload = import_automerge_repo5.cbor.decode(message.payload.value);
-    (0, import_log11.log)("recv", () => {
-      const decodedData = payload.type === "sync" && payload.data ? A5.decodeSyncMessage(payload.data) : payload.type === "collection-state" ? payload.state : payload;
-      return {
-        from: message.serviceId,
-        type: payload.type,
-        decodedData
-      };
+    import_log11.log.verbose("edge replicator receive", {
+      type: payload.type,
+      documentId: payload.type === "sync" && payload.documentId,
+      remoteId: this._remotePeerId
     }, {
       F: __dxlog_file16,
-      L: 302,
+      L: 326,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3461,18 +3498,23 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
       this._onRestartRequested();
       return;
     }
+    if (message.type === "sync") {
+      this._inflightRequests--;
+      if (this._inflightRequests === MAX_INFLIGHT_REQUESTS - 1) {
+        this._outgoingRequestsBarrier.wake();
+      }
+    }
     this._readableStreamController.enqueue(message);
   }
   async _sendMessage(message) {
     message.targetId = this._targetServiceId;
-    (0, import_log11.log)("send", {
+    import_log11.log.verbose("edge replicator send", {
       type: message.type,
-      senderId: message.senderId,
-      targetId: message.targetId,
-      documentId: message.documentId
+      documentId: message.type === "sync" && message.documentId,
+      remoteId: this._remotePeerId
     }, {
       F: __dxlog_file16,
-      L: 332,
+      L: 360,
       S: this,
       C: (f, a) => f(...a)
     });