@dxos/client-services 0.6.12-main.ed7cda7 → 0.6.12-main.f9d0246

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

@@ -32,7 +32,7 @@ __export(testing_exports, {
   sanitizeInvitation: () => sanitizeInvitation
 });
 module.exports = __toCommonJS(testing_exports);
-var import_chunk_US3NPCS5 = require("../chunk-US3NPCS5.cjs");
+var import_chunk_UPLMIG6W = require("../chunk-UPLMIG6W.cjs");
 var import_credentials = require("@dxos/credentials");
 var import_keys = require("@dxos/keys");
 var import_async = require("@dxos/async");
@@ -228,7 +228,7 @@ var createInvitation = async (host, options) => {
     authMethod: import_services.Invitation.AuthMethod.NONE,
     ...options ?? {}
   };
-  if (host instanceof import_chunk_US3NPCS5.ServiceContext) {
+  if (host instanceof import_chunk_UPLMIG6W.ServiceContext) {
     return host.invitationsManager.createInvitation({
       kind: import_services.Invitation.Kind.SPACE,
       ...options
@@ -238,7 +238,7 @@ var createInvitation = async (host, options) => {
 };
 var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
   invitation = sanitizeInvitation(invitation);
-  if (guest instanceof import_chunk_US3NPCS5.ServiceContext) {
+  if (guest instanceof import_chunk_UPLMIG6W.ServiceContext) {
     return guest.invitationsManager.acceptInvitation({
       invitation,
       deviceProfile: guestDeviceProfile
@@ -248,7 +248,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_US3NPCS5.ClientServicesHost({
+  return new import_chunk_UPLMIG6W.ClientServicesHost({
     config,
     signalManager: new import_messaging.MemorySignalManager(signalManagerContext),
     transportFactory: import_network_manager.MemoryTransportFactory
@@ -267,7 +267,7 @@ var createServiceContext = async ({ signalManagerFactory = async () => {
   });
   const level = (0, import_testing.createTestLevel)();
   await level.open();
-  return new import_chunk_US3NPCS5.ServiceContext(storage, level, networkManager, signalManager, void 0, {
+  return new import_chunk_UPLMIG6W.ServiceContext(storage, level, networkManager, signalManager, void 0, {
     invitationConnectionDefaultParams: {
       controlHeartbeatInterval: 200
     },
@@ -376,7 +376,7 @@ var TestPeer = class {
     return this._props.meshEchoReplicator ??= new import_echo_pipeline.MeshEchoReplicator();
   }
   get dataSpaceManager() {
-    return this._props.dataSpaceManager ??= new import_chunk_US3NPCS5.DataSpaceManager({
+    return this._props.dataSpaceManager ??= new import_chunk_UPLMIG6W.DataSpaceManager({
       spaceManager: this.spaceManager,
       metadataStore: this.metadataStore,
       keyring: this.keyring,
@@ -391,9 +391,9 @@ var TestPeer = class {
     });
   }
   get invitationsManager() {
-    return this._props.invitationsManager ??= new import_chunk_US3NPCS5.InvitationsManager(new import_chunk_US3NPCS5.InvitationsHandler(this.networkManager), (invitation) => {
+    return this._props.invitationsManager ??= new import_chunk_UPLMIG6W.InvitationsManager(new import_chunk_UPLMIG6W.InvitationsHandler(this.networkManager), (invitation) => {
       if (invitation.kind === import_services2.Invitation.Kind.SPACE) {
-        return new import_chunk_US3NPCS5.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
+        return new import_chunk_UPLMIG6W.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
       } else {
         throw new Error("not implemented");
       }

package/dist/lib/node-esm/{chunk-LV7T6HCX.mjs → chunk-DSRREBQH.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.6.12-main.ed7cda7";
+var DXOS_VERSION = "0.6.12-main.f9d0246";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -852,45 +852,31 @@ var EdgeFeedReplicator = class extends Resource {
     }));
     this._messenger.connected.on(this._ctx, async () => {
       await this._resetConnection();
-      this._connected = true;
-      const connectionCtx = new Context3({
-        onError: async (err) => {
-          if (connectionCtx !== this._connectionCtx) {
-            return;
-          }
-          if (err instanceof EdgeIdentityChangedError || err instanceof EdgeConnectionClosedError) {
-            log3("resetting on reconnect", void 0, {
-              F: __dxlog_file5,
-              L: 86,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-            await this._resetConnection();
-          } else {
-            this._ctx.raise(err);
-          }
-        }
-      }, {
-        F: __dxlog_file5,
-        L: 80
-      });
-      this._connectionCtx = connectionCtx;
-      log3("connection context created", void 0, {
-        F: __dxlog_file5,
-        L: 94,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      scheduleMicroTask(connectionCtx, async () => {
-        for (const feed of this._feeds.values()) {
-          await this._replicateFeed(connectionCtx, feed);
-        }
-      });
+      this._startReplication();
     });
+    if (this._messenger.isConnected) {
+      this._startReplication();
+    }
   }
   async _close() {
     await this._resetConnection();
   }
+  _startReplication() {
+    this._connected = true;
+    const connectionCtx = this._createConnectionContext();
+    this._connectionCtx = connectionCtx;
+    log3("connection context created", void 0, {
+      F: __dxlog_file5,
+      L: 94,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    scheduleMicroTask(connectionCtx, async () => {
+      for (const feed of this._feeds.values()) {
+        await this._replicateFeed(connectionCtx, feed);
+      }
+    });
+  }
   async _resetConnection() {
     this._connected = false;
     await this._connectionCtx?.dispose();
@@ -902,7 +888,7 @@ var EdgeFeedReplicator = class extends Resource {
       key: feed.key
     }, {
       F: __dxlog_file5,
-      L: 115,
+      L: 110,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -927,7 +913,7 @@ var EdgeFeedReplicator = class extends Resource {
     if (!this._connectionCtx) {
       log3.info("message dropped because connection was disposed", void 0, {
         F: __dxlog_file5,
-        L: 140,
+        L: 135,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -941,13 +927,13 @@ var EdgeFeedReplicator = class extends Resource {
     };
     log3.info("sending message", logPayload, {
       F: __dxlog_file5,
-      L: 146,
+      L: 141,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(message.feedKey, void 0, {
       F: __dxlog_file5,
-      L: 148,
+      L: 143,
       S: this,
       A: [
         "message.feedKey",
@@ -970,7 +956,7 @@ var EdgeFeedReplicator = class extends Resource {
     if (!this._connectionCtx) {
       log3.warn("received message after connection context was disposed", void 0, {
         F: __dxlog_file5,
-        L: 165,
+        L: 160,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -985,7 +971,7 @@ var EdgeFeedReplicator = class extends Resource {
               message
             }, {
               F: __dxlog_file5,
-              L: 171,
+              L: 166,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -996,7 +982,7 @@ var EdgeFeedReplicator = class extends Resource {
                 feedKey
               }, {
                 F: __dxlog_file5,
-                L: 176,
+                L: 171,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1029,7 +1015,7 @@ var EdgeFeedReplicator = class extends Resource {
             blocks: message.blocks.map((b) => b.index)
           }, {
             F: __dxlog_file5,
-            L: 198,
+            L: 193,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1040,7 +1026,7 @@ var EdgeFeedReplicator = class extends Resource {
               feedKey
             }, {
               F: __dxlog_file5,
-              L: 203,
+              L: 198,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1054,7 +1040,7 @@ var EdgeFeedReplicator = class extends Resource {
             ...message
           }, {
             F: __dxlog_file5,
-            L: 212,
+            L: 207,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1069,7 +1055,7 @@ var EdgeFeedReplicator = class extends Resource {
       to
     }, {
       F: __dxlog_file5,
-      L: 219,
+      L: 214,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1079,7 +1065,7 @@ var EdgeFeedReplicator = class extends Resource {
       });
       invariant2(data instanceof Uint8Array, void 0, {
         F: __dxlog_file5,
-        L: 224,
+        L: 219,
         S: this,
         A: [
           "data instanceof Uint8Array",
@@ -1107,7 +1093,7 @@ var EdgeFeedReplicator = class extends Resource {
       blocks: blocks.length
     }, {
       F: __dxlog_file5,
-      L: 245,
+      L: 240,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1129,7 +1115,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: 266,
+          L: 261,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1145,6 +1131,30 @@ var EdgeFeedReplicator = class extends Resource {
       _usingCtx.d();
     }
   }
+  _createConnectionContext() {
+    const connectionCtx = new Context3({
+      onError: async (err) => {
+        if (connectionCtx !== this._connectionCtx) {
+          return;
+        }
+        if (err instanceof EdgeIdentityChangedError || err instanceof EdgeConnectionClosedError) {
+          log3("resetting on reconnect", void 0, {
+            F: __dxlog_file5,
+            L: 278,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          await this._resetConnection();
+        } else {
+          this._ctx.raise(err);
+        }
+      }
+    }, {
+      F: __dxlog_file5,
+      L: 272
+    });
+    return connectionCtx;
+  }
 };
 var bufferizeBlock = (block) => ({
   index: block.index,
@@ -7806,4 +7816,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-LV7T6HCX.mjs.map
+//# sourceMappingURL=chunk-DSRREBQH.mjs.map