Skip to content

Commit 1e86273

Browse files
committed
fix(desktop): suppress window activation during shutdown
1 parent 8143910 commit 1e86273

2 files changed

Lines changed: 37 additions & 2 deletions

File tree

‎apps/desktop/src/window/DesktopWindow.test.ts‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ function layerTest(input: {
233233
readonly previewZoomReapplies?: number[];
234234
readonly onReveal?: (window: Electron.BrowserWindow) => void;
235235
readonly focusedWindow?: Electron.BrowserWindow;
236+
readonly state?: DesktopState.DesktopState["Service"];
236237
}) {
237238
let desktopSettings = input.desktopSettings ?? DesktopAppSettings.DEFAULT_DESKTOP_SETTINGS;
238239
const layerDesktopAppSettings = Layer.succeed(DesktopAppSettings.DesktopAppSettings, {
@@ -305,7 +306,7 @@ function layerTest(input: {
305306
layerDesktopAppSettings,
306307
layerDesktopClientSettings,
307308
layerDesktopServerExposure,
308-
DesktopState.layer,
309+
input.state ? Layer.succeed(DesktopState.DesktopState, input.state) : DesktopState.layer,
309310
layerElectronApp,
310311
Layer.succeed(ElectronMenu.ElectronMenu, {
311312
setApplicationMenu: () => Effect.void,
@@ -423,6 +424,7 @@ const makeSplashScenario = (
423424
const layer = DesktopWindow.layer.pipe(
424425
Layer.provide(
425426
Layer.mergeAll(
427+
DesktopState.layer,
426428
layerDesktopAssets,
427429
Layer.succeed(DesktopRendererHistory.DesktopRendererHistory, {
428430
register: () => Effect.void,
@@ -649,6 +651,36 @@ describe("DesktopWindow", () => {
649651
);
650652
});
651653

654+
it.effect.each([false, true])(
655+
"ignores activation and backend readiness while quitting (existing window: %s)",
656+
(existing) =>
657+
Effect.gen(function* () {
658+
const fakeWindow = makeFakeBrowserWindow();
659+
const createCount = yield* Ref.make(0);
660+
const mainWindow = yield* Ref.make(
661+
existing ? Option.some(fakeWindow.window) : Option.none<Electron.BrowserWindow>(),
662+
);
663+
const state = { quitting: yield* Ref.make(true), backendReady: yield* Ref.make(false) };
664+
let reveals = 0;
665+
const layer = layerTest({
666+
window: fakeWindow.window,
667+
createCount,
668+
mainWindow,
669+
state,
670+
onReveal: () => {
671+
reveals += 1;
672+
},
673+
});
674+
yield* Effect.gen(function* () {
675+
const desktopWindow = yield* DesktopWindow.DesktopWindow;
676+
yield* desktopWindow.handleBackendReady(new URL("http://127.0.0.1:3773"));
677+
yield* desktopWindow.activate;
678+
assert.equal(yield* Ref.get(createCount), 0);
679+
assert.equal(reveals, 0);
680+
}).pipe(Effect.provide(layer));
681+
}),
682+
);
683+
652684
it.effect("does not open a development window until the backend is ready", () =>
653685
Effect.gen(function* () {
654686
const fakeWindow = makeFakeBrowserWindow();

‎apps/desktop/src/window/DesktopWindow.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import * as Electron from "electron";
1111
import { type DesktopSnapShotEvent, DEFAULT_CLIENT_SETTINGS } from "@t3tools/contracts";
1212

1313
import * as DesktopAssets from "../app/DesktopAssets.ts";
14+
import * as DesktopState from "../app/DesktopState.ts";
1415
import * as DesktopEnvironment from "../app/DesktopEnvironment.ts";
1516
import { makeComponentLogger } from "../app/DesktopObservability.ts";
1617
import * as ElectronMenu from "../electron/ElectronMenu.ts";
@@ -322,6 +323,7 @@ function bindFirstRevealTrigger(
322323

323324
/** @public Service construction is part of the canonical Effect module API. */
324325
export const make = Effect.gen(function* () {
326+
const state = yield* DesktopState.DesktopState;
325327
const environment = yield* DesktopEnvironment.DesktopEnvironment;
326328
const assets = yield* DesktopAssets.DesktopAssets;
327329
const electronMenu = yield* ElectronMenu.ElectronMenu;
@@ -903,7 +905,7 @@ export const make = Effect.gen(function* () {
903905
});
904906

905907
const createMainIfBackendReady = Effect.gen(function* () {
906-
if (!windowRequested) return;
908+
if (!windowRequested || (yield* Ref.get(state.quitting))) return;
907909
if (yield* waitingForBackend) return;
908910
const existingWindow = yield* currentMainWindow;
909911
if (Option.isSome(existingWindow)) return;
@@ -1000,6 +1002,7 @@ export const make = Effect.gen(function* () {
10001002
}
10011003
}),
10021004
activate: Effect.gen(function* () {
1005+
if (yield* Ref.get(state.quitting)) return;
10031006
windowRequested = true;
10041007
const existingWindow = yield* currentMainWindow;
10051008
if (Option.isSome(existingWindow)) {

0 commit comments

Comments
 (0)