diff --git a/desktop/app/src/server/devices/android/AndroidDevice.tsx b/desktop/app/src/server/devices/android/AndroidDevice.tsx index d7b6a556e..de7072f2f 100644 --- a/desktop/app/src/server/devices/android/AndroidDevice.tsx +++ b/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'; diff --git a/desktop/app/src/server/devices/android/androidDeviceManager.tsx b/desktop/app/src/server/devices/android/androidDeviceManager.tsx index de5cbc5e4..5dc3ec719 100644 --- a/desktop/app/src/server/devices/android/androidDeviceManager.tsx +++ b/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 { 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; diff --git a/desktop/types/adbkit.d.ts b/desktop/types/adbkit.d.ts index 320b28087..7a23542d0 100644 --- a/desktop/types/adbkit.d.ts +++ b/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; -} - -// 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; + } + + // 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 {