@dxos/client-services 0.7.4 → 0.7.5-main.9cb18ac

package/dist/lib/browser/{chunk-423GRVVV.mjs → chunk-2VSGKKFD.mjs}

@@ -397,7 +397,7 @@ import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.7.4";
+var DXOS_VERSION = "0.7.5-main.9cb18ac";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -1036,21 +1036,20 @@ var EdgeFeedReplicator = class extends Resource {
       });
       return;
     }
-    const logPayload = message.type === "data" ? {
-      feedKey: message.feedKey,
-      blocks: message.blocks.map((b) => b.index)
-    } : {
-      message
-    };
-    log4.info("sending message", logPayload, {
-      F: __dxlog_file6,
-      L: 152,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    if (message.type === "data") {
+      log4.info("sending blocks", {
+        feedKey: message.feedKey,
+        blocks: message.blocks.map((b) => b.index)
+      }, {
+        F: __dxlog_file6,
+        L: 151,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
     invariant2(message.feedKey, void 0, {
       F: __dxlog_file6,
-      L: 154,
+      L: 157,
       S: this,
       A: [
         "message.feedKey",
@@ -1062,7 +1061,7 @@ var EdgeFeedReplicator = class extends Resource {
       type: message.type
     }, {
       F: __dxlog_file6,
-      L: 157,
+      L: 160,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1081,7 +1080,7 @@ var EdgeFeedReplicator = class extends Resource {
     if (!this._connectionCtx) {
       log4.warn("received message after connection context was disposed", void 0, {
         F: __dxlog_file6,
-        L: 172,
+        L: 175,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1092,14 +1091,6 @@ var EdgeFeedReplicator = class extends Resource {
         case "metadata": {
           try {
             var _usingCtx = _using_ctx();
-            log4.info("received metadata", {
-              message
-            }, {
-              F: __dxlog_file6,
-              L: 178,
-              S: this,
-              C: (f, a) => f(...a)
-            });
             const feedKey = PublicKey3.fromHex(message.feedKey);
             const feed = this._feeds.get(feedKey);
             if (!feed) {
@@ -1107,7 +1098,7 @@ var EdgeFeedReplicator = class extends Resource {
                 feedKey
               }, {
                 F: __dxlog_file6,
-                L: 183,
+                L: 184,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1115,7 +1106,18 @@ var EdgeFeedReplicator = class extends Resource {
             }
             const _guard = _usingCtx.u(await this._getPushMutex(feed.key).acquire());
             this._remoteLength.set(feedKey, message.length);
+            const logMeta = {
+              localLength: feed.length,
+              remoteLength: message.length,
+              feedKey
+            };
             if (message.length > feed.length) {
+              log4.info("requesting missing blocks", logMeta, {
+                F: __dxlog_file6,
+                L: 194,
+                S: this,
+                C: (f, a) => f(...a)
+              });
               await this._sendMessage({
                 type: "request",
                 feedKey: feedKey.toHex(),
@@ -1125,6 +1127,12 @@ var EdgeFeedReplicator = class extends Resource {
                 }
               });
             } else if (message.length < feed.length) {
+              log4.info("pushing blocks to remote", logMeta, {
+                F: __dxlog_file6,
+                L: 202,
+                S: this,
+                C: (f, a) => f(...a)
+              });
               await this._pushBlocks(feed, message.length, feed.length);
             }
             break;
@@ -1140,7 +1148,7 @@ var EdgeFeedReplicator = class extends Resource {
             blocks: message.blocks.map((b) => b.index)
           }, {
             F: __dxlog_file6,
-            L: 205,
+            L: 211,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1151,7 +1159,7 @@ var EdgeFeedReplicator = class extends Resource {
               feedKey
             }, {
               F: __dxlog_file6,
-              L: 210,
+              L: 216,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1165,7 +1173,7 @@ var EdgeFeedReplicator = class extends Resource {
             ...message
           }, {
             F: __dxlog_file6,
-            L: 219,
+            L: 225,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1180,7 +1188,7 @@ var EdgeFeedReplicator = class extends Resource {
       to
     }, {
       F: __dxlog_file6,
-      L: 226,
+      L: 232,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1190,7 +1198,7 @@ var EdgeFeedReplicator = class extends Resource {
       });
       invariant2(data instanceof Uint8Array, void 0, {
         F: __dxlog_file6,
-        L: 231,
+        L: 237,
         S: this,
         A: [
           "data instanceof Uint8Array",
@@ -1218,7 +1226,7 @@ var EdgeFeedReplicator = class extends Resource {
       blocks: blocks.length
     }, {
       F: __dxlog_file6,
-      L: 252,
+      L: 258,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1240,7 +1248,7 @@ var EdgeFeedReplicator = class extends Resource {
       if (!this._remoteLength.has(feed.key)) {
         log4("blocks not pushed because remote length is unknown", void 0, {
           F: __dxlog_file6,
-          L: 273,
+          L: 279,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1265,7 +1273,7 @@ var EdgeFeedReplicator = class extends Resource {
         if (err instanceof EdgeIdentityChangedError || err instanceof EdgeConnectionClosedError) {
           log4("resetting on reconnect", void 0, {
             F: __dxlog_file6,
-            L: 290,
+            L: 296,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1276,7 +1284,7 @@ var EdgeFeedReplicator = class extends Resource {
       }
     }, {
       F: __dxlog_file6,
-      L: 284
+      L: 290
     });
     return connectionCtx;
   }
@@ -1443,6 +1451,7 @@ var NotarizationPlugin = class extends Resource3 {
     this._processedCredentials = new ComplexSet(PublicKey4.hash);
     this._processCredentialsTriggers = new ComplexMap3(PublicKey4.hash);
     this._activeEdgePollingIntervalHandle = void 0;
+    this._activeEdgePollingEnabled = false;
     this._spaceId = params.spaceId;
     this._activeEdgePollingInterval = params.activeEdgePollingInterval ?? DEFAULT_ACTIVE_EDGE_POLLING_INTERVAL;
     if (params.edgeClient && params.edgeFeatures?.feedReplicator) {
@@ -1450,15 +1459,6 @@ var NotarizationPlugin = class extends Resource3 {
     }
   }
   setActiveEdgePollingEnabled(enabled) {
-    invariant4(this.isOpen, void 0, {
-      F: __dxlog_file8,
-      L: 109,
-      S: this,
-      A: [
-        "this.isOpen",
-        ""
-      ]
-    });
     const client = this._edgeClient;
     invariant4(client, void 0, {
       F: __dxlog_file8,
@@ -1469,30 +1469,30 @@ var NotarizationPlugin = class extends Resource3 {
         ""
       ]
     });
-    if (enabled && !this._activeEdgePollingIntervalHandle) {
-      this._activeEdgePollingIntervalHandle = setInterval(() => {
-        if (this._writer) {
-          this._notarizePendingEdgeCredentials(client, this._writer);
-        }
-      }, this._activeEdgePollingInterval);
-    } else if (!enabled && this._activeEdgePollingIntervalHandle) {
-      clearInterval(this._activeEdgePollingIntervalHandle);
-      this._activeEdgePollingIntervalHandle = void 0;
+    this._activeEdgePollingEnabled = enabled;
+    if (this.isOpen) {
+      if (enabled && !this._activeEdgePollingIntervalHandle) {
+        this._startPeriodicEdgePolling(client);
+      } else if (!enabled && this._activeEdgePollingIntervalHandle) {
+        this._stopPeriodicEdgePolling();
+      }
     }
   }
   get hasWriter() {
     return !!this._writer;
   }
   async _open() {
-    if (this._edgeClient && this._writer) {
-      this._notarizePendingEdgeCredentials(this._edgeClient, this._writer);
+    if (this._edgeClient) {
+      if (this._activeEdgePollingEnabled) {
+        this._startPeriodicEdgePolling(this._edgeClient);
+      }
+      if (this._writer) {
+        this._notarizePendingEdgeCredentials(this._edgeClient, this._writer);
+      }
     }
   }
   async _close() {
-    if (this._activeEdgePollingIntervalHandle) {
-      clearInterval(this._activeEdgePollingIntervalHandle);
-      this._activeEdgePollingIntervalHandle = void 0;
-    }
+    this._stopPeriodicEdgePolling();
     await this._ctx.dispose();
   }
   /**
@@ -1670,10 +1670,23 @@ var NotarizationPlugin = class extends Resource3 {
       ]
     });
     this._writer = writer;
-    if (this._edgeClient) {
+    if (this._edgeClient && this.isOpen) {
       this._notarizePendingEdgeCredentials(this._edgeClient, writer);
     }
   }
+  _startPeriodicEdgePolling(client) {
+    this._activeEdgePollingIntervalHandle = setInterval(() => {
+      if (this._writer) {
+        this._notarizePendingEdgeCredentials(client, this._writer);
+      }
+    }, this._activeEdgePollingInterval);
+  }
+  _stopPeriodicEdgePolling() {
+    if (this._activeEdgePollingIntervalHandle) {
+      clearInterval(this._activeEdgePollingIntervalHandle);
+      this._activeEdgePollingIntervalHandle = void 0;
+    }
+  }
   /**
   * The method is used only for adding agent feeds to spaces.
   * When an agent is created we can admit them into all the existing spaces. In case the operation fails
@@ -1692,7 +1705,7 @@ var NotarizationPlugin = class extends Resource3 {
         if (!credentials.length) {
           log5("edge did not return credentials for notarization", void 0, {
             F: __dxlog_file8,
-            L: 296,
+            L: 311,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1702,7 +1715,7 @@ var NotarizationPlugin = class extends Resource3 {
           count: credentials.length
         }, {
           F: __dxlog_file8,
-          L: 300,
+          L: 315,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1715,7 +1728,7 @@ var NotarizationPlugin = class extends Resource3 {
           count: decodedCredentials.length
         }, {
           F: __dxlog_file8,
-          L: 309,
+          L: 324,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1743,7 +1756,7 @@ var NotarizationPlugin = class extends Resource3 {
     for (const credential of credentials) {
       invariant4(credential.id, "Credential must have an id", {
         F: __dxlog_file8,
-        L: 335,
+        L: 350,
         S: this,
         A: [
           "credential.id",
@@ -1767,7 +1780,7 @@ var NotarizationPlugin = class extends Resource3 {
           peer: extension.localPeerId
         }, {
           F: __dxlog_file8,
-          L: 350,
+          L: 365,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1779,7 +1792,7 @@ var NotarizationPlugin = class extends Resource3 {
           peer: extension.localPeerId
         }, {
           F: __dxlog_file8,
-          L: 355,
+          L: 370,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1796,7 +1809,7 @@ var NotarizationPlugin = class extends Resource3 {
         peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
       }, {
         F: __dxlog_file8,
-        L: 367,
+        L: 382,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1812,7 +1825,7 @@ var handleEdgeError = (error) => {
   if (!(error instanceof EdgeCallFailedError) || error.errorData) {
     log5.catch(error, void 0, {
       F: __dxlog_file8,
-      L: 381,
+      L: 396,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -1821,7 +1834,7 @@ var handleEdgeError = (error) => {
       reason: error.reason
     }, {
       F: __dxlog_file8,
-      L: 383,
+      L: 398,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -7622,7 +7635,8 @@ var ServiceContext = class extends Resource7 {
     this.recoveryManager = new EdgeIdentityRecoveryManager(this.keyring, this._edgeHttpClient, () => this.identityManager.identity, this._acceptIdentity.bind(this));
     this.echoHost = new EchoHost({
       kv: this.level,
-      peerIdProvider: () => this.identityManager.identity?.deviceKey?.toHex()
+      peerIdProvider: () => this.identityManager.identity?.deviceKey?.toHex(),
+      getSpaceKeyByRootDocumentId: (documentId) => this.spaceManager.findSpaceByRootDocumentId(documentId)?.key
     });
     this._meshReplicator = new MeshEchoReplicator();
     this.invitations = new InvitationsHandler(this.networkManager, this._edgeHttpClient, _runtimeParams?.invitationConnectionDefaultParams);
@@ -7641,7 +7655,7 @@ var ServiceContext = class extends Resource7 {
     await this._checkStorageVersion();
     log24("opening...", void 0, {
       F: __dxlog_file28,
-      L: 198,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7649,7 +7663,7 @@ var ServiceContext = class extends Resource7 {
       id: this._instanceId
     }), {
       F: __dxlog_file28,
-      L: 199,
+      L: 200,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7676,7 +7690,7 @@ var ServiceContext = class extends Resource7 {
       count: loadedInvitations.invitations?.length
     }, {
       F: __dxlog_file28,
-      L: 227,
+      L: 228,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7684,13 +7698,13 @@ var ServiceContext = class extends Resource7 {
       id: this._instanceId
     }), {
       F: __dxlog_file28,
-      L: 229,
+      L: 230,
       S: this,
       C: (f, a) => f(...a)
     });
     log24("opened", void 0, {
       F: __dxlog_file28,
-      L: 230,
+      L: 231,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7698,7 +7712,7 @@ var ServiceContext = class extends Resource7 {
   async _close(ctx) {
     log24("closing...", void 0, {
       F: __dxlog_file28,
-      L: 234,
+      L: 235,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7717,7 +7731,7 @@ var ServiceContext = class extends Resource7 {
     await this._edgeConnection?.close();
     log24("closed", void 0, {
       F: __dxlog_file28,
-      L: 250,
+      L: 251,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7728,7 +7742,7 @@ var ServiceContext = class extends Resource7 {
     await identity.joinNetwork();
     await this._initialize(new Context9(void 0, {
       F: __dxlog_file28,
-      L: 257
+      L: 258
     }));
     return identity;
   }
@@ -7739,7 +7753,7 @@ var ServiceContext = class extends Resource7 {
     const factory = this._handlerFactories.get(invitation.kind);
     invariant20(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file28,
-      L: 266,
+      L: 267,
       S: this,
       A: [
         "factory",
@@ -7765,7 +7779,7 @@ var ServiceContext = class extends Resource7 {
     await this.identityManager.acceptIdentity(identity, identityRecord, params.deviceProfile);
     await this._initialize(new Context9(void 0, {
       F: __dxlog_file28,
-      L: 285
+      L: 286
     }));
     return identity;
   }
@@ -7779,7 +7793,7 @@ var ServiceContext = class extends Resource7 {
   async _initialize(ctx) {
     log24("initializing spaces...", void 0, {
       F: __dxlog_file28,
-      L: 300,
+      L: 301,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7818,7 +7832,7 @@ var ServiceContext = class extends Resource7 {
     this._handlerFactories.set(Invitation10.Kind.SPACE, (invitation) => {
       invariant20(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file28,
-        L: 338,
+        L: 339,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -7842,7 +7856,7 @@ var ServiceContext = class extends Resource7 {
             details: assertion
           }, {
             F: __dxlog_file28,
-            L: 354,
+            L: 355,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7853,7 +7867,7 @@ var ServiceContext = class extends Resource7 {
             details: assertion
           }, {
             F: __dxlog_file28,
-            L: 358,
+            L: 359,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7864,7 +7878,7 @@ var ServiceContext = class extends Resource7 {
             details: assertion
           }, {
             F: __dxlog_file28,
-            L: 363,
+            L: 364,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7875,7 +7889,7 @@ var ServiceContext = class extends Resource7 {
         } catch (err) {
           log24.catch(err, void 0, {
             F: __dxlog_file28,
-            L: 369,
+            L: 370,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7891,12 +7905,12 @@ var ServiceContext = class extends Resource7 {
       let edgeIdentity;
       const identity = this.identityManager.identity;
       if (identity) {
-        log24.info("Setting identity on edge connection", {
+        log24("setting identity on edge connection", {
           identity: identity.identityKey.toHex(),
           swarms: this.networkManager.topics
         }, {
           F: __dxlog_file28,
-          L: 383,
+          L: 384,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -7910,7 +7924,7 @@ var ServiceContext = class extends Resource7 {
           });
           invariant20(identity.deviceCredentialChain, void 0, {
             F: __dxlog_file28,
-            L: 401,
+            L: 403,
             S: this,
             A: [
               "identity.deviceCredentialChain",
@@ -9053,4 +9067,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-423GRVVV.mjs.map
+//# sourceMappingURL=chunk-2VSGKKFD.mjs.map