@dxos/client-services 0.6.2 → 0.6.3-main.0308ae2

package/dist/lib/node/{chunk-7XBIZ7NK.cjs → chunk-CVLKGJK5.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_7XBIZ7NK_exports = {};
-__export(chunk_7XBIZ7NK_exports, {
+var chunk_CVLKGJK5_exports = {};
+__export(chunk_CVLKGJK5_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   ClientServicesProviderResource: () => ClientServicesProviderResource,
@@ -70,7 +70,7 @@ __export(chunk_7XBIZ7NK_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_7XBIZ7NK_exports);
+module.exports = __toCommonJS(chunk_CVLKGJK5_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -647,7 +647,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.6.2";
+var DXOS_VERSION = "0.6.3-main.0308ae2";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -1787,9 +1787,9 @@ var IdentityServiceImpl = class extends import_context4.Resource {
     const dataSpaceManager = this._dataSpaceManagerProvider();
     const recordedDefaultSpaceTrigger = new import_async8.Trigger();
     const allProcessed = (0, import_util4.safeAwaitAll)(dataSpaceManager.spaces.values(), async (space) => {
-      if (space.state === import_services4.SpaceState.CLOSED) {
+      if (space.state === import_services4.SpaceState.SPACE_CLOSED) {
         await space.open();
-        const requiresMigration = space.stateUpdate.waitForCondition(() => space.state === import_services4.SpaceState.REQUIRES_MIGRATION);
+        const requiresMigration = space.stateUpdate.waitForCondition(() => space.state === import_services4.SpaceState.SPACE_REQUIRES_MIGRATION);
         await Promise.race([
           space.initializeDataPipeline(),
           requiresMigration
@@ -2020,11 +2020,11 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
         C: (f, a) => f(...a)
       });
       await (0, import_context6.cancelWithContext)(this._ctx, this.rpc.InvitationHostService.options({
-        role: import_invitations3.Options.Role.GUEST
+        role: import_invitations3.InvitationOptions.Role.GUEST
       }));
       (0, import_log7.log)("options sent", void 0, {
         F: __dxlog_file9,
-        L: 88,
+        L: 91,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2033,13 +2033,13 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
       }));
       (0, import_log7.log)("options received", void 0, {
         F: __dxlog_file9,
-        L: 90,
+        L: 93,
         S: this,
         C: (f, a) => f(...a)
       });
-      if (this._remoteOptions?.role !== import_invitations3.Options.Role.HOST) {
+      if (this._remoteOptions?.role !== import_invitations3.InvitationOptions.Role.HOST) {
         throw new import_protocols6.InvalidInvitationExtensionRoleError(void 0, {
-          expected: import_invitations3.Options.Role.HOST,
+          expected: import_invitations3.InvitationOptions.Role.HOST,
           remoteOptions: this._remoteOptions,
           remotePeerId: context.remotePeerId
         });
@@ -2067,7 +2067,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
       this._invitationFlowLock = null;
       (0, import_log7.log)("invitation flow lock released", void 0, {
         F: __dxlog_file9,
-        L: 123,
+        L: 126,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2330,7 +2330,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
       const lastState = this._requireActiveInvitation().state;
       this._callbacks.onStateUpdate(import_services8.Invitation.State.CONNECTING);
       await this.rpc.InvitationHostService.options({
-        role: import_invitations4.Options.Role.HOST
+        role: import_invitations4.InvitationOptions.Role.HOST
       });
       (0, import_log8.log)("options sent", void 0, {
         F: __dxlog_file10,
@@ -2347,10 +2347,10 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
         S: this,
         C: (f, a) => f(...a)
       });
-      if (this._remoteOptions?.role !== import_invitations4.Options.Role.GUEST) {
+      if (this._remoteOptions?.role !== import_invitations4.InvitationOptions.Role.GUEST) {
         this._callbacks.onStateUpdate(lastState);
         throw new import_protocols7.InvalidInvitationExtensionRoleError(void 0, {
-          expected: import_invitations4.Options.Role.GUEST,
+          expected: import_invitations4.InvitationOptions.Role.GUEST,
           remoteOptions: this._remoteOptions,
           remotePeerId: context.remotePeerId
         });
@@ -2434,7 +2434,7 @@ var InvitationTopology = class {
       ]
     });
     const { ownPeerId, candidates, connected, allPeers } = this._controller.getState();
-    if (this._role === import_invitations5.Options.Role.GUEST) {
+    if (this._role === import_invitations5.InvitationOptions.Role.GUEST) {
       return;
     }
     if (connected.length > 0) {
@@ -2473,7 +2473,7 @@ var InvitationTopology = class {
     this._seenPeers.clear();
   }
   toString() {
-    return `InvitationTopology(${this._role === import_invitations5.Options.Role.GUEST ? "guest" : "host"})`;
+    return `InvitationTopology(${this._role === import_invitations5.InvitationOptions.Role.GUEST ? "guest" : "host"})`;
   }
 };
 var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts";
@@ -2488,7 +2488,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, {
@@ -2504,7 +2504,7 @@ var InvitationsHandler = class {
             const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
             (0, import_invariant6.invariant)(deviceKey, void 0, {
               F: __dxlog_file12,
-              L: 93,
+              L: 94,
               S: this,
               A: [
                 "deviceKey",
@@ -2533,7 +2533,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file12,
-                L: 118,
+                L: 119,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2541,7 +2541,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file12,
-                L: 119,
+                L: 120,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2553,17 +2553,17 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file12,
-                L: 121,
+                L: 122,
                 S: this,
                 C: (f, a) => f(...a)
               });
               guardedState.set(extension, import_services6.Invitation.State.SUCCESS);
-              metrics.increment("invitation.success");
+              metrics.increment("dxos.invitation.success");
               import_log6.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols5.trace.end({
                 id: traceId
               }), {
                 F: __dxlog_file12,
-                L: 124,
+                L: 125,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2574,22 +2574,22 @@ var InvitationsHandler = class {
             } catch (err) {
               if (err instanceof import_async9.TimeoutError) {
                 if (guardedState.set(extension, import_services6.Invitation.State.TIMEOUT)) {
-                  metrics.increment("invitation.timeout");
+                  metrics.increment("dxos.invitation.timeout");
                   (0, import_log6.log)("timeout", {
                     ...protocol.toJSON()
                   }, {
                     F: __dxlog_file12,
-                    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");
                   import_log6.log.error("failed", err, {
                     F: __dxlog_file12,
-                    L: 139,
+                    L: 140,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -2600,7 +2600,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file12,
-                L: 142,
+                L: 143,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2614,7 +2614,7 @@ var InvitationsHandler = class {
               ...err.context
             }, {
               F: __dxlog_file12,
-              L: 150,
+              L: 151,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2622,22 +2622,22 @@ var InvitationsHandler = class {
           }
           if (err instanceof import_async9.TimeoutError) {
             if (guardedState.set(extension, import_services6.Invitation.State.TIMEOUT)) {
-              metrics.increment("invitation.timeout");
+              metrics.increment("dxos.invitation.timeout");
               (0, import_log6.log)("timeout", {
                 err
               }, {
                 F: __dxlog_file12,
-                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");
               import_log6.log.error("failed", err, {
                 F: __dxlog_file12,
-                L: 161,
+                L: 162,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2651,7 +2651,7 @@ var InvitationsHandler = class {
       if (invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now()) {
         import_log6.log.warn("invitation has already expired", void 0, {
           F: __dxlog_file12,
-          L: 172,
+          L: 173,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2659,14 +2659,14 @@ var InvitationsHandler = class {
         (0, import_async9.scheduleTask)(ctx, async () => {
           await swarmConnection.close();
           guardedState.set(null, import_services6.Invitation.State.EXPIRED);
-          metrics.increment("invitation.expired");
+          metrics.increment("dxos.invitation.expired");
           await ctx.dispose();
         }, invitation.created.getTime() + invitation.lifetime * 1e3 - Date.now());
       }
     }
     let swarmConnection;
     (0, import_async9.scheduleTask)(ctx, async () => {
-      swarmConnection = await this._joinSwarm(ctx, invitation, import_invitations2.Options.Role.HOST, createExtension);
+      swarmConnection = await this._joinSwarm(ctx, invitation, import_invitations2.InvitationOptions.Role.HOST, createExtension);
       guardedState.set(null, import_services6.Invitation.State.CONNECTING);
     });
   }
@@ -2675,7 +2675,7 @@ var InvitationsHandler = class {
     if (deviceProfile) {
       (0, import_invariant6.invariant)(invitation.kind === import_services6.Invitation.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
         F: __dxlog_file12,
-        L: 206,
+        L: 207,
         S: this,
         A: [
           "invitation.kind === Invitation.Kind.DEVICE",
@@ -2693,7 +2693,7 @@ var InvitationsHandler = class {
         triedPeers: triedPeersIds.size
       }, {
         F: __dxlog_file12,
-        L: 214,
+        L: 215,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2720,7 +2720,7 @@ var InvitationsHandler = class {
               currentState: guardedState.current.state
             }, {
               F: __dxlog_file12,
-              L: 242,
+              L: 243,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2738,7 +2738,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file12,
-                L: 254,
+                L: 255,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2750,7 +2750,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file12,
-                L: 265,
+                L: 266,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2759,7 +2759,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file12,
-                L: 269,
+                L: 270,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2772,7 +2772,7 @@ var InvitationsHandler = class {
                 response: introductionResponse
               }, {
                 F: __dxlog_file12,
-                L: 274,
+                L: 275,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2793,7 +2793,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file12,
-                L: 300,
+                L: 301,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2805,7 +2805,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file12,
-                L: 311,
+                L: 312,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2818,7 +2818,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file12,
-                L: 317,
+                L: 318,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2828,7 +2828,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file12,
-                  L: 320,
+                  L: 321,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2836,7 +2836,7 @@ var InvitationsHandler = class {
               } else {
                 (0, import_log6.log)("auth failed", err, {
                   F: __dxlog_file12,
-                  L: 323,
+                  L: 324,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2848,7 +2848,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file12,
-                L: 327,
+                L: 328,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2864,7 +2864,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file12,
-              L: 336,
+              L: 337,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2872,7 +2872,7 @@ var InvitationsHandler = class {
           } else {
             (0, import_log6.log)("auth failed", err, {
               F: __dxlog_file12,
-              L: 339,
+              L: 340,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2890,21 +2890,21 @@ var InvitationsHandler = class {
       } else {
         (0, import_invariant6.invariant)(invitation.swarmKey, void 0, {
           F: __dxlog_file12,
-          L: 354,
+          L: 355,
           S: this,
           A: [
             "invitation.swarmKey",
             ""
           ]
         });
-        await this._joinSwarm(ctx, invitation, import_invitations2.Options.Role.GUEST, createExtension);
+        await this._joinSwarm(ctx, invitation, import_invitations2.InvitationOptions.Role.GUEST, createExtension);
         guardedState.set(null, import_services6.Invitation.State.CONNECTING);
       }
     });
   }
   async _joinSwarm(ctx, invitation, role, extensionFactory) {
     let label;
-    if (role === import_invitations2.Options.Role.GUEST) {
+    if (role === import_invitations2.InvitationOptions.Role.GUEST) {
       label = "invitation guest";
     } else if (invitation.kind === import_services6.Invitation.Kind.DEVICE) {
       label = "invitation host for device";
@@ -2990,7 +2990,7 @@ var InvitationsHandler = class {
         oldState: stateToString(invitation.state)
       }, {
         F: __dxlog_file12,
-        L: 448,
+        L: 449,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3001,7 +3001,7 @@ var InvitationsHandler = class {
         oldState: stateToString(invitation.state)
       }, {
         F: __dxlog_file12,
-        L: 454,
+        L: 455,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3020,7 +3020,7 @@ var InvitationsHandler = class {
     for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
       (0, import_log6.log)("guest waiting for authentication code...", void 0, {
         F: __dxlog_file12,
-        L: 479,
+        L: 480,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3028,7 +3028,7 @@ var InvitationsHandler = class {
       const authCode = await authenticated.wait(options);
       (0, import_log6.log)("sending authentication request", void 0, {
         F: __dxlog_file12,
-        L: 483,
+        L: 484,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3047,7 +3047,7 @@ var InvitationsHandler = class {
             attempt
           }, {
             F: __dxlog_file12,
-            L: 494,
+            L: 495,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3065,7 +3065,7 @@ var InvitationsHandler = class {
     }
     (0, import_log6.log)("sending authentication request", void 0, {
       F: __dxlog_file12,
-      L: 513,
+      L: 514,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4340,7 +4340,7 @@ var DataSpace = class {
     this._cache = void 0;
     this._automergeSpaceState = new AutomergeSpaceState((rootUrl) => this._onNewAutomergeRoot(rootUrl));
     this._epochProcessingMutex = new import_async13.Mutex();
-    this._state = import_services12.SpaceState.CLOSED;
+    this._state = import_services12.SpaceState.SPACE_CLOSED;
     this._databaseRoot = null;
     this.error = void 0;
     this.stateUpdate = new import_async13.Event();
@@ -4409,7 +4409,7 @@ var DataSpace = class {
     };
   }
   async open() {
-    if (this._state === import_services12.SpaceState.CLOSED) {
+    if (this._state === import_services12.SpaceState.SPACE_CLOSED) {
       await this._open();
     }
   }
@@ -4424,7 +4424,7 @@ var DataSpace = class {
       F: __dxlog_file17,
       L: 215
     }));
-    this._state = import_services12.SpaceState.CONTROL_ONLY;
+    this._state = import_services12.SpaceState.SPACE_CONTROL_ONLY;
     (0, import_log12.log)("new state", {
       state: import_services12.SpaceState[this._state]
     }, {
@@ -4442,7 +4442,7 @@ var DataSpace = class {
   }
   async _close() {
     await this._callbacks.beforeClose?.();
-    this._state = import_services12.SpaceState.CLOSED;
+    this._state = import_services12.SpaceState.SPACE_CLOSED;
     (0, import_log12.log)("new state", {
       state: import_services12.SpaceState[this._state]
     }, {
@@ -4495,7 +4495,7 @@ var DataSpace = class {
           S: this,
           C: (f, a) => f(...a)
         });
-        this._state = import_services12.SpaceState.ERROR;
+        this._state = import_services12.SpaceState.SPACE_ERROR;
         (0, import_log12.log)("new state", {
           state: import_services12.SpaceState[this._state]
         }, {
@@ -4512,10 +4512,10 @@ var DataSpace = class {
     });
   }
   async initializeDataPipeline() {
-    if (this._state !== import_services12.SpaceState.CONTROL_ONLY) {
+    if (this._state !== import_services12.SpaceState.SPACE_CONTROL_ONLY) {
       throw new import_protocols9.SystemError("Invalid operation");
     }
-    this._state = import_services12.SpaceState.INITIALIZING;
+    this._state = import_services12.SpaceState.SPACE_INITIALIZING;
     (0, import_log12.log)("new state", {
       state: import_services12.SpaceState[this._state]
     }, {
@@ -4526,13 +4526,13 @@ var DataSpace = class {
     });
     await this._initializeAndReadControlPipeline();
     await (0, import_async13.sleep)(1);
-    const ready = this.stateUpdate.waitForCondition(() => this._state === import_services12.SpaceState.READY);
+    const ready = this.stateUpdate.waitForCondition(() => this._state === import_services12.SpaceState.SPACE_READY);
     this._automergeSpaceState.startProcessingRootDocs();
     await ready;
   }
   async _enterReadyState() {
     await this._callbacks.beforeReady?.();
-    this._state = import_services12.SpaceState.READY;
+    this._state = import_services12.SpaceState.SPACE_READY;
     (0, import_log12.log)("new state", {
       state: import_services12.SpaceState[this._state]
     }, {
@@ -4643,17 +4643,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() !== import_echo_protocol.SpaceDocVersion.CURRENT) {
-            if (this._state !== import_services12.SpaceState.REQUIRES_MIGRATION) {
-              this._state = import_services12.SpaceState.REQUIRES_MIGRATION;
-              this.stateUpdate.emit();
-            }
+            this._state = import_services12.SpaceState.SPACE_REQUIRES_MIGRATION;
+            this.stateUpdate.emit();
+          } else if (this._state !== import_services12.SpaceState.SPACE_READY) {
+            await this._enterReadyState();
           } else {
-            if (this._state !== import_services12.SpaceState.READY) {
-              await this._enterReadyState();
-            }
+            this.stateUpdate.emit();
           }
         } catch (_) {
           _usingCtx.e = _;
@@ -4670,7 +4668,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file17,
-          L: 433,
+          L: 431,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4723,40 +4721,44 @@ var DataSpace = class {
         credential
       }
     });
-    await this.inner.controlPipeline.state.waitUntilTimeframe(new import_timeframe3.Timeframe([
+    const timeframe = new import_timeframe3.Timeframe([
       [
         receipt.feedKey,
         receipt.seq
       ]
-    ]));
+    ]);
+    await this.inner.controlPipeline.state.waitUntilTimeframe(timeframe);
     await this._echoHost.updateIndexes();
-    return credential;
+    return {
+      credential,
+      timeframe
+    };
   }
   async activate() {
     if (![
-      import_services12.SpaceState.CLOSED,
-      import_services12.SpaceState.INACTIVE
+      import_services12.SpaceState.SPACE_CLOSED,
+      import_services12.SpaceState.SPACE_INACTIVE
     ].includes(this._state)) {
       return;
     }
-    await this._metadataStore.setSpaceState(this.key, import_services12.SpaceState.ACTIVE);
+    await this._metadataStore.setSpaceState(this.key, import_services12.SpaceState.SPACE_ACTIVE);
     await this._open();
     this.initializeDataPipelineAsync();
   }
   async deactivate() {
-    if (this._state === import_services12.SpaceState.INACTIVE) {
+    if (this._state === import_services12.SpaceState.SPACE_INACTIVE) {
       return;
     }
-    await this._metadataStore.setSpaceState(this.key, import_services12.SpaceState.INACTIVE);
-    if (this._state !== import_services12.SpaceState.CLOSED) {
+    await this._metadataStore.setSpaceState(this.key, import_services12.SpaceState.SPACE_INACTIVE);
+    if (this._state !== import_services12.SpaceState.SPACE_CLOSED) {
       await this._close();
     }
-    this._state = import_services12.SpaceState.INACTIVE;
+    this._state = import_services12.SpaceState.SPACE_INACTIVE;
     (0, import_log12.log)("new state", {
       state: import_services12.SpaceState[this._state]
     }, {
       F: __dxlog_file17,
-      L: 514,
+      L: 513,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5026,7 +5028,7 @@ var DataSpaceManager = class {
       genesisFeedKey: controlFeedKey,
       controlFeedKey,
       dataFeedKey,
-      state: import_services14.SpaceState.ACTIVE
+      state: import_services14.SpaceState.SPACE_ACTIVE
     };
     (0, import_log15.log)("creating space...", {
       spaceKey
@@ -5208,7 +5210,7 @@ var DataSpaceManager = class {
   async waitUntilSpaceReady(spaceKey) {
     await (0, import_context13.cancelWithContext)(this._ctx, this.updated.waitForCondition(() => {
       const space = this._spaces.get(spaceKey);
-      return !!space && space.state === import_services14.SpaceState.READY;
+      return !!space && space.state === import_services14.SpaceState.SPACE_READY;
     }));
   }
   async requestSpaceAdmissionCredential(spaceKey) {
@@ -5255,25 +5257,43 @@ var DataSpaceManager = class {
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
         credentialAuthenticator: (0, import_util9.deferFunction)(() => dataSpace.authVerifier.verifier)
       },
-      onAuthorizedConnection: (session) => {
-        session.addExtension("dxos.mesh.teleport.admission-discovery", new import_echo_pipeline4.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 import_echo_pipeline4.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) {
+          import_log15.log.warn("error on authorized connection", {
+            err
+          }, {
+            F: __dxlog_file18,
+            L: 403,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          await session.close(err);
+        }
+      }),
       onAuthFailure: () => {
         import_log15.log.warn("auth failure", void 0, {
           F: __dxlog_file18,
-          L: 396,
+          L: 408,
           S: this,
           C: (f, a) => f(...a)
         });
       },
       onMemberRolesChanged: async (members) => {
-        if (dataSpace?.state === import_services14.SpaceState.READY) {
+        if (dataSpace?.state === import_services14.SpaceState.SPACE_READY) {
           this._handleMemberRoleChanges(presence, space.protocol, members);
         }
       },
@@ -5286,7 +5306,7 @@ var DataSpaceManager = class {
     dataFeed && await space.setDataFeed(dataFeed);
     const dataSpace = new DataSpace({
       inner: space,
-      initialState: metadata.state === import_services14.SpaceState.INACTIVE ? import_services14.SpaceState.INACTIVE : import_services14.SpaceState.CLOSED,
+      initialState: metadata.state === import_services14.SpaceState.SPACE_INACTIVE ? import_services14.SpaceState.SPACE_INACTIVE : import_services14.SpaceState.SPACE_CLOSED,
       metadataStore: this._metadataStore,
       gossip,
       presence,
@@ -5300,7 +5320,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file18,
-            L: 423,
+            L: 435,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5311,7 +5331,7 @@ var DataSpaceManager = class {
             open: this._isOpen
           }, {
             F: __dxlog_file18,
-            L: 426,
+            L: 438,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5330,7 +5350,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file18,
-            L: 434,
+            L: 446,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5339,7 +5359,7 @@ var DataSpaceManager = class {
       cache: metadata.cache
     });
     presence.newPeer.on((peerState) => {
-      if (dataSpace.state === import_services14.SpaceState.READY) {
+      if (dataSpace.state === import_services14.SpaceState.SPACE_READY) {
         this._handleNewPeerConnected(space, peerState);
       }
     });
@@ -5371,7 +5391,7 @@ var DataSpaceManager = class {
       closedSessions
     }, {
       F: __dxlog_file18,
-      L: 470,
+      L: 482,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5386,7 +5406,7 @@ var DataSpaceManager = class {
           peerId: peerState.peerId
         }, {
           F: __dxlog_file18,
-          L: 484,
+          L: 496,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5395,7 +5415,7 @@ var DataSpaceManager = class {
     }
   }
   async _handleInvitationStatusChange(dataSpace, delegatedInvitation, isActive) {
-    if (dataSpace?.state !== import_services14.SpaceState.READY) {
+    if (dataSpace?.state !== import_services14.SpaceState.SPACE_READY) {
       return;
     }
     if (isActive) {
@@ -5464,10 +5484,10 @@ var SpacesServiceImpl = class {
     const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols12.SpaceNotFoundError(spaceKey));
     if (state) {
       switch (state) {
-        case import_services15.SpaceState.ACTIVE:
+        case import_services15.SpaceState.SPACE_ACTIVE:
           await space.activate();
           break;
-        case import_services15.SpaceState.INACTIVE:
+        case import_services15.SpaceState.SPACE_INACTIVE:
           await space.deactivate();
           break;
         default:
@@ -5514,9 +5534,9 @@ var SpacesServiceImpl = class {
       const scheduler = new import_async17.UpdateScheduler(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space));
-        (0, import_log16.log)("update", {
-          spaces
-        }, {
+        (0, import_log16.log)("update", () => ({
+          ids: spaces.map((space) => space.id)
+        }), {
           F: __dxlog_file19,
           L: 115,
           S: this,
@@ -5651,12 +5671,13 @@ var SpacesServiceImpl = class {
   async createEpoch({ spaceKey, migration, automergeRootUrl }) {
     const dataSpaceManager = await this._getDataSpaceManager();
     const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols12.SpaceNotFoundError(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) {
@@ -5763,7 +5784,7 @@ var SpacesServiceImpl = class {
     const dataSpaceManager = await this._getDataSpaceManager();
     const identity = this._identityManager.identity?.identityKey.truncate();
     if (identity) {
-      import_tracing8.trace.metrics.gauge("echo.space.count", dataSpaceManager.spaces.size, {
+      import_tracing8.trace.metrics.gauge("dxos.echo.space.count", dataSpaceManager.spaces.size, {
         tags: {
           identity
         }
@@ -7135,4 +7156,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-7XBIZ7NK.cjs.map
+//# sourceMappingURL=chunk-CVLKGJK5.cjs.map