@dxos/client-services 0.1.25-next.3c6b542 → 0.1.26

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

@@ -5,14 +5,14 @@
 import { Config } from '@dxos/config';
 import { createCredentialSignerWithChain, CredentialGenerator } from '@dxos/credentials';
 import {
-  SnapshotStore,
   DataPipelineControllerImpl,
   MetadataStore,
   SigningContext,
+  SnapshotStore,
   SpaceManager,
   valueEncoding
-} from '@dxos/echo-pipeline';
-import { testLocalDatabase } from '@dxos/echo-pipeline/testing';
+} from '@dxos/echo-db';
+import { testLocalDatabase } from '@dxos/echo-db/testing';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
 import { MemorySignalManager, MemorySignalManagerContext } from '@dxos/messaging';

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

@@ -8,17 +8,15 @@ import { log, logInfo } from '@dxos/log';
 import { MemorySignalManager, MemorySignalManagerContext, WebsocketSignalManager } from '@dxos/messaging';
 import { createWebRTCTransportFactory, NetworkManager } from '@dxos/network-manager';
 import { createProtoRpcPeer, ProtoRpcPeer, RpcPort } from '@dxos/rpc';
-import { getAsyncValue, Provider } from '@dxos/util';
+import { MaybePromise } from '@dxos/util';
 
 import { clientServiceBundle, ClientServices, ClientServicesHost } from '../services';
-import { ShellRuntime, ShellRuntimeImpl } from './shell-runtime';
 
 const LOCK_KEY = 'DXOS_RESOURCE_LOCK';
 
 export type IFrameHostRuntimeParams = {
-  configProvider: Config | Provider<Promise<Config>>;
+  configProvider: () => MaybePromise<Config>;
   appPort: RpcPort;
-  shellPort?: RpcPort;
 };
 
 /**
@@ -28,7 +26,7 @@ export type IFrameHostRuntimeParams = {
  * This should only be used when SharedWorker is not available.
  */
 export class IFrameHostRuntime {
-  private readonly _configProvider: Config | Provider<Promise<Config>>;
+  private readonly _configProvider: () => MaybePromise<Config>;
   private readonly _transportFactory = createWebRTCTransportFactory();
   private readonly _ready = new Trigger<Error | undefined>();
   private readonly _getService: <Service>(
@@ -36,20 +34,16 @@ export class IFrameHostRuntime {
   ) => Promise<Service>;
 
   private readonly _appPort: RpcPort;
-  private readonly _shellPort?: RpcPort;
-  private _config!: Config;
   private _clientServices!: ClientServicesHost;
   private _clientRpc!: ProtoRpcPeer<ClientServices>;
-  private _shellRuntime?: ShellRuntimeImpl;
+  private _config!: Config;
 
   @logInfo
   public origin?: string;
 
-  constructor({ configProvider, appPort, shellPort }: IFrameHostRuntimeParams) {
+  constructor({ configProvider, appPort }: IFrameHostRuntimeParams) {
     this._configProvider = configProvider;
     this._appPort = appPort;
-    this._shellPort = shellPort;
-
     this._getService = async (find) => {
       const error = await this._ready.wait();
       if (error) {
@@ -63,24 +57,12 @@ export class IFrameHostRuntime {
 
       return service;
     };
-
-    if (this._shellPort) {
-      this._shellRuntime = new ShellRuntimeImpl(this._shellPort);
-    }
-  }
-
-  get services() {
-    return this._clientServices;
-  }
-
-  get shell(): ShellRuntime | undefined {
-    return this._shellRuntime;
   }
 
   async start() {
     log('starting...');
     try {
-      this._config = await getAsyncValue(this._configProvider);
+      this._config = await this._configProvider();
       const signalServer = this._config.get('runtime.services.signal.server');
       this._clientServices = new ClientServicesHost({
         lockKey: LOCK_KEY,
@@ -112,7 +94,7 @@ export class IFrameHostRuntime {
         port: this._appPort
       });
 
-      await Promise.all([this._clientServices.open(), this._clientRpc.open(), this._shellRuntime?.open()]);
+      await Promise.all([this._clientServices.open(), this._clientRpc.open()]);
       this._ready.wake(undefined);
       log('started');
     } catch (err: any) {
@@ -125,7 +107,6 @@ export class IFrameHostRuntime {
     log('stopping...');
     await this._clientRpc.close();
     await this._clientServices.close();
-    await this._shellRuntime?.close();
     log('stopped');
   }
 }

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

@@ -7,14 +7,12 @@ import { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
 import { createProtoRpcPeer, ProtoRpcPeer, RpcPort } from '@dxos/rpc';
 
 import { iframeServiceBundle, WorkerServiceBundle, workerServiceBundle } from './services';
-import { ShellRuntime, 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 = {
   systemPort: RpcPort;
   workerAppPort: RpcPort;
   windowAppPort: RpcPort;
-  shellPort?: RpcPort;
 };
 
 /**
@@ -24,16 +22,13 @@ export class IFrameProxyRuntime {
   private readonly _systemPort: RpcPort;
   private readonly _windowAppPort: RpcPort;
   private readonly _workerAppPort: RpcPort;
-  private readonly _shellPort?: RpcPort;
   private readonly _systemRpc: ProtoRpcPeer<WorkerServiceBundle>;
-  private readonly _shellRuntime?: ShellRuntimeImpl;
   private readonly _transportService = new WebRTCTransportService();
 
-  constructor({ systemPort, workerAppPort, windowAppPort, shellPort }: IFrameProxyRuntimeParams) {
+  constructor({ systemPort, workerAppPort, windowAppPort }: IFrameProxyRuntimeParams) {
     this._systemPort = systemPort;
     this._windowAppPort = windowAppPort;
     this._workerAppPort = workerAppPort;
-    this._shellPort = shellPort;
 
     this._systemRpc = createProtoRpcPeer({
       requested: workerServiceBundle,
@@ -52,24 +47,14 @@ export class IFrameProxyRuntime {
 
     this._workerAppPort.subscribe((msg) => this._windowAppPort.send(msg));
     this._windowAppPort.subscribe((msg) => this._workerAppPort.send(msg));
-
-    if (this._shellPort) {
-      this._shellRuntime = new ShellRuntimeImpl(this._shellPort);
-    }
-  }
-
-  get shell(): ShellRuntime | undefined {
-    return this._shellRuntime;
   }
 
   async open(origin: string) {
     await this._systemRpc.open();
     await this._systemRpc.rpc.WorkerService.start({ origin });
-    await this._shellRuntime?.open();
   }
 
   async close() {
-    await this._shellRuntime?.close();
     await this._systemRpc.rpc.WorkerService.stop();
     await this._systemRpc.close();
   }

package/src/packlets/vault/index.ts

@@ -5,8 +5,6 @@
 export * from './iframe-host-runtime';
 export * from './iframe-proxy-runtime';
 export * from './services';
-export * from './shell-controller';
-export * from './shell-runtime';
 export * from './vault-resource-lock';
 export * from './worker-runtime';
 export * from './worker-session';

package/src/packlets/vault/services.ts

@@ -3,7 +3,7 @@
 //
 
 import { schema } from '@dxos/protocols';
-import type { IframeService, AppService, ShellService, WorkerService } from '@dxos/protocols/proto/dxos/iframe';
+import type { IframeService, WorkerService } from '@dxos/protocols/proto/dxos/iframe';
 import type { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
 import { ServiceBundle } from '@dxos/rpc';
 
@@ -24,19 +24,3 @@ export type WorkerServiceBundle = {
 export const workerServiceBundle: ServiceBundle<WorkerServiceBundle> = {
   WorkerService: schema.getService('dxos.iframe.WorkerService')
 };
-
-export type AppServiceBundle = {
-  AppService: AppService;
-};
-
-export const appServiceBundle: ServiceBundle<AppServiceBundle> = {
-  AppService: schema.getService('dxos.iframe.AppService')
-};
-
-export type ShellServiceBundle = {
-  ShellService: ShellService;
-};
-
-export const shellServiceBundle: ServiceBundle<ShellServiceBundle> = {
-  ShellService: schema.getService('dxos.iframe.ShellService')
-};

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

@@ -17,7 +17,6 @@ import { WorkerSession } from './worker-session';
 export type CreateSessionParams = {
   appPort: RpcPort;
   systemPort: RpcPort;
-  shellPort: RpcPort;
 };
 
 /**
@@ -71,7 +70,7 @@ export class WorkerRuntime {
   /**
    * Create a new session.
    */
-  async createSession({ appPort, systemPort, shellPort }: CreateSessionParams) {
+  async createSession({ appPort, systemPort }: CreateSessionParams) {
     const session = new WorkerSession({
       getService: async (find) => {
         const error = await this._ready.wait();
@@ -88,7 +87,6 @@ export class WorkerRuntime {
       },
       appPort,
       systemPort,
-      shellPort,
       readySignal: this._ready
     });
 

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

@@ -4,7 +4,7 @@
 
 import assert from 'node:assert';
 
-import { asyncTimeout, Trigger } from '@dxos/async';
+import { Trigger } from '@dxos/async';
 import { log, logInfo } from '@dxos/log';
 import { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
 import { createProtoRpcPeer, ProtoRpcPeer, RpcPort } from '@dxos/rpc';
@@ -17,7 +17,6 @@ export type WorkerSessionParams = {
   getService: <Service>(find: (services: Partial<ClientServices>) => Service | undefined) => Promise<Service>;
   systemPort: RpcPort;
   appPort: RpcPort;
-  shellPort: RpcPort;
   readySignal: Trigger<Error | undefined>;
   options?: {
     heartbeatInterval: number;
@@ -29,7 +28,6 @@ export type WorkerSessionParams = {
  */
 export class WorkerSession {
   private readonly _clientRpc: ProtoRpcPeer<ClientServices>;
-  private readonly _shellClientRpc: ProtoRpcPeer<ClientServices>;
   private readonly _iframeRpc: ProtoRpcPeer<IframeServiceBundle>;
   private readonly _startTrigger = new Trigger();
   private readonly _getService: WorkerSessionParams['getService'];
@@ -47,7 +45,6 @@ export class WorkerSession {
     getService,
     systemPort,
     appPort,
-    shellPort,
     options = {
       heartbeatInterval: 1_000
     }
@@ -57,22 +54,23 @@ export class WorkerSession {
     this._options = options;
     this._getService = getService;
 
-    const handlers = {
-      DataService: async () => await this._getService((services) => services.DataService),
-      DevicesService: async () => await this._getService((services) => services.DevicesService),
-      DevtoolsHost: async () => await this._getService((services) => services.DevtoolsHost),
-      HaloInvitationsService: async () => await this._getService((services) => services.HaloInvitationsService),
-      NetworkService: async () => await this._getService((services) => services.NetworkService),
-      ProfileService: async () => await this._getService((services) => services.ProfileService),
-      SpaceInvitationsService: async () => await this._getService((services) => services.SpaceInvitationsService),
-      SpaceService: async () => await this._getService((services) => services.SpaceService),
-      SpacesService: async () => await this._getService((services) => services.SpacesService),
-      SystemService: async () => await this._getService((services) => services.SystemService),
-      TracingService: async () => await this._getService((services) => services.TracingService)
-    };
-
-    this._clientRpc = createProtoRpcPeer({ exposed: clientServiceBundle, handlers, port: appPort });
-    this._shellClientRpc = createProtoRpcPeer({ exposed: clientServiceBundle, handlers, port: shellPort });
+    this._clientRpc = createProtoRpcPeer({
+      exposed: clientServiceBundle,
+      handlers: {
+        DataService: async () => await this._getService((services) => services.DataService),
+        DevicesService: async () => await this._getService((services) => services.DevicesService),
+        DevtoolsHost: async () => await this._getService((services) => services.DevtoolsHost),
+        HaloInvitationsService: async () => await this._getService((services) => services.HaloInvitationsService),
+        NetworkService: async () => await this._getService((services) => services.NetworkService),
+        ProfileService: async () => await this._getService((services) => services.ProfileService),
+        SpaceInvitationsService: async () => await this._getService((services) => services.SpaceInvitationsService),
+        SpaceService: async () => await this._getService((services) => services.SpaceService),
+        SpacesService: async () => await this._getService((services) => services.SpacesService),
+        SystemService: async () => await this._getService((services) => services.SystemService),
+        TracingService: async () => await this._getService((services) => services.TracingService)
+      },
+      port: appPort
+    });
 
     this._iframeRpc = createProtoRpcPeer({
       requested: iframeServiceBundle,
@@ -104,7 +102,7 @@ export class WorkerSession {
 
   async open() {
     log.info('opening..');
-    await Promise.all([this._clientRpc.open(), this._iframeRpc.open(), this._maybeOpenShell()]);
+    await Promise.all([this._clientRpc.open(), this._iframeRpc.open()]);
 
     await this._startTrigger.wait({ timeout: 3_000 });
 
@@ -139,12 +137,4 @@ export class WorkerSession {
 
     await Promise.all([this._clientRpc.close(), this._iframeRpc.close()]);
   }
-
-  private async _maybeOpenShell() {
-    try {
-      await asyncTimeout(this._shellClientRpc.open(), 1_000);
-    } catch {
-      log.info('No shell connected.');
-    }
-  }
 }