@@ -13,8 +13,17 @@ import * as DesktopEnvironment from "./DesktopEnvironment.ts";
1313import * as DesktopLifecycle from "./DesktopLifecycle.ts" ;
1414import * as DesktopShutdown from "./DesktopShutdown.ts" ;
1515import * as DesktopState from "./DesktopState.ts" ;
16+ import * as DesktopTray from "./DesktopTray.ts" ;
1617import * as DesktopWindow from "../window/DesktopWindow.ts" ;
1718
19+ function makeDesktopTrayLayer ( isAvailable = true ) {
20+ return Layer . succeed ( DesktopTray . DesktopTray , {
21+ configure : Effect . void ,
22+ isAvailable : Effect . succeed ( isAvailable ) ,
23+ destroy : Effect . void ,
24+ } satisfies DesktopTray . DesktopTray [ "Service" ] ) ;
25+ }
26+
1827function makeElectronAppLayer (
1928 appListeners : Map < string , ( ...args : readonly unknown [ ] ) => void > ,
2029 quit : Effect . Effect < void > = Effect . void ,
@@ -119,6 +128,7 @@ describe("DesktopLifecycle", () => {
119128 ) ,
120129 ) ,
121130 Layer . provideMerge ( makeDesktopWindowLayer ( ) ) ,
131+ Layer . provideMerge ( makeDesktopTrayLayer ( ) ) ,
122132 Layer . provideMerge ( environmentLayer ) ,
123133 Layer . provideMerge ( DesktopShutdown . layer ) ,
124134 Layer . provideMerge ( DesktopState . layer ) ,
@@ -153,6 +163,122 @@ describe("DesktopLifecycle", () => {
153163 } ) ;
154164 }
155165
166+ it . effect ( "does not quit on window-all-closed on win32 (with tray) or darwin" , ( ) =>
167+ Effect . gen ( function * ( ) {
168+ for ( const platform of [ "win32" , "darwin" ] as const ) {
169+ const appListeners = new Map < string , ( ...args : readonly unknown [ ] ) => void > ( ) ;
170+ let quitCalled = false ;
171+ const quit = Effect . sync ( ( ) => {
172+ quitCalled = true ;
173+ } ) ;
174+
175+ const environmentLayer = Layer . succeed ( DesktopEnvironment . DesktopEnvironment , {
176+ platform,
177+ isDevelopment : false ,
178+ } as DesktopEnvironment . DesktopEnvironment [ "Service" ] ) ;
179+
180+ const layer = DesktopLifecycle . layer . pipe (
181+ Layer . provideMerge ( makeElectronAppLayer ( appListeners , quit ) ) ,
182+ Layer . provideMerge ( electronThemeLayer ) ,
183+ Layer . provideMerge ( makeElectronWindowLayer ( ) ) ,
184+ Layer . provideMerge ( makeDesktopWindowLayer ( ) ) ,
185+ Layer . provideMerge ( makeDesktopTrayLayer ( true ) ) ,
186+ Layer . provideMerge ( environmentLayer ) ,
187+ Layer . provideMerge ( DesktopShutdown . layer ) ,
188+ Layer . provideMerge ( DesktopState . layer ) ,
189+ ) ;
190+
191+ yield * Effect . scoped (
192+ Effect . gen ( function * ( ) {
193+ const lifecycle = yield * DesktopLifecycle . DesktopLifecycle ;
194+ yield * lifecycle . register ;
195+
196+ appListeners . get ( "window-all-closed" ) ?.( ) ;
197+ yield * Effect . yieldNow ;
198+
199+ assert . isFalse ( quitCalled , `expected quit not to be called on ${ platform } ` ) ;
200+ } ) ,
201+ ) . pipe ( Effect . provide ( layer ) ) ;
202+ }
203+ } ) ,
204+ ) ;
205+
206+ it . effect ( "quits on window-all-closed on win32 when tray is unavailable" , ( ) =>
207+ Effect . gen ( function * ( ) {
208+ const appListeners = new Map < string , ( ...args : readonly unknown [ ] ) => void > ( ) ;
209+ let quitCalled = false ;
210+ const quit = Effect . sync ( ( ) => {
211+ quitCalled = true ;
212+ } ) ;
213+
214+ const environmentLayer = Layer . succeed ( DesktopEnvironment . DesktopEnvironment , {
215+ platform : "win32" ,
216+ isDevelopment : false ,
217+ } as DesktopEnvironment . DesktopEnvironment [ "Service" ] ) ;
218+
219+ const layer = DesktopLifecycle . layer . pipe (
220+ Layer . provideMerge ( makeElectronAppLayer ( appListeners , quit ) ) ,
221+ Layer . provideMerge ( electronThemeLayer ) ,
222+ Layer . provideMerge ( makeElectronWindowLayer ( ) ) ,
223+ Layer . provideMerge ( makeDesktopWindowLayer ( ) ) ,
224+ Layer . provideMerge ( makeDesktopTrayLayer ( false ) ) ,
225+ Layer . provideMerge ( environmentLayer ) ,
226+ Layer . provideMerge ( DesktopShutdown . layer ) ,
227+ Layer . provideMerge ( DesktopState . layer ) ,
228+ ) ;
229+
230+ yield * Effect . scoped (
231+ Effect . gen ( function * ( ) {
232+ const lifecycle = yield * DesktopLifecycle . DesktopLifecycle ;
233+ yield * lifecycle . register ;
234+
235+ appListeners . get ( "window-all-closed" ) ?.( ) ;
236+ yield * Effect . yieldNow ;
237+
238+ assert . isTrue ( quitCalled , "expected quit to be called on win32 when tray unavailable" ) ;
239+ } ) ,
240+ ) . pipe ( Effect . provide ( layer ) ) ;
241+ } ) ,
242+ ) ;
243+
244+ it . effect ( "quits on window-all-closed on linux" , ( ) =>
245+ Effect . gen ( function * ( ) {
246+ const appListeners = new Map < string , ( ...args : readonly unknown [ ] ) => void > ( ) ;
247+ let quitCalled = false ;
248+ const quit = Effect . sync ( ( ) => {
249+ quitCalled = true ;
250+ } ) ;
251+
252+ const environmentLayer = Layer . succeed ( DesktopEnvironment . DesktopEnvironment , {
253+ platform : "linux" ,
254+ isDevelopment : false ,
255+ } as DesktopEnvironment . DesktopEnvironment [ "Service" ] ) ;
256+
257+ const layer = DesktopLifecycle . layer . pipe (
258+ Layer . provideMerge ( makeElectronAppLayer ( appListeners , quit ) ) ,
259+ Layer . provideMerge ( electronThemeLayer ) ,
260+ Layer . provideMerge ( makeElectronWindowLayer ( ) ) ,
261+ Layer . provideMerge ( makeDesktopWindowLayer ( ) ) ,
262+ Layer . provideMerge ( makeDesktopTrayLayer ( ) ) ,
263+ Layer . provideMerge ( environmentLayer ) ,
264+ Layer . provideMerge ( DesktopShutdown . layer ) ,
265+ Layer . provideMerge ( DesktopState . layer ) ,
266+ ) ;
267+
268+ yield * Effect . scoped (
269+ Effect . gen ( function * ( ) {
270+ const lifecycle = yield * DesktopLifecycle . DesktopLifecycle ;
271+ yield * lifecycle . register ;
272+
273+ appListeners . get ( "window-all-closed" ) ?.( ) ;
274+ yield * Effect . yieldNow ;
275+
276+ assert . isTrue ( quitCalled , "expected quit to be called on linux" ) ;
277+ } ) ,
278+ ) . pipe ( Effect . provide ( layer ) ) ;
279+ } ) ,
280+ ) ;
281+
156282 it . effect ( "destroys windows before waiting for backend shutdown" , ( ) =>
157283 Effect . gen ( function * ( ) {
158284 const appListeners = new Map < string , ( ...args : readonly unknown [ ] ) => void > ( ) ;
@@ -191,6 +317,7 @@ describe("DesktopLifecycle", () => {
191317 Layer . provideMerge ( electronThemeLayer ) ,
192318 Layer . provideMerge ( makeElectronWindowLayer ( destroyAll ) ) ,
193319 Layer . provideMerge ( makeDesktopWindowLayer ( { flushMainWindowBounds } ) ) ,
320+ Layer . provideMerge ( makeDesktopTrayLayer ( ) ) ,
194321 Layer . provideMerge ( environmentLayer ) ,
195322 Layer . provideMerge ( desktopShutdownLayer ) ,
196323 Layer . provideMerge ( DesktopState . layer ) ,
@@ -232,6 +359,7 @@ describe("DesktopLifecycle", () => {
232359 Layer . provideMerge ( electronThemeLayer ) ,
233360 Layer . provideMerge ( makeElectronWindowLayer ( ) ) ,
234361 Layer . provideMerge ( makeDesktopWindowLayer ( { activate } ) ) ,
362+ Layer . provideMerge ( makeDesktopTrayLayer ( ) ) ,
235363 Layer . provideMerge ( environmentLayer ) ,
236364 Layer . provideMerge ( DesktopShutdown . layer ) ,
237365 Layer . provideMerge ( DesktopState . layer ) ,
0 commit comments