@dxos/client-services 0.5.1-main.39e0ee2 → 0.5.1-main.3c7169d

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

@@ -4,7 +4,6 @@
 
 import {
   createAdmissionCredentials,
-  createCancelDelegatedSpaceInvitationCredential,
   createDelegatedSpaceInvitationCredential,
   getCredentialAssertion,
 } from '@dxos/credentials';
@@ -88,7 +87,7 @@ export class SpaceInvitationProtocol implements InvitationProtocol {
 
   async delegate(invitation: Invitation): Promise<PublicKey> {
     invariant(this._spaceKey);
-    const space = this._spaceManager.spaces.get(this._spaceKey);
+    const space = await this._spaceManager.spaces.get(this._spaceKey);
     invariant(space);
     if (invitation.authMethod === Invitation.AuthMethod.KNOWN_PUBLIC_KEY) {
       invariant(invitation.guestKeypair?.publicKey);
@@ -119,23 +118,6 @@ export class SpaceInvitationProtocol implements InvitationProtocol {
     return credential.credential.credential.id!;
   }
 
-  async cancelDelegation(invitation: Invitation): Promise<void> {
-    invariant(this._spaceKey);
-    invariant(invitation.type === Invitation.Type.DELEGATED && invitation.delegationCredentialId);
-    const space = this._spaceManager.spaces.get(this._spaceKey);
-    invariant(space);
-
-    log('cancelling delegated space invitation', { host: this._signingContext.deviceKey, id: invitation.invitationId });
-    const credential = await createCancelDelegatedSpaceInvitationCredential(
-      this._signingContext.credentialSigner,
-      space.key,
-      invitation.delegationCredentialId,
-    );
-
-    invariant(credential.credential);
-    await writeMessages(space.inner.controlPipeline.writer, [credential]);
-  }
-
   checkInvitation(invitation: Partial<Invitation>) {
     if (invitation.spaceKey && this._spaceManager.spaces.has(invitation.spaceKey)) {
       return new AlreadyJoinedError('Already joined space.');

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

@@ -21,7 +21,6 @@ import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { type Credential, type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { type Storage } from '@dxos/random-access-storage';
-import type { TeleportParams } from '@dxos/teleport';
 import { BlobStore } from '@dxos/teleport-extension-object-sync';
 import { trace as Trace } from '@dxos/tracing';
 import { safeInstanceof } from '@dxos/util';
@@ -41,8 +40,7 @@ import {
 import { InvitationsManager } from '../invitations/invitations-manager';
 import { DataSpaceManager, type DataSpaceManagerRuntimeParams, type SigningContext } from '../spaces';
 
-export type ServiceContextRuntimeParams = IdentityManagerRuntimeParams &
-  DataSpaceManagerRuntimeParams & { invitationConnectionDefaultParams?: Partial<TeleportParams> };
+export type ServiceContextRuntimeParams = IdentityManagerRuntimeParams & DataSpaceManagerRuntimeParams;
 /**
  * Shared backend for all client services.
  */
@@ -83,7 +81,7 @@ export class ServiceContext extends Resource {
     public readonly level: LevelDB,
     public readonly networkManager: NetworkManager,
     public readonly signalManager: SignalManager,
-    public readonly _runtimeParams?: ServiceContextRuntimeParams,
+    public readonly _runtimeParams?: IdentityManagerRuntimeParams & DataSpaceManagerRuntimeParams,
   ) {
     super();
 
@@ -125,7 +123,7 @@ export class ServiceContext extends Resource {
       storage: this.storage,
     });
 
-    this.invitations = new InvitationsHandler(this.networkManager, _runtimeParams?.invitationConnectionDefaultParams);
+    this.invitations = new InvitationsHandler(this.networkManager);
     this.invitationsManager = new InvitationsManager(
       this.invitations,
       (invitation) => this.getInvitationHandler(invitation),

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

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

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

@@ -49,9 +49,7 @@ export const createServiceContext = async ({
   const level = createTestLevel();
   await level.open();
 
-  return new ServiceContext(storage, level, networkManager, signalManager, {
-    invitationConnectionDefaultParams: { controlHeartbeatInterval: 200 },
-  });
+  return new ServiceContext(storage, level, networkManager, signalManager);
 };
 
 export const createPeers = async (numPeers: number) => {

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

@@ -6,12 +6,7 @@ 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,
-  type InvitationUrlRequest,
-} from '@dxos/protocols/proto/dxos/iframe';
+import { type AppContextRequest, type LayoutRequest, ShellLayout } from '@dxos/protocols/proto/dxos/iframe';
 import { createProtoRpcPeer, type ProtoRpcPeer, type RpcPort } from '@dxos/rpc';
 
 /**
@@ -19,18 +14,10 @@ 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 _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
+  private _spaceKey?: PublicKey;
 
   constructor(private readonly _port: RpcPort) {}
 
@@ -46,18 +33,6 @@ 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;
@@ -65,13 +40,6 @@ 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');
 
@@ -90,12 +58,6 @@ 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/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.5.1-main.39e0ee2";
+export const DXOS_VERSION = "0.5.1-main.3c7169d";