@dxos/echo-pipeline 0.7.4 → 0.7.5-main.499c70c

package/dist/lib/browser/index.mjs

@@ -310,7 +310,7 @@ var CollectionSynchronizer = class extends Resource2 {
         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);
@@ -1293,7 +1293,10 @@ var AutomergeHost = class extends Resource4 {
     if (toReplicate.length === 0) {
       return;
     }
-    log4.info("replication documents after collection sync", {
+    log4.info("replicating documents after collection sync", {
+      collectionId,
+      peerId,
+      toReplicate,
       count: toReplicate.length
     }, {
       F: __dxlog_file4,
@@ -1364,7 +1367,7 @@ var changeIsPresentInDoc = (doc, changeHash) => {
 var decodeCollectionState = (state) => {
   invariant3(typeof state === "object" && state !== null, "Invalid state", {
     F: __dxlog_file4,
-    L: 557,
+    L: 560,
     S: void 0,
     A: [
       "typeof state === 'object' && state !== null",
@@ -1656,10 +1659,10 @@ var MeshEchoReplicator = class {
               documentId: params.documentId,
               peerId: connection.peerId
             });
-            log6("document not found locally for share policy check, accepting the remote document", {
+            log6("document not found locally for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId,
-              remoteDocumentExists
+              acceptDocument: remoteDocumentExists
             }, {
               F: __dxlog_file7,
               L: 91,
@@ -3116,8 +3119,7 @@ var EchoHost = class extends Resource9 {
 };
 
 // packages/core/echo/echo-pipeline/src/edge/echo-edge-replicator.ts
-import { Mutex, scheduleTask as scheduleTask2, scheduleMicroTask } from "@dxos/async";
-import * as A5 from "@dxos/automerge/automerge";
+import { Mutex, scheduleTask as scheduleTask2, scheduleMicroTask, Trigger as Trigger2 } from "@dxos/async";
 import { cbor as cbor2 } from "@dxos/automerge/automerge-repo";
 import { Context as Context6, Resource as Resource10 } from "@dxos/context";
 import { randomUUID } from "@dxos/crypto";
@@ -3210,14 +3212,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 = Context6.default(void 0, {
       F: __dxlog_file16,
-      L: 63
+      L: 62
     });
     this._ctx.onDispose(this._edgeConnection.onReconnected(() => {
       this._ctx && scheduleMicroTask(this._ctx, () => this._handleReconnect());
@@ -3296,7 +3298,7 @@ var EchoEdgeReplicator = class {
   async _openConnection(spaceId, reconnects = 0) {
     invariant12(this._context, void 0, {
       F: __dxlog_file16,
-      L: 124,
+      L: 123,
       S: this,
       A: [
         "this._context",
@@ -3305,7 +3307,7 @@ var EchoEdgeReplicator = class {
     });
     invariant12(!this._connections.has(spaceId), void 0, {
       F: __dxlog_file16,
-      L: 125,
+      L: 124,
       S: this,
       A: [
         "!this._connections.has(spaceId)",
@@ -3335,7 +3337,7 @@ var EchoEdgeReplicator = class {
           restartDelay
         }, {
           F: __dxlog_file16,
-          L: 148,
+          L: 147,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3366,10 +3368,20 @@ var EchoEdgeReplicator = class {
     await connection.open();
   }
 };
+var MAX_INFLIGHT_REQUESTS = 5;
 var EdgeReplicatorConnection = class extends Resource10 {
   constructor({ edgeConnection, spaceId, context, sharedPolicyEnabled, onRemoteConnected, onRemoteDisconnected, onRestartRequested }) {
     super();
     this._remotePeerId = null;
+    /**
+    * Prevents sending too many messages to edge over this connection so that we don't overwhelm
+    * a replicator durable object.
+    * inflightRequests counter is incremented on outgoing sync messages and decremented on incoming messages.
+    * The trigger is waiting while the counter is above MAX_INFLIGHT_REQUESTS.
+    * The counter can go negative because we receive edge-initiated sync messages on doc change broadcasts.
+    */
+    this._outgoingRequestsBarrier = new Trigger2();
+    this._inflightRequests = 0;
     this._edgeConnection = edgeConnection;
     this._spaceId = spaceId;
     this._context = context;
@@ -3379,6 +3391,7 @@ var EdgeReplicatorConnection = class extends Resource10 {
     this._onRemoteConnected = onRemoteConnected;
     this._onRemoteDisconnected = onRemoteDisconnected;
     this._onRestartRequested = onRestartRequested;
+    this._outgoingRequestsBarrier.wake();
     this.readable = new ReadableStream({
       start: (controller) => {
         this._readableStreamController = controller;
@@ -3386,6 +3399,11 @@ var EdgeReplicatorConnection = class extends Resource10 {
     });
     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);
       }
     });
@@ -3393,7 +3411,7 @@ var EdgeReplicatorConnection = class extends Resource10 {
   async _open(ctx) {
     log11("open", void 0, {
       F: __dxlog_file16,
-      L: 242,
+      L: 261,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3405,17 +3423,18 @@ var EdgeReplicatorConnection = class extends Resource10 {
   async _close() {
     log11("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() {
     invariant12(this._remotePeerId, "Not connected", {
       F: __dxlog_file16,
-      L: 260,
+      L: 282,
       S: this,
       A: [
         "this._remotePeerId",
@@ -3434,12 +3453,13 @@ var EdgeReplicatorConnection = class extends Resource10 {
         documentId: params.documentId,
         peerId: this._remotePeerId
       });
-      log11.info("document not found locally for share policy check, accepting the remote document", {
+      log11.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)
       });
@@ -3452,23 +3472,20 @@ var EdgeReplicatorConnection = class extends Resource10 {
       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 = cbor2.decode(message.payload.value);
-    log11("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
-      };
+    log11.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)
     });
@@ -3480,18 +3497,23 @@ var EdgeReplicatorConnection = class extends Resource10 {
       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;
-    log11("send", {
+    log11.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)
     });