Add a timeout to ADB root detection commands

It turns out that on some devices "su root whoami" does not
fail or run whoami - it just successfully starts a shell.
In these cases, we have a problem, as that blocks the rest
of the root detection. To fix this, we now time out in any
such cases. It would be a bit better to properly get root
using the interactive shell, but the practicality is a bit
complicated, so let's ignore that for now until a real
device that needs that comes up.

Author: pimterry

src/interceptors/android/adb-commands.ts

@@ -85,10 +85,28 @@ export function stringAsStream(input: string) {
     return contentStream;
 }
 
-async function run(adbClient: adb.AdbClient, deviceId: string, command: string[]): Promise<string> {
-    return adbClient.shell(deviceId, command)
-    .then(adb.util.readAll)
-    .then(buffer => buffer.toString('utf8'));
+async function run(
+    adbClient: adb.AdbClient,
+    deviceId: string,
+    command: string[],
+    options: {
+        timeout?: number
+    } = {
+        timeout: 10000
+    }
+): Promise<string> {
+    return Promise.race([
+        adbClient.shell(deviceId, command)
+            .then(adb.util.readAll)
+            .then(buffer => buffer.toString('utf8')),
+        ...(options.timeout
+            ? [
+                delay(options.timeout)
+                .then(() => { throw new Error(`Timeout for ADB command ${command}`) })
+            ]
+            : []
+        )
+    ]);
 }
 
 export async function pushFile(
@@ -115,7 +133,7 @@ export async function getRootCommand(adbClient: adb.AdbClient, deviceId: string)
     // Run whoami with each of the possible root commands
     const rootCheckResults = await Promise.all(
         runAsRootCommands.map((cmd) =>
-            run(adbClient, deviceId, cmd.concat('whoami')).catch(console.log)
+            run(adbClient, deviceId, cmd.concat('whoami'), { timeout: 1000 }).catch(console.log)
             .then((whoami) => ({ cmd, whoami }))
         )
     )