@@ -34,6 +34,7 @@ import * as FileSystem from "effect/FileSystem";
3434import * as ElectronApp from "../electron/ElectronApp.ts" ;
3535import * as ElectronShell from "../electron/ElectronShell.ts" ;
3636import * as ElectronWindow from "../electron/ElectronWindow.ts" ;
37+ import * as DesktopWindow from "../window/DesktopWindow.ts" ;
3738import * as DesktopClerk from "./DesktopClerk.ts" ;
3839import * as DesktopWebLinks from "./DesktopWebLinks.ts" ;
3940import * as DesktopEnvironment from "./DesktopEnvironment.ts" ;
@@ -229,7 +230,12 @@ describe("DesktopClerk", () => {
229230 assert . equal ( quit . mock . calls . length , 0 ) ;
230231 assert . deepEqual ( registeredEvents , [ "open-url" , "open-file" , "second-instance" ] ) ;
231232 } ) . pipe (
232- Effect . provide ( layerDesktopClerk ( ) ) ,
233+ Effect . provide (
234+ Layer . mergeAll (
235+ Layer . mock ( DesktopWindow . DesktopWindow ) ( { activate : Effect . void } ) ,
236+ layerDesktopClerk ( ) ,
237+ ) ,
238+ ) ,
233239 Effect . provideService ( ElectronApp . ElectronApp , electronApp ) ,
234240 Effect . provideService ( ElectronWindow . ElectronWindow , electronWindow ) ,
235241 Effect . provideService ( DesktopWebLinks . DesktopWebLinks , ignoreWebLinks ) ,
@@ -258,7 +264,12 @@ describe("DesktopClerk", () => {
258264 assert . equal ( quit . mock . calls . length , 1 ) ;
259265 assert . deepEqual ( registeredEvents , [ ] ) ;
260266 } ) . pipe (
261- Effect . provide ( layerDesktopClerk ( ) ) ,
267+ Effect . provide (
268+ Layer . mergeAll (
269+ Layer . mock ( DesktopWindow . DesktopWindow ) ( { activate : Effect . void } ) ,
270+ layerDesktopClerk ( ) ,
271+ ) ,
272+ ) ,
262273 Effect . provideService ( ElectronApp . ElectronApp , electronApp ) ,
263274 Effect . provideService ( ElectronWindow . ElectronWindow , electronWindow ) ,
264275 Effect . provideService ( DesktopWebLinks . DesktopWebLinks , ignoreWebLinks ) ,
@@ -305,7 +316,12 @@ it.effect(
305316 assert . equal ( event . preventDefault . mock . calls . length , 1 ) ;
306317 } ) . pipe (
307318 Effect . scoped ,
308- Effect . provide ( layerDesktopClerk ( ) ) ,
319+ Effect . provide (
320+ Layer . mergeAll (
321+ Layer . mock ( DesktopWindow . DesktopWindow ) ( { activate : Effect . void } ) ,
322+ layerDesktopClerk ( ) ,
323+ ) ,
324+ ) ,
309325 Effect . provideService ( ElectronApp . ElectronApp , electronApp ) ,
310326 Effect . provideService ( ElectronWindow . ElectronWindow , electronWindow ) ,
311327 Effect . provideService ( DesktopWebLinks . DesktopWebLinks , ignoreWebLinks ) ,
@@ -384,7 +400,12 @@ it.effect.each(["startup", "open-url"] as const)(
384400 assert . strictEqual ( delivery ?. flowId , request . flowId ) ;
385401 assert . strictEqual ( delivery ?. returnUrl , request . returnUrl ) ;
386402 } ) . pipe (
387- Effect . provide ( layerDesktopClerk ( true , [ ] , "darwin" , undefined , shell ) ) ,
403+ Effect . provide (
404+ Layer . mergeAll (
405+ Layer . mock ( DesktopWindow . DesktopWindow ) ( { activate : Effect . void } ) ,
406+ layerDesktopClerk ( true , [ ] , "darwin" , undefined , shell ) ,
407+ ) ,
408+ ) ,
388409 Effect . provideService ( HostProcess . Arguments , entry === "startup" ? [ "t3" , link ] : [ "t3" ] ) ,
389410 Effect . provideService ( ElectronApp . ElectronApp , electronApp ) ,
390411 Effect . provideService (
@@ -434,7 +455,12 @@ it.effect("hands web and app links to the renderer and leaves other links alone"
434455 "t3code://threads/env-1/thread-1" ,
435456 ] ) ;
436457 } ) . pipe (
437- Effect . provide ( layerDesktopClerk ( true , [ ] , "darwin" ) ) ,
458+ Effect . provide (
459+ Layer . mergeAll (
460+ Layer . mock ( DesktopWindow . DesktopWindow ) ( { activate : Effect . void } ) ,
461+ layerDesktopClerk ( true , [ ] , "darwin" ) ,
462+ ) ,
463+ ) ,
438464 Effect . provideService ( HostProcess . Arguments , [ "t3" ] ) ,
439465 Effect . provideService ( ElectronApp . ElectronApp , electronApp ) ,
440466 Effect . provideService (
@@ -451,3 +477,35 @@ it.effect("hands web and app links to the renderer and leaves other links alone"
451477 ) ;
452478 } ) . pipe ( Effect . scoped ) ,
453479) ;
480+
481+ it . effect ( "activates the desktop for an ordinary second launch with no existing window" , ( ) => {
482+ storageMock . mockReturnValue ( storageAdapter ) ;
483+ createClerkBridgeMock . mockReturnValue ( { cleanup : vi . fn ( ) , isPrimaryInstance : true } ) ;
484+ const listeners = new Map < string , ( ...args : unknown [ ] ) => void > ( ) ;
485+ const activated = Promise . withResolvers < void > ( ) ;
486+ return Effect . gen ( function * ( ) {
487+ const clerk = yield * DesktopClerk . DesktopClerk ;
488+ yield * clerk . configure ;
489+ listeners . get ( "second-instance" ) ! ( { } , [ "t3" ] ) ;
490+ yield * Effect . promise ( ( ) => activated . promise ) ;
491+ } ) . pipe (
492+ Effect . scoped ,
493+
494+ Effect . provideService ( ElectronApp . ElectronApp , {
495+ on : ( name : string , listener : ( ...args : unknown [ ] ) => void ) =>
496+ Effect . sync ( ( ) => {
497+ listeners . set ( name , listener ) ;
498+ } ) ,
499+ } as unknown as ElectronApp . ElectronApp [ "Service" ] ) ,
500+ Effect . provide (
501+ Layer . mergeAll (
502+ layerDesktopClerk ( ) ,
503+ Layer . mock ( ElectronWindow . ElectronWindow ) ( { currentMainOrFirst : Effect . succeedNone } ) ,
504+ Layer . mock ( DesktopWindow . DesktopWindow ) ( {
505+ activate : Effect . sync ( ( ) => activated . resolve ( ) ) ,
506+ } ) ,
507+ ) ,
508+ ) ,
509+ Effect . provideService ( DesktopWebLinks . DesktopWebLinks , ignoreWebLinks ) ,
510+ ) ;
511+ } ) ;
0 commit comments