Enhancing types for Device

Summary: While investigating Flipper to unblock D30990411. I found this untyped `device` field. This field is exactly the `Device` type in 'adbkit', so I did a small refactor to type it.

Reviewed By: timur-valiev

Differential Revision: D30996427

fbshipit-source-id: 9972a865c2dee009088635e57ef512969f404ddf

desktop/app/src/server/devices/android/AndroidDevice.tsx

@@ -8,7 +8,7 @@
  */
 
 import BaseDevice from '../BaseDevice';
-import adb, {Client as ADBClient} from 'adbkit';
+import adb, {Client as ADBClient, PullTransfer} from 'adbkit';
 import {Priority, Reader} from 'adbkit-logcat';
 import {createWriteStream} from 'fs';
 import type {LogLevel, DeviceType} from 'flipper-plugin';

desktop/app/src/server/devices/android/androidDeviceManager.tsx

@@ -13,7 +13,7 @@ import child_process from 'child_process';
 import {getAdbClient} from './adbClient';
 import which from 'which';
 import {promisify} from 'util';
-import {Client as ADBClient} from 'adbkit';
+import {Client as ADBClient, Device} from 'adbkit';
 import {join} from 'path';
 import {FlipperServer} from '../../FlipperServer';
 import {notNull} from '../../utils/typeUtils';
@@ -26,7 +26,7 @@ export class AndroidDeviceManager {
 
   private createDevice(
     adbClient: ADBClient,
-    device: any,
+    device: Device,
   ): Promise<AndroidDevice | undefined> {
     return new Promise(async (resolve, reject) => {
       const type =
@@ -224,7 +224,7 @@ export class AndroidDeviceManager {
     }
   }
 
-  private async registerDevice(adbClient: ADBClient, deviceData: any) {
+  private async registerDevice(adbClient: ADBClient, deviceData: Device) {
     const androidDevice = await this.createDevice(adbClient, deviceData);
     if (!androidDevice) {
       return;

desktop/types/adbkit.d.ts

@@ -7,44 +7,43 @@
  * @format
  */
 
-interface Device {
-  id: string;
-  type: 'emulator' | 'device' | 'offline';
-}
-
-interface Util {
-  readAll: (stream: NodeJS.ReadStream) => Promise<Buffer>;
-}
-
-// https://github.com/openstf/adbkit#pulltransfer
-interface PullTransfer extends NodeJS.WriteStream {
-  cancel: () => this;
-  on(
-    event: 'progress',
-    listener: (stats: {bytesTransferred: number}) => void,
-  ): this;
-  on(event: 'error', listener: (err: Error) => void): this;
-  on(event: 'end', listener: () => void): this;
-  on(event: 'resize', listener: () => void): this;
-}
-
-interface DeviceTracker extends NodeJS.EventEmitter {
-  on(event: 'add', listener: (device: Device) => void): this;
-  on(event: 'remove', listener: (device: Device) => void): this;
-  on(event: 'change', listener: (device: Device) => void): this;
-  on(
-    event: 'changeSet',
-    listener: (changes: {
-      added: Device[];
-      removed: Device[];
-      changed: Device[];
-    }) => void,
-  ): this;
-  on(event: 'error', listener: (err: Error) => void): this;
-  on(event: 'end', listener: () => void): this;
-}
-
 declare module 'adbkit' {
+  export interface Device {
+    id: string;
+    type: 'emulator' | 'device' | 'offline';
+  }
+
+  interface Util {
+    readAll: (stream: NodeJS.ReadStream) => Promise<Buffer>;
+  }
+
+  // https://github.com/openstf/adbkit#pulltransfer
+  export interface PullTransfer extends NodeJS.WriteStream {
+    cancel: () => this;
+    on(
+      event: 'progress',
+      listener: (stats: {bytesTransferred: number}) => void,
+    ): this;
+    on(event: 'error', listener: (err: Error) => void): this;
+    on(event: 'end', listener: () => void): this;
+    on(event: 'resize', listener: () => void): this;
+  }
+
+  interface DeviceTracker extends NodeJS.EventEmitter {
+    on(event: 'add', listener: (device: Device) => void): this;
+    on(event: 'remove', listener: (device: Device) => void): this;
+    on(event: 'change', listener: (device: Device) => void): this;
+    on(
+      event: 'changeSet',
+      listener: (changes: {
+        added: Device[];
+        removed: Device[];
+        changed: Device[];
+      }) => void,
+    ): this;
+    on(event: 'error', listener: (err: Error) => void): this;
+    on(event: 'end', listener: () => void): this;
+  }
   const util: Util;
   const adbkit: any;
   export interface Client {