@@ -24,6 +24,7 @@ import * as Path from "effect/Path";
2424import * as PubSub from "effect/PubSub" ;
2525import * as Queue from "effect/Queue" ;
2626import * as Stream from "effect/Stream" ;
27+ import * as TestClock from "effect/testing/TestClock" ;
2728import type { BrowserContext , Page } from "playwright-core" ;
2829import { beforeEach , expect , vi } from "vite-plus/test" ;
2930
@@ -389,13 +390,36 @@ const viewerInput = (tabId: string, canOperate: boolean) => ({
389390 maxHeight : 800 ,
390391 quality : 70 ,
391392} ) ;
392- const stallViewer = (
393- viewer : ServerBrowser . ServerBrowserViewer ,
394- item : ServerBrowser . ServerBrowserViewerOutput ,
395- ) => {
393+ /** Fills a viewer's output with frames; resolves once every one of them is acknowledged. */
394+ const stallViewer = ( viewer : ServerBrowser . ServerBrowserViewer ) => {
396395 const output = viewer . output as unknown as Queue . Queue < ServerBrowser . ServerBrowserViewerOutput > ;
397- while ( Queue . offerUnsafe ( output , item ) ) ;
396+ const acked = Promise . withResolvers < void > ( ) ;
397+ let unacked = 0 ;
398+ const ack = Effect . sync ( ( ) => {
399+ if ( -- unacked === 0 ) acked . resolve ( ) ;
400+ } ) ;
401+ while ( Queue . offerUnsafe ( output , { _tag : "frame" , data : Buffer . alloc ( 0 ) , ack } ) ) unacked ++ ;
402+ return Effect . promise ( ( ) => acked . promise ) ;
398403} ;
404+ const viewportSizes = ( items : ReadonlyArray < ServerBrowser . ServerBrowserViewerOutput > ) =>
405+ items . flatMap ( ( item ) => ( item . _tag === "viewport" ? [ `${ item . width } x${ item . height } ` ] : [ ] ) ) ;
406+ const openDesktopViewer = Effect . gen ( function * ( ) {
407+ const browser = yield * ServerBrowser . ServerBrowser ;
408+ const manager = yield * Manager . PreviewManager ;
409+ desktopRendersNext = true ;
410+ const { tabId } = yield * manager . open ( { threadId : scope . thread . threadId , runtime : "server" } ) ;
411+ const viewer = yield * browser . attachViewer ( viewerInput ( tabId , true ) ) ;
412+ const context = desktopConnections [ 0 ] ! . context ;
413+ const cdp = context . sessions [ 0 ] ! ;
414+ const resize = ( width : number , height : number ) => {
415+ Object . assign ( context . cssViewport , { width, height } ) ;
416+ return Effect . promise ( ( ) => cdp . emitAsync ( "Page.frameResized" ) ) ;
417+ } ;
418+ // Ready once the size measured on attach and on a first resize both reached the viewer.
419+ yield * resize ( 1920 , 1080 ) ;
420+ expect ( viewportSizes ( yield * Queue . takeAll ( viewer . output ) ) ) . toEqual ( [ "1920x1080" , "1920x1080" ] ) ;
421+ return { tabId, viewer, context, cdp, resize } ;
422+ } ) ;
399423
400424beforeEach ( ( ) => {
401425 contexts . length = 0 ;
@@ -1175,71 +1199,103 @@ it.live("only the current controller can answer a file picker", () =>
11751199 ) . pipe ( Effect . provide ( layer ) ) ,
11761200) ;
11771201
1178- it . live ( "desktop viewers get the page's CSS size and keep the last one a read cannot measure" , ( ) =>
1179- Effect . scoped (
1180- Effect . gen ( function * ( ) {
1181- const browser = yield * ServerBrowser . ServerBrowser ;
1182- const manager = yield * Manager . PreviewManager ;
1183- const broker = yield * Broker . PreviewAutomationBroker ;
1184- yield * Effect . yieldNow ;
1185- desktopRendersNext = true ;
1186- const opened = yield * manager . open ( { threadId : scope . thread . threadId , runtime : "server" } ) ;
1187- const viewer = yield * browser . attachViewer ( viewerInput ( opened . tabId , true ) ) ;
1188- const context = desktopConnections [ 0 ] ! . context ;
1189- const cdp = context . sessions [ 0 ] ! ;
1190- Object . assign ( context . cssViewport , { width : 1000 , height : 600 } ) ;
1191- cdp . send . mockClear ( ) ;
1192- // A burst of resizes measures the page once more after the read in flight.
1193- yield * Effect . promise ( ( ) =>
1194- Promise . all ( [ 1 , 2 , 3 ] . map ( ( ) => cdp . emitAsync ( "Page.frameResized" ) ) ) ,
1195- ) ;
1196- expect ( yield * Queue . takeAll ( viewer . output ) ) . toContainEqual ( {
1197- _tag : "viewport" ,
1198- width : 1000 ,
1199- height : 600 ,
1200- } ) ;
1201- const reads = cdp . send . mock . calls . filter (
1202- ( [ method , input ] ) =>
1203- method === "Runtime.evaluate" && ( input as { contextId ?: number } ) . contextId === 9 ,
1204- ) ;
1205- expect ( reads ) . toHaveLength ( 2 ) ;
1206- // A hidden webview measures 0x0.
1207- Object . assign ( context . cssViewport , { width : 0 , height : 0 } ) ;
1208- expect (
1209- yield * broker . invoke < PreviewAutomationStatus > ( {
1210- scope,
1211- operation : "status" ,
1212- input : { } ,
1213- tabId : PreviewTabId . make ( opened . tabId ) ,
1214- } ) ,
1215- ) . toMatchObject ( { viewport : { width : 1000 , height : 600 } } ) ;
1216- } ) ,
1217- ) . pipe ( Effect . provide ( layer ) ) ,
1202+ it . effect (
1203+ "desktop viewers get the page's CSS size and keep the last one a read cannot measure" ,
1204+ ( ) =>
1205+ Effect . scoped (
1206+ Effect . gen ( function * ( ) {
1207+ const { viewer, cdp } = yield * openDesktopViewer ;
1208+ // Each page size read waits here for its answer.
1209+ const reads = yield * Queue . unbounded < PromiseWithResolvers < Record < string , unknown > > > ( ) ;
1210+ const send = cdp . send . getMockImplementation ( ) ! ;
1211+ cdp . send . mockImplementation ( ( method , input ) => {
1212+ if ( method !== "Runtime.evaluate" || ( input as { contextId ?: number } ) . contextId !== 9 )
1213+ return send ( method , input ) ;
1214+ const read = Promise . withResolvers < Record < string , unknown > > ( ) ;
1215+ Queue . offerUnsafe ( reads , read ) ;
1216+ return read . promise ;
1217+ } ) ;
1218+ const answer = ( width : number , height : number ) => ( {
1219+ result : { value : { width, height } } ,
1220+ } ) ;
1221+ const resized = ( ) => cdp . emitAsync ( "Page.frameResized" ) ;
1222+ // Resizes during a read share one more read, so the newest size arrives last.
1223+ const first = resized ( ) ;
1224+ const firstRead = yield * Queue . take ( reads ) ;
1225+ const burst = Promise . all ( [ resized ( ) , resized ( ) ] ) ;
1226+ firstRead . resolve ( answer ( 800 , 500 ) ) ;
1227+ ( yield * Queue . take ( reads ) ) . resolve ( answer ( 1000 , 600 ) ) ;
1228+ expect ( yield * Queue . size ( reads ) ) . toBe ( 0 ) ;
1229+ yield * Effect . promise ( ( ) => Promise . all ( [ first , burst ] ) ) ;
1230+ expect ( viewportSizes ( yield * Queue . takeAll ( viewer . output ) ) ) . toEqual ( [
1231+ "800x500" ,
1232+ "1000x600" ,
1233+ "1000x600" ,
1234+ ] ) ;
1235+ // A dialog blocks page script, so a read that never answers gives up.
1236+ const blocked = resized ( ) ;
1237+ const stuck = yield * Queue . take ( reads ) ;
1238+ yield * TestClock . adjust ( "1 second" ) ;
1239+ yield * Effect . promise ( ( ) => blocked ) ;
1240+ // Its late answer, a read a navigation breaks and a hidden webview keep the last size.
1241+ stuck . resolve ( answer ( 100 , 100 ) ) ;
1242+ const navigated = resized ( ) ;
1243+ ( yield * Queue . take ( reads ) ) . reject ( new Error ( "Cannot find context with specified id" ) ) ;
1244+ yield * Effect . promise ( ( ) => navigated ) ;
1245+ const hidden = resized ( ) ;
1246+ ( yield * Queue . take ( reads ) ) . resolve ( answer ( 0 , 0 ) ) ;
1247+ yield * Effect . promise ( ( ) => hidden ) ;
1248+ expect ( viewportSizes ( yield * Queue . takeAll ( viewer . output ) ) ) . toEqual ( [
1249+ "1000x600" ,
1250+ "1000x600" ,
1251+ "1000x600" ,
1252+ ] ) ;
1253+ } ) ,
1254+ ) . pipe ( Effect . provide ( layer ) ) ,
12181255) ;
12191256
1220- it . live ( "a stalled desktop viewer still gets its size, control and reconnect" , ( ) =>
1257+ it . effect ( "a stalled desktop viewer still gets its size, control and reconnect" , ( ) =>
12211258 Effect . scoped (
12221259 Effect . gen ( function * ( ) {
1223- const browser = yield * ServerBrowser . ServerBrowser ;
1224- const manager = yield * Manager . PreviewManager ;
1225- yield * Effect . yieldNow ;
1226- desktopRendersNext = true ;
1227- const opened = yield * manager . open ( { threadId : scope . thread . threadId , runtime : "server" } ) ;
1228- const viewer = yield * browser . attachViewer ( viewerInput ( opened . tabId , true ) ) ;
1229- yield * viewer . input ( { type : "takeControl" } ) ;
1230- const context = desktopConnections [ 0 ] ! . context ;
1260+ const { tabId, viewer, context, resize } = yield * openDesktopViewer ;
12311261 yield * Effect . promise ( ( ) => desktopDetachReady . promise ) ;
1232- stallViewer ( viewer , { _tag : "frame" , data : Buffer . alloc ( 0 ) , ack : Effect . void } ) ;
1233- Object . assign ( context . cssViewport , { width : 1000 , height : 600 } ) ;
1234- yield * Effect . promise ( ( ) => context . sessions [ 0 ] ! . emitAsync ( "Page.frameResized" ) ) ;
1262+ yield * viewer . input ( { type : "takeControl" } ) ;
1263+ context . page . emit ( "filechooser" , {
1264+ isMultiple : ( ) => false ,
1265+ element : ( ) => ( { getAttribute : async ( ) => ".csv" } ) ,
1266+ setFiles : vi . fn ( async ( ) => { } ) ,
1267+ } ) ;
1268+ let chooser = yield * Queue . take ( viewer . output ) ;
1269+ while ( chooser . _tag !== "fileChooser" ) chooser = yield * Queue . take ( viewer . output ) ;
1270+ yield * Queue . clear ( viewer . output ) ;
1271+ const control = expect . objectContaining ( { _tag : "control" , controller : "you" } ) ;
1272+ // A resize replaces a full backlog but keeps control and the controller's open picker.
1273+ yield * viewer . input ( { type : "takeControl" } ) ;
1274+ let acked = stallViewer ( viewer ) ;
1275+ yield * resize ( 1000 , 600 ) ;
12351276 expect ( yield * Queue . takeAll ( viewer . output ) ) . toEqual ( [
12361277 { _tag : "viewport" , width : 1000 , height : 600 } ,
1237- expect . objectContaining ( { _tag : "control" , controller : "you" } ) ,
1278+ control ,
1279+ chooser ,
1280+ ] ) ;
1281+ yield * acked ;
1282+ // A control change keeps the newest size.
1283+ yield * resize ( 900 , 500 ) ;
1284+ yield * resize ( 1200 , 700 ) ;
1285+ acked = stallViewer ( viewer ) ;
1286+ yield * viewer . input ( { type : "releaseControl" } ) ;
1287+ expect ( yield * Queue . takeAll ( viewer . output ) ) . toEqual ( [
1288+ expect . objectContaining ( { _tag : "control" , controller : "unclaimed" } ) ,
1289+ { _tag : "viewport" , width : 1200 , height : 700 } ,
12381290 ] ) ;
1239- stallViewer ( viewer , { _tag : "frame" , data : Buffer . alloc ( 0 ) , ack : Effect . void } ) ;
1240- desktopDetaches . emit ( "detach" , { threadId : scope . thread . threadId , tabId : opened . tabId } ) ;
1291+ yield * acked ;
1292+ // The desktop takes the page back; a resize after it cannot bury the reconnect.
1293+ acked = stallViewer ( viewer ) ;
1294+ desktopDetaches . emit ( "detach" , { threadId : scope . thread . threadId , tabId } ) ;
12411295 yield * Effect . promise ( ( ) => desktopReleased . promise ) ;
1296+ yield * resize ( 1000 , 600 ) ;
12421297 expect ( yield * Queue . takeAll ( viewer . output ) ) . toEqual ( [ { _tag : "reconnect" } ] ) ;
1298+ yield * acked ;
12431299 } ) ,
12441300 ) . pipe ( Effect . provide ( layer ) ) ,
12451301) ;
0 commit comments