Clean up activation timeout logic, which didn't work as intended

Seems like I misunderstood/confused myself somehow in cf3ea7e: this
doesn't configure an activation timeout (which doesn't really exist,
though we report errors at 30s+) but instead sets the isActivable
timeout. That's not actually very important for ADB (should be quick,
perhaps after the first check) AFAICT, and it's definitely not what was
described/documented for this change.

Now, we extend the time a little for the JVM and ADB, both of which may
need to wait for external processes (especially slow on Mac) but
otherwise keep the default 1s for isActivable and 30s warning for
activation itself.

Author: pimterry

src/api-server.ts

@@ -167,7 +167,7 @@ const buildResolvers = (
             isActivable: (interceptor: Interceptor) => {
                 return withFallback(
                     interceptor.isActivable(),
-                    interceptor.activationTimeout || INTERCEPTOR_TIMEOUT,
+                    interceptor.activableTimeout || INTERCEPTOR_TIMEOUT,
                     false
                 );
             },

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

@@ -45,6 +45,8 @@ export class AndroidAdbInterceptor implements Interceptor {
         return (await getConnectedDevices(this.adbClient)).length > 0;
     }
 
+    activableTimeout = 3000; // Increase timeout for device detection slightly
+
     isActive(): boolean {
         return false;
     }
@@ -55,8 +57,6 @@ export class AndroidAdbInterceptor implements Interceptor {
         };
     }
 
-    activationTimeout = 10000; // Increase timeout for this interceptor to 10s, as initial setup takes a while
-
     async activate(proxyPort: number, options: {
         deviceId: string
     }): Promise<void | {}> {

src/interceptors/index.ts

@@ -29,13 +29,14 @@ export interface Interceptor {
     id: string;
     version: string;
 
-    getMetadata?(type: 'summary' | 'detailed'): any;
+    getMetadata?(type: 'summary' | 'detailed'): Promise<any>;
 
     isActivable(): Promise<boolean>;
+    activableTimeout?: number;
+
     isActive(proxyPort: number): boolean;
 
     activate(proxyPort: number, options?: any): Promise<void | {}>;
-    activationTimeout?: number;
 
     deactivate(proxyPort: number, options?: any): Promise<void | {}>;
     deactivateAll(): Promise<void | {}>;

src/interceptors/jvm.ts

@@ -88,14 +88,14 @@ export class JvmInterceptor implements Interceptor {
         [pid: string]: number // PID -> proxy port
     } = {};
 
-    activationTimeout = 2000; // Increase the timeout slightly for this
-
     constructor(private config: HtkConfig) { }
 
     async isActivable(): Promise<boolean> {
         return !!await javaBinPromise;
     }
 
+    activableTimeout = 2000; // Increase the timeout slightly for this
+
     isActive(proxyPort: number | string) {
         return _.some(this.interceptedProcesses, (port) => port === proxyPort);
     }