Rewrite Android video shell service (#46)

Author: ingmaras

src/services/android-video-shell.service.ts

@@ -1,11 +1,9 @@
-import { isMac } from '../helpers/utils'
-import { spawn, ChildProcess, execSync } from 'child_process'
+import { exec, ChildProcess, execSync } from 'child_process'
 import * as os from 'os'
 import * as fs from 'fs'
 
 import { randomString } from '../helpers/random'
 import { Device } from './device.service'
-import { getFfmpegBin } from './ffmpeg.service'
 
 export default class AndroidVideoShell {
   process: ChildProcess | null = null
@@ -18,6 +16,8 @@ export default class AndroidVideoShell {
 
   device: Device
 
+  pid?: string
+
   constructor(options: { device: Device; verbose?: boolean }) {
     this.fileName = `${randomString()}-raw.mp4`
     this.path = `${os.tmpdir()}/${this.fileName}`
@@ -26,59 +26,26 @@ export default class AndroidVideoShell {
   }
 
   record() {
-    this.process = spawn('adb', [
-      '-s',
-      this.device.id,
-      'shell',
-      'screenrecord',
-      `/sdcard/${this.fileName}`,
-      '--output-format',
-      'h264',
-    ])
-
-    this.log(`Recording started in ${this.path}.`)
-
-    this.process.stdout!.on('data', (data) => {
-      console.log(`[process] stdout: ${data}`)
-    })
-
-    this.process.stderr!.on('data', (data) => {
-      console.log(`[process] stderr: ${data}`)
-    })
+    this.process = exec(`adb -s ${this.device.id} shell screenrecord /sdcard/${this.fileName} --output-format mp4 --verbose`)
+    console.log(`Recording started in ${this.path}.`)
 
-    this.process.on('error', (error) => {
-      console.log(`[process] error: ${error.message}`)
-    })
-  }
-  //   adb shell screenrecord --output-format=h264 --size 1440x2560 - > ./screenrecord.raw
-  //
+    this.pid = execSync(`adb -s ${this.device.id} shell pidof screenrecord`).toString().trim().split(' ')[0]
+    this.log(`Android screenrecord process spawned. PID: ${this.pid}`)
 
-  speedUpRequired = () => {
-    return this.device.isEmulator && isMac()
+    this.process.stdout!.on('data', (data) => this.log(`stdout: ${data}`))
+    this.process.stderr!.on('data', (data) => this.log(`stderr: ${data}`))
+    this.process.on('error', (error) => this.log(`error: ${error.message}`))
   }
 
   save = async (): Promise<string> => {
     return new Promise((resolve) => {
-      if (this.process) {
-        this.process.kill('SIGINT')
-        this.log('[process] SIGINT time.')
-
-        this.process.on('close', async (/* code: number */) => {
-          // TODO: investigate why this process ends with a null exit code and reject promise if we can get a proper exit code
-          execSync(
-            `adb -s ${this.device.id} pull /sdcard/${this.fileName} ${this.path}.h264`
-          )
-          this.log('[process] File saved and ready to upload!')
-
-          let speedOption = ''
+      this.log(`Killing Android screenrecord process. PID: ${this.pid}`)
+      execSync(`adb -s ${this.device.id} shell kill -SIGINT ${this.pid}`)
 
-          if (this.speedUpRequired()) {
-            speedOption = '-vf "setpts=1.6*PTS"'
-          }
-
-          execSync(
-            `${getFfmpegBin()} -vcodec h264 -i ${this.path}.h264 ${speedOption} -r 30 ${this.path}`
-          )
+      if (this.process) {
+        this.process.on('close', async () => {
+          execSync(`adb -s ${this.device.id} pull /sdcard/${this.fileName} ${this.path}`)
+          console.log('File saved and ready to upload!')
           resolve(this.path)
         })
       }
@@ -88,7 +55,9 @@ export default class AndroidVideoShell {
   async destroy() {
     this.log('Destroying temporary video file')
     await fs.unlinkSync(this.path)
-    // TODO: also destroy the video file on the android side
+
+    this.log('Destroying temporary video file on Android')
+    execSync(`adb -s ${this.device.id} shell rm /sdcard/${this.fileName}`)
   }
 
   private log(text: string) {