File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -129,6 +129,35 @@ it.layer(NetService.layer)("NetService", (it) => {
129129 } ) ;
130130 } ) ;
131131
132+ it . effect ( "rejects missing and non-finite ports returned by the server" , ( ) =>
133+ Effect . gen ( function * ( ) {
134+ for ( const invalidPort of [ undefined , Number . NaN ] ) {
135+ const probe = NodeNet . createServer ( ) ;
136+ probe . unref = ( ( ) => probe ) as typeof probe . unref ;
137+ probe . address = ( ( ) => ( {
138+ address : "127.0.0.1" ,
139+ family : "IPv4" ,
140+ port : invalidPort ,
141+ } ) ) as unknown as typeof probe . address ;
142+ probe . listen = ( ( _port : number , _host : string , listeningListener : ( ) => void ) => {
143+ listeningListener ( ) ;
144+ return probe ;
145+ } ) as typeof probe . listen ;
146+ probe . close = ( ( callback ?: ( cause ?: Error ) => void ) => {
147+ callback ?.( ) ;
148+ return probe ;
149+ } ) as typeof probe . close ;
150+ const net = NetService . make ( { createServer : ( ) => probe } ) ;
151+
152+ const error = yield * net . reserveLoopbackPort ( ) . pipe ( Effect . flip ) ;
153+
154+ assert ( isLoopbackPortAddressUnavailableError ( error ) ) ;
155+ assert . equal ( error . port , null ) ;
156+ assert . equal ( "cause" in error , false ) ;
157+ }
158+ } ) ,
159+ ) ;
160+
132161 it . effect ( "isPortAvailableOnLoopback reports false for an occupied port" , ( ) =>
133162 Effect . acquireUseRelease (
134163 openServer ( "127.0.0.1" ) ,
Original file line number Diff line number Diff line change @@ -237,7 +237,10 @@ export const make = (
237237 ? {
238238 address : address . address ,
239239 family : address . family ,
240- port : address . port ,
240+ port :
241+ typeof address . port === "number" && Number . isFinite ( address . port )
242+ ? address . port
243+ : null ,
241244 }
242245 : {
243246 address,
@@ -247,7 +250,8 @@ export const make = (
247250 addressDetails = resolvedAddressDetails ;
248251
249252 probe . close ( ( cause ) => {
250- if ( resolvedAddressDetails . port === null || resolvedAddressDetails . port <= 0 ) {
253+ const port = resolvedAddressDetails . port ;
254+ if ( port === null || ! Number . isInteger ( port ) || port <= 0 || port > 65_535 ) {
251255 settle (
252256 Effect . fail (
253257 new LoopbackPortAddressUnavailableError ( {
@@ -264,14 +268,14 @@ export const make = (
264268 Effect . fail (
265269 new LoopbackPortReleaseError ( {
266270 host,
267- port : resolvedAddressDetails . port ,
271+ port,
268272 cause,
269273 } ) ,
270274 ) ,
271275 ) ;
272276 return ;
273277 }
274- settle ( Effect . succeed ( resolvedAddressDetails . port ) ) ;
278+ settle ( Effect . succeed ( port ) ) ;
275279 } ) ;
276280 } ) ;
277281 } catch ( cause ) {
You can’t perform that action at this time.
0 commit comments