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

package/dist/lib/node/{chunk-PAH5HN65.cjs → chunk-3A3QU6K5.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_PAH5HN65_exports = {};
-__export(chunk_PAH5HN65_exports, {
+var chunk_3A3QU6K5_exports = {};
+__export(chunk_3A3QU6K5_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -70,7 +70,7 @@ __export(chunk_PAH5HN65_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_PAH5HN65_exports);
+module.exports = __toCommonJS(chunk_3A3QU6K5_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -413,7 +413,7 @@ var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src
 var subscribeToNetworkStatus = ({ signalManager }) => new import_codec_protobuf2.Stream(({ next, close }) => {
   const update = () => {
     try {
-      const status = signalManager.getStatus();
+      const status = signalManager.getStatus?.();
       next({
         servers: status
       });
@@ -421,7 +421,7 @@ var subscribeToNetworkStatus = ({ signalManager }) => new import_codec_protobuf2
       close(err);
     }
   };
-  signalManager.statusChanged.on(() => update());
+  signalManager.statusChanged?.on(() => update());
   update();
 });
 var subscribeToSignal = ({ signalManager }) => new import_codec_protobuf2.Stream(({ next }) => {
@@ -432,8 +432,8 @@ var subscribeToSignal = ({ signalManager }) => new import_codec_protobuf2.Stream
   signalManager.onMessage.on(ctx, (message) => {
     next({
       message: {
-        author: message.author.asUint8Array(),
-        recipient: message.recipient.asUint8Array(),
+        author: import_keys2.PublicKey.from(message.author.peerKey).asUint8Array(),
+        recipient: import_keys2.PublicKey.from(message.recipient.peerKey).asUint8Array(),
         payload: message.payload
       },
       receivedAt: /* @__PURE__ */ new Date()
@@ -441,7 +441,16 @@ var subscribeToSignal = ({ signalManager }) => new import_codec_protobuf2.Stream
   });
   signalManager.swarmEvent.on(ctx, (swarmEvent) => {
     next({
-      swarmEvent: swarmEvent.swarmEvent,
+      swarmEvent: swarmEvent.peerAvailable ? {
+        peerAvailable: {
+          peer: import_keys2.PublicKey.from(swarmEvent.peerAvailable.peer.peerKey).asUint8Array(),
+          since: swarmEvent.peerAvailable.since
+        }
+      } : {
+        peerLeft: {
+          peer: import_keys2.PublicKey.from(swarmEvent.peerLeft.peer.peerKey).asUint8Array()
+        }
+      },
       topic: swarmEvent.topic.asUint8Array(),
       receivedAt: /* @__PURE__ */ new Date()
     });
@@ -656,7 +665,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.6.8-main.3be982f";
+var DXOS_VERSION = "0.6.8-staging.77f93a3";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -1213,11 +1222,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 import_async7.Event();
     const { devicePresenceAnnounceInterval = DEVICE_PRESENCE_ANNOUNCE_INTERVAL, devicePresenceOfflineTimeout = DEVICE_PRESENCE_OFFLINE_TIMEOUT } = params ?? {};
     this._devicePresenceAnnounceInterval = devicePresenceAnnounceInterval;
@@ -1232,7 +1242,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file6,
-      L: 104,
+      L: 107,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1241,7 +1251,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file6,
-      L: 107,
+      L: 110,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1254,7 +1264,7 @@ var IdentityManager = class {
         displayName: this._identity.profileDocument?.displayName
       }, {
         F: __dxlog_file6,
-        L: 112,
+        L: 115,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1264,7 +1274,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file6,
-      L: 119,
+      L: 122,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1272,13 +1282,13 @@ var IdentityManager = class {
   async close() {
     await this._identity?.close(new import_context3.Context(void 0, {
       F: __dxlog_file6,
-      L: 123
+      L: 126
     }));
   }
   async createIdentity({ displayName, deviceProfile } = {}) {
     (0, import_invariant3.invariant)(!this._identity, "Identity already exists.", {
       F: __dxlog_file6,
-      L: 128,
+      L: 131,
       S: this,
       A: [
         "!this._identity",
@@ -1287,7 +1297,7 @@ var IdentityManager = class {
     });
     (0, import_log4.log)("creating identity...", void 0, {
       F: __dxlog_file6,
-      L: 129,
+      L: 132,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1305,13 +1315,13 @@ var IdentityManager = class {
     const identity = await this._constructIdentity(identityRecord);
     await identity.open(new import_context3.Context(void 0, {
       F: __dxlog_file6,
-      L: 144
+      L: 147
     }));
     {
       const generator = new import_credentials6.CredentialGenerator(this._keyring, identityRecord.identityKey, identityRecord.deviceKey);
       (0, import_invariant3.invariant)(identityRecord.haloSpace.genesisFeedKey, "Genesis feed key is required.", {
         F: __dxlog_file6,
-        L: 148,
+        L: 151,
         S: this,
         A: [
           "identityRecord.haloSpace.genesisFeedKey",
@@ -1320,7 +1330,7 @@ var IdentityManager = class {
       });
       (0, import_invariant3.invariant)(identityRecord.haloSpace.dataFeedKey, "Data feed key is required.", {
         F: __dxlog_file6,
-        L: 149,
+        L: 152,
         S: this,
         A: [
           "identityRecord.haloSpace.dataFeedKey",
@@ -1359,7 +1369,7 @@ var IdentityManager = class {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file6,
-      L: 191,
+      L: 194,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1370,7 +1380,7 @@ var IdentityManager = class {
       profile: identity.profileDocument
     }, {
       F: __dxlog_file6,
-      L: 197,
+      L: 200,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1407,13 +1417,13 @@ var IdentityManager = class {
       params
     }, {
       F: __dxlog_file6,
-      L: 235,
+      L: 238,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant3.invariant)(!this._identity, "Identity already exists.", {
       F: __dxlog_file6,
-      L: 236,
+      L: 239,
       S: this,
       A: [
         "!this._identity",
@@ -1434,7 +1444,7 @@ var IdentityManager = class {
     const identity = await this._constructIdentity(identityRecord);
     await identity.open(new import_context3.Context(void 0, {
       F: __dxlog_file6,
-      L: 251
+      L: 254
     }));
     this._identity = identity;
     await this._metadataStore.setIdentityRecord(identityRecord);
@@ -1444,7 +1454,7 @@ var IdentityManager = class {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file6,
-      L: 255,
+      L: 258,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1458,7 +1468,7 @@ var IdentityManager = class {
       deviceKey: identity.deviceKey
     }, {
       F: __dxlog_file6,
-      L: 265,
+      L: 268,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1470,7 +1480,7 @@ var IdentityManager = class {
   async updateProfile(profile) {
     (0, import_invariant3.invariant)(this._identity, "Identity not initialized.", {
       F: __dxlog_file6,
-      L: 273,
+      L: 276,
       S: this,
       A: [
         "this._identity",
@@ -1501,7 +1511,7 @@ var IdentityManager = class {
   async updateDeviceProfile(profile) {
     (0, import_invariant3.invariant)(this._identity, "Identity not initialized.", {
       F: __dxlog_file6,
-      L: 290,
+      L: 293,
       S: this,
       A: [
         "this._identity",
@@ -1537,7 +1547,7 @@ var IdentityManager = class {
   async _constructIdentity(identityRecord) {
     (0, import_invariant3.invariant)(!this._identity, void 0, {
       F: __dxlog_file6,
-      L: 316,
+      L: 319,
       S: this,
       A: [
         "!this._identity",
@@ -1548,7 +1558,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file6,
-      L: 317,
+      L: 320,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1563,7 +1573,7 @@ var IdentityManager = class {
     });
     (0, import_invariant3.invariant)(identityRecord.haloSpace.controlFeedKey, void 0, {
       F: __dxlog_file6,
-      L: 330,
+      L: 333,
       S: this,
       A: [
         "identityRecord.haloSpace.controlFeedKey",
@@ -1575,7 +1585,7 @@ var IdentityManager = class {
     });
     (0, import_invariant3.invariant)(identityRecord.haloSpace.dataFeedKey, void 0, {
       F: __dxlog_file6,
-      L: 334,
+      L: 337,
       S: this,
       A: [
         "identityRecord.haloSpace.dataFeedKey",
@@ -1589,6 +1599,7 @@ var IdentityManager = class {
     const space = await this._constructSpace({
       spaceRecord: identityRecord.haloSpace,
       swarmIdentity: {
+        identityKey: identityRecord.identityKey,
         peerKey: identityRecord.deviceKey,
         credentialProvider: createAuthProvider((0, import_credentials6.createCredentialSignerWithKey)(this._keyring, identityRecord.deviceKey)),
         credentialAuthenticator: (0, import_util4.deferFunction)(() => identity.authVerifier.verifier)
@@ -1609,10 +1620,11 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey
     }, {
       F: __dxlog_file6,
-      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);
     }
@@ -1634,7 +1646,7 @@ var IdentityManager = class {
       onAuthFailure: () => {
         import_log4.log.warn("auth failure", void 0, {
           F: __dxlog_file6,
-          L: 385,
+          L: 390,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2890,7 +2902,6 @@ var InvitationsHandler = class {
     }
     const swarmConnection = await this._networkManager.joinSwarm({
       topic: invitation.swarmKey,
-      peerId: import_keys6.PublicKey.random(),
       protocolProvider: (0, import_network_manager.createTeleportProtocolFactory)(async (teleport) => {
         teleport.addExtension("dxos.halo.invitations", extensionFactory());
       }, this._defaultTeleportParams),
@@ -2967,7 +2978,7 @@ var InvitationsHandler = class {
         oldState: stateToString(invitation.state)
       }, {
         F: __dxlog_file12,
-        L: 461,
+        L: 460,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2978,7 +2989,7 @@ var InvitationsHandler = class {
         oldState: stateToString(invitation.state)
       }, {
         F: __dxlog_file12,
-        L: 467,
+        L: 466,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2997,7 +3008,7 @@ var InvitationsHandler = class {
     for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
       (0, import_log6.log)("guest waiting for authentication code...", void 0, {
         F: __dxlog_file12,
-        L: 492,
+        L: 491,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3005,7 +3016,7 @@ var InvitationsHandler = class {
       const authCode = await authenticated.wait(options);
       (0, import_log6.log)("sending authentication request", void 0, {
         F: __dxlog_file12,
-        L: 496,
+        L: 495,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3024,7 +3035,7 @@ var InvitationsHandler = class {
             attempt
           }, {
             F: __dxlog_file12,
-            L: 507,
+            L: 506,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3042,7 +3053,7 @@ var InvitationsHandler = class {
     }
     (0, import_log6.log)("sending authentication request", void 0, {
       F: __dxlog_file12,
-      L: 526,
+      L: 525,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4793,7 +4804,7 @@ var DataSpace = class {
   constructor(params) {
     this._ctx = new import_context11.Context(void 0, {
       F: __dxlog_file19,
-      L: 87
+      L: 89
     });
     this._notarizationPlugin = new NotarizationPlugin();
     this._cache = void 0;
@@ -4826,7 +4837,7 @@ var DataSpace = class {
       authTimeout: import_client_protocol5.AUTH_TIMEOUT
     });
     this._cache = params.cache;
-    if (params.edgeConnection) {
+    if (params.edgeConnection && params.edgeFeatures?.feedReplicator) {
       this._edgeFeedReplicator = new EdgeFeedReplicator({
         messenger: params.edgeConnection,
         spaceId: this.id
@@ -4837,7 +4848,7 @@ var DataSpace = class {
       state: import_services13.SpaceState[this._state]
     }, {
       F: __dxlog_file19,
-      L: 157,
+      L: 159,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4896,7 +4907,7 @@ var DataSpace = class {
     }
     await this._inner.open(new import_context11.Context(void 0, {
       F: __dxlog_file19,
-      L: 231
+      L: 233
     }));
     await this._edgeFeedReplicator?.open();
     this._state = import_services13.SpaceState.SPACE_CONTROL_ONLY;
@@ -4904,7 +4915,7 @@ var DataSpace = class {
       state: import_services13.SpaceState[this._state]
     }, {
       F: __dxlog_file19,
-      L: 236,
+      L: 238,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4924,14 +4935,14 @@ var DataSpace = class {
       state: import_services13.SpaceState[this._state]
     }, {
       F: __dxlog_file19,
-      L: 255,
+      L: 257,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._ctx.dispose();
     this._ctx = new import_context11.Context(void 0, {
       F: __dxlog_file19,
-      L: 257
+      L: 259
     });
     if (this._edgeFeedReplicator) {
       this.inner.protocol.feedAdded.remove(this._onFeedAdded);
@@ -4964,7 +4975,7 @@ var DataSpace = class {
         if (err instanceof import_protocols10.CancelledError || err instanceof import_context11.ContextDisposedError) {
           (0, import_log14.log)("data pipeline initialization cancelled", err, {
             F: __dxlog_file19,
-            L: 295,
+            L: 297,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4972,7 +4983,7 @@ var DataSpace = class {
         }
         import_log14.log.error("Error initializing data pipeline", err, {
           F: __dxlog_file19,
-          L: 299,
+          L: 301,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4981,7 +4992,7 @@ var DataSpace = class {
           state: import_services13.SpaceState[this._state]
         }, {
           F: __dxlog_file19,
-          L: 301,
+          L: 303,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5001,7 +5012,7 @@ var DataSpace = class {
       state: import_services13.SpaceState[this._state]
     }, {
       F: __dxlog_file19,
-      L: 317,
+      L: 319,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5018,7 +5029,7 @@ var DataSpace = class {
       state: import_services13.SpaceState[this._state]
     }, {
       F: __dxlog_file19,
-      L: 336,
+      L: 338,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5034,7 +5045,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     (0, import_log14.log)("writable feeds created", void 0, {
       F: __dxlog_file19,
-      L: 352,
+      L: 354,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5097,7 +5108,7 @@ var DataSpace = class {
       rootUrl
     }, {
       F: __dxlog_file19,
-      L: 418,
+      L: 420,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5149,7 +5160,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file19,
-          L: 461,
+          L: 463,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5239,7 +5250,7 @@ var DataSpace = class {
       state: import_services13.SpaceState[this._state]
     }, {
       F: __dxlog_file19,
-      L: 543,
+      L: 545,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5379,6 +5390,7 @@ var DataSpaceManager = class extends import_context14.Resource {
     this._spaces = new import_util11.ComplexMap(import_keys13.PublicKey.hash);
     this._instanceId = import_keys13.PublicKey.random().toHex();
     this._edgeConnection = void 0;
+    this._edgeFeatures = void 0;
     this._meshReplicator = void 0;
     this._echoEdgeReplicator = void 0;
     this._runtimeParams = void 0;
@@ -5391,6 +5403,7 @@ var DataSpaceManager = class extends import_context14.Resource {
     this._meshReplicator = params.meshReplicator;
     this._invitationsManager = params.invitationsManager;
     this._edgeConnection = params.edgeConnection;
+    this._edgeFeatures = params.edgeFeatures;
     this._echoEdgeReplicator = params.echoEdgeReplicator;
     this._runtimeParams = params.runtimeParams;
     import_tracing8.trace.diagnostic({
@@ -5423,7 +5436,7 @@ var DataSpaceManager = class extends import_context14.Resource {
   async _open() {
     (0, import_log17.log)("open", void 0, {
       F: __dxlog_file20,
-      L: 187,
+      L: 192,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5431,7 +5444,7 @@ var DataSpaceManager = class extends import_context14.Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file20,
-      L: 188,
+      L: 193,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5439,7 +5452,7 @@ var DataSpaceManager = class extends import_context14.Resource {
       spaces: this._metadataStore.spaces.length
     }, {
       F: __dxlog_file20,
-      L: 189,
+      L: 194,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5449,7 +5462,7 @@ var DataSpaceManager = class extends import_context14.Resource {
           spaceMetadata
         }, {
           F: __dxlog_file20,
-          L: 193,
+          L: 198,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5460,7 +5473,7 @@ var DataSpaceManager = class extends import_context14.Resource {
           err
         }, {
           F: __dxlog_file20,
-          L: 196,
+          L: 201,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5471,7 +5484,7 @@ var DataSpaceManager = class extends import_context14.Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file20,
-      L: 202,
+      L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5479,7 +5492,7 @@ var DataSpaceManager = class extends import_context14.Resource {
   async _close() {
     (0, import_log17.log)("close", void 0, {
       F: __dxlog_file20,
-      L: 207,
+      L: 212,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5494,7 +5507,7 @@ var DataSpaceManager = class extends import_context14.Resource {
   async createSpace() {
     (0, import_invariant17.invariant)(this._lifecycleState === import_context14.LifecycleState.OPEN, "Not open.", {
       F: __dxlog_file20,
-      L: 219,
+      L: 224,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -5515,7 +5528,7 @@ var DataSpaceManager = class extends import_context14.Resource {
       spaceKey
     }, {
       F: __dxlog_file20,
-      L: 231,
+      L: 236,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5527,7 +5540,7 @@ var DataSpaceManager = class extends import_context14.Resource {
     const memberCredential = credentials[1];
     (0, import_invariant17.invariant)((0, import_credentials15.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file20,
-      L: 241,
+      L: 246,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -5559,7 +5572,7 @@ var DataSpaceManager = class extends import_context14.Resource {
           spaceId: space.id
         }, {
           F: __dxlog_file20,
-          L: 266,
+          L: 271,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5594,7 +5607,7 @@ var DataSpaceManager = class extends import_context14.Resource {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     (0, import_invariant17.invariant)(automergeIndex, void 0, {
       F: __dxlog_file20,
-      L: 299,
+      L: 304,
       S: this,
       A: [
         "automergeIndex",
@@ -5611,13 +5624,13 @@ var DataSpaceManager = class extends import_context14.Resource {
       opts
     }, {
       F: __dxlog_file20,
-      L: 308,
+      L: 313,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant17.invariant)(this._lifecycleState === import_context14.LifecycleState.OPEN, "Not open.", {
       F: __dxlog_file20,
-      L: 309,
+      L: 314,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -5626,7 +5639,7 @@ var DataSpaceManager = class extends import_context14.Resource {
     });
     (0, import_invariant17.invariant)(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file20,
-      L: 310,
+      L: 315,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -5650,7 +5663,7 @@ var DataSpaceManager = class extends import_context14.Resource {
     const space = this._spaceManager.spaces.get(options.spaceKey);
     (0, import_invariant17.invariant)(space, void 0, {
       F: __dxlog_file20,
-      L: 330,
+      L: 335,
       S: this,
       A: [
         "space",
@@ -5663,7 +5676,7 @@ var DataSpaceManager = class extends import_context14.Resource {
     const credentials = await (0, import_credentials15.createAdmissionCredentials)(this._signingContext.credentialSigner, options.identityKey, space.key, space.genesisFeedKey, options.role, space.spaceState.membershipChainHeads, options.profile, options.delegationCredentialId);
     (0, import_invariant17.invariant)(credentials[0].credential, void 0, {
       F: __dxlog_file20,
-      L: 349,
+      L: 354,
       S: this,
       A: [
         "credentials[0].credential",
@@ -5673,7 +5686,7 @@ var DataSpaceManager = class extends import_context14.Resource {
     const spaceMemberCredential = credentials[0].credential.credential;
     (0, import_invariant17.invariant)((0, import_credentials15.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file20,
-      L: 351,
+      L: 356,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -5700,6 +5713,7 @@ var DataSpaceManager = class extends import_context14.Resource {
       identityKey: this._signingContext.identityKey,
       timeout: 15e3,
       swarmIdentity: {
+        identityKey: this._signingContext.identityKey,
         peerKey: this._signingContext.deviceKey,
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
         credentialAuthenticator: async () => true
@@ -5711,7 +5725,7 @@ var DataSpaceManager = class extends import_context14.Resource {
       metadata
     }, {
       F: __dxlog_file20,
-      L: 386,
+      L: 392,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5734,6 +5748,7 @@ var DataSpaceManager = class extends import_context14.Resource {
     const space = await this._spaceManager.constructSpace({
       metadata,
       swarmIdentity: {
+        identityKey: this._signingContext.identityKey,
         peerKey: this._signingContext.deviceKey,
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
         credentialAuthenticator: (0, import_util11.deferFunction)(() => dataSpace.authVerifier.verifier)
@@ -5754,7 +5769,7 @@ var DataSpaceManager = class extends import_context14.Resource {
             err
           }, {
             F: __dxlog_file20,
-            L: 427,
+            L: 434,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5764,7 +5779,7 @@ var DataSpaceManager = class extends import_context14.Resource {
       onAuthFailure: () => {
         import_log17.log.warn("auth failure", void 0, {
           F: __dxlog_file20,
-          L: 432,
+          L: 439,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5797,7 +5812,7 @@ var DataSpaceManager = class extends import_context14.Resource {
             space: space.key
           }, {
             F: __dxlog_file20,
-            L: 459,
+            L: 466,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5808,7 +5823,7 @@ var DataSpaceManager = class extends import_context14.Resource {
             open: this._lifecycleState === import_context14.LifecycleState.OPEN
           }, {
             F: __dxlog_file20,
-            L: 462,
+            L: 469,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5827,14 +5842,15 @@ var DataSpaceManager = class extends import_context14.Resource {
             space: space.key
           }, {
             F: __dxlog_file20,
-            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);
@@ -5860,7 +5876,7 @@ var DataSpaceManager = class extends import_context14.Resource {
         space: space.key
       }, {
         F: __dxlog_file20,
-        L: 500,
+        L: 508,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5893,7 +5909,7 @@ var DataSpaceManager = class extends import_context14.Resource {
       closedSessions
     }, {
       F: __dxlog_file20,
-      L: 526,
+      L: 534,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5908,7 +5924,7 @@ var DataSpaceManager = class extends import_context14.Resource {
           peerId: peerState.peerId
         }, {
           F: __dxlog_file20,
-          L: 540,
+          L: 548,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -6307,7 +6323,7 @@ function _ts_decorate7(decorators, target, key, desc) {
 }
 var __dxlog_file22 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
 var ServiceContext = class extends import_context15.Resource {
-  constructor(storage, level, networkManager, signalManager, _edgeConnection, _runtimeParams) {
+  constructor(storage, level, networkManager, signalManager, _edgeConnection, _runtimeParams, _edgeFeatures) {
     super();
     this.storage = storage;
     this.level = level;
@@ -6315,6 +6331,7 @@ var ServiceContext = class extends import_context15.Resource {
     this.signalManager = signalManager;
     this._edgeConnection = _edgeConnection;
     this._runtimeParams = _runtimeParams;
+    this._edgeFeatures = _edgeFeatures;
     this.initialized = new import_async19.Trigger();
     this._meshReplicator = void 0;
     this._echoEdgeReplicator = void 0;
@@ -6340,17 +6357,41 @@ var ServiceContext = class extends import_context15.Resource {
       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) {
+          import_log19.log.info("Setting identity on edge connection", {
+            identity: identity.identityKey.toHex(),
+            oldIdentity: this._edgeConnection.identityKey.toHex(),
+            swarms: this.networkManager.topics
+          }, {
+            F: __dxlog_file22,
+            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 import_echo_db3.EchoHost({
       kv: this.level
     });
+    this._meshReplicator = new import_echo_pipeline4.MeshEchoReplicator();
     this.invitations = new InvitationsHandler(this.networkManager, _runtimeParams?.invitationConnectionDefaultParams);
     this.invitationsManager = new InvitationsManager(this.invitations, (invitation) => this.getInvitationHandler(invitation), this.metadataStore);
     this._handlerFactories.set(import_services17.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? (0, import_debug6.failUndefined)(), this._acceptIdentity.bind(this)));
     if (!this._runtimeParams?.disableP2pReplication) {
       this._meshReplicator = new import_echo_pipeline4.MeshEchoReplicator();
     }
-    if (this._edgeConnection) {
+    if (this._edgeConnection && this._edgeFeatures?.echoReplicator) {
       this._echoEdgeReplicator = new import_echo_db3.EchoEdgeReplicator({
         edgeConnection: this._edgeConnection
       });
@@ -6360,7 +6401,7 @@ var ServiceContext = class extends import_context15.Resource {
     await this._checkStorageVersion();
     (0, import_log19.log)("opening...", void 0, {
       F: __dxlog_file22,
-      L: 160,
+      L: 186,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6368,13 +6409,13 @@ var ServiceContext = class extends import_context15.Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file22,
-      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);
@@ -6393,7 +6434,7 @@ var ServiceContext = class extends import_context15.Resource {
       count: loadedInvitations.invitations?.length
     }, {
       F: __dxlog_file22,
-      L: 183,
+      L: 210,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6401,13 +6442,13 @@ var ServiceContext = class extends import_context15.Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file22,
-      L: 185,
+      L: 212,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log19.log)("opened", void 0, {
       F: __dxlog_file22,
-      L: 186,
+      L: 213,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6415,7 +6456,7 @@ var ServiceContext = class extends import_context15.Resource {
   async _close(ctx) {
     (0, import_log19.log)("closing...", void 0, {
       F: __dxlog_file22,
-      L: 190,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6433,7 +6474,7 @@ var ServiceContext = class extends import_context15.Resource {
     await this._edgeConnection?.close();
     (0, import_log19.log)("closed", void 0, {
       F: __dxlog_file22,
-      L: 205,
+      L: 232,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6442,7 +6483,7 @@ var ServiceContext = class extends import_context15.Resource {
     const identity = await this.identityManager.createIdentity(params);
     await this._initialize(new import_context15.Context(void 0, {
       F: __dxlog_file22,
-      L: 210
+      L: 237
     }));
     return identity;
   }
@@ -6450,7 +6491,7 @@ var ServiceContext = class extends import_context15.Resource {
     const factory = this._handlerFactories.get(invitation.kind);
     (0, import_invariant19.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file22,
-      L: 216,
+      L: 243,
       S: this,
       A: [
         "factory",
@@ -6471,7 +6512,7 @@ var ServiceContext = class extends import_context15.Resource {
     const identity = await this.identityManager.acceptIdentity(params);
     await this._initialize(new import_context15.Context(void 0, {
       F: __dxlog_file22,
-      L: 232
+      L: 259
     }));
     return identity;
   }
@@ -6485,7 +6526,7 @@ var ServiceContext = class extends import_context15.Resource {
   async _initialize(ctx) {
     (0, import_log19.log)("initializing spaces...", void 0, {
       F: __dxlog_file22,
-      L: 247,
+      L: 274,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6514,13 +6555,14 @@ var ServiceContext = class extends import_context15.Resource {
       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(import_services17.Invitation.Kind.SPACE, (invitation) => {
       (0, import_invariant19.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file22,
-        L: 275,
+        L: 303,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -6544,7 +6586,7 @@ var ServiceContext = class extends import_context15.Resource {
             details: assertion
           }, {
             F: __dxlog_file22,
-            L: 291,
+            L: 319,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6555,7 +6597,7 @@ var ServiceContext = class extends import_context15.Resource {
             details: assertion
           }, {
             F: __dxlog_file22,
-            L: 295,
+            L: 323,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6566,7 +6608,7 @@ var ServiceContext = class extends import_context15.Resource {
             details: assertion
           }, {
             F: __dxlog_file22,
-            L: 300,
+            L: 328,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6577,7 +6619,7 @@ var ServiceContext = class extends import_context15.Resource {
         } catch (err) {
           import_log19.log.catch(err, void 0, {
             F: __dxlog_file22,
-            L: 306,
+            L: 334,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7108,18 +7150,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?.();
       };
     });
   }
@@ -7322,13 +7364,21 @@ var ClientServicesHost = class {
         C: (f, a) => f(...a)
       });
     }
+    const edgeEndpoint = config?.get("runtime.services.edge.url");
+    if (edgeEndpoint) {
+      this._edgeConnection = new import_edge_client.EdgeClient(import_keys16.PublicKey.random(), import_keys16.PublicKey.random(), {
+        socketEndpoint: edgeEndpoint
+      });
+    }
     const { connectionLog = true, transportFactory = (0, import_network_manager2.createSimplePeerTransportFactory)({
       iceServers: this._config?.get("runtime.services.ice")
-    }, this._config?.get("runtime.services.iceProviders") && (0, import_network_manager2.createIceProvider)(this._config.get("runtime.services.iceProviders"))), signalManager = new import_messaging.WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
+    }, this._config?.get("runtime.services.iceProviders") && (0, import_network_manager2.createIceProvider)(this._config.get("runtime.services.iceProviders"))), signalManager = this._edgeConnection && this._config?.get("runtime.client.edgeFeatures")?.signaling ? new import_messaging.EdgeSignalManager({
+      edgeConnection: this._edgeConnection
+    }) : new import_messaging.WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
     (0, import_invariant21.invariant)(!this._networkManager, "network manager already set", {
       F: __dxlog_file25,
-      L: 223,
+      L: 233,
       S: this,
       A: [
         "!this._networkManager",
@@ -7336,19 +7386,17 @@ var ClientServicesHost = class {
       ]
     });
     this._networkManager = new import_network_manager2.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 import_edge_client.EdgeClient(import_keys16.PublicKey.random(), import_keys16.PublicKey.random(), {
-        socketEndpoint: edgeEndpoint
-      });
-    }
     (0, import_log21.log)("initialized", void 0, {
       F: __dxlog_file25,
-      L: 238,
+      L: 246,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7362,13 +7410,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file25,
-      L: 249,
+      L: 257,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant21.invariant)(this._config, "config not set", {
       F: __dxlog_file25,
-      L: 251,
+      L: 259,
       S: this,
       A: [
         "this._config",
@@ -7377,7 +7425,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant21.invariant)(this._storage, "storage not set", {
       F: __dxlog_file25,
-      L: 252,
+      L: 260,
       S: this,
       A: [
         "this._storage",
@@ -7386,7 +7434,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant21.invariant)(this._signalManager, "signal manager not set", {
       F: __dxlog_file25,
-      L: 253,
+      L: 261,
       S: this,
       A: [
         "this._signalManager",
@@ -7395,7 +7443,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant21.invariant)(this._networkManager, "network manager not set", {
       F: __dxlog_file25,
-      L: 254,
+      L: 262,
       S: this,
       A: [
         "this._networkManager",
@@ -7407,7 +7455,7 @@ var ClientServicesHost = class {
       lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file25,
-      L: 257,
+      L: 265,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7417,7 +7465,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;
@@ -7463,7 +7511,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file25,
-      L: 344,
+      L: 353,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7471,7 +7519,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file25,
-      L: 345,
+      L: 354,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7485,7 +7533,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file25,
-      L: 356,
+      L: 365,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7503,7 +7551,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file25,
-      L: 365,
+      L: 374,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7514,13 +7562,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file25,
-      L: 370,
+      L: 379,
       S: this,
       C: (f, a) => f(...a)
     });
     import_log21.log.info("resetting...", void 0, {
       F: __dxlog_file25,
-      L: 372,
+      L: 381,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7528,7 +7576,7 @@ var ClientServicesHost = class {
     await this._storage.reset();
     import_log21.log.info("reset", void 0, {
       F: __dxlog_file25,
-      L: 375,
+      L: 384,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7536,7 +7584,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file25,
-      L: 376,
+      L: 385,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7609,4 +7657,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-PAH5HN65.cjs.map
+//# sourceMappingURL=chunk-3A3QU6K5.cjs.map