@dxos/client-services 0.5.1-next.638da00 → 0.5.1-next.65aaa36

package/dist/lib/node/{chunk-2PGHNVRY.cjs → chunk-ITFB7UCR.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_2PGHNVRY_exports = {};
-__export(chunk_2PGHNVRY_exports, {
+var chunk_ITFB7UCR_exports = {};
+__export(chunk_ITFB7UCR_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   ClientServicesProviderResource: () => ClientServicesProviderResource,
@@ -66,7 +66,7 @@ __export(chunk_2PGHNVRY_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_2PGHNVRY_exports);
+module.exports = __toCommonJS(chunk_ITFB7UCR_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -172,7 +172,6 @@ var import_invariant10 = require("@dxos/invariant");
 var import_keys8 = require("@dxos/keys");
 var import_log9 = require("@dxos/log");
 var import_services8 = require("@dxos/protocols/proto/dxos/client/services");
-var import_credentials10 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_codec_protobuf9 = require("@dxos/codec-protobuf");
 var import_debug2 = require("@dxos/debug");
 var import_rpc = require("@dxos/rpc");
@@ -189,13 +188,12 @@ var import_keys9 = require("@dxos/keys");
 var import_log10 = require("@dxos/log");
 var import_protocols8 = require("@dxos/protocols");
 var import_services9 = require("@dxos/protocols/proto/dxos/client/services");
-var import_credentials11 = require("@dxos/protocols/proto/dxos/halo/credentials");
-var import_credentials12 = require("@dxos/protocols/proto/dxos/halo/credentials");
+var import_credentials10 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe2 = require("@dxos/timeframe");
 var import_tracing4 = require("@dxos/tracing");
 var import_util6 = require("@dxos/util");
 var import_async12 = require("@dxos/async");
-var import_credentials13 = require("@dxos/credentials");
+var import_credentials11 = require("@dxos/credentials");
 var import_async13 = require("@dxos/async");
 var import_context10 = require("@dxos/context");
 var import_invariant12 = require("@dxos/invariant");
@@ -206,7 +204,7 @@ var import_teleport3 = require("@dxos/teleport");
 var import_util7 = require("@dxos/util");
 var import_async14 = require("@dxos/async");
 var import_context11 = require("@dxos/context");
-var import_credentials14 = require("@dxos/credentials");
+var import_credentials12 = require("@dxos/credentials");
 var import_invariant13 = require("@dxos/invariant");
 var import_keys11 = require("@dxos/keys");
 var import_log12 = require("@dxos/log");
@@ -214,9 +212,9 @@ var import_protocols10 = require("@dxos/protocols");
 var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_gossip2 = require("@dxos/teleport-extension-gossip");
 var import_util8 = require("@dxos/util");
-var import_credentials15 = require("@dxos/credentials");
+var import_credentials13 = require("@dxos/credentials");
 var import_debug4 = require("@dxos/debug");
-var import_credentials16 = require("@dxos/protocols/proto/dxos/halo/credentials");
+var import_credentials14 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe3 = require("@dxos/timeframe");
 var import_async15 = require("@dxos/async");
 var import_codec_protobuf10 = require("@dxos/codec-protobuf");
@@ -225,10 +223,9 @@ var import_invariant14 = require("@dxos/invariant");
 var import_log13 = require("@dxos/log");
 var import_protocols11 = require("@dxos/protocols");
 var import_services11 = require("@dxos/protocols/proto/dxos/client/services");
-var import_credentials17 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_async16 = require("@dxos/async");
 var import_context12 = require("@dxos/context");
-var import_credentials18 = require("@dxos/credentials");
+var import_credentials15 = require("@dxos/credentials");
 var import_debug6 = require("@dxos/debug");
 var import_echo_db = require("@dxos/echo-db");
 var import_echo_pipeline4 = require("@dxos/echo-pipeline");
@@ -242,9 +239,8 @@ var import_services12 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_object_sync = require("@dxos/teleport-extension-object-sync");
 var import_tracing5 = require("@dxos/tracing");
 var import_util9 = require("@dxos/util");
-var import_async17 = require("@dxos/async");
 var import_codec_protobuf11 = require("@dxos/codec-protobuf");
-var import_credentials19 = require("@dxos/credentials");
+var import_credentials16 = require("@dxos/credentials");
 var import_invariant16 = require("@dxos/invariant");
 var import_protocols13 = require("@dxos/protocols");
 var import_services13 = require("@dxos/protocols/proto/dxos/client/services");
@@ -254,7 +250,7 @@ var import_config = require("@dxos/config");
 var import_services15 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing7 = require("@dxos/tracing");
 var import_util10 = require("@dxos/util");
-var import_async18 = require("@dxos/async");
+var import_async17 = require("@dxos/async");
 var import_client_protocol5 = require("@dxos/client-protocol");
 var import_context13 = require("@dxos/context");
 var import_echo_protocol = require("@dxos/echo-protocol");
@@ -269,14 +265,14 @@ var import_services16 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing8 = require("@dxos/tracing");
 var import_util11 = require("@dxos/util");
 var import_websocket_rpc = require("@dxos/websocket-rpc");
-var import_async19 = require("@dxos/async");
+var import_async18 = require("@dxos/async");
 var import_codec_protobuf12 = require("@dxos/codec-protobuf");
 var import_invariant18 = require("@dxos/invariant");
 var import_services17 = require("@dxos/protocols/proto/dxos/client/services");
 var import_invariant19 = require("@dxos/invariant");
 var import_lock_file = require("@dxos/lock-file");
 var import_log16 = require("@dxos/log");
-var import_async20 = require("@dxos/async");
+var import_async19 = require("@dxos/async");
 var import_codec_protobuf13 = require("@dxos/codec-protobuf");
 var import_keys14 = require("@dxos/keys");
 var import_log17 = require("@dxos/log");
@@ -2747,7 +2743,7 @@ var SpaceInvitationProtocol = class {
         ""
       ]
     });
-    const space = this._spaceManager.spaces.get(this._spaceKey);
+    const space = await this._spaceManager.spaces.get(this._spaceKey);
     (0, import_invariant9.invariant)(space, void 0, {
       F: __dxlog_file10,
       L: 58,
@@ -2776,10 +2772,10 @@ var SpaceInvitationProtocol = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    const credentials = await (0, import_credentials7.createAdmissionCredentials)(this._signingContext.credentialSigner, identityKey, space.key, space.inner.genesisFeedKey, invitation.role ?? import_credentials8.SpaceMember.Role.ADMIN, space.inner.spaceState.membershipChainHeads, guestProfile, invitation.delegationCredentialId);
+    const credentials = await (0, import_credentials7.createAdmissionCredentials)(this._signingContext.credentialSigner, identityKey, space.key, space.inner.genesisFeedKey, guestProfile, invitation.delegationCredentialId);
     (0, import_invariant9.invariant)(credentials[0].credential, void 0, {
       F: __dxlog_file10,
-      L: 77,
+      L: 75,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2789,7 +2785,7 @@ var SpaceInvitationProtocol = class {
     const spaceMemberCredential = credentials[0].credential.credential;
     (0, import_invariant9.invariant)((0, import_credentials7.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file10,
-      L: 79,
+      L: 77,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2807,7 +2803,7 @@ var SpaceInvitationProtocol = class {
   async delegate(invitation) {
     (0, import_invariant9.invariant)(this._spaceKey, void 0, {
       F: __dxlog_file10,
-      L: 92,
+      L: 90,
       S: this,
       A: [
         "this._spaceKey",
@@ -2817,7 +2813,7 @@ var SpaceInvitationProtocol = class {
     const space = this._spaceManager.spaces.get(this._spaceKey);
     (0, import_invariant9.invariant)(space, void 0, {
       F: __dxlog_file10,
-      L: 94,
+      L: 92,
       S: this,
       A: [
         "space",
@@ -2827,7 +2823,7 @@ var SpaceInvitationProtocol = class {
     if (invitation.authMethod === import_services7.Invitation.AuthMethod.KNOWN_PUBLIC_KEY) {
       (0, import_invariant9.invariant)(invitation.guestKeypair?.publicKey, void 0, {
         F: __dxlog_file10,
-        L: 96,
+        L: 94,
         S: this,
         A: [
           "invitation.guestKeypair?.publicKey",
@@ -2840,7 +2836,7 @@ var SpaceInvitationProtocol = class {
       id: invitation.invitationId
     }, {
       F: __dxlog_file10,
-      L: 99,
+      L: 97,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2848,14 +2844,14 @@ var SpaceInvitationProtocol = class {
       invitationId: invitation.invitationId,
       authMethod: invitation.authMethod,
       swarmKey: invitation.swarmKey,
-      role: invitation.role ?? import_credentials8.SpaceMember.Role.ADMIN,
+      role: import_credentials8.SpaceMember.Role.ADMIN,
       expiresOn: invitation.lifetime ? new Date((invitation.created?.getTime() ?? Date.now()) + invitation.lifetime) : void 0,
       multiUse: invitation.multiUse ?? false,
       guestKey: invitation.authMethod === import_services7.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? invitation.guestKeypair.publicKey : void 0
     });
     (0, import_invariant9.invariant)(credential.credential, void 0, {
       F: __dxlog_file10,
-      L: 119,
+      L: 117,
       S: this,
       A: [
         "credential.credential",
@@ -2870,7 +2866,7 @@ var SpaceInvitationProtocol = class {
   async cancelDelegation(invitation) {
     (0, import_invariant9.invariant)(this._spaceKey, void 0, {
       F: __dxlog_file10,
-      L: 125,
+      L: 123,
       S: this,
       A: [
         "this._spaceKey",
@@ -2879,7 +2875,7 @@ var SpaceInvitationProtocol = class {
     });
     (0, import_invariant9.invariant)(invitation.type === import_services7.Invitation.Type.DELEGATED && invitation.delegationCredentialId, void 0, {
       F: __dxlog_file10,
-      L: 126,
+      L: 124,
       S: this,
       A: [
         "invitation.type === Invitation.Type.DELEGATED && invitation.delegationCredentialId",
@@ -2889,7 +2885,7 @@ var SpaceInvitationProtocol = class {
     const space = this._spaceManager.spaces.get(this._spaceKey);
     (0, import_invariant9.invariant)(space, void 0, {
       F: __dxlog_file10,
-      L: 128,
+      L: 126,
       S: this,
       A: [
         "space",
@@ -2901,14 +2897,14 @@ var SpaceInvitationProtocol = class {
       id: invitation.invitationId
     }, {
       F: __dxlog_file10,
-      L: 130,
+      L: 128,
       S: this,
       C: (f, a) => f(...a)
     });
     const credential = await (0, import_credentials7.createCancelDelegatedSpaceInvitationCredential)(this._signingContext.credentialSigner, space.key, invitation.delegationCredentialId);
     (0, import_invariant9.invariant)(credential.credential, void 0, {
       F: __dxlog_file10,
-      L: 137,
+      L: 135,
       S: this,
       A: [
         "credential.credential",
@@ -2944,7 +2940,7 @@ var SpaceInvitationProtocol = class {
   async accept(response) {
     (0, import_invariant9.invariant)(response.space, void 0, {
       F: __dxlog_file10,
-      L: 169,
+      L: 167,
       S: this,
       A: [
         "response.space",
@@ -2955,7 +2951,7 @@ var SpaceInvitationProtocol = class {
     const assertion = (0, import_credentials7.getCredentialAssertion)(credential);
     (0, import_invariant9.invariant)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
       F: __dxlog_file10,
-      L: 172,
+      L: 170,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2964,7 +2960,7 @@ var SpaceInvitationProtocol = class {
     });
     (0, import_invariant9.invariant)(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
       F: __dxlog_file10,
-      L: 173,
+      L: 171,
       S: this,
       A: [
         "credential.subject.id.equals(this._signingContext.identityKey)",
@@ -3026,7 +3022,7 @@ var InvitationsManager = class {
     } catch (err) {
       import_log9.log.catch(err, void 0, {
         F: __dxlog_file11,
-        L: 77,
+        L: 76,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3049,7 +3045,7 @@ var InvitationsManager = class {
       const loadTasks = freshInvitations.map((persistentInvitation) => {
         (0, import_invariant10.invariant)(!this._createInvitations.get(persistentInvitation.invitationId), "invitation already exists", {
           F: __dxlog_file11,
-          L: 98,
+          L: 97,
           S: this,
           A: [
             "!this._createInvitations.get(persistentInvitation.invitationId)",
@@ -3068,7 +3064,7 @@ var InvitationsManager = class {
     } catch (err) {
       import_log9.log.catch(err, void 0, {
         F: __dxlog_file11,
-        L: 105,
+        L: 104,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3100,13 +3096,13 @@ var InvitationsManager = class {
   async authenticate({ invitationId, authCode }) {
     (0, import_log9.log)("authenticating...", void 0, {
       F: __dxlog_file11,
-      L: 135,
+      L: 134,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant10.invariant)(invitationId, void 0, {
       F: __dxlog_file11,
-      L: 136,
+      L: 135,
       S: this,
       A: [
         "invitationId",
@@ -3119,7 +3115,7 @@ var InvitationsManager = class {
         invitationId
       }, {
         F: __dxlog_file11,
-        L: 139,
+        L: 138,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3132,13 +3128,13 @@ var InvitationsManager = class {
       invitationId
     }, {
       F: __dxlog_file11,
-      L: 146,
+      L: 145,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant10.invariant)(invitationId, void 0, {
       F: __dxlog_file11,
-      L: 147,
+      L: 146,
       S: this,
       A: [
         "invitationId",
@@ -3184,7 +3180,7 @@ var InvitationsManager = class {
     }
   }
   _createInvitation(protocol, options) {
-    const { invitationId = import_keys8.PublicKey.random().toHex(), type = import_services8.Invitation.Type.INTERACTIVE, authMethod = import_services8.Invitation.AuthMethod.SHARED_SECRET, state = import_services8.Invitation.State.INIT, timeout = import_client_protocol3.INVITATION_TIMEOUT, swarmKey = import_keys8.PublicKey.random(), persistent = options?.authMethod !== import_services8.Invitation.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, role = import_credentials10.SpaceMember.Role.ADMIN, lifetime = 86400, multiUse = false } = options ?? {};
+    const { invitationId = import_keys8.PublicKey.random().toHex(), type = import_services8.Invitation.Type.INTERACTIVE, authMethod = import_services8.Invitation.AuthMethod.SHARED_SECRET, state = import_services8.Invitation.State.INIT, timeout = import_client_protocol3.INVITATION_TIMEOUT, swarmKey = import_keys8.PublicKey.random(), persistent = options?.authMethod !== import_services8.Invitation.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, lifetime = 86400, multiUse = false } = options ?? {};
     const authCode = options?.authCode ?? (authMethod === import_services8.Invitation.AuthMethod.SHARED_SECRET ? (0, import_credentials9.generatePasscode)(import_client_protocol3.AUTHENTICATION_CODE_LENGTH) : void 0);
     return {
       invitationId,
@@ -3198,7 +3194,6 @@ var InvitationsManager = class {
       guestKeypair: guestKeypair ?? (authMethod === import_services8.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? createAdmissionKeypair() : void 0),
       created,
       lifetime,
-      role,
       multiUse,
       delegationCredentialId: options?.delegationCredentialId,
       ...protocol.getInvitationContext()
@@ -3217,7 +3212,7 @@ var InvitationsManager = class {
         ...handler.toJSON()
       }, {
         F: __dxlog_file11,
-        L: 236,
+        L: 233,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3250,7 +3245,7 @@ var InvitationsManager = class {
             ...handler.toJSON()
           }, {
             F: __dxlog_file11,
-            L: 256,
+            L: 253,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3261,7 +3256,7 @@ var InvitationsManager = class {
         } else {
           import_log9.log.warn("auth failed", err, {
             F: __dxlog_file11,
-            L: 259,
+            L: 256,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3278,7 +3273,7 @@ var InvitationsManager = class {
         ...handler.toJSON()
       }, {
         F: __dxlog_file11,
-        L: 266,
+        L: 263,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3323,7 +3318,7 @@ var InvitationsManager = class {
     } catch (err) {
       import_log9.log.catch(err, void 0, {
         F: __dxlog_file11,
-        L: 302,
+        L: 299,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3419,7 +3414,7 @@ var AutomergeSpaceState = class {
     this._isProcessingRootDocs = false;
   }
   async processCredential(credential) {
-    if (!(0, import_credentials13.checkCredentialType)(credential, "dxos.halo.credentials.Epoch")) {
+    if (!(0, import_credentials11.checkCredentialType)(credential, "dxos.halo.credentials.Epoch")) {
       return;
     }
     this.lastEpoch = credential;
@@ -3734,7 +3729,7 @@ var DataSpace = class {
     this._callbacks = params.callbacks ?? {};
     this._echoHost = params.echoHost;
     this.authVerifier = new TrustedKeySetAuthVerifier({
-      trustedKeysProvider: () => new import_util6.ComplexSet(import_keys9.PublicKey.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => member.role !== import_credentials11.SpaceMember.Role.REMOVED).map((member) => member.key)),
+      trustedKeysProvider: () => new import_util6.ComplexSet(import_keys9.PublicKey.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => !member.removed).map((member) => member.key)),
       update: this._inner.stateUpdate,
       authTimeout: import_client_protocol4.AUTH_TIMEOUT
     });
@@ -3744,7 +3739,7 @@ var DataSpace = class {
       state: import_services9.SpaceState[this._state]
     }, {
       F: __dxlog_file13,
-      L: 137,
+      L: 136,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3794,7 +3789,7 @@ var DataSpace = class {
       state: import_services9.SpaceState[this._state]
     }, {
       F: __dxlog_file13,
-      L: 195,
+      L: 194,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3812,7 +3807,7 @@ var DataSpace = class {
       state: import_services9.SpaceState[this._state]
     }, {
       F: __dxlog_file13,
-      L: 209,
+      L: 208,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3844,7 +3839,7 @@ var DataSpace = class {
         if (err instanceof import_protocols8.CancelledError || err instanceof import_context9.ContextDisposedError) {
           (0, import_log10.log)("data pipeline initialization cancelled", err, {
             F: __dxlog_file13,
-            L: 242,
+            L: 241,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3852,7 +3847,7 @@ var DataSpace = class {
         }
         import_log10.log.error("Error initializing data pipeline", err, {
           F: __dxlog_file13,
-          L: 246,
+          L: 245,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3861,7 +3856,7 @@ var DataSpace = class {
           state: import_services9.SpaceState[this._state]
         }, {
           F: __dxlog_file13,
-          L: 248,
+          L: 247,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3881,7 +3876,7 @@ var DataSpace = class {
       state: import_services9.SpaceState[this._state]
     }, {
       F: __dxlog_file13,
-      L: 264,
+      L: 263,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3891,7 +3886,7 @@ var DataSpace = class {
     await (0, import_context9.cancelWithContext)(this._ctx, this.automergeSpaceState.ensureEpochInitialized());
     (0, import_log10.log)("data pipeline ready", void 0, {
       F: __dxlog_file13,
-      L: 276,
+      L: 275,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3901,7 +3896,7 @@ var DataSpace = class {
       state: import_services9.SpaceState[this._state]
     }, {
       F: __dxlog_file13,
-      L: 280,
+      L: 279,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3917,7 +3912,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     (0, import_log10.log)("writable feeds created", void 0, {
       F: __dxlog_file13,
-      L: 296,
+      L: 295,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3944,7 +3939,7 @@ var DataSpace = class {
           spaceKey: this.key,
           deviceKey: this._signingContext.deviceKey,
           identityKey: this._signingContext.identityKey,
-          designation: import_credentials12.AdmittedFeed.Designation.CONTROL
+          designation: import_credentials10.AdmittedFeed.Designation.CONTROL
         }
       }));
     }
@@ -3961,7 +3956,7 @@ var DataSpace = class {
           spaceKey: this.key,
           deviceKey: this._signingContext.deviceKey,
           identityKey: this._signingContext.identityKey,
-          designation: import_credentials12.AdmittedFeed.Designation.DATA
+          designation: import_credentials10.AdmittedFeed.Designation.DATA
         }
       }));
     }
@@ -3980,7 +3975,7 @@ var DataSpace = class {
       rootUrl
     }, {
       F: __dxlog_file13,
-      L: 362,
+      L: 361,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4012,7 +4007,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file13,
-          L: 385,
+          L: 384,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4067,7 +4062,7 @@ var DataSpace = class {
           const newRoot = this._echoHost.automergeRepo.create(rootHandle.docSync());
           (0, import_invariant11.invariant)(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
             F: __dxlog_file13,
-            L: 435,
+            L: 434,
             S: this,
             A: [
               "typeof newRoot.url === 'string' && newRoot.url.length > 0",
@@ -4086,7 +4081,7 @@ var DataSpace = class {
         {
           import_log10.log.info("Fragmenting", void 0, {
             F: __dxlog_file13,
-            L: 447,
+            L: 446,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4098,7 +4093,7 @@ var DataSpace = class {
           const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
           (0, import_invariant11.invariant)(properties, "Properties not found", {
             F: __dxlog_file13,
-            L: 457,
+            L: 456,
             S: this,
             A: [
               "properties",
@@ -4114,7 +4109,7 @@ var DataSpace = class {
           const newRoot = this._echoHost.automergeRepo.create(newSpaceDoc);
           (0, import_invariant11.invariant)(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
             F: __dxlog_file13,
-            L: 462,
+            L: 461,
             S: this,
             A: [
               "typeof newRoot.url === 'string' && newRoot.url.length > 0",
@@ -4183,7 +4178,7 @@ var DataSpace = class {
       state: import_services9.SpaceState[this._state]
     }, {
       F: __dxlog_file13,
-      L: 528,
+      L: 527,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4237,7 +4232,7 @@ DataSpace = _ts_decorate4([
 ], DataSpace);
 var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
   const credentials = [
-    await (0, import_credentials15.createCredential)({
+    await (0, import_credentials13.createCredential)({
       signer: keyring,
       issuer: space.key,
       subject: space.key,
@@ -4246,14 +4241,14 @@ var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
         spaceKey: space.key
       }
     }),
-    await (0, import_credentials15.createCredential)({
+    await (0, import_credentials13.createCredential)({
       signer: keyring,
       issuer: space.key,
       subject: signingContext.identityKey,
       assertion: {
         "@type": "dxos.halo.credentials.SpaceMember",
         spaceKey: space.key,
-        role: import_credentials16.SpaceMember.Role.OWNER,
+        role: import_credentials14.SpaceMember.Role.ADMIN,
         profile: signingContext.getProfile(),
         genesisFeedKey: space.controlFeedKey ?? (0, import_debug4.failUndefined)()
       }
@@ -4265,7 +4260,7 @@ var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
         spaceKey: space.key,
         identityKey: signingContext.identityKey,
         deviceKey: signingContext.deviceKey,
-        designation: import_credentials16.AdmittedFeed.Designation.CONTROL
+        designation: import_credentials14.AdmittedFeed.Designation.CONTROL
       }
     }),
     await signingContext.credentialSigner.createCredential({
@@ -4275,7 +4270,7 @@ var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
         spaceKey: space.key,
         identityKey: signingContext.identityKey,
         deviceKey: signingContext.deviceKey,
-        designation: import_credentials16.AdmittedFeed.Designation.DATA
+        designation: import_credentials14.AdmittedFeed.Designation.DATA
       }
     }),
     await signingContext.credentialSigner.createCredential({
@@ -4445,7 +4440,7 @@ var DataSpaceManager = class {
     const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, automergeRootUrl);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
-    (0, import_invariant13.invariant)((0, import_credentials14.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+    (0, import_invariant13.invariant)((0, import_credentials12.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file14,
       L: 163,
       S: this,
@@ -4707,9 +4702,6 @@ var SpacesServiceImpl = class {
       }
     }
   }
-  async updateMemberRole(_) {
-    throw new Error("not implemented");
-  }
   querySpaces() {
     return new import_codec_protobuf10.Stream(({ next, ctx }) => {
       const scheduler = new import_async15.UpdateScheduler(ctx, async () => {
@@ -4719,7 +4711,7 @@ var SpacesServiceImpl = class {
           spaces
         }, {
           F: __dxlog_file15,
-          L: 82,
+          L: 77,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4802,7 +4794,7 @@ var SpacesServiceImpl = class {
       } else {
         (0, import_invariant14.invariant)(!credential.id, "Id on unsigned credentials is not allowed", {
           F: __dxlog_file15,
-          L: 169,
+          L: 164,
           S: this,
           A: [
             "!credential.id",
@@ -4811,7 +4803,7 @@ var SpacesServiceImpl = class {
         });
         (0, import_invariant14.invariant)(this._identityManager.identity, "Identity is not available", {
           F: __dxlog_file15,
-          L: 170,
+          L: 165,
           S: this,
           A: [
             "this._identityManager.identity",
@@ -4821,7 +4813,7 @@ var SpacesServiceImpl = class {
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
         (0, import_invariant14.invariant)(credential.issuer.equals(signer.getIssuer()), void 0, {
           F: __dxlog_file15,
-          L: 172,
+          L: 167,
           S: this,
           A: [
             "credential.issuer.equals(signer.getIssuer())",
@@ -4876,7 +4868,7 @@ var SpacesServiceImpl = class {
             identityKey: member.key,
             profile: member.profile ?? {}
           },
-          presence: member.role === import_credentials17.SpaceMember.Role.REMOVED ? import_services11.SpaceMember.PresenceState.REMOVED : isMe || peers.length > 0 ? import_services11.SpaceMember.PresenceState.ONLINE : import_services11.SpaceMember.PresenceState.OFFLINE,
+          presence: member.removed ? import_services11.SpaceMember.PresenceState.REMOVED : isMe || peers.length > 0 ? import_services11.SpaceMember.PresenceState.ONLINE : import_services11.SpaceMember.PresenceState.OFFLINE,
           peerStates: peers
         };
       }),
@@ -5089,7 +5081,7 @@ var ServiceContext = class extends import_context12.Resource {
     this.initialized.wake();
     this._deviceSpaceSync = {
       processCredential: async (credential) => {
-        const assertion = (0, import_credentials18.getCredentialAssertion)(credential);
+        const assertion = (0, import_credentials15.getCredentialAssertion)(credential);
         if (assertion["@type"] !== "dxos.halo.credentials.SpaceMember") {
           return;
         }
@@ -5176,7 +5168,7 @@ var ServiceRegistry = class {
     delete this._handlers[name];
   }
 };
-var DXOS_VERSION = "0.5.1-next.638da00";
+var DXOS_VERSION = "0.5.1-next.65aaa36";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -5218,55 +5210,63 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
     },
     trace: import_tracing6.TRACE_PROCESSOR.getDiagnostics()
   };
-  await Promise.all([
-    (async () => {
-      (0, import_invariant16.invariant)(clientServices.LoggingService, "SystemService is not available.", {
-        F: __dxlog_file17,
-        L: 110,
-        S: void 0,
-        A: [
-          "clientServices.LoggingService",
-          "'SystemService is not available.'"
-        ]
-      });
-      diagnostics.metrics = await (0, import_codec_protobuf11.getFirstStreamValue)(clientServices.LoggingService.queryMetrics({}), {
-        timeout: DEFAULT_TIMEOUT
-      }).catch(() => void 0);
-    })(),
-    (async () => {
-      diagnostics.storage = await (0, import_async17.asyncTimeout)(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 (0, import_codec_protobuf11.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 (0, import_codec_protobuf11.getFirstStreamValue)(clientServices.DevtoolsHost.subscribeToFeeds({}), {
-          timeout: DEFAULT_TIMEOUT
-        }).catch(() => void 0) ?? {};
-        diagnostics.feeds = feeds.map(({ feedKey, bytes, length }) => ({
-          feedKey,
-          bytes,
-          length
-        }));
-        const status = await (0, import_codec_protobuf11.getFirstStreamValue)(clientServices.NetworkService.queryStatus(), {
-          timeout: DEFAULT_TIMEOUT
-        }).catch(() => void 0);
-        diagnostics.networkStatus = status;
-        diagnostics.swarms = serviceContext.networkManager.connectionLog?.swarms;
+  {
+    (0, import_invariant16.invariant)(clientServices.LoggingService, "SystemService is not available.", {
+      F: __dxlog_file17,
+      L: 108,
+      S: void 0,
+      A: [
+        "clientServices.LoggingService",
+        "'SystemService is not available.'"
+      ]
+    });
+    diagnostics.metrics = await (0, import_codec_protobuf11.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;
       }
+      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 (0, import_codec_protobuf11.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 (0, import_codec_protobuf11.getFirstStreamValue)(clientServices.DevtoolsHost.subscribeToFeeds({}), {
+      timeout: DEFAULT_TIMEOUT
+    }).catch(() => void 0) ?? {};
+    diagnostics.feeds = feeds.map(({ feedKey, bytes, length }) => ({
+      feedKey,
+      bytes,
+      length
+    }));
+    const status = await (0, import_codec_protobuf11.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;
 };
@@ -5274,7 +5274,7 @@ var getSpaceStats = async (space) => {
   const stats = {
     key: space.key,
     metrics: space.metrics,
-    epochs: space.inner.spaceState.credentials.filter((0, import_credentials19.credentialTypeFilter)("dxos.halo.credentials.Epoch")).map((credential) => ({
+    epochs: space.inner.spaceState.credentials.filter((0, import_credentials16.credentialTypeFilter)("dxos.halo.credentials.Epoch")).map((credential) => ({
       ...credential.subject.assertion,
       id: credential.id
     })),
@@ -5303,24 +5303,6 @@ 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
-  }));
-};
 var createCollectDiagnosticsBroadcastSender = () => {
   return {
     broadcastDiagnosticsRequest: async () => void 0
@@ -5393,7 +5375,7 @@ var DevicesServiceImpl = class {
           presenceSubscribed = true;
         }
       };
-      const subscriptions = new import_async19.EventSubscriptions();
+      const subscriptions = new import_async18.EventSubscriptions();
       if (this._identityManager.identity) {
         subscribeIdentity();
         subscribePresence();
@@ -5466,7 +5448,7 @@ _ts_decorate7([
 var isLocked = (lockPath) => import_lock_file.LockFile.isLocked(lockPath);
 var LoggingServiceImpl = class {
   constructor() {
-    this._logs = new import_async20.Event();
+    this._logs = new import_async19.Event();
     this._started = Date.now();
     this._sessionId = import_keys14.PublicKey.random().toHex();
     this._logProcessor = (_config, entry2) => {
@@ -5743,7 +5725,7 @@ var ClientServicesHost = class {
     runtimeParams
   } = {}) {
     this._tracingService = import_tracing8.TRACE_PROCESSOR.createTraceSender();
-    this._statusUpdate = new import_async18.Event();
+    this._statusUpdate = new import_async17.Event();
     this._opening = false;
     this._open = false;
     this._storage = storage;
@@ -6041,7 +6023,7 @@ var ClientServicesHost = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log15.log.info("resetting...", void 0, {
+    (0, import_log15.log)("resetting...", void 0, {
       F: __dxlog_file20,
       L: 342,
       S: this,
@@ -6049,7 +6031,7 @@ var ClientServicesHost = class {
     });
     await this._serviceContext?.close();
     await this._storage.reset();
-    import_log15.log.info("reset", void 0, {
+    (0, import_log15.log)("reset", void 0, {
       F: __dxlog_file20,
       L: 345,
       S: this,
@@ -6110,18 +6092,17 @@ _ts_decorate8([
   import_tracing8.trace.info()
 ], ClientServicesHost.prototype, "_open", void 0);
 _ts_decorate8([
-  import_async18.synchronized,
+  import_async17.synchronized,
   import_tracing8.trace.span()
 ], ClientServicesHost.prototype, "open", null);
 _ts_decorate8([
-  import_async18.synchronized,
+  import_async17.synchronized,
   import_tracing8.trace.span()
 ], ClientServicesHost.prototype, "close", null);
 ClientServicesHost = _ts_decorate8([
   import_tracing8.trace.resource()
 ], ClientServicesHost);
 var ClientServicesProviderResource = Symbol.for("dxos.resource.ClientServices");
-var GET_DIAGNOSTICS_RPC_TIMEOUT = 1e4;
 var DiagnosticsCollector = class {
   static {
     this.broadcastSender = createCollectDiagnosticsBroadcastSender();
@@ -6129,8 +6110,6 @@ var DiagnosticsCollector = class {
   static async collect(config = findConfigs(), services = findSystemServiceProvider(), options = {}) {
     const serviceDiagnostics = await services?.services?.SystemService?.getDiagnostics({
       keys: options.humanize ? import_services15.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE : options.truncate ? import_services15.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE : void 0
-    }, {
-      timeout: GET_DIAGNOSTICS_RPC_TIMEOUT
     });
     const clientDiagnostics = {
       config,
@@ -6147,12 +6126,12 @@ var DiagnosticsCollector = class {
   }
 };
 var findSystemServiceProvider = () => {
-  const serviceProviders = import_tracing7.TRACE_PROCESSOR.findResourcesByAnnotation(ClientServicesProviderResource);
+  const serviceProviders = import_tracing7.TRACE_PROCESSOR.findByAnnotation(ClientServicesProviderResource);
   const providerResource = serviceProviders.find((r) => r.instance.deref()?.services?.SystemService != null);
   return providerResource?.instance?.deref() ?? null;
 };
 var findConfigs = () => {
-  const configs = import_tracing7.TRACE_PROCESSOR.findResourcesByAnnotation(import_config.ConfigResource);
+  const configs = import_tracing7.TRACE_PROCESSOR.findByAnnotation(import_config.ConfigResource);
   return configs.map((r) => r.instance.deref()).filter(import_util10.nonNullable);
 };
 // Annotate the CommonJS export names for ESM import in node:
@@ -6195,4 +6174,4 @@ var findConfigs = () => {
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-2PGHNVRY.cjs.map
+//# sourceMappingURL=chunk-ITFB7UCR.cjs.map