@@ -405,27 +405,37 @@ it.layer(NodeServices.layer)("pruning runtimes on start", (it) => {
405405 } ) ,
406406 } ) ;
407407
408- const pruneFrom = Effect . fn ( function * ( executable : "own runtime" | "elsewhere" ) {
408+ const pruneOnStart = Effect . fn ( "test.prune_on_start" ) ( function * ( input : {
409+ readonly executable : "own runtime" | "elsewhere" ;
410+ readonly managed ?: boolean ;
411+ readonly symlinkedHome ?: boolean ;
412+ } ) {
409413 const fs = yield * FileSystem . FileSystem ;
410414 const path = yield * Path . Path ;
411- const baseDir = yield * fs . makeTempDirectoryScoped ( { prefix : "t3-prune-on-start-" } ) ;
415+ const tempDir = yield * fs . makeTempDirectoryScoped ( { prefix : "t3-prune-on-start-" } ) ;
416+ const realHome = path . join ( tempDir , "home" ) ;
417+ const baseDir = input . symlinkedHome ? path . join ( tempDir , "linked-home" ) : realHome ;
412418 const versionsDir = path . join ( baseDir , "runtime" , "versions" ) ;
413419 yield * TestClock . setTime ( 24 * 60 * 60 * 1000 ) ;
414420 for ( const version of [ staleVersion , packageJson . version ] ) {
415- const directory = path . join ( versionsDir , version ) ;
421+ const directory = path . join ( realHome , "runtime" , "versions" , version ) ;
416422 yield * fs . makeDirectory ( directory , { recursive : true } ) ;
417423 yield * fs . writeFileString ( path . join ( directory , "t3" ) , "" ) ;
418424 const sentinel = path . join ( directory , ".install-complete" ) ;
419425 yield * fs . writeFileString ( sentinel , `${ version } \n` ) ;
420426 yield * fs . utimes ( sentinel , 0 , 0 ) ;
421427 }
422- const removed = yield * ServerSelfUpdate . pruneRuntimesOnStart ( { baseDir, managed : false } ) . pipe (
423- Effect . provideService (
424- HostProcess . ExecutablePath ,
425- executable === "own runtime"
426- ? path . join ( versionsDir , packageJson . version , "t3" )
427- : "/usr/local/bin/node" ,
428- ) ,
428+ if ( input . symlinkedHome ) yield * fs . symlink ( realHome , baseDir ) ;
429+ // Like `process.execPath`, the running runtime is reported by its real path.
430+ const executablePath =
431+ input . executable === "own runtime"
432+ ? yield * fs . realPath ( path . join ( versionsDir , packageJson . version , "t3" ) )
433+ : "/usr/local/bin/node" ;
434+ const removed = yield * ServerSelfUpdate . pruneRuntimesOnStart ( {
435+ baseDir,
436+ managed : input . managed ?? false ,
437+ } ) . pipe (
438+ Effect . provideService ( HostProcess . ExecutablePath , executablePath ) ,
429439 Effect . provideService ( HostProcess . Platform , "darwin" ) ,
430440 Effect . provideService ( HostProcess . Environment , { } ) ,
431441 Effect . provideService ( ProcessRunner . ProcessRunner , otherProcesses ) ,
@@ -436,15 +446,29 @@ it.layer(NodeServices.layer)("pruning runtimes on start", (it) => {
436446 // The SSH launcher runs `t3 serve` straight from the pinned runtime, with no boot service.
437447 it . effect ( "prunes for a server started from its home's pinned runtime" , ( ) =>
438448 Effect . gen ( function * ( ) {
439- const { removed, remaining } = yield * pruneFrom ( "own runtime" ) ;
449+ const { removed, remaining } = yield * pruneOnStart ( { executable : "own runtime" } ) ;
440450 expect ( removed ) . toEqual ( [ staleVersion ] ) ;
441451 expect ( remaining ) . toEqual ( [ packageJson . version ] ) ;
442452 } ) ,
443453 ) ;
444454
455+ it . effect ( "recognizes its runtime through a symlinked T3 home" , ( ) =>
456+ Effect . gen ( function * ( ) {
457+ const { removed } = yield * pruneOnStart ( { executable : "own runtime" , symlinkedHome : true } ) ;
458+ expect ( removed ) . toEqual ( [ staleVersion ] ) ;
459+ } ) ,
460+ ) ;
461+
462+ it . effect ( "prunes for a boot-service server wherever it runs from" , ( ) =>
463+ Effect . gen ( function * ( ) {
464+ const { removed } = yield * pruneOnStart ( { executable : "elsewhere" , managed : true } ) ;
465+ expect ( removed ) . toEqual ( [ staleVersion ] ) ;
466+ } ) ,
467+ ) ;
468+
445469 it . effect ( "leaves runtimes alone for an unmanaged server started elsewhere" , ( ) =>
446470 Effect . gen ( function * ( ) {
447- const { removed, remaining } = yield * pruneFrom ( "elsewhere" ) ;
471+ const { removed, remaining } = yield * pruneOnStart ( { executable : "elsewhere" } ) ;
448472 expect ( removed ) . toEqual ( [ ] ) ;
449473 expect ( remaining ) . toEqual ( [ staleVersion , packageJson . version ] . toSorted ( ) ) ;
450474 } ) ,
0 commit comments