@dxos/client-services 0.3.11-main.ec7a2b3 → 0.3.11-main.ee2b64c

package/src/packlets/spaces/automerge-space-state.ts

@@ -9,6 +9,8 @@ export class AutomergeSpaceState implements CredentialProcessor {
   public rootUrl: string | undefined = undefined;
   public lastEpoch: SpecificCredential<Epoch> | undefined = undefined;
 
+  constructor(private readonly _onNewRoot: (rootUrl: string) => void) {}
+
   async processCredential(credential: Credential) {
     if (!checkCredentialType(credential, 'dxos.halo.credentials.Epoch')) {
       return;
@@ -17,6 +19,8 @@ export class AutomergeSpaceState implements CredentialProcessor {
     this.lastEpoch = credential;
     if (credential.subject.assertion.automergeRoot) {
       this.rootUrl = credential.subject.assertion.automergeRoot;
+
+      this._onNewRoot(this.rootUrl);
     }
   }
 }

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

@@ -143,6 +143,9 @@ export class DataSpaceManager {
     const space = await this._constructSpace(metadata);
 
     const automergeRoot = this._automergeHost.repo.create();
+    automergeRoot.change((doc: any) => {
+      doc.experimental_spaceKey = spaceKey.toHex();
+    });
 
     const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, automergeRoot.url);
     await this._metadataStore.addSpace(metadata);
@@ -222,12 +225,13 @@ export class DataSpaceManager {
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
         credentialAuthenticator: deferFunction(() => dataSpace.authVerifier.verifier),
       },
-      onNetworkConnection: (session) => {
+      onAuthorizedConnection: (session) => {
         session.addExtension(
           'dxos.mesh.teleport.gossip',
           gossip.createExtension({ remotePeerId: session.remotePeerId }),
         );
         session.addExtension('dxos.mesh.teleport.notarization', dataSpace.notarizationPlugin.createExtension());
+        this._automergeHost.authorizeDevice(space.key, session.remotePeerId);
         session.addExtension('dxos.mesh.teleport.automerge', this._automergeHost.createExtension());
       },
       onAuthFailure: () => {

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

@@ -2,9 +2,9 @@
 // Copyright 2022 DXOS.org
 //
 
-import { Event, scheduleTask, sleep, synchronized, trackLeaks } from '@dxos/async';
+import { Event, asyncTimeout, scheduleTask, sleep, synchronized, trackLeaks } from '@dxos/async';
 import { AUTH_TIMEOUT } from '@dxos/client-protocol';
-import { cancelWithContext, Context } from '@dxos/context';
+import { cancelWithContext, Context, ContextDisposedError } from '@dxos/context';
 import { timed } from '@dxos/debug';
 import {
   type MetadataStore,
@@ -15,6 +15,7 @@ import {
   type AutomergeHost,
 } from '@dxos/echo-pipeline';
 import { type FeedStore } from '@dxos/feed-store';
+import { failedInvariant } from '@dxos/invariant';
 import { type Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -77,9 +78,12 @@ export type DataSpaceParams = {
 const ENABLE_FEED_PURGE = false;
 
 @trackLeaks('open', 'close')
+@trace.resource()
 export class DataSpace {
   private _ctx = new Context();
+  @trace.info()
   private readonly _inner: Space;
+
   private readonly _gossip: Gossip;
   private readonly _presence: Presence;
   private readonly _keyring: Keyring;
@@ -92,7 +96,7 @@ export class DataSpace {
   private readonly _automergeHost: AutomergeHost;
 
   // TODO(dmaretskyi): Move into Space?
-  private readonly _automergeSpaceState = new AutomergeSpaceState();
+  private readonly _automergeSpaceState = new AutomergeSpaceState((rootUrl) => this._onNewAutomergeRoot(rootUrl));
 
   private _state = SpaceState.CLOSED;
 
@@ -137,6 +141,7 @@ export class DataSpace {
     log('new state', { state: SpaceState[this._state] });
   }
 
+  @trace.info()
   get key() {
     return this._inner.key;
   }
@@ -145,6 +150,7 @@ export class DataSpace {
     return this._inner.isOpen;
   }
 
+  @trace.info({ enum: SpaceState })
   get state(): SpaceState {
     return this._state;
   }
@@ -174,6 +180,14 @@ export class DataSpace {
     return this._automergeSpaceState;
   }
 
+  @trace.info({ depth: null })
+  private get _automergeInfo() {
+    return {
+      rootUrl: this._automergeSpaceState.rootUrl,
+      lastEpoch: this._automergeSpaceState.lastEpoch,
+    };
+  }
+
   @synchronized
   async open() {
     await this._open();
@@ -232,7 +246,7 @@ export class DataSpace {
         this.metrics.pipelineInitBegin = new Date();
         await this.initializeDataPipeline();
       } catch (err) {
-        if (err instanceof CancelledError) {
+        if (err instanceof CancelledError || err instanceof ContextDisposedError) {
           log('data pipeline initialization cancelled', err);
           return;
         }
@@ -363,6 +377,25 @@ export class DataSpace {
     }
   }
 
+  private _onNewAutomergeRoot(rootUrl: string) {
+    log('loading automerge root doc for space', { space: this.key, rootUrl });
+    const handle = this._automergeHost.repo.find(rootUrl as any);
+
+    queueMicrotask(async () => {
+      try {
+        await asyncTimeout(handle.whenReady(), 5_000);
+        const doc = handle.docSync() ?? failedInvariant();
+        if (!doc.experimental_spaceKey) {
+          handle.change((doc: any) => {
+            doc.experimental_spaceKey = this.key.toHex();
+          });
+        }
+      } catch (err) {
+        log.warn('error loading automerge root doc', { space: this.key, rootUrl, err });
+      }
+    });
+  }
+
   // TODO(dmaretskyi): Use profile from signing context.
   async updateOwnProfile(profile: ProfileDocument) {
     const credential = await this._signingContext.credentialSigner.createCredential({

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

@@ -41,7 +41,7 @@ export class SpacesServiceImpl implements SpacesService {
 
   async createSpace(): Promise<Space> {
     if (!this._identityManager.identity) {
-      throw new Error('This device has no HALO identity available. See https://docs.dxos.org/guide/halo');
+      throw new Error('This device has no HALO identity available. See https://docs.dxos.org/guide/platform/halo');
     }
 
     const dataSpaceManager = await this._getDataSpaceManager();
@@ -222,8 +222,8 @@ export class SpacesServiceImpl implements SpacesService {
           presence: member.removed
             ? SpaceMember.PresenceState.REMOVED
             : isMe || peers.length > 0
-            ? SpaceMember.PresenceState.ONLINE
-            : SpaceMember.PresenceState.OFFLINE,
+              ? SpaceMember.PresenceState.ONLINE
+              : SpaceMember.PresenceState.OFFLINE,
           peerStates: peers,
         };
       }),

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

@@ -12,16 +12,18 @@ import {
   type UpdateStatusRequest,
   type QueryStatusRequest,
   type QueryStatusResponse,
+  type Platform,
 } from '@dxos/protocols/proto/dxos/client/services';
 import { jsonKeyReplacer, type MaybePromise } from '@dxos/util';
 
 import { type Diagnostics } from '../services';
+import { getPlatform } from '../services/platform';
 
 export type SystemServiceOptions = {
   config?: Config;
   statusUpdate: Event<void>;
   getCurrentStatus: () => SystemStatus;
-  getDiagnostics: () => Promise<Partial<Diagnostics>>;
+  getDiagnostics: () => Promise<Partial<Diagnostics['services']>>;
   onUpdateStatus: (status: SystemStatus) => MaybePromise<void>;
   onReset: () => MaybePromise<void>;
 };
@@ -73,6 +75,10 @@ export class SystemServiceImpl implements SystemService {
     };
   }
 
+  async getPlatform(): Promise<Platform> {
+    return getPlatform();
+  }
+
   async updateStatus({ status }: UpdateStatusRequest) {
     await this._onUpdateStatus(status);
   }

package/src/packlets/testing/invitation-utils.ts

@@ -3,7 +3,7 @@
 //
 
 import { Trigger } from '@dxos/async';
-import { type AuthenticatingInvitation, type CancellableInvitation } from '@dxos/client-protocol';
+import { InvitationEncoder, type AuthenticatingInvitation, type CancellableInvitation } from '@dxos/client-protocol';
 import { invariant } from '@dxos/invariant';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 
@@ -13,15 +13,7 @@ import { ServiceContext } from '../services';
  * Strip secrets from invitation before giving it to the peer.
  */
 export const sanitizeInvitation = (invitation: Invitation): Invitation => {
-  return {
-    invitationId: invitation.invitationId,
-    type: invitation.type,
-    kind: invitation.kind,
-    authMethod: invitation.authMethod,
-    swarmKey: invitation.swarmKey,
-    state: invitation.state,
-    timeout: invitation.timeout,
-  };
+  return InvitationEncoder.decode(InvitationEncoder.encode(invitation));
 };
 
 export type InvitationHost = {

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.3.11-main.ec7a2b3";
+export const DXOS_VERSION = "0.3.11-main.ee2b64c";