Add retry to Android app launch to maybe fix "Unable to resolve Intent"

Still happening maybe 5 times a day, and this will be breaking ADB
setup, it'd be nice to retry just to see if waiting a little make this
work.

Author: pimterry

src/interceptors/android/adb-commands.ts

@@ -331,4 +331,34 @@ export async function bringToFront(
     await adbClient.shell(deviceId, [
         "am", "start", "--activity-single-top", activityName
     ]);
+}
+
+export async function startActivity(
+    adbClient: adb.AdbClient,
+    deviceId: string,
+    options: {
+        action?: string,
+        data?: string,
+        retries?: number
+    }
+): Promise<void> {
+    const retries = options.retries ?? 0;
+
+    try {
+        await adbClient.startActivity(deviceId, {
+            wait: true,
+            action: options.action,
+            data: options.data
+        });
+    } catch (e) {
+        if (retries <= 0) throw e;
+        else {
+            await delay(1000);
+
+            return startActivity(adbClient, deviceId, {
+                ...options,
+                retries: retries - 1
+            });
+        }
+    }
 }

src/interceptors/android/android-adb-interceptor.ts

@@ -17,7 +17,8 @@ import {
     stringAsStream,
     hasCertInstalled,
     bringToFront,
-    setChromeFlags
+    setChromeFlags,
+    startActivity
 } from './adb-commands';
 import { streamLatestApk, clearAllApks } from './fetch-apk';
 import { parseCert, getCertificateFingerprint, getCertificateSubjectHash } from '../../certificates';
@@ -109,10 +110,10 @@ export class AndroidAdbInterceptor implements Interceptor {
         await this.adbClient.reverse(options.deviceId, 'tcp:' + proxyPort, 'tcp:' + proxyPort).catch(() => {});
 
         // Use ADB to launch the app with the proxy details
-        await this.adbClient.startActivity(options.deviceId, {
-            wait: true,
+        await startActivity(this.adbClient, options.deviceId, {
             action: 'tech.httptoolkit.android.ACTIVATE',
-            data: `https://android.httptoolkit.tech/connect/?data=${intentData}`
+            data: `https://android.httptoolkit.tech/connect/?data=${intentData}`,
+            retries: 10
         });
 
         this.deviceProxyMapping[proxyPort] = this.deviceProxyMapping[proxyPort] || [];