feat: enhance error handling in Scrcpy class and update process exit logging

Author: UrielCh

.vscode/launch.json

@@ -33,6 +33,7 @@
             "internalConsoleOptions": "openOnSessionStart",
             "skipFiles": ["<node_internals>/**"],
             "env": {
+              "DEBUG__ALL": "*",
               "DEBUG": "adb:minicap, adb:scrcpy",
               "DEBUG_COLORS": "1"
             }

src/adb/thirdparty/scrcpy/Scrcpy.ts

@@ -221,9 +221,14 @@ export default class Scrcpy extends EventEmitter {
     }
   }
 
-  private _setFatalError(msg: string) {
+  private _setFatalError(msg: string | Error) {
+    // console.error(`_setFatalError. Scrcpy fatal error:`, msg);
     if (this.setFatalError) {
-      this.setFatalError(msg);
+      if (msg instanceof Error) {
+         this.setFatalError(msg.message + '\n' + msg.stack);
+      } else {
+        this.setFatalError(msg);
+      }
       this.setFatalError = undefined;
     }
   }
@@ -598,6 +603,7 @@ export default class Scrcpy extends EventEmitter {
     let codec = "H264";
     // let header: Uint8Array | undefined;
     if (this.major >= 2) {
+          await Utils.waitforReadable(this.videoSocket, 0, 'videoSocket Codec header');
           const frameMeta = this.videoSocket.stream.read(12) as Buffer;
           const codecId = frameMeta.readUInt32BE(0);
           // Read width (4 bytes)
@@ -638,6 +644,8 @@ export default class Scrcpy extends EventEmitter {
       await Utils.waitforReadable(this.videoSocket, 0, 'videoSocket packet size');
       let len: number | undefined = undefined;
       if (this.config.sendFrameMeta) {
+        if (!this.videoSocket)
+          break;
         const frameMeta = this.videoSocket.stream.read(12) as Buffer;
         if (!frameMeta) {
           // regular end condition

tasks/realTest.ts

@@ -224,17 +224,18 @@ const stressTestScrCpy = async (deviceClient: DeviceClient) => {
     await Utils.delay(100);
     scrcpys.push(scrcpy)
     try {
+      scrcpy.on("error", (e) => {
+        console.error(`scrcpy #${pass} error`, e);
+      });
       scrcpy.once('frame', (data) => {
         console.log(`${pc.magenta('scrcpy')} emit hit first frame isKeyframe: ${data.keyframe} from #${pass}`);
       })
       scrcpy.once('error', (data) => {
         console.log(`${pc.red('scrcpy')} emit hit error: ${data} from #${pass}`);
       })
-
       await scrcpy.start();
       await scrcpy.firstFrame;
       console.log(`${pc.magenta('scrcpy')} Should had emit hit first frame isKeyframe from #${pass}`);
-      await Utils.delay(500);
     } catch (e) {
       console.error(`Start Scrcpy PASS:${pass} failed ${(e as Error).message}`);
     }
@@ -535,7 +536,7 @@ const main = async () => {
   // await stressMinicap(deviceClient);
 
   // process.stdin.resume();
-  await stressTestScrCpy(deviceClient);
+  // await stressTestScrCpy(deviceClient);
 
   // await testSTFService(deviceClient);
   // await testService(deviceClient);
@@ -554,11 +555,10 @@ process.on('unhandledRejection', (reason, promise) => {
   console.error('Unhandled Rejection at:', promise, 'reason:', reason);
 });
 
-process.on('exit', () => console.log('Processus en cours de fermeture'));
+process.on('exit', (code) => console.log('Processus is closing, exit code:', code));
 process.on('SIGINT', () => console.log('SIGINT reçu'));
 process.on('SIGTERM', () => console.log('SIGTERM reçu'));
 
-
 main().catch(e => console.error("ERROR", e)).finally(() => {
   console.log('Processus terminé');
 });