Clean up unused worker threads for closed apps; other performance optimizations

This commit is contained in:
James Babcock committed 2026-09-22 14:56:54 -07:00
1 parent 9560f3ac8d
commit 2e4d20e130
20 files changed
+360 -13

No files matched your search

+7
View File
@@ -0,0 +1,7 @@
import { disposeSettingsStore } from "../../native/settings-store";
/** Called on the worker after its windows and app-owned resources are closed. */
export function finishWorkerShutdown(): void {
disposeSettingsStore();
global.postMessage({ type: "worker-stopped" });
}
+50
View File
@@ -15,6 +15,10 @@ import { publishWorkerState } from "./worker-state";
* worker→Java directly on Android; iOS posts baked frames to the main host.
*/
export type WorkerAppMessage =
/** Last host window closed: report worker-idle unless background work still owns the worker. */
| { type: "check-idle" }
/** Release app-wide resources, then acknowledge with worker-stopped. */
| { type: "shutdown" }
| { type: "navigation-sensors"; event: NavigationSensorEvent }
| { type: "open-window"; windowId: string; surfaceId: string; title: string; viewport: { width: number; height: number } }
| { type: "resize-window"; windowId: string; viewport: { width: number; height: number } }
@@ -34,6 +38,8 @@ export type WorkerAppMessage =
| { type: "tool-call"; callId: string; windowId: string; name: string; args: unknown };
export type WorkerAppReply =
| { type: "worker-idle" }
| { type: "worker-stopped" }
| { type: "buzzer-sequence"; payload: number[] }
| { type: "navigation-sensors"; request: NavigationSensorRequest }
| { type: "open-url"; url: string }
@@ -182,6 +188,8 @@ export type WorkerWindowSpec = {
export type WorkerAppHostOptions = {
appId: string;
worker: Worker;
/** Drop this host from the app cache as soon as shutdown begins. */
onStopping?: () => void;
navigationSensors?: { handle(request: NavigationSensorRequest): void; stop(): void };
openUrl?: (url: string) => void;
playBuzzerSequence?: (payload: Uint8Array) => Promise<void> | void;
@@ -236,12 +244,23 @@ export class WorkerAppHost {
*/
private workerReady = false;
private readonly queuedMessages: WorkerAppMessage[] = [];
private stopping = false;
private terminated = false;
private shutdownTimer: ReturnType<typeof setTimeout> | null = null;
private readonly publishedStateKeys = new Set<string>();
constructor(private readonly options: WorkerAppHostOptions) {
options.worker.onmessage = (event: MessageEvent) => {
const message = event.data as WorkerAppReply | undefined;
if (!message) return;
if (this.stopping) {
if (message.type === "worker-stopped") this.terminate();
return;
}
switch (message.type) {
case "worker-idle":
if (!this.openWindows.size) this.shutdown();
break;
case "buzzer-sequence":
if (this.openWindows.size) {
void Promise.resolve(this.options.playBuzzerSequence?.(new Uint8Array(message.payload)))
@@ -357,6 +376,7 @@ export class WorkerAppHost {
// Titles are informational for now (sidebar shows icons only).
break;
case "publish-state":
this.publishedStateKeys.add(message.key);
publishWorkerState(message.key, message.state);
break;
case "set-tools":
@@ -392,8 +412,33 @@ export class WorkerAppHost {
return this.openWindows.size;
}
private shutdown(): void {
if (this.stopping) return;
this.stopping = true;
this.options.onStopping?.();
this.queuedMessages.length = 0;
this.options.navigationSensors?.stop();
shell.setTrayIcon(this.options.appId, null);
for (const key of this.publishedStateKeys) publishWorkerState(key, undefined);
this.publishedStateKeys.clear();
// The idle reply follows all close-window cleanup. Allow the worker to
// release app-wide native subscriptions/sockets before killing its isolate.
this.shutdownTimer = setTimeout(() => this.terminate(), 5000);
this.options.worker.postMessage({ type: "shutdown" } satisfies WorkerAppMessage);
}
private terminate(): void {
if (this.terminated) return;
this.terminated = true;
if (this.shutdownTimer !== null) clearTimeout(this.shutdownTimer);
this.shutdownTimer = null;
this.options.worker.terminate();
}
/** Open a window of this app and register it with the shell. */
openWindow(spec: WorkerWindowSpec): ShellWindow {
if (this.stopping) throw new Error(`Worker ${this.options.appId} is shutting down`);
let closed = false;
const surfaceId = `window:${spec.windowId}`;
const heightMode = spec.heightMode ?? "min";
this.openWindows.add(spec.windowId);
@@ -419,6 +464,8 @@ export class WorkerAppHost {
hasAppMenu: () => this.windowGestures.get(spec.windowId)?.hasAppMenu ?? false,
claimsLongPress: () => this.windowGestures.get(spec.windowId)?.claimsLongPress ?? false,
close: () => {
if (closed) return;
closed = true;
this.openWindows.delete(spec.windowId);
if (!this.openWindows.size) this.options.navigationSensors?.stop();
this.windowGestures.delete(spec.windowId);
@@ -428,6 +475,7 @@ export class WorkerAppHost {
this.failPendingToolCallsFor(spec.windowId);
this.post({ type: "close-window", windowId: spec.windowId });
this.options.removeSurface(surfaceId);
if (!this.openWindows.size) this.post({ type: "check-idle" });
},
drawIcon: windowIcon(spec.icon, spec.iconLetter, spec.iconGlyph, () => this.windowIconActivity.get(spec.windowId) ?? "idle"),
handleInput: (event, frameId) => {
@@ -473,6 +521,7 @@ export class WorkerAppHost {
void this.options
.configureSurface(surfaceId, false, heightMode)
.then(() => {
if (closed || this.stopping) return;
if (spec.focus) {
shell.focusWindow(spec.windowId);
}
@@ -511,6 +560,7 @@ export class WorkerAppHost {
}
private post(message: WorkerAppMessage): void {
if (this.stopping) return;
if (!this.workerReady) {
this.queuedMessages.push(message);
return;