11import { spawn } from 'node:child_process'
22import { existsSync , readFileSync , rmSync , writeFileSync } from 'node:fs'
3+ import { createServer } from 'node:net'
34import { resolve } from 'node:path'
45import { expect , test } from '@playwright/test'
5- import { getTestServerPort } from '@tanstack/router-e2e-utils'
6- import packageJson from '../package.json' with { type : 'json' }
76import type { ChildProcess } from 'node:child_process'
87import type { Page , Request } from '@playwright/test'
98
@@ -33,6 +32,71 @@ interface ServerFnRequest {
3332interface DevServer {
3433 child : ChildProcess
3534 logs : Array < string >
35+ port : number
36+ }
37+
38+ let navigationId = 0
39+
40+ async function delay ( ms : number ) : Promise < void > {
41+ await new Promise ( ( resolve ) => setTimeout ( resolve , ms ) )
42+ }
43+
44+ async function getAvailablePort ( ) : Promise < number > {
45+ return await new Promise ( ( resolvePromise , reject ) => {
46+ const server = createServer ( )
47+
48+ server . unref ( )
49+ server . once ( 'error' , reject )
50+ server . listen ( 0 , '127.0.0.1' , ( ) => {
51+ const address = server . address ( )
52+
53+ if ( ! address || typeof address === 'string' ) {
54+ server . close ( ( ) => reject ( new Error ( 'Could not allocate a port' ) ) )
55+ return
56+ }
57+
58+ const { port } = address
59+ server . close ( ( error ) => {
60+ if ( error ) {
61+ reject ( error )
62+ return
63+ }
64+
65+ resolvePromise ( port )
66+ } )
67+ } )
68+ } )
69+ }
70+
71+ async function canListen ( port : number ) : Promise < boolean > {
72+ return await new Promise ( ( resolvePromise ) => {
73+ const server = createServer ( )
74+
75+ const finish = ( value : boolean ) => {
76+ server . removeAllListeners ( )
77+ resolvePromise ( value )
78+ }
79+
80+ server . unref ( )
81+ server . once ( 'error' , ( ) => finish ( false ) )
82+ server . listen ( port , '127.0.0.1' , ( ) => {
83+ server . close ( ( error ) => finish ( ! error ) )
84+ } )
85+ } )
86+ }
87+
88+ async function waitForPortAvailable ( port : number ) : Promise < void > {
89+ const start = Date . now ( )
90+
91+ while ( Date . now ( ) - start < 10_000 ) {
92+ if ( await canListen ( port ) ) {
93+ return
94+ }
95+
96+ await delay ( 100 )
97+ }
98+
99+ throw new Error ( `Timed out waiting for port ${ port } to be released` )
36100}
37101
38102function startRsbuildDevServer (
@@ -42,7 +106,7 @@ function startRsbuildDevServer(
42106 const logs : Array < string > = [ ]
43107 const child = spawn (
44108 'pnpm' ,
45- [ 'exec' , 'rsbuild' , 'dev' , '--port' , String ( port ) ] ,
109+ [ 'exec' , 'rsbuild' , 'dev' , '--host' , '127.0.0.1' , '-- port', String ( port ) ] ,
46110 {
47111 cwd : appDir ,
48112 detached : true ,
@@ -60,7 +124,7 @@ function startRsbuildDevServer(
60124 child . stdout ?. on ( 'data' , ( chunk : Buffer ) => logs . push ( chunk . toString ( ) ) )
61125 child . stderr ?. on ( 'data' , ( chunk : Buffer ) => logs . push ( chunk . toString ( ) ) )
62126
63- return { child, logs }
127+ return { child, logs, port }
64128}
65129
66130function killDevServer ( devServer : DevServer , signal : NodeJS . Signals ) {
@@ -100,7 +164,7 @@ async function waitForHttpOk(devServer: DevServer, url: string): Promise<void> {
100164 // Wait until the dev server starts accepting requests.
101165 }
102166
103- await new Promise ( ( resolve ) => setTimeout ( resolve , 250 ) )
167+ await delay ( 250 )
104168 }
105169
106170 throw new Error (
@@ -152,6 +216,8 @@ async function stopDevServer(devServer: DevServer): Promise<void> {
152216 doneTimer = setTimeout ( done , 500 )
153217 } , 3000 )
154218 } )
219+
220+ await waitForPortAvailable ( devServer . port )
155221}
156222
157223async function waitForRetry < T > (
@@ -173,7 +239,7 @@ async function waitForRetry<T>(
173239 return await action ( )
174240 } catch ( error ) {
175241 lastError = error
176- await new Promise ( ( resolve ) => setTimeout ( resolve , 500 ) )
242+ await delay ( 500 )
177243 }
178244 }
179245
@@ -211,9 +277,12 @@ async function exerciseServerFunctions(
211277 baseURL : string ,
212278 expectedUsername = 'TEST' ,
213279) {
214- const response = await page . goto ( `${ baseURL } /consistent` , {
215- waitUntil : 'networkidle' ,
216- } )
280+ const response = await page . goto (
281+ `${ baseURL } /consistent?testRun=${ navigationId ++ } ` ,
282+ {
283+ waitUntil : 'networkidle' ,
284+ } ,
285+ )
217286 expect ( response ?. ok ( ) ) . toBe ( true )
218287
219288 const expectedLocator = page . getByTestId (
@@ -224,6 +293,8 @@ async function exerciseServerFunctions(
224293 )
225294 const expected = ( await expectedLocator . textContent ( ) ) || ''
226295
296+ await expect ( page . getByTestId ( 'consistent-client-hydrated' ) ) . toBeAttached ( )
297+
227298 await page . getByTestId ( 'test-consistent-server-fn-calls-btn' ) . click ( )
228299 await page . waitForLoadState ( 'networkidle' )
229300
@@ -281,8 +352,8 @@ test('rsbuild build cache warm restart keeps server function registry', async ({
281352
282353 rmSync ( cacheDir , { recursive : true , force : true } )
283354
284- const port = await getTestServerPort ( ` ${ packageJson . name } -rsbuild-cache` )
285- const baseURL = `http://localhost :${ port } `
355+ const port = await getAvailablePort ( )
356+ const baseURL = `http://127.0.0.1 :${ port } `
286357 let devServer = startRsbuildDevServer ( port )
287358
288359 try {
@@ -315,8 +386,8 @@ test('rsbuild without build cache keeps server function registry', async ({
315386
316387 rmSync ( cacheDir , { recursive : true , force : true } )
317388
318- const port = await getTestServerPort ( ` ${ packageJson . name } -rsbuild-no-cache` )
319- const baseURL = `http://localhost :${ port } `
389+ const port = await getAvailablePort ( )
390+ const baseURL = `http://127.0.0.1 :${ port } `
320391 const devServer = startRsbuildDevServer ( port , false )
321392
322393 try {
@@ -340,8 +411,8 @@ test('rsbuild watch updates and removes server function metadata', async ({
340411 const updatedSource = originalSource . replaceAll ( "'TEST'" , "'WATCH'" )
341412 rmSync ( cacheDir , { recursive : true , force : true } )
342413
343- const port = await getTestServerPort ( ` ${ packageJson . name } -rsbuild-watch` )
344- const baseURL = `http://localhost :${ port } `
414+ const port = await getAvailablePort ( )
415+ const baseURL = `http://127.0.0.1 :${ port } `
345416 const devServer = startRsbuildDevServer ( port )
346417
347418 try {
0 commit comments