@@ -18,6 +18,7 @@ import * as DesktopWindow from "../window/DesktopWindow.ts";
1818function makeElectronAppLayer (
1919 appListeners : Map < string , ( ...args : readonly unknown [ ] ) => void > ,
2020 quit : Effect . Effect < void > = Effect . void ,
21+ overrides : Partial < ElectronApp . ElectronApp [ "Service" ] > = { } ,
2122) {
2223 const registerListener = ( eventName : string , listener : ( ...args : readonly unknown [ ] ) => void ) =>
2324 Effect . acquireRelease (
@@ -51,6 +52,7 @@ function makeElectronAppLayer(
5152 onBeforeQuitForUpdate : ( listener ) => registerListener ( "before-quit-for-update" , listener ) ,
5253 on : ( eventName , listener ) =>
5354 registerListener ( eventName , listener as unknown as ( ...args : readonly unknown [ ] ) => void ) ,
55+ ...overrides ,
5456 } satisfies ElectronApp . ElectronApp [ "Service" ] ) ;
5557}
5658
@@ -101,6 +103,69 @@ function makeDesktopWindowLayer(
101103}
102104
103105describe ( "DesktopLifecycle" , ( ) => {
106+ it . effect . each ( [ false , true ] ) (
107+ "exits after shutdown even if scheduling relaunch fails: %s" ,
108+ ( fails ) =>
109+ Effect . gen ( function * ( ) {
110+ const requested = yield * Deferred . make < void > ( ) ;
111+ const complete = yield * Deferred . make < void > ( ) ;
112+ const exited = yield * Deferred . make < void > ( ) ;
113+ const events : string [ ] = [ ] ;
114+ let options : Electron . RelaunchOptions | undefined ;
115+ const layer = DesktopLifecycle . layer . pipe (
116+ Layer . provideMerge (
117+ makeElectronAppLayer ( new Map ( ) , Effect . void , {
118+ relaunch : ( value ) =>
119+ Effect . sync ( ( ) => {
120+ options = value ;
121+ events . push ( "relaunch" ) ;
122+ } ) . pipe ( Effect . andThen ( fails ? Effect . die ( "spawn failed" ) : Effect . void ) ) ,
123+ exit : ( code ) =>
124+ Effect . sync ( ( ) => {
125+ assert . equal ( code , 0 ) ;
126+ events . push ( "exit" ) ;
127+ } ) . pipe ( Effect . andThen ( Deferred . succeed ( exited , undefined ) ) , Effect . asVoid ) ,
128+ } ) ,
129+ ) ,
130+ Layer . provideMerge (
131+ makeDesktopWindowLayer ( {
132+ flushMainWindowBounds : Effect . sync ( ( ) => {
133+ events . push ( "flush" ) ;
134+ } ) ,
135+ } ) ,
136+ ) ,
137+ Layer . provideMerge (
138+ Layer . succeed ( DesktopEnvironment . DesktopEnvironment , {
139+ isDevelopment : false ,
140+ } as DesktopEnvironment . DesktopEnvironment [ "Service" ] ) ,
141+ ) ,
142+ Layer . provideMerge (
143+ Layer . succeed ( DesktopShutdown . DesktopShutdown , {
144+ request : Deferred . succeed ( requested , undefined ) . pipe ( Effect . asVoid ) ,
145+ awaitRequest : Deferred . await ( requested ) ,
146+ markComplete : Deferred . succeed ( complete , undefined ) . pipe ( Effect . asVoid ) ,
147+ awaitComplete : Deferred . await ( complete ) ,
148+ isComplete : Deferred . isDone ( complete ) ,
149+ } ) ,
150+ ) ,
151+ Layer . provideMerge ( DesktopState . layer ) ,
152+ Layer . provideMerge ( electronThemeLayer ) ,
153+ ) ;
154+ yield * Effect . gen ( function * ( ) {
155+ const lifecycle = yield * DesktopLifecycle . DesktopLifecycle ;
156+ yield * lifecycle . relaunch ( "serverExposureMode=network-accessible" ) ;
157+ yield * Deferred . await ( requested ) ;
158+ assert . deepEqual ( events , [ "flush" ] ) ;
159+ yield * Deferred . succeed ( complete , undefined ) ;
160+ yield * Deferred . await ( exited ) ;
161+ assert . deepEqual ( options , {
162+ args : process . argv . slice ( 1 ) ,
163+ } ) ;
164+ assert . deepEqual ( events , [ "flush" , "relaunch" , "exit" ] ) ;
165+ } ) . pipe ( Effect . provide ( layer ) ) ;
166+ } ) ,
167+ ) ;
168+
104169 it . effect . each ( [ "darwin" , "win32" , "linux" ] satisfies ReadonlyArray < NodeJS . Platform > ) (
105170 "lets the updater's quit event proceed on %s" ,
106171 ( platform ) => {
0 commit comments