@dxos/client-services 0.6.3-main.d007b87 → 0.6.3-main.d76104f

package/dist/lib/browser/{chunk-Y7UULU6J.mjs → chunk-TRX3WZGF.mjs}

@@ -359,7 +359,7 @@ import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.6.3-main.d007b87";
+var DXOS_VERSION = "0.6.3-main.d76104f";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -1644,9 +1644,9 @@ var IdentityServiceImpl = class extends Resource {
     const dataSpaceManager = this._dataSpaceManagerProvider();
     const recordedDefaultSpaceTrigger = new Trigger3();
     const allProcessed = safeAwaitAll(dataSpaceManager.spaces.values(), async (space) => {
-      if (space.state === SpaceState.CLOSED) {
+      if (space.state === SpaceState.SPACE_CLOSED) {
         await space.open();
-        const requiresMigration = space.stateUpdate.waitForCondition(() => space.state === SpaceState.REQUIRES_MIGRATION);
+        const requiresMigration = space.stateUpdate.waitForCondition(() => space.state === SpaceState.SPACE_REQUIRES_MIGRATION);
         await Promise.race([
           space.initializeDataPipeline(),
           requiresMigration
@@ -1811,7 +1811,7 @@ import { createTeleportProtocolFactory } from "@dxos/network-manager";
 import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError3, trace as trace5 } from "@dxos/protocols";
 import { Invitation as Invitation4 } from "@dxos/protocols/proto/dxos/client/services";
 import { AuthenticationResponse as AuthenticationResponse2 } from "@dxos/protocols/proto/dxos/halo/invitations";
-import { Options as Options4 } from "@dxos/protocols/proto/dxos/halo/invitations";
+import { InvitationOptions as InvitationOptions4 } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { trace as _trace } from "@dxos/tracing";
 import { ComplexSet as ComplexSet3 } from "@dxos/util";
 
@@ -1821,7 +1821,7 @@ import { cancelWithContext as cancelWithContext2, Context as Context4 } from "@d
 import { invariant as invariant6 } from "@dxos/invariant";
 import { log as log7 } from "@dxos/log";
 import { InvalidInvitationExtensionRoleError, schema as schema2 } from "@dxos/protocols";
-import { Options } from "@dxos/protocols/proto/dxos/halo/invitations";
+import { InvitationOptions } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { RpcExtension } from "@dxos/teleport";
 
 // packages/sdk/client-services/src/packlets/invitations/utils.ts
@@ -1913,11 +1913,11 @@ var InvitationGuestExtension = class extends RpcExtension {
         C: (f, a) => f(...a)
       });
       await cancelWithContext2(this._ctx, this.rpc.InvitationHostService.options({
-        role: Options.Role.GUEST
+        role: InvitationOptions.Role.GUEST
       }));
       log7("options sent", void 0, {
         F: __dxlog_file10,
-        L: 88,
+        L: 91,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1926,13 +1926,13 @@ var InvitationGuestExtension = class extends RpcExtension {
       }));
       log7("options received", void 0, {
         F: __dxlog_file10,
-        L: 90,
+        L: 93,
         S: this,
         C: (f, a) => f(...a)
       });
-      if (this._remoteOptions?.role !== Options.Role.HOST) {
+      if (this._remoteOptions?.role !== InvitationOptions.Role.HOST) {
         throw new InvalidInvitationExtensionRoleError(void 0, {
-          expected: Options.Role.HOST,
+          expected: InvitationOptions.Role.HOST,
           remoteOptions: this._remoteOptions,
           remotePeerId: context.remotePeerId
         });
@@ -1960,7 +1960,7 @@ var InvitationGuestExtension = class extends RpcExtension {
       this._invitationFlowLock = null;
       log7("invitation flow lock released", void 0, {
         F: __dxlog_file10,
-        L: 123,
+        L: 126,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1977,7 +1977,7 @@ import { PublicKey as PublicKey5 } from "@dxos/keys";
 import { log as log8 } from "@dxos/log";
 import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError2, schema as schema3, trace as trace4 } from "@dxos/protocols";
 import { Invitation as Invitation3 } from "@dxos/protocols/proto/dxos/client/services";
-import { AuthenticationResponse, Options as Options2 } from "@dxos/protocols/proto/dxos/halo/invitations";
+import { AuthenticationResponse, InvitationOptions as InvitationOptions2 } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { RpcExtension as RpcExtension2 } from "@dxos/teleport";
 var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-host-extension.ts";
 var OPTIONS_TIMEOUT2 = 1e4;
@@ -2235,7 +2235,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
       const lastState = this._requireActiveInvitation().state;
       this._callbacks.onStateUpdate(Invitation3.State.CONNECTING);
       await this.rpc.InvitationHostService.options({
-        role: Options2.Role.HOST
+        role: InvitationOptions2.Role.HOST
       });
       log8("options sent", void 0, {
         F: __dxlog_file11,
@@ -2252,10 +2252,10 @@ var InvitationHostExtension = class extends RpcExtension2 {
         S: this,
         C: (f, a) => f(...a)
       });
-      if (this._remoteOptions?.role !== Options2.Role.GUEST) {
+      if (this._remoteOptions?.role !== InvitationOptions2.Role.GUEST) {
         this._callbacks.onStateUpdate(lastState);
         throw new InvalidInvitationExtensionRoleError2(void 0, {
-          expected: Options2.Role.GUEST,
+          expected: InvitationOptions2.Role.GUEST,
           remoteOptions: this._remoteOptions,
           remotePeerId: context.remotePeerId
         });
@@ -2315,7 +2315,7 @@ var isAuthenticationRequired = (invitation) => invitation.authMethod !== Invitat
 import { invariant as invariant8 } from "@dxos/invariant";
 import { PublicKey as PublicKey6 } from "@dxos/keys";
 import { log as log9 } from "@dxos/log";
-import { Options as Options3 } from "@dxos/protocols/proto/dxos/halo/invitations";
+import { InvitationOptions as InvitationOptions3 } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { ComplexSet as ComplexSet2 } from "@dxos/util";
 var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-topology.ts";
 var InvitationTopology = class {
@@ -2346,7 +2346,7 @@ var InvitationTopology = class {
       ]
     });
     const { ownPeerId, candidates, connected, allPeers } = this._controller.getState();
-    if (this._role === Options3.Role.GUEST) {
+    if (this._role === InvitationOptions3.Role.GUEST) {
       return;
     }
     if (connected.length > 0) {
@@ -2385,7 +2385,7 @@ var InvitationTopology = class {
     this._seenPeers.clear();
   }
   toString() {
-    return `InvitationTopology(${this._role === Options3.Role.GUEST ? "guest" : "host"})`;
+    return `InvitationTopology(${this._role === InvitationOptions3.Role.GUEST ? "guest" : "host"})`;
   }
 };
 
@@ -2402,7 +2402,7 @@ var InvitationsHandler = class {
     this._defaultTeleportParams = _defaultTeleportParams;
   }
   handleInvitationFlow(ctx, stream, protocol, invitation) {
-    metrics.increment("invitation.created");
+    metrics.increment("dxos.invitation.created");
     const guardedState = this._createGuardedState(ctx, invitation, stream);
     const createExtension = () => {
       const extension = new InvitationHostExtension(guardedState.mutex, {
@@ -2418,7 +2418,7 @@ var InvitationsHandler = class {
             const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
             invariant9(deviceKey, void 0, {
               F: __dxlog_file13,
-              L: 93,
+              L: 94,
               S: this,
               A: [
                 "deviceKey",
@@ -2447,7 +2447,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file13,
-                L: 118,
+                L: 119,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2455,7 +2455,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file13,
-                L: 119,
+                L: 120,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2467,17 +2467,17 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file13,
-                L: 121,
+                L: 122,
                 S: this,
                 C: (f, a) => f(...a)
               });
               guardedState.set(extension, Invitation4.State.SUCCESS);
-              metrics.increment("invitation.success");
+              metrics.increment("dxos.invitation.success");
               log10.trace("dxos.sdk.invitations-handler.host.onOpen", trace5.end({
                 id: traceId
               }), {
                 F: __dxlog_file13,
-                L: 124,
+                L: 125,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2488,22 +2488,22 @@ var InvitationsHandler = class {
             } catch (err) {
               if (err instanceof TimeoutError) {
                 if (guardedState.set(extension, Invitation4.State.TIMEOUT)) {
-                  metrics.increment("invitation.timeout");
+                  metrics.increment("dxos.invitation.timeout");
                   log10("timeout", {
                     ...protocol.toJSON()
                   }, {
                     F: __dxlog_file13,
-                    L: 134,
+                    L: 135,
                     S: this,
                     C: (f, a) => f(...a)
                   });
                 }
               } else {
                 if (guardedState.error(extension, err)) {
-                  metrics.increment("invitation.failed");
+                  metrics.increment("dxos.invitation.failed");
                   log10.error("failed", err, {
                     F: __dxlog_file13,
-                    L: 139,
+                    L: 140,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -2514,7 +2514,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file13,
-                L: 142,
+                L: 143,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2528,7 +2528,7 @@ var InvitationsHandler = class {
               ...err.context
             }, {
               F: __dxlog_file13,
-              L: 150,
+              L: 151,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2536,22 +2536,22 @@ var InvitationsHandler = class {
           }
           if (err instanceof TimeoutError) {
             if (guardedState.set(extension, Invitation4.State.TIMEOUT)) {
-              metrics.increment("invitation.timeout");
+              metrics.increment("dxos.invitation.timeout");
               log10("timeout", {
                 err
               }, {
                 F: __dxlog_file13,
-                L: 156,
+                L: 157,
                 S: this,
                 C: (f, a) => f(...a)
               });
             }
           } else {
             if (guardedState.error(extension, err)) {
-              metrics.increment("invitation.failed");
+              metrics.increment("dxos.invitation.failed");
               log10.error("failed", err, {
                 F: __dxlog_file13,
-                L: 161,
+                L: 162,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2565,7 +2565,7 @@ var InvitationsHandler = class {
       if (invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now()) {
         log10.warn("invitation has already expired", void 0, {
           F: __dxlog_file13,
-          L: 172,
+          L: 173,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2573,14 +2573,14 @@ var InvitationsHandler = class {
         scheduleTask3(ctx, async () => {
           await swarmConnection.close();
           guardedState.set(null, Invitation4.State.EXPIRED);
-          metrics.increment("invitation.expired");
+          metrics.increment("dxos.invitation.expired");
           await ctx.dispose();
         }, invitation.created.getTime() + invitation.lifetime * 1e3 - Date.now());
       }
     }
     let swarmConnection;
     scheduleTask3(ctx, async () => {
-      swarmConnection = await this._joinSwarm(ctx, invitation, Options4.Role.HOST, createExtension);
+      swarmConnection = await this._joinSwarm(ctx, invitation, InvitationOptions4.Role.HOST, createExtension);
       guardedState.set(null, Invitation4.State.CONNECTING);
     });
   }
@@ -2589,7 +2589,7 @@ var InvitationsHandler = class {
     if (deviceProfile) {
       invariant9(invitation.kind === Invitation4.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
         F: __dxlog_file13,
-        L: 206,
+        L: 207,
         S: this,
         A: [
           "invitation.kind === Invitation.Kind.DEVICE",
@@ -2607,7 +2607,7 @@ var InvitationsHandler = class {
         triedPeers: triedPeersIds.size
       }, {
         F: __dxlog_file13,
-        L: 214,
+        L: 215,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2634,7 +2634,7 @@ var InvitationsHandler = class {
               currentState: guardedState.current.state
             }, {
               F: __dxlog_file13,
-              L: 242,
+              L: 243,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2652,7 +2652,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file13,
-                L: 254,
+                L: 255,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2664,7 +2664,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file13,
-                L: 265,
+                L: 266,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2673,7 +2673,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file13,
-                L: 269,
+                L: 270,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2686,7 +2686,7 @@ var InvitationsHandler = class {
                 response: introductionResponse
               }, {
                 F: __dxlog_file13,
-                L: 274,
+                L: 275,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2707,7 +2707,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file13,
-                L: 300,
+                L: 301,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2719,7 +2719,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file13,
-                L: 311,
+                L: 312,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2732,7 +2732,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file13,
-                L: 317,
+                L: 318,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2742,7 +2742,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file13,
-                  L: 320,
+                  L: 321,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2750,7 +2750,7 @@ var InvitationsHandler = class {
               } else {
                 log10("auth failed", err, {
                   F: __dxlog_file13,
-                  L: 323,
+                  L: 324,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2762,7 +2762,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file13,
-                L: 327,
+                L: 328,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2778,7 +2778,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file13,
-              L: 336,
+              L: 337,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2786,7 +2786,7 @@ var InvitationsHandler = class {
           } else {
             log10("auth failed", err, {
               F: __dxlog_file13,
-              L: 339,
+              L: 340,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2804,21 +2804,21 @@ var InvitationsHandler = class {
       } else {
         invariant9(invitation.swarmKey, void 0, {
           F: __dxlog_file13,
-          L: 354,
+          L: 355,
           S: this,
           A: [
             "invitation.swarmKey",
             ""
           ]
         });
-        await this._joinSwarm(ctx, invitation, Options4.Role.GUEST, createExtension);
+        await this._joinSwarm(ctx, invitation, InvitationOptions4.Role.GUEST, createExtension);
         guardedState.set(null, Invitation4.State.CONNECTING);
       }
     });
   }
   async _joinSwarm(ctx, invitation, role, extensionFactory) {
     let label;
-    if (role === Options4.Role.GUEST) {
+    if (role === InvitationOptions4.Role.GUEST) {
       label = "invitation guest";
     } else if (invitation.kind === Invitation4.Kind.DEVICE) {
       label = "invitation host for device";
@@ -2904,7 +2904,7 @@ var InvitationsHandler = class {
         oldState: stateToString(invitation.state)
       }, {
         F: __dxlog_file13,
-        L: 448,
+        L: 449,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2915,7 +2915,7 @@ var InvitationsHandler = class {
         oldState: stateToString(invitation.state)
       }, {
         F: __dxlog_file13,
-        L: 454,
+        L: 455,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2934,7 +2934,7 @@ var InvitationsHandler = class {
     for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
       log10("guest waiting for authentication code...", void 0, {
         F: __dxlog_file13,
-        L: 479,
+        L: 480,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2942,7 +2942,7 @@ var InvitationsHandler = class {
       const authCode = await authenticated.wait(options);
       log10("sending authentication request", void 0, {
         F: __dxlog_file13,
-        L: 483,
+        L: 484,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2961,7 +2961,7 @@ var InvitationsHandler = class {
             attempt
           }, {
             F: __dxlog_file13,
-            L: 494,
+            L: 495,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2979,7 +2979,7 @@ var InvitationsHandler = class {
     }
     log10("sending authentication request", void 0, {
       F: __dxlog_file13,
-      L: 513,
+      L: 514,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4322,10 +4322,10 @@ var DataSpace = class {
     // TODO(dmaretskyi): Move into Space?
     this._automergeSpaceState = new AutomergeSpaceState((rootUrl) => this._onNewAutomergeRoot(rootUrl));
     this._epochProcessingMutex = new Mutex2();
-    this._state = SpaceState2.CLOSED;
+    this._state = SpaceState2.SPACE_CLOSED;
     this._databaseRoot = null;
     /**
-    * Error for _state === SpaceState.ERROR.
+    * Error for _state === SpaceState.SPACE_ERROR.
     */
     this.error = void 0;
     this.stateUpdate = new Event6();
@@ -4394,7 +4394,7 @@ var DataSpace = class {
     };
   }
   async open() {
-    if (this._state === SpaceState2.CLOSED) {
+    if (this._state === SpaceState2.SPACE_CLOSED) {
       await this._open();
     }
   }
@@ -4409,7 +4409,7 @@ var DataSpace = class {
       F: __dxlog_file18,
       L: 215
     }));
-    this._state = SpaceState2.CONTROL_ONLY;
+    this._state = SpaceState2.SPACE_CONTROL_ONLY;
     log15("new state", {
       state: SpaceState2[this._state]
     }, {
@@ -4427,7 +4427,7 @@ var DataSpace = class {
   }
   async _close() {
     await this._callbacks.beforeClose?.();
-    this._state = SpaceState2.CLOSED;
+    this._state = SpaceState2.SPACE_CLOSED;
     log15("new state", {
       state: SpaceState2[this._state]
     }, {
@@ -4480,7 +4480,7 @@ var DataSpace = class {
           S: this,
           C: (f, a) => f(...a)
         });
-        this._state = SpaceState2.ERROR;
+        this._state = SpaceState2.SPACE_ERROR;
         log15("new state", {
           state: SpaceState2[this._state]
         }, {
@@ -4497,10 +4497,10 @@ var DataSpace = class {
     });
   }
   async initializeDataPipeline() {
-    if (this._state !== SpaceState2.CONTROL_ONLY) {
+    if (this._state !== SpaceState2.SPACE_CONTROL_ONLY) {
       throw new SystemError("Invalid operation");
     }
-    this._state = SpaceState2.INITIALIZING;
+    this._state = SpaceState2.SPACE_INITIALIZING;
     log15("new state", {
       state: SpaceState2[this._state]
     }, {
@@ -4511,13 +4511,13 @@ var DataSpace = class {
     });
     await this._initializeAndReadControlPipeline();
     await sleep3(1);
-    const ready = this.stateUpdate.waitForCondition(() => this._state === SpaceState2.READY);
+    const ready = this.stateUpdate.waitForCondition(() => this._state === SpaceState2.SPACE_READY);
     this._automergeSpaceState.startProcessingRootDocs();
     await ready;
   }
   async _enterReadyState() {
     await this._callbacks.beforeReady?.();
-    this._state = SpaceState2.READY;
+    this._state = SpaceState2.SPACE_READY;
     log15("new state", {
       state: SpaceState2[this._state]
     }, {
@@ -4628,17 +4628,15 @@ var DataSpace = class {
               };
             });
           }
-          const root = await this._echoHost.openSpaceRoot(handle.url);
+          const root = await this._echoHost.openSpaceRoot(this.id, handle.url);
           this._databaseRoot = root;
           if (root.getVersion() !== SpaceDocVersion2.CURRENT) {
-            if (this._state !== SpaceState2.REQUIRES_MIGRATION) {
-              this._state = SpaceState2.REQUIRES_MIGRATION;
-              this.stateUpdate.emit();
-            }
+            this._state = SpaceState2.SPACE_REQUIRES_MIGRATION;
+            this.stateUpdate.emit();
+          } else if (this._state !== SpaceState2.SPACE_READY) {
+            await this._enterReadyState();
           } else {
-            if (this._state !== SpaceState2.READY) {
-              await this._enterReadyState();
-            }
+            this.stateUpdate.emit();
           }
         } catch (_) {
           _usingCtx.e = _;
@@ -4655,7 +4653,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file18,
-          L: 433,
+          L: 431,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4708,40 +4706,44 @@ var DataSpace = class {
         credential
       }
     });
-    await this.inner.controlPipeline.state.waitUntilTimeframe(new Timeframe3([
+    const timeframe = new Timeframe3([
       [
         receipt.feedKey,
         receipt.seq
       ]
-    ]));
+    ]);
+    await this.inner.controlPipeline.state.waitUntilTimeframe(timeframe);
     await this._echoHost.updateIndexes();
-    return credential;
+    return {
+      credential,
+      timeframe
+    };
   }
   async activate() {
     if (![
-      SpaceState2.CLOSED,
-      SpaceState2.INACTIVE
+      SpaceState2.SPACE_CLOSED,
+      SpaceState2.SPACE_INACTIVE
     ].includes(this._state)) {
       return;
     }
-    await this._metadataStore.setSpaceState(this.key, SpaceState2.ACTIVE);
+    await this._metadataStore.setSpaceState(this.key, SpaceState2.SPACE_ACTIVE);
     await this._open();
     this.initializeDataPipelineAsync();
   }
   async deactivate() {
-    if (this._state === SpaceState2.INACTIVE) {
+    if (this._state === SpaceState2.SPACE_INACTIVE) {
       return;
     }
-    await this._metadataStore.setSpaceState(this.key, SpaceState2.INACTIVE);
-    if (this._state !== SpaceState2.CLOSED) {
+    await this._metadataStore.setSpaceState(this.key, SpaceState2.SPACE_INACTIVE);
+    if (this._state !== SpaceState2.SPACE_CLOSED) {
       await this._close();
     }
-    this._state = SpaceState2.INACTIVE;
+    this._state = SpaceState2.SPACE_INACTIVE;
     log15("new state", {
       state: SpaceState2[this._state]
     }, {
       F: __dxlog_file18,
-      L: 514,
+      L: 513,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5040,7 +5042,7 @@ var DataSpaceManager = class {
       genesisFeedKey: controlFeedKey,
       controlFeedKey,
       dataFeedKey,
-      state: SpaceState3.ACTIVE
+      state: SpaceState3.SPACE_ACTIVE
     };
     log16("creating space...", {
       spaceKey
@@ -5222,7 +5224,7 @@ var DataSpaceManager = class {
   async waitUntilSpaceReady(spaceKey) {
     await cancelWithContext5(this._ctx, this.updated.waitForCondition(() => {
       const space = this._spaces.get(spaceKey);
-      return !!space && space.state === SpaceState3.READY;
+      return !!space && space.state === SpaceState3.SPACE_READY;
     }));
   }
   async requestSpaceAdmissionCredential(spaceKey) {
@@ -5269,25 +5271,43 @@ var DataSpaceManager = class {
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
         credentialAuthenticator: deferFunction2(() => dataSpace.authVerifier.verifier)
       },
-      onAuthorizedConnection: (session) => {
-        session.addExtension("dxos.mesh.teleport.admission-discovery", new CredentialServerExtension(space));
-        session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
-          remotePeerId: session.remotePeerId
-        }));
-        session.addExtension("dxos.mesh.teleport.notarization", dataSpace.notarizationPlugin.createExtension());
-        this._echoHost.authorizeDevice(space.key, session.remotePeerId);
-        session.addExtension("dxos.mesh.teleport.automerge", this._echoHost.createReplicationExtension());
-      },
+      onAuthorizedConnection: (session) => queueMicrotask(async () => {
+        try {
+          if (!session.isOpen) {
+            return;
+          }
+          session.addExtension("dxos.mesh.teleport.admission-discovery", new CredentialServerExtension(space));
+          session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
+            remotePeerId: session.remotePeerId
+          }));
+          session.addExtension("dxos.mesh.teleport.notarization", dataSpace.notarizationPlugin.createExtension());
+          await this._echoHost.authorizeDevice(space.key, session.remotePeerId);
+          if (!session.isOpen) {
+            return;
+          }
+          session.addExtension("dxos.mesh.teleport.automerge", this._echoHost.createReplicationExtension());
+        } catch (err) {
+          log16.warn("error on authorized connection", {
+            err
+          }, {
+            F: __dxlog_file19,
+            L: 403,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          await session.close(err);
+        }
+      }),
       onAuthFailure: () => {
         log16.warn("auth failure", void 0, {
           F: __dxlog_file19,
-          L: 396,
+          L: 408,
           S: this,
           C: (f, a) => f(...a)
         });
       },
       onMemberRolesChanged: async (members) => {
-        if (dataSpace?.state === SpaceState3.READY) {
+        if (dataSpace?.state === SpaceState3.SPACE_READY) {
           this._handleMemberRoleChanges(presence, space.protocol, members);
         }
       },
@@ -5300,7 +5320,7 @@ var DataSpaceManager = class {
     dataFeed && await space.setDataFeed(dataFeed);
     const dataSpace = new DataSpace({
       inner: space,
-      initialState: metadata.state === SpaceState3.INACTIVE ? SpaceState3.INACTIVE : SpaceState3.CLOSED,
+      initialState: metadata.state === SpaceState3.SPACE_INACTIVE ? SpaceState3.SPACE_INACTIVE : SpaceState3.SPACE_CLOSED,
       metadataStore: this._metadataStore,
       gossip,
       presence,
@@ -5314,7 +5334,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file19,
-            L: 423,
+            L: 435,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5325,7 +5345,7 @@ var DataSpaceManager = class {
             open: this._isOpen
           }, {
             F: __dxlog_file19,
-            L: 426,
+            L: 438,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5344,7 +5364,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file19,
-            L: 434,
+            L: 446,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5353,7 +5373,7 @@ var DataSpaceManager = class {
       cache: metadata.cache
     });
     presence.newPeer.on((peerState) => {
-      if (dataSpace.state === SpaceState3.READY) {
+      if (dataSpace.state === SpaceState3.SPACE_READY) {
         this._handleNewPeerConnected(space, peerState);
       }
     });
@@ -5385,7 +5405,7 @@ var DataSpaceManager = class {
       closedSessions
     }, {
       F: __dxlog_file19,
-      L: 470,
+      L: 482,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5400,7 +5420,7 @@ var DataSpaceManager = class {
           peerId: peerState.peerId
         }, {
           F: __dxlog_file19,
-          L: 484,
+          L: 496,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5409,7 +5429,7 @@ var DataSpaceManager = class {
     }
   }
   async _handleInvitationStatusChange(dataSpace, delegatedInvitation, isActive) {
-    if (dataSpace?.state !== SpaceState3.READY) {
+    if (dataSpace?.state !== SpaceState3.SPACE_READY) {
       return;
     }
     if (isActive) {
@@ -5490,10 +5510,10 @@ var SpacesServiceImpl = class {
     const space = dataSpaceManager.spaces.get(spaceKey) ?? raise2(new SpaceNotFoundError2(spaceKey));
     if (state) {
       switch (state) {
-        case SpaceState4.ACTIVE:
+        case SpaceState4.SPACE_ACTIVE:
           await space.activate();
           break;
-        case SpaceState4.INACTIVE:
+        case SpaceState4.SPACE_INACTIVE:
           await space.deactivate();
           break;
         default:
@@ -5540,9 +5560,9 @@ var SpacesServiceImpl = class {
       const scheduler = new UpdateScheduler(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space));
-        log17("update", {
-          spaces
-        }, {
+        log17("update", () => ({
+          ids: spaces.map((space) => space.id)
+        }), {
           F: __dxlog_file20,
           L: 115,
           S: this,
@@ -5677,12 +5697,13 @@ var SpacesServiceImpl = class {
   async createEpoch({ spaceKey, migration, automergeRootUrl }) {
     const dataSpaceManager = await this._getDataSpaceManager();
     const space = dataSpaceManager.spaces.get(spaceKey) ?? raise2(new SpaceNotFoundError2(spaceKey));
-    const credential = await space.createEpoch({
+    const result = await space.createEpoch({
       migration,
       newAutomergeRoot: automergeRootUrl
     });
     return {
-      epochCredential: credential ?? void 0
+      epochCredential: result?.credential,
+      controlTimeframe: result?.timeframe
     };
   }
   async admitContact(request) {
@@ -5789,7 +5810,7 @@ var SpacesServiceImpl = class {
     const dataSpaceManager = await this._getDataSpaceManager();
     const identity = this._identityManager.identity?.identityKey.truncate();
     if (identity) {
-      trace8.metrics.gauge("echo.space.count", dataSpaceManager.spaces.size, {
+      trace8.metrics.gauge("dxos.echo.space.count", dataSpaceManager.spaces.size, {
         tags: {
           identity
         }
@@ -7332,4 +7353,4 @@ export {
   ClientServicesProviderResource,
   DiagnosticsCollector
 };
-//# sourceMappingURL=chunk-Y7UULU6J.mjs.map
+//# sourceMappingURL=chunk-TRX3WZGF.mjs.map