@dxos/client-services 0.5.1-main.ef0d69d → 0.5.1-main.f81ddc4

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

@@ -4,6 +4,7 @@
 
 import {
   createAdmissionCredentials,
+  createCancelDelegatedSpaceInvitationCredential,
   createDelegatedSpaceInvitationCredential,
   getCredentialAssertion,
 } from '@dxos/credentials';
@@ -87,7 +88,7 @@ export class SpaceInvitationProtocol implements InvitationProtocol {
 
   async delegate(invitation: Invitation): Promise<PublicKey> {
     invariant(this._spaceKey);
-    const space = await this._spaceManager.spaces.get(this._spaceKey);
+    const space = this._spaceManager.spaces.get(this._spaceKey);
     invariant(space);
     if (invitation.authMethod === Invitation.AuthMethod.KNOWN_PUBLIC_KEY) {
       invariant(invitation.guestKeypair?.publicKey);
@@ -118,6 +119,23 @@ 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/invitations/utils.ts

@@ -0,0 +1,27 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { type Mutex, type MutexGuard } from '@dxos/async';
+import { cancelWithContext, type Context, ContextDisposedError } from '@dxos/context';
+import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
+
+export const stateToString = (state: Invitation.State): string => {
+  return Object.entries(Invitation.State).find(([key, val]) => val === state)?.[0] ?? 'unknown';
+};
+
+export const tryAcquireBeforeContextDisposed = async (ctx: Context, mutex: Mutex): Promise<MutexGuard> => {
+  let guard: MutexGuard | undefined;
+  return cancelWithContext(
+    ctx,
+    (async () => {
+      guard = await mutex.acquire();
+      if (ctx.disposed) {
+        guard.release();
+        guard = undefined;
+        throw new ContextDisposedError();
+      }
+      return guard;
+    })(),
+  );
+};

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

@@ -8,7 +8,8 @@ import { asyncTimeout } from '@dxos/async';
 import { getHeads } from '@dxos/automerge/automerge';
 import { AutomergeContext } from '@dxos/echo-db';
 import { AutomergeHost, DataServiceImpl } from '@dxos/echo-pipeline';
-import { createTestLevel } from '@dxos/echo-pipeline/testing';
+import { IndexMetadataStore } from '@dxos/indexing';
+import { createTestLevel } from '@dxos/kv-store/testing';
 import { afterTest, describe, test } from '@dxos/test';
 
 describe('AutomergeHost', () => {
@@ -26,6 +27,7 @@ describe('AutomergeHost', () => {
 
     const host = new AutomergeHost({
       db: level.sublevel('automerge'),
+      indexMetadataStore: new IndexMetadataStore({ db: level.sublevel('index-metadata') }),
     });
     await host.open();
     afterTest(() => host.close());

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

@@ -2,8 +2,6 @@
 // Copyright 2022 DXOS.org
 //
 
-import { type Level } from 'level';
-
 import { Trigger } from '@dxos/async';
 import { Context, Resource } from '@dxos/context';
 import { getCredentialAssertion, type CredentialProcessor } from '@dxos/credentials';
@@ -14,6 +12,7 @@ import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
 import { Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
+import { type LevelDB } from '@dxos/kv-store';
 import { log } from '@dxos/log';
 import { type SignalManager } from '@dxos/messaging';
 import { type NetworkManager } from '@dxos/network-manager';
@@ -22,6 +21,7 @@ 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,7 +41,8 @@ import {
 import { InvitationsManager } from '../invitations/invitations-manager';
 import { DataSpaceManager, type DataSpaceManagerRuntimeParams, type SigningContext } from '../spaces';
 
-export type ServiceContextRuntimeParams = IdentityManagerRuntimeParams & DataSpaceManagerRuntimeParams;
+export type ServiceContextRuntimeParams = IdentityManagerRuntimeParams &
+  DataSpaceManagerRuntimeParams & { invitationConnectionDefaultParams?: Partial<TeleportParams> };
 /**
  * Shared backend for all client services.
  */
@@ -79,10 +80,10 @@ export class ServiceContext extends Resource {
 
   constructor(
     public readonly storage: Storage,
-    public readonly level: Level<string, string>,
+    public readonly level: LevelDB,
     public readonly networkManager: NetworkManager,
     public readonly signalManager: SignalManager,
-    public readonly _runtimeParams?: IdentityManagerRuntimeParams & DataSpaceManagerRuntimeParams,
+    public readonly _runtimeParams?: ServiceContextRuntimeParams,
   ) {
     super();
 
@@ -124,7 +125,7 @@ export class ServiceContext extends Resource {
       storage: this.storage,
     });
 
-    this.invitations = new InvitationsHandler(this.networkManager);
+    this.invitations = new InvitationsHandler(this.networkManager, _runtimeParams?.invitationConnectionDefaultParams);
     this.invitationsManager = new InvitationsManager(
       this.invitations,
       (invitation) => this.getInvitationHandler(invitation),

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

@@ -2,16 +2,15 @@
 // Copyright 2021 DXOS.org
 //
 
-import { type Level } from 'level';
-
 import { Event, synchronized } from '@dxos/async';
 import { clientServiceBundle, defaultKey, type ClientServices, Properties } from '@dxos/client-protocol';
 import { type Config } from '@dxos/config';
 import { Context } from '@dxos/context';
-import { type ObjectStructure, encodeReference, type SpaceDoc, type LevelDB } from '@dxos/echo-pipeline';
+import { type ObjectStructure, encodeReference, type SpaceDoc } from '@dxos/echo-protocol';
 import { getTypeReference } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
+import { type LevelDB } from '@dxos/kv-store';
 import { log } from '@dxos/log';
 import { WebsocketSignalManager, type SignalManager } from '@dxos/messaging';
 import { NetworkManager, createSimplePeerTransportFactory, type TransportFactory } from '@dxos/network-manager';
@@ -82,7 +81,7 @@ export class ClientServicesHost {
   private _signalManager?: SignalManager;
   private _networkManager?: NetworkManager;
   private _storage?: Storage;
-  private _level?: Level<string, string>;
+  private _level?: LevelDB;
   private _callbacks?: ClientServicesHostCallbacks;
   private _devtoolsProxy?: WebsocketRpcClient<{}, ClientServices>;
 

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

@@ -7,8 +7,9 @@ import { AUTH_TIMEOUT } from '@dxos/client-protocol';
 import { cancelWithContext, Context, ContextDisposedError } from '@dxos/context';
 import { timed, warnAfterTimeout } from '@dxos/debug';
 import { type EchoHost } from '@dxos/echo-db';
-import { type MetadataStore, type Space, createMappedFeedWriter, type SpaceDoc } from '@dxos/echo-pipeline';
+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';

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,7 @@ 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

@@ -7,10 +7,11 @@ import { Context } from '@dxos/context';
 import { createCredentialSignerWithChain, CredentialGenerator } from '@dxos/credentials';
 import { failUndefined } from '@dxos/debug';
 import { EchoHost } from '@dxos/echo-db';
-import { MetadataStore, type LevelDB, SnapshotStore, SpaceManager, valueEncoding } from '@dxos/echo-pipeline';
-import { createTestLevel } from '@dxos/echo-pipeline/testing';
+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';
@@ -48,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) => {

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.5.1-main.ef0d69d";
+export const DXOS_VERSION = "0.5.1-main.f81ddc4";