@dxos/client-services 0.1.23 → 0.1.24-next.6b1f434

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

@@ -4,19 +4,20 @@
 
 import assert from 'node:assert';
 
-import { Trigger } from '@dxos/async';
+import { asyncTimeout, 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';
 import { Callback } from '@dxos/util';
 
-import { clientServiceBundle, ClientServices, ClientServicesHost } from '../services';
+import { clientServiceBundle, ClientServices } from '../services';
 import { IframeServiceBundle, iframeServiceBundle, workerServiceBundle } from './services';
 
 export type WorkerSessionParams = {
-  getServices: () => Promise<ClientServicesHost>;
+  getService: <Service>(find: (services: Partial<ClientServices>) => Service | undefined) => Promise<Service>;
   systemPort: RpcPort;
   appPort: RpcPort;
+  shellPort: RpcPort;
   readySignal: Trigger<Error | undefined>;
   options?: {
     heartbeatInterval: number;
@@ -28,9 +29,10 @@ 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 _getServices: () => Promise<ClientServicesHost>;
+  private readonly _getService: WorkerSessionParams['getService'];
   private readonly _options: NonNullable<WorkerSessionParams['options']>;
   private _heartbeatTimer?: NodeJS.Timeout;
 
@@ -42,35 +44,35 @@ export class WorkerSession {
   public bridgeService?: BridgeService;
 
   constructor({
-    getServices,
+    getService,
     systemPort,
     appPort,
+    shellPort,
     options = {
       heartbeatInterval: 1_000
     }
   }: WorkerSessionParams) {
     assert(options);
-    assert(getServices);
+    assert(getService);
     this._options = options;
-    this._getServices = getServices;
-
-    this._clientRpc = createProtoRpcPeer({
-      exposed: clientServiceBundle,
-      handlers: {
-        HaloInvitationsService: async () => (await this._getServices()).services.HaloInvitationsService,
-        DevicesService: async () => (await this._getServices()).services.DevicesService,
-        SpaceInvitationsService: async () => (await this._getServices()).services.SpaceInvitationsService,
-        SpacesService: async () => (await this._getServices()).services.SpacesService,
-        NetworkService: async () => (await this._getServices()).services.NetworkService,
-        SpaceService: async () => (await this._getServices()).services.SpaceService,
-        DataService: async () => (await this._getServices()).services.DataService,
-        ProfileService: async () => (await this._getServices()).services.ProfileService,
-        SystemService: async () => (await this._getServices()).services.SystemService,
-        DevtoolsHost: async () => (await this._getServices()).services.DevtoolsHost,
-        TracingService: async () => (await this._getServices()).services.TracingService
-      },
-      port: appPort
-    });
+    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._iframeRpc = createProtoRpcPeer({
       requested: iframeServiceBundle,
@@ -102,7 +104,7 @@ export class WorkerSession {
 
   async open() {
     log.info('opening..');
-    await Promise.all([this._clientRpc.open(), this._iframeRpc.open()]);
+    await Promise.all([this._clientRpc.open(), this._iframeRpc.open(), this._maybeOpenShell()]);
 
     await this._startTrigger.wait({ timeout: 3_000 });
 
@@ -137,4 +139,12 @@ 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.');
+    }
+  }
 }

package/dist/types/src/packlets/vault/iframe-runtime.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"iframe-runtime.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/iframe-runtime.ts"],"names":[],"mappings":"AAMA,OAAO,EAAoC,OAAO,EAAE,MAAM,WAAW,CAAC;AAKtE,oBAAY,mBAAmB,GAAG;IAChC,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAU;IACtC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAU;IACzC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAU;IACzC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAgC;gBAEtD,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,EAAE,mBAAmB;IAwBvE,IAAI,CAAC,MAAM,EAAE,MAAM;IAKnB,KAAK;CAIZ"}