1+ // @effect -diagnostics nodeBuiltinImport:off -- replace the native OS lookup and sync its ESM bindings.
2+ import * as NodeModule from "node:module" ;
3+ import type * as NodeOS from "node:os" ;
14import { it } from "@effect/vitest" ;
25import * as HostProcess from "@t3tools/shared/HostProcess" ;
36import * as NetService from "@t3tools/shared/Net" ;
@@ -7,10 +10,17 @@ import * as Sink from "effect/Sink";
710import * as Stream from "effect/Stream" ;
811import * as ChildProcess from "effect/process/ChildProcess" ;
912import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner" ;
10- import { describe , expect } from "vite-plus/test" ;
13+ import { afterEach , describe , expect , vi } from "vite-plus/test" ;
1114
1215import * as RemoteOpenTargets from "./RemoteOpenTargets.ts" ;
1316
17+ const mutableOs = NodeModule . createRequire ( import . meta. url ) ( "node:os" ) as typeof NodeOS ;
18+
19+ afterEach ( ( ) => {
20+ vi . restoreAllMocks ( ) ;
21+ NodeModule . syncBuiltinESMExports ( ) ;
22+ } ) ;
23+
1424const encoder = new TextEncoder ( ) ;
1525
1626const TAILSCALE_STATUS_JSON = JSON . stringify ( {
@@ -59,8 +69,11 @@ const resolveTargets = (input: {
5969 readonly sshd : { readonly ipv4 : boolean ; readonly ipv6 : boolean } ;
6070 readonly tailscale : { readonly status : CommandResult ; readonly prefs : CommandResult } ;
6171 readonly hostname : string ;
62- } ) =>
63- Effect . flatMap ( RemoteOpenTargets . RemoteOpenTargets , ( service ) => service . resolveTargets ( ) ) . pipe (
72+ readonly username ?: string | null ;
73+ } ) => {
74+ const resolve = Effect . flatMap ( RemoteOpenTargets . RemoteOpenTargets , ( service ) =>
75+ service . resolveTargets ( ) ,
76+ ) . pipe (
6477 Effect . provideService ( HostProcess . Hostname , input . hostname ) ,
6578 Effect . provide (
6679 RemoteOpenTargets . layer . pipe (
@@ -69,6 +82,11 @@ const resolveTargets = (input: {
6982 ) ,
7083 ) ;
7184
85+ return input . username === undefined
86+ ? resolve
87+ : resolve . pipe ( Effect . provideService ( HostProcess . Username , input . username ) ) ;
88+ } ;
89+
7290const prefsJson = ( prefs : { readonly RunSSH : boolean ; readonly WantRunning : boolean } ) => ( {
7391 exitCode : 0 ,
7492 stdout : JSON . stringify (
@@ -90,6 +108,7 @@ describe("RemoteOpenTargets", () => {
90108 sshd : { ipv4 : false , ipv6 : false } ,
91109 tailscale : TAILSCALE_UP ,
92110 hostname : "bb-1" ,
111+ username : "t3-user" ,
93112 } ) ;
94113 expect ( targets ) . toEqual ( [ ] ) ;
95114 } ) ,
@@ -101,8 +120,11 @@ describe("RemoteOpenTargets", () => {
101120 sshd : { ipv4 : false , ipv6 : false } ,
102121 tailscale : TAILSCALE_SSH ,
103122 hostname : "bb-1" ,
123+ username : "t3-user" ,
104124 } ) ;
105- expect ( targets ) . toEqual ( [ { kind : "tailscale" , host : "bb-1.tail1234.ts.net" } ] ) ;
125+ expect ( targets ) . toEqual ( [
126+ { kind : "tailscale" , host : "bb-1.tail1234.ts.net" , username : "t3-user" } ,
127+ ] ) ;
106128 } ) ,
107129 ) ;
108130
@@ -112,6 +134,7 @@ describe("RemoteOpenTargets", () => {
112134 sshd : { ipv4 : false , ipv6 : false } ,
113135 tailscale : { status : STATUS_UP , prefs : prefsJson ( { RunSSH : true , WantRunning : false } ) } ,
114136 hostname : "bb-1" ,
137+ username : null ,
115138 } ) ;
116139 expect ( targets ) . toEqual ( [ ] ) ;
117140 } ) ,
@@ -123,10 +146,11 @@ describe("RemoteOpenTargets", () => {
123146 sshd : { ipv4 : true , ipv6 : true } ,
124147 tailscale : TAILSCALE_UP ,
125148 hostname : "bb-1" ,
149+ username : "t3-user" ,
126150 } ) ;
127151 expect ( targets ) . toEqual ( [
128- { kind : "tailscale" , host : "bb-1.tail1234.ts.net" } ,
129- { kind : "mdns" , host : "bb-1.local" } ,
152+ { kind : "tailscale" , host : "bb-1.tail1234.ts.net" , username : "t3-user" } ,
153+ { kind : "mdns" , host : "bb-1.local" , username : "t3-user" } ,
130154 ] ) ;
131155 } ) ,
132156 ) ;
@@ -137,8 +161,9 @@ describe("RemoteOpenTargets", () => {
137161 sshd : { ipv4 : false , ipv6 : true } ,
138162 tailscale : TAILSCALE_DOWN ,
139163 hostname : "bb-1" ,
164+ username : "t3-user" ,
140165 } ) ;
141- expect ( targets ) . toEqual ( [ { kind : "mdns" , host : "bb-1.local" } ] ) ;
166+ expect ( targets ) . toEqual ( [ { kind : "mdns" , host : "bb-1.local" , username : "t3-user" } ] ) ;
142167 } ) ,
143168 ) ;
144169
@@ -148,8 +173,9 @@ describe("RemoteOpenTargets", () => {
148173 sshd : { ipv4 : true , ipv6 : false } ,
149174 tailscale : TAILSCALE_DOWN ,
150175 hostname : "bb-1" ,
176+ username : "t3-user" ,
151177 } ) ;
152- expect ( targets ) . toEqual ( [ { kind : "mdns" , host : "bb-1.local" } ] ) ;
178+ expect ( targets ) . toEqual ( [ { kind : "mdns" , host : "bb-1.local" , username : "t3-user" } ] ) ;
153179 } ) ,
154180 ) ;
155181
@@ -159,8 +185,28 @@ describe("RemoteOpenTargets", () => {
159185 sshd : { ipv4 : true , ipv6 : true } ,
160186 tailscale : TAILSCALE_DOWN ,
161187 hostname : "bb-1.example.com" ,
188+ username : "t3-user" ,
189+ } ) ;
190+ expect ( targets ) . toEqual ( [ { kind : "mdns" , host : "bb-1.local" , username : "t3-user" } ] ) ;
191+ } ) ,
192+ ) ;
193+
194+ it . effect ( "still advertises hostname targets when the OS login lookup fails" , ( ) =>
195+ Effect . gen ( function * ( ) {
196+ const userInfo = vi . spyOn ( mutableOs , "userInfo" ) . mockImplementation ( ( ) => {
197+ throw new Error ( "No passwd entry for this UID" ) ;
162198 } ) ;
163- expect ( targets ) . toEqual ( [ { kind : "mdns" , host : "bb-1.local" } ] ) ;
199+ NodeModule . syncBuiltinESMExports ( ) ;
200+ const targets = yield * resolveTargets ( {
201+ sshd : { ipv4 : true , ipv6 : true } ,
202+ tailscale : TAILSCALE_UP ,
203+ hostname : "bb-1" ,
204+ } ) ;
205+ expect ( userInfo ) . toHaveBeenCalled ( ) ;
206+ expect ( targets ) . toEqual ( [
207+ { kind : "tailscale" , host : "bb-1.tail1234.ts.net" } ,
208+ { kind : "mdns" , host : "bb-1.local" } ,
209+ ] ) ;
164210 } ) ,
165211 ) ;
166212} ) ;
0 commit comments