Merge pull request #22 from emereum/emereum-devices-with-paths-ignore…

…-incomplete

Ignore incomplete device info when retrieving devices with paths

src/adb/command/host/HostDevicesWithPathsCommand.ts

@@ -1,7 +1,7 @@
 import Command from '../../command';
 import DeviceWithPath from '../../../models/DeviceWithPath';
 import DeviceClient from '../../DeviceClient';
-import { DeviceType } from '../../../models/Device';
+import { isDeviceType } from '../../../models/Device';
 
 
 export default class HostDevicesWithPathsCommand extends Command<DeviceWithPath[]> {
@@ -18,25 +18,25 @@ export default class HostDevicesWithPathsCommand extends Command<DeviceWithPath[
   }
 
   private _parseDevices(value: string): DeviceWithPath[] {
-    return value
-      .split('\n')
-      .filter((e) => e)
-      .map((line: string) => {
-        // eslint-disable-next-line prefer-const
-        let [id, type, path, product, model, device, transportId] = line.split(/\s+/);
-        model = model.replace('model:', '');
-        product = product.replace('product:', '');
-        transportId = transportId.replace('transport_id:', '');
-        return {
-          id,
-          type: type as DeviceType,
-          path,
-          product,
-          model,
-          device,
-          transportId,
-          getClient: () => new DeviceClient(this.connection.parent, id),
-        };
-      });
+    const regexp = /^([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+product:([^\s]+)\s+model:([^\s]+)\s+device:([^\s]+)\s+transport_id:([^\s]+)$/gm;
+    const devices: DeviceWithPath[] = [];
+    let match;
+    while ((match = regexp.exec(value)) !== null) {
+      const [, id, type, path, product, model, device, transportId] = match;
+      if (!isDeviceType(type)) {
+        continue;
+      }
+      devices.push({
+        id,
+        type,
+        path,
+        product,
+        model,
+        device,
+        transportId,
+        getClient: () => new DeviceClient(this.connection.parent, id),
+      })
+    }
+    return devices;
   }
 }

src/models/Device.ts

@@ -1,9 +1,13 @@
 import { DeviceClient } from "..";
 
+const deviceTypes = ['emulator', 'device', 'offline', 'unauthorized', 'recovery'] as const;
 /**
  * adb device starts
  */
-export type DeviceType = 'emulator' | 'device' | 'offline' | 'unauthorized' | 'recovery';
+export type DeviceType = typeof deviceTypes[number];
+export function isDeviceType(value: string): value is DeviceType {
+  return deviceTypes.includes(value as DeviceType);
+}
 
 export default interface Device {
   /**