Add attach / detach commands (#534)

* Add attach / detach commands

Signed-off-by: Yishai Yosifov <74960133+YishaiYosifov@users.noreply.github.com>

* Add "unknown" type to the device interface

Signed-off-by: Yishai Yosifov <74960133+YishaiYosifov@users.noreply.github.com>

---------

Signed-off-by: Yishai Yosifov <74960133+YishaiYosifov@users.noreply.github.com>

Author: slomg

README.md

@@ -951,6 +951,22 @@ Waits until ADB can see the device. Note that you must know the serial in advanc
 -   Returns: `Promise`
 -   Resolves with: `id` (see callback)
 
+#### device.attach():
+Reattaches ADB to the device's ADB USB interface. This re-enables communication between ADB and device, reversing `client.detach()`.
+
+-   **callback(err)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` if the device device was reattached successfully, `Error` otherwise (can occur if the device is not detached).
+-   Returns: `Promise`
+-   Resolves with: `true`
+
+#### device.detach():
+Detaches ADB's USB interface from ADB. This releases the device from ADB control, allowing other processes to use it.
+
+-   **callback(err)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` if the device device was detached successfully, `Error` otherwise (can occur if the device is not attached).
+-   Returns: `Promise`
+-   Resolves with: `true`
+
 ### Sync
 
 #### sync.end()

src/Device.ts

@@ -1,4 +1,4 @@
 export default interface Device {
   id: string;
-  type: 'emulator' | 'device' | 'offline' | 'unauthorized';
+  type: 'emulator' | 'device' | 'offline' | 'unauthorized' | 'unknown';
 }

src/adb/DeviceClient.ts

@@ -36,6 +36,8 @@ import {
   WaitBootCompleteCommand,
 } from './command/host-transport';
 import {
+  AttachCommand,
+  DetachCommand,
   ForwardCommand,
   GetDevicePathCommand,
   GetSerialNoCommand,
@@ -603,4 +605,22 @@ export default class DeviceClient {
   public waitForDevice(): Bluebird<string> {
     return this.connection().then((conn) => new WaitForDeviceCommand(conn).execute(this.serial));
   }
+
+  /**
+   * Reattaches ADB to the device's ADB USB interface. This re-enables communication between ADB and device, reversing `client.detach()`.
+   *
+   * @returns true
+   */
+  public attach(): Bluebird<boolean> {
+    return this.connection().then((conn) => new AttachCommand(conn).execute(this.serial));
+  }
+
+  /**
+   * Detaches ADB's USB interface from ADB. This releases the device from ADB control, allowing other processes to use it.
+   *
+   * @returns true
+   */
+  public detach(): Bluebird<boolean> {
+    return this.connection().then((conn) => new DetachCommand(conn).execute(this.serial));
+  }
 }

src/adb/command/host-serial/attach.ts

@@ -0,0 +1,19 @@
+import Command from '../../command';
+import Protocol from '../../protocol';
+import Bluebird from 'bluebird';
+
+export default class AttachCommand extends Command<boolean> {
+  execute(serial: string): Bluebird<boolean> {
+    this._send(`host-serial:${serial}:attach`);
+    return this.parser.readAscii(4).then((reply) => {
+      switch (reply) {
+        case Protocol.OKAY:
+          return true;
+        case Protocol.FAIL:
+          return this.parser.readError();
+        default:
+          return this.parser.unexpected(reply, 'OKAY or FAIL');
+      }
+    });
+  }
+}

src/adb/command/host-serial/detach.ts

@@ -0,0 +1,19 @@
+import Command from '../../command';
+import Protocol from '../../protocol';
+import Bluebird from 'bluebird';
+
+export default class DetachCommand extends Command<boolean> {
+  execute(serial: string): Bluebird<boolean> {
+    this._send(`host-serial:${serial}:detach`);
+    return this.parser.readAscii(4).then((reply) => {
+      switch (reply) {
+        case Protocol.OKAY:
+          return true;
+        case Protocol.FAIL:
+          return this.parser.readError();
+        default:
+          return this.parser.unexpected(reply, 'OKAY or FAIL');
+      }
+    });
+  }
+}

src/adb/command/host-serial/index.ts

@@ -1,3 +1,5 @@
+export { default as AttachCommand } from './attach';
+export { default as DetachCommand } from './detach';
 export { default as ForwardCommand } from './forward';
 export { default as GetDevicePathCommand } from './getdevicepath';
 export { default as GetSerialNoCommand } from './getdevicepath';