Fix ADB ECONNRESET crash, by using forked adbkit

Author: pimterry

custom-typings/adbkit.d.ts

@@ -1,4 +1,4 @@
-declare module 'adbkit' {
+declare module '@httptoolkit/adbkit' {
     import * as stream from 'stream';
     import * as events from 'events';
 
@@ -34,9 +34,10 @@ declare module 'adbkit' {
         pull(
             id: string,
             path: string
-        ): Promise<events.EventEmitter & { cancel: () => void }>
+        ): Promise<stream.Readable & { cancel: () => void }>
         shell(id: string, cmd: string | string[]): Promise<stream.Readable>;
         root(id: string): Promise<true>;
+        on(type: 'error', handler: (error: Error) => void): void;
     }
 
     export function createClient(options?: {

package-lock.json

@@ -26,6 +26,7 @@
   "homepage": "https://github.com/httptoolkit/httptoolkit-server",
   "bugs": "https://github.com/httptoolkit/httptoolkit-server/issues",
   "dependencies": {
+    "@httptoolkit/adbkit": "^2.11.2-crashfix",
     "@httptoolkit/browser-launcher": "^1.7.3",
     "@httptoolkit/osx-find-executable": "^2.0.0",
     "@oclif/command": "^1.5.4",
@@ -37,7 +38,6 @@
     "@types/command-exists": "^1.2.0",
     "@types/node-fetch": "^2.5.4",
     "@types/tmp": "0.0.33",
-    "adbkit": "^2.11.1",
     "async-mutex": "^0.1.3",
     "chrome-remote-interface": "^0.28.0",
     "command-exists": "^1.2.8",

package.json

@@ -1,6 +1,6 @@
 import * as stream from 'stream';
 import * as path from 'path';
-import * as adb from 'adbkit';
+import * as adb from '@httptoolkit/adbkit';
 import { reportError } from '../../error-tracking';
 import { delay } from '../../util';
 import { getCertificateFingerprint, parseCert } from '../../certificates';
@@ -9,7 +9,7 @@ export const ANDROID_TEMP = '/data/local/tmp';
 export const SYSTEM_CA_PATH = '/system/etc/security/cacerts';
 
 export function createAdbClient() {
-    return adb.createClient({
+    const client = adb.createClient({
         port: process.env['ANDROID_ADB_SERVER_PORT']
             ? parseInt(process.env['ANDROID_ADB_SERVER_PORT'], 10)
             : 5037,
@@ -18,6 +18,12 @@ export function createAdbClient() {
             ? path.join(process.env['ANDROID_HOME'], 'platform-tools', 'adb')
             : 'adb'
     });
+
+    // We listen for errors and report them. This only happens if adbkit completely
+    // fails to handle or listen to a connection error. We'd rather report that than crash.
+    client.on('error', reportError);
+
+    return client;
 }
 
 // Batch async calls, so that all calls whilst one call is ongoing return the same result.