@dxos/client-services 0.6.8-main.3be982f → 0.6.8-staging.77f93a3

package/dist/lib/browser/{chunk-I6MMWGWX.mjs → chunk-RZ5JISVH.mjs}

@@ -89,7 +89,7 @@ var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src
 var subscribeToNetworkStatus = ({ signalManager }) => new Stream2(({ next, close }) => {
   const update = () => {
     try {
-      const status = signalManager.getStatus();
+      const status = signalManager.getStatus?.();
       next({
         servers: status
       });
@@ -97,7 +97,7 @@ var subscribeToNetworkStatus = ({ signalManager }) => new Stream2(({ next, close
       close(err);
     }
   };
-  signalManager.statusChanged.on(() => update());
+  signalManager.statusChanged?.on(() => update());
   update();
 });
 var subscribeToSignal = ({ signalManager }) => new Stream2(({ next }) => {
@@ -108,8 +108,8 @@ var subscribeToSignal = ({ signalManager }) => new Stream2(({ next }) => {
   signalManager.onMessage.on(ctx, (message) => {
     next({
       message: {
-        author: message.author.asUint8Array(),
-        recipient: message.recipient.asUint8Array(),
+        author: PublicKey2.from(message.author.peerKey).asUint8Array(),
+        recipient: PublicKey2.from(message.recipient.peerKey).asUint8Array(),
         payload: message.payload
       },
       receivedAt: /* @__PURE__ */ new Date()
@@ -117,7 +117,16 @@ var subscribeToSignal = ({ signalManager }) => new Stream2(({ next }) => {
   });
   signalManager.swarmEvent.on(ctx, (swarmEvent) => {
     next({
-      swarmEvent: swarmEvent.swarmEvent,
+      swarmEvent: swarmEvent.peerAvailable ? {
+        peerAvailable: {
+          peer: PublicKey2.from(swarmEvent.peerAvailable.peer.peerKey).asUint8Array(),
+          since: swarmEvent.peerAvailable.since
+        }
+      } : {
+        peerLeft: {
+          peer: PublicKey2.from(swarmEvent.peerLeft.peer.peerKey).asUint8Array()
+        }
+      },
       topic: swarmEvent.topic.asUint8Array(),
       receivedAt: /* @__PURE__ */ new Date()
     });
@@ -359,7 +368,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.8-main.3be982f";
+var DXOS_VERSION = "0.6.8-staging.77f93a3";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -1051,11 +1060,12 @@ var DEVICE_PRESENCE_OFFLINE_TIMEOUT = 2e4;
 var IdentityManager = class {
   // TODO(burdon): IdentityManagerParams.
   // TODO(dmaretskyi): Perhaps this should take/generate the peerKey outside of an initialized identity.
-  constructor(_metadataStore, _keyring, _feedStore, _spaceManager, params) {
+  constructor(_metadataStore, _keyring, _feedStore, _spaceManager, params, _callbacks) {
     this._metadataStore = _metadataStore;
     this._keyring = _keyring;
     this._feedStore = _feedStore;
     this._spaceManager = _spaceManager;
+    this._callbacks = _callbacks;
     this.stateUpdate = new Event2();
     const { devicePresenceAnnounceInterval = DEVICE_PRESENCE_ANNOUNCE_INTERVAL, devicePresenceOfflineTimeout = DEVICE_PRESENCE_OFFLINE_TIMEOUT } = params ?? {};
     this._devicePresenceAnnounceInterval = devicePresenceAnnounceInterval;
@@ -1070,7 +1080,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file7,
-      L: 104,
+      L: 107,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1079,7 +1089,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file7,
-      L: 107,
+      L: 110,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1092,7 +1102,7 @@ var IdentityManager = class {
         displayName: this._identity.profileDocument?.displayName
       }, {
         F: __dxlog_file7,
-        L: 112,
+        L: 115,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1102,7 +1112,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file7,
-      L: 119,
+      L: 122,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1110,13 +1120,13 @@ var IdentityManager = class {
   async close() {
     await this._identity?.close(new Context3(void 0, {
       F: __dxlog_file7,
-      L: 123
+      L: 126
     }));
   }
   async createIdentity({ displayName, deviceProfile } = {}) {
     invariant3(!this._identity, "Identity already exists.", {
       F: __dxlog_file7,
-      L: 128,
+      L: 131,
       S: this,
       A: [
         "!this._identity",
@@ -1125,7 +1135,7 @@ var IdentityManager = class {
     });
     log5("creating identity...", void 0, {
       F: __dxlog_file7,
-      L: 129,
+      L: 132,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1143,13 +1153,13 @@ var IdentityManager = class {
     const identity = await this._constructIdentity(identityRecord);
     await identity.open(new Context3(void 0, {
       F: __dxlog_file7,
-      L: 144
+      L: 147
     }));
     {
       const generator = new CredentialGenerator(this._keyring, identityRecord.identityKey, identityRecord.deviceKey);
       invariant3(identityRecord.haloSpace.genesisFeedKey, "Genesis feed key is required.", {
         F: __dxlog_file7,
-        L: 148,
+        L: 151,
         S: this,
         A: [
           "identityRecord.haloSpace.genesisFeedKey",
@@ -1158,7 +1168,7 @@ var IdentityManager = class {
       });
       invariant3(identityRecord.haloSpace.dataFeedKey, "Data feed key is required.", {
         F: __dxlog_file7,
-        L: 149,
+        L: 152,
         S: this,
         A: [
           "identityRecord.haloSpace.dataFeedKey",
@@ -1197,7 +1207,7 @@ var IdentityManager = class {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file7,
-      L: 191,
+      L: 194,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1208,7 +1218,7 @@ var IdentityManager = class {
       profile: identity.profileDocument
     }, {
       F: __dxlog_file7,
-      L: 197,
+      L: 200,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1245,13 +1255,13 @@ var IdentityManager = class {
       params
     }, {
       F: __dxlog_file7,
-      L: 235,
+      L: 238,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(!this._identity, "Identity already exists.", {
       F: __dxlog_file7,
-      L: 236,
+      L: 239,
       S: this,
       A: [
         "!this._identity",
@@ -1272,7 +1282,7 @@ var IdentityManager = class {
     const identity = await this._constructIdentity(identityRecord);
     await identity.open(new Context3(void 0, {
       F: __dxlog_file7,
-      L: 251
+      L: 254
     }));
     this._identity = identity;
     await this._metadataStore.setIdentityRecord(identityRecord);
@@ -1282,7 +1292,7 @@ var IdentityManager = class {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file7,
-      L: 255,
+      L: 258,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1296,7 +1306,7 @@ var IdentityManager = class {
       deviceKey: identity.deviceKey
     }, {
       F: __dxlog_file7,
-      L: 265,
+      L: 268,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1308,7 +1318,7 @@ var IdentityManager = class {
   async updateProfile(profile) {
     invariant3(this._identity, "Identity not initialized.", {
       F: __dxlog_file7,
-      L: 273,
+      L: 276,
       S: this,
       A: [
         "this._identity",
@@ -1339,7 +1349,7 @@ var IdentityManager = class {
   async updateDeviceProfile(profile) {
     invariant3(this._identity, "Identity not initialized.", {
       F: __dxlog_file7,
-      L: 290,
+      L: 293,
       S: this,
       A: [
         "this._identity",
@@ -1375,7 +1385,7 @@ var IdentityManager = class {
   async _constructIdentity(identityRecord) {
     invariant3(!this._identity, void 0, {
       F: __dxlog_file7,
-      L: 316,
+      L: 319,
       S: this,
       A: [
         "!this._identity",
@@ -1386,7 +1396,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file7,
-      L: 317,
+      L: 320,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1401,7 +1411,7 @@ var IdentityManager = class {
     });
     invariant3(identityRecord.haloSpace.controlFeedKey, void 0, {
       F: __dxlog_file7,
-      L: 330,
+      L: 333,
       S: this,
       A: [
         "identityRecord.haloSpace.controlFeedKey",
@@ -1413,7 +1423,7 @@ var IdentityManager = class {
     });
     invariant3(identityRecord.haloSpace.dataFeedKey, void 0, {
       F: __dxlog_file7,
-      L: 334,
+      L: 337,
       S: this,
       A: [
         "identityRecord.haloSpace.dataFeedKey",
@@ -1427,6 +1437,7 @@ var IdentityManager = class {
     const space = await this._constructSpace({
       spaceRecord: identityRecord.haloSpace,
       swarmIdentity: {
+        identityKey: identityRecord.identityKey,
         peerKey: identityRecord.deviceKey,
         credentialProvider: createAuthProvider(createCredentialSignerWithKey2(this._keyring, identityRecord.deviceKey)),
         credentialAuthenticator: deferFunction(() => identity.authVerifier.verifier)
@@ -1447,10 +1458,11 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey
     }, {
       F: __dxlog_file7,
-      L: 360,
+      L: 364,
       S: this,
       C: (f, a) => f(...a)
     });
+    this._callbacks?.onIdentityConstruction?.(identity);
     if (identityRecord.haloSpace.controlTimeframe) {
       identity.controlPipeline.state.setTargetTimeframe(identityRecord.haloSpace.controlTimeframe);
     }
@@ -1472,7 +1484,7 @@ var IdentityManager = class {
       onAuthFailure: () => {
         log5.warn("auth failure", void 0, {
           F: __dxlog_file7,
-          L: 385,
+          L: 390,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2796,7 +2808,6 @@ var InvitationsHandler = class {
     }
     const swarmConnection = await this._networkManager.joinSwarm({
       topic: invitation.swarmKey,
-      peerId: PublicKey7.random(),
       protocolProvider: createTeleportProtocolFactory(async (teleport) => {
         teleport.addExtension("dxos.halo.invitations", extensionFactory());
       }, this._defaultTeleportParams),
@@ -2873,7 +2884,7 @@ var InvitationsHandler = class {
         oldState: stateToString(invitation.state)
       }, {
         F: __dxlog_file13,
-        L: 461,
+        L: 460,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2884,7 +2895,7 @@ var InvitationsHandler = class {
         oldState: stateToString(invitation.state)
       }, {
         F: __dxlog_file13,
-        L: 467,
+        L: 466,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2903,7 +2914,7 @@ var InvitationsHandler = class {
     for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
       log10("guest waiting for authentication code...", void 0, {
         F: __dxlog_file13,
-        L: 492,
+        L: 491,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2911,7 +2922,7 @@ var InvitationsHandler = class {
       const authCode = await authenticated.wait(options);
       log10("sending authentication request", void 0, {
         F: __dxlog_file13,
-        L: 496,
+        L: 495,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2930,7 +2941,7 @@ var InvitationsHandler = class {
             attempt
           }, {
             F: __dxlog_file13,
-            L: 507,
+            L: 506,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2948,7 +2959,7 @@ var InvitationsHandler = class {
     }
     log10("sending authentication request", void 0, {
       F: __dxlog_file13,
-      L: 526,
+      L: 525,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4860,7 +4871,7 @@ var DataSpace = class {
   constructor(params) {
     this._ctx = new Context8(void 0, {
       F: __dxlog_file20,
-      L: 87
+      L: 89
     });
     this._notarizationPlugin = new NotarizationPlugin();
     this._cache = void 0;
@@ -4897,7 +4908,7 @@ var DataSpace = class {
       authTimeout: AUTH_TIMEOUT2
     });
     this._cache = params.cache;
-    if (params.edgeConnection) {
+    if (params.edgeConnection && params.edgeFeatures?.feedReplicator) {
       this._edgeFeedReplicator = new EdgeFeedReplicator({
         messenger: params.edgeConnection,
         spaceId: this.id
@@ -4908,7 +4919,7 @@ var DataSpace = class {
       state: SpaceState2[this._state]
     }, {
       F: __dxlog_file20,
-      L: 157,
+      L: 159,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4967,7 +4978,7 @@ var DataSpace = class {
     }
     await this._inner.open(new Context8(void 0, {
       F: __dxlog_file20,
-      L: 231
+      L: 233
     }));
     await this._edgeFeedReplicator?.open();
     this._state = SpaceState2.SPACE_CONTROL_ONLY;
@@ -4975,7 +4986,7 @@ var DataSpace = class {
       state: SpaceState2[this._state]
     }, {
       F: __dxlog_file20,
-      L: 236,
+      L: 238,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4995,14 +5006,14 @@ var DataSpace = class {
       state: SpaceState2[this._state]
     }, {
       F: __dxlog_file20,
-      L: 255,
+      L: 257,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._ctx.dispose();
     this._ctx = new Context8(void 0, {
       F: __dxlog_file20,
-      L: 257
+      L: 259
     });
     if (this._edgeFeedReplicator) {
       this.inner.protocol.feedAdded.remove(this._onFeedAdded);
@@ -5035,7 +5046,7 @@ var DataSpace = class {
         if (err instanceof CancelledError || err instanceof ContextDisposedError3) {
           log17("data pipeline initialization cancelled", err, {
             F: __dxlog_file20,
-            L: 295,
+            L: 297,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5043,7 +5054,7 @@ var DataSpace = class {
         }
         log17.error("Error initializing data pipeline", err, {
           F: __dxlog_file20,
-          L: 299,
+          L: 301,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5052,7 +5063,7 @@ var DataSpace = class {
           state: SpaceState2[this._state]
         }, {
           F: __dxlog_file20,
-          L: 301,
+          L: 303,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5072,7 +5083,7 @@ var DataSpace = class {
       state: SpaceState2[this._state]
     }, {
       F: __dxlog_file20,
-      L: 317,
+      L: 319,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5089,7 +5100,7 @@ var DataSpace = class {
       state: SpaceState2[this._state]
     }, {
       F: __dxlog_file20,
-      L: 336,
+      L: 338,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5105,7 +5116,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     log17("writable feeds created", void 0, {
       F: __dxlog_file20,
-      L: 352,
+      L: 354,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5168,7 +5179,7 @@ var DataSpace = class {
       rootUrl
     }, {
       F: __dxlog_file20,
-      L: 418,
+      L: 420,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5220,7 +5231,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file20,
-          L: 461,
+          L: 463,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5310,7 +5321,7 @@ var DataSpace = class {
       state: SpaceState2[this._state]
     }, {
       F: __dxlog_file20,
-      L: 543,
+      L: 545,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5478,6 +5489,7 @@ var DataSpaceManager = class extends Resource4 {
     this._spaces = new ComplexMap4(PublicKey12.hash);
     this._instanceId = PublicKey12.random().toHex();
     this._edgeConnection = void 0;
+    this._edgeFeatures = void 0;
     this._meshReplicator = void 0;
     this._echoEdgeReplicator = void 0;
     this._runtimeParams = void 0;
@@ -5490,6 +5502,7 @@ var DataSpaceManager = class extends Resource4 {
     this._meshReplicator = params.meshReplicator;
     this._invitationsManager = params.invitationsManager;
     this._edgeConnection = params.edgeConnection;
+    this._edgeFeatures = params.edgeFeatures;
     this._echoEdgeReplicator = params.echoEdgeReplicator;
     this._runtimeParams = params.runtimeParams;
     trace7.diagnostic({
@@ -5522,7 +5535,7 @@ var DataSpaceManager = class extends Resource4 {
   async _open() {
     log18("open", void 0, {
       F: __dxlog_file21,
-      L: 187,
+      L: 192,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5530,7 +5543,7 @@ var DataSpaceManager = class extends Resource4 {
       id: this._instanceId
     }), {
       F: __dxlog_file21,
-      L: 188,
+      L: 193,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5538,7 +5551,7 @@ var DataSpaceManager = class extends Resource4 {
       spaces: this._metadataStore.spaces.length
     }, {
       F: __dxlog_file21,
-      L: 189,
+      L: 194,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5548,7 +5561,7 @@ var DataSpaceManager = class extends Resource4 {
           spaceMetadata
         }, {
           F: __dxlog_file21,
-          L: 193,
+          L: 198,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5559,7 +5572,7 @@ var DataSpaceManager = class extends Resource4 {
           err
         }, {
           F: __dxlog_file21,
-          L: 196,
+          L: 201,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5570,7 +5583,7 @@ var DataSpaceManager = class extends Resource4 {
       id: this._instanceId
     }), {
       F: __dxlog_file21,
-      L: 202,
+      L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5578,7 +5591,7 @@ var DataSpaceManager = class extends Resource4 {
   async _close() {
     log18("close", void 0, {
       F: __dxlog_file21,
-      L: 207,
+      L: 212,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5593,7 +5606,7 @@ var DataSpaceManager = class extends Resource4 {
   async createSpace() {
     invariant15(this._lifecycleState === LifecycleState.OPEN, "Not open.", {
       F: __dxlog_file21,
-      L: 219,
+      L: 224,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -5614,7 +5627,7 @@ var DataSpaceManager = class extends Resource4 {
       spaceKey
     }, {
       F: __dxlog_file21,
-      L: 231,
+      L: 236,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5626,7 +5639,7 @@ var DataSpaceManager = class extends Resource4 {
     const memberCredential = credentials[1];
     invariant15(getCredentialAssertion3(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file21,
-      L: 241,
+      L: 246,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -5658,7 +5671,7 @@ var DataSpaceManager = class extends Resource4 {
           spaceId: space.id
         }, {
           F: __dxlog_file21,
-          L: 266,
+          L: 271,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5693,7 +5706,7 @@ var DataSpaceManager = class extends Resource4 {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant15(automergeIndex, void 0, {
       F: __dxlog_file21,
-      L: 299,
+      L: 304,
       S: this,
       A: [
         "automergeIndex",
@@ -5710,13 +5723,13 @@ var DataSpaceManager = class extends Resource4 {
       opts
     }, {
       F: __dxlog_file21,
-      L: 308,
+      L: 313,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant15(this._lifecycleState === LifecycleState.OPEN, "Not open.", {
       F: __dxlog_file21,
-      L: 309,
+      L: 314,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -5725,7 +5738,7 @@ var DataSpaceManager = class extends Resource4 {
     });
     invariant15(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file21,
-      L: 310,
+      L: 315,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -5749,7 +5762,7 @@ var DataSpaceManager = class extends Resource4 {
     const space = this._spaceManager.spaces.get(options.spaceKey);
     invariant15(space, void 0, {
       F: __dxlog_file21,
-      L: 330,
+      L: 335,
       S: this,
       A: [
         "space",
@@ -5762,7 +5775,7 @@ var DataSpaceManager = class extends Resource4 {
     const credentials = await createAdmissionCredentials(this._signingContext.credentialSigner, options.identityKey, space.key, space.genesisFeedKey, options.role, space.spaceState.membershipChainHeads, options.profile, options.delegationCredentialId);
     invariant15(credentials[0].credential, void 0, {
       F: __dxlog_file21,
-      L: 349,
+      L: 354,
       S: this,
       A: [
         "credentials[0].credential",
@@ -5772,7 +5785,7 @@ var DataSpaceManager = class extends Resource4 {
     const spaceMemberCredential = credentials[0].credential.credential;
     invariant15(getCredentialAssertion3(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file21,
-      L: 351,
+      L: 356,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -5799,6 +5812,7 @@ var DataSpaceManager = class extends Resource4 {
       identityKey: this._signingContext.identityKey,
       timeout: 15e3,
       swarmIdentity: {
+        identityKey: this._signingContext.identityKey,
         peerKey: this._signingContext.deviceKey,
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
         credentialAuthenticator: async () => true
@@ -5810,7 +5824,7 @@ var DataSpaceManager = class extends Resource4 {
       metadata
     }, {
       F: __dxlog_file21,
-      L: 386,
+      L: 392,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5833,6 +5847,7 @@ var DataSpaceManager = class extends Resource4 {
     const space = await this._spaceManager.constructSpace({
       metadata,
       swarmIdentity: {
+        identityKey: this._signingContext.identityKey,
         peerKey: this._signingContext.deviceKey,
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
         credentialAuthenticator: deferFunction2(() => dataSpace.authVerifier.verifier)
@@ -5853,7 +5868,7 @@ var DataSpaceManager = class extends Resource4 {
             err
           }, {
             F: __dxlog_file21,
-            L: 427,
+            L: 434,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5863,7 +5878,7 @@ var DataSpaceManager = class extends Resource4 {
       onAuthFailure: () => {
         log18.warn("auth failure", void 0, {
           F: __dxlog_file21,
-          L: 432,
+          L: 439,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5896,7 +5911,7 @@ var DataSpaceManager = class extends Resource4 {
             space: space.key
           }, {
             F: __dxlog_file21,
-            L: 459,
+            L: 466,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5907,7 +5922,7 @@ var DataSpaceManager = class extends Resource4 {
             open: this._lifecycleState === LifecycleState.OPEN
           }, {
             F: __dxlog_file21,
-            L: 462,
+            L: 469,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5926,14 +5941,15 @@ var DataSpaceManager = class extends Resource4 {
             space: space.key
           }, {
             F: __dxlog_file21,
-            L: 470,
+            L: 477,
             S: this,
             C: (f, a) => f(...a)
           });
         }
       },
       cache: metadata.cache,
-      edgeConnection: this._edgeConnection
+      edgeConnection: this._edgeConnection,
+      edgeFeatures: this._edgeFeatures
     });
     dataSpace.postOpen.append(async () => {
       await this._echoEdgeReplicator?.connectToSpace(dataSpace.id);
@@ -5959,7 +5975,7 @@ var DataSpaceManager = class extends Resource4 {
         space: space.key
       }, {
         F: __dxlog_file21,
-        L: 500,
+        L: 508,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5992,7 +6008,7 @@ var DataSpaceManager = class extends Resource4 {
       closedSessions
     }, {
       F: __dxlog_file21,
-      L: 526,
+      L: 534,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6007,7 +6023,7 @@ var DataSpaceManager = class extends Resource4 {
           peerId: peerState.peerId
         }, {
           F: __dxlog_file21,
-          L: 540,
+          L: 548,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -6436,7 +6452,7 @@ function _ts_decorate7(decorators, target, key, desc) {
 }
 var __dxlog_file23 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
 var ServiceContext = class extends Resource5 {
-  constructor(storage, level, networkManager, signalManager, _edgeConnection, _runtimeParams) {
+  constructor(storage, level, networkManager, signalManager, _edgeConnection, _runtimeParams, _edgeFeatures) {
     super();
     this.storage = storage;
     this.level = level;
@@ -6444,6 +6460,7 @@ var ServiceContext = class extends Resource5 {
     this.signalManager = signalManager;
     this._edgeConnection = _edgeConnection;
     this._runtimeParams = _runtimeParams;
+    this._edgeFeatures = _edgeFeatures;
     this.initialized = new Trigger9();
     this._meshReplicator = void 0;
     this._echoEdgeReplicator = void 0;
@@ -6469,17 +6486,41 @@ var ServiceContext = class extends Resource5 {
       metadataStore: this.metadataStore,
       disableP2pReplication: this._runtimeParams?.disableP2pReplication
     });
-    this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager, this._runtimeParams);
+    this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager, this._runtimeParams, {
+      onIdentityConstruction: (identity) => {
+        if (this._edgeConnection) {
+          log20.info("Setting identity on edge connection", {
+            identity: identity.identityKey.toHex(),
+            oldIdentity: this._edgeConnection.identityKey.toHex(),
+            swarms: this.networkManager.topics
+          }, {
+            F: __dxlog_file23,
+            L: 128,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          this._edgeConnection.setIdentity({
+            deviceKey: identity.deviceKey,
+            identityKey: identity.identityKey
+          });
+          this.networkManager.setPeerInfo({
+            identityKey: identity.identityKey.toHex(),
+            peerKey: identity.deviceKey.toHex()
+          });
+        }
+      }
+    });
     this.echoHost = new EchoHost({
       kv: this.level
     });
+    this._meshReplicator = new MeshEchoReplicator();
     this.invitations = new InvitationsHandler(this.networkManager, _runtimeParams?.invitationConnectionDefaultParams);
     this.invitationsManager = new InvitationsManager(this.invitations, (invitation) => this.getInvitationHandler(invitation), this.metadataStore);
     this._handlerFactories.set(Invitation8.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? failUndefined2(), this._acceptIdentity.bind(this)));
     if (!this._runtimeParams?.disableP2pReplication) {
       this._meshReplicator = new MeshEchoReplicator();
     }
-    if (this._edgeConnection) {
+    if (this._edgeConnection && this._edgeFeatures?.echoReplicator) {
       this._echoEdgeReplicator = new EchoEdgeReplicator({
         edgeConnection: this._edgeConnection
       });
@@ -6489,7 +6530,7 @@ var ServiceContext = class extends Resource5 {
     await this._checkStorageVersion();
     log20("opening...", void 0, {
       F: __dxlog_file23,
-      L: 160,
+      L: 186,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6497,13 +6538,13 @@ var ServiceContext = class extends Resource5 {
       id: this._instanceId
     }), {
       F: __dxlog_file23,
-      L: 161,
+      L: 187,
       S: this,
       C: (f, a) => f(...a)
     });
+    await this._edgeConnection?.open();
     await this.signalManager.open();
     await this.networkManager.open();
-    await this._edgeConnection?.open();
     await this.echoHost.open(ctx);
     if (this._meshReplicator) {
       await this.echoHost.addReplicator(this._meshReplicator);
@@ -6522,7 +6563,7 @@ var ServiceContext = class extends Resource5 {
       count: loadedInvitations.invitations?.length
     }, {
       F: __dxlog_file23,
-      L: 183,
+      L: 210,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6530,13 +6571,13 @@ var ServiceContext = class extends Resource5 {
       id: this._instanceId
     }), {
       F: __dxlog_file23,
-      L: 185,
+      L: 212,
       S: this,
       C: (f, a) => f(...a)
     });
     log20("opened", void 0, {
       F: __dxlog_file23,
-      L: 186,
+      L: 213,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6544,7 +6585,7 @@ var ServiceContext = class extends Resource5 {
   async _close(ctx) {
     log20("closing...", void 0, {
       F: __dxlog_file23,
-      L: 190,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6562,7 +6603,7 @@ var ServiceContext = class extends Resource5 {
     await this._edgeConnection?.close();
     log20("closed", void 0, {
       F: __dxlog_file23,
-      L: 205,
+      L: 232,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6571,7 +6612,7 @@ var ServiceContext = class extends Resource5 {
     const identity = await this.identityManager.createIdentity(params);
     await this._initialize(new Context9(void 0, {
       F: __dxlog_file23,
-      L: 210
+      L: 237
     }));
     return identity;
   }
@@ -6579,7 +6620,7 @@ var ServiceContext = class extends Resource5 {
     const factory = this._handlerFactories.get(invitation.kind);
     invariant17(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file23,
-      L: 216,
+      L: 243,
       S: this,
       A: [
         "factory",
@@ -6600,7 +6641,7 @@ var ServiceContext = class extends Resource5 {
     const identity = await this.identityManager.acceptIdentity(params);
     await this._initialize(new Context9(void 0, {
       F: __dxlog_file23,
-      L: 232
+      L: 259
     }));
     return identity;
   }
@@ -6614,7 +6655,7 @@ var ServiceContext = class extends Resource5 {
   async _initialize(ctx) {
     log20("initializing spaces...", void 0, {
       F: __dxlog_file23,
-      L: 247,
+      L: 274,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6643,13 +6684,14 @@ var ServiceContext = class extends Resource5 {
       edgeConnection: this._edgeConnection,
       echoEdgeReplicator: this._echoEdgeReplicator,
       meshReplicator: this._meshReplicator,
-      runtimeParams: this._runtimeParams
+      runtimeParams: this._runtimeParams,
+      edgeFeatures: this._edgeFeatures
     });
     await this.dataSpaceManager.open();
     this._handlerFactories.set(Invitation8.Kind.SPACE, (invitation) => {
       invariant17(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file23,
-        L: 275,
+        L: 303,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -6673,7 +6715,7 @@ var ServiceContext = class extends Resource5 {
             details: assertion
           }, {
             F: __dxlog_file23,
-            L: 291,
+            L: 319,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6684,7 +6726,7 @@ var ServiceContext = class extends Resource5 {
             details: assertion
           }, {
             F: __dxlog_file23,
-            L: 295,
+            L: 323,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6695,7 +6737,7 @@ var ServiceContext = class extends Resource5 {
             details: assertion
           }, {
             F: __dxlog_file23,
-            L: 300,
+            L: 328,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6706,7 +6748,7 @@ var ServiceContext = class extends Resource5 {
         } catch (err) {
           log20.catch(err, void 0, {
             F: __dxlog_file23,
-            L: 306,
+            L: 334,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6992,7 +7034,7 @@ import { EdgeClient } from "@dxos/edge-client";
 import { invariant as invariant20 } from "@dxos/invariant";
 import { PublicKey as PublicKey17 } from "@dxos/keys";
 import { log as log23 } from "@dxos/log";
-import { WebsocketSignalManager } from "@dxos/messaging";
+import { EdgeSignalManager, WebsocketSignalManager } from "@dxos/messaging";
 import { SwarmNetworkManager, createIceProvider, createSimplePeerTransportFactory } from "@dxos/network-manager";
 import { trace as trace10 } from "@dxos/protocols";
 import { SystemStatus } from "@dxos/protocols/proto/dxos/client/services";
@@ -7301,18 +7343,18 @@ var NetworkServiceImpl = class {
         next({
           swarm: this.networkManager.connectionState,
           connectionInfo: this.networkManager.connectionLog?.swarms,
-          signaling: this.signalManager.getStatus().map(({ host, state }) => ({
+          signaling: this.signalManager.getStatus?.().map(({ host, state }) => ({
             server: host,
             state
           }))
         });
       };
       const unsubscribeSwarm = this.networkManager.connectionStateChanged.on(() => update());
-      const unsubscribeSignal = this.signalManager.statusChanged.on(() => update());
+      const unsubscribeSignal = this.signalManager.statusChanged?.on(() => update());
       update();
       return () => {
         unsubscribeSwarm();
-        unsubscribeSignal();
+        unsubscribeSignal?.();
       };
     });
   }
@@ -7522,13 +7564,21 @@ var ClientServicesHost = class {
         C: (f, a) => f(...a)
       });
     }
+    const edgeEndpoint = config?.get("runtime.services.edge.url");
+    if (edgeEndpoint) {
+      this._edgeConnection = new EdgeClient(PublicKey17.random(), PublicKey17.random(), {
+        socketEndpoint: edgeEndpoint
+      });
+    }
     const { connectionLog = true, transportFactory = createSimplePeerTransportFactory({
       iceServers: this._config?.get("runtime.services.ice")
-    }, this._config?.get("runtime.services.iceProviders") && createIceProvider(this._config.get("runtime.services.iceProviders"))), signalManager = new WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
+    }, this._config?.get("runtime.services.iceProviders") && createIceProvider(this._config.get("runtime.services.iceProviders"))), signalManager = this._edgeConnection && this._config?.get("runtime.client.edgeFeatures")?.signaling ? new EdgeSignalManager({
+      edgeConnection: this._edgeConnection
+    }) : new WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
     invariant20(!this._networkManager, "network manager already set", {
       F: __dxlog_file26,
-      L: 223,
+      L: 233,
       S: this,
       A: [
         "!this._networkManager",
@@ -7536,19 +7586,17 @@ var ClientServicesHost = class {
       ]
     });
     this._networkManager = new SwarmNetworkManager({
-      log: connectionLog,
+      enableDevtoolsLogging: connectionLog,
       transportFactory,
-      signalManager
+      signalManager,
+      peerInfo: this._edgeConnection ? {
+        identityKey: this._edgeConnection.identityKey.toHex(),
+        peerKey: this._edgeConnection.deviceKey.toHex()
+      } : void 0
     });
-    const edgeEndpoint = config?.get("runtime.services.edge.url");
-    if (edgeEndpoint) {
-      this._edgeConnection = new EdgeClient(PublicKey17.random(), PublicKey17.random(), {
-        socketEndpoint: edgeEndpoint
-      });
-    }
     log23("initialized", void 0, {
       F: __dxlog_file26,
-      L: 238,
+      L: 246,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7562,13 +7610,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file26,
-      L: 249,
+      L: 257,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant20(this._config, "config not set", {
       F: __dxlog_file26,
-      L: 251,
+      L: 259,
       S: this,
       A: [
         "this._config",
@@ -7577,7 +7625,7 @@ var ClientServicesHost = class {
     });
     invariant20(this._storage, "storage not set", {
       F: __dxlog_file26,
-      L: 252,
+      L: 260,
       S: this,
       A: [
         "this._storage",
@@ -7586,7 +7634,7 @@ var ClientServicesHost = class {
     });
     invariant20(this._signalManager, "signal manager not set", {
       F: __dxlog_file26,
-      L: 253,
+      L: 261,
       S: this,
       A: [
         "this._signalManager",
@@ -7595,7 +7643,7 @@ var ClientServicesHost = class {
     });
     invariant20(this._networkManager, "network manager not set", {
       F: __dxlog_file26,
-      L: 254,
+      L: 262,
       S: this,
       A: [
         "this._networkManager",
@@ -7607,7 +7655,7 @@ var ClientServicesHost = class {
       lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file26,
-      L: 257,
+      L: 265,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7617,7 +7665,7 @@ var ClientServicesHost = class {
     }
     await this._level.open();
     await this._loggingService.open();
-    this._serviceContext = new ServiceContext(this._storage, this._level, this._networkManager, this._signalManager, this._edgeConnection, this._runtimeParams);
+    this._serviceContext = new ServiceContext(this._storage, this._level, this._networkManager, this._signalManager, this._edgeConnection, this._runtimeParams, this._config.get("runtime.client.edgeFeatures"));
     const dataSpaceManagerProvider = async () => {
       await this._serviceContext.initialized.wait();
       return this._serviceContext.dataSpaceManager;
@@ -7663,7 +7711,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file26,
-      L: 344,
+      L: 353,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7671,7 +7719,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file26,
-      L: 345,
+      L: 354,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7685,7 +7733,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file26,
-      L: 356,
+      L: 365,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7703,7 +7751,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file26,
-      L: 365,
+      L: 374,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7714,13 +7762,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file26,
-      L: 370,
+      L: 379,
       S: this,
       C: (f, a) => f(...a)
     });
     log23.info("resetting...", void 0, {
       F: __dxlog_file26,
-      L: 372,
+      L: 381,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7728,7 +7776,7 @@ var ClientServicesHost = class {
     await this._storage.reset();
     log23.info("reset", void 0, {
       F: __dxlog_file26,
-      L: 375,
+      L: 384,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7736,7 +7784,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file26,
-      L: 376,
+      L: 385,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7810,4 +7858,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-I6MMWGWX.mjs.map
+//# sourceMappingURL=chunk-RZ5JISVH.mjs.map