@@ -425,17 +425,36 @@ server.listen(Number(flag("--port")), "127.0.0.1", () => {
425425 }
426426 } ) ,
427427 ) ;
428- const launch = ( stateKey : string ) =>
428+ const launch = (
429+ stateKey : string ,
430+ gate ?: {
431+ readonly onLine : ( line : string ) => Effect . Effect < void > ;
432+ readonly release : Effect . Effect < void > ;
433+ } ,
434+ ) =>
429435 Effect . gen ( function * ( ) {
430436 const child = yield * spawner . spawn (
431437 ChildProcess . make ( "sh" , [ launchScript , stateKey ] , {
438+ ...( gate
439+ ? {
440+ stdin : Stream . fromEffect (
441+ gate . release . pipe ( Effect . as ( new TextEncoder ( ) . encode ( "go\n" ) ) ) ,
442+ ) ,
443+ }
444+ : { } ) ,
432445 env : { PATH : process . env . PATH ?? "" , HOME : home } ,
433446 extendEnv : false ,
434447 } ) ,
435448 ) ;
436449 const [ stdout , stderr , exitCode ] = yield * Effect . all (
437450 [
438- child . stdout . pipe ( Stream . decodeText ( ) , Stream . mkString ) ,
451+ child . stdout . pipe (
452+ Stream . decodeText ( ) ,
453+ Stream . splitLines ,
454+ Stream . tap ( ( line ) => gate ?. onLine ( line ) ?? Effect . void ) ,
455+ Stream . map ( ( line ) => `${ line } \n` ) ,
456+ Stream . mkString ,
457+ ) ,
439458 child . stderr . pipe ( Stream . decodeText ( ) , Stream . mkString ) ,
440459 child . exitCode ,
441460 ] ,
@@ -449,7 +468,7 @@ server.listen(Number(flag("--port")), "127.0.0.1", () => {
449468 serverKind : string ;
450469 } ;
451470 } ) ;
452- return { fs, stateDir, readManagedPid, launch } ;
471+ return { fs, stateDir, readManagedPid, launch, launchScript } ;
453472 } ) ;
454473
455474 it . live ( "keeps managing its server after the connection's state key changes" , ( ) =>
@@ -474,6 +493,57 @@ server.listen(Number(flag("--port")), "127.0.0.1", () => {
474493 } ) . pipe ( Effect . scoped , Effect . provide ( NodeServices . layer ) ) ,
475494 ) ;
476495
496+ it . live ( "serializes two aliases claiming the same managed server" , ( ) =>
497+ Effect . gen ( function * ( ) {
498+ const { fs, stateDir, readManagedPid, launch, launchScript } = yield * prepareLaunch ;
499+ const launched = yield * launch ( "old-alias" ) ;
500+ const pid = yield * readManagedPid ( "old-alias" ) ;
501+ const firstAtTransfer = yield * Deferred . make < void > ( ) ;
502+ const secondProgress = yield * Deferred . make < "waiting" | "transferring" > ( ) ;
503+ const releaseFirst = yield * Deferred . make < void > ( ) ;
504+ const releaseSecond = yield * Deferred . make < void > ( ) ;
505+ const script = yield * fs . readFileString ( launchScript ) ;
506+ // Report lock contention while the first transfer is held, so the race
507+ // does not depend on subprocess scheduling.
508+ yield * fs . writeFileString (
509+ launchScript ,
510+ script
511+ . replace (
512+ 'if cmp -s "$PREVIOUS_STATE_DIR/active-runner.sh" "$RUNNER_FILE"; then' ,
513+ 'printf "transferring\\n"; read -r release; if cmp -s "$PREVIOUS_STATE_DIR/active-runner.sh" "$RUNNER_FILE"; then' ,
514+ )
515+ . replace (
516+ ' if [ "$LOCK_WAIT_COUNT" -ge 200 ]; then' ,
517+ ' printf "waiting\\n"; if [ "$LOCK_WAIT_COUNT" -ge 200 ]; then' ,
518+ ) ,
519+ ) ;
520+ const first = yield * launch ( "first-alias" , {
521+ onLine : ( line ) =>
522+ line === "transferring"
523+ ? Deferred . succeed ( firstAtTransfer , undefined ) . pipe ( Effect . asVoid )
524+ : Effect . void ,
525+ release : Deferred . await ( releaseFirst ) ,
526+ } ) . pipe ( Effect . forkScoped ) ;
527+ yield * Deferred . await ( firstAtTransfer ) ;
528+ const second = yield * launch ( "second-alias" , {
529+ onLine : ( line ) =>
530+ line === "waiting" || line === "transferring"
531+ ? Deferred . succeed ( secondProgress , line ) . pipe ( Effect . asVoid )
532+ : Effect . void ,
533+ release : Deferred . await ( releaseSecond ) ,
534+ } ) . pipe ( Effect . forkScoped ) ;
535+ assert . equal ( yield * Deferred . await ( secondProgress ) , "waiting" ) ;
536+ yield * Deferred . succeed ( releaseFirst , undefined ) ;
537+ assert . deepEqual ( yield * Fiber . join ( first ) , launched ) ;
538+ yield * Deferred . succeed ( releaseSecond , undefined ) ;
539+ assert . deepEqual ( yield * Fiber . join ( second ) , launched ) ;
540+ assert . equal ( yield * readManagedPid ( "second-alias" ) , pid ) ;
541+ assert . isFalse ( yield * fs . exists ( `${ stateDir ( "first-alias" ) } /pid` ) ) ;
542+ assert . isFalse ( yield * fs . exists ( `${ stateDir ( "old-alias" ) } /pid` ) ) ;
543+ assert . isTrue ( isAlive ( pid ) ) ;
544+ } ) . pipe ( Effect . scoped , Effect . provide ( NodeServices . layer ) ) ,
545+ ) ;
546+
477547 it . live ( "does not take over a server whose recorded process identity differs" , ( ) =>
478548 Effect . gen ( function * ( ) {
479549 const { fs, stateDir, readManagedPid, launch } = yield * prepareLaunch ;
0 commit comments