@@ -12,6 +12,7 @@ import * as Clock from "effect/Clock";
1212import * as Deferred from "effect/Deferred" ;
1313import * as Duration from "effect/Duration" ;
1414import * as Effect from "effect/Effect" ;
15+ import * as Exit from "effect/Exit" ;
1516import * as Fiber from "effect/Fiber" ;
1617import * as FileSystem from "effect/FileSystem" ;
1718import * as Layer from "effect/Layer" ;
@@ -701,18 +702,27 @@ describe("ssh tunnel scripts", () => {
701702 } ) ,
702703 ) ;
703704
704- it . effect ( "closes every local tunnel without stopping the remote servers" , ( ) =>
705+ it . effect ( "closes connected and connecting local tunnels without stopping remote servers" , ( ) =>
705706 Effect . gen ( function * ( ) {
706- let tunnelKills = 0 ;
707+ const killedTunnels = new Set < string > ( ) ;
708+ const connectingTunnelSpawned = yield * Deferred . make < void > ( ) ;
707709 let remoteStops = 0 ;
710+ let nextLocalPort = 41_773 ;
711+ const connectingPort = 41_774 ;
708712 const spawner = ChildProcessSpawner . make ( ( command ) =>
709- Effect . sync ( ( ) => {
713+ Effect . gen ( function * ( ) {
710714 const args = commandArgs ( command ) ;
711715 if ( args . includes ( "-G" ) ) return makeSuccessfulProcess ( "" ) ;
712716 if ( args . includes ( "-N" ) ) {
713- return makeRunningProcess ( ( ) => {
714- tunnelKills += 1 ;
715- } ) ;
717+ const host = args . at ( - 1 ) ?? "" ;
718+ if ( args . includes ( `${ connectingPort } :127.0.0.1:3773` ) ) {
719+ yield * Deferred . succeed ( connectingTunnelSpawned , undefined ) ;
720+ }
721+ // Like the real spawner, closing the spawn scope kills the process.
722+ return yield * Effect . acquireRelease (
723+ Effect . succeed ( makeRunningProcess ( ( ) => killedTunnels . add ( host ) ) ) ,
724+ ( tunnel ) => tunnel . kill ( ) . pipe ( Effect . ignore ) ,
725+ ) ;
716726 }
717727 if ( args . some ( ( arg , index ) => arg === "-s" && args [ index + 1 ] === "--" ) ) {
718728 return makeSuccessfulProcess ( '{"remotePort":3773}\n' ) ;
@@ -726,24 +736,39 @@ describe("ssh tunnel scripts", () => {
726736 NodeCrypto . layer ,
727737 Layer . succeed ( ChildProcessSpawner . ChildProcessSpawner , spawner ) ,
728738 Layer . succeed ( HttpClient . HttpClient , testHttpClient ) ,
729- Layer . succeed ( NetService . NetService , testNetService ) ,
739+ Layer . succeed (
740+ NetService . NetService ,
741+ NetService . NetService . of ( {
742+ ...testNetService ,
743+ reserveLoopbackPort : ( ) => Effect . sync ( ( ) => nextLocalPort ++ ) ,
744+ hasListenerOnHost : ( port ) => Effect . succeed ( port !== connectingPort ) ,
745+ } ) ,
746+ ) ,
730747 SshAuth . SshPasswordPrompt . disabledLayer ,
731748 SshTunnel . SshEnvironmentManager . layer ( { resolveCliRunner : Effect . succeed ( ARCHIVE ) } ) ,
732749 ) ;
733750 yield * Effect . gen ( function * ( ) {
734751 const manager = yield * SshTunnel . SshEnvironmentManager ;
735- for ( const host of [ "devbox" , "other" ] ) {
736- yield * manager . ensureEnvironment ( {
737- alias : host ,
738- hostname : host ,
752+ yield * manager . ensureEnvironment ( {
753+ alias : "devbox" ,
754+ hostname : "devbox" ,
755+ username : null ,
756+ port : null ,
757+ } ) ;
758+ const connecting = yield * Effect . forkChild (
759+ manager . ensureEnvironment ( {
760+ alias : "other" ,
761+ hostname : "other" ,
739762 username : null ,
740763 port : null ,
741- } ) ;
742- }
764+ } ) ,
765+ ) ;
766+ yield * Deferred . await ( connectingTunnelSpawned ) ;
743767
744768 yield * manager . closeLocalTunnels ( ) ;
745769
746- assert . equal ( tunnelKills , 2 ) ;
770+ assert . isTrue ( Exit . isFailure ( yield * Fiber . await ( connecting ) ) ) ;
771+ assert . deepEqual ( [ ...killedTunnels ] . sort ( ) , [ "devbox" , "other" ] ) ;
747772 assert . equal ( remoteStops , 0 ) ;
748773 } ) . pipe ( Effect . provide ( layer ) , Effect . scoped ) ;
749774 } ) ,
0 commit comments