@@ -64,6 +64,7 @@ describe("native device stream transport", () => {
6464 readyState = 1 ;
6565 binaryType = "" ;
6666 onopen : ( ( ) => void ) | null = null ;
67+ onmessage : ( ( event : { data : ArrayBuffer } ) => void ) | null = null ;
6768 onclose : ( ( event : { code : number ; reason : string } ) => void ) | null = null ;
6869 send = vi . fn ( ) ;
6970 close = vi . fn ( ) ;
@@ -111,10 +112,12 @@ describe("native device stream transport", () => {
111112 expect ( imageUrl . searchParams . get ( "hostId" ) ) . toBe ( "ssh-host" ) ;
112113 expect ( fetch ) . toHaveBeenCalledTimes ( 1 ) ;
113114 socket . onopen ?.( ) ;
115+ expect ( socket . send ) . not . toHaveBeenCalled ( ) ;
116+ socket . onmessage ?.( { data : Uint8Array . of ( 0x83 ) . buffer } ) ;
114117 client . setOrientation ( "landscape_right" ) ;
115118 client . pressButton ( "home" ) ;
116119 client . sendTouch ( "begin" , 0.25 , 0.75 ) ;
117- const messages = socket . send . mock . calls . slice ( 1 ) . map ( ( [ bytes ] ) => {
120+ const messages = socket . send . mock . calls . map ( ( [ bytes ] ) => {
118121 const packet = bytes as Uint8Array ;
119122 return {
120123 tag : packet [ 0 ] ,
@@ -179,6 +182,7 @@ describe("native device stream transport", () => {
179182 client . start ( ) ;
180183 const replacement = await reopened ;
181184 replacement . onopen ?.( ) ;
185+ if ( platform === "ios" ) replacement . onmessage ?.( { data : Uint8Array . of ( 0x83 ) . buffer } ) ;
182186 replacement . send . mockClear ( ) ;
183187 events . onInputConnected . mockClear ( ) ;
184188
@@ -336,6 +340,7 @@ describe("iOS input startup", () => {
336340 packet [ 0 ] = 0x82 ;
337341 packet . set ( json , 1 ) ;
338342 socket . onmessage ?.( { data : packet . buffer } ) ;
343+ socket . onmessage ?.( { data : Uint8Array . of ( 0x83 ) . buffer } ) ;
339344 client . sendTouch ( "begin" , 0.2 , 0.7 ) ;
340345 const sent = socket . send . mock . calls [ 0 ] ! [ 0 ] as Uint8Array ;
341346 expect ( JSON . parse ( new TextDecoder ( ) . decode ( sent . subarray ( 1 ) ) ) ) . toEqual ( {
@@ -519,27 +524,100 @@ describe("shared device stream readiness and recovery", () => {
519524 expect ( vi . getTimerCount ( ) ) . toBe ( 0 ) ;
520525 } ) ;
521526
522- it ( "drops an iOS decode backlog and resumes at a keyframe without switching to MJPEG " , async ( ) => {
523- const { client, videoBodies , decoders , events, decodedFrame } = recoveryFixture ( "ios" , false ) ;
527+ it ( "requires admission on each iOS socket and does not mistake config for admission " , async ( ) => {
528+ const { client, sockets , events, imageReady } = recoveryFixture ( ) ;
524529 client . start ( ) ;
525530 await vi . advanceTimersByTimeAsync ( 0 ) ;
531+ imageReady ( ) ;
532+ const config = ( socket : ( typeof sockets ) [ number ] , unavailable : boolean ) => {
533+ const json = new TextEncoder ( ) . encode (
534+ JSON . stringify ( {
535+ width : 400 ,
536+ height : 800 ,
537+ orientation : "portrait" ,
538+ inputUnavailable : unavailable ,
539+ supportsHingeAngle : true ,
540+ } ) ,
541+ ) ;
542+ socket . onmessage ?.( { data : Uint8Array . of ( 0x82 , ...json ) . buffer } ) ;
543+ } ;
544+ const controls = ( ) => {
545+ client . sendTouch ( "begin" , 0.2 , 0.3 ) ;
546+ client . pressButton ( "home" ) ;
547+ client . sendKey ( { code : "KeyA" } as KeyboardEvent , "down" ) ;
548+ client . setOrientation ( "landscape_left" ) ;
549+ client . controlDuo ( { control : "angle" , value : 90 } ) ;
550+ } ;
551+ const first = sockets [ 0 ] ! ;
552+ config ( first , false ) ;
553+ controls ( ) ;
554+ expect ( first . send ) . not . toHaveBeenCalled ( ) ;
555+ expect ( events . onInputConnected ) . not . toHaveBeenCalledWith ( true , undefined ) ;
556+ config ( first , true ) ;
557+ first . onmessage ?.( { data : Uint8Array . of ( 0x83 ) . buffer } ) ;
558+ controls ( ) ;
559+ expect ( first . send ) . not . toHaveBeenCalled ( ) ;
560+ expect ( events . onInputConnected ) . toHaveBeenLastCalledWith ( false ) ;
561+ config ( first , false ) ;
562+ client . pressButton ( "home" ) ;
563+ expect ( first . send ) . toHaveBeenCalled ( ) ;
564+ first . onclose ?.( { code : 1013 , reason : "retry" } ) ;
565+ await vi . advanceTimersByTimeAsync ( 1_000 ) ;
566+ const replacement = sockets [ 1 ] ! ;
567+ config ( replacement , false ) ;
568+ controls ( ) ;
569+ expect ( replacement . send ) . not . toHaveBeenCalled ( ) ;
570+ first . onmessage ?.( { data : Uint8Array . of ( 0x83 ) . buffer } ) ;
571+ expect ( events . onInputConnected ) . toHaveBeenLastCalledWith ( false , undefined ) ;
572+ replacement . onmessage ?.( { data : Uint8Array . of ( 0x83 ) . buffer } ) ;
573+ client . pressButton ( "home" ) ;
574+ expect ( replacement . send ) . toHaveBeenCalledOnce ( ) ;
575+ client . stop ( ) ;
576+ expect ( vi . getTimerCount ( ) ) . toBe ( 0 ) ;
577+ } ) ;
578+
579+ it ( "reopens a backlogged iOS feed for a fresh keyframe while keeping input connected" , async ( ) => {
580+ const { client, videoBodies, decoders, events, decodedFrame, signals, sockets, drawImage } =
581+ recoveryFixture ( "ios" , false ) ;
582+ client . start ( ) ;
583+ await vi . advanceTimersByTimeAsync ( 0 ) ;
584+ const socket = sockets [ 0 ] ! ;
585+ socket . onmessage ?.( { data : Uint8Array . of ( 0x83 ) . buffer } ) ;
526586 const body = videoBodies [ 0 ] ! ;
527587 body . enqueue ( new Uint8Array ( [ ...envelope ( 1 , [ 1 , 0x64 , 0 , 0x1f ] ) , ...envelope ( 2 , [ 1 ] ) ] ) ) ;
528588 await vi . advanceTimersByTimeAsync ( 0 ) ;
529589 decodedFrame ( ) ;
530590 const decoder = decoders [ 0 ] ! ;
531- expect ( decoder . decode ) . toHaveBeenCalledOnce ( ) ;
532591 decoder . decodeQueueSize = 9 ;
533592 body . enqueue ( new Uint8Array ( [ ...envelope ( 3 , [ 2 ] ) , ...envelope ( 3 , [ 3 ] ) ] ) ) ;
534593 await vi . advanceTimersByTimeAsync ( 0 ) ;
535- expect ( decoder . reset ) . toHaveBeenCalledOnce ( ) ;
536- expect ( decoder . decode ) . toHaveBeenCalledOnce ( ) ;
537- body . enqueue ( new Uint8Array ( [ ...envelope ( 2 , [ 4 ] ) , ...envelope ( 3 , [ 5 ] ) ] ) ) ;
594+ expect ( signals [ 1 ] ! . aborted ) . toBe ( true ) ;
595+ expect ( decoder . state ) . toBe ( "closed" ) ;
596+ expect ( events . onStatus ) . toHaveBeenLastCalledWith (
597+ "connecting" ,
598+ expect . stringContaining ( "fell behind" ) ,
599+ ) ;
600+ expect ( socket . close ) . not . toHaveBeenCalled ( ) ;
601+ client . sendTouch ( "begin" , 0.2 , 0.3 ) ;
602+ expect ( socket . send ) . toHaveBeenCalledOnce ( ) ;
603+ await vi . advanceTimersByTimeAsync ( 1_000 ) ;
604+ expect ( videoBodies ) . toHaveLength ( 2 ) ;
605+ // The old feed never produces another IDR. Only a fresh subscription can recover.
606+ videoBodies [ 1 ] ! . enqueue (
607+ new Uint8Array ( [ ...envelope ( 1 , [ 1 , 0x64 , 0 , 0x1f ] ) , ...envelope ( 2 , [ 4 ] ) ] ) ,
608+ ) ;
538609 await vi . advanceTimersByTimeAsync ( 0 ) ;
539- expect ( decoder . decode ) . toHaveBeenCalledTimes ( 3 ) ;
610+ expect ( decoders [ 1 ] ! . decode ) . toHaveBeenCalledOnce ( ) ;
611+ drawImage . mockClear ( ) ;
612+ decodedFrame ( 0 ) ;
613+ expect ( drawImage ) . not . toHaveBeenCalled ( ) ;
614+ decodedFrame ( ) ;
615+ expect ( drawImage ) . toHaveBeenCalledOnce ( ) ;
540616 expect ( events . onMjpegFallback ) . not . toHaveBeenCalled ( ) ;
541617 expect ( events . onStatus ) . toHaveBeenLastCalledWith ( "streaming" , undefined ) ;
618+ expect ( events . onInputConnected ) . toHaveBeenLastCalledWith ( true ) ;
542619 client . stop ( ) ;
620+ expect ( vi . getTimerCount ( ) ) . toBe ( 0 ) ;
543621 } ) ;
544622
545623 it ( "does not repaint a delayed JPEG seed over newer decoded video" , async ( ) => {
@@ -614,7 +692,7 @@ describe("shared device stream readiness and recovery", () => {
614692 expect ( sockets [ 0 ] ! . close ) . toHaveBeenCalledOnce ( ) ;
615693 expect ( image . src ) . toBe ( "" ) ;
616694 client . pressButton ( "home" ) ;
617- expect ( sockets [ 0 ] ! . send ) . toHaveBeenCalledTimes ( 1 ) ;
695+ expect ( sockets [ 0 ] ! . send ) . not . toHaveBeenCalled ( ) ;
618696 expect ( vi . getTimerCount ( ) ) . toBe ( 0 ) ;
619697 } ) ;
620698
0 commit comments