@@ -211,6 +211,7 @@ interface ServerTab {
211211 loading : boolean ;
212212 closing : boolean ;
213213 recording : Recording | null ;
214+ initialNavigation : Promise < void > | null ;
214215 /** The latest queued start, so a stop can find a recording still starting. */
215216 recordingStart : Promise < Recording > | null ;
216217 /** Serializes captures and recording start/stop. */
@@ -381,8 +382,9 @@ const make = Effect.gen(function* () {
381382 [ ...tab . viewers ]
382383 . map ( ( viewer ) => viewer . requestedSize )
383384 . filter ( ( requested ) => requested !== null )
384- . sort ( ( left , right ) => right . order - left . order ) [ 0 ] ;
385- if ( size ) await tab . page . setViewportSize ( { width : size . width , height : size . height } ) ;
385+ . sort ( ( left , right ) => right . order - left . order ) [ 0 ] ??
386+ UNATTACHED_FILL_VIEWPORT ;
387+ await tab . page . setViewportSize ( { width : size . width , height : size . height } ) ;
386388 broadcastViewport ( tab ) ;
387389 } ;
388390
@@ -419,6 +421,7 @@ const make = Effect.gen(function* () {
419421 closing : false ,
420422 recording : null ,
421423 recordingStart : null ,
424+ initialNavigation : null ,
422425 captureLock : Promise . resolve ( ) ,
423426 capturing : 0 ,
424427 } ;
@@ -502,21 +505,25 @@ const make = Effect.gen(function* () {
502505 tabs . set ( tabKey ( tab . threadId , tab . tabId ) , tab ) ;
503506 reportLiveTabs ( ) ;
504507 if ( snapshot . navStatus . _tag === "Loading" ) {
505- void page . goto ( snapshot . navStatus . url ) . catch ( ( ) => undefined ) ;
508+ tab . initialNavigation = page
509+ . goto ( snapshot . navStatus . url , { waitUntil : "commit" , timeout : NAVIGATION_TIMEOUT_MS } )
510+ . then (
511+ ( ) => undefined ,
512+ ( ) => undefined ,
513+ ) ;
506514 }
507515 return tab ;
508516 } ;
509517
510518 const ensureTab = ( snapshot : PreviewSessionSnapshot ) : Promise < ServerTab > => {
511519 const key = tabKey ( snapshot . threadId , snapshot . tabId ) ;
520+ const pending = pendingTabs . get ( key ) ;
521+ if ( pending ) return pending ;
512522 const existing = tabs . get ( key ) ;
513523 if ( existing ) return Promise . resolve ( existing ) ;
514- let pending = pendingTabs . get ( key ) ;
515- if ( ! pending ) {
516- pending = createTab ( snapshot ) . finally ( ( ) => pendingTabs . delete ( key ) ) ;
517- pendingTabs . set ( key , pending ) ;
518- }
519- return pending ;
524+ const opening = createTab ( snapshot ) . finally ( ( ) => pendingTabs . delete ( key ) ) ;
525+ pendingTabs . set ( key , opening ) ;
526+ return opening ;
520527 } ;
521528
522529 /** Server tabs that exist in PreviewManager but have not finished opening here. */
@@ -872,8 +879,9 @@ const make = Effect.gen(function* () {
872879 } ) ,
873880 ) ;
874881 } ;
882+ const navigationTimeout = Math . min ( request . timeoutMs , NAVIGATION_TIMEOUT_MS ) ;
875883 if ( existing ) {
876- if ( url ) await navigate ( existing , url , "load" , request . timeoutMs ) ;
884+ if ( url ) await navigate ( existing , url , "load" , navigationTimeout ) ;
877885 await revealTab ( existing ) ;
878886 return statusWithTitle ( existing ) ;
879887 }
@@ -886,10 +894,12 @@ const make = Effect.gen(function* () {
886894 } ) ,
887895 ) ;
888896 const tab = await ensureTab ( snapshot ) ;
897+ // Wait for the requested document without blocking manager events for other tabs.
898+ await tab . initialNavigation ;
889899 await revealTab ( tab ) ;
890900 if ( url ) {
891901 await tab . page
892- . waitForLoadState ( "load" , { timeout : request . timeoutMs } )
902+ . waitForLoadState ( "load" , { timeout : navigationTimeout } )
893903 . catch ( ( ) => undefined ) ;
894904 }
895905 return statusWithTitle ( tab ) ;
0 commit comments