@dxos/client-services 0.1.56-main.c19b7cd → 0.1.56-main.c277f68

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

@@ -64,13 +64,14 @@ var import_rpc = require("@dxos/rpc");
 var import_codec_protobuf2 = require("@dxos/codec-protobuf");
 var import_credentials2 = require("@dxos/credentials");
 var import_document_model = require("@dxos/document-model");
+var import_echo_db = require("@dxos/echo-db");
 var import_invariant = require("@dxos/invariant");
 var import_log = require("@dxos/log");
 var import_protocols = require("@dxos/protocols");
 var import_services = require("@dxos/protocols/proto/dxos/client/services");
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.1.56-main.c19b7cd";
+var DXOS_VERSION = "0.1.56-main.c277f68";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 var getPlatform = () => {
@@ -104,9 +105,8 @@ var getPlatform = () => {
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
 var DEFAULT_TIMEOUT = 1e3;
 var createDiagnostics = async (clientServices, serviceContext, config) => {
-  var _a, _b, _c;
   const diagnostics = {
-    created: new Date().toISOString(),
+    created: (/* @__PURE__ */ new Date()).toISOString(),
     platform: getPlatform(),
     client: {
       version: DXOS_VERSION,
@@ -118,7 +118,7 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
   {
     (0, import_invariant.invariant)(clientServices.LoggingService, "SystemService is not available.", {
       F: __dxlog_file,
-      L: 87,
+      L: 88,
       S: void 0,
       A: [
         "clientServices.LoggingService",
@@ -136,16 +136,16 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
       spaceKey: identity.space.key,
       profile: identity.profileDocument
     };
-    const { devices } = (_a = await (0, import_codec_protobuf2.getFirstStreamValue)(clientServices.DevicesService.queryDevices(), {
+    const { devices } = await (0, import_codec_protobuf2.getFirstStreamValue)(clientServices.DevicesService.queryDevices(), {
       timeout: DEFAULT_TIMEOUT
-    }).catch(() => void 0)) != null ? _a : {};
+    }).catch(() => void 0) ?? {};
     diagnostics.devices = devices;
     if (serviceContext.dataSpaceManager) {
-      diagnostics.spaces = await Promise.all((_b = Array.from(serviceContext.dataSpaceManager.spaces.values()).map((space) => getSpaceStats(space))) != null ? _b : []);
+      diagnostics.spaces = await Promise.all(Array.from(serviceContext.dataSpaceManager.spaces.values()).map((space) => getSpaceStats(space)) ?? []);
     }
-    const { feeds = [] } = (_c = await (0, import_codec_protobuf2.getFirstStreamValue)(clientServices.DevtoolsHost.subscribeToFeeds({}), {
+    const { feeds = [] } = await (0, import_codec_protobuf2.getFirstStreamValue)(clientServices.DevtoolsHost.subscribeToFeeds({}), {
       timeout: DEFAULT_TIMEOUT
-    }).catch(() => void 0)) != null ? _c : {};
+    }).catch(() => void 0) ?? {};
     diagnostics.feeds = feeds.map(({ feedKey, bytes, length }) => ({
       feedKey,
       bytes,
@@ -158,16 +158,13 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
 var getProperties = (space) => {
   let properties = {};
   try {
-    const propertiesItem = space.dataPipeline.itemManager.items.find((item) => {
-      var _a, _b;
-      return ((_a = item.modelMeta) == null ? void 0 : _a.type) === import_document_model.DocumentModel.meta.type && ((_b = item.state) == null ? void 0 : _b.type) === "dxos.sdk.client.Properties";
-    });
-    const state = propertiesItem == null ? void 0 : propertiesItem.state;
-    properties = state == null ? void 0 : state.data;
+    const propertiesItem = space.dataPipeline.itemManager.items.find((item) => item.modelMeta?.type === import_document_model.DocumentModel.meta.type && item.state?.type === import_echo_db.TYPE_PROPERTIES);
+    const state = propertiesItem?.state;
+    properties = state?.data;
   } catch (err) {
     import_log.log.warn(err.message, void 0, {
       F: __dxlog_file,
-      L: 144,
+      L: 145,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -175,7 +172,6 @@ var getProperties = (space) => {
   return properties;
 };
 var getSpaceStats = async (space) => {
-  var _a, _b, _c, _d, _e, _f;
   const stats = {
     key: space.key,
     metrics: space.metrics,
@@ -183,18 +179,15 @@ var getSpaceStats = async (space) => {
       ...credential.subject.assertion,
       id: credential.id
     })),
-    members: Array.from(space.inner.spaceState.members.values()).map((member) => {
-      var _a2;
-      return {
-        identity: {
-          identityKey: member.key,
-          profile: {
-            displayName: (_a2 = member.assertion.profile) == null ? void 0 : _a2.displayName
-          }
-        },
-        presence: space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? import_services.SpaceMember.PresenceState.ONLINE : import_services.SpaceMember.PresenceState.OFFLINE
-      };
-    }),
+    members: Array.from(space.inner.spaceState.members.values()).map((member) => ({
+      identity: {
+        identityKey: member.key,
+        profile: {
+          displayName: member.assertion.profile?.displayName
+        }
+      },
+      presence: space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? import_services.SpaceMember.PresenceState.ONLINE : import_services.SpaceMember.PresenceState.OFFLINE
+    })),
     pipeline: {
       // TODO(burdon): Pick properties from credentials if needed.
       // currentEpoch: space.dataPipeline.currentEpoch,
@@ -204,11 +197,11 @@ var getSpaceStats = async (space) => {
       targetControlTimeframe: space.inner.controlPipeline.state.targetTimeframe,
       totalControlTimeframe: space.inner.controlPipeline.state.endTimeframe,
       // TODO(burdon): Empty?
-      dataFeeds: (_b = (_a = space.dataPipeline.pipelineState) == null ? void 0 : _a.feeds.map((feed) => feed.key)) != null ? _b : [],
-      startDataTimeframe: (_c = space.dataPipeline.pipelineState) == null ? void 0 : _c.startTimeframe,
-      currentDataTimeframe: (_d = space.dataPipeline.pipelineState) == null ? void 0 : _d.timeframe,
-      targetDataTimeframe: (_e = space.dataPipeline.pipelineState) == null ? void 0 : _e.targetTimeframe,
-      totalDataTimeframe: (_f = space.dataPipeline.pipelineState) == null ? void 0 : _f.endTimeframe
+      dataFeeds: space.dataPipeline.pipelineState?.feeds.map((feed) => feed.key) ?? [],
+      startDataTimeframe: space.dataPipeline.pipelineState?.startTimeframe,
+      currentDataTimeframe: space.dataPipeline.pipelineState?.timeframe,
+      targetDataTimeframe: space.dataPipeline.pipelineState?.targetTimeframe,
+      totalDataTimeframe: space.dataPipeline.pipelineState?.endTimeframe
     }
   };
   if (space.dataPipeline.itemManager) {
@@ -241,6 +234,7 @@ var import_protocols9 = require("@dxos/protocols");
 var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_object_sync = require("@dxos/teleport-extension-object-sync");
 var import_tracing3 = require("@dxos/tracing");
+var import_util6 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/identity/authenticator.ts
 var import_async = require("@dxos/async");
@@ -345,7 +339,7 @@ var TrustedKeySetAuthVerifier = class {
         return await trigger.wait({
           timeout: this._params.authTimeout
         });
-      } catch (e) {
+      } catch {
         return false;
       } finally {
         clear();
@@ -441,11 +435,10 @@ var Identity = class Identity2 {
     return this._deviceStateMachine.deviceCredentialChain;
   }
   getAdmissionCredentials() {
-    var _a, _b;
     return {
       deviceKey: this.deviceKey,
-      controlFeedKey: (_a = this.space.controlFeedKey) != null ? _a : (0, import_debug2.failUndefined)(),
-      dataFeedKey: (_b = this.space.dataFeedKey) != null ? _b : (0, import_debug2.failUndefined)()
+      controlFeedKey: this.space.controlFeedKey ?? (0, import_debug2.failUndefined)(),
+      dataFeedKey: this.space.dataFeedKey ?? (0, import_debug2.failUndefined)()
     };
   }
   /**
@@ -539,6 +532,7 @@ var import_keys2 = require("@dxos/keys");
 var import_log4 = require("@dxos/log");
 var import_protocols3 = require("@dxos/protocols");
 var import_credentials7 = require("@dxos/protocols/proto/dxos/halo/credentials");
+var import_timeframe = require("@dxos/timeframe");
 var import_tracing2 = require("@dxos/tracing");
 var import_util = require("@dxos/util");
 function _ts_decorate2(decorators, target, key, desc) {
@@ -566,7 +560,6 @@ var IdentityManager = class IdentityManager2 {
     return this._identity;
   }
   async open(ctx) {
-    var _a;
     const traceId = import_keys2.PublicKey.random().toHex();
     import_log4.log.trace("dxos.halo.identity-manager.open", import_protocols3.trace.begin({
       id: traceId
@@ -592,7 +585,7 @@ var IdentityManager = class IdentityManager2 {
       await this._identity.ready();
       import_log4.log.trace("dxos.halo.identity", {
         identityKey: identityRecord.identityKey,
-        displayName: (_a = this._identity.profileDocument) == null ? void 0 : _a.displayName
+        displayName: this._identity.profileDocument?.displayName
       }, {
         F: __dxlog_file4,
         L: 82,
@@ -611,11 +604,9 @@ var IdentityManager = class IdentityManager2 {
     });
   }
   async close() {
-    var _a;
-    await ((_a = this._identity) == null ? void 0 : _a.close(new import_context2.Context()));
+    await this._identity?.close(new import_context2.Context());
   }
   async createIdentity({ displayName } = {}) {
-    var _a;
     (0, import_invariant3.invariant)(!this._identity, "Identity already exists.", {
       F: __dxlog_file4,
       L: 96,
@@ -689,7 +680,7 @@ var IdentityManager = class IdentityManager2 {
     await this._identity.ready();
     import_log4.log.trace("dxos.halo.identity", {
       identityKey: identityRecord.identityKey,
-      displayName: (_a = this._identity.profileDocument) == null ? void 0 : _a.displayName
+      displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file4,
       L: 152,
@@ -712,7 +703,6 @@ var IdentityManager = class IdentityManager2 {
   * Accept an existing identity. Expects it's device key to be authorized (now or later).
   */
   async acceptIdentity(params) {
-    var _a;
     (0, import_log4.log)("accepting identity", {
       params
     }, {
@@ -748,7 +738,7 @@ var IdentityManager = class IdentityManager2 {
     await this._identity.ready();
     import_log4.log.trace("dxos.halo.identity", {
       identityKey: identityRecord.identityKey,
-      displayName: (_a = this._identity.profileDocument) == null ? void 0 : _a.displayName
+      displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file4,
       L: 186,
@@ -767,10 +757,42 @@ var IdentityManager = class IdentityManager2 {
     });
     return identity;
   }
+  /**
+  * Update the profile document of an existing identity.
+  */
+  async updateProfile(profile) {
+    (0, import_invariant3.invariant)(this._identity, "Identity not initialized.", {
+      F: __dxlog_file4,
+      L: 200,
+      S: this,
+      A: [
+        "this._identity",
+        "'Identity not initialized.'"
+      ]
+    });
+    const credential = await this._identity.getIdentityCredentialSigner().createCredential({
+      subject: this._identity.identityKey,
+      assertion: {
+        "@type": "dxos.halo.credentials.IdentityProfile",
+        profile
+      }
+    });
+    const receipt = await this._identity.controlPipeline.writer.write({
+      credential: {
+        credential
+      }
+    });
+    await this._identity.controlPipeline.state.waitUntilTimeframe(new import_timeframe.Timeframe([
+      [
+        receipt.feedKey,
+        receipt.seq
+      ]
+    ]));
+  }
   async _constructIdentity(identityRecord) {
     (0, import_invariant3.invariant)(!this._identity, void 0, {
       F: __dxlog_file4,
-      L: 197,
+      L: 214,
       S: this,
       A: [
         "!this._identity",
@@ -781,13 +803,13 @@ var IdentityManager = class IdentityManager2 {
       identityRecord
     }, {
       F: __dxlog_file4,
-      L: 198,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant3.invariant)(identityRecord.haloSpace.controlFeedKey, void 0, {
       F: __dxlog_file4,
-      L: 201,
+      L: 218,
       S: this,
       A: [
         "identityRecord.haloSpace.controlFeedKey",
@@ -799,7 +821,7 @@ var IdentityManager = class IdentityManager2 {
     });
     (0, import_invariant3.invariant)(identityRecord.haloSpace.dataFeedKey, void 0, {
       F: __dxlog_file4,
-      L: 205,
+      L: 222,
       S: this,
       A: [
         "identityRecord.haloSpace.dataFeedKey",
@@ -831,7 +853,7 @@ var IdentityManager = class IdentityManager2 {
       identityKey: identityRecord.identityKey
     }, {
       F: __dxlog_file4,
-      L: 229,
+      L: 246,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -852,7 +874,7 @@ var IdentityManager = class IdentityManager2 {
       onAuthFailure: () => {
         import_log4.log.warn("auth failure", void 0, {
           F: __dxlog_file4,
-          L: 248,
+          L: 265,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -875,12 +897,13 @@ var import_debug3 = require("@dxos/debug");
 var import_invariant4 = require("@dxos/invariant");
 var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-service.ts";
 var IdentityServiceImpl = class {
-  // TODO(wittjosiah): Remove dependency on service context.
-  constructor(_serviceContext) {
-    this._serviceContext = _serviceContext;
+  constructor(_createIdentity, _identityManager, _keyring) {
+    this._createIdentity = _createIdentity;
+    this._identityManager = _identityManager;
+    this._keyring = _keyring;
   }
   async createIdentity(request) {
-    await this._serviceContext.createIdentity(request);
+    await this._createIdentity(request);
     return this._getIdentity();
   }
   async recoverIdentity(request) {
@@ -892,34 +915,47 @@ var IdentityServiceImpl = class {
         identity: this._getIdentity()
       });
       emitNext();
-      return this._serviceContext.identityManager.stateUpdate.on(emitNext);
+      return this._identityManager.stateUpdate.on(emitNext);
     });
   }
   _getIdentity() {
-    if (!this._serviceContext.identityManager.identity) {
+    if (!this._identityManager.identity) {
       return void 0;
     }
     return {
-      identityKey: this._serviceContext.identityManager.identity.identityKey,
-      spaceKey: this._serviceContext.identityManager.identity.space.key,
-      profile: this._serviceContext.identityManager.identity.profileDocument
+      identityKey: this._identityManager.identity.identityKey,
+      spaceKey: this._identityManager.identity.space.key,
+      profile: this._identityManager.identity.profileDocument
     };
   }
+  async updateProfile(profile) {
+    (0, import_invariant4.invariant)(this._identityManager.identity, "Identity not initialized.", {
+      F: __dxlog_file5,
+      L: 59,
+      S: this,
+      A: [
+        "this._identityManager.identity",
+        "'Identity not initialized.'"
+      ]
+    });
+    await this._identityManager.updateProfile(profile);
+    return this._getIdentity();
+  }
   async signPresentation({ presentation, nonce }) {
-    (0, import_invariant4.invariant)(this._serviceContext.identityManager.identity, "Identity not initialized.", {
+    (0, import_invariant4.invariant)(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file5,
-      L: 56,
+      L: 65,
       S: this,
       A: [
-        "this._serviceContext.identityManager.identity",
+        "this._identityManager.identity",
         "'Identity not initialized.'"
       ]
     });
     return await (0, import_credentials8.signPresentation)({
       presentation,
-      signer: this._serviceContext.keyring,
-      signerKey: this._serviceContext.identityManager.identity.deviceKey,
-      chain: this._serviceContext.identityManager.identity.deviceCredentialChain,
+      signer: this._keyring,
+      signerKey: this._identityManager.identity.deviceKey,
+      chain: this._identityManager.identity.deviceCredentialChain,
       nonce
     });
   }
@@ -1255,7 +1291,6 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
     };
   }
   async onOpen(context) {
-    var _a;
     await super.onOpen(context);
     try {
       await this.rpc.InvitationHostService.options({
@@ -1264,7 +1299,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
       await (0, import_context3.cancelWithContext)(this._ctx, this._remoteOptionsTrigger.wait({
         timeout: OPTIONS_TIMEOUT
       }));
-      if (((_a = this._remoteOptions) == null ? void 0 : _a.role) !== import_invitations.Options.Role.GUEST) {
+      if (this._remoteOptions?.role !== import_invitations.Options.Role.GUEST) {
         throw new import_errors.InvalidInvitationExtensionRoleError(void 0, {
           expected: import_invitations.Options.Role.GUEST,
           remoteOptions: this._remoteOptions
@@ -1322,7 +1357,6 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
     };
   }
   async onOpen(context) {
-    var _a;
     await super.onOpen(context);
     try {
       (0, import_log5.log)("begin options", void 0, {
@@ -1343,7 +1377,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
         S: this,
         C: (f, a) => f(...a)
       });
-      if (((_a = this._remoteOptions) == null ? void 0 : _a.role) !== import_invitations.Options.Role.HOST) {
+      if (this._remoteOptions?.role !== import_invitations.Options.Role.HOST) {
         throw new import_errors.InvalidInvitationExtensionRoleError(void 0, {
           expected: import_invitations.Options.Role.HOST,
           remoteOptions: this._remoteOptions
@@ -1382,9 +1416,8 @@ var InvitationsHandler = class {
     this._networkManager = _networkManager;
   }
   createInvitation(protocol, options) {
-    var _a;
-    const { invitationId = import_keys4.PublicKey.random().toHex(), type = import_services4.Invitation.Type.INTERACTIVE, authMethod = import_services4.Invitation.AuthMethod.SHARED_SECRET, state = import_services4.Invitation.State.INIT, timeout = import_client_protocol2.INVITATION_TIMEOUT, swarmKey = import_keys4.PublicKey.random() } = options != null ? options : {};
-    const authCode = (_a = options == null ? void 0 : options.authCode) != null ? _a : authMethod === import_services4.Invitation.AuthMethod.SHARED_SECRET ? (0, import_credentials9.generatePasscode)(import_client_protocol2.AUTHENTICATION_CODE_LENGTH) : void 0;
+    const { invitationId = import_keys4.PublicKey.random().toHex(), type = import_services4.Invitation.Type.INTERACTIVE, authMethod = import_services4.Invitation.AuthMethod.SHARED_SECRET, state = import_services4.Invitation.State.INIT, timeout = import_client_protocol2.INVITATION_TIMEOUT, swarmKey = import_keys4.PublicKey.random() } = options ?? {};
+    const authCode = options?.authCode ?? (authMethod === import_services4.Invitation.AuthMethod.SHARED_SECRET ? (0, import_credentials9.generatePasscode)(import_client_protocol2.AUTHENTICATION_CODE_LENGTH) : void 0);
     (0, import_invariant7.invariant)(protocol, void 0, {
       F: __dxlog_file8,
       L: 76,
@@ -1437,9 +1470,8 @@ var InvitationsHandler = class {
           return invitation;
         },
         admit: async (admissionRequest) => {
-          var _a2, _b, _c;
           try {
-            const deviceKey = (_c = (_a2 = admissionRequest.device) == null ? void 0 : _a2.deviceKey) != null ? _c : (_b = admissionRequest.space) == null ? void 0 : _b.deviceKey;
+            const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
             (0, import_invariant7.invariant)(deviceKey, void 0, {
               F: __dxlog_file8,
               L: 119,
@@ -1584,7 +1616,8 @@ var InvitationsHandler = class {
         protocolProvider: (0, import_network_manager.createTeleportProtocolFactory)(async (teleport) => {
           teleport.addExtension("dxos.halo.invitations", createExtension());
         }),
-        topology: new import_network_manager.StarTopology(topic)
+        topology: new import_network_manager.StarTopology(topic),
+        label: "invitation host"
       });
       ctx.onDispose(() => swarmConnection.close());
       stream.next({
@@ -1609,7 +1642,7 @@ var InvitationsHandler = class {
     const { timeout = import_client_protocol2.INVITATION_TIMEOUT } = invitation;
     (0, import_invariant7.invariant)(protocol, void 0, {
       F: __dxlog_file8,
-      L: 210,
+      L: 211,
       S: this,
       A: [
         "protocol",
@@ -1623,7 +1656,7 @@ var InvitationsHandler = class {
     const setState = (newData) => {
       (0, import_invariant7.invariant)(newData.state !== void 0, void 0, {
         F: __dxlog_file8,
-        L: 221,
+        L: 222,
         S: this,
         A: [
           "newData.state !== undefined",
@@ -1643,7 +1676,7 @@ var InvitationsHandler = class {
             ...protocol.toJSON()
           }, {
             F: __dxlog_file8,
-            L: 229,
+            L: 230,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1653,7 +1686,7 @@ var InvitationsHandler = class {
         } else {
           import_log6.log.warn("auth failed", err, {
             F: __dxlog_file8,
-            L: 232,
+            L: 233,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1667,7 +1700,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file8,
-        L: 240,
+        L: 241,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1682,7 +1715,7 @@ var InvitationsHandler = class {
               currentState
             }, {
               F: __dxlog_file8,
-              L: 250,
+              L: 251,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1697,7 +1730,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file8,
-                L: 259,
+                L: 260,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1709,7 +1742,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file8,
-                L: 267,
+                L: 268,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1720,7 +1753,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file8,
-                L: 271,
+                L: 272,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1730,7 +1763,7 @@ var InvitationsHandler = class {
                 response: introductionResponse
               }, {
                 F: __dxlog_file8,
-                L: 275,
+                L: 276,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1742,7 +1775,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_file8,
-                    L: 284,
+                    L: 285,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -1754,7 +1787,7 @@ var InvitationsHandler = class {
                   });
                   (0, import_log6.log)("sending authentication request", void 0, {
                     F: __dxlog_file8,
-                    L: 288,
+                    L: 289,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -1775,7 +1808,7 @@ var InvitationsHandler = class {
                         attempt
                       }, {
                         F: __dxlog_file8,
-                        L: 299,
+                        L: 300,
                         S: this,
                         C: (f, a) => f(...a)
                       });
@@ -1792,7 +1825,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file8,
-                L: 310,
+                L: 311,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1804,7 +1837,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file8,
-                L: 321,
+                L: 322,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1816,7 +1849,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file8,
-                L: 323,
+                L: 324,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1826,7 +1859,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file8,
-                  L: 326,
+                  L: 327,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1836,7 +1869,7 @@ var InvitationsHandler = class {
               } else {
                 (0, import_log6.log)("auth failed", err, {
                   F: __dxlog_file8,
-                  L: 329,
+                  L: 330,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1847,7 +1880,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file8,
-                L: 332,
+                L: 333,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1865,7 +1898,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file8,
-              L: 343,
+              L: 344,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1875,7 +1908,7 @@ var InvitationsHandler = class {
           } else {
             (0, import_log6.log)("auth failed", err, {
               F: __dxlog_file8,
-              L: 346,
+              L: 347,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1888,7 +1921,7 @@ var InvitationsHandler = class {
     (0, import_async5.scheduleTask)(ctx, async () => {
       (0, import_invariant7.invariant)(invitation.swarmKey, void 0, {
         F: __dxlog_file8,
-        L: 356,
+        L: 357,
         S: this,
         A: [
           "invitation.swarmKey",
@@ -1902,7 +1935,8 @@ var InvitationsHandler = class {
         protocolProvider: (0, import_network_manager.createTeleportProtocolFactory)(async (teleport) => {
           teleport.addExtension("dxos.halo.invitations", createExtension());
         }),
-        topology: new import_network_manager.StarTopology(topic)
+        topology: new import_network_manager.StarTopology(topic),
+        label: "invitation guest"
       });
       ctx.onDispose(() => swarmConnection.close());
       setState({
@@ -2138,7 +2172,6 @@ var SpaceInvitationProtocol = class {
     };
   }
   async admit(request, guestProfile) {
-    var _a;
     (0, import_invariant9.invariant)(this._spaceKey, void 0, {
       F: __dxlog_file10,
       L: 42,
@@ -2202,7 +2235,7 @@ var SpaceInvitationProtocol = class {
       space: {
         credential: spaceMemberCredential,
         controlTimeframe: space.inner.controlPipeline.state.timeframe,
-        dataTimeframe: (_a = space.dataPipeline.pipelineState) == null ? void 0 : _a.timeframe
+        dataTimeframe: space.dataPipeline.pipelineState?.timeframe
       }
     };
   }
@@ -2289,7 +2322,7 @@ var import_keys6 = require("@dxos/keys");
 var import_log10 = require("@dxos/log");
 var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials11 = require("@dxos/protocols/proto/dxos/halo/credentials");
-var import_timeframe = require("@dxos/timeframe");
+var import_timeframe2 = require("@dxos/timeframe");
 var import_util3 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
@@ -2358,7 +2391,7 @@ var NotarizationPlugin = class {
         errors.throw(err);
       }
     });
-    opCtx == null ? void 0 : opCtx.onDispose(() => ctx.dispose());
+    opCtx?.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
       (0, import_async7.scheduleTask)(ctx, () => {
         import_log9.log.warn("Notarization timeout", {
@@ -2451,11 +2484,10 @@ var NotarizationPlugin = class {
   * Called with credentials arriving from the control pipeline.
   */
   async processCredential(credential) {
-    var _a;
     if (!credential.id) {
       return;
     }
-    (_a = this._processCredentialsTriggers.get(credential.id)) == null ? void 0 : _a.wake();
+    this._processCredentialsTriggers.get(credential.id)?.wake();
     this._processedCredentials.add(credential.id);
     this._processCredentialsTriggers.delete(credential.id);
   }
@@ -2481,11 +2513,10 @@ var NotarizationPlugin = class {
   * Requests from other peers to notarize credentials.
   */
   async _onNotarize(request) {
-    var _a;
     if (!this._writer) {
       throw new Error(WRITER_NOT_SET_ERROR_CODE);
     }
-    for (const credential of (_a = request.credentials) != null ? _a : []) {
+    for (const credential of request.credentials ?? []) {
       (0, import_invariant10.invariant)(credential.id, "Credential must have an id", {
         F: __dxlog_file11,
         L: 200,
@@ -2586,7 +2617,6 @@ var DataSpace = class DataSpace2 {
     this.error = void 0;
     this.stateUpdate = new import_async8.Event();
     this.metrics = {};
-    var _a;
     this._inner = params.inner;
     this._inner.stateUpdate.on(this._ctx, () => this.stateUpdate.emit());
     this._gossip = params.gossip;
@@ -2595,7 +2625,7 @@ var DataSpace = class DataSpace2 {
     this._feedStore = params.feedStore;
     this._metadataStore = params.metadataStore;
     this._signingContext = params.signingContext;
-    this._callbacks = (_a = params.callbacks) != null ? _a : {};
+    this._callbacks = params.callbacks ?? {};
     this.authVerifier = new TrustedKeySetAuthVerifier({
       trustedKeysProvider: () => new import_util3.ComplexSet(import_keys6.PublicKey.hash, Array.from(this._inner.spaceState.members.keys())),
       update: this._inner.stateUpdate,
@@ -2639,14 +2669,13 @@ var DataSpace = class DataSpace2 {
     this._state = import_services7.SpaceState.CONTROL_ONLY;
     this.stateUpdate.emit();
     this.metrics = {};
-    this.metrics.open = new Date();
+    this.metrics.open = /* @__PURE__ */ new Date();
   }
   async close() {
     await this._close();
   }
   async _close() {
-    var _a, _b;
-    await ((_b = (_a = this._callbacks).beforeClose) == null ? void 0 : _b.call(_a));
+    await this._callbacks.beforeClose?.();
     this._state = import_services7.SpaceState.CLOSED;
     await this._ctx.dispose();
     this._ctx = new import_context6.Context();
@@ -2668,7 +2697,7 @@ var DataSpace = class DataSpace2 {
   initializeDataPipelineAsync() {
     (0, import_async8.scheduleTask)(this._ctx, async () => {
       try {
-        this.metrics.pipelineInitBegin = new Date();
+        this.metrics.pipelineInitBegin = /* @__PURE__ */ new Date();
         await this.initializeDataPipeline();
       } catch (err) {
         if (err instanceof import_errors3.CancelledError) {
@@ -2690,12 +2719,11 @@ var DataSpace = class DataSpace2 {
         this.error = err;
         this.stateUpdate.emit();
       } finally {
-        this.metrics.ready = new Date();
+        this.metrics.ready = /* @__PURE__ */ new Date();
       }
     });
   }
   async initializeDataPipeline() {
-    var _a, _b, _c, _d;
     if (this._state !== import_services7.SpaceState.CONTROL_ONLY) {
       throw new import_errors3.SystemError("Invalid operation");
     }
@@ -2704,7 +2732,7 @@ var DataSpace = class DataSpace2 {
       ctx: this._ctx,
       breakOnStall: false
     });
-    this.metrics.controlPipelineReady = new Date();
+    this.metrics.controlPipelineReady = /* @__PURE__ */ new Date();
     await this._createWritableFeeds();
     (0, import_log10.log)("writable feeds created", void 0, {
       F: __dxlog_file12,
@@ -2721,7 +2749,7 @@ var DataSpace = class DataSpace2 {
       }), this._inner.controlPipeline.writer));
     }
     await this._inner.initializeDataPipeline();
-    this.metrics.dataPipelineOpen = new Date();
+    this.metrics.dataPipelineOpen = /* @__PURE__ */ new Date();
     await (0, import_context6.cancelWithContext)(this._ctx, this._inner.dataPipeline.ensureEpochInitialized());
     (0, import_log10.log)("waiting for data pipeline to reach target timeframe", void 0, {
       F: __dxlog_file12,
@@ -2733,17 +2761,17 @@ var DataSpace = class DataSpace2 {
       ctx: this._ctx,
       breakOnStall: false
     });
-    this.metrics.dataPipelineReady = new Date();
+    this.metrics.dataPipelineReady = /* @__PURE__ */ new Date();
     (0, import_log10.log)("data pipeline ready", void 0, {
       F: __dxlog_file12,
       L: 257,
       S: this,
       C: (f, a) => f(...a)
     });
-    await ((_b = (_a = this._callbacks).beforeReady) == null ? void 0 : _b.call(_a));
+    await this._callbacks.beforeReady?.();
     this._state = import_services7.SpaceState.READY;
     this.stateUpdate.emit();
-    await ((_d = (_c = this._callbacks).afterReady) == null ? void 0 : _d.call(_c));
+    await this._callbacks.afterReady?.();
   }
   async _createWritableFeeds() {
     const credentials = [];
@@ -2790,7 +2818,6 @@ var DataSpace = class DataSpace2 {
     await this._metadataStore.setWritableFeedKeys(this.key, this.inner.controlFeedKey, this.inner.dataFeedKey);
   }
   async createEpoch() {
-    var _a, _b;
     const epoch = await this.dataPipeline.createEpoch();
     const receipt = await this.inner.controlPipeline.writer.write({
       credential: {
@@ -2803,14 +2830,14 @@ var DataSpace = class DataSpace2 {
         })
       }
     });
-    await this.inner.controlPipeline.state.waitUntilTimeframe(new import_timeframe.Timeframe([
+    await this.inner.controlPipeline.state.waitUntilTimeframe(new import_timeframe2.Timeframe([
       [
         receipt.feedKey,
         receipt.seq
       ]
     ]));
     if (ENABLE_FEED_PURGE) {
-      for (const feed of (_b = (_a = this.inner.dataPipeline.pipelineState) == null ? void 0 : _a.feeds) != null ? _b : []) {
+      for (const feed of this.inner.dataPipeline.pipelineState?.feeds ?? []) {
         const indexBeforeEpoch = epoch.timeframe.get(feed.key);
         if (indexBeforeEpoch === void 0) {
           continue;
@@ -2860,9 +2887,8 @@ DataSpace = _ts_decorate3([
 var import_credentials12 = require("@dxos/credentials");
 var import_debug5 = require("@dxos/debug");
 var import_credentials13 = require("@dxos/protocols/proto/dxos/halo/credentials");
-var import_timeframe2 = require("@dxos/timeframe");
+var import_timeframe3 = require("@dxos/timeframe");
 var spaceGenesis = async (keyring, signingContext, space) => {
-  var _a, _b, _c, _d;
   const credentials = [
     await (0, import_credentials12.createCredential)({
       signer: keyring,
@@ -2882,11 +2908,11 @@ var spaceGenesis = async (keyring, signingContext, space) => {
         spaceKey: space.key,
         role: import_credentials13.SpaceMember.Role.ADMIN,
         profile: signingContext.profile,
-        genesisFeedKey: (_a = space.controlFeedKey) != null ? _a : (0, import_debug5.failUndefined)()
+        genesisFeedKey: space.controlFeedKey ?? (0, import_debug5.failUndefined)()
       }
     }),
     await signingContext.credentialSigner.createCredential({
-      subject: (_b = space.controlFeedKey) != null ? _b : (0, import_debug5.failUndefined)(),
+      subject: space.controlFeedKey ?? (0, import_debug5.failUndefined)(),
       assertion: {
         "@type": "dxos.halo.credentials.AdmittedFeed",
         spaceKey: space.key,
@@ -2896,7 +2922,7 @@ var spaceGenesis = async (keyring, signingContext, space) => {
       }
     }),
     await signingContext.credentialSigner.createCredential({
-      subject: (_c = space.dataFeedKey) != null ? _c : (0, import_debug5.failUndefined)(),
+      subject: space.dataFeedKey ?? (0, import_debug5.failUndefined)(),
       assertion: {
         "@type": "dxos.halo.credentials.AdmittedFeed",
         spaceKey: space.key,
@@ -2906,12 +2932,12 @@ var spaceGenesis = async (keyring, signingContext, space) => {
       }
     }),
     await signingContext.credentialSigner.createCredential({
-      subject: (_d = space.key) != null ? _d : (0, import_debug5.failUndefined)(),
+      subject: space.key ?? (0, import_debug5.failUndefined)(),
       assertion: {
         "@type": "dxos.halo.credentials.Epoch",
         number: 0,
         previousId: void 0,
-        timeframe: new import_timeframe2.Timeframe(),
+        timeframe: new import_timeframe3.Timeframe(),
         snapshotCid: void 0
       }
     })
@@ -3171,7 +3197,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       onAuthFailure: () => {
         import_log11.log.warn("auth failure", void 0, {
           F: __dxlog_file13,
-          L: 213,
+          L: 217,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3195,7 +3221,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 231,
+            L: 235,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3207,7 +3233,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             open: this._isOpen
           }, {
             F: __dxlog_file13,
-            L: 238,
+            L: 242,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3220,7 +3246,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 244,
+            L: 248,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3285,9 +3311,8 @@ var SpacesServiceImpl = class {
     return this._serializeSpace(space);
   }
   async updateSpace({ spaceKey, state }) {
-    var _a;
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
     if (state) {
       switch (state) {
         case import_services9.SpaceState.ACTIVE:
@@ -3318,7 +3343,7 @@ var SpacesServiceImpl = class {
           spaces
         });
       }, {
-        maxFrequency: 2
+        maxFrequency: process.env.NODE_ENV === "test" ? void 0 : 2
       });
       (0, import_async10.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
@@ -3351,17 +3376,15 @@ var SpacesServiceImpl = class {
     });
   }
   async postMessage({ spaceKey, channel, message }) {
-    var _a;
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
     await space.postMessage(getChannelId(channel), message);
   }
   subscribeMessages({ spaceKey, channel }) {
     return new import_codec_protobuf5.Stream(({ ctx, next }) => {
       (0, import_async10.scheduleTask)(ctx, async () => {
-        var _a;
         const dataSpaceManager = await this._getDataSpaceManager();
-        const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+        const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
         const handle = space.listen(getChannelId(channel), (message) => {
           next(message);
         });
@@ -3371,8 +3394,7 @@ var SpacesServiceImpl = class {
   }
   queryCredentials({ spaceKey }) {
     return new import_codec_protobuf5.Stream(({ ctx, next }) => {
-      var _a;
-      const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+      const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
       const processor = {
         processCredential: async (credential) => {
           next(credential);
@@ -3383,9 +3405,8 @@ var SpacesServiceImpl = class {
     });
   }
   async writeCredentials({ spaceKey, credentials }) {
-    var _a;
-    const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
-    for (const credential of credentials != null ? credentials : []) {
+    const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+    for (const credential of credentials ?? []) {
       await space.controlPipeline.writer.write({
         credential: {
           credential
@@ -3394,13 +3415,11 @@ var SpacesServiceImpl = class {
     }
   }
   async createEpoch({ spaceKey }) {
-    var _a;
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
     await space.createEpoch();
   }
   _serializeSpace(space) {
-    var _a, _b, _c, _d, _e, _f, _g;
     return {
       spaceKey: space.key,
       state: space.state,
@@ -3412,16 +3431,15 @@ var SpacesServiceImpl = class {
         currentControlTimeframe: space.inner.controlPipeline.state.timeframe,
         targetControlTimeframe: space.inner.controlPipeline.state.targetTimeframe,
         totalControlTimeframe: space.inner.controlPipeline.state.endTimeframe,
-        dataFeeds: (_b = (_a = space.dataPipeline.pipelineState) == null ? void 0 : _a.feeds.map((feed) => feed.key)) != null ? _b : [],
-        startDataTimeframe: (_c = space.dataPipeline.pipelineState) == null ? void 0 : _c.startTimeframe,
-        currentDataTimeframe: (_d = space.dataPipeline.pipelineState) == null ? void 0 : _d.timeframe,
-        targetDataTimeframe: (_e = space.dataPipeline.pipelineState) == null ? void 0 : _e.targetTimeframe,
-        totalDataTimeframe: (_f = space.dataPipeline.pipelineState) == null ? void 0 : _f.endTimeframe
+        dataFeeds: space.dataPipeline.pipelineState?.feeds.map((feed) => feed.key) ?? [],
+        startDataTimeframe: space.dataPipeline.pipelineState?.startTimeframe,
+        currentDataTimeframe: space.dataPipeline.pipelineState?.timeframe,
+        targetDataTimeframe: space.dataPipeline.pipelineState?.targetTimeframe,
+        totalDataTimeframe: space.dataPipeline.pipelineState?.endTimeframe
       },
       members: Array.from(space.inner.spaceState.members.values()).map((member) => {
-        var _a2, _b2, _c2;
         const peers = space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key));
-        const isMe = (_a2 = this._identityManager.identity) == null ? void 0 : _a2.identityKey.equals(member.key);
+        const isMe = this._identityManager.identity?.identityKey.equals(member.key);
         if (isMe) {
           peers.push(space.presence.getLocalState());
         }
@@ -3429,14 +3447,14 @@ var SpacesServiceImpl = class {
           identity: {
             identityKey: member.key,
             profile: {
-              displayName: (_c2 = (_b2 = member.assertion.profile) == null ? void 0 : _b2.displayName) != null ? _c2 : (0, import_util5.humanize)(member.key)
+              displayName: member.assertion.profile?.displayName ?? (0, import_util5.humanize)(member.key)
             }
           },
           presence: isMe || peers.length > 0 ? import_services9.SpaceMember.PresenceState.ONLINE : import_services9.SpaceMember.PresenceState.OFFLINE,
           peerStates: peers
         };
       }),
-      creator: (_g = space.inner.spaceState.creator) == null ? void 0 : _g.key,
+      creator: space.inner.spaceState.creator?.key,
       cache: space.cache,
       metrics: space.metrics
     };
@@ -3476,7 +3494,8 @@ var ServiceContext = class ServiceContext2 {
         root: storage.createDirectory("feeds"),
         signer: this.keyring,
         hypercore: {
-          valueEncoding: import_echo_pipeline3.valueEncoding
+          valueEncoding: import_echo_pipeline3.valueEncoding,
+          stats: true
         }
       })
     });
@@ -3490,16 +3509,13 @@ var ServiceContext = class ServiceContext2 {
     });
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager);
     this.invitations = new InvitationsHandler(this.networkManager);
-    this._handlerFactories.set(import_services10.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => {
-      var _a;
-      return (_a = this.identityManager.identity) != null ? _a : (0, import_debug7.failUndefined)();
-    }, this._acceptIdentity.bind(this)));
+    this._handlerFactories.set(import_services10.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? (0, import_debug7.failUndefined)(), this._acceptIdentity.bind(this)));
   }
   async open(ctx) {
     await this._checkStorageVersion();
     (0, import_log13.log)("opening...", void 0, {
       F: __dxlog_file15,
-      L: 131,
+      L: 135,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3507,7 +3523,7 @@ var ServiceContext = class ServiceContext2 {
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 132,
+      L: 136,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3522,29 +3538,28 @@ var ServiceContext = class ServiceContext2 {
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 140,
+      L: 144,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log13.log)("opened", void 0, {
       F: __dxlog_file15,
-      L: 141,
+      L: 145,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
-    var _a;
     (0, import_log13.log)("closing...", void 0, {
       F: __dxlog_file15,
-      L: 145,
+      L: 149,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._deviceSpaceSync && this.identityManager.identity) {
       await this.identityManager.identity.space.spaceState.removeCredentialProcessor(this._deviceSpaceSync);
     }
-    await ((_a = this.dataSpaceManager) == null ? void 0 : _a.close());
+    await this.dataSpaceManager?.close();
     await this.identityManager.close();
     await this.spaceManager.close();
     await this.feedStore.close();
@@ -3553,7 +3568,7 @@ var ServiceContext = class ServiceContext2 {
     this.dataServiceSubscriptions.clear();
     (0, import_log13.log)("closed", void 0, {
       F: __dxlog_file15,
-      L: 156,
+      L: 160,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3567,7 +3582,7 @@ var ServiceContext = class ServiceContext2 {
     const factory = this._handlerFactories.get(invitation.kind);
     (0, import_invariant12.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file15,
-      L: 168,
+      L: 171,
       S: this,
       A: [
         "factory",
@@ -3589,14 +3604,13 @@ var ServiceContext = class ServiceContext2 {
   }
   // Called when identity is created.
   async _initialize(ctx) {
-    var _a;
     (0, import_log13.log)("initializing spaces...", void 0, {
       F: __dxlog_file15,
-      L: 190,
+      L: 192,
       S: this,
       C: (f, a) => f(...a)
     });
-    const identity = (_a = this.identityManager.identity) != null ? _a : (0, import_debug7.failUndefined)();
+    const identity = this.identityManager.identity ?? (0, import_debug7.failUndefined)();
     const signingContext = {
       credentialSigner: identity.getIdentityCredentialSigner(),
       identityKey: identity.identityKey,
@@ -3615,7 +3629,7 @@ var ServiceContext = class ServiceContext2 {
     this._handlerFactories.set(import_services10.Invitation.Kind.SPACE, (invitation) => {
       (0, import_invariant12.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file15,
-        L: 213,
+        L: 215,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -3639,7 +3653,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 229,
+            L: 231,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3650,7 +3664,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 233,
+            L: 235,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3661,7 +3675,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 238,
+            L: 240,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3672,7 +3686,7 @@ var ServiceContext = class ServiceContext2 {
         } catch (err) {
           import_log13.log.catch(err, void 0, {
             F: __dxlog_file15,
-            L: 244,
+            L: 246,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3689,6 +3703,7 @@ _ts_decorate5([
   import_tracing3.trace.span()
 ], ServiceContext.prototype, "_initialize", null);
 ServiceContext = _ts_decorate5([
+  (0, import_util6.safeInstanceof)("dxos.client-services.ServiceContext"),
   import_tracing3.trace.resource()
 ], ServiceContext);
 
@@ -3723,21 +3738,17 @@ var DevicesServiceImpl = class {
   queryDevices() {
     return new import_codec_protobuf6.Stream(({ next }) => {
       const update = () => {
-        var _a;
-        const deviceKeys = (_a = this._identityManager.identity) == null ? void 0 : _a.authorizedDeviceKeys;
+        const deviceKeys = this._identityManager.identity?.authorizedDeviceKeys;
         if (!deviceKeys) {
           next({
             devices: []
           });
         } else {
           next({
-            devices: Array.from(deviceKeys.values()).map((key) => {
-              var _a2;
-              return {
-                deviceKey: key,
-                kind: ((_a2 = this._identityManager.identity) == null ? void 0 : _a2.deviceKey.equals(key)) ? import_services11.DeviceKind.CURRENT : import_services11.DeviceKind.TRUSTED
-              };
-            })
+            devices: Array.from(deviceKeys.values()).map((key) => ({
+              deviceKey: key,
+              kind: this._identityManager.identity?.deviceKey.equals(key) ? import_services11.DeviceKind.CURRENT : import_services11.DeviceKind.TRUSTED
+            }))
           });
         }
       };
@@ -3765,14 +3776,14 @@ var import_async13 = require("@dxos/async");
 var import_codec_protobuf7 = require("@dxos/codec-protobuf");
 var import_feed_store4 = require("@dxos/feed-store");
 var import_keys9 = require("@dxos/keys");
-var import_util6 = require("@dxos/util");
+var import_util7 = require("@dxos/util");
 var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
   return new import_codec_protobuf7.Stream(({ next }) => {
     const subscriptions = new import_async13.EventSubscriptions();
-    const feedMap = new import_util6.ComplexMap(import_keys9.PublicKey.hash);
+    const feedMap = new import_util7.ComplexMap(import_keys9.PublicKey.hash);
     const update = () => {
       const { feeds } = feedStore;
-      feeds.filter((feed) => !(feedKeys == null ? void 0 : feedKeys.length) || feedKeys.some((feedKey) => feedKey.equals(feed.key))).forEach((feed) => {
+      feeds.filter((feed) => !feedKeys?.length || feedKeys.some((feedKey) => feedKey.equals(feed.key))).forEach((feed) => {
         if (!feedMap.has(feed.key)) {
           feedMap.set(feed.key, feed);
           feed.on("close", update);
@@ -3780,15 +3791,12 @@ var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
         }
       });
       next({
-        feeds: Array.from(feedMap.values()).map((feed) => {
-          var _a, _b;
-          return {
-            feedKey: feed.key,
-            length: feed.properties.length,
-            bytes: feed.core.byteLength,
-            downloaded: (_b = (_a = feed.core.bitfield) == null ? void 0 : _a.data.toBuffer()) != null ? _b : new Uint8Array()
-          };
-        })
+        feeds: Array.from(feedMap.values()).map((feed) => ({
+          feedKey: feed.key,
+          length: feed.properties.length,
+          bytes: feed.core.byteLength,
+          downloaded: feed.core.bitfield?.data.toBuffer() ?? new Uint8Array()
+        }))
       });
     };
     subscriptions.add(feedStore.feedOpened.on(update));
@@ -3888,13 +3896,13 @@ var subscribeToSignal = ({ signalManager }) => new import_codec_protobuf10.Strea
         recipient: message.recipient.asUint8Array(),
         payload: message.payload
       },
-      receivedAt: new Date()
+      receivedAt: /* @__PURE__ */ new Date()
     });
   });
   signalManager.swarmEvent.on(ctx, (swarmEvent) => {
     next({
       swarmEvent: swarmEvent.swarmEvent,
-      receivedAt: new Date()
+      receivedAt: /* @__PURE__ */ new Date()
     });
   });
   return () => {
@@ -3902,17 +3910,15 @@ var subscribeToSignal = ({ signalManager }) => new import_codec_protobuf10.Strea
   };
 });
 var subscribeToSwarmInfo = ({ networkManager }) => new import_codec_protobuf10.Stream(({ next }) => {
-  var _a;
   const update = () => {
-    var _a2;
-    const info = (_a2 = networkManager.connectionLog) == null ? void 0 : _a2.swarms;
+    const info = networkManager.connectionLog?.swarms;
     if (info) {
       next({
         data: info
       });
     }
   };
-  (_a = networkManager.connectionLog) == null ? void 0 : _a.update.on(update);
+  networkManager.connectionLog?.update.on(update);
   update();
 });
 
@@ -3925,14 +3931,14 @@ var subscribeToSpaces = (context, { spaceKeys = [] }) => {
       const spaces = [
         ...context.spaceManager.spaces.values()
       ];
-      const filteredSpaces = spaces.filter((space) => !(spaceKeys == null ? void 0 : spaceKeys.length) || spaceKeys.some((spaceKey) => spaceKey.equals(space.key)));
+      const filteredSpaces = spaces.filter((space) => !spaceKeys?.length || spaceKeys.some((spaceKey) => spaceKey.equals(space.key)));
       next({
         spaces: filteredSpaces.map((space) => {
           const spaceMetadata = context.metadataStore.spaces.find((spaceMetadata2) => spaceMetadata2.key.equals(space.key));
           return {
             key: space.key,
             isOpen: space.isOpen,
-            timeframe: spaceMetadata == null ? void 0 : spaceMetadata.dataTimeframe,
+            timeframe: spaceMetadata?.dataTimeframe,
             genesisFeed: space.genesisFeedKey,
             controlFeed: space.controlFeedKey,
             dataFeed: space.dataFeedKey
@@ -3946,7 +3952,7 @@ var subscribeToSpaces = (context, { spaceKeys = [] }) => {
       await update();
     });
     return () => {
-      unsubscribe == null ? void 0 : unsubscribe();
+      unsubscribe?.();
       clearTimeout(timeout);
     };
   });
@@ -3977,16 +3983,15 @@ var DevtoolsServiceImpl = class {
     };
   }
   async getStorageInfo() {
-    var _a, _b, _c, _d, _e;
-    const storageUsage = (_c = await ((_b = (_a = this.params.context.storage).getDiskInfo) == null ? void 0 : _b.call(_a))) != null ? _c : {
+    const storageUsage = await this.params.context.storage.getDiskInfo?.() ?? {
       used: 0
     };
     const navigatorInfo = typeof navigator === "object" ? await navigator.storage.estimate() : void 0;
     return {
       type: this.params.context.storage.type,
       storageUsage: storageUsage.used,
-      originUsage: (_d = navigatorInfo == null ? void 0 : navigatorInfo.usage) != null ? _d : 0,
-      usageQuota: (_e = navigatorInfo == null ? void 0 : navigatorInfo.quota) != null ? _e : 0
+      originUsage: navigatorInfo?.usage ?? 0,
+      usageQuota: navigatorInfo?.quota ?? 0
     };
   }
   async getBlobs() {
@@ -4094,7 +4099,6 @@ var Lock = class {
     return this._lockPath;
   }
   async acquire() {
-    var _a;
     (0, import_log14.log)("acquiring lock...", void 0, {
       F: __dxlog_file16,
       L: 32,
@@ -4102,7 +4106,7 @@ var Lock = class {
       C: (f, a) => f(...a)
     });
     this._fileHandle = await import_lock_file.LockFile.acquire(this._lockPath);
-    await ((_a = this._onAcquire) == null ? void 0 : _a.call(this));
+    await this._onAcquire?.();
     (0, import_log14.log)("acquired lock", void 0, {
       F: __dxlog_file16,
       L: 37,
@@ -4111,8 +4115,7 @@ var Lock = class {
     });
   }
   async release() {
-    var _a;
-    await ((_a = this._onRelease) == null ? void 0 : _a.call(this));
+    await this._onRelease?.();
     (0, import_invariant13.invariant)(this._fileHandle, "Lock is not acquired", {
       F: __dxlog_file16,
       L: 42,
@@ -4134,11 +4137,11 @@ var import_async16 = require("@dxos/async");
 var import_codec_protobuf13 = require("@dxos/codec-protobuf");
 var import_log15 = require("@dxos/log");
 var import_services12 = require("@dxos/protocols/proto/dxos/client/services");
-var import_util7 = require("@dxos/util");
+var import_util8 = require("@dxos/util");
 var LoggingServiceImpl = class {
   constructor() {
     this._logs = new import_async16.Event();
-    this._started = new Date();
+    this._started = /* @__PURE__ */ new Date();
     this._logProcessor = (_config, entry2) => {
       this._logs.emit(entry2);
     };
@@ -4152,15 +4155,15 @@ var LoggingServiceImpl = class {
   }
   async controlMetrics({ reset, record }) {
     if (reset) {
-      import_util7.tracer.clear();
+      import_util8.tracer.clear();
     }
     if (record === true) {
-      import_util7.tracer.start();
+      import_util8.tracer.start();
     } else if (record === false) {
-      import_util7.tracer.stop();
+      import_util8.tracer.stop();
     }
     return {
-      recording: import_util7.tracer.recording
+      recording: import_util8.tracer.recording
     };
   }
   /**
@@ -4168,24 +4171,23 @@ var LoggingServiceImpl = class {
   */
   queryMetrics({ interval = 5e3 }) {
     const getNumericalValues = (key) => {
-      var _a;
-      const events = (_a = import_util7.tracer.get(key)) != null ? _a : [];
+      const events = import_util8.tracer.get(key) ?? [];
       return {
         key,
-        stats: (0, import_util7.numericalValues)(events, "duration")
+        stats: (0, import_util8.numericalValues)(events, "duration")
       };
     };
     return new import_codec_protobuf13.Stream(({ next }) => {
       const update = () => {
         const metrics = {
-          timestamp: new Date(),
+          timestamp: /* @__PURE__ */ new Date(),
           values: [
             getNumericalValues("dxos.echo.pipeline.control"),
             getNumericalValues("dxos.echo.pipeline.data")
           ].filter(Boolean)
         };
         next({
-          timestamp: new Date(),
+          timestamp: /* @__PURE__ */ new Date(),
           metrics
         });
       };
@@ -4199,11 +4201,10 @@ var LoggingServiceImpl = class {
   queryLogs(request) {
     return new import_codec_protobuf13.Stream(({ ctx, next }) => {
       const handler = (entry2) => {
-        var _a, _b, _c, _d, _e;
         if (LOG_PROCESSING > 0) {
           return;
         }
-        if (((_a = entry2.meta) == null ? void 0 : _a.F.includes("logging-service")) || entry2.context && Object.values(entry2.context).some((value) => typeof value === "string" && value.includes("LoggingService"))) {
+        if (entry2.meta?.F.includes("logging-service") || entry2.context && Object.values(entry2.context).some((value) => typeof value === "string" && value.includes("LoggingService"))) {
           return;
         }
         if (!shouldLog(entry2, request)) {
@@ -4211,12 +4212,12 @@ var LoggingServiceImpl = class {
         }
         const record = {
           ...entry2,
-          context: (0, import_util7.jsonify)((0, import_log15.getContextFromEntry)(entry2)),
-          timestamp: new Date(),
+          context: (0, import_util8.jsonify)((0, import_log15.getContextFromEntry)(entry2)),
+          timestamp: /* @__PURE__ */ new Date(),
           meta: {
             // TODO(dmaretskyi): Fix proto.
-            file: (_c = (_b = entry2.meta) == null ? void 0 : _b.F) != null ? _c : "",
-            line: (_e = (_d = entry2.meta) == null ? void 0 : _d.L) != null ? _e : 0
+            file: entry2.meta?.F ?? "",
+            line: entry2.meta?.L ?? 0
           }
         };
         try {
@@ -4239,15 +4240,11 @@ var matchFilter = (filter, level, path, options) => {
   }
 };
 var shouldLog = (entry2, request) => {
-  var _a;
-  const options = (_a = request.options) != null ? _a : import_services12.QueryLogsRequest.MatchingOptions.INCLUSIVE;
+  const options = request.options ?? import_services12.QueryLogsRequest.MatchingOptions.INCLUSIVE;
   if (request.filters === void 0) {
     return options === import_services12.QueryLogsRequest.MatchingOptions.INCLUSIVE;
   } else {
-    return request.filters.some((filter) => {
-      var _a2, _b;
-      return matchFilter(filter, entry2.level, (_b = (_a2 = entry2.meta) == null ? void 0 : _a2.F) != null ? _b : "", options);
-    });
+    return request.filters.some((filter) => matchFilter(filter, entry2.level, entry2.meta?.F ?? "", options));
   }
 };
 var LOG_PROCESSING = 0;
@@ -4289,10 +4286,10 @@ var import_client_protocol4 = require("@dxos/client-protocol");
 var import_errors5 = require("@dxos/errors");
 var import_config = require("@dxos/protocols/proto/dxos/config");
 var import_random_access_storage = require("@dxos/random-access-storage");
-var import_util8 = require("@dxos/util");
+var import_util9 = require("@dxos/util");
 var StorageDriver = import_config.Runtime.Client.Storage.StorageDriver;
 var createStorageObjects = (config) => {
-  const { path = (0, import_util8.isNode)() ? import_client_protocol4.DX_DATA : "dxos/storage", storageType, keyStorage, persistent = false } = config != null ? config : {};
+  const { path = (0, import_util9.isNode)() ? import_client_protocol4.DX_DATA : "dxos/storage", storageType, keyStorage, persistent = false } = config ?? {};
   if (persistent && storageType === StorageDriver.RAM) {
     throw new import_errors5.InvalidConfigError("RAM storage cannot be used in persistent mode.");
   }
@@ -4336,7 +4333,7 @@ var toStorageType = (type) => {
 // packages/sdk/client-services/src/packlets/system/system-service.ts
 var import_codec_protobuf15 = require("@dxos/codec-protobuf");
 var import_services13 = require("@dxos/protocols/proto/dxos/client/services");
-var import_util9 = require("@dxos/util");
+var import_util10 = require("@dxos/util");
 var SystemServiceImpl = class {
   constructor({ config, statusUpdate, getDiagnostics, onUpdateStatus, getCurrentStatus, onReset }) {
     this._config = config;
@@ -4347,8 +4344,7 @@ var SystemServiceImpl = class {
     this._onReset = onReset;
   }
   async getConfig() {
-    var _a, _b;
-    return (_b = (_a = this._config) == null ? void 0 : _a.values) != null ? _b : {};
+    return this._config?.values ?? {};
   }
   /**
   * NOTE: Since this is serialized as a JSON object, we allow the option to serialize keys.
@@ -4356,8 +4352,8 @@ var SystemServiceImpl = class {
   async getDiagnostics({ keys } = {}) {
     const diagnostics = await this._getDiagnostics();
     return {
-      timestamp: new Date(),
-      diagnostics: JSON.parse(JSON.stringify(diagnostics, (0, import_util9.jsonKeyReplacer)({
+      timestamp: /* @__PURE__ */ new Date(),
+      diagnostics: JSON.parse(JSON.stringify(diagnostics, (0, import_util10.jsonKeyReplacer)({
         truncate: keys === import_services13.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
         humanize: keys === import_services13.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
       })))
@@ -4471,11 +4467,10 @@ var ClientServicesHost = class ClientServicesHost2 {
         return createDiagnostics(this._serviceRegistry.services, this._serviceContext, this._config);
       },
       onUpdateStatus: async (status) => {
-        var _a, _b;
         if (!this.isOpen && status === import_services14.SystemStatus.ACTIVE) {
-          await ((_a = this._resourceLock) == null ? void 0 : _a.acquire());
+          await this._resourceLock?.acquire();
         } else if (this.isOpen && status === import_services14.SystemStatus.INACTIVE) {
-          await ((_b = this._resourceLock) == null ? void 0 : _b.release());
+          await this._resourceLock?.release();
         }
       },
       onReset: async () => {
@@ -4512,7 +4507,6 @@ var ClientServicesHost = class ClientServicesHost2 {
   * Can only be called once.
   */
   initialize({ config, ...options }) {
-    var _a, _b, _c;
     (0, import_invariant14.invariant)(!this._open, "service host is open", {
       F: __dxlog_file17,
       L: 181,
@@ -4522,7 +4516,7 @@ var ClientServicesHost = class ClientServicesHost2 {
         "'service host is open'"
       ]
     });
-    import_log16.log.info("initializing...", void 0, {
+    (0, import_log16.log)("initializing...", void 0, {
       F: __dxlog_file17,
       L: 182,
       S: this,
@@ -4544,8 +4538,8 @@ var ClientServicesHost = class ClientServicesHost2 {
       }
     }
     const { connectionLog = true, transportFactory = (0, import_network_manager2.createWebRTCTransportFactory)({
-      iceServers: (_a = this._config) == null ? void 0 : _a.get("runtime.services.ice")
-    }), signalManager = new import_messaging.WebsocketSignalManager((_c = (_b = this._config) == null ? void 0 : _b.get("runtime.services.signaling")) != null ? _c : []) } = options;
+      iceServers: this._config?.get("runtime.services.ice")
+    }), signalManager = new import_messaging.WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
     (0, import_invariant14.invariant)(!this._networkManager, "network manager already set", {
       F: __dxlog_file17,
@@ -4561,7 +4555,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       transportFactory,
       signalManager
     });
-    import_log16.log.info("initialized", void 0, {
+    (0, import_log16.log)("initialized", void 0, {
       F: __dxlog_file17,
       L: 208,
       S: this,
@@ -4569,7 +4563,6 @@ var ClientServicesHost = class ClientServicesHost2 {
     });
   }
   async open(ctx) {
-    var _a, _b, _c;
     if (this._open) {
       return;
     }
@@ -4619,20 +4612,20 @@ var ClientServicesHost = class ClientServicesHost2 {
       ]
     });
     this._opening = true;
-    import_log16.log.info("opening...", {
-      lockKey: (_a = this._resourceLock) == null ? void 0 : _a.lockKey
+    (0, import_log16.log)("opening...", {
+      lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file17,
       L: 227,
       S: this,
       C: (f, a) => f(...a)
     });
-    await ((_b = this._resourceLock) == null ? void 0 : _b.acquire());
+    await this._resourceLock?.acquire();
     await this._loggingService.open();
     this._serviceContext = new ServiceContext(this._storage, this._networkManager, this._signalManager, this._modelFactory);
     this._serviceRegistry.setServices({
       SystemService: this._systemService,
-      IdentityService: new IdentityServiceImpl(this._serviceContext),
+      IdentityService: new IdentityServiceImpl((params) => this._serviceContext.createIdentity(params), this._serviceContext.identityManager, this._serviceContext.keyring),
       InvitationsService: new InvitationsServiceImpl(this._serviceContext.invitations, (invitation) => this._serviceContext.getInvitationHandler(invitation)),
       DevicesService: new DevicesServiceImpl(this._serviceContext.identityManager),
       SpacesService: new SpacesServiceImpl(this._serviceContext.identityManager, this._serviceContext.spaceManager, this._serviceContext.dataServiceSubscriptions, async () => {
@@ -4654,12 +4647,12 @@ var ClientServicesHost = class ClientServicesHost2 {
     this._opening = false;
     this._open = true;
     this._statusUpdate.emit();
-    const deviceKey = (_c = this._serviceContext.identityManager.identity) == null ? void 0 : _c.deviceKey;
-    import_log16.log.info("opened", {
+    const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
+    (0, import_log16.log)("opened", {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 280,
+      L: 284,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4667,22 +4660,21 @@ var ClientServicesHost = class ClientServicesHost2 {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 281,
+      L: 285,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
-    var _a;
     if (!this._open) {
       return;
     }
-    const deviceKey = (_a = this._serviceContext.identityManager.identity) == null ? void 0 : _a.deviceKey;
-    import_log16.log.info("closing...", {
+    const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
+    (0, import_log16.log)("closing...", {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 292,
+      L: 296,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4693,37 +4685,36 @@ var ClientServicesHost = class ClientServicesHost2 {
     await this._serviceContext.close();
     this._open = false;
     this._statusUpdate.emit();
-    import_log16.log.info("closed", {
+    (0, import_log16.log)("closed", {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 298,
+      L: 302,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async reset() {
-    var _a, _b, _c;
     const traceId = import_keys12.PublicKey.random().toHex();
     import_log16.log.trace("dxos.sdk.client-services-host.reset", import_protocols10.trace.begin({
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 303,
+      L: 307,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log16.log)("resetting...", void 0, {
       F: __dxlog_file17,
-      L: 305,
+      L: 309,
       S: this,
       C: (f, a) => f(...a)
     });
-    await ((_a = this._serviceContext) == null ? void 0 : _a.close());
+    await this._serviceContext?.close();
     await this._storage.reset();
     (0, import_log16.log)("reset", void 0, {
       F: __dxlog_file17,
-      L: 308,
+      L: 312,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4731,11 +4722,11 @@ var ClientServicesHost = class ClientServicesHost2 {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 309,
+      L: 313,
       S: this,
       C: (f, a) => f(...a)
     });
-    await ((_c = (_b = this._callbacks) == null ? void 0 : _b.onReset) == null ? void 0 : _c.call(_b));
+    await this._callbacks?.onReset?.();
   }
 };
 _ts_decorate7([
@@ -4775,18 +4766,16 @@ var performInvitation = ({ host, guest, options, hooks }) => {
   const authCode = new import_async18.Trigger();
   const hostObservable = createInvitation(host, options);
   hostObservable.subscribe(async (hostInvitation) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
     switch (hostInvitation.state) {
       case import_services15.Invitation.State.CONNECTING: {
-        if ((_b = (_a = hooks == null ? void 0 : hooks.host) == null ? void 0 : _a.onConnecting) == null ? void 0 : _b.call(_a, hostObservable)) {
+        if (hooks?.host?.onConnecting?.(hostObservable)) {
           break;
         }
         const guestObservable = acceptInvitation(guest, hostInvitation);
         guestObservable.subscribe(async (guestInvitation) => {
-          var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2, _n2;
           switch (guestInvitation.state) {
             case import_services15.Invitation.State.CONNECTING: {
-              if ((_b2 = (_a2 = hooks == null ? void 0 : hooks.guest) == null ? void 0 : _a2.onConnecting) == null ? void 0 : _b2.call(_a2, guestObservable)) {
+              if (hooks?.guest?.onConnecting?.(guestObservable)) {
                 break;
               }
               (0, import_invariant15.invariant)(hostInvitation.swarmKey.equals(guestInvitation.swarmKey), void 0, {
@@ -4801,22 +4790,22 @@ var performInvitation = ({ host, guest, options, hooks }) => {
               break;
             }
             case import_services15.Invitation.State.CONNECTED: {
-              (_d2 = (_c2 = hooks == null ? void 0 : hooks.guest) == null ? void 0 : _c2.onConnected) == null ? void 0 : _d2.call(_c2, guestObservable);
+              hooks?.guest?.onConnected?.(guestObservable);
               break;
             }
             case import_services15.Invitation.State.READY_FOR_AUTHENTICATION: {
-              if ((_f2 = (_e2 = hooks == null ? void 0 : hooks.guest) == null ? void 0 : _e2.onReady) == null ? void 0 : _f2.call(_e2, guestObservable)) {
+              if (hooks?.guest?.onReady?.(guestObservable)) {
                 break;
               }
               await guestObservable.authenticate(await authCode.wait());
               break;
             }
             case import_services15.Invitation.State.AUTHENTICATING: {
-              (_h2 = (_g2 = hooks == null ? void 0 : hooks.guest) == null ? void 0 : _g2.onAuthenticating) == null ? void 0 : _h2.call(_g2, guestObservable);
+              hooks?.guest?.onAuthenticating?.(guestObservable);
               break;
             }
             case import_services15.Invitation.State.SUCCESS: {
-              if ((_j2 = (_i2 = hooks == null ? void 0 : hooks.guest) == null ? void 0 : _i2.onSuccess) == null ? void 0 : _j2.call(_i2, guestObservable)) {
+              if (hooks?.guest?.onSuccess?.(guestObservable)) {
                 break;
               }
               guestComplete.wake({
@@ -4825,7 +4814,7 @@ var performInvitation = ({ host, guest, options, hooks }) => {
               break;
             }
             case import_services15.Invitation.State.CANCELLED: {
-              if ((_l2 = (_k2 = hooks == null ? void 0 : hooks.guest) == null ? void 0 : _k2.onCancelled) == null ? void 0 : _l2.call(_k2, guestObservable)) {
+              if (hooks?.guest?.onCancelled?.(guestObservable)) {
                 break;
               }
               guestComplete.wake({
@@ -4834,7 +4823,7 @@ var performInvitation = ({ host, guest, options, hooks }) => {
               break;
             }
             case import_services15.Invitation.State.TIMEOUT: {
-              if ((_n2 = (_m2 = hooks == null ? void 0 : hooks.guest) == null ? void 0 : _m2.onTimeout) == null ? void 0 : _n2.call(_m2, guestObservable)) {
+              if (hooks?.guest?.onTimeout?.(guestObservable)) {
                 return;
               }
               guestComplete.wake({
@@ -4843,8 +4832,7 @@ var performInvitation = ({ host, guest, options, hooks }) => {
             }
           }
         }, (error) => {
-          var _a2, _b2;
-          if ((_b2 = (_a2 = hooks == null ? void 0 : hooks.guest) == null ? void 0 : _a2.onError) == null ? void 0 : _b2.call(_a2, guestObservable)) {
+          if (hooks?.guest?.onError?.(guestObservable)) {
             return;
           }
           guestComplete.wake({
@@ -4854,11 +4842,11 @@ var performInvitation = ({ host, guest, options, hooks }) => {
         break;
       }
       case import_services15.Invitation.State.CONNECTED: {
-        (_d = (_c = hooks == null ? void 0 : hooks.host) == null ? void 0 : _c.onConnected) == null ? void 0 : _d.call(_c, hostObservable);
+        hooks?.host?.onConnected?.(hostObservable);
         break;
       }
       case import_services15.Invitation.State.READY_FOR_AUTHENTICATION: {
-        if ((_f = (_e = hooks == null ? void 0 : hooks.host) == null ? void 0 : _e.onReady) == null ? void 0 : _f.call(_e, hostObservable)) {
+        if (hooks?.host?.onReady?.(hostObservable)) {
           break;
         }
         if (hostInvitation.authCode) {
@@ -4867,11 +4855,11 @@ var performInvitation = ({ host, guest, options, hooks }) => {
         break;
       }
       case import_services15.Invitation.State.AUTHENTICATING: {
-        (_h = (_g = hooks == null ? void 0 : hooks.host) == null ? void 0 : _g.onAuthenticating) == null ? void 0 : _h.call(_g, hostObservable);
+        hooks?.host?.onAuthenticating?.(hostObservable);
         break;
       }
       case import_services15.Invitation.State.SUCCESS: {
-        if ((_j = (_i = hooks == null ? void 0 : hooks.host) == null ? void 0 : _i.onSuccess) == null ? void 0 : _j.call(_i, hostObservable)) {
+        if (hooks?.host?.onSuccess?.(hostObservable)) {
           break;
         }
         hostComplete.wake({
@@ -4880,7 +4868,7 @@ var performInvitation = ({ host, guest, options, hooks }) => {
         break;
       }
       case import_services15.Invitation.State.CANCELLED: {
-        if ((_l = (_k = hooks == null ? void 0 : hooks.host) == null ? void 0 : _k.onCancelled) == null ? void 0 : _l.call(_k, hostObservable)) {
+        if (hooks?.host?.onCancelled?.(hostObservable)) {
           break;
         }
         hostComplete.wake({
@@ -4889,7 +4877,7 @@ var performInvitation = ({ host, guest, options, hooks }) => {
         break;
       }
       case import_services15.Invitation.State.TIMEOUT: {
-        if ((_n = (_m = hooks == null ? void 0 : hooks.host) == null ? void 0 : _m.onTimeout) == null ? void 0 : _n.call(_m, hostObservable)) {
+        if (hooks?.host?.onTimeout?.(hostObservable)) {
           break;
         }
         hostComplete.wake({
@@ -4899,8 +4887,7 @@ var performInvitation = ({ host, guest, options, hooks }) => {
       }
     }
   }, (error) => {
-    var _a, _b;
-    if ((_b = (_a = hooks == null ? void 0 : hooks.host) == null ? void 0 : _a.onError) == null ? void 0 : _b.call(_a, hostObservable)) {
+    if (hooks?.host?.onError?.(hostObservable)) {
       return;
     }
     hostComplete.wake({
@@ -4913,9 +4900,9 @@ var performInvitation = ({ host, guest, options, hooks }) => {
   ];
 };
 var createInvitation = (host, options) => {
-  options != null ? options : options = {
+  options ??= {
     authMethod: import_services15.Invitation.AuthMethod.NONE,
-    ...options != null ? options : {}
+    ...options ?? {}
   };
   if (host instanceof ServiceContext) {
     const hostHandler = host.getInvitationHandler({
@@ -5011,18 +4998,15 @@ var TestPeer = class {
     return this._props;
   }
   get storage() {
-    var _a, _b;
-    return (_b = (_a = this._props).storage) != null ? _b : _a.storage = (0, import_random_access_storage2.createStorage)({
+    return this._props.storage ??= (0, import_random_access_storage2.createStorage)({
       type: this.opts.storageType
     });
   }
   get keyring() {
-    var _a, _b;
-    return (_b = (_a = this._props).keyring) != null ? _b : _a.keyring = new import_keyring2.Keyring(this.storage.createDirectory("keyring"));
+    return this._props.keyring ??= new import_keyring2.Keyring(this.storage.createDirectory("keyring"));
   }
   get feedStore() {
-    var _a, _b;
-    return (_b = (_a = this._props).feedStore) != null ? _b : _a.feedStore = new import_feed_store5.FeedStore({
+    return this._props.feedStore ??= new import_feed_store5.FeedStore({
       factory: new import_feed_store5.FeedFactory({
         root: this.storage.createDirectory("feeds"),
         signer: this.keyring,
@@ -5033,27 +5017,22 @@ var TestPeer = class {
     });
   }
   get metadataStore() {
-    var _a, _b;
-    return (_b = (_a = this._props).metadataStore) != null ? _b : _a.metadataStore = new import_echo_pipeline5.MetadataStore(this.storage.createDirectory("metadata"));
+    return this._props.metadataStore ??= new import_echo_pipeline5.MetadataStore(this.storage.createDirectory("metadata"));
   }
   get blobStore() {
-    var _a, _b;
-    return (_b = (_a = this._props).blobStore) != null ? _b : _a.blobStore = new import_teleport_extension_object_sync2.BlobStore(this.storage.createDirectory("blobs"));
+    return this._props.blobStore ??= new import_teleport_extension_object_sync2.BlobStore(this.storage.createDirectory("blobs"));
   }
   get snapshotStore() {
-    var _a, _b;
-    return (_b = (_a = this._props).snapshotStore) != null ? _b : _a.snapshotStore = new import_echo_pipeline5.SnapshotStore(this.storage.createDirectory("snapshots"));
+    return this._props.snapshotStore ??= new import_echo_pipeline5.SnapshotStore(this.storage.createDirectory("snapshots"));
   }
   get networkManager() {
-    var _a, _b;
-    return (_b = (_a = this._props).networkManager) != null ? _b : _a.networkManager = new import_network_manager3.NetworkManager({
+    return this._props.networkManager ??= new import_network_manager3.NetworkManager({
       signalManager: new import_messaging2.MemorySignalManager(this.signalContext),
       transportFactory: import_network_manager3.MemoryTransportFactory
     });
   }
   get spaceManager() {
-    var _a, _b;
-    return (_b = (_a = this._props).spaceManager) != null ? _b : _a.spaceManager = new import_echo_pipeline5.SpaceManager({
+    return this._props.spaceManager ??= new import_echo_pipeline5.SpaceManager({
       feedStore: this.feedStore,
       networkManager: this.networkManager,
       metadataStore: this.metadataStore,
@@ -5063,16 +5042,13 @@ var TestPeer = class {
     });
   }
   get identity() {
-    var _a;
-    return (_a = this._props.signingContext) != null ? _a : (0, import_debug8.failUndefined)();
+    return this._props.signingContext ?? (0, import_debug8.failUndefined)();
   }
   get dataSpaceManager() {
-    var _a, _b;
-    return (_b = (_a = this._props).dataSpaceManager) != null ? _b : _a.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, new import_echo_pipeline5.DataServiceSubscriptions(), this.keyring, this.identity, this.feedStore);
+    return this._props.dataSpaceManager ??= new DataSpaceManager(this.spaceManager, this.metadataStore, new import_echo_pipeline5.DataServiceSubscriptions(), this.keyring, this.identity, this.feedStore);
   }
   async createIdentity() {
-    var _a, _b;
-    (_b = (_a = this._props).signingContext) != null ? _b : _a.signingContext = await createSigningContext(this.keyring);
+    this._props.signingContext ??= await createSigningContext(this.keyring);
   }
   async destroy() {
     await this.storage.reset();