Update ADBkit for minor type fixes & install error handling

Author: pimterry

package-lock.json

@@ -26,7 +26,7 @@
   "homepage": "https://github.com/httptoolkit/httptoolkit-server",
   "bugs": "https://github.com/httptoolkit/httptoolkit-server/issues",
   "dependencies": {
-    "@devicefarmer/adbkit": "^3.2.4",
+    "@devicefarmer/adbkit": "^3.2.5",
     "@graphql-tools/schema": "^8.5.0",
     "@graphql-tools/utils": "^8.8.0",
     "@httptoolkit/browser-launcher": "^2.1.0",

package.json

@@ -67,7 +67,7 @@ export const getConnectedDevices = batchCalls(async (adbClient: Adb.Client) => {
     try {
         const devices = await (adbClient.listDevices() as Promise<Adb.Device[]>);
         return devices
-            .filter((d: { type: string }) => // Required until https://github.com/DeviceFarmer/adbkit/pull/437 is merged
+            .filter((d) =>
                 d.type !== 'offline' &&
                 d.type !== 'unauthorized' &&
                 !d.type.startsWith("no permissions")
@@ -141,8 +141,7 @@ export async function pushFile(
     path: string,
     mode?: number
 ) {
-    const transfer = await adbClient.push(contents as any, path, mode);
-    // Any required until https://github.com/DeviceFarmer/adbkit/pull/436 is released
+    const transfer = await adbClient.push(contents, path, mode);
 
     return new Promise((resolve, reject) => {
         transfer.on('end', resolve);

src/interceptors/android/adb-commands.ts

@@ -71,19 +71,13 @@ export class AndroidAdbInterceptor implements Interceptor {
         if (!(await deviceClient.isInstalled('tech.httptoolkit.android.v1'))) {
             console.log("App not installed, installing...");
             try {
-                await deviceClient.install(
-                    await streamLatestApk(this.config) as any
-                    // Any required until https://github.com/DeviceFarmer/adbkit/pull/436 is released
-                );
+                await deviceClient.install(await streamLatestApk(this.config));
             } catch (e) {
                 console.log("Resetting & retrying APK install, after initial failure:", e);
                 // This can fail due to connection issues (with the device or while downloading
                 // the APK) due to a corrupted APK. Reset the APKs and try again, just in case.
                 await clearAllApks(this.config);
-                await deviceClient.install(
-                    await streamLatestApk(this.config) as any
-                    // Any required until https://github.com/DeviceFarmer/adbkit/pull/436 is released
-                );
+                await deviceClient.install(await streamLatestApk(this.config));
             }
             console.log("App installed successfully");