@dxos/client-services 0.5.0 → 0.5.1-main.0ec204c

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

@@ -6,14 +6,10 @@ import { Event, asyncTimeout, scheduleTask, sleep, synchronized, trackLeaks } fr
 import { AUTH_TIMEOUT } from '@dxos/client-protocol';
 import { cancelWithContext, Context, ContextDisposedError } from '@dxos/context';
 import { timed, warnAfterTimeout } from '@dxos/debug';
-import {
-  type MetadataStore,
-  type Space,
-  createMappedFeedWriter,
-  type AutomergeHost,
-  type SpaceDoc,
-} from '@dxos/echo-pipeline';
+import { type EchoHost } from '@dxos/echo-db';
+import { type MetadataStore, type Space, createMappedFeedWriter } from '@dxos/echo-pipeline';
 import { AutomergeDocumentLoaderImpl } from '@dxos/echo-pipeline';
+import { type SpaceDoc } from '@dxos/echo-protocol';
 import { TYPE_PROPERTIES } from '@dxos/echo-schema';
 import { type FeedStore } from '@dxos/feed-store';
 import { failedInvariant, invariant } from '@dxos/invariant';
@@ -24,6 +20,7 @@ import { CancelledError, SystemError } from '@dxos/protocols';
 import { SpaceState, type Space as SpaceProto, CreateEpochRequest } from '@dxos/protocols/proto/dxos/client/services';
 import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { type SpaceCache } from '@dxos/protocols/proto/dxos/echo/metadata';
+import { SpaceMember } from '@dxos/protocols/proto/dxos/halo/credentials';
 import {
   AdmittedFeed,
   type ProfileDocument,
@@ -66,10 +63,10 @@ export type DataSpaceParams = {
   presence: Presence;
   keyring: Keyring;
   feedStore: FeedStore<FeedMessage>;
+  echoHost: EchoHost;
   signingContext: SigningContext;
   callbacks?: DataSpaceCallbacks;
   cache?: SpaceCache;
-  automergeHost: AutomergeHost;
 };
 
 export type CreateEpochOptions = {
@@ -92,7 +89,7 @@ export class DataSpace {
   private readonly _notarizationPlugin = new NotarizationPlugin();
   private readonly _callbacks: DataSpaceCallbacks;
   private readonly _cache?: SpaceCache = undefined;
-  private readonly _automergeHost: AutomergeHost;
+  private readonly _echoHost: EchoHost;
 
   // TODO(dmaretskyi): Move into Space?
   private readonly _automergeSpaceState = new AutomergeSpaceState((rootUrl) => this._onNewAutomergeRoot(rootUrl));
@@ -120,14 +117,14 @@ export class DataSpace {
     this._metadataStore = params.metadataStore;
     this._signingContext = params.signingContext;
     this._callbacks = params.callbacks ?? {};
-    this._automergeHost = params.automergeHost;
+    this._echoHost = params.echoHost;
 
     this.authVerifier = new TrustedKeySetAuthVerifier({
       trustedKeysProvider: () =>
         new ComplexSet(
           PublicKey.hash,
           Array.from(this._inner.spaceState.members.values())
-            .filter((member) => !member.removed)
+            .filter((member) => member.role !== SpaceMember.Role.REMOVED)
             .map((member) => member.key),
         ),
       update: this._inner.stateUpdate,
@@ -363,8 +360,8 @@ export class DataSpace {
 
   private _onNewAutomergeRoot(rootUrl: string) {
     log('loading automerge root doc for space', { space: this.key, rootUrl });
-    this._automergeHost._requestedDocs.add(rootUrl as any);
-    const handle = this._automergeHost.repo.find(rootUrl as any);
+    this._echoHost.replicateDocument(rootUrl);
+    const handle = this._echoHost.automergeRepo.find(rootUrl as any);
 
     queueMicrotask(async () => {
       try {
@@ -419,7 +416,7 @@ export class DataSpace {
         break;
       case CreateEpochRequest.Migration.INIT_AUTOMERGE:
         {
-          const document = this._automergeHost.repo.create();
+          const document = this._echoHost.automergeRepo.create();
           // TODO(dmaretskyi): Unify epoch construction.
           epoch = {
             previousId: this._automergeSpaceState.lastEpoch?.id,
@@ -432,9 +429,9 @@ export class DataSpace {
       case CreateEpochRequest.Migration.PRUNE_AUTOMERGE_ROOT_HISTORY:
         {
           const currentRootUrl = this._automergeSpaceState.rootUrl;
-          const rootHandle = this._automergeHost.repo.find(currentRootUrl as any);
+          const rootHandle = this._echoHost.automergeRepo.find(currentRootUrl as any);
           await cancelWithContext(this._ctx, asyncTimeout(rootHandle.whenReady(), 10_000));
-          const newRoot = this._automergeHost.repo.create(rootHandle.docSync());
+          const newRoot = this._echoHost.automergeRepo.create(rootHandle.docSync());
           invariant(typeof newRoot.url === 'string' && newRoot.url.length > 0);
           // TODO(dmaretskyi): Unify epoch construction.
           epoch = {
@@ -450,7 +447,7 @@ export class DataSpace {
           log.info('Fragmenting');
 
           const currentRootUrl = this._automergeSpaceState.rootUrl;
-          const rootHandle = this._automergeHost.repo.find<SpaceDoc>(currentRootUrl as any);
+          const rootHandle = this._echoHost.automergeRepo.find<SpaceDoc>(currentRootUrl as any);
           await cancelWithContext(this._ctx, asyncTimeout(rootHandle.whenReady(), 10_000));
 
           // Find properties object.
@@ -461,11 +458,11 @@ export class DataSpace {
 
           // Create a new space doc with the properties object.
           const newSpaceDoc: SpaceDoc = { ...rootHandle.docSync(), objects: Object.fromEntries([properties]) };
-          const newRoot = this._automergeHost.repo.create(newSpaceDoc);
+          const newRoot = this._echoHost.automergeRepo.create(newSpaceDoc);
           invariant(typeof newRoot.url === 'string' && newRoot.url.length > 0);
 
           // Create new automerge documents for all objects.
-          const docLoader = new AutomergeDocumentLoaderImpl(this.key, this._automergeHost.repo);
+          const docLoader = new AutomergeDocumentLoaderImpl(this.key, this._echoHost.automergeRepo);
           await docLoader.loadSpaceRootDocHandle(this._ctx, { rootUrl: newRoot.url });
 
           otherObjects.forEach(([key, value]) => {

package/src/packlets/spaces/genesis.ts

@@ -36,7 +36,7 @@ export const spaceGenesis = async (
       assertion: {
         '@type': 'dxos.halo.credentials.SpaceMember',
         spaceKey: space.key,
-        role: SpaceMember.Role.ADMIN,
+        role: SpaceMember.Role.OWNER,
         profile: signingContext.getProfile(),
         genesisFeedKey: space.controlFeedKey ?? failUndefined(),
       },

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

@@ -22,8 +22,9 @@ import {
   type SubscribeMessagesRequest,
   type UpdateSpaceRequest,
   type WriteCredentialsRequest,
+  type UpdateMemberRoleRequest,
 } from '@dxos/protocols/proto/dxos/client/services';
-import { type Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
+import { type Credential, SpaceMember as HaloSpaceMember } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { type GossipMessage } from '@dxos/protocols/proto/dxos/mesh/teleport/gossip';
 import { type Provider } from '@dxos/util';
 
@@ -67,6 +68,10 @@ export class SpacesServiceImpl implements SpacesService {
     }
   }
 
+  async updateMemberRole(_: UpdateMemberRoleRequest): Promise<void> {
+    throw new Error('not implemented');
+  }
+
   querySpaces(): Stream<QuerySpacesResponse> {
     return new Stream<QuerySpacesResponse>(({ next, ctx }) => {
       const scheduler = new UpdateScheduler(
@@ -213,11 +218,12 @@ export class SpacesServiceImpl implements SpacesService {
             identityKey: member.key,
             profile: member.profile ?? {},
           },
-          presence: member.removed
-            ? SpaceMember.PresenceState.REMOVED
-            : isMe || peers.length > 0
-              ? SpaceMember.PresenceState.ONLINE
-              : SpaceMember.PresenceState.OFFLINE,
+          presence:
+            member.role === HaloSpaceMember.Role.REMOVED
+              ? SpaceMember.PresenceState.REMOVED
+              : isMe || peers.length > 0
+                ? SpaceMember.PresenceState.ONLINE
+                : SpaceMember.PresenceState.OFFLINE,
           peerStates: peers,
         };
       }),

package/src/packlets/storage/level.ts

@@ -2,10 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Level } from 'level';
 import path from 'node:path';
 
 import { PublicKey } from '@dxos/keys';
+import { createLevel as createKV } from '@dxos/kv-store';
 import { type Runtime } from '@dxos/protocols/proto/dxos/config';
 
 import { getRootPath, isPersistent } from './util';
@@ -13,7 +13,8 @@ import { getRootPath, isPersistent } from './util';
 export const createLevel = async (config: Runtime.Client.Storage) => {
   const persistent = isPersistent(config);
   const storagePath = persistent ? path.join(getRootPath(config), 'level') : `/tmp/dxos-${PublicKey.random().toHex()}`;
-  const level = new Level<string, string>(storagePath);
+  const level = createKV(storagePath);
+  // TODO(dmaretskyi): This function shouldn't call open - .
   await level.open();
   return level;
 };

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

@@ -45,6 +45,7 @@ export type PerformInvitationParams = {
     guest?: PerformInvitationCallbacks<AuthenticatingInvitation>;
   };
   guestDeviceProfile?: DeviceProfileDocument;
+  codeInputDelay?: number;
 };
 
 export type Result = { invitation?: Invitation; error?: Error };
@@ -55,7 +56,10 @@ export const performInvitation = ({
   options,
   hooks,
   guestDeviceProfile,
+  codeInputDelay,
 }: PerformInvitationParams): [Promise<Result>, Promise<Result>] => {
+  let guestError = false;
+  let guestConnected = false;
   const hostComplete = new Trigger<Result>();
   const guestComplete = new Trigger<Result>();
   const authCode = new Trigger<string>();
@@ -65,6 +69,10 @@ export const performInvitation = ({
       async (hostInvitation: Invitation) => {
         switch (hostInvitation.state) {
           case Invitation.State.CONNECTING: {
+            if (guestConnected) {
+              break;
+            }
+            guestConnected = true;
             if (hooks?.host?.onConnecting?.(hostObservable)) {
               break;
             }
@@ -89,7 +97,16 @@ export const performInvitation = ({
                     if (hooks?.guest?.onReady?.(guestObservable)) {
                       break;
                     }
-                    await guestObservable.authenticate(await authCode.wait());
+                    const code = await authCode.wait();
+                    if (codeInputDelay == null) {
+                      await guestObservable.authenticate(code);
+                    } else {
+                      setTimeout(async () => {
+                        if (!guestError) {
+                          await guestObservable.authenticate(code);
+                        }
+                      }, codeInputDelay);
+                    }
                     break;
                   }
 
@@ -123,6 +140,7 @@ export const performInvitation = ({
                 }
               },
               (error: Error) => {
+                guestError = true;
                 if (hooks?.guest?.onError?.(guestObservable)) {
                   return;
                 }
@@ -216,8 +234,10 @@ const acceptInvitation = (
   invitation = sanitizeInvitation(invitation);
 
   if (guest instanceof ServiceContext) {
-    const guestHandler = guest.getInvitationHandler({ kind: invitation.kind });
-    return guest.invitations.acceptInvitation(guestHandler, invitation, guestDeviceProfile);
+    return guest.invitationsManager.acceptInvitation({
+      invitation,
+      deviceProfile: guestDeviceProfile,
+    });
   }
 
   return guest.join(invitation, guestDeviceProfile);

package/src/packlets/testing/test-builder.ts

@@ -6,17 +6,12 @@ import { type Config } from '@dxos/config';
 import { Context } from '@dxos/context';
 import { createCredentialSignerWithChain, CredentialGenerator } from '@dxos/credentials';
 import { failUndefined } from '@dxos/debug';
-import {
-  AutomergeHost,
-  MetadataStore,
-  type LevelDB,
-  SnapshotStore,
-  SpaceManager,
-  valueEncoding,
-} from '@dxos/echo-pipeline';
-import { createTestLevel } from '@dxos/echo-pipeline/testing';
+import { EchoHost } from '@dxos/echo-db';
+import { MetadataStore, SnapshotStore, SpaceManager, valueEncoding } from '@dxos/echo-pipeline';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
+import { type LevelDB } from '@dxos/kv-store';
+import { createTestLevel } from '@dxos/kv-store/testing';
 import { MemorySignalManager, MemorySignalManagerContext } from '@dxos/messaging';
 import { MemoryTransportFactory, NetworkManager } from '@dxos/network-manager';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
@@ -54,7 +49,9 @@ export const createServiceContext = async ({
   const level = createTestLevel();
   await level.open();
 
-  return new ServiceContext(storage, level, networkManager, signalManager);
+  return new ServiceContext(storage, level, networkManager, signalManager, {
+    invitationConnectionDefaultParams: { controlHeartbeatInterval: 200 },
+  });
 };
 
 export const createPeers = async (numPeers: number) => {
@@ -105,7 +102,7 @@ export type TestPeerProps = {
   snapshotStore?: SnapshotStore;
   signingContext?: SigningContext;
   blobStore?: BlobStore;
-  automergeHost?: AutomergeHost;
+  echoHost?: EchoHost;
   invitationsManager?: InvitationsManager;
 };
 
@@ -178,9 +175,10 @@ export class TestPeer {
     return this._props.signingContext ?? failUndefined();
   }
 
-  get automergeHost() {
-    return (this._props.automergeHost ??= new AutomergeHost({
-      db: this.level.sublevel('automerge'),
+  get echoHost() {
+    return (this._props.echoHost ??= new EchoHost({
+      kv: this.level,
+      storage: this.storage,
     }));
   }
 
@@ -191,7 +189,7 @@ export class TestPeer {
       this.keyring,
       this.identity,
       this.feedStore,
-      this.automergeHost,
+      this.echoHost,
       this.invitationsManager,
     ));
   }

package/src/packlets/vault/shell-runtime.ts

@@ -6,7 +6,12 @@ import { Event } from '@dxos/async';
 import { appServiceBundle, type AppServiceBundle, type ShellRuntime, shellServiceBundle } from '@dxos/client-protocol';
 import { invariant } from '@dxos/invariant';
 import { type PublicKey } from '@dxos/keys';
-import { type AppContextRequest, type LayoutRequest, ShellLayout } from '@dxos/protocols/proto/dxos/iframe';
+import {
+  type AppContextRequest,
+  type LayoutRequest,
+  ShellLayout,
+  type InvitationUrlRequest,
+} from '@dxos/protocols/proto/dxos/iframe';
 import { createProtoRpcPeer, type ProtoRpcPeer, type RpcPort } from '@dxos/rpc';
 
 /**
@@ -14,11 +19,19 @@ import { createProtoRpcPeer, type ProtoRpcPeer, type RpcPort } from '@dxos/rpc';
  */
 export class ShellRuntimeImpl implements ShellRuntime {
   readonly layoutUpdate = new Event<LayoutRequest>();
+  readonly invitationUrlUpdate = new Event<InvitationUrlRequest>();
+
   private _appRpc?: ProtoRpcPeer<AppServiceBundle>;
   private _layout = ShellLayout.DEFAULT;
-  private _invitationCode?: string;
   private _spaceKey?: PublicKey;
 
+  private _invitationCode?: string;
+  private _invitationUrl? = typeof window !== 'undefined' ? window.location.origin : undefined;
+
+  // TODO(burdon): Change to using underscores (coordinate with @dxos/web-auth).
+  private _deviceInvitationParam = 'deviceInvitationCode'; // TODO(burdon): device_invitation_code
+  private _spaceInvitationParam = 'spaceInvitationCode'; // TODO(burdon): space_invitation_code
+
   constructor(private readonly _port: RpcPort) {}
 
   get layout() {
@@ -33,6 +46,18 @@ export class ShellRuntimeImpl implements ShellRuntime {
     return this._spaceKey;
   }
 
+  get invitationUrl() {
+    return this._invitationUrl!;
+  }
+
+  get deviceInvitationParam() {
+    return this._deviceInvitationParam;
+  }
+
+  get spaceInvitationParam() {
+    return this._spaceInvitationParam;
+  }
+
   setLayout({ layout, invitationCode, spaceKey }: LayoutRequest) {
     this._layout = layout;
     this._invitationCode = invitationCode;
@@ -40,6 +65,13 @@ export class ShellRuntimeImpl implements ShellRuntime {
     this.layoutUpdate.emit({ layout, invitationCode, spaceKey });
   }
 
+  setInvitationUrl({ invitationUrl, deviceInvitationParam, spaceInvitationParam }: InvitationUrlRequest) {
+    this._invitationUrl = invitationUrl;
+    this._deviceInvitationParam = deviceInvitationParam;
+    this._spaceInvitationParam = spaceInvitationParam;
+    this.invitationUrlUpdate.emit({ invitationUrl, deviceInvitationParam, spaceInvitationParam });
+  }
+
   async setAppContext(context: AppContextRequest) {
     invariant(this._appRpc, 'runtime not open');
 
@@ -58,6 +90,12 @@ export class ShellRuntimeImpl implements ShellRuntime {
             this._spaceKey = request.spaceKey;
             this.layoutUpdate.emit(request);
           },
+          setInvitationUrl: async (request) => {
+            this._invitationUrl = request.invitationUrl;
+            this._deviceInvitationParam = request.deviceInvitationParam;
+            this._spaceInvitationParam = request.spaceInvitationParam;
+            this.invitationUrlUpdate.emit(request);
+          },
         },
       },
       port: this._port,

package/src/packlets/vault/worker-runtime.ts

@@ -120,7 +120,9 @@ export class WorkerRuntime {
       this._sessions.delete(session);
       if (this._sessions.size === 0) {
         // Terminate the worker when all sessions are closed.
-        self.close();
+        if (globalThis.self) {
+          self.close();
+        }
       } else {
         this._reconnectWebrtc();
       }

package/src/version.ts

@@ -1,5 +1 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-export const DXOS_VERSION = '0.5.0'; // {x-release-please-version}
+export const DXOS_VERSION = "0.5.1-main.0ec204c";