@dxos/client-services 0.5.1-next.bb5476b → 0.5.1-next.d0efa9a

package/dist/lib/browser/{chunk-E7BDB5EP.mjs → chunk-AZWKEPKJ.mjs}

@@ -2594,7 +2594,7 @@ var SpaceInvitationProtocol = class {
         ""
       ]
     });
-    const space = await this._spaceManager.spaces.get(this._spaceKey);
+    const space = this._spaceManager.spaces.get(this._spaceKey);
     invariant9(space, void 0, {
       F: __dxlog_file10,
       L: 58,
@@ -2623,10 +2623,10 @@ var SpaceInvitationProtocol = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    const credentials = await createAdmissionCredentials(this._signingContext.credentialSigner, identityKey, space.key, space.inner.genesisFeedKey, guestProfile, invitation.delegationCredentialId);
+    const credentials = await createAdmissionCredentials(this._signingContext.credentialSigner, identityKey, space.key, space.inner.genesisFeedKey, invitation.role ?? SpaceMember.Role.ADMIN, space.inner.spaceState.membershipChainHeads, guestProfile, invitation.delegationCredentialId);
     invariant9(credentials[0].credential, void 0, {
       F: __dxlog_file10,
-      L: 75,
+      L: 77,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2636,7 +2636,7 @@ var SpaceInvitationProtocol = class {
     const spaceMemberCredential = credentials[0].credential.credential;
     invariant9(getCredentialAssertion(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file10,
-      L: 77,
+      L: 79,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2654,7 +2654,7 @@ var SpaceInvitationProtocol = class {
   async delegate(invitation) {
     invariant9(this._spaceKey, void 0, {
       F: __dxlog_file10,
-      L: 90,
+      L: 92,
       S: this,
       A: [
         "this._spaceKey",
@@ -2664,7 +2664,7 @@ var SpaceInvitationProtocol = class {
     const space = this._spaceManager.spaces.get(this._spaceKey);
     invariant9(space, void 0, {
       F: __dxlog_file10,
-      L: 92,
+      L: 94,
       S: this,
       A: [
         "space",
@@ -2674,7 +2674,7 @@ var SpaceInvitationProtocol = class {
     if (invitation.authMethod === Invitation5.AuthMethod.KNOWN_PUBLIC_KEY) {
       invariant9(invitation.guestKeypair?.publicKey, void 0, {
         F: __dxlog_file10,
-        L: 94,
+        L: 96,
         S: this,
         A: [
           "invitation.guestKeypair?.publicKey",
@@ -2687,7 +2687,7 @@ var SpaceInvitationProtocol = class {
       id: invitation.invitationId
     }, {
       F: __dxlog_file10,
-      L: 97,
+      L: 99,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2695,14 +2695,14 @@ var SpaceInvitationProtocol = class {
       invitationId: invitation.invitationId,
       authMethod: invitation.authMethod,
       swarmKey: invitation.swarmKey,
-      role: SpaceMember.Role.ADMIN,
+      role: invitation.role ?? SpaceMember.Role.ADMIN,
       expiresOn: invitation.lifetime ? new Date((invitation.created?.getTime() ?? Date.now()) + invitation.lifetime) : void 0,
       multiUse: invitation.multiUse ?? false,
       guestKey: invitation.authMethod === Invitation5.AuthMethod.KNOWN_PUBLIC_KEY ? invitation.guestKeypair.publicKey : void 0
     });
     invariant9(credential.credential, void 0, {
       F: __dxlog_file10,
-      L: 117,
+      L: 119,
       S: this,
       A: [
         "credential.credential",
@@ -2717,7 +2717,7 @@ var SpaceInvitationProtocol = class {
   async cancelDelegation(invitation) {
     invariant9(this._spaceKey, void 0, {
       F: __dxlog_file10,
-      L: 123,
+      L: 125,
       S: this,
       A: [
         "this._spaceKey",
@@ -2726,7 +2726,7 @@ var SpaceInvitationProtocol = class {
     });
     invariant9(invitation.type === Invitation5.Type.DELEGATED && invitation.delegationCredentialId, void 0, {
       F: __dxlog_file10,
-      L: 124,
+      L: 126,
       S: this,
       A: [
         "invitation.type === Invitation.Type.DELEGATED && invitation.delegationCredentialId",
@@ -2736,7 +2736,7 @@ var SpaceInvitationProtocol = class {
     const space = this._spaceManager.spaces.get(this._spaceKey);
     invariant9(space, void 0, {
       F: __dxlog_file10,
-      L: 126,
+      L: 128,
       S: this,
       A: [
         "space",
@@ -2748,14 +2748,14 @@ var SpaceInvitationProtocol = class {
       id: invitation.invitationId
     }, {
       F: __dxlog_file10,
-      L: 128,
+      L: 130,
       S: this,
       C: (f, a) => f(...a)
     });
     const credential = await createCancelDelegatedSpaceInvitationCredential(this._signingContext.credentialSigner, space.key, invitation.delegationCredentialId);
     invariant9(credential.credential, void 0, {
       F: __dxlog_file10,
-      L: 135,
+      L: 137,
       S: this,
       A: [
         "credential.credential",
@@ -2791,7 +2791,7 @@ var SpaceInvitationProtocol = class {
   async accept(response) {
     invariant9(response.space, void 0, {
       F: __dxlog_file10,
-      L: 167,
+      L: 169,
       S: this,
       A: [
         "response.space",
@@ -2802,7 +2802,7 @@ var SpaceInvitationProtocol = class {
     const assertion = getCredentialAssertion(credential);
     invariant9(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
       F: __dxlog_file10,
-      L: 170,
+      L: 172,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2811,7 +2811,7 @@ var SpaceInvitationProtocol = class {
     });
     invariant9(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
       F: __dxlog_file10,
-      L: 171,
+      L: 173,
       S: this,
       A: [
         "credential.subject.id.equals(this._signingContext.identityKey)",
@@ -2844,6 +2844,7 @@ import { invariant as invariant10 } from "@dxos/invariant";
 import { PublicKey as PublicKey8 } from "@dxos/keys";
 import { log as log9 } from "@dxos/log";
 import { Invitation as Invitation6 } from "@dxos/protocols/proto/dxos/client/services";
+import { SpaceMember as SpaceMember2 } from "@dxos/protocols/proto/dxos/halo/credentials";
 var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-manager.ts";
 var InvitationsManager = class {
   constructor(_invitationsHandler, _getHandler, _metadataStore) {
@@ -2884,7 +2885,7 @@ var InvitationsManager = class {
     } catch (err) {
       log9.catch(err, void 0, {
         F: __dxlog_file11,
-        L: 76,
+        L: 77,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2907,7 +2908,7 @@ var InvitationsManager = class {
       const loadTasks = freshInvitations.map((persistentInvitation) => {
         invariant10(!this._createInvitations.get(persistentInvitation.invitationId), "invitation already exists", {
           F: __dxlog_file11,
-          L: 97,
+          L: 98,
           S: this,
           A: [
             "!this._createInvitations.get(persistentInvitation.invitationId)",
@@ -2926,7 +2927,7 @@ var InvitationsManager = class {
     } catch (err) {
       log9.catch(err, void 0, {
         F: __dxlog_file11,
-        L: 104,
+        L: 105,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2958,13 +2959,13 @@ var InvitationsManager = class {
   async authenticate({ invitationId, authCode }) {
     log9("authenticating...", void 0, {
       F: __dxlog_file11,
-      L: 134,
+      L: 135,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant10(invitationId, void 0, {
       F: __dxlog_file11,
-      L: 135,
+      L: 136,
       S: this,
       A: [
         "invitationId",
@@ -2977,7 +2978,7 @@ var InvitationsManager = class {
         invitationId
       }, {
         F: __dxlog_file11,
-        L: 138,
+        L: 139,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2990,13 +2991,13 @@ var InvitationsManager = class {
       invitationId
     }, {
       F: __dxlog_file11,
-      L: 145,
+      L: 146,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant10(invitationId, void 0, {
       F: __dxlog_file11,
-      L: 146,
+      L: 147,
       S: this,
       A: [
         "invitationId",
@@ -3042,7 +3043,7 @@ var InvitationsManager = class {
     }
   }
   _createInvitation(protocol, options) {
-    const { invitationId = PublicKey8.random().toHex(), type = Invitation6.Type.INTERACTIVE, authMethod = Invitation6.AuthMethod.SHARED_SECRET, state = Invitation6.State.INIT, timeout = INVITATION_TIMEOUT2, swarmKey = PublicKey8.random(), persistent = options?.authMethod !== Invitation6.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, lifetime = 86400, multiUse = false } = options ?? {};
+    const { invitationId = PublicKey8.random().toHex(), type = Invitation6.Type.INTERACTIVE, authMethod = Invitation6.AuthMethod.SHARED_SECRET, state = Invitation6.State.INIT, timeout = INVITATION_TIMEOUT2, swarmKey = PublicKey8.random(), persistent = options?.authMethod !== Invitation6.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, role = SpaceMember2.Role.ADMIN, lifetime = 86400, multiUse = false } = options ?? {};
     const authCode = options?.authCode ?? (authMethod === Invitation6.AuthMethod.SHARED_SECRET ? generatePasscode(AUTHENTICATION_CODE_LENGTH) : void 0);
     return {
       invitationId,
@@ -3056,6 +3057,7 @@ var InvitationsManager = class {
       guestKeypair: guestKeypair ?? (authMethod === Invitation6.AuthMethod.KNOWN_PUBLIC_KEY ? createAdmissionKeypair() : void 0),
       created,
       lifetime,
+      role,
       multiUse,
       delegationCredentialId: options?.delegationCredentialId,
       ...protocol.getInvitationContext()
@@ -3074,7 +3076,7 @@ var InvitationsManager = class {
         ...handler.toJSON()
       }, {
         F: __dxlog_file11,
-        L: 233,
+        L: 236,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3107,7 +3109,7 @@ var InvitationsManager = class {
             ...handler.toJSON()
           }, {
             F: __dxlog_file11,
-            L: 253,
+            L: 256,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3118,7 +3120,7 @@ var InvitationsManager = class {
         } else {
           log9.warn("auth failed", err, {
             F: __dxlog_file11,
-            L: 256,
+            L: 259,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3135,7 +3137,7 @@ var InvitationsManager = class {
         ...handler.toJSON()
       }, {
         F: __dxlog_file11,
-        L: 263,
+        L: 266,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3180,7 +3182,7 @@ var InvitationsManager = class {
     } catch (err) {
       log9.catch(err, void 0, {
         F: __dxlog_file11,
-        L: 299,
+        L: 302,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3287,6 +3289,7 @@ import { PublicKey as PublicKey10 } from "@dxos/keys";
 import { log as log11 } from "@dxos/log";
 import { CancelledError, SystemError } from "@dxos/protocols";
 import { SpaceState, CreateEpochRequest } from "@dxos/protocols/proto/dxos/client/services";
+import { SpaceMember as SpaceMember3 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { AdmittedFeed as AdmittedFeed3 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Timeframe as Timeframe2 } from "@dxos/timeframe";
 import { trace as trace6 } from "@dxos/tracing";
@@ -3635,7 +3638,7 @@ var DataSpace = class {
     this._callbacks = params.callbacks ?? {};
     this._echoHost = params.echoHost;
     this.authVerifier = new TrustedKeySetAuthVerifier({
-      trustedKeysProvider: () => new ComplexSet5(PublicKey10.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => !member.removed).map((member) => member.key)),
+      trustedKeysProvider: () => new ComplexSet5(PublicKey10.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => member.role !== SpaceMember3.Role.REMOVED).map((member) => member.key)),
       update: this._inner.stateUpdate,
       authTimeout: AUTH_TIMEOUT2
     });
@@ -3645,7 +3648,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file13,
-      L: 136,
+      L: 137,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3695,7 +3698,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file13,
-      L: 194,
+      L: 195,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3713,7 +3716,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file13,
-      L: 208,
+      L: 209,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3745,7 +3748,7 @@ var DataSpace = class {
         if (err instanceof CancelledError || err instanceof ContextDisposedError3) {
           log11("data pipeline initialization cancelled", err, {
             F: __dxlog_file13,
-            L: 241,
+            L: 242,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3753,7 +3756,7 @@ var DataSpace = class {
         }
         log11.error("Error initializing data pipeline", err, {
           F: __dxlog_file13,
-          L: 245,
+          L: 246,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3762,7 +3765,7 @@ var DataSpace = class {
           state: SpaceState[this._state]
         }, {
           F: __dxlog_file13,
-          L: 247,
+          L: 248,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3782,7 +3785,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file13,
-      L: 263,
+      L: 264,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3792,7 +3795,7 @@ var DataSpace = class {
     await cancelWithContext4(this._ctx, this.automergeSpaceState.ensureEpochInitialized());
     log11("data pipeline ready", void 0, {
       F: __dxlog_file13,
-      L: 275,
+      L: 276,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3802,7 +3805,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file13,
-      L: 279,
+      L: 280,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3818,7 +3821,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     log11("writable feeds created", void 0, {
       F: __dxlog_file13,
-      L: 295,
+      L: 296,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3881,7 +3884,7 @@ var DataSpace = class {
       rootUrl
     }, {
       F: __dxlog_file13,
-      L: 361,
+      L: 362,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3913,7 +3916,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file13,
-          L: 384,
+          L: 385,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3968,7 +3971,7 @@ var DataSpace = class {
           const newRoot = this._echoHost.automergeRepo.create(rootHandle.docSync());
           invariant12(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
             F: __dxlog_file13,
-            L: 434,
+            L: 435,
             S: this,
             A: [
               "typeof newRoot.url === 'string' && newRoot.url.length > 0",
@@ -3987,7 +3990,7 @@ var DataSpace = class {
         {
           log11.info("Fragmenting", void 0, {
             F: __dxlog_file13,
-            L: 446,
+            L: 447,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3999,7 +4002,7 @@ var DataSpace = class {
           const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
           invariant12(properties, "Properties not found", {
             F: __dxlog_file13,
-            L: 456,
+            L: 457,
             S: this,
             A: [
               "properties",
@@ -4015,7 +4018,7 @@ var DataSpace = class {
           const newRoot = this._echoHost.automergeRepo.create(newSpaceDoc);
           invariant12(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
             F: __dxlog_file13,
-            L: 461,
+            L: 462,
             S: this,
             A: [
               "typeof newRoot.url === 'string' && newRoot.url.length > 0",
@@ -4084,7 +4087,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file13,
-      L: 527,
+      L: 528,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4152,7 +4155,7 @@ import { ComplexMap as ComplexMap3, deferFunction as deferFunction2, forEachAsyn
 // packages/sdk/client-services/src/packlets/spaces/genesis.ts
 import { createCredential } from "@dxos/credentials";
 import { failUndefined } from "@dxos/debug";
-import { AdmittedFeed as AdmittedFeed4, SpaceMember as SpaceMember2 } from "@dxos/protocols/proto/dxos/halo/credentials";
+import { AdmittedFeed as AdmittedFeed4, SpaceMember as SpaceMember4 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Timeframe as Timeframe3 } from "@dxos/timeframe";
 var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
   const credentials = [
@@ -4172,7 +4175,7 @@ var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
       assertion: {
         "@type": "dxos.halo.credentials.SpaceMember",
         spaceKey: space.key,
-        role: SpaceMember2.Role.ADMIN,
+        role: SpaceMember4.Role.OWNER,
         profile: signingContext.getProfile(),
         genesisFeedKey: space.controlFeedKey ?? failUndefined()
       }
@@ -4605,7 +4608,8 @@ import { raise as raise2 } from "@dxos/debug";
 import { invariant as invariant14 } from "@dxos/invariant";
 import { log as log13 } from "@dxos/log";
 import { ApiError, SpaceNotFoundError, encodeError } from "@dxos/protocols";
-import { SpaceMember as SpaceMember3, SpaceState as SpaceState3 } from "@dxos/protocols/proto/dxos/client/services";
+import { SpaceMember as SpaceMember5, SpaceState as SpaceState3 } from "@dxos/protocols/proto/dxos/client/services";
+import { SpaceMember as HaloSpaceMember } from "@dxos/protocols/proto/dxos/halo/credentials";
 var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
 var SpacesServiceImpl = class {
   constructor(_identityManager, _spaceManager, _getDataSpaceManager) {
@@ -4637,6 +4641,9 @@ var SpacesServiceImpl = class {
       }
     }
   }
+  async updateMemberRole(_) {
+    throw new Error("not implemented");
+  }
   querySpaces() {
     return new Stream10(({ next, ctx }) => {
       const scheduler = new UpdateScheduler(ctx, async () => {
@@ -4646,7 +4653,7 @@ var SpacesServiceImpl = class {
           spaces
         }, {
           F: __dxlog_file15,
-          L: 77,
+          L: 82,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4729,7 +4736,7 @@ var SpacesServiceImpl = class {
       } else {
         invariant14(!credential.id, "Id on unsigned credentials is not allowed", {
           F: __dxlog_file15,
-          L: 164,
+          L: 169,
           S: this,
           A: [
             "!credential.id",
@@ -4738,7 +4745,7 @@ var SpacesServiceImpl = class {
         });
         invariant14(this._identityManager.identity, "Identity is not available", {
           F: __dxlog_file15,
-          L: 165,
+          L: 170,
           S: this,
           A: [
             "this._identityManager.identity",
@@ -4748,7 +4755,7 @@ var SpacesServiceImpl = class {
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
         invariant14(credential.issuer.equals(signer.getIssuer()), void 0, {
           F: __dxlog_file15,
-          L: 167,
+          L: 172,
           S: this,
           A: [
             "credential.issuer.equals(signer.getIssuer())",
@@ -4803,7 +4810,7 @@ var SpacesServiceImpl = class {
             identityKey: member.key,
             profile: member.profile ?? {}
           },
-          presence: member.removed ? SpaceMember3.PresenceState.REMOVED : isMe || peers.length > 0 ? SpaceMember3.PresenceState.ONLINE : SpaceMember3.PresenceState.OFFLINE,
+          presence: member.role === HaloSpaceMember.Role.REMOVED ? SpaceMember5.PresenceState.REMOVED : isMe || peers.length > 0 ? SpaceMember5.PresenceState.ONLINE : SpaceMember5.PresenceState.OFFLINE,
           peerStates: peers
         };
       }),
@@ -5125,15 +5132,16 @@ var ServiceRegistry = class {
 };
 
 // packages/sdk/client-services/src/packlets/diagnostics/diagnostics.ts
+import { asyncTimeout as asyncTimeout2 } from "@dxos/async";
 import { getFirstStreamValue } from "@dxos/codec-protobuf";
 import { credentialTypeFilter } from "@dxos/credentials";
 import { invariant as invariant16 } from "@dxos/invariant";
 import { STORAGE_VERSION as STORAGE_VERSION2 } from "@dxos/protocols";
-import { SpaceMember as SpaceMember4 } from "@dxos/protocols/proto/dxos/client/services";
+import { SpaceMember as SpaceMember6 } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.5.1-next.bb5476b";
+var DXOS_VERSION = "0.5.1-next.d0efa9a";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -5180,63 +5188,55 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
     },
     trace: TRACE_PROCESSOR.getDiagnostics()
   };
-  {
-    invariant16(clientServices.LoggingService, "SystemService is not available.", {
-      F: __dxlog_file17,
-      L: 108,
-      S: void 0,
-      A: [
-        "clientServices.LoggingService",
-        "'SystemService is not available.'"
-      ]
-    });
-    diagnostics.metrics = await getFirstStreamValue(clientServices.LoggingService.queryMetrics({}), {
-      timeout: DEFAULT_TIMEOUT
-    }).catch(() => void 0);
-  }
-  if (typeof navigator !== "undefined" && navigator.storage) {
-    const map = /* @__PURE__ */ new Map();
-    const dir = await navigator.storage.getDirectory();
-    for await (const filename of dir?.keys()) {
-      const idx = filename.indexOf("-", filename.indexOf("-") + 1);
-      if (idx === -1) {
-        continue;
+  await Promise.all([
+    (async () => {
+      invariant16(clientServices.LoggingService, "SystemService is not available.", {
+        F: __dxlog_file17,
+        L: 110,
+        S: void 0,
+        A: [
+          "clientServices.LoggingService",
+          "'SystemService is not available.'"
+        ]
+      });
+      diagnostics.metrics = await getFirstStreamValue(clientServices.LoggingService.queryMetrics({}), {
+        timeout: DEFAULT_TIMEOUT
+      }).catch(() => void 0);
+    })(),
+    (async () => {
+      diagnostics.storage = await asyncTimeout2(getStorageDiagnostics(), DEFAULT_TIMEOUT).catch(() => void 0);
+    })(),
+    async () => {
+      const identity = serviceContext.identityManager.identity;
+      if (identity) {
+        diagnostics.identity = {
+          identityKey: identity.identityKey,
+          spaceKey: identity.space.key,
+          profile: identity.profileDocument
+        };
+        const { devices } = await getFirstStreamValue(clientServices.DevicesService.queryDevices(), {
+          timeout: DEFAULT_TIMEOUT
+        }).catch(() => void 0) ?? {};
+        diagnostics.devices = devices;
+        if (serviceContext.dataSpaceManager) {
+          diagnostics.spaces = await Promise.all(Array.from(serviceContext.dataSpaceManager.spaces.values()).map((space) => getSpaceStats(space)) ?? []);
+        }
+        const { feeds = [] } = await getFirstStreamValue(clientServices.DevtoolsHost.subscribeToFeeds({}), {
+          timeout: DEFAULT_TIMEOUT
+        }).catch(() => void 0) ?? {};
+        diagnostics.feeds = feeds.map(({ feedKey, bytes, length }) => ({
+          feedKey,
+          bytes,
+          length
+        }));
+        const status = await getFirstStreamValue(clientServices.NetworkService.queryStatus(), {
+          timeout: DEFAULT_TIMEOUT
+        }).catch(() => void 0);
+        diagnostics.networkStatus = status;
+        diagnostics.swarms = serviceContext.networkManager.connectionLog?.swarms;
       }
-      map.set(filename.slice(0, idx), (map.get(filename.slice(0, idx)) ?? 0) + 1);
     }
-    diagnostics.storage = Array.from(map.entries()).sort((a, b) => b[1] - a[1]).map(([file, count]) => ({
-      file,
-      count
-    }));
-  }
-  const identity = serviceContext.identityManager.identity;
-  if (identity) {
-    diagnostics.identity = {
-      identityKey: identity.identityKey,
-      spaceKey: identity.space.key,
-      profile: identity.profileDocument
-    };
-    const { devices } = await getFirstStreamValue(clientServices.DevicesService.queryDevices(), {
-      timeout: DEFAULT_TIMEOUT
-    }).catch(() => void 0) ?? {};
-    diagnostics.devices = devices;
-    if (serviceContext.dataSpaceManager) {
-      diagnostics.spaces = await Promise.all(Array.from(serviceContext.dataSpaceManager.spaces.values()).map((space) => getSpaceStats(space)) ?? []);
-    }
-    const { feeds = [] } = await getFirstStreamValue(clientServices.DevtoolsHost.subscribeToFeeds({}), {
-      timeout: DEFAULT_TIMEOUT
-    }).catch(() => void 0) ?? {};
-    diagnostics.feeds = feeds.map(({ feedKey, bytes, length }) => ({
-      feedKey,
-      bytes,
-      length
-    }));
-    const status = await getFirstStreamValue(clientServices.NetworkService.queryStatus(), {
-      timeout: DEFAULT_TIMEOUT
-    }).catch(() => void 0);
-    diagnostics.networkStatus = status;
-    diagnostics.swarms = serviceContext.networkManager.connectionLog?.swarms;
-  }
+  ]);
   diagnostics.config = config.values;
   return diagnostics;
 };
@@ -5255,7 +5255,7 @@ var getSpaceStats = async (space) => {
           displayName: member.assertion.profile?.displayName
         }
       },
-      presence: space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? SpaceMember4.PresenceState.ONLINE : SpaceMember4.PresenceState.OFFLINE
+      presence: space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? SpaceMember6.PresenceState.ONLINE : SpaceMember6.PresenceState.OFFLINE
     })),
     pipeline: {
       // TODO(burdon): Pick properties from credentials if needed.
@@ -5273,6 +5273,24 @@ var getSpaceStats = async (space) => {
   }
   return stats;
 };
+var getStorageDiagnostics = async () => {
+  if (typeof navigator === "undefined" || !navigator.storage) {
+    return void 0;
+  }
+  const map = /* @__PURE__ */ new Map();
+  const dir = await navigator.storage.getDirectory();
+  for await (const filename of dir?.keys()) {
+    const idx = filename.indexOf("-", filename.indexOf("-") + 1);
+    if (idx === -1) {
+      continue;
+    }
+    map.set(filename.slice(0, idx), (map.get(filename.slice(0, idx)) ?? 0) + 1);
+  }
+  return Array.from(map.entries()).sort((a, b) => b[1] - a[1]).map(([file, count]) => ({
+    file,
+    count
+  }));
+};
 
 // packages/sdk/client-services/src/packlets/diagnostics/browser-diagnostics-broadcast.ts
 import { Trigger as Trigger7 } from "@dxos/async";
@@ -5473,7 +5491,7 @@ var DevicesServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/locks/browser.ts
-import { asyncTimeout as asyncTimeout2, Trigger as Trigger8 } from "@dxos/async";
+import { asyncTimeout as asyncTimeout3, Trigger as Trigger8 } from "@dxos/async";
 import { RESOURCE_LOCK_TIMEOUT } from "@dxos/client-protocol";
 import { log as log16, logInfo } from "@dxos/log";
 function _ts_decorate7(decorators, target, key, desc) {
@@ -5514,7 +5532,7 @@ var Lock = class {
         S: this,
         C: (f, a) => f(...a)
       });
-      await asyncTimeout2(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
+      await asyncTimeout3(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
       log16("acquired lock", void 0, {
         F: __dxlog_file20,
         L: 44,
@@ -6207,7 +6225,7 @@ var ClientServicesHost = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    log18("resetting...", void 0, {
+    log18.info("resetting...", void 0, {
       F: __dxlog_file21,
       L: 342,
       S: this,
@@ -6215,7 +6233,7 @@ var ClientServicesHost = class {
     });
     await this._serviceContext?.close();
     await this._storage.reset();
-    log18("reset", void 0, {
+    log18.info("reset", void 0, {
       F: __dxlog_file21,
       L: 345,
       S: this,
@@ -6293,6 +6311,7 @@ import { humanize } from "@dxos/util";
 var ClientServicesProviderResource = Symbol.for("dxos.resource.ClientServices");
 
 // packages/sdk/client-services/src/packlets/diagnostics/diagnostics-collector.ts
+var GET_DIAGNOSTICS_RPC_TIMEOUT = 1e4;
 var DiagnosticsCollector = class {
   static {
     this.broadcastSender = createCollectDiagnosticsBroadcastSender();
@@ -6300,6 +6319,8 @@ var DiagnosticsCollector = class {
   static async collect(config = findConfigs(), services = findSystemServiceProvider(), options = {}) {
     const serviceDiagnostics = await services?.services?.SystemService?.getDiagnostics({
       keys: options.humanize ? GetDiagnosticsRequest2.KEY_OPTION.HUMANIZE : options.truncate ? GetDiagnosticsRequest2.KEY_OPTION.TRUNCATE : void 0
+    }, {
+      timeout: GET_DIAGNOSTICS_RPC_TIMEOUT
     });
     const clientDiagnostics = {
       config,
@@ -6316,12 +6337,12 @@ var DiagnosticsCollector = class {
   }
 };
 var findSystemServiceProvider = () => {
-  const serviceProviders = TRACE_PROCESSOR3.findByAnnotation(ClientServicesProviderResource);
+  const serviceProviders = TRACE_PROCESSOR3.findResourcesByAnnotation(ClientServicesProviderResource);
   const providerResource = serviceProviders.find((r) => r.instance.deref()?.services?.SystemService != null);
   return providerResource?.instance?.deref() ?? null;
 };
 var findConfigs = () => {
-  const configs = TRACE_PROCESSOR3.findByAnnotation(ConfigResource);
+  const configs = TRACE_PROCESSOR3.findResourcesByAnnotation(ConfigResource);
   return configs.map((r) => r.instance.deref()).filter(nonNullable);
 };
 
@@ -6365,4 +6386,4 @@ export {
   ClientServicesHost,
   ClientServicesProviderResource
 };
-//# sourceMappingURL=chunk-E7BDB5EP.mjs.map
+//# sourceMappingURL=chunk-AZWKEPKJ.mjs.map