@@ -22,7 +22,7 @@ import * as Path from "effect/Path";
2222import * as Schema from "effect/Schema" ;
2323import * as Scope from "effect/Scope" ;
2424import * as Stream from "effect/Stream" ;
25- import { HttpClient } from "effect/http" ;
25+ import * as HttpClient from "effect/http/HttpClient " ;
2626import * as HttpClientResponse from "effect/http/HttpClientResponse" ;
2727import { ChildProcess , ChildProcessSpawner } from "effect/process" ;
2828
@@ -167,6 +167,10 @@ const RemotePairingResult = Schema.Struct({
167167 credential : Schema . String ,
168168} ) ;
169169
170+ const RemotePairingServerDescriptor = Schema . Struct ( {
171+ serverVersion : Schema . String ,
172+ } ) ;
173+
170174const decodeRemoteLaunchResult = Schema . decodeEffect ( fromLenientJson ( RemoteLaunchResult ) ) ;
171175const decodeRemotePairingResult = Schema . decodeEffect ( fromLenientJson ( RemotePairingResult ) ) ;
172176
@@ -880,23 +884,23 @@ const resolveRemotePairingRunner = Effect.fn("ssh/tunnel.resolveRemotePairingRun
880884 if ( isNodeScriptRunner ( runner ) ) {
881885 return runner ;
882886 }
883- const descriptor = yield * HttpClient . get (
884- new URL ( "/.well-known/t3/environment" , httpBaseUrl ) . toString ( ) ,
885- ) . pipe (
886- Effect . flatMap ( HttpClientResponse . filterStatusOk ) ,
887- Effect . flatMap (
888- HttpClientResponse . schemaBodyJson ( Schema . Struct ( { serverVersion : Schema . String } ) ) ,
889- ) ,
890- Effect . timeout ( SSH_READY_TIMEOUT_MS ) ,
891- Effect . mapError (
892- ( cause ) =>
893- new SshPairingError ( {
894- message : "Failed to discover the running SSH server version for pairing." ,
895- stdout : "" ,
896- cause,
897- } ) ,
898- ) ,
899- ) ;
887+ const client = HttpClient . withScope ( yield * HttpClient . HttpClient ) ;
888+ const descriptor = yield * client
889+ . get ( new URL ( "/.well-known/t3/environment" , httpBaseUrl ) . toString ( ) )
890+ . pipe (
891+ Effect . flatMap ( HttpClientResponse . filterStatusOk ) ,
892+ Effect . flatMap ( HttpClientResponse . schemaBodyJson ( RemotePairingServerDescriptor ) ) ,
893+ Effect . scoped ,
894+ Effect . timeout ( SSH_READY_TIMEOUT_MS ) ,
895+ Effect . mapError (
896+ ( cause ) =>
897+ new SshPairingError ( {
898+ message : "Failed to discover the running SSH server version for pairing." ,
899+ stdout : "" ,
900+ cause,
901+ } ) ,
902+ ) ,
903+ ) ;
900904 if ( ! EXACT_ARCHIVE_VERSION . test ( descriptor . serverVersion ) ) {
901905 return yield * new SshPairingError ( {
902906 message : "The running SSH server did not report a valid release version for pairing." ,
@@ -1764,18 +1768,17 @@ const makeSshEnvironmentManager = Effect.fn("ssh/tunnel.SshEnvironmentManager.ma
17641768 key ,
17651769 Effect . gen ( function * ( ) {
17661770 const entry = yield * ensureTunnelEntry ( key , resolvedTarget , runner ) ;
1767- const pairingRunner = requestOptions ?. issuePairingToken
1768- ? yield * resolveRemotePairingRunner ( entry . httpBaseUrl , runner )
1769- : runner ;
1770- const pairingResult = requestOptions ?. issuePairingToken
1771- ? yield * runWithSshAuth ( {
1772- key,
1773- target : entry . target ,
1774- operation : ( authOptions ) =>
1775- issueRemotePairingToken ( entry . target , authOptions , pairingRunner ) ,
1776- } )
1777- : null ;
1778- const pairingToken = pairingResult ?. credential ?? null ;
1771+ let pairingToken : string | null = null ;
1772+ if ( requestOptions ?. issuePairingToken ) {
1773+ const pairingRunner = yield * resolveRemotePairingRunner ( entry . httpBaseUrl , runner ) ;
1774+ const pairingResult = yield * runWithSshAuth ( {
1775+ key,
1776+ target : entry . target ,
1777+ operation : ( authOptions ) =>
1778+ issueRemotePairingToken ( entry . target , authOptions , pairingRunner ) ,
1779+ } ) ;
1780+ pairingToken = pairingResult . credential ;
1781+ }
17791782
17801783 yield * Effect . logInfo ( "ssh.environment.ensure.succeeded" , {
17811784 ...sshTargetLogFields ( entry . target ) ,
0 commit comments