@dxos/client-services 0.1.53 → 0.1.54-next.b67d4c9

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

@@ -4,8 +4,10 @@
 
 import { EventSubscriptions, UpdateScheduler, scheduleTask } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
-import { raise, todo } from '@dxos/debug';
+import { CredentialProcessor } from '@dxos/credentials';
+import { raise } from '@dxos/debug';
 import { DataServiceSubscriptions, SpaceManager, SpaceNotFoundError } from '@dxos/echo-pipeline';
+import { ApiError } from '@dxos/errors';
 import { log } from '@dxos/log';
 import { encodeError } from '@dxos/protocols';
 import {
@@ -15,6 +17,7 @@ import {
   QuerySpacesResponse,
   Space,
   SpaceMember,
+  SpaceState,
   SpacesService,
   SubscribeMessagesRequest,
   UpdateSpaceRequest,
@@ -46,8 +49,23 @@ export class SpacesServiceImpl implements SpacesService {
     return this._serializeSpace(space);
   }
 
-  async updateSpace(request: UpdateSpaceRequest) {
-    todo();
+  async updateSpace({ spaceKey, state }: UpdateSpaceRequest) {
+    const dataSpaceManager = await this._getDataSpaceManager();
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? raise(new SpaceNotFoundError(spaceKey));
+
+    if (state) {
+      switch (state) {
+        case SpaceState.ACTIVE:
+          await space.activate();
+          break;
+
+        case SpaceState.INACTIVE:
+          await space.deactivate();
+          break;
+        default:
+          throw new ApiError('Invalid space state');
+      }
+    }
   }
 
   querySpaces(): Stream<QuerySpacesResponse> {
@@ -124,13 +142,13 @@ export class SpacesServiceImpl implements SpacesService {
     return new Stream(({ ctx, next }) => {
       const space = this._spaceManager.spaces.get(spaceKey) ?? raise(new SpaceNotFoundError(spaceKey));
 
-      const processor = space.spaceState.registerProcessor({
-        process: async (credential) => {
+      const processor: CredentialProcessor = {
+        processCredential: async (credential) => {
           next(credential);
         },
-      });
-      ctx.onDispose(() => processor.close());
-      scheduleTask(ctx, () => processor.open());
+      };
+      ctx.onDispose(() => space.spaceState.removeCredentialProcessor(processor));
+      scheduleTask(ctx, () => space.spaceState.addCredentialProcessor(processor));
     });
   }
 

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

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import assert from 'node:assert';
+import invariant from 'tiny-invariant';
 
 import { Trigger } from '@dxos/async';
 import { AuthenticatingInvitationObservable, CancellableInvitationObservable } from '@dxos/client-protocol';
@@ -82,7 +82,7 @@ export const performInvitation = ({
                   if (hooks?.guest?.onConnecting?.(guestObservable)) {
                     break;
                   }
-                  assert(hostInvitation.swarmKey!.equals(guestInvitation.swarmKey!));
+                  invariant(hostInvitation.swarmKey!.equals(guestInvitation.swarmKey!));
                   break;
                 }
 

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

@@ -2,11 +2,18 @@
 // Copyright 2022 DXOS.org
 //
 
-import { createDefaultModelFactory } from '@dxos/client-protocol';
 import { Config } from '@dxos/config';
 import { Context } from '@dxos/context';
 import { createCredentialSignerWithChain, CredentialGenerator } from '@dxos/credentials';
-import { SnapshotStore, DataPipeline, MetadataStore, SpaceManager, valueEncoding } from '@dxos/echo-pipeline';
+import { failUndefined } from '@dxos/debug';
+import {
+  SnapshotStore,
+  DataPipeline,
+  MetadataStore,
+  SpaceManager,
+  valueEncoding,
+  DataServiceSubscriptions,
+} from '@dxos/echo-pipeline';
 import { testLocalDatabase } from '@dxos/echo-pipeline/testing';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
@@ -15,8 +22,8 @@ import { MemoryTransportFactory, NetworkManager } from '@dxos/network-manager';
 import { createStorage, Storage, StorageType } from '@dxos/random-access-storage';
 import { BlobStore } from '@dxos/teleport-extension-object-sync';
 
-import { ClientServicesHost, ServiceContext } from '../services';
-import { SigningContext } from '../spaces';
+import { ClientServicesHost, createDefaultModelFactory, ServiceContext } from '../services';
+import { DataSpaceManager, SigningContext } from '../spaces';
 
 //
 // TODO(burdon): Replace with test builder.
@@ -97,7 +104,9 @@ export type TestPeerProps = {
   keyring?: Keyring;
   networkManager?: NetworkManager;
   spaceManager?: SpaceManager;
+  dataSpaceManager?: DataSpaceManager;
   snapshotStore?: SnapshotStore;
+  signingContext?: SigningContext;
   blobStore?: BlobStore;
 };
 
@@ -109,6 +118,10 @@ export class TestPeer {
     private readonly opts: TestPeerOpts = { storageType: StorageType.RAM },
   ) {}
 
+  get props() {
+    return this._props;
+  }
+
   get storage() {
     return (this._props.storage ??= createStorage({ type: this.opts.storageType }));
   }
@@ -159,6 +172,25 @@ export class TestPeer {
     }));
   }
 
+  get identity() {
+    return this._props.signingContext ?? failUndefined();
+  }
+
+  get dataSpaceManager() {
+    return (this._props.dataSpaceManager ??= new DataSpaceManager(
+      this.spaceManager,
+      this.metadataStore,
+      new DataServiceSubscriptions(),
+      this.keyring,
+      this.identity,
+      this.feedStore,
+    ));
+  }
+
+  async createIdentity() {
+    this._props.signingContext ??= await createSigningContext(this.keyring);
+  }
+
   async destroy() {
     await this.storage.reset();
   }

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

@@ -3,7 +3,7 @@
 //
 
 import { Trigger } from '@dxos/async';
-import { PROXY_CONNECTION_TIMEOUT } from '@dxos/client-protocol';
+import { PROXY_CONNECTION_TIMEOUT, ShellRuntime } from '@dxos/client-protocol';
 import { Config } from '@dxos/config';
 import { log, logInfo } from '@dxos/log';
 import { MemorySignalManager, MemorySignalManagerContext, WebsocketSignalManager } from '@dxos/messaging';
@@ -13,7 +13,7 @@ import { getAsyncValue, MaybePromise, Provider } from '@dxos/util';
 
 import { ClientServicesHost } from '../services';
 import { ClientRpcServer, ClientRpcServerParams } from '../services/client-rpc-server';
-import { ShellRuntime, ShellRuntimeImpl } from './shell-runtime';
+import { ShellRuntimeImpl } from './shell-runtime';
 
 const LOCK_KEY = 'DXOS_RESOURCE_LOCK';
 

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

@@ -3,7 +3,7 @@
 //
 
 import { Trigger } from '@dxos/async';
-import { iframeServiceBundle, workerServiceBundle, WorkerServiceBundle } from '@dxos/client-protocol';
+import { iframeServiceBundle, ShellRuntime, workerServiceBundle, WorkerServiceBundle } from '@dxos/client-protocol';
 import { Config } from '@dxos/config';
 import { RemoteServiceConnectionError } from '@dxos/errors';
 import { log } from '@dxos/log';
@@ -12,7 +12,7 @@ import { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
 import { createProtoRpcPeer, ProtoRpcPeer, RpcPort } from '@dxos/rpc';
 import { getAsyncValue, MaybePromise, Provider } from '@dxos/util';
 
-import { ShellRuntime, ShellRuntimeImpl } from './shell-runtime';
+import { ShellRuntimeImpl } from './shell-runtime';
 
 // NOTE: Keep as RpcPorts to avoid dependency on @dxos/rpc-tunnel so we don't depend on browser-specific apis.
 export type IFrameProxyRuntimeParams = {

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

@@ -2,23 +2,14 @@
 // Copyright 2023 DXOS.org
 //
 
-import assert from 'node:assert';
+import invariant from 'tiny-invariant';
 
 import { Event } from '@dxos/async';
-import { appServiceBundle, AppServiceBundle, shellServiceBundle } from '@dxos/client-protocol';
+import { appServiceBundle, AppServiceBundle, ShellRuntime, shellServiceBundle } from '@dxos/client-protocol';
 import { PublicKey } from '@dxos/keys';
 import { AppContextRequest, LayoutRequest, ShellLayout } from '@dxos/protocols/proto/dxos/iframe';
 import { createProtoRpcPeer, ProtoRpcPeer, RpcPort } from '@dxos/rpc';
 
-export interface ShellRuntime {
-  layoutUpdate: Event<LayoutRequest>;
-  layout: ShellLayout;
-  invitationCode?: string;
-  spaceKey?: PublicKey;
-  setLayout: (layout: ShellLayout, options?: Omit<LayoutRequest, 'layout'>) => void;
-  setAppContext: (context: AppContextRequest) => Promise<void>;
-}
-
 /**
  * Endpoint that handles shell services.
  */
@@ -51,7 +42,7 @@ export class ShellRuntimeImpl implements ShellRuntime {
   }
 
   async setAppContext(context: AppContextRequest) {
-    assert(this._appRpc, 'runtime not open');
+    invariant(this._appRpc, 'runtime not open');
 
     await this._appRpc.rpc.AppService.setContext(context);
   }
@@ -81,40 +72,3 @@ export class ShellRuntimeImpl implements ShellRuntime {
     this._appRpc = undefined;
   }
 }
-
-export class MemoryShellRuntime implements ShellRuntime {
-  readonly layoutUpdate = new Event<LayoutRequest>();
-  readonly contextUpdate = new Event<AppContextRequest>();
-  private _layout: ShellLayout;
-  private _invitationCode?: string;
-  private _spaceKey?: PublicKey;
-
-  constructor({ layout, invitationCode, spaceKey }: Partial<LayoutRequest> & Partial<AppContextRequest> = {}) {
-    this._layout = layout ?? ShellLayout.DEFAULT;
-    this._invitationCode = invitationCode;
-    this._spaceKey = spaceKey;
-  }
-
-  get layout() {
-    return this._layout;
-  }
-
-  get invitationCode() {
-    return this._invitationCode;
-  }
-
-  get spaceKey() {
-    return this._spaceKey;
-  }
-
-  setLayout(layout: ShellLayout, options: Omit<LayoutRequest, 'layout'> = {}) {
-    this._layout = layout;
-    this._invitationCode = options.invitationCode;
-    this._spaceKey = options.spaceKey;
-    this.layoutUpdate.emit({ layout, ...options });
-  }
-
-  async setAppContext(context: AppContextRequest) {
-    this.contextUpdate.emit(context);
-  }
-}

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

@@ -37,7 +37,7 @@ export class WorkerRuntime {
   constructor(
     private readonly _configProvider: () => MaybePromise<Config>
   ) {
-    this._clientServices = new ClientServicesHost();
+    this._clientServices = new ClientServicesHost({ callbacks: { onReset: async () => { self.close(); } } });
   }
 
   get host() {

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

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import assert from 'node:assert';
+import invariant from 'tiny-invariant';
 
 import { asyncTimeout, Trigger } from '@dxos/async';
 import {
@@ -16,8 +16,7 @@ import { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
 import { createProtoRpcPeer, ProtoRpcPeer, RpcPort } from '@dxos/rpc';
 import { Callback, MaybePromise } from '@dxos/util';
 
-import { ClientServicesHost } from '../services';
-import { ClientRpcServer, ClientRpcServerParams } from '../services/client-rpc-server';
+import { ClientServicesHost, ClientRpcServer, ClientRpcServerParams } from '../services';
 
 export type WorkerSessionParams = {
   serviceHost: ClientServicesHost;
@@ -48,7 +47,7 @@ export class WorkerSession {
   public bridgeService?: BridgeService;
 
   constructor({ serviceHost, systemPort, appPort, shellPort, readySignal }: WorkerSessionParams) {
-    assert(serviceHost);
+    invariant(serviceHost);
     this._serviceHost = serviceHost;
 
     const middleware: Pick<ClientRpcServerParams, 'handleCall' | 'handleStream'> = {
@@ -111,17 +110,18 @@ export class WorkerSession {
   }
 
   async open() {
-    log.info('opening..');
+    log.info('opening...');
     await Promise.all([this._clientRpc.open(), this._iframeRpc.open(), this._maybeOpenShell()]);
 
     await this._startTrigger.wait({ timeout: PROXY_CONNECTION_TIMEOUT });
     if (this.lockKey) {
       void this._afterLockReleases(this.lockKey, () => this.close());
     }
+    log.info('opened');
   }
 
   async close() {
-    log.info('closing..');
+    log.info('closing...');
     try {
       await this.onClose.callIfSet();
     } catch (err: any) {
@@ -129,6 +129,7 @@ export class WorkerSession {
     }
 
     await Promise.all([this._clientRpc.close(), this._iframeRpc.close()]);
+    log.info('closed');
   }
 
   private async _maybeOpenShell() {