Add list-devices option to list the available devices.

Summary: This diff adds an option of `--list-devices` which will list the currently active devices on the machine. It will be later used to select a device by passing an `id` as an argument.

Reviewed By: danielbuechele

Differential Revision: D15524250

fbshipit-source-id: 7a79ceb1e431a25adcb4e05bc0cb68407c527806

headless/index.js

@@ -17,7 +17,7 @@ import {
   exportMetricsWithoutTrace,
   exportMetricsFromTrace,
 } from '../src/utils/exportMetrics.js';
-
+import {listDevices} from '../src/utils/listDevices';
 // $FlowFixMe this file exist, trust me, flow!
 import setup from '../static/setup.js';
 
@@ -60,6 +60,12 @@ yargs
         describe: 'Will export metrics instead of data when flipper terminates',
         type: 'string',
       });
+      yargs.option('list-devices', {
+        alias: 'showDevices',
+        default: false,
+        describe: 'Will print the list of devices in the terminal',
+        type: 'boolean',
+      });
     },
     startFlipper,
   )
@@ -77,6 +83,7 @@ async function startFlipper({
   dev,
   verbose,
   metrics,
+  showDevices,
   exit,
   'insecure-port': insecurePort,
   'secure-port': securePort,
@@ -145,8 +152,15 @@ async function startFlipper({
     devToolsEnhancer.composeWithDevTools(applyMiddleware(headlessMiddleware)),
   );
   const logger = initLogger(store, {isHeadless: true});
-  dispatcher(store, logger);
 
+  //TODO: T45068486 Refactor this function into separate components.
+  if (showDevices) {
+    const devices = await listDevices();
+    originalConsole.log(devices);
+    process.exit();
+  }
+
+  dispatcher(store, logger);
   if (shouldExportMetric(metrics) && metrics && metrics.length > 0) {
     try {
       const payload = await exportMetricsFromTrace(metrics, store.getState());

src/dispatcher/androidDevice.js

@@ -14,11 +14,12 @@ import {registerDeviceCallbackOnPlugins} from '../utils/onRegisterDevice.js';
 import {getAdbClient} from '../utils/adbClient';
 import {default as which} from 'which';
 import {promisify} from 'util';
+import type {ServerPorts} from '../reducers/application';
 
 function createDevice(
   adbClient: any,
   device: any,
-  store: Store,
+  ports: ?ServerPorts,
 ): Promise<AndroidDevice> {
   return new Promise((resolve, reject) => {
     const type =
@@ -32,13 +33,22 @@ function createDevice(
         name = (await getRunningEmulatorName(device.id)) || name;
       }
       const androidDevice = new AndroidDevice(device.id, type, name, adbClient);
-      const ports = store.getState().application.serverPorts;
+      if (ports) {
-      androidDevice.reverse([ports.secure, ports.insecure]);
+        androidDevice.reverse([ports.secure, ports.insecure]);
+      }
       resolve(androidDevice);
     });
   });
 }
 
+export async function getActiveAndroidDevices(): Promise<Array<BaseDevice>> {
+  const client = await getAdbClient();
+  const androidDevices = await client.listDevices();
+  return await Promise.all(
+    androidDevices.map(device => createDevice(client, device)),
+  );
+}
+
 function getRunningEmulatorName(id: string): Promise<?string> {
   return new Promise((resolve, reject) => {
     const port = id.replace('emulator-', '');
@@ -138,7 +148,11 @@ export default (store: Store, logger: Logger) => {
   };
 
   async function registerDevice(adbClient: any, deviceData: any, store: Store) {
-    const androidDevice = await createDevice(adbClient, deviceData, store);
+    const androidDevice = await createDevice(
+      adbClient,
+      deviceData,
+      store.getState().application.serverPorts,
+    );
     logger.track('usage', 'register-device', {
       os: 'Android',
       name: androidDevice.title,

src/dispatcher/iOSDevice.js

@@ -142,6 +142,20 @@ function getActiveDevices(): Promise<Array<IOSDeviceParams>> {
   });
 }
 
+export async function getActiveDevicesAndSimulators(): Promise<
+  Array<IOSDevice>,
+> {
+  const activeDevices: Array<Array<IOSDeviceParams>> = await Promise.all([
+    getActiveSimulators(),
+    getActiveDevices(),
+  ]);
+  const allDevices = activeDevices[0].concat(activeDevices[1]);
+  return allDevices.map(device => {
+    const {udid, type, name} = device;
+    return new IOSDevice(udid, type, name);
+  });
+}
+
 export default (store: Store, logger: Logger) => {
   // monitoring iOS devices only available on MacOS.
   if (process.platform !== 'darwin') {

src/reducers/application.js

@@ -30,6 +30,10 @@ export type LauncherMsg = {
   message: string,
   severity: 'warning' | 'error',
 };
+export type ServerPorts = {
+  insecure: number,
+  secure: number,
+};
 
 export type State = {
   leftSidebarVisible: boolean,
@@ -39,10 +43,7 @@ export type State = {
   activeSheet: ActiveSheet,
   exportFile: ?string,
   sessionId: ?string,
-  serverPorts: {
+  serverPorts: ServerPorts,
-    insecure: number,
-    secure: number,
-  },
   downloadingImportData: boolean,
   launcherMsg: LauncherMsg,
 };

src/utils/listDevices.js

@@ -0,0 +1,15 @@
+/**
+ * Copyright 2018-present Facebook.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ * @format
+ */
+import {getActiveAndroidDevices} from '../dispatcher/androidDevice';
+import {getActiveDevicesAndSimulators} from '../dispatcher/iOSDevice';
+import type BaseDevice from '../devices/BaseDevice';
+
+export async function listDevices(): Promise<Array<BaseDevice>> {
+  const androidDevices = await getActiveAndroidDevices();
+  const iOSDevices = await getActiveDevicesAndSimulators();
+  return iOSDevices.concat(androidDevices);
+}