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

package/dist/lib/browser/testing/index.mjs

@@ -6,7 +6,7 @@ import {
   InvitationsManager,
   ServiceContext,
   SpaceInvitationProtocol
-} from "../chunk-423GRVVV.mjs";
+} from "../chunk-27A4ATQX.mjs";
 
 // packages/sdk/client-services/src/packlets/testing/credential-utils.ts
 import { createCredential } from "@dxos/credentials";

package/dist/lib/node/{chunk-ZS24HRVA.cjs → chunk-7FKXMJDD.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_ZS24HRVA_exports = {};
-__export(chunk_ZS24HRVA_exports, {
+var chunk_7FKXMJDD_exports = {};
+__export(chunk_7FKXMJDD_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -72,7 +72,7 @@ __export(chunk_ZS24HRVA_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_ZS24HRVA_exports);
+module.exports = __toCommonJS(chunk_7FKXMJDD_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -735,7 +735,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.7.4";
+var DXOS_VERSION = "0.7.5-main.9d26e3a";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -1256,21 +1256,20 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       });
       return;
     }
-    const logPayload = message.type === "data" ? {
-      feedKey: message.feedKey,
-      blocks: message.blocks.map((b) => b.index)
-    } : {
-      message
-    };
-    import_log3.log.info("sending message", logPayload, {
-      F: __dxlog_file5,
-      L: 152,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    if (message.type === "data") {
+      import_log3.log.info("sending blocks", {
+        feedKey: message.feedKey,
+        blocks: message.blocks.map((b) => b.index)
+      }, {
+        F: __dxlog_file5,
+        L: 151,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
     (0, import_invariant2.invariant)(message.feedKey, void 0, {
       F: __dxlog_file5,
-      L: 154,
+      L: 157,
       S: this,
       A: [
         "message.feedKey",
@@ -1282,7 +1281,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       type: message.type
     }, {
       F: __dxlog_file5,
-      L: 157,
+      L: 160,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1301,7 +1300,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
     if (!this._connectionCtx) {
       import_log3.log.warn("received message after connection context was disposed", void 0, {
         F: __dxlog_file5,
-        L: 172,
+        L: 175,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1312,14 +1311,6 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
         case "metadata": {
           try {
             var _usingCtx = _using_ctx();
-            import_log3.log.info("received metadata", {
-              message
-            }, {
-              F: __dxlog_file5,
-              L: 178,
-              S: this,
-              C: (f, a) => f(...a)
-            });
             const feedKey = import_keys3.PublicKey.fromHex(message.feedKey);
             const feed = this._feeds.get(feedKey);
             if (!feed) {
@@ -1327,7 +1318,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
                 feedKey
               }, {
                 F: __dxlog_file5,
-                L: 183,
+                L: 184,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1335,7 +1326,18 @@ var EdgeFeedReplicator = class extends import_context3.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) {
+              import_log3.log.info("requesting missing blocks", logMeta, {
+                F: __dxlog_file5,
+                L: 194,
+                S: this,
+                C: (f, a) => f(...a)
+              });
               await this._sendMessage({
                 type: "request",
                 feedKey: feedKey.toHex(),
@@ -1345,6 +1347,12 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
                 }
               });
             } else if (message.length < feed.length) {
+              import_log3.log.info("pushing blocks to remote", logMeta, {
+                F: __dxlog_file5,
+                L: 202,
+                S: this,
+                C: (f, a) => f(...a)
+              });
               await this._pushBlocks(feed, message.length, feed.length);
             }
             break;
@@ -1360,7 +1368,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
             blocks: message.blocks.map((b) => b.index)
           }, {
             F: __dxlog_file5,
-            L: 205,
+            L: 211,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1371,7 +1379,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
               feedKey
             }, {
               F: __dxlog_file5,
-              L: 210,
+              L: 216,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1385,7 +1393,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
             ...message
           }, {
             F: __dxlog_file5,
-            L: 219,
+            L: 225,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1400,7 +1408,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       to
     }, {
       F: __dxlog_file5,
-      L: 226,
+      L: 232,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1410,7 +1418,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       });
       (0, import_invariant2.invariant)(data instanceof Uint8Array, void 0, {
         F: __dxlog_file5,
-        L: 231,
+        L: 237,
         S: this,
         A: [
           "data instanceof Uint8Array",
@@ -1438,7 +1446,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       blocks: blocks.length
     }, {
       F: __dxlog_file5,
-      L: 252,
+      L: 258,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1460,7 +1468,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       if (!this._remoteLength.has(feed.key)) {
         (0, import_log3.log)("blocks not pushed because remote length is unknown", void 0, {
           F: __dxlog_file5,
-          L: 273,
+          L: 279,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1485,7 +1493,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
         if (err instanceof import_edge_client.EdgeIdentityChangedError || err instanceof import_edge_client.EdgeConnectionClosedError) {
           (0, import_log3.log)("resetting on reconnect", void 0, {
             F: __dxlog_file5,
-            L: 290,
+            L: 296,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1496,7 +1504,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       }
     }, {
       F: __dxlog_file5,
-      L: 284
+      L: 290
     });
     return connectionCtx;
   }
@@ -7759,7 +7767,7 @@ var ServiceContext = class extends import_context16.Resource {
       let edgeIdentity;
       const identity = this.identityManager.identity;
       if (identity) {
-        import_log22.log.info("Setting identity on edge connection", {
+        (0, import_log22.log)("setting identity on edge connection", {
           identity: identity.identityKey.toHex(),
           swarms: this.networkManager.topics
         }, {
@@ -7778,7 +7786,7 @@ var ServiceContext = class extends import_context16.Resource {
           });
           (0, import_invariant21.invariant)(identity.deviceCredentialChain, void 0, {
             F: __dxlog_file27,
-            L: 401,
+            L: 402,
             S: this,
             A: [
               "identity.deviceCredentialChain",
@@ -8850,4 +8858,4 @@ ClientServicesHost = _ts_decorate11([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-ZS24HRVA.cjs.map
+//# sourceMappingURL=chunk-7FKXMJDD.cjs.map