11import { assert , describe , it } from "@effect/vitest" ;
2+ import * as Deferred from "effect/Deferred" ;
23import * as Effect from "effect/Effect" ;
34import * as Layer from "effect/Layer" ;
45import * as Ref from "effect/Ref" ;
@@ -7,90 +8,105 @@ import type * as Electron from "electron";
78
89import * as ElectronApp from "../electron/ElectronApp.ts" ;
910import * as ElectronTheme from "../electron/ElectronTheme.ts" ;
11+ import * as ElectronWindow from "../electron/ElectronWindow.ts" ;
1012import * as DesktopEnvironment from "./DesktopEnvironment.ts" ;
1113import * as DesktopLifecycle from "./DesktopLifecycle.ts" ;
1214import * as DesktopShutdown from "./DesktopShutdown.ts" ;
1315import * as DesktopState from "./DesktopState.ts" ;
1416import * as DesktopWindow from "../window/DesktopWindow.ts" ;
1517
18+ function makeElectronAppLayer (
19+ appListeners : Map < string , ( ...args : readonly unknown [ ] ) => void > ,
20+ quit : Effect . Effect < void > = Effect . void ,
21+ ) {
22+ const registerListener = ( eventName : string , listener : ( ...args : readonly unknown [ ] ) => void ) =>
23+ Effect . acquireRelease (
24+ Effect . sync ( ( ) => {
25+ appListeners . set ( eventName , listener ) ;
26+ } ) ,
27+ ( ) =>
28+ Effect . sync ( ( ) => {
29+ appListeners . delete ( eventName ) ;
30+ } ) ,
31+ ) . pipe ( Effect . asVoid ) ;
32+
33+ return Layer . succeed ( ElectronApp . ElectronApp , {
34+ metadata : Effect . die ( "unexpected metadata read" ) ,
35+ name : Effect . succeed ( "T3 Code" ) ,
36+ whenReady : Effect . void ,
37+ quit,
38+ exit : ( ) => Effect . void ,
39+ relaunch : ( ) => Effect . void ,
40+ setPath : ( ) => Effect . void ,
41+ setName : ( ) => Effect . void ,
42+ setAboutPanelOptions : ( ) => Effect . void ,
43+ setAppUserModelId : ( ) => Effect . void ,
44+ getAppMetrics : Effect . succeed ( [ ] ) ,
45+ isDefaultProtocolClient : ( ) => Effect . succeed ( false ) ,
46+ setAsDefaultProtocolClient : ( ) => Effect . succeed ( true ) ,
47+ setDesktopName : ( ) => Effect . void ,
48+ setDockIcon : ( ) => Effect . void ,
49+ appendCommandLineSwitch : ( ) => Effect . void ,
50+ removeCommandLineSwitch : ( ) => Effect . void ,
51+ onBeforeQuitForUpdate : ( listener ) => registerListener ( "before-quit-for-update" , listener ) ,
52+ on : ( eventName , listener ) =>
53+ registerListener ( eventName , listener as unknown as ( ...args : readonly unknown [ ] ) => void ) ,
54+ } satisfies ElectronApp . ElectronApp [ "Service" ] ) ;
55+ }
56+
57+ const electronThemeLayer = Layer . succeed ( ElectronTheme . ElectronTheme , {
58+ shouldUseDarkColors : Effect . succeed ( false ) ,
59+ setSource : ( ) => Effect . void ,
60+ onUpdated : ( ) => Effect . void ,
61+ } ) ;
62+
63+ function makeElectronWindowLayer ( destroyAll : Effect . Effect < void > = Effect . void ) {
64+ return Layer . succeed ( ElectronWindow . ElectronWindow , {
65+ create : ( ) => Effect . die ( "unexpected window creation" ) ,
66+ main : Effect . die ( "unexpected main window read" ) ,
67+ currentMainOrFirst : Effect . die ( "unexpected current window read" ) ,
68+ focusedMainOrFirst : Effect . die ( "unexpected focused window read" ) ,
69+ setMain : ( ) => Effect . void ,
70+ clearMain : ( ) => Effect . void ,
71+ reveal : ( ) => Effect . void ,
72+ sendAll : ( ) => Effect . void ,
73+ destroyAll,
74+ syncAllAppearance : ( ) => Effect . void ,
75+ } ) ;
76+ }
77+
78+ function makeDesktopWindowLayer ( flushMainWindowBounds : Effect . Effect < void > = Effect . void ) {
79+ return Layer . succeed ( DesktopWindow . DesktopWindow , {
80+ createMain : Effect . die ( "unexpected window creation" ) ,
81+ ensureMain : Effect . die ( "unexpected window creation" ) ,
82+ revealOrCreateMain : Effect . die ( "unexpected window creation" ) ,
83+ activate : Effect . void ,
84+ createMainIfBackendReady : Effect . void ,
85+ showConnectingSplash : Effect . void ,
86+ handleBackendReady : ( ) => Effect . void ,
87+ handleBackendNotReady : Effect . void ,
88+ flushMainWindowBounds,
89+ dispatchMenuAction : ( ) => Effect . void ,
90+ zoomMain : ( ) => Effect . void ,
91+ syncAppearance : Effect . void ,
92+ } ) ;
93+ }
94+
1695describe ( "DesktopLifecycle" , ( ) => {
1796 for ( const platform of [ "darwin" , "win32" , "linux" ] satisfies ReadonlyArray < NodeJS . Platform > ) {
1897 it . effect ( `lets the updater's quit event proceed on ${ platform } ` , ( ) => {
1998 const appListeners = new Map < string , ( ...args : readonly unknown [ ] ) => void > ( ) ;
2099
21- const electronAppLayer = Layer . succeed ( ElectronApp . ElectronApp , {
22- metadata : Effect . die ( "unexpected metadata read" ) ,
23- name : Effect . succeed ( "T3 Code" ) ,
24- whenReady : Effect . void ,
25- quit : Effect . void ,
26- exit : ( ) => Effect . void ,
27- relaunch : ( ) => Effect . void ,
28- setPath : ( ) => Effect . void ,
29- setName : ( ) => Effect . void ,
30- setAboutPanelOptions : ( ) => Effect . void ,
31- setAppUserModelId : ( ) => Effect . void ,
32- getAppMetrics : Effect . succeed ( [ ] ) ,
33- isDefaultProtocolClient : ( ) => Effect . succeed ( false ) ,
34- setAsDefaultProtocolClient : ( ) => Effect . succeed ( true ) ,
35- setDesktopName : ( ) => Effect . void ,
36- setDockIcon : ( ) => Effect . void ,
37- appendCommandLineSwitch : ( ) => Effect . void ,
38- removeCommandLineSwitch : ( ) => Effect . void ,
39- onBeforeQuitForUpdate : ( listener ) =>
40- Effect . acquireRelease (
41- Effect . sync ( ( ) => {
42- appListeners . set ( "before-quit-for-update" , listener ) ;
43- } ) ,
44- ( ) =>
45- Effect . sync ( ( ) => {
46- appListeners . delete ( "before-quit-for-update" ) ;
47- } ) ,
48- ) . pipe ( Effect . asVoid ) ,
49- on : ( eventName , listener ) =>
50- Effect . acquireRelease (
51- Effect . sync ( ( ) => {
52- appListeners . set (
53- eventName ,
54- listener as unknown as ( ...args : readonly unknown [ ] ) => void ,
55- ) ;
56- } ) ,
57- ( ) =>
58- Effect . sync ( ( ) => {
59- appListeners . delete ( eventName ) ;
60- } ) ,
61- ) . pipe ( Effect . asVoid ) ,
62- } satisfies ElectronApp . ElectronApp [ "Service" ] ) ;
63-
64- const electronThemeLayer = Layer . succeed ( ElectronTheme . ElectronTheme , {
65- shouldUseDarkColors : Effect . succeed ( false ) ,
66- setSource : ( ) => Effect . void ,
67- onUpdated : ( ) => Effect . void ,
68- } ) ;
69-
70- const desktopWindowLayer = Layer . succeed ( DesktopWindow . DesktopWindow , {
71- createMain : Effect . die ( "unexpected window creation" ) ,
72- ensureMain : Effect . die ( "unexpected window creation" ) ,
73- revealOrCreateMain : Effect . die ( "unexpected window creation" ) ,
74- activate : Effect . void ,
75- createMainIfBackendReady : Effect . void ,
76- showConnectingSplash : Effect . void ,
77- handleBackendReady : ( ) => Effect . void ,
78- handleBackendNotReady : Effect . void ,
79- flushMainWindowBounds : Effect . void ,
80- dispatchMenuAction : ( ) => Effect . void ,
81- zoomMain : ( ) => Effect . void ,
82- syncAppearance : Effect . void ,
83- } ) ;
84-
85100 const environmentLayer = Layer . succeed ( DesktopEnvironment . DesktopEnvironment , {
86101 platform,
87102 isDevelopment : false ,
88103 } as DesktopEnvironment . DesktopEnvironment [ "Service" ] ) ;
89104
90105 const layer = DesktopLifecycle . layer . pipe (
91- Layer . provideMerge ( electronAppLayer ) ,
106+ Layer . provideMerge ( makeElectronAppLayer ( appListeners ) ) ,
92107 Layer . provideMerge ( electronThemeLayer ) ,
93- Layer . provideMerge ( desktopWindowLayer ) ,
108+ Layer . provideMerge ( makeElectronWindowLayer ( ) ) ,
109+ Layer . provideMerge ( makeDesktopWindowLayer ( ) ) ,
94110 Layer . provideMerge ( environmentLayer ) ,
95111 Layer . provideMerge ( DesktopShutdown . layer ) ,
96112 Layer . provideMerge ( DesktopState . layer ) ,
@@ -122,4 +138,67 @@ describe("DesktopLifecycle", () => {
122138 ) . pipe ( Effect . provide ( layer ) ) ;
123139 } ) ;
124140 }
141+
142+ it . effect ( "destroys windows before waiting for backend shutdown" , ( ) =>
143+ Effect . gen ( function * ( ) {
144+ const appListeners = new Map < string , ( ...args : readonly unknown [ ] ) => void > ( ) ;
145+ const shutdownRequested = yield * Deferred . make < void > ( ) ;
146+ const allowShutdown = yield * Deferred . make < void > ( ) ;
147+ const quitRequested = yield * Deferred . make < void > ( ) ;
148+ const events : string [ ] = [ ] ;
149+
150+ const quit = Effect . sync ( ( ) => {
151+ events . push ( "quit" ) ;
152+ } ) . pipe ( Effect . andThen ( Deferred . succeed ( quitRequested , undefined ) ) , Effect . asVoid ) ;
153+ const destroyAll = Effect . sync ( ( ) => {
154+ events . push ( "destroy" ) ;
155+ } ) ;
156+ const flushMainWindowBounds = Effect . sync ( ( ) => {
157+ events . push ( "flush" ) ;
158+ } ) ;
159+
160+ const desktopShutdownLayer = Layer . succeed ( DesktopShutdown . DesktopShutdown , {
161+ request : Effect . sync ( ( ) => {
162+ events . push ( "request" ) ;
163+ } ) . pipe ( Effect . andThen ( Deferred . succeed ( shutdownRequested , undefined ) ) , Effect . asVoid ) ,
164+ awaitRequest : Deferred . await ( shutdownRequested ) ,
165+ markComplete : Deferred . succeed ( allowShutdown , undefined ) . pipe ( Effect . asVoid ) ,
166+ awaitComplete : Deferred . await ( allowShutdown ) ,
167+ isComplete : Deferred . isDone ( allowShutdown ) ,
168+ } ) ;
169+
170+ const environmentLayer = Layer . succeed ( DesktopEnvironment . DesktopEnvironment , {
171+ platform : "darwin" ,
172+ isDevelopment : false ,
173+ } as DesktopEnvironment . DesktopEnvironment [ "Service" ] ) ;
174+
175+ const layer = DesktopLifecycle . layer . pipe (
176+ Layer . provideMerge ( makeElectronAppLayer ( appListeners , quit ) ) ,
177+ Layer . provideMerge ( electronThemeLayer ) ,
178+ Layer . provideMerge ( makeElectronWindowLayer ( destroyAll ) ) ,
179+ Layer . provideMerge ( makeDesktopWindowLayer ( flushMainWindowBounds ) ) ,
180+ Layer . provideMerge ( environmentLayer ) ,
181+ Layer . provideMerge ( desktopShutdownLayer ) ,
182+ Layer . provideMerge ( DesktopState . layer ) ,
183+ ) ;
184+
185+ yield * Effect . scoped (
186+ Effect . gen ( function * ( ) {
187+ const lifecycle = yield * DesktopLifecycle . DesktopLifecycle ;
188+ yield * lifecycle . register ;
189+
190+ const event = { preventDefault : ( ) => undefined } as Electron . Event ;
191+ appListeners . get ( "before-quit" ) ?.( event ) ;
192+
193+ yield * Deferred . await ( shutdownRequested ) ;
194+ const eventsBeforeCleanup = [ ...events ] ;
195+ yield * Deferred . succeed ( allowShutdown , undefined ) ;
196+ yield * Deferred . await ( quitRequested ) ;
197+
198+ assert . deepEqual ( eventsBeforeCleanup , [ "flush" , "destroy" , "request" ] ) ;
199+ assert . deepEqual ( events , [ "flush" , "destroy" , "request" , "quit" ] ) ;
200+ } ) ,
201+ ) . pipe ( Effect . provide ( layer ) ) ;
202+ } ) ,
203+ ) ;
125204} ) ;
0 commit comments