@dxos/client-services 0.7.4 → 0.7.5-main.499c70c

package/dist/lib/node/testing/index.cjs

@@ -32,7 +32,7 @@ __export(testing_exports, {
   sanitizeInvitation: () => sanitizeInvitation
 });
 module.exports = __toCommonJS(testing_exports);
-var import_chunk_ZS24HRVA = require("../chunk-ZS24HRVA.cjs");
+var import_chunk_PHNHOPRY = require("../chunk-PHNHOPRY.cjs");
 var import_credentials = require("@dxos/credentials");
 var import_keys = require("@dxos/keys");
 var import_async = require("@dxos/async");
@@ -235,7 +235,7 @@ var createInvitation = async (host, options) => {
     authMethod: import_services.Invitation.AuthMethod.NONE,
     ...options ?? {}
   };
-  if (host instanceof import_chunk_ZS24HRVA.ServiceContext) {
+  if (host instanceof import_chunk_PHNHOPRY.ServiceContext) {
     return host.invitationsManager.createInvitation({
       kind: import_services.Invitation.Kind.SPACE,
       ...options
@@ -245,7 +245,7 @@ var createInvitation = async (host, options) => {
 };
 var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
   invitation = sanitizeInvitation(invitation);
-  if (guest instanceof import_chunk_ZS24HRVA.ServiceContext) {
+  if (guest instanceof import_chunk_PHNHOPRY.ServiceContext) {
     return guest.invitationsManager.acceptInvitation({
       invitation,
       deviceProfile: guestDeviceProfile
@@ -255,7 +255,7 @@ var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
 };
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/testing/test-builder.ts";
 var createServiceHost = (config, signalManagerContext) => {
-  return new import_chunk_ZS24HRVA.ClientServicesHost({
+  return new import_chunk_PHNHOPRY.ClientServicesHost({
     config,
     signalManager: new import_messaging.MemorySignalManager(signalManagerContext),
     transportFactory: import_network_manager.MemoryTransportFactory
@@ -274,7 +274,7 @@ var createServiceContext = async ({ signalManagerFactory = async () => {
   });
   const level = (0, import_testing.createTestLevel)();
   await level.open();
-  return new import_chunk_ZS24HRVA.ServiceContext(storage, level, networkManager, signalManager, void 0, void 0, {
+  return new import_chunk_PHNHOPRY.ServiceContext(storage, level, networkManager, signalManager, void 0, void 0, {
     invitationConnectionDefaultParams: {
       teleport: {
         controlHeartbeatInterval: 200
@@ -385,7 +385,7 @@ var TestPeer = class {
     return this._props.meshEchoReplicator ??= new import_echo_pipeline.MeshEchoReplicator();
   }
   get dataSpaceManager() {
-    return this._props.dataSpaceManager ??= new import_chunk_ZS24HRVA.DataSpaceManager({
+    return this._props.dataSpaceManager ??= new import_chunk_PHNHOPRY.DataSpaceManager({
       spaceManager: this.spaceManager,
       metadataStore: this.metadataStore,
       keyring: this.keyring,
@@ -400,9 +400,9 @@ var TestPeer = class {
     });
   }
   get invitationsManager() {
-    return this._props.invitationsManager ??= new import_chunk_ZS24HRVA.InvitationsManager(new import_chunk_ZS24HRVA.InvitationsHandler(this.networkManager), (invitation) => {
+    return this._props.invitationsManager ??= new import_chunk_PHNHOPRY.InvitationsManager(new import_chunk_PHNHOPRY.InvitationsHandler(this.networkManager), (invitation) => {
       if (invitation.kind === import_services2.Invitation.Kind.SPACE) {
-        return new import_chunk_ZS24HRVA.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
+        return new import_chunk_PHNHOPRY.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
       } else {
         throw new Error("not implemented");
       }

package/dist/lib/node-esm/{chunk-OQOXRHWF.mjs → chunk-5LEHZOCS.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.499c70c";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -958,21 +958,20 @@ var EdgeFeedReplicator = class extends Resource {
       });
       return;
     }
-    const logPayload = message.type === "data" ? {
-      feedKey: message.feedKey,
-      blocks: message.blocks.map((b) => b.index)
-    } : {
-      message
-    };
-    log3.info("sending message", logPayload, {
-      F: __dxlog_file5,
-      L: 152,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    if (message.type === "data") {
+      log3.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)
+      });
+    }
     invariant2(message.feedKey, void 0, {
       F: __dxlog_file5,
-      L: 154,
+      L: 157,
       S: this,
       A: [
         "message.feedKey",
@@ -984,7 +983,7 @@ var EdgeFeedReplicator = class extends Resource {
       type: message.type
     }, {
       F: __dxlog_file5,
-      L: 157,
+      L: 160,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1003,7 +1002,7 @@ var EdgeFeedReplicator = class extends Resource {
     if (!this._connectionCtx) {
       log3.warn("received message after connection context was disposed", void 0, {
         F: __dxlog_file5,
-        L: 172,
+        L: 175,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1014,14 +1013,6 @@ var EdgeFeedReplicator = class extends Resource {
         case "metadata": {
           try {
             var _usingCtx = _using_ctx();
-            log3.info("received metadata", {
-              message
-            }, {
-              F: __dxlog_file5,
-              L: 178,
-              S: this,
-              C: (f, a) => f(...a)
-            });
             const feedKey = PublicKey3.fromHex(message.feedKey);
             const feed = this._feeds.get(feedKey);
             if (!feed) {
@@ -1029,7 +1020,7 @@ var EdgeFeedReplicator = class extends Resource {
                 feedKey
               }, {
                 F: __dxlog_file5,
-                L: 183,
+                L: 184,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1037,7 +1028,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) {
+              log3.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(),
@@ -1047,6 +1049,12 @@ var EdgeFeedReplicator = class extends Resource {
                 }
               });
             } else if (message.length < feed.length) {
+              log3.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;
@@ -1062,7 +1070,7 @@ var EdgeFeedReplicator = class extends Resource {
             blocks: message.blocks.map((b) => b.index)
           }, {
             F: __dxlog_file5,
-            L: 205,
+            L: 211,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1073,7 +1081,7 @@ var EdgeFeedReplicator = class extends Resource {
               feedKey
             }, {
               F: __dxlog_file5,
-              L: 210,
+              L: 216,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1087,7 +1095,7 @@ var EdgeFeedReplicator = class extends Resource {
             ...message
           }, {
             F: __dxlog_file5,
-            L: 219,
+            L: 225,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1102,7 +1110,7 @@ var EdgeFeedReplicator = class extends Resource {
       to
     }, {
       F: __dxlog_file5,
-      L: 226,
+      L: 232,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1112,7 +1120,7 @@ var EdgeFeedReplicator = class extends Resource {
       });
       invariant2(data instanceof Uint8Array, void 0, {
         F: __dxlog_file5,
-        L: 231,
+        L: 237,
         S: this,
         A: [
           "data instanceof Uint8Array",
@@ -1140,7 +1148,7 @@ var EdgeFeedReplicator = class extends Resource {
       blocks: blocks.length
     }, {
       F: __dxlog_file5,
-      L: 252,
+      L: 258,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1162,7 +1170,7 @@ var EdgeFeedReplicator = class extends Resource {
       if (!this._remoteLength.has(feed.key)) {
         log3("blocks not pushed because remote length is unknown", void 0, {
           F: __dxlog_file5,
-          L: 273,
+          L: 279,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1187,7 +1195,7 @@ var EdgeFeedReplicator = class extends Resource {
         if (err instanceof EdgeIdentityChangedError || err instanceof EdgeConnectionClosedError) {
           log3("resetting on reconnect", void 0, {
             F: __dxlog_file5,
-            L: 290,
+            L: 296,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1198,7 +1206,7 @@ var EdgeFeedReplicator = class extends Resource {
       }
     }, {
       F: __dxlog_file5,
-      L: 284
+      L: 290
     });
     return connectionCtx;
   }
@@ -7748,7 +7756,7 @@ var ServiceContext = class extends Resource7 {
       let edgeIdentity;
       const identity = this.identityManager.identity;
       if (identity) {
-        log23.info("Setting identity on edge connection", {
+        log23("setting identity on edge connection", {
           identity: identity.identityKey.toHex(),
           swarms: this.networkManager.topics
         }, {
@@ -7767,7 +7775,7 @@ var ServiceContext = class extends Resource7 {
           });
           invariant21(identity.deviceCredentialChain, void 0, {
             F: __dxlog_file27,
-            L: 401,
+            L: 402,
             S: this,
             A: [
               "identity.deviceCredentialChain",
@@ -8910,4 +8918,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-OQOXRHWF.mjs.map
+//# sourceMappingURL=chunk-5LEHZOCS.mjs.map