@dxos/client-services 0.1.58-main.ffbb8a1 → 0.1.58-next.6d0af18

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

@@ -3,7 +3,7 @@
 //
 
 import { Event } from '@dxos/async';
-import { AuthenticatingInvitationObservable, CancellableInvitationObservable } from '@dxos/client-protocol';
+import { AuthenticatingInvitation, CancellableInvitation } from '@dxos/client-protocol';
 import { Stream } from '@dxos/codec-protobuf';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
@@ -21,8 +21,8 @@ import { InvitationsHandler } from './invitations-handler';
  * Adapts invitation service observable to client/service stream.
  */
 export class InvitationsServiceImpl implements InvitationsService {
-  private readonly _createInvitations = new Map<string, CancellableInvitationObservable>();
-  private readonly _acceptInvitations = new Map<string, AuthenticatingInvitationObservable>();
+  private readonly _createInvitations = new Map<string, CancellableInvitation>();
+  private readonly _acceptInvitations = new Map<string, AuthenticatingInvitation>();
   private readonly _invitationCreated = new Event<Invitation>();
   private readonly _invitationAccepted = new Event<Invitation>();
   private readonly _removedCreated = new Event<Invitation>();
@@ -41,7 +41,7 @@ export class InvitationsServiceImpl implements InvitationsService {
   }
 
   createInvitation(options: Invitation): Stream<Invitation> {
-    let invitation: CancellableInvitationObservable;
+    let invitation: CancellableInvitation;
 
     const existingInvitation = this._createInvitations.get(options.invitationId);
     if (existingInvitation) {
@@ -64,13 +64,16 @@ export class InvitationsServiceImpl implements InvitationsService {
         () => {
           close();
           this._createInvitations.delete(invitation.get().invitationId);
+          if (invitation.get().type !== Invitation.Type.MULTIUSE) {
+            this._removedCreated.emit(invitation.get());
+          }
         },
       );
     });
   }
 
   acceptInvitation(options: Invitation): Stream<Invitation> {
-    let invitation: AuthenticatingInvitationObservable;
+    let invitation: AuthenticatingInvitation;
 
     const existingInvitation = this._acceptInvitations.get(options.invitationId);
     if (existingInvitation) {
@@ -93,6 +96,9 @@ export class InvitationsServiceImpl implements InvitationsService {
         () => {
           close();
           this._acceptInvitations.delete(invitation.get().invitationId);
+          if (invitation.get().type !== Invitation.Type.MULTIUSE) {
+            this._removedAccepted.emit(invitation.get());
+          }
         },
       );
     });

package/src/packlets/invitations/space-invitation-protocol.ts

@@ -13,8 +13,8 @@ import { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { AdmissionRequest, AdmissionResponse, IntroductionRequest } from '@dxos/protocols/proto/dxos/halo/invitations';
 
-import { DataSpaceManager, SigningContext } from '../spaces';
 import { InvitationProtocol } from './invitation-protocol';
+import { DataSpaceManager, SigningContext } from '../spaces';
 
 export class SpaceInvitationProtocol implements InvitationProtocol {
   constructor(

package/src/packlets/network/network-service.test.ts

@@ -9,9 +9,9 @@ import { Context } from '@dxos/context';
 import { NetworkService, ConnectionState } from '@dxos/protocols/proto/dxos/client/services';
 import { afterEach, afterTest, beforeEach, describe, test } from '@dxos/test';
 
+import { NetworkServiceImpl } from './network-service';
 import { ServiceContext } from '../services';
 import { createServiceContext } from '../testing';
-import { NetworkServiceImpl } from './network-service';
 
 describe('NetworkService', () => {
   let serviceContext: ServiceContext;

package/src/packlets/services/diagnostics.ts

@@ -22,10 +22,10 @@ import {
 import { SubscribeToFeedsResponse } from '@dxos/protocols/proto/dxos/devtools/host';
 import { Epoch } from '@dxos/protocols/proto/dxos/halo/credentials';
 
-import { DXOS_VERSION } from '../../version';
-import { DataSpace } from '../spaces';
 import { getPlatform, Platform } from './platform';
 import { ServiceContext } from './service-context';
+import { DXOS_VERSION } from '../../version';
+import { DataSpace } from '../spaces';
 
 const DEFAULT_TIMEOUT = 1_000;
 

package/src/packlets/services/service-context.ts

@@ -21,7 +21,7 @@ import { log } from '@dxos/log';
 import { SignalManager } from '@dxos/messaging';
 import { ModelFactory } from '@dxos/model-factory';
 import { NetworkManager } from '@dxos/network-manager';
-import { STORAGE_VERSION, trace } from '@dxos/protocols';
+import { InvalidStorageVersionError, STORAGE_VERSION, trace } from '@dxos/protocols';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
@@ -73,12 +73,11 @@ export class ServiceContext {
 
   private readonly _instanceId = PublicKey.random().toHex();
 
-  // prettier-ignore
   constructor(
     public readonly storage: Storage,
     public readonly networkManager: NetworkManager,
     public readonly signalManager: SignalManager,
-    public readonly modelFactory: ModelFactory
+    public readonly modelFactory: ModelFactory,
   ) {
     // TODO(burdon): Move strings to constants.
     this.metadataStore = new MetadataStore(storage.createDirectory('metadata'));
@@ -94,7 +93,7 @@ export class ServiceContext {
           valueEncoding,
           stats: true,
         },
-      })
+      }),
     });
 
     this.spaceManager = new SpaceManager({
@@ -106,12 +105,7 @@ export class ServiceContext {
       snapshotStore: this.snapshotStore,
     });
 
-    this.identityManager = new IdentityManager(
-      this.metadataStore,
-      this.keyring,
-      this.feedStore,
-      this.spaceManager
-    );
+    this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager);
 
     this.invitations = new InvitationsHandler(this.networkManager);
 
@@ -123,8 +117,8 @@ export class ServiceContext {
         new DeviceInvitationProtocol(
           this.keyring,
           () => this.identityManager.identity ?? failUndefined(),
-          this._acceptIdentity.bind(this)
-        )
+          this._acceptIdentity.bind(this),
+        ),
     );
   }
 
@@ -184,7 +178,7 @@ export class ServiceContext {
   private async _checkStorageVersion() {
     await this.metadataStore.load();
     if (this.metadataStore.version !== STORAGE_VERSION) {
-      throw new Error(`Invalid storage version: current=${this.metadataStore.version}, expected=${STORAGE_VERSION}`);
+      throw new InvalidStorageVersionError(STORAGE_VERSION, this.metadataStore.version);
       // TODO(mykola): Migrate storage to a new version if incompatibility is detected.
     }
   }

package/src/packlets/services/service-host.test.ts

@@ -22,11 +22,11 @@ import { createMockCredential, createServiceHost } from '../testing';
 chai.use(chaiAsPromised);
 
 describe('ClientServicesHost', () => {
-  const persistentStoragePath = '/tmp/dxos/client-services/service-host/storage';
+  const dataRoot = '/tmp/dxos/client-services/service-host/storage';
 
   afterEach(async () => {
     // Clean up.
-    isNode() && rmSync(persistentStoragePath, { recursive: true, force: true });
+    isNode() && rmSync(dataRoot, { recursive: true, force: true });
   });
 
   test('queryCredentials', async () => {
@@ -114,7 +114,7 @@ describe('ClientServicesHost', () => {
 
   test('storage reset', async () => {
     const config = new Config({
-      runtime: { client: { storage: { persistent: true, path: persistentStoragePath } } },
+      runtime: { client: { storage: { persistent: true, dataRoot } } },
     });
     {
       const host = createServiceHost(config, new MemorySignalManagerContext());

package/src/packlets/services/service-host.ts

@@ -3,11 +3,12 @@
 //
 
 import { Event, synchronized } from '@dxos/async';
-import { clientServiceBundle, ClientServices } from '@dxos/client-protocol';
+import { clientServiceBundle, ClientServices, defaultKey, Properties } from '@dxos/client-protocol';
 import { Config } from '@dxos/config';
 import { Context } from '@dxos/context';
 import { DocumentModel } from '@dxos/document-model';
 import { DataServiceImpl } from '@dxos/echo-pipeline';
+import { TypedObject, base } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -16,14 +17,18 @@ import { ModelFactory } from '@dxos/model-factory';
 import { createSimplePeerTransportFactory, NetworkManager, TransportFactory } from '@dxos/network-manager';
 import { trace } from '@dxos/protocols';
 import { SystemStatus } from '@dxos/protocols/proto/dxos/client/services';
+import { EchoObject } from '@dxos/protocols/proto/dxos/echo/object';
 import { Storage } from '@dxos/random-access-storage';
 import { TextModel } from '@dxos/text-model';
 import { TRACE_PROCESSOR, trace as Trace } from '@dxos/tracing';
 import { WebsocketRpcClient } from '@dxos/websocket-rpc';
 
+import { createDiagnostics } from './diagnostics';
+import { ServiceContext } from './service-context';
+import { ServiceRegistry } from './service-registry';
 import { DevicesServiceImpl } from '../devices';
 import { DevtoolsServiceImpl, DevtoolsHostEvents } from '../devtools';
-import { IdentityServiceImpl } from '../identity';
+import { CreateIdentityOptions, IdentityServiceImpl } from '../identity';
 import { InvitationsServiceImpl } from '../invitations';
 import { Lock, ResourceLock } from '../locks';
 import { LoggingServiceImpl } from '../logging';
@@ -31,15 +36,27 @@ import { NetworkServiceImpl } from '../network';
 import { SpacesServiceImpl } from '../spaces';
 import { createStorageObjects } from '../storage';
 import { SystemServiceImpl } from '../system';
-import { createDiagnostics } from './diagnostics';
-import { ServiceContext } from './service-context';
-import { ServiceRegistry } from './service-registry';
 
 // TODO(burdon): Factor out to spaces.
 export const createDefaultModelFactory = () => {
   return new ModelFactory().registerModel(DocumentModel).registerModel(TextModel);
 };
 
+// TODO(wittjosiah): Factor out.
+const createGenesisMutationFromTypedObject = (obj: TypedObject): EchoObject => {
+  const snapshot = obj[base]._createSnapshot();
+
+  return {
+    objectId: obj[base]._id,
+    genesis: {
+      modelType: obj[base]._modelConstructor.meta.type,
+    },
+    snapshot: {
+      model: snapshot,
+    },
+  };
+};
+
 export type ClientServicesHostParams = {
   /**
    * Can be omitted if `initialize` is later called.
@@ -243,7 +260,7 @@ export class ClientServicesHost {
       SystemService: this._systemService,
 
       IdentityService: new IdentityServiceImpl(
-        (params) => this._serviceContext.createIdentity(params),
+        (params) => this._createIdentity(params),
         this._serviceContext.identityManager,
         this._serviceContext.keyring,
       ),
@@ -329,4 +346,23 @@ export class ClientServicesHost {
     log.trace('dxos.sdk.client-services-host.reset', trace.end({ id: traceId }));
     await this._callbacks?.onReset?.();
   }
+
+  private async _createIdentity(params?: CreateIdentityOptions) {
+    const identity = await this._serviceContext.createIdentity(params);
+
+    // Setup default space.
+    await this._serviceContext.initialized.wait();
+    const space = await this._serviceContext.dataSpaceManager!.createSpace();
+    const obj: TypedObject = new Properties();
+    obj[defaultKey] = identity.identityKey.toHex();
+    await this._serviceRegistry.services.DataService!.write({
+      spaceKey: space.key,
+      batch: {
+        objects: [createGenesisMutationFromTypedObject(obj)],
+      },
+    });
+    await this._serviceRegistry.services.DataService!.flush({ spaceKey: space.key });
+
+    return identity;
+  }
 }

package/src/packlets/services/service-registry.test.ts

@@ -14,9 +14,9 @@ import { SystemService, SystemStatus } from '@dxos/protocols/proto/dxos/client/s
 import { createLinkedPorts, createProtoRpcPeer, createServiceBundle } from '@dxos/rpc';
 import { describe, test } from '@dxos/test';
 
+import { ServiceRegistry } from './service-registry';
 import { SystemServiceImpl } from '../system';
 import { createServiceContext } from '../testing';
-import { ServiceRegistry } from './service-registry';
 
 // TODO(burdon): Create TestService (that doesn't require peers).
 

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

@@ -164,7 +164,7 @@ describe('DataSpaceManager', () => {
         afterTest(async () => builder.destroy());
 
         const peer = builder.createPeer({
-          storageType: typeof window === 'undefined' ? StorageType.NODE : StorageType.WEBFS,
+          dataStore: typeof window === 'undefined' ? StorageType.NODE : StorageType.WEBFS,
         });
         await peer.createIdentity();
         await openAndClose(peer.dataSpaceManager);

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

@@ -20,9 +20,9 @@ import { Gossip, Presence } from '@dxos/teleport-extension-gossip';
 import { Timeframe } from '@dxos/timeframe';
 import { ComplexMap, deferFunction, forEachAsync } from '@dxos/util';
 
-import { createAuthProvider } from '../identity';
 import { DataSpace } from './data-space';
 import { spaceGenesis } from './genesis';
+import { createAuthProvider } from '../identity';
 
 export interface SigningContext {
   identityKey: PublicKey;

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

@@ -7,11 +7,11 @@ import { AUTH_TIMEOUT } from '@dxos/client-protocol';
 import { cancelWithContext, Context } from '@dxos/context';
 import { timed } from '@dxos/debug';
 import { MetadataStore, Space, createMappedFeedWriter, DataPipeline } from '@dxos/echo-pipeline';
-import { CancelledError, SystemError } from '@dxos/errors';
 import { FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
+import { CancelledError, SystemError } from '@dxos/protocols';
 import { SpaceState, Space as SpaceProto } from '@dxos/protocols/proto/dxos/client/services';
 import { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { SpaceCache } from '@dxos/protocols/proto/dxos/echo/metadata';
@@ -22,9 +22,9 @@ import { Timeframe } from '@dxos/timeframe';
 import { trace } from '@dxos/tracing';
 import { ComplexSet } from '@dxos/util';
 
-import { TrustedKeySetAuthVerifier } from '../identity';
 import { SigningContext } from './data-space-manager';
 import { NotarizationPlugin } from './notarization-plugin';
+import { TrustedKeySetAuthVerifier } from '../identity';
 
 export type DataSpaceCallbacks = {
   /**
@@ -101,7 +101,13 @@ export class DataSpace {
     this._callbacks = params.callbacks ?? {};
 
     this.authVerifier = new TrustedKeySetAuthVerifier({
-      trustedKeysProvider: () => new ComplexSet(PublicKey.hash, Array.from(this._inner.spaceState.members.keys())),
+      trustedKeysProvider: () =>
+        new ComplexSet(
+          PublicKey.hash,
+          Array.from(this._inner.spaceState.members.values())
+            .filter((member) => !member.removed)
+            .map((member) => member.key),
+        ),
       update: this._inner.stateUpdate,
       authTimeout: AUTH_TIMEOUT,
     });
@@ -151,6 +157,7 @@ export class DataSpace {
   }
 
   private async _open() {
+    await this._gossip.open();
     await this._notarizationPlugin.open();
     await this._inner.spaceState.addCredentialProcessor(this._notarizationPlugin);
     await this._inner.open(new Context());
@@ -180,6 +187,7 @@ export class DataSpace {
     await this._notarizationPlugin.close();
 
     await this._presence.destroy();
+    await this._gossip.close();
   }
 
   async postMessage(channel: string, message: any) {

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

@@ -11,9 +11,9 @@ import { PublicKey } from '@dxos/keys';
 import { Space, SpacesService } from '@dxos/protocols/proto/dxos/client/services';
 import { afterEach, afterTest, beforeEach, describe, test } from '@dxos/test';
 
+import { SpacesServiceImpl } from './spaces-service';
 import { ServiceContext } from '../services';
 import { createServiceContext } from '../testing';
-import { SpacesServiceImpl } from './spaces-service';
 
 chai.use(chaiAsPromised);
 

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

@@ -6,10 +6,10 @@ import { EventSubscriptions, UpdateScheduler, scheduleTask } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
 import { CredentialProcessor } from '@dxos/credentials';
 import { raise } from '@dxos/debug';
-import { DataServiceSubscriptions, SpaceManager, SpaceNotFoundError } from '@dxos/echo-pipeline';
-import { ApiError } from '@dxos/errors';
+import { DataServiceSubscriptions, SpaceManager } from '@dxos/echo-pipeline';
+import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
-import { encodeError } from '@dxos/protocols';
+import { ApiError, SpaceNotFoundError, encodeError } from '@dxos/protocols';
 import {
   CreateEpochRequest,
   PostMessageRequest,
@@ -27,9 +27,9 @@ import { Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { GossipMessage } from '@dxos/protocols/proto/dxos/mesh/teleport/gossip';
 import { Provider } from '@dxos/util';
 
-import { IdentityManager } from '../identity';
 import { DataSpace } from './data-space';
 import { DataSpaceManager } from './data-space-manager';
+import { IdentityManager } from '../identity';
 
 export class SpacesServiceImpl implements SpacesService {
   constructor(
@@ -99,7 +99,7 @@ export class SpacesServiceImpl implements SpacesService {
             subscriptions.add(space.dataPipeline.onNewEpoch.on(ctx, () => scheduler.trigger()));
 
             // Pipeline progress.
-            space.inner.controlPipeline.state.timeframeUpdate.on(ctx, () => scheduler.trigger());
+            subscriptions.add(space.inner.controlPipeline.state.timeframeUpdate.on(ctx, () => scheduler.trigger()));
             if (space.dataPipeline.pipelineState) {
               subscriptions.add(space.dataPipeline.pipelineState.timeframeUpdate.on(ctx, () => scheduler.trigger()));
             }
@@ -140,8 +140,8 @@ export class SpacesServiceImpl implements SpacesService {
     });
   }
 
-  queryCredentials({ spaceKey }: QueryCredentialsRequest): Stream<Credential> {
-    return new Stream(({ ctx, next }) => {
+  queryCredentials({ spaceKey, noTail }: QueryCredentialsRequest): Stream<Credential> {
+    return new Stream(({ ctx, next, close }) => {
       const space = this._spaceManager.spaces.get(spaceKey) ?? raise(new SpaceNotFoundError(spaceKey));
 
       const processor: CredentialProcessor = {
@@ -150,14 +150,31 @@ export class SpacesServiceImpl implements SpacesService {
         },
       };
       ctx.onDispose(() => space.spaceState.removeCredentialProcessor(processor));
-      scheduleTask(ctx, () => space.spaceState.addCredentialProcessor(processor));
+      scheduleTask(ctx, async () => {
+        await space.spaceState.addCredentialProcessor(processor);
+        if (noTail) {
+          close();
+        }
+      });
     });
   }
 
   async writeCredentials({ spaceKey, credentials }: WriteCredentialsRequest) {
     const space = this._spaceManager.spaces.get(spaceKey) ?? raise(new SpaceNotFoundError(spaceKey));
     for (const credential of credentials ?? []) {
-      await space.controlPipeline.writer.write({ credential: { credential } });
+      if (credential.proof) {
+        await space.controlPipeline.writer.write({ credential: { credential } });
+      } else {
+        invariant(!credential.id, 'Id on unsigned credentials is not allowed');
+        invariant(this._identityManager.identity, 'Identity is not available');
+        const signer = this._identityManager.identity.getIdentityCredentialSigner();
+        invariant(credential.issuer.equals(signer.getIssuer()));
+        const signedCredential = await signer.createCredential({
+          subject: credential.subject.id,
+          assertion: credential.subject.assertion,
+        });
+        await space.controlPipeline.writer.write({ credential: { credential: signedCredential } });
+      }
     }
   }
 
@@ -202,7 +219,11 @@ export class SpacesServiceImpl implements SpacesService {
               displayName: member.assertion.profile?.displayName,
             },
           },
-          presence: isMe || peers.length > 0 ? SpaceMember.PresenceState.ONLINE : SpaceMember.PresenceState.OFFLINE,
+          presence: member.removed
+            ? SpaceMember.PresenceState.REMOVED
+            : isMe || peers.length > 0
+            ? SpaceMember.PresenceState.ONLINE
+            : SpaceMember.PresenceState.OFFLINE,
           peerStates: peers,
         };
       }),

package/src/packlets/storage/storage.ts

@@ -5,7 +5,7 @@
 //
 
 import { DX_DATA } from '@dxos/client-protocol';
-import { InvalidConfigError } from '@dxos/errors';
+import { InvalidConfigError } from '@dxos/protocols';
 import { Runtime } from '@dxos/protocols/proto/dxos/config';
 import { createStorage, StorageType } from '@dxos/random-access-storage';
 import { isNode } from '@dxos/util';
@@ -15,29 +15,29 @@ import StorageDriver = Runtime.Client.Storage.StorageDriver;
 // TODO(burdon): Factor out.
 export const createStorageObjects = (config: Runtime.Client.Storage) => {
   const {
-    path = isNode() ? DX_DATA : 'dxos/storage', // TODO(burdon): Factor out const.
-    storageType,
-    keyStorage,
     persistent = false,
+    keyStore,
+    dataStore,
+    dataRoot = isNode() ? DX_DATA : 'dxos/storage', // TODO(burdon): Factor out const.
   } = config ?? {};
 
-  if (persistent && storageType === StorageDriver.RAM) {
+  if (persistent && dataStore === StorageDriver.RAM) {
     throw new InvalidConfigError('RAM storage cannot be used in persistent mode.');
   }
-  if (!persistent && storageType !== undefined && storageType !== StorageDriver.RAM) {
+  if (!persistent && dataStore !== undefined && dataStore !== StorageDriver.RAM) {
     throw new InvalidConfigError('Cannot use a persistent storage in not persistent mode.');
   }
-  if (persistent && keyStorage === StorageDriver.RAM) {
+  if (persistent && keyStore === StorageDriver.RAM) {
     throw new InvalidConfigError('RAM key storage cannot be used in persistent mode.');
   }
-  if (!persistent && keyStorage !== StorageDriver.RAM && keyStorage !== undefined) {
+  if (!persistent && keyStore !== StorageDriver.RAM && keyStore !== undefined) {
     throw new InvalidConfigError('Cannot use a persistent key storage in not persistent mode.');
   }
 
   return {
     storage: createStorage({
-      type: persistent ? toStorageType(storageType) : StorageType.RAM,
-      root: `${path}/`,
+      type: persistent ? toStorageType(dataStore) : StorageType.RAM,
+      root: `${dataRoot}/`,
     }),
   };
 };

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

@@ -3,7 +3,7 @@
 //
 
 import { Trigger } from '@dxos/async';
-import { AuthenticatingInvitationObservable, CancellableInvitationObservable } from '@dxos/client-protocol';
+import { AuthenticatingInvitation, CancellableInvitation } from '@dxos/client-protocol';
 import { invariant } from '@dxos/invariant';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 
@@ -25,11 +25,11 @@ export const sanitizeInvitation = (invitation: Invitation): Invitation => {
 };
 
 export type InvitationHost = {
-  createInvitation(options?: Partial<Invitation>): CancellableInvitationObservable;
+  share(options?: Partial<Invitation>): CancellableInvitation;
 };
 
 export type InvitationGuest = {
-  acceptInvitation(invitation: Invitation): AuthenticatingInvitationObservable;
+  join(invitation: Invitation | string): AuthenticatingInvitation;
 };
 
 export type PerformInvitationCallbacks<T> = {
@@ -48,8 +48,8 @@ export type PerformInvitationParams = {
   guest: ServiceContext | InvitationGuest;
   options?: Partial<Invitation>;
   hooks?: {
-    host?: PerformInvitationCallbacks<CancellableInvitationObservable>;
-    guest?: PerformInvitationCallbacks<AuthenticatingInvitationObservable>;
+    host?: PerformInvitationCallbacks<CancellableInvitation>;
+    guest?: PerformInvitationCallbacks<AuthenticatingInvitation>;
   };
 };
 
@@ -196,7 +196,7 @@ export const performInvitation = ({
 const createInvitation = (
   host: ServiceContext | InvitationHost,
   options?: Partial<Invitation>,
-): CancellableInvitationObservable => {
+): CancellableInvitation => {
   options ??= {
     authMethod: Invitation.AuthMethod.NONE,
     ...(options ?? {}),
@@ -207,13 +207,13 @@ const createInvitation = (
     return host.invitations.createInvitation(hostHandler, options);
   }
 
-  return host.createInvitation(options);
+  return host.share(options);
 };
 
 const acceptInvitation = (
   guest: ServiceContext | InvitationGuest,
   invitation: Invitation,
-): AuthenticatingInvitationObservable => {
+): AuthenticatingInvitation => {
   invitation = sanitizeInvitation(invitation);
 
   if (guest instanceof ServiceContext) {
@@ -221,5 +221,5 @@ const acceptInvitation = (
     return guest.invitations.acceptInvitation(guestHandler, invitation);
   }
 
-  return guest.acceptInvitation(invitation);
+  return guest.join(invitation);
 };

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

@@ -94,7 +94,7 @@ export class TestBuilder {
 }
 
 export type TestPeerOpts = {
-  storageType?: StorageType;
+  dataStore?: StorageType;
 };
 
 export type TestPeerProps = {
@@ -115,7 +115,7 @@ export class TestPeer {
 
   constructor(
     private readonly signalContext: MemorySignalManagerContext,
-    private readonly opts: TestPeerOpts = { storageType: StorageType.RAM },
+    private readonly opts: TestPeerOpts = { dataStore: StorageType.RAM },
   ) {}
 
   get props() {
@@ -123,7 +123,7 @@ export class TestPeer {
   }
 
   get storage() {
-    return (this._props.storage ??= createStorage({ type: this.opts.storageType }));
+    return (this._props.storage ??= createStorage({ type: this.opts.dataStore }));
   }
 
   get keyring() {

package/src/packlets/vault/iframe-host-runtime.ts

@@ -12,9 +12,9 @@ import { createSimplePeerTransportFactory, TransportFactory } from '@dxos/networ
 import { RpcPort } from '@dxos/rpc';
 import { getAsyncValue, MaybePromise, Provider } from '@dxos/util';
 
+import { ShellRuntimeImpl } from './shell-runtime';
 import { ClientServicesHost } from '../services';
 import { ClientRpcServer, ClientRpcServerParams } from '../services/client-rpc-server';
-import { ShellRuntimeImpl } from './shell-runtime';
 
 const LOCK_KEY = 'DXOS_RESOURCE_LOCK';
 

package/src/packlets/vault/iframe-proxy-runtime.ts

@@ -5,9 +5,9 @@
 import { Trigger } from '@dxos/async';
 import { iframeServiceBundle, ShellRuntime, workerServiceBundle, WorkerServiceBundle } from '@dxos/client-protocol';
 import { Config } from '@dxos/config';
-import { RemoteServiceConnectionError } from '@dxos/errors';
 import { log } from '@dxos/log';
 import { SimplePeerTransportService } from '@dxos/network-manager';
+import { RemoteServiceConnectionError } from '@dxos/protocols';
 import { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
 import { createProtoRpcPeer, ProtoRpcPeer, RpcPort } from '@dxos/rpc';
 import { getAsyncValue, MaybePromise, Provider } from '@dxos/util';

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

@@ -33,11 +33,11 @@ export class ShellRuntimeImpl implements ShellRuntime {
     return this._spaceKey;
   }
 
-  setLayout(layout: ShellLayout, options: Omit<LayoutRequest, 'layout'> = {}) {
+  setLayout({ layout, invitationCode, spaceKey }: LayoutRequest) {
     this._layout = layout;
-    this._invitationCode = options.invitationCode;
-    this._spaceKey = options.spaceKey;
-    this.layoutUpdate.emit({ layout, ...options });
+    this._invitationCode = invitationCode;
+    this._spaceKey = spaceKey;
+    this.layoutUpdate.emit({ layout, invitationCode, spaceKey });
   }
 
   async setAppContext(context: AppContextRequest) {