@@ -59,6 +59,7 @@ const layerDesktopClerk = (
5959 openSystemSettings : ( ) => Effect . succeed ( false ) ,
6060 copyText : ( ) => Effect . void ,
6161 } ,
62+ listeners = new Map < string , ( ...args : unknown [ ] ) => void > ( ) ,
6263) => {
6364 const environment = DesktopEnvironment . DesktopEnvironment . of ( {
6465 stateDir : "/tmp/t3-state" ,
@@ -79,6 +80,17 @@ const layerDesktopClerk = (
7980 quit : Effect . sync ( ( ) => {
8081 events . push ( "quit" ) ;
8182 } ) ,
83+ on : ( name : string , listener : ( ...args : unknown [ ] ) => void ) =>
84+ Effect . acquireRelease (
85+ Effect . sync ( ( ) => {
86+ events . push ( `on:${ name } ` ) ;
87+ listeners . set ( name , listener ) ;
88+ } ) ,
89+ ( ) =>
90+ Effect . sync ( ( ) => {
91+ listeners . delete ( name ) ;
92+ } ) ,
93+ ) . pipe ( Effect . asVoid ) ,
8294 } as unknown as ElectronApp . ElectronApp [ "Service" ] ;
8395
8496 return DesktopClerk . layer . pipe (
@@ -127,6 +139,7 @@ describe("DesktopClerk", () => {
127139 assert . deepEqual ( events , [
128140 "setPath:userData:/tmp/app-data/t3code-dev" ,
129141 "requestSingleInstanceLock" ,
142+ "on:second-instance" ,
130143 "createClerkBridge" ,
131144 ] ) ;
132145 storageMock . mockClear ( ) ;
@@ -182,6 +195,7 @@ describe("DesktopClerk", () => {
182195 assert . deepEqual ( events , [
183196 `setPath:userData:${ userData } ` ,
184197 "requestSingleInstanceLock" ,
198+ "on:second-instance" ,
185199 "createClerkBridge" ,
186200 ] ) ;
187201 } ,
@@ -235,38 +249,91 @@ describe("DesktopClerk", () => {
235249 } ) ;
236250 } ) ;
237251
238- it . effect ( "reveals the running window when a second instance launches" , ( ) => {
252+ it . effect . each ( [ "before configure" , "after configure" ] as const ) (
253+ "reveals the running window when a second instance launches %s" ,
254+ ( entry ) => {
255+ storageMock . mockReturnValue ( storageAdapter ) ;
256+ createClerkBridgeMock . mockReturnValue ( { cleanup : vi . fn ( ) , isPrimaryInstance : true } ) ;
257+ const quit = vi . fn ( ) ;
258+ const listeners = new Map < string , ( ...args : unknown [ ] ) => void > ( ) ;
259+ const revealed = Promise . withResolvers < unknown > ( ) ;
260+ const window = { id : 1 } ;
261+ const electronApp = {
262+ quit : Effect . sync ( quit ) ,
263+ on : ( eventName : string , listener : ( ...args : unknown [ ] ) => void ) =>
264+ Effect . sync ( ( ) => {
265+ listeners . set ( eventName , listener ) ;
266+ } ) ,
267+ } as unknown as ElectronApp . ElectronApp [ "Service" ] ;
268+ const electronWindow = {
269+ currentMainOrFirst : Effect . succeedSome ( window ) ,
270+ reveal : ( value : unknown ) => Effect . sync ( ( ) => revealed . resolve ( value ) ) ,
271+ } as unknown as ElectronWindow . ElectronWindow [ "Service" ] ;
272+
273+ return Effect . gen ( function * ( ) {
274+ const clerk = yield * DesktopClerk . DesktopClerk ;
275+ if ( entry === "before configure" ) listeners . get ( "second-instance" ) ?.( { } , [ "t3" ] ) ;
276+ yield * clerk . configure ;
277+
278+ assert . equal ( quit . mock . calls . length , 0 ) ;
279+ if ( entry === "after configure" ) listeners . get ( "second-instance" ) ! ( { } , [ "t3" ] ) ;
280+ assert . strictEqual ( yield * Effect . promise ( ( ) => revealed . promise ) , window ) ;
281+ } ) . pipe (
282+ Effect . scoped ,
283+ Effect . provide ( layerDesktopClerk ( true , [ ] , "darwin" , undefined , undefined , listeners ) ) ,
284+ Effect . provideService ( ElectronApp . ElectronApp , electronApp ) ,
285+ Effect . provideService ( ElectronWindow . ElectronWindow , electronWindow ) ,
286+ Effect . provideService ( DesktopWebLinks . DesktopWebLinks , ignoreWebLinks ) ,
287+ ) ;
288+ } ,
289+ ) ;
290+
291+ it . effect ( "delivers queued startup links and later links once in arrival order" , ( ) => {
239292 storageMock . mockReturnValue ( storageAdapter ) ;
240293 createClerkBridgeMock . mockReturnValue ( { cleanup : vi . fn ( ) , isPrimaryInstance : true } ) ;
241- const quit = vi . fn ( ) ;
242294 const listeners = new Map < string , ( ...args : unknown [ ] ) => void > ( ) ;
243- const revealed = Promise . withResolvers < unknown > ( ) ;
244- const window = { id : 1 } ;
295+ const received : string [ ] = [ ] ;
296+ const first = "t3code://new?prompt=first" ;
297+ const second = "t3code://threads/env-1/thread-1" ;
298+ const later = "t3code://new?prompt=later" ;
299+ const delivered = Promise . withResolvers < void > ( ) ;
245300 const electronApp = {
246- quit : Effect . sync ( quit ) ,
247- on : ( eventName : string , listener : ( ...args : unknown [ ] ) => void ) =>
301+ on : ( name : string , listener : ( ...args : unknown [ ] ) => void ) =>
248302 Effect . sync ( ( ) => {
249- listeners . set ( eventName , listener ) ;
303+ listeners . set ( name , listener ) ;
250304 } ) ,
251305 } as unknown as ElectronApp . ElectronApp [ "Service" ] ;
252- const electronWindow = {
253- currentMainOrFirst : Effect . succeedSome ( window ) ,
254- reveal : ( value : unknown ) => Effect . sync ( ( ) => revealed . resolve ( value ) ) ,
255- } as unknown as ElectronWindow . ElectronWindow [ "Service" ] ;
256306
257307 return Effect . gen ( function * ( ) {
258308 const clerk = yield * DesktopClerk . DesktopClerk ;
309+ listeners . get ( "second-instance" ) ?.( { } , [ "t3" , first ] ) ;
310+ listeners . get ( "second-instance" ) ?.( { } , [ "t3" , second ] ) ;
311+ assert . deepEqual ( received , [ ] ) ;
312+
259313 yield * clerk . configure ;
314+ listeners . get ( "second-instance" ) ! ( { } , [ "t3" , later ] ) ;
315+ yield * Effect . promise ( ( ) => delivered . promise ) ;
260316
261- assert . equal ( quit . mock . calls . length , 0 ) ;
262- listeners . get ( "second-instance" ) ! ( { } , [ "t3" ] ) ;
263- assert . strictEqual ( yield * Effect . promise ( ( ) => revealed . promise ) , window ) ;
317+ assert . deepEqual ( received , [ first , second , later ] ) ;
264318 } ) . pipe (
265319 Effect . scoped ,
266- Effect . provide ( layerDesktopClerk ( ) ) ,
320+ Effect . provide ( layerDesktopClerk ( true , [ ] , "darwin" , undefined , undefined , listeners ) ) ,
267321 Effect . provideService ( ElectronApp . ElectronApp , electronApp ) ,
268- Effect . provideService ( ElectronWindow . ElectronWindow , electronWindow ) ,
269- Effect . provideService ( DesktopWebLinks . DesktopWebLinks , ignoreWebLinks ) ,
322+ Effect . provideService (
323+ ElectronWindow . ElectronWindow ,
324+ { } as ElectronWindow . ElectronWindow [ "Service" ] ,
325+ ) ,
326+ Effect . provideService (
327+ DesktopWebLinks . DesktopWebLinks ,
328+ DesktopWebLinks . DesktopWebLinks . of ( {
329+ receive : ( url ) =>
330+ Effect . sync ( ( ) => {
331+ received . push ( url ) ;
332+ if ( url === later ) delivered . resolve ( ) ;
333+ } ) ,
334+ setRendererReady : ( ) => Effect . void ,
335+ } ) ,
336+ ) ,
270337 ) ;
271338 } ) ;
272339
@@ -339,15 +406,15 @@ it.effect(
339406 assert . equal ( event . preventDefault . mock . calls . length , 1 ) ;
340407 } ) . pipe (
341408 Effect . scoped ,
342- Effect . provide ( layerDesktopClerk ( ) ) ,
409+ Effect . provide ( layerDesktopClerk ( true , [ ] , "darwin" , undefined , undefined , listeners ) ) ,
343410 Effect . provideService ( ElectronApp . ElectronApp , electronApp ) ,
344411 Effect . provideService ( ElectronWindow . ElectronWindow , electronWindow ) ,
345412 Effect . provideService ( DesktopWebLinks . DesktopWebLinks , ignoreWebLinks ) ,
346413 ) ;
347414 } ,
348415) ;
349416
350- it . effect . each ( [ "startup" , "open-url" ] as const ) (
417+ it . effect . each ( [ "startup" , "open-url" , "early-second-instance" ] as const ) (
351418 "receives hosted web sign-in through the desktop %s handler" ,
352419 ( entry ) =>
353420 Effect . gen ( function * ( ) {
@@ -406,6 +473,9 @@ it.effect.each(["startup", "open-url"] as const)(
406473 } as unknown as ElectronApp . ElectronApp [ "Service" ] ;
407474 yield * Effect . gen ( function * ( ) {
408475 const clerk = yield * DesktopClerk . DesktopClerk ;
476+ if ( entry === "early-second-instance" ) {
477+ listeners . get ( "second-instance" ) ?.( { } , [ "t3" , link ] ) ;
478+ }
409479 yield * clerk . configure ;
410480 if ( entry === "open-url" ) {
411481 const event = { preventDefault : vi . fn ( ) } ;
@@ -418,7 +488,7 @@ it.effect.each(["startup", "open-url"] as const)(
418488 assert . strictEqual ( delivery ?. flowId , request . flowId ) ;
419489 assert . strictEqual ( delivery ?. returnUrl , request . returnUrl ) ;
420490 } ) . pipe (
421- Effect . provide ( layerDesktopClerk ( true , [ ] , "darwin" , undefined , shell ) ) ,
491+ Effect . provide ( layerDesktopClerk ( true , [ ] , "darwin" , undefined , shell , listeners ) ) ,
422492 Effect . provideService ( HostProcess . Arguments , entry === "startup" ? [ "t3" , link ] : [ "t3" ] ) ,
423493 Effect . provideService ( ElectronApp . ElectronApp , electronApp ) ,
424494 Effect . provideService (
@@ -468,7 +538,7 @@ it.effect("hands web and app links to the renderer and leaves other links alone"
468538 "t3code://threads/env-1/thread-1" ,
469539 ] ) ;
470540 } ) . pipe (
471- Effect . provide ( layerDesktopClerk ( true , [ ] , "darwin" ) ) ,
541+ Effect . provide ( layerDesktopClerk ( true , [ ] , "darwin" , undefined , undefined , listeners ) ) ,
472542 Effect . provideService ( HostProcess . Arguments , [ "t3" ] ) ,
473543 Effect . provideService ( ElectronApp . ElectronApp , electronApp ) ,
474544 Effect . provideService (
0 commit comments