@@ -53,17 +53,28 @@ const layerSpawner = (input: { readonly status: CommandResult; readonly prefs: C
5353 } ) ,
5454 ) ;
5555
56- const layerNet = ( input : { readonly ipv4 : boolean ; readonly ipv6 : boolean } ) =>
56+ const layerNet = ( input : {
57+ readonly ipv4 : boolean ;
58+ readonly ipv6 : boolean ;
59+ readonly tailnet ?: boolean ;
60+ } ) =>
5761 Layer . succeed ( NetService . NetService , {
5862 canListenOnHost : ( ) => Effect . succeed ( true ) ,
5963 isPortAvailableOnLoopback : ( ) => Effect . succeed ( true ) ,
60- hasListenerOnHost : ( _port , host ) => Effect . succeed ( host === "::1" ? input . ipv6 : input . ipv4 ) ,
64+ hasListenerOnHost : ( _port , host ) =>
65+ Effect . succeed (
66+ host === "127.0.0.1"
67+ ? input . ipv4
68+ : host === "::1"
69+ ? input . ipv6
70+ : ( host === "100.64.1.2" || host === "bb-1.tail1234.ts.net" ) && input . tailnet === true ,
71+ ) ,
6172 reserveLoopbackPort : ( ) => Effect . succeed ( 40_000 ) ,
6273 findAvailablePort : ( preferred ) => Effect . succeed ( preferred ) ,
6374 } ) ;
6475
6576const resolveTargets = ( input : {
66- readonly sshd : { readonly ipv4 : boolean ; readonly ipv6 : boolean } ;
77+ readonly sshd : { readonly ipv4 : boolean ; readonly ipv6 : boolean ; readonly tailnet ?: boolean } ;
6778 readonly tailscale : { readonly status : CommandResult ; readonly prefs : CommandResult } ;
6879 readonly hostname : string ;
6980 readonly username ?: string | null ;
@@ -125,6 +136,20 @@ describe("RemoteOpenTargets", () => {
125136 } ) ,
126137 ) ;
127138
139+ it . effect ( "advertises the tailnet name when sshd listens only on the tailnet address" , ( ) =>
140+ Effect . gen ( function * ( ) {
141+ const targets = yield * resolveTargets ( {
142+ sshd : { ipv4 : false , ipv6 : false , tailnet : true } ,
143+ tailscale : TAILSCALE_UP ,
144+ hostname : "bb-1" ,
145+ username : "t3-user" ,
146+ } ) ;
147+ expect ( targets ) . toEqual ( [
148+ { kind : "tailscale" , host : "bb-1.tail1234.ts.net" , username : "t3-user" } ,
149+ ] ) ;
150+ } ) ,
151+ ) ;
152+
128153 it . effect ( "ignores a stored RunSSH after `tailscale down`" , ( ) =>
129154 Effect . gen ( function * ( ) {
130155 const targets = yield * resolveTargets ( {
0 commit comments