@dxos/client-services 0.3.11-main.bd26370 → 0.3.11-main.c244d7e

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

@@ -18,7 +18,13 @@ import { ClientServicesHost } from '../services';
 export type CreateSessionParams = {
   appPort: RpcPort;
   systemPort: RpcPort;
-  shellPort: RpcPort;
+  shellPort?: RpcPort;
+};
+
+export type WorkerRuntimeCallbacks = {
+  acquireLock: () => Promise<void>;
+  releaseLock: () => void;
+  onReset: () => Promise<void>;
 };
 
 /**
@@ -27,6 +33,8 @@ export type CreateSessionParams = {
  * Tabs make requests to the `ClientServicesHost`, and provide a WebRTC gateway.
  */
 export class WorkerRuntime {
+  private readonly _acquireLock: () => Promise<void>;
+  private readonly _releaseLock: () => void;
   private readonly _transportFactory = new SimplePeerTransportProxyFactory();
   private readonly _ready = new Trigger<Error | undefined>();
   private readonly _sessions = new Set<WorkerSession>();
@@ -34,12 +42,15 @@ export class WorkerRuntime {
   private _sessionForNetworking?: WorkerSession; // TODO(burdon): Expose to client QueryStatusResponse.
   private _config!: Config;
 
-  constructor(private readonly _configProvider: () => MaybePromise<Config>) {
+  constructor(
+    private readonly _configProvider: () => MaybePromise<Config>,
+    { acquireLock, releaseLock, onReset }: WorkerRuntimeCallbacks,
+  ) {
+    this._acquireLock = acquireLock;
+    this._releaseLock = releaseLock;
     this._clientServices = new ClientServicesHost({
       callbacks: {
-        onReset: async () => {
-          self.close();
-        },
+        onReset: async () => onReset(),
       },
     });
   }
@@ -51,6 +62,7 @@ export class WorkerRuntime {
   async start() {
     log('starting...');
     try {
+      await this._acquireLock();
       this._config = await this._configProvider();
       const signals = this._config.get('runtime.services.signaling');
       this._clientServices.initialize({
@@ -71,7 +83,8 @@ export class WorkerRuntime {
   }
 
   async stop() {
-    // TODO(dmaretskyi): Terminate active sessions.
+    // Release the lock to notify remote clients that the worker is terminating.
+    this._releaseLock();
     await this._clientServices.close();
   }
 
@@ -87,10 +100,15 @@ export class WorkerRuntime {
       readySignal: this._ready,
     });
 
-    // When tab is closed.
+    // When tab is closed or client is destroyed.
     session.onClose.set(async () => {
       this._sessions.delete(session);
-      this._reconnectWebrtc();
+      if (this._sessions.size === 0) {
+        // Terminate the worker when all sessions are closed.
+        self.close();
+      } else {
+        this._reconnectWebrtc();
+      }
     });
 
     await session.open();
@@ -100,7 +118,7 @@ export class WorkerRuntime {
   }
 
   /**
-   * Selects one of the existing session fro WebRTC networking.
+   * Selects one of the existing session for WebRTC networking.
    */
   private _reconnectWebrtc() {
     log('reconnecting webrtc...');

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

@@ -21,7 +21,8 @@ export type WorkerSessionParams = {
   serviceHost: ClientServicesHost;
   systemPort: RpcPort;
   appPort: RpcPort;
-  shellPort: RpcPort;
+  // TODO(wittjosiah): Remove shellPort.
+  shellPort?: RpcPort;
   readySignal: Trigger<Error | undefined>;
 };
 
@@ -30,7 +31,7 @@ export type WorkerSessionParams = {
  */
 export class WorkerSession {
   private readonly _clientRpc: ClientRpcServer;
-  private readonly _shellClientRpc: ClientRpcServer;
+  private readonly _shellClientRpc?: ClientRpcServer;
   private readonly _iframeRpc: ProtoRpcPeer<IframeServiceBundle>;
   private readonly _startTrigger = new Trigger();
   private readonly _serviceHost: ClientServicesHost;
@@ -74,11 +75,13 @@ export class WorkerSession {
       ...middleware,
     });
 
-    this._shellClientRpc = new ClientRpcServer({
-      serviceRegistry: this._serviceHost.serviceRegistry,
-      port: shellPort,
-      ...middleware,
-    });
+    this._shellClientRpc = shellPort
+      ? new ClientRpcServer({
+          serviceRegistry: this._serviceHost.serviceRegistry,
+          port: shellPort,
+          ...middleware,
+        })
+      : undefined;
 
     this._iframeRpc = createProtoRpcPeer({
       requested: iframeServiceBundle,
@@ -138,7 +141,7 @@ export class WorkerSession {
 
   private async _maybeOpenShell() {
     try {
-      await asyncTimeout(this._shellClientRpc.open(), 1_000);
+      this._shellClientRpc && (await asyncTimeout(this._shellClientRpc.open(), 1_000));
     } catch {
       log.info('No shell connected.');
     }

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.3.11-main.bd26370";
+export const DXOS_VERSION = "0.3.11-main.c244d7e";