@@ -156,73 +156,109 @@ describe("desktop agent screenshot rendering lease", () => {
156156 } ) . pipe ( Effect . scoped ) ,
157157 ) ;
158158
159- it . effect . each ( [ "native " , "cdp " ] as const ) (
160- "reports a stable capture error when %s fails and allows a retry " ,
161- ( failedStage ) =>
159+ it . effect . each ( [ "reject " , "throw " ] as const ) (
160+ "returns the CDP screenshot even if native warmup fails with %s " ,
161+ ( failure ) =>
162162 Effect . gen ( function * ( ) {
163163 const { guest, leases, replies, command, acknowledge } = yield * setup ;
164- const cause = new Error ( "internal compositor failure detail " ) ;
165- const captureFailed = vi . fn < ( error : unknown ) => void > ( ) ;
166- guest . tab . withCaptureActivity = ( capture ) =>
167- capture . pipe ( Effect . tapError ( ( error ) => Effect . sync ( ( ) => captureFailed ( error ) ) ) ) ;
168- if ( failedStage === "native" ) guest . capturePage . mockRejectedValueOnce ( cause ) ;
169- else guest . screenshot . mockRejectedValueOnce ( cause ) ;
164+ const cause = new Error ( "native unavailable " ) ;
165+ if ( failure === "reject" ) guest . capturePage . mockRejectedValueOnce ( cause ) ;
166+ else
167+ guest . capturePage . mockImplementationOnce ( ( ) => {
168+ throw cause ;
169+ } ) ;
170170 yield * command ( 1 ) ;
171171 const active = yield * acknowledge ;
172- expect ( ( yield * Queue . take ( replies ) ) . error ?. message ) . toBe (
173- "Desktop browser screenshot failed: the compositor could not capture a frame." ,
174- ) ;
175- expect ( captureFailed ) . toHaveBeenCalledExactlyOnceWith ( expect . objectContaining ( { cause } ) ) ;
172+ expect ( yield * Queue . take ( replies ) ) . toEqual ( { id : 1 , result : { data : "encoded-by-cdp" } } ) ;
176173 expect ( yield * Queue . take ( leases ) ) . toEqual ( { ...active , active : false } ) ;
177- yield * command ( 2 ) ;
178- yield * acknowledge ;
179- expect ( yield * Queue . take ( replies ) ) . toEqual ( { id : 2 , result : { data : "encoded-by-cdp" } } ) ;
180174 } ) . pipe ( Effect . scoped ) ,
181175 ) ;
182176
183- it . effect . each ( [ "native" , "cdp" ] as const ) (
184- "bounds %s waiting without accumulating captures or blocking DOM commands" ,
185- ( stalledStage ) =>
177+ it . effect ( "preserves the CDP failure cause and allows a retry" , ( ) =>
178+ Effect . gen ( function * ( ) {
179+ const { guest, leases, replies, command, acknowledge } = yield * setup ;
180+ const cause = new Error ( "internal compositor failure detail" ) ;
181+ const captureFailed = vi . fn < ( error : unknown ) => void > ( ) ;
182+ guest . tab . withCaptureActivity = ( capture ) =>
183+ capture . pipe ( Effect . tapError ( ( error ) => Effect . sync ( ( ) => captureFailed ( error ) ) ) ) ;
184+ guest . screenshot . mockRejectedValueOnce ( cause ) ;
185+ yield * command ( 1 ) ;
186+ const active = yield * acknowledge ;
187+ expect ( ( yield * Queue . take ( replies ) ) . error ?. message ) . toBe (
188+ "Desktop browser screenshot failed: the compositor could not capture a frame." ,
189+ ) ;
190+ expect ( captureFailed ) . toHaveBeenCalledExactlyOnceWith ( expect . objectContaining ( { cause } ) ) ;
191+ expect ( yield * Queue . take ( leases ) ) . toEqual ( { ...active , active : false } ) ;
192+ yield * command ( 2 ) ;
193+ yield * acknowledge ;
194+ expect ( yield * Queue . take ( replies ) ) . toEqual ( { id : 2 , result : { data : "encoded-by-cdp" } } ) ;
195+ } ) . pipe ( Effect . scoped ) ,
196+ ) ;
197+
198+ it . effect . each ( [ "success" , "failure" ] as const ) (
199+ "returns CDP %s while retaining the slot for pending native work" ,
200+ ( outcome ) =>
186201 Effect . gen ( function * ( ) {
187202 const { guest, leases, replies, command, acknowledge } = yield * setup ;
188- const pending = Promise . withResolvers < { data : string } > ( ) ;
189- if ( stalledStage === "native" )
190- guest . capturePage . mockImplementationOnce ( ( ) => {
191- guest . nativeStarted . resolve ( ) ;
192- return pending . promise ;
193- } ) ;
194- else
195- guest . screenshot . mockImplementationOnce ( ( ) => {
196- guest . screenshotStarted . resolve ( ) ;
197- return pending . promise ;
198- } ) ;
203+ const pending = Promise . withResolvers < object > ( ) ;
204+ guest . capturePage . mockImplementationOnce ( ( ) => pending . promise ) ;
205+ if ( outcome === "failure" ) guest . screenshot . mockRejectedValueOnce ( new Error ( "CDP failed" ) ) ;
199206 yield * command ( 1 ) ;
200207 const active = yield * acknowledge ;
201- yield * Effect . promise (
202- ( ) => ( stalledStage === "native" ? guest . nativeStarted : guest . screenshotStarted ) . promise ,
203- ) ;
204- yield * TestClock . adjust ( "8 seconds" ) ;
205- expect ( ( yield * Queue . take ( replies ) ) . error ?. message ) . toContain ( "within 8 seconds" ) ;
208+ const reply = yield * Queue . take ( replies ) ;
209+ if ( outcome === "success" )
210+ expect ( reply ) . toEqual ( { id : 1 , result : { data : "encoded-by-cdp" } } ) ;
211+ else
212+ expect ( reply . error ?. message ) . toBe (
213+ "Desktop browser screenshot failed: the compositor could not capture a frame." ,
214+ ) ;
206215 expect ( yield * Queue . take ( leases ) ) . toEqual ( { ...active , active : false } ) ;
207216 yield * command ( 2 ) ;
208217 expect ( ( yield * Queue . take ( replies ) ) . error ?. message ) . toContain (
209218 "previous capture is still pending" ,
210219 ) ;
211220 yield * command ( 3 , "DOM.enable" ) ;
212221 expect ( ( yield * Queue . take ( replies ) ) . id ) . toBe ( 3 ) ;
213- expect ( guest . capturePage ) . toHaveBeenCalledTimes ( stalledStage === "cdp" ? 2 : 1 ) ;
214- pending . resolve ( { data : "late-image" } ) ;
222+ pending . resolve ( { } ) ;
215223 yield * Effect . promise ( ( ) => new Promise ( ( resolve ) => setImmediate ( resolve ) ) ) ;
216- expect ( guest . screenshot ) . toHaveBeenCalledTimes ( 1 ) ;
224+ expect ( guest . capturePage ) . toHaveBeenCalledTimes ( 1 ) ;
217225 yield * command ( 4 ) ;
218226 yield * acknowledge ;
219227 expect ( yield * Queue . take ( replies ) ) . toEqual ( { id : 4 , result : { data : "encoded-by-cdp" } } ) ;
220- expect ( guest . capturePage . mock . calls . length ) . toBeLessThanOrEqual (
221- stalledStage === "cdp" ? 4 : 3 ,
222- ) ;
223228 } ) . pipe ( Effect . scoped ) ,
224229 ) ;
225230
231+ it . effect ( "bounds CDP waiting without accumulating captures or blocking DOM commands" , ( ) =>
232+ Effect . gen ( function * ( ) {
233+ const { guest, leases, replies, command, acknowledge } = yield * setup ;
234+ const pending = Promise . withResolvers < { data : string } > ( ) ;
235+ guest . screenshot . mockImplementationOnce ( ( ) => {
236+ guest . screenshotStarted . resolve ( ) ;
237+ return pending . promise ;
238+ } ) ;
239+ yield * command ( 1 ) ;
240+ const active = yield * acknowledge ;
241+ yield * Effect . promise ( ( ) => guest . screenshotStarted . promise ) ;
242+ yield * TestClock . adjust ( "8 seconds" ) ;
243+ expect ( ( yield * Queue . take ( replies ) ) . error ?. message ) . toContain ( "within 8 seconds" ) ;
244+ expect ( yield * Queue . take ( leases ) ) . toEqual ( { ...active , active : false } ) ;
245+ yield * command ( 2 ) ;
246+ expect ( ( yield * Queue . take ( replies ) ) . error ?. message ) . toContain (
247+ "previous capture is still pending" ,
248+ ) ;
249+ yield * command ( 3 , "DOM.enable" ) ;
250+ expect ( ( yield * Queue . take ( replies ) ) . id ) . toBe ( 3 ) ;
251+ expect ( guest . capturePage ) . toHaveBeenCalledTimes ( 2 ) ;
252+ pending . resolve ( { data : "late-image" } ) ;
253+ yield * Effect . promise ( ( ) => new Promise ( ( resolve ) => setImmediate ( resolve ) ) ) ;
254+ expect ( guest . screenshot ) . toHaveBeenCalledTimes ( 1 ) ;
255+ yield * command ( 4 ) ;
256+ yield * acknowledge ;
257+ expect ( yield * Queue . take ( replies ) ) . toEqual ( { id : 4 , result : { data : "encoded-by-cdp" } } ) ;
258+ expect ( guest . capturePage . mock . calls . length ) . toBeLessThanOrEqual ( 4 ) ;
259+ } ) . pipe ( Effect . scoped ) ,
260+ ) ;
261+
226262 it . effect ( "retains the pending CDP slot when native capture throws synchronously" , ( ) =>
227263 Effect . gen ( function * ( ) {
228264 const { guest, leases, replies, command, acknowledge } = yield * setup ;
@@ -258,7 +294,8 @@ describe("desktop agent screenshot rendering lease", () => {
258294 ( lifecycle ) =>
259295 Effect . gen ( function * ( ) {
260296 const { host, guest, leases, replies, command, acknowledge } = yield * setup ;
261- const pending = Promise . withResolvers < object > ( ) ;
297+ const pending = Promise . withResolvers < { data : string } > ( ) ;
298+ guest . screenshot . mockImplementationOnce ( ( ) => pending . promise ) ;
262299 guest . capturePage . mockImplementationOnce ( ( ) => {
263300 guest . nativeStarted . resolve ( ) ;
264301 return pending . promise ;
@@ -272,7 +309,7 @@ describe("desktop agent screenshot rendering lease", () => {
272309 else host . attach ( key , makeGuest ( 42 ) . tab ) ;
273310 expect ( yield * Queue . take ( leases ) ) . toEqual ( { ...active , active : false } ) ;
274311 if ( lifecycle === "detach" ) host . attach ( key , guest . tab ) ;
275- pending . resolve ( { } ) ;
312+ pending . resolve ( { data : "discarded" } ) ;
276313 yield * command ( 2 , "DOM.enable" ) ;
277314 expect ( ( yield * Queue . take ( replies ) ) . id ) . toBe ( 2 ) ;
278315 yield * Effect . promise ( ( ) => new Promise ( ( resolve ) => setImmediate ( resolve ) ) ) ;
0 commit comments