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

package/src/packlets/spaces/data-space-manager.ts

@@ -197,7 +197,7 @@ export class DataSpaceManager {
       genesisFeedKey: controlFeedKey,
       controlFeedKey,
       dataFeedKey,
-      state: SpaceState.ACTIVE,
+      state: SpaceState.SPACE_ACTIVE,
     };
 
     log('creating space...', { spaceKey });
@@ -336,7 +336,7 @@ export class DataSpaceManager {
       this._ctx,
       this.updated.waitForCondition(() => {
         const space = this._spaces.get(spaceKey);
-        return !!space && space.state === SpaceState.READY;
+        return !!space && space.state === SpaceState.SPACE_READY;
       }),
     );
   }
@@ -382,21 +382,33 @@ export class DataSpaceManager {
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
         credentialAuthenticator: deferFunction(() => 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: any) {
+            log.warn('error on authorized connection', { err });
+            await session.close(err);
+          }
+        }),
       onAuthFailure: () => {
         log.warn('auth failure');
       },
       onMemberRolesChanged: async (members: MemberInfo[]) => {
-        if (dataSpace?.state === SpaceState.READY) {
+        if (dataSpace?.state === SpaceState.SPACE_READY) {
           this._handleMemberRoleChanges(presence, space.protocol, members);
         }
       },
@@ -410,7 +422,7 @@ export class DataSpaceManager {
 
     const dataSpace = new DataSpace({
       inner: space,
-      initialState: metadata.state === SpaceState.INACTIVE ? SpaceState.INACTIVE : SpaceState.CLOSED,
+      initialState: metadata.state === SpaceState.SPACE_INACTIVE ? SpaceState.SPACE_INACTIVE : SpaceState.SPACE_CLOSED,
       metadataStore: this._metadataStore,
       gossip,
       presence,
@@ -438,7 +450,7 @@ export class DataSpaceManager {
     });
 
     presence.newPeer.on((peerState) => {
-      if (dataSpace.state === SpaceState.READY) {
+      if (dataSpace.state === SpaceState.SPACE_READY) {
         this._handleNewPeerConnected(space, peerState);
       }
     });
@@ -492,7 +504,7 @@ export class DataSpaceManager {
     delegatedInvitation: DelegateInvitationCredential,
     isActive: boolean,
   ): Promise<void> {
-    if (dataSpace?.state !== SpaceState.READY) {
+    if (dataSpace?.state !== SpaceState.SPACE_READY) {
       return;
     }
     if (isActive) {

package/src/packlets/spaces/data-space.ts

@@ -101,12 +101,12 @@ export class DataSpace {
 
   private readonly _epochProcessingMutex = new Mutex();
 
-  private _state = SpaceState.CLOSED;
+  private _state = SpaceState.SPACE_CLOSED;
 
   private _databaseRoot: DatabaseRoot | null = null;
 
   /**
-   * Error for _state === SpaceState.ERROR.
+   * Error for _state === SpaceState.SPACE_ERROR.
    */
   public error: Error | undefined = undefined;
 
@@ -200,7 +200,7 @@ export class DataSpace {
 
   @synchronized
   async open() {
-    if (this._state === SpaceState.CLOSED) {
+    if (this._state === SpaceState.SPACE_CLOSED) {
       await this._open();
     }
   }
@@ -213,7 +213,7 @@ export class DataSpace {
     await this._automergeSpaceState.open();
     await this._inner.spaceState.addCredentialProcessor(this._automergeSpaceState);
     await this._inner.open(new Context());
-    this._state = SpaceState.CONTROL_ONLY;
+    this._state = SpaceState.SPACE_CONTROL_ONLY;
     log('new state', { state: SpaceState[this._state] });
     this.stateUpdate.emit();
     this.metrics = {};
@@ -227,7 +227,7 @@ export class DataSpace {
 
   private async _close() {
     await this._callbacks.beforeClose?.();
-    this._state = SpaceState.CLOSED;
+    this._state = SpaceState.SPACE_CLOSED;
     log('new state', { state: SpaceState[this._state] });
     await this._ctx.dispose();
     this._ctx = new Context();
@@ -267,7 +267,7 @@ export class DataSpace {
         }
 
         log.error('Error initializing data pipeline', err);
-        this._state = SpaceState.ERROR;
+        this._state = SpaceState.SPACE_ERROR;
         log('new state', { state: SpaceState[this._state] });
         this.error = err as Error;
         this.stateUpdate.emit();
@@ -279,11 +279,11 @@ export class DataSpace {
 
   @trace.span({ showInBrowserTimeline: true })
   async initializeDataPipeline() {
-    if (this._state !== SpaceState.CONTROL_ONLY) {
+    if (this._state !== SpaceState.SPACE_CONTROL_ONLY) {
       throw new SystemError('Invalid operation');
     }
 
-    this._state = SpaceState.INITIALIZING;
+    this._state = SpaceState.SPACE_INITIALIZING;
     log('new state', { state: SpaceState[this._state] });
 
     await this._initializeAndReadControlPipeline();
@@ -291,7 +291,7 @@ export class DataSpace {
     // Allow other tasks to run before loading the data pipeline.
     await sleep(1);
 
-    const ready = this.stateUpdate.waitForCondition(() => this._state === SpaceState.READY);
+    const ready = this.stateUpdate.waitForCondition(() => this._state === SpaceState.SPACE_READY);
 
     this._automergeSpaceState.startProcessingRootDocs();
 
@@ -302,7 +302,7 @@ export class DataSpace {
   private async _enterReadyState() {
     await this._callbacks.beforeReady?.();
 
-    this._state = SpaceState.READY;
+    this._state = SpaceState.SPACE_READY;
     log('new state', { state: SpaceState[this._state] });
     this.stateUpdate.emit();
 
@@ -412,19 +412,17 @@ export class DataSpace {
 
         // TODO(dmaretskyi): Close roots.
         // TODO(dmaretskyi): How do we handle changing to the next EPOCH?
-        const root = await this._echoHost.openSpaceRoot(handle.url);
+        const root = await this._echoHost.openSpaceRoot(this.id, handle.url);
 
         // NOTE: Make sure this assignment happens synchronously together with the state change.
         this._databaseRoot = root;
         if (root.getVersion() !== SpaceDocVersion.CURRENT) {
-          if (this._state !== SpaceState.REQUIRES_MIGRATION) {
-            this._state = SpaceState.REQUIRES_MIGRATION;
-            this.stateUpdate.emit();
-          }
+          this._state = SpaceState.SPACE_REQUIRES_MIGRATION;
+          this.stateUpdate.emit();
+        } else if (this._state !== SpaceState.SPACE_READY) {
+          await this._enterReadyState();
         } else {
-          if (this._state !== SpaceState.READY) {
-            await this._enterReadyState();
-          }
+          this.stateUpdate.emit();
         }
       } catch (err) {
         if (err instanceof ContextDisposedError) {
@@ -447,7 +445,7 @@ export class DataSpace {
     await this.inner.controlPipeline.writer.write({ credential: { credential } });
   }
 
-  async createEpoch(options?: CreateEpochOptions): Promise<SpecificCredential<Epoch> | null> {
+  async createEpoch(options?: CreateEpochOptions): Promise<CreateEpochResult | null> {
     const ctx = this._ctx.derive();
 
     // Preserving existing behavior.
@@ -483,35 +481,41 @@ export class DataSpace {
       credential: { credential },
     });
 
-    await this.inner.controlPipeline.state.waitUntilTimeframe(new Timeframe([[receipt.feedKey, receipt.seq]]));
+    const timeframe = new Timeframe([[receipt.feedKey, receipt.seq]]);
+    await this.inner.controlPipeline.state.waitUntilTimeframe(timeframe);
     await this._echoHost.updateIndexes();
 
-    return credential;
+    return { credential, timeframe };
   }
 
   @synchronized
   async activate() {
-    if (![SpaceState.CLOSED, SpaceState.INACTIVE].includes(this._state)) {
+    if (![SpaceState.SPACE_CLOSED, SpaceState.SPACE_INACTIVE].includes(this._state)) {
       return;
     }
 
-    await this._metadataStore.setSpaceState(this.key, SpaceState.ACTIVE);
+    await this._metadataStore.setSpaceState(this.key, SpaceState.SPACE_ACTIVE);
     await this._open();
     this.initializeDataPipelineAsync();
   }
 
   @synchronized
   async deactivate() {
-    if (this._state === SpaceState.INACTIVE) {
+    if (this._state === SpaceState.SPACE_INACTIVE) {
       return;
     }
     // Unregister from data service.
-    await this._metadataStore.setSpaceState(this.key, SpaceState.INACTIVE);
-    if (this._state !== SpaceState.CLOSED) {
+    await this._metadataStore.setSpaceState(this.key, SpaceState.SPACE_INACTIVE);
+    if (this._state !== SpaceState.SPACE_CLOSED) {
       await this._close();
     }
-    this._state = SpaceState.INACTIVE;
+    this._state = SpaceState.SPACE_INACTIVE;
     log('new state', { state: SpaceState[this._state] });
     this.stateUpdate.emit();
   }
 }
+
+type CreateEpochResult = {
+  credential: SpecificCredential<Epoch>;
+  timeframe: Timeframe;
+};

package/src/packlets/spaces/spaces-service.ts

@@ -66,11 +66,11 @@ export class SpacesServiceImpl implements SpacesService {
 
     if (state) {
       switch (state) {
-        case SpaceState.ACTIVE:
+        case SpaceState.SPACE_ACTIVE:
           await space.activate();
           break;
 
-        case SpaceState.INACTIVE:
+        case SpaceState.SPACE_INACTIVE:
           await space.deactivate();
           break;
         default:
@@ -112,7 +112,7 @@ export class SpacesServiceImpl implements SpacesService {
         async () => {
           const dataSpaceManager = await this._getDataSpaceManager();
           const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space));
-          log('update', { spaces });
+          log('update', () => ({ ids: spaces.map((space) => space.id) }));
           await this._updateMetrics();
           next({ spaces });
         },
@@ -226,8 +226,8 @@ export class SpacesServiceImpl implements SpacesService {
   async createEpoch({ spaceKey, migration, automergeRootUrl }: CreateEpochRequest): Promise<CreateEpochResponse> {
     const dataSpaceManager = await this._getDataSpaceManager();
     const space = dataSpaceManager.spaces.get(spaceKey) ?? raise(new SpaceNotFoundError(spaceKey));
-    const credential = await space.createEpoch({ migration, newAutomergeRoot: automergeRootUrl });
-    return { epochCredential: credential ?? undefined };
+    const result = await space.createEpoch({ migration, newAutomergeRoot: automergeRootUrl });
+    return { epochCredential: result?.credential, controlTimeframe: result?.timeframe };
   }
 
   async admitContact(request: AdmitContactRequest): Promise<void> {
@@ -324,7 +324,7 @@ export class SpacesServiceImpl implements SpacesService {
     const dataSpaceManager = await this._getDataSpaceManager();
     const identity = this._identityManager.identity?.identityKey.truncate();
     if (identity) {
-      trace.metrics.gauge('echo.space.count', dataSpaceManager.spaces.size, {
+      trace.metrics.gauge('dxos.echo.space.count', dataSpaceManager.spaces.size, {
         tags: { identity },
       });
     }

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.6.3-main.d007b87";
+export const DXOS_VERSION = "0.6.3-main.d76104f";