@devicefarmer/adbkit 2.11.3 → 3.2.2

package/README.md

@@ -1,7 +1,5 @@
 # adbkit
 
-_**Interested in helping to convert the CoffeeScript codebase to plain JavaScript? [Help us](https://github.com/openstf/adbkit/issues/48)!**_
-
 **adbkit** is a pure [Node.js][nodejs] client for the [Android Debug Bridge][adb-site] server. It can be used either as a library in your own application, or simply as a convenient utility for playing with your device.
 
 Most of the `adb` command line tool's functionality is supported (including pushing/pulling files, installing APKs and processing logs), with some added functionality such as being able to generate touch/key events and take screenshots. Some shims are provided for older devices, but we have not and will not test anything below Android 2.3.
@@ -10,8 +8,8 @@ Internally, we use this library to drive a multitude of Android devices from a v
 
 ## Requirements
 
-* [Node.js][nodejs] >= 0.10
-* The `adb` command line tool
+-   [Node.js][nodejs] >= 0.10
+-   The `adb` command line tool
 
 Please note that although it may happen at some point, **this project is NOT an implementation of the ADB _server_**. The target host (where the devices are connected) must still have ADB installed and either already running (e.g. via `adb start-server`) or available in `$PATH`. An attempt will be made to start the server locally via the aforementioned command if the initial connection fails. This is the only case where we fall back to the `adb` binary.
 
@@ -19,192 +17,171 @@ When targeting a remote host, starting the server is entirely your responsibilit
 
 Alternatively, you may want to consider using the Chrome [ADB][chrome-adb] extension, as it includes the ADB server and can be started/stopped quite easily.
 
+For Linux users, adb need `plugdev` group acess, So you may need to add your current user to `plugdev` group.
+`sudo usermod -a -G plugdev $USER`
+
 ## Getting started
 
 Install via NPM:
 
 ```bash
-npm install --save adbkit
+npm install --save @devicefarmer/adbkit
 ```
 
 We use [debug][node-debug], and our debug namespace is `adb`. Some of the dependencies may provide debug output of their own. To see the debug output, set the `DEBUG` environment variable. For example, run your program with `DEBUG=adb:* node app.js`.
 
-Note that even though the module is written in [CoffeeScript][coffeescript], only the compiled JavaScript is published to [NPM][npm], which means that it can easily be used with pure JavaScript codebases, too.
-
 ### Examples
 
 The examples may be a bit verbose, but that's because we're trying to keep them as close to real-life code as possible, with flow control and error handling taken care of.
 
 #### Checking for NFC support
 
-```js
-var Promise = require('bluebird')
-var adb = require('adbkit')
-var client = adb.createClient()
-
-client.listDevices()
-  .then(function(devices) {
-    return Promise.filter(devices, function(device) {
-      return client.getFeatures(device.id)
-        .then(function(features) {
-          return features['android.hardware.nfc']
-        })
-    })
-  })
-  .then(function(supportedDevices) {
-    console.log('The following devices support NFC:', supportedDevices)
-  })
-  .catch(function(err) {
-    console.error('Something went wrong:', err.stack)
-  })
+```typescript
+import Bluebird from 'bluebird';
+import Adb from '@devicefarmer/adbkit';
+
+const client = Adb.createClient();
+
+const test = async () => {
+    try {
+        const devices = await client.listDevices();
+        const supportedDevices = await Bluebird.filter(devices, async (device) => {
+            const features = await client.getFeatures(device.id);
+            return features['android.hardware.nfc'];
+        });
+        console.log('The following devices support NFC:', supportedDevices);
+    } catch (err) {
+        console.error('Something went wrong:', err.stack);
+    }
+};
 ```
 
 #### Installing an APK
 
-```js
-var Promise = require('bluebird')
-var adb = require('adbkit')
-var client = adb.createClient()
-var apk = 'vendor/app.apk'
-
-client.listDevices()
-  .then(function(devices) {
-    return Promise.map(devices, function(device) {
-      return client.install(device.id, apk)
-    })
-  })
-  .then(function() {
-    console.log('Installed %s on all connected devices', apk)
-  })
-  .catch(function(err) {
-    console.error('Something went wrong:', err.stack)
-  })
+```typescript
+import Bluebird from 'bluebird';
+import Adb from '@devicefarmer/adbkit';
+
+const client = Adb.createClient();
+const apk = 'vendor/app.apk';
+
+const test = async () => {
+    try {
+        const devices = await client.listDevices();
+        await Bluebird.map(devices, (device) => client.install(device.id, apk));
+        console.log(`Installed ${apk} on all connected devices`);
+    } catch (err) {
+        console.error('Something went wrong:', err.stack);
+    }
+};
 ```
 
 #### Tracking devices
 
-```js
-var adb = require('adbkit')
-var client = adb.createClient()
-
-client.trackDevices()
-  .then(function(tracker) {
-    tracker.on('add', function(device) {
-      console.log('Device %s was plugged in', device.id)
-    })
-    tracker.on('remove', function(device) {
-      console.log('Device %s was unplugged', device.id)
-    })
-    tracker.on('end', function() {
-      console.log('Tracking stopped')
-    })
-  })
-  .catch(function(err) {
-    console.error('Something went wrong:', err.stack)
-  })
+```typescript
+import Adb from '@devicefarmer/adbkit';
+
+const client = Adb.createClient();
+const test = async () => {
+    try {
+        const tracker = await client.trackDevices();
+        tracker.on('add', (device) => console.log('Device %s was plugged in', device.id));
+        tracker.on('remove', (device) => console.log('Device %s was unplugged', device.id));
+        tracker.on('end', () => console.log('Tracking stopped'));
+    } catch (err) {
+        console.error('Something went wrong:', err.stack);
+    }
+};
 ```
 
 #### Pulling a file from all connected devices
 
-```js
-var Promise = require('bluebird')
-var fs = require('fs')
-var adb = require('adbkit')
-var client = adb.createClient()
-
-client.listDevices()
-  .then(function(devices) {
-    return Promise.map(devices, function(device) {
-      return client.pull(device.id, '/system/build.prop')
-        .then(function(transfer) {
-          return new Promise(function(resolve, reject) {
-            var fn = '/tmp/' + device.id + '.build.prop'
-            transfer.on('progress', function(stats) {
-              console.log('[%s] Pulled %d bytes so far',
-                device.id,
-                stats.bytesTransferred)
-            })
-            transfer.on('end', function() {
-              console.log('[%s] Pull complete', device.id)
-              resolve(device.id)
-            })
-            transfer.on('error', reject)
-            transfer.pipe(fs.createWriteStream(fn))
-          })
-        })
-    })
-  })
-  .then(function() {
-    console.log('Done pulling /system/build.prop from all connected devices')
-  })
-  .catch(function(err) {
-    console.error('Something went wrong:', err.stack)
-  })
+```typescript
+import Bluebird from 'bluebird';
+import fs from 'fs';
+import Adb from '@devicefarmer/adbkit';
+const client = Adb.createClient();
+
+const test = async () => {
+    try {
+        const devices = await client.listDevices();
+        await Bluebird.map(devices, async (device) => {
+            const transfer = await client.pull(device.id, '/system/build.prop');
+            const fn = `/tmp/${device.id}.build.prop`;
+            await new Bluebird((resolve, reject) => {
+                transfer.on('progress', (stats) =>
+                    console.log(`[${device.id}] Pulled ${stats.bytesTransferred} bytes so far`),
+                );
+                transfer.on('end', () => {
+                    console.log(`[${device.id}] Pull complete`);
+                    resolve(device.id);
+                });
+                transfer.on('error', reject);
+                transfer.pipe(fs.createWriteStream(fn));
+            });
+        });
+        console.log('Done pulling /system/build.prop from all connected devices');
+    } catch (err) {
+        console.error('Something went wrong:', err.stack);
+    }
+};
 ```
 
 #### Pushing a file to all connected devices
 
-```js
-var Promise = require('bluebird')
-var adb = require('adbkit')
-var client = adb.createClient()
-
-client.listDevices()
-  .then(function(devices) {
-    return Promise.map(devices, function(device) {
-      return client.push(device.id, 'temp/foo.txt', '/data/local/tmp/foo.txt')
-        .then(function(transfer) {
-          return new Promise(function(resolve, reject) {
-            transfer.on('progress', function(stats) {
-              console.log('[%s] Pushed %d bytes so far',
-                device.id,
-                stats.bytesTransferred)
-            })
-            transfer.on('end', function() {
-              console.log('[%s] Push complete', device.id)
-              resolve()
-            })
-            transfer.on('error', reject)
-          })
-        })
-    })
-  })
-  .then(function() {
-    console.log('Done pushing foo.txt to all connected devices')
-  })
-  .catch(function(err) {
-    console.error('Something went wrong:', err.stack)
-  })
+```typescript
+import Bluebird from 'bluebird';
+import Adb from '@devicefarmer/adbkit';
+const client = Adb.createClient();
+
+const test = async () => {
+    try {
+        const devices = await client.listDevices();
+        await Bluebird.map(devices, async (device) => {
+            const transfer = await client.push(device.id, 'temp/foo.txt', '/data/local/tmp/foo.txt');
+            await new Bluebird(function (resolve, reject) {
+                transfer.on('progress', (stats) =>
+                    console.log(`[${device.id}] Pushed ${stats.bytesTransferred} bytes so far`),
+                );
+                transfer.on('end', () => {
+                    console.log('[${device.id}] Push complete');
+                    resolve();
+                });
+                transfer.on('error', reject);
+            });
+        });
+        console.log('Done pushing foo.txt to all connected devices');
+    } catch (err) {
+        console.error('Something went wrong:', err.stack);
+    }
+};
 ```
 
 #### List files in a folder
 
-```js
-var Promise = require('bluebird')
-var adb = require('adbkit')
-var client = adb.createClient()
-
-client.listDevices()
-  .then(function(devices) {
-    return Promise.map(devices, function(device) {
-      return client.readdir(device.id, '/sdcard')
-        .then(function(files) {
-          // Synchronous, so we don't have to care about returning at the
-          // right time
-          files.forEach(function(file) {
-            if (file.isFile()) {
-              console.log('[%s] Found file "%s"', device.id, file.name)
-            }
-          })
-        })
-    })
-  })
-  .then(function() {
-    console.log('Done checking /sdcard files on connected devices')
-  })
-  .catch(function(err) {
-    console.error('Something went wrong:', err.stack)
-  })
+```typescript
+import Bluebird from 'bluebird';
+import Adb from '@devicefarmer/adbkit';
+const client = Adb.createClient();
+
+const test = async () => {
+    try {
+        const devices = await client.listDevices();
+        await Bluebird.map(devices, async (device) => {
+            const files = await client.readdir(device.id, '/sdcard');
+            // Synchronous, so we don't have to care about returning at the
+            // right time
+            files.forEach((file) => {
+                if (file.isFile()) {
+                    console.log(`[${device.id}] Found file "${file.name}"`);
+                }
+            });
+        });
+        console.log('Done checking /sdcard files on connected devices');
+    } catch (err) {
+        console.error('Something went wrong:', err.stack);
+    }
+};
 ```
 
 ## API
@@ -215,524 +192,535 @@ client.listDevices()
 
 Creates a client instance with the provided options. Note that this will not automatically establish a connection, it will only be done when necessary.
 
-* **options** An object compatible with [Net.connect][net-connect]'s options:
-    - **port** The port where the ADB server is listening. Defaults to `5037`.
-    - **host** The host of the ADB server. Defaults to `'localhost'`.
-    - **bin** As the sole exception, this option provides the path to the `adb` binary, used for starting the server locally if initial connection fails. Defaults to `'adb'`.
-* Returns: The client instance.
+-   **options** An object compatible with [Net.connect][net-connect]'s options:
+    -   **port** The port where the ADB server is listening. Defaults to `5037`.
+    -   **host** The host of the ADB server. Defaults to `'127.0.0.1'`.
+    -   **bin** As the sole exception, this option provides the path to the `adb` binary, used for starting the server locally if initial connection fails. Defaults to `'adb'`.
+-   Returns: The client instance.
 
-#### adb.util.parsePublicKey(androidKey[, callback])
+#### adb.util.parsePublicKey(androidKey)
 
 Parses an Android-formatted mincrypt public key (e.g. `~/.android/adbkey.pub`).
 
-* **androidKey** The key String or [`Buffer`][node-buffer] to parse. Not a filename.
-* **callback(err, output)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **key** The key as a [forge.pki](https://github.com/digitalbazaar/forge#rsa) public key. You may need [node-forge](https://github.com/digitalbazaar/forge) for complicated operations. Additionally the following properties are present:
-      * **fingerprint** The key fingerprint, like it would display on a device. Note that this is different than the one you'd get from `forge.ssh.getPublicKeyFingerprint(key)`, because the device fingerprint is based on the original format.
-      * **comment** The key comment, if any.
-* Returns: `Promise`
-* Resolves with: `key` (see callback)
+-   **androidKey** The key String or [`Buffer`][node-buffer] to parse. Not a filename.
+-   **callback(err, output)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **key** The key as a [forge.pki](https://github.com/digitalbazaar/forge#rsa) public key. You may need [node-forge](https://github.com/digitalbazaar/forge) for complicated operations. Additionally the following properties are present:
+        -   **fingerprint** The key fingerprint, like it would display on a device. Note that this is different than the one you'd get from `forge.ssh.getPublicKeyFingerprint(key)`, because the device fingerprint is based on the original format.
+        -   **comment** The key comment, if any.
+-   Returns: `Promise`
+-   Resolves with: `key` (see callback)
 
-#### adb.util.readAll(stream[, callback])
+#### adb.util.readAll(stream)
 
 Takes a [`Stream`][node-stream] and reads everything it outputs until the stream ends. Then it resolves with the collected output. Convenient with `client.shell()`.
 
-* **stream** The [`Stream`][node-stream] to read.
-* **callback(err, output)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **output** All the output as a [`Buffer`][node-buffer]. Use `output.toString('utf-8')` to get a readable string from it.
-* Returns: `Promise`
-* Resolves with: `output` (see callback)
+-   **stream** The [`Stream`][node-stream] to read.
+-   **callback(err, output)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **output** All the output as a [`Buffer`][node-buffer]. Use `output.toString('utf-8')` to get a readable string from it.
+-   Returns: `Promise`
+-   Resolves with: `output` (see callback)
 
 ### Client
 
-#### client.clear(serial, pkg[, callback])
 
-Deletes all data associated with a package from the device. This is roughly analogous to `adb shell pm clear <pkg>`.
+#### client.version()
+
+Queries the ADB server for its version. This is mainly useful for backwards-compatibility purposes.
+
+-   **callback(err, version)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **version** The version of the ADB server.
+-   Returns: `Promise`
+-   Resolves with: `version` (see callback)
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **pkg** The package name. This is NOT the APK.
-* **callback(err)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-* Returns: `Promise`
-* Resolves with: `true`
 
-#### client.connect(host[, port]&#91;, callback])
+#### client.connect(host[, port])
 
 Connects to the given device, which must have its ADB daemon running in tcp mode (see `client.tcpip()`) and be accessible on the same network. Same as `adb connect <host>:<port>`.
 
-* **host** The target host. Can also contain the port, in which case the port argument is not used and can be skipped.
-* **port** Optional. The target port. Defaults to `5555`.
-* **callback(err, id)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **id** The connected device ID. Can be used as `serial` in other commands.
-* Returns: `Promise`
-* Resolves with: `id` (see callback)
+-   **host** The target host. Can also contain the port, in which case the port argument is not used and can be skipped.
+-   **port** Optional. The target port. Defaults to `5555`.
+-   **callback(err, id)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **id** The connected device ID. Can be used as `serial` in other commands.
+-   Returns: `Promise`
+-   Resolves with: `id` (see callback)
 
 ##### Example - switch to TCP mode and set up a forward for Chrome devtools
 
 Note: be careful with using `client.listDevices()` together with `client.tcpip()` and other similar methods that modify the connection with ADB. You might have the same device twice in your device list (i.e. one device connected via both USB and TCP), which can cause havoc if run simultaneously.
 
-```javascript
-var Promise = require('bluebird')
-var client = require('adbkit').createClient()
-
-client.listDevices()
-  .then(function(devices) {
-    return Promise.map(devices, function(device) {
-      return client.tcpip(device.id)
-        .then(function(port) {
-          // Switching to TCP mode causes ADB to lose the device for a
-          // moment, so let's just wait till we get it back.
-          return client.waitForDevice(device.id).return(port)
-        })
-        .then(function(port) {
-          return client.getDHCPIpAddress(device.id)
-            .then(function(ip) {
-              return client.connect(ip, port)
-            })
-            .then(function(id) {
-              // It can take a moment for the connection to happen.
-              return client.waitForDevice(id)
-            })
-            .then(function(id) {
-              return client.forward(id, 'tcp:9222', 'localabstract:chrome_devtools_remote')
-                .then(function() {
-                  console.log('Setup devtools on "%s"', id)
-                })
-            })
-        })
-    })
-  })
+```typescript
+import Bluebird from 'bluebird';
+import Adb from '@devicefarmer/adbkit';
+const client = Adb.createClient();
+
+const test = async () => {
+    try {
+        const devices = await client.listDevices();
+        await Bluebird.map(devices, async (device) => {
+            const device = client.getDevice(device.id);
+            const port = await device.tcpip();
+            // Switching to TCP mode causes ADB to lose the device for a
+            // moment, so let's just wait till we get it back.
+            await device.waitForDevice();
+            const ip = await device.getDHCPIpAddress();
+            const deviceTCP = await client.connect(ip, port);
+            // It can take a moment for the connection to happen.
+            await deviceTCP.waitForDevice();
+            await deviceTCP.forward('tcp:9222', 'localabstract:chrome_devtools_remote');
+            console.log(`Setup devtools on "${id}"`);
+        });
+    } catch (err) {
+        console.error('Something went wrong:', err.stack);
+    }
+};
 ```
 
-#### client.disconnect(host[, port]&#91;, callback])
+#### client.disconnect(host[, port])
 
 Disconnects from the given device, which should have been connected via `client.connect()` or just `adb connect <host>:<port>`.
 
-* **host** The target host. Can also contain the port, in which case the port argument is not used and can be skipped. In other words you can just put the `id` you got from `client.connect()` here and it will be fine.
-* **port** Optional. The target port. Defaults to `5555`.
-* **callback(err, id)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **id** The disconnected device ID. Will no longer be usable as a `serial` in other commands until you've connected again.
-* Returns: `Promise`
-* Resolves with: `id` (see callback)
+-   **host** The target host. Can also contain the port, in which case the port argument is not used and can be skipped. In other words you can just put the `id` you got from `client.connect()` here and it will be fine.
+-   **port** Optional. The target port. Defaults to `5555`.
+-   **callback(err, id)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **id** The disconnected device ID. Will no longer be usable as a `serial` in other commands until you've connected again.
+-   Returns: `Promise`
+-   Resolves with: `id` (see callback)
+
+
+#### client.kill()
+
+This kills the ADB server. Note that the next connection will attempt to start the server again when it's unable to connect.
+-   Returns: `Promise<true>`
+-   Resolves with: `true`
+
+
+#### client.listDevices()
+
+Gets the list of currently connected devices and emulators.
+-   Returns: `Promise<devices>` An array of device objects. The device objects are plain JavaScript objects with two properties: `id` and `type`.
+     -   **id** The ID of the device. For real devices, this is usually the USB identifier.
+    -   **type** The device type. Values include `'emulator'` for emulators, `'device'` for devices, and `'offline'` for offline devices. `'offline'` can occur for example during boot, in low-battery conditions or when the ADB connection has not yet been approved on the device.-   Resolves with: `devices` (see callback)
+
+#### client.listDevicesWithPaths()
+
+Like `client.listDevices()`, but includes the "path" of every device.
+-   Returns: `Promise<devices>` An array of device objects. The device objects are plain JavaScript objects with the following properties:
+    -   **id** See `client.listDevices()`.
+    -   **type** See `client.listDevices()`.
+    -   **path** The device path. This can be something like `usb:FD120000` for real devices.
+
+
+#### client.trackDevices()
+
+Gets a device tracker. Events will be emitted when devices are added, removed, or their type changes (i.e. to/from `offline`). Note that the same events will be emitted for the initially connected devices also, so that you don't need to use both `client.listDevices()` and `client.trackDevices()`.
+
+Note that as the tracker will keep a connection open, you must call `tracker.end()` if you wish to stop tracking devices.
+
+-   **callback(err, tracker)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **tracker** The device tracker, which is an [`EventEmitter`][node-events]. The following events are available:
+        -   **add** **(device)** Emitted when a new device is connected, once per device. See `client.listDevices()` for details on the device object.
+        -   **remove** **(device)** Emitted when a device is unplugged, once per device. This does not include `offline` devices, those devices are connected but unavailable to ADB. See `client.listDevices()` for details on the device object.
+        -   **change** **(device)** Emitted when the `type` property of a device changes, once per device. The current value of `type` is the new value. This event usually occurs the type changes from `'device'` to `'offline'` or the other way around. See `client.listDevices()` for details on the device object and the `'offline'` type.
+        -   **changeSet** **(changes)** Emitted once for all changes reported by ADB in a single run. Multiple changes can occur when, for example, a USB hub is connected/unplugged and the device list changes quickly. If you wish to process all changes at once, use this event instead of the once-per-device ones. Keep in mind that the other events will still be emitted, though.
+            -   **changes** An object with the following properties always present:
+                -   **added** An array of added device objects, each one as in the `add` event. Empty if none.
+                -   **removed** An array of removed device objects, each one as in the `remove` event. Empty if none.
+                -   **changed** An array of changed device objects, each one as in the `change` event. Empty if none.
+        -   **end** Emitted when the underlying connection ends.
+        -   **error** **(err)** Emitted if there's an error.
+-   Returns: `Promise`
+-   Resolves with: `tracker` (see callback)
+
+
+
+### DeviceClient
+
+#### device.clear(pkg)
+
+Deletes all data associated with a package from the device. This is roughly analogous to `adb shell pm clear <pkg>`.
+
+-   **pkg** The package name. This is NOT the APK.
+-   **callback(err)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+-   Returns: `Promise`
+-   Resolves with: `true`
+
 
-#### client.forward(serial, local, remote[, callback])
+#### device.forward(local, remote)
 
 Forwards socket connections from the ADB server host (local) to the device (remote). This is analogous to `adb forward <local> <remote>`. It's important to note that if you are connected to a remote ADB server, the forward will be created on that host.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **local** A string representing the local endpoint on the ADB host. At time of writing, can be one of:
-    - `tcp:<port>`
-    - `localabstract:<unix domain socket name>`
-    - `localreserved:<unix domain socket name>`
-    - `localfilesystem:<unix domain socket name>`
-    - `dev:<character device name>`
-* **remote** A string representing the remote endpoint on the device. At time of writing, can be one of:
-    - Any value accepted by the `local` argument
-    - `jdwp:<process pid>`
-* **callback(err)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-* Returns: `Promise`
-* Resolves with: `true`
-
-#### client.framebuffer(serial[, format]&#91;, callback])
+-   **local** A string representing the local endpoint on the ADB host. At time of writing, can be one of:
+    -   `tcp:<port>`
+    -   `localabstract:<unix domain socket name>`
+    -   `localreserved:<unix domain socket name>`
+    -   `localfilesystem:<unix domain socket name>`
+    -   `dev:<character device name>`
+-   **remote** A string representing the remote endpoint on the device. At time of writing, can be one of:
+    -   Any value accepted by the `local` argument
+    -   `jdwp:<process pid>`
+-   **callback(err)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+-   Returns: `Promise`
+-   Resolves with: `true`
+
+#### device.framebuffer([format])
 
 Fetches the current **raw** framebuffer (i.e. what is visible on the screen) from the device, and optionally converts it into something more usable by using [GraphicsMagick][graphicsmagick]'s `gm` command, which must be available in `$PATH` if conversion is desired. Note that we don't bother supporting really old framebuffer formats such as RGB_565. If for some mysterious reason you happen to run into a `>=2.3` device that uses RGB_565, let us know.
 
 Note that high-resolution devices can have quite massive framebuffers. For example, a device with a resolution of 1920x1080 and 32 bit colors would have a roughly 8MB (`1920*1080*4` byte) RGBA framebuffer. Empirical tests point to about 5MB/s bandwidth limit for the ADB USB connection, which means that it can take ~1.6 seconds for the raw data to arrive, or even more if the USB connection is already congested. Using a conversion will further slow down completion.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **format** The desired output format. Any output format supported by [GraphicsMagick][graphicsmagick] (such as `'png'`) is supported. Defaults to `'raw'` for raw framebuffer data.
-* **callback(err, framebuffer)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **framebuffer** The possibly converted framebuffer stream. The stream also has a `meta` property with the following values:
-        * **version** The framebuffer version. Useful for patching possible backwards-compatibility issues.
-        * **bpp** Bits per pixel (i.e. color depth).
-        * **size** The raw byte size of the framebuffer.
-        * **width** The horizontal resolution of the framebuffer. This SHOULD always be the same as screen width. We have not encountered any device with incorrect framebuffer metadata, but according to rumors there might be some.
-        * **height** The vertical resolution of the framebuffer. This SHOULD always be the same as screen height.
-        * **red_offset** The bit offset of the red color in a pixel.
-        * **red_length** The bit length of the red color in a pixel.
-        * **blue_offset** The bit offset of the blue color in a pixel.
-        * **blue_length** The bit length of the blue color in a pixel.
-        * **green_offset** The bit offset of the green color in a pixel.
-        * **green_length** The bit length of the green color in a pixel.
-        * **alpha_offset** The bit offset of alpha in a pixel.
-        * **alpha_length** The bit length of alpha in a pixel. `0` when not available.
-        * **format** The framebuffer format for convenience. This can be one of `'bgr'`,  `'bgra'`, `'rgb'`, `'rgba'`.
-* Returns: `Promise`
-* Resolves with: `framebuffer` (see callback)
-
-#### client.getDevicePath(serial[, callback])
+-   **format** The desired output format. Any output format supported by [GraphicsMagick][graphicsmagick] (such as `'png'`) is supported. Defaults to `'raw'` for raw framebuffer data.
+-   **callback(err, framebuffer)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **framebuffer** The possibly converted framebuffer stream. The stream also has a `meta` property with the following values:
+        -   **version** The framebuffer version. Useful for patching possible backwards-compatibility issues.
+        -   **bpp** Bits per pixel (i.e. color depth).
+        -   **size** The raw byte size of the framebuffer.
+        -   **width** The horizontal resolution of the framebuffer. This SHOULD always be the same as screen width. We have not encountered any device with incorrect framebuffer metadata, but according to rumors there might be some.
+        -   **height** The vertical resolution of the framebuffer. This SHOULD always be the same as screen height.
+        -   **red_offset** The bit offset of the red color in a pixel.
+        -   **red_length** The bit length of the red color in a pixel.
+        -   **blue_offset** The bit offset of the blue color in a pixel.
+        -   **blue_length** The bit length of the blue color in a pixel.
+        -   **green_offset** The bit offset of the green color in a pixel.
+        -   **green_length** The bit length of the green color in a pixel.
+        -   **alpha_offset** The bit offset of alpha in a pixel.
+        -   **alpha_length** The bit length of alpha in a pixel. `0` when not available.
+        -   **format** The framebuffer format for convenience. This can be one of `'bgr'`, `'bgra'`, `'rgb'`, `'rgba'`.
+-   Returns: `Promise`
+-   Resolves with: `framebuffer` (see callback)
+
+#### device.getDevicePath()
 
 Gets the device path of the device identified by the given serial number.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **callback(err, path)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **path** The device path. This corresponds to the device path in `client.listDevicesWithPaths()`.
-* Returns: `Promise`
-* Resolves with: `path` (see callback)
+-   **callback(err, path)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **path** The device path. This corresponds to the device path in `client.listDevicesWithPaths()`.
+-   Returns: `Promise`
+-   Resolves with: `path` (see callback)
 
-#### client.getDHCPIpAddress(serial[, iface]&#91;, callback])
+#### device.getDHCPIpAddress([iface])
 
 Attemps to retrieve the IP address of the device. Roughly analogous to `adb shell getprop dhcp.<iface>.ipaddress`.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **iface** Optional. The network interface. Defaults to `'wlan0'`.
-* **callback(err, ip)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **ip** The IP address as a `String`.
-* Returns: `Promise`
-* Resolves with: `ip` (see callback)
+-   **iface** Optional. The network interface. Defaults to `'wlan0'`.
+-   **callback(err, ip)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **ip** The IP address as a `String`.
+-   Returns: `Promise`
+-   Resolves with: `ip` (see callback)
 
-#### client.getFeatures(serial[, callback])
+#### device.getFeatures()
 
 Retrieves the features of the device identified by the given serial number. This is analogous to `adb shell pm list features`. Useful for checking whether hardware features such as NFC are available (you'd check for `'android.hardware.nfc'`).
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **callback(err, features)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **features** An object of device features. Each key corresponds to a device feature, with the value being either `true` for a boolean feature, or the feature value as a string (e.g. `'0x20000'` for `reqGlEsVersion`).
-* Returns: `Promise`
-* Resolves with: `features` (see callback)
-
-#### client.getPackages(serial[, callback])
+**flags** Flags to pass to the `pm list packages` command to filter the list
+  ```
+  -d: filter to only show disabled packages
+  -e: filter to only show enabled packages
+  -s: filter to only show system packages
+  -3: filter to only show third party packages
+  ```
+-   **callback(err, features)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **features** An object of device features. Each key corresponds to a device feature, with the value being either `true` for a boolean feature, or the feature value as a string (e.g. `'0x20000'` for `reqGlEsVersion`).
+-   Returns: `Promise`
+-   Resolves with: `features` (see callback)
+
+#### device.getPackages()
 
 Retrieves the list of packages present on the device. This is analogous to `adb shell pm list packages`. If you just want to see if something's installed, consider using `client.isInstalled()` instead.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **callback(err, packages)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **packages** An array of package names.
-* Returns: `Promise`
-* Resolves with: `packages` (see callback)
+-   **callback(err, packages)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **packages** An array of package names.
+-   Returns: `Promise`
+-   Resolves with: `packages` (see callback)
 
-#### client.getProperties(serial[, callback])
+#### device.getProperties()
 
 Retrieves the properties of the device identified by the given serial number. This is analogous to `adb shell getprop`.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **callback(err, properties)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **properties** An object of device properties. Each key corresponds to a device property. Convenient for accessing things like `'ro.product.model'`.
-* Returns: `Promise`
-* Resolves with: `properties` (see callback)
+-   **callback(err, properties)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **properties** An object of device properties. Each key corresponds to a device property. Convenient for accessing things like `'ro.product.model'`.
+-   Returns: `Promise`
+-   Resolves with: `properties` (see callback)
 
-#### client.getSerialNo(serial[, callback])
+#### device.getSerialNo()
 
 Gets the serial number of the device identified by the given serial number. With our API this doesn't really make much sense, but it has been implemented for completeness. _FYI: in the raw ADB protocol you can specify a device in other ways, too._
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **callback(err, serial)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **serial** The serial number of the device.
-* Returns: `Promise`
-* Resolves with: `serial` (see callback)
+-   **callback(err, serial)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **serial** The serial number of the device.
+-   Returns: `Promise`
+-   Resolves with: `serial` (see callback)
 
-#### client.getState(serial[, callback])
+#### device.getState()
 
 Gets the state of the device identified by the given serial number.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **callback(err, state)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **state** The device state. This corresponds to the device type in `client.listDevices()`.
-* Returns: `Promise`
-* Resolves with: `state` (see callback)
+-   **callback(err, state)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **state** The device state. This corresponds to the device type in `client.listDevices()`.
+-   Returns: `Promise`
+-   Resolves with: `state` (see callback)
 
-#### client.install(serial, apk[, callback])
+#### device.install(apk)
 
 Installs the APK on the device, replacing any previously installed version. This is roughly analogous to `adb install -r <apk>`.
 
 Note that if the call seems to stall, you may have to accept a dialog on the phone first.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **apk** When `String`, interpreted as a path to an APK file. When [`Stream`][node-stream], installs directly from the stream, which must be a valid APK.
-* **callback(err)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise. It may have a `.code` property containing the error code reported by the device.
-* Returns: `Promise`
-* Resolves with: `true`
+-   **apk** When `String`, interpreted as a path to an APK file. When [`Stream`][node-stream], installs directly from the stream, which must be a valid APK.
+-   **callback(err)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise. It may have a `.code` property containing the error code reported by the device.
+-   Returns: `Promise`
+-   Resolves with: `true`
 
 ##### Example - install an APK from a URL
 
 This example requires the [request](https://www.npmjs.org/package/request) module. It also doesn't do any error handling (404 responses, timeouts, invalid URLs etc).
 
-```javascript
-var client = require('adbkit').createClient()
-var request = require('request')
-var Readable = require('stream').Readable
+```typescript
+import Adb from '@devicefarmer/adbkit';
+import request from 'request';
+import { Readable } from 'stream';
 
-// The request module implements old-style streams, so we have to wrap it.
-client.install('<serial>', new Readable().wrap(request('http://example.org/app.apk')))
-  .then(function() {
+const client = Adb.createClient();
+
+const test = async () => {
+  // The request module implements old-style streams, so we have to wrap it.
+  try {
+    // request is deprecated
+    const device = client.getClient('<serial>');
+    await device.install(new Readable().wrap(request('http://example.org/app.apk') as any) as any)
     console.log('Installed')
-  })
+  } catch (err) {
+    console.error('Something went wrong:', err.stack)
+  }
+}
 ```
 
-#### client.installRemote(serial, apk[, callback])
+#### device.installRemote(apk)
 
 Installs an APK file which must already be located on the device file system, and replaces any previously installed version. Useful if you've previously pushed the file to the device for some reason (perhaps to have direct access to `client.push()`'s transfer stats). This is roughly analogous to `adb shell pm install -r <apk>` followed by `adb shell rm -f <apk>`.
 
 Note that if the call seems to stall, you may have to accept a dialog on the phone first.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **apk** The path to the APK file on the device. The file will be removed when the command completes.
-* **callback(err)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-* Returns: `Promise`
-* Resolves with: `true`
+-   **apk** The path to the APK file on the device. The file will be removed when the command completes.
+-   **callback(err)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+-   Returns: `Promise`
+-   Resolves with: `true`
 
-#### client.isInstalled(serial, pkg[, callback])
+#### device.isInstalled(pkg)
 
 Tells you if the specific package is installed or not. This is analogous to `adb shell pm path <pkg>` and some output parsing.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **pkg** The package name. This is NOT the APK.
-* **callback(err, installed)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **installed** `true` if the package is installed, `false` otherwise.
-* Returns: `Promise`
-* Resolves with: `installed` (see callback)
-
-#### client.kill([callback])
-
-This kills the ADB server. Note that the next connection will attempt to start the server again when it's unable to connect.
-
-* **callback(err)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-* Returns: `Promise`
-* Resolves with: `true`
-
-#### client.listDevices([callback])
-
-Gets the list of currently connected devices and emulators.
-
-* **callback(err, devices)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **devices** An array of device objects. The device objects are plain JavaScript objects with two properties: `id` and `type`.
-        * **id** The ID of the device. For real devices, this is usually the USB identifier.
-        * **type** The device type. Values include `'emulator'` for emulators, `'device'` for devices, and `'offline'` for offline devices. `'offline'` can occur for example during boot, in low-battery conditions or when the ADB connection has not yet been approved on the device.
-* Returns: `Promise`
-* Resolves with: `devices` (see callback)
-
-#### client.listDevicesWithPaths([callback])
-
-Like `client.listDevices()`, but includes the "path" of every device.
-
-* **callback(err, devices)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **devices** An array of device objects. The device objects are plain JavaScript objects with the following properties:
-        * **id** See `client.listDevices()`.
-        * **type** See `client.listDevices()`.
-        * **path** The device path. This can be something like `usb:FD120000` for real devices.
-* Returns: `Promise`
-* Resolves with: `devices` (see callback)
+-   **pkg** The package name. This is NOT the APK.
+-   **callback(err, installed)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **installed** `true` if the package is installed, `false` otherwise.
+-   Returns: `Promise`
+-   Resolves with: `installed` (see callback)
 
-#### client.listForwards(serial[, callback])
+#### device.listForwards()
 
 Lists forwarded connections on the device. This is analogous to `adb forward --list`.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **callback(err, forwards)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **forwards** An array of forward objects with the following properties:
-        * **serial** The device serial.
-        * **local** The local endpoint. Same format as `client.forward()`'s `local` argument.
-        * **remote** The remote endpoint on the device. Same format as `client.forward()`'s `remote` argument.
-* Returns: `Promise`
-* Resolves with: `forwards` (see callback)
+-   **callback(err, forwards)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **forwards** An array of forward objects with the following properties:
+        -   **serial** The device serial.
+        -   **local** The local endpoint. Same format as `client.forward()`'s `local` argument.
+        -   **remote** The remote endpoint on the device. Same format as `client.forward()`'s `remote` argument.
+-   Returns: `Promise`
+-   Resolves with: `forwards` (see callback)
 
-#### client.listReverses(serial[, callback])
+#### device.listReverses()
 
 Lists forwarded connections on the device. This is analogous to `adb reverse --list`.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **callback(err, forwards)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **reverses** An array of reverse objects with the following properties:
-        * **remote** The remote endpoint on the device. Same format as `client.reverse()`'s `remote` argument.
-        * **local** The local endpoint on the host. Same format as `client.reverse()`'s `local` argument.
+-   **callback(err, forwards)** Optional. Use this or the returned `Promise`.
+
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **reverses** An array of reverse objects with the following properties:
+        -   **remote** The remote endpoint on the device. Same format as `client.reverse()`'s `remote` argument.
+        -   **local** The local endpoint on the host. Same format as `client.reverse()`'s `local` argument.
 
-* Returns: `Promise`
-* Resolves with: `reverses` (see callback)
+-   Returns: `Promise`
+-   Resolves with: `reverses` (see callback)
 
-#### client.openLocal(serial, path[, callback])
+#### device.openLocal(path)
 
 Opens a direct connection to a unix domain socket in the given path.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **path** The path to the socket. Prefixed with `'localfilesystem:'` by default, include another prefix (e.g. `'localabstract:'`) in the path to override.
-* **callback(err, conn)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **conn** The connection (i.e. [`net.Socket`][node-net]). Read and write as you please. Call `conn.end()` to end the connection.
-* Returns: `Promise`
-* Resolves with: `conn` (see callback)
+-   **path** The path to the socket. Prefixed with `'localfilesystem:'` by default, include another prefix (e.g. `'localabstract:'`) in the path to override.
+-   **callback(err, conn)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **conn** The connection (i.e. [`net.Socket`][node-net]). Read and write as you please. Call `conn.end()` to end the connection.
+-   Returns: `Promise`
+-   Resolves with: `conn` (see callback)
 
-#### client.openLog(serial, name[, callback])
+#### device.openLog(name)
 
 Opens a direct connection to a binary log file, providing access to the raw log data. Note that it is usually much more convenient to use the `client.openLogcat()` method, described separately.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **name** The name of the log. Available logs include `'main'`, `'system'`, `'radio'` and `'events'`.
-* **callback(err, log)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **log** The binary log stream. Call `log.end()` when you wish to stop receiving data.
-* Returns: `Promise`
-* Resolves with: `log` (see callback)
+-   **name** The name of the log. Available logs include `'main'`, `'system'`, `'radio'` and `'events'`.
+-   **callback(err, log)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **log** The binary log stream. Call `log.end()` when you wish to stop receiving data.
+-   Returns: `Promise`
+-   Resolves with: `log` (see callback)
 
-#### client.openLogcat(serial[, options]&#91;, callback])
+#### device.openLogcat([options])
 
 Calls the `logcat` utility on the device and hands off the connection to [adbkit-logcat][adbkit-logcat], a pure Node.js Logcat client. This is analogous to `adb logcat -B`, but the event stream will be parsed for you and a separate event will be emitted for every log entry, allowing for easy processing.
 
 For more information, check out the [adbkit-logcat][adbkit-logcat] documentation.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **options** Optional. The following options are supported:
-    - **clear** When `true`, clears logcat before opening the reader. Not set by default.
-* **callback(err, logcat)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **logcat** The Logcat client. Please see the [adbkit-logcat][adbkit-logcat] documentation for details.
-* Returns: `Promise`
-* Resolves with: `logcat` (see callback)
+-   **options** Optional. The following options are supported:
+    -   **clear** When `true`, clears logcat before opening the reader. Not set by default.
+-   **callback(err, logcat)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **logcat** The Logcat client. Please see the [adbkit-logcat][adbkit-logcat] documentation for details.
+-   Returns: `Promise`
+-   Resolves with: `logcat` (see callback)
 
-#### client.openMonkey(serial[, port]&#91;, callback])
+#### device.openMonkey([port])
 
 Starts the built-in `monkey` utility on the device, connects to it using `client.openTcp()` and hands the connection to [adbkit-monkey][adbkit-monkey], a pure Node.js Monkey client. This allows you to create touch and key events, among other things.
 
 For more information, check out the [adbkit-monkey][adbkit-monkey] documentation.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **port** Optional. The device port where you'd like Monkey to run at. Defaults to `1080`.
-* **callback(err, monkey)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **monkey** The Monkey client. Please see the [adbkit-monkey][adbkit-monkey] documentation for details.
-* Returns: `Promise`
-* Resolves with: `monkey` (see callback)
+-   **port** Optional. The device port where you'd like Monkey to run at. Defaults to `1080`.
+-   **callback(err, monkey)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **monkey** The Monkey client. Please see the [adbkit-monkey][adbkit-monkey] documentation for details.
+-   Returns: `Promise`
+-   Resolves with: `monkey` (see callback)
 
-#### client.openProcStat(serial[, callback])
+#### device.openProcStat()
 
 Tracks `/proc/stat` and emits useful information, such as CPU load. A single sync service instance is used to download the `/proc/stat` file for processing. While doing this does consume some resources, it is very light and should not be a problem.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **callback(err, stats)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **stats** The `/proc/stat` tracker, which is an [`EventEmitter`][node-events]. Call `stat.end()` to stop tracking. The following events are available:
-        * **load** **(loads)** Emitted when a CPU load calculation is available.
-            - **loads** CPU loads of **online** CPUs. Each key is a CPU id (e.g. `'cpu0'`, `'cpu1'`) and the value an object with the following properties:
-                * **user** Percentage (0-100) of ticks spent on user programs.
-                * **nice** Percentage (0-100) of ticks spent on `nice`d user programs.
-                * **system** Percentage (0-100) of ticks spent on system programs.
-                * **idle** Percentage (0-100) of ticks spent idling.
-                * **iowait** Percentage (0-100) of ticks spent waiting for IO.
-                * **irq** Percentage (0-100) of ticks spent on hardware interrupts.
-                * **softirq** Percentage (0-100) of ticks spent on software interrupts.
-                * **steal** Percentage (0-100) of ticks stolen by others.
-                * **guest** Percentage (0-100) of ticks spent by a guest.
-                * **guestnice** Percentage (0-100) of ticks spent by a `nice`d guest.
-                * **total** Total. Always 100.
-* Returns: `Promise`
-* Resolves with: `stats` (see callback)
-
-#### client.openTcp(serial, port[, host]&#91;, callback])
+-   **callback(err, stats)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **stats** The `/proc/stat` tracker, which is an [`EventEmitter`][node-events]. Call `stat.end()` to stop tracking. The following events are available:
+        -   **load** **(loads)** Emitted when a CPU load calculation is available.
+            -   **loads** CPU loads of **online** CPUs. Each key is a CPU id (e.g. `'cpu0'`, `'cpu1'`) and the value an object with the following properties:
+                -   **user** Percentage (0-100) of ticks spent on user programs.
+                -   **nice** Percentage (0-100) of ticks spent on `nice`d user programs.
+                -   **system** Percentage (0-100) of ticks spent on system programs.
+                -   **idle** Percentage (0-100) of ticks spent idling.
+                -   **iowait** Percentage (0-100) of ticks spent waiting for IO.
+                -   **irq** Percentage (0-100) of ticks spent on hardware interrupts.
+                -   **softirq** Percentage (0-100) of ticks spent on software interrupts.
+                -   **steal** Percentage (0-100) of ticks stolen by others.
+                -   **guest** Percentage (0-100) of ticks spent by a guest.
+                -   **guestnice** Percentage (0-100) of ticks spent by a `nice`d guest.
+                -   **total** Total. Always 100.
+-   Returns: `Promise`
+-   Resolves with: `stats` (see callback)
+
+#### device.openTcp(port[, host])
 
 Opens a direct TCP connection to a port on the device, without any port forwarding required.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **port** The port number to connect to.
-* **host** Optional. The host to connect to. Allegedly this is supposed to establish a connection to the given host from the device, but we have not been able to get it to work at all. Skip the host and everything works great.
-* **callback(err, conn)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **conn** The TCP connection (i.e. [`net.Socket`][node-net]). Read and write as you please. Call `conn.end()` to end the connection.
-* Returns: `Promise`
-* Resolves with: `conn` (see callback)
+-   **port** The port number to connect to.
+-   **host** Optional. The host to connect to. Allegedly this is supposed to establish a connection to the given host from the device, but we have not been able to get it to work at all. Skip the host and everything works great.
+-   **callback(err, conn)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **conn** The TCP connection (i.e. [`net.Socket`][node-net]). Read and write as you please. Call `conn.end()` to end the connection.
+-   Returns: `Promise`
+-   Resolves with: `conn` (see callback)
 
-#### client.pull(serial, path[, callback])
+#### device.pull(path)
 
 A convenience shortcut for `sync.pull()`, mainly for one-off use cases. The connection cannot be reused, resulting in poorer performance over multiple calls. However, the Sync client will be closed automatically for you, so that's one less thing to worry about.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **path** See `sync.pull()` for details.
-* **callback(err, transfer)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **transfer** A `PullTransfer` instance (see below)
-* Returns: `Promise`
-* Resolves with: `transfer` (see callback)
+-   **path** See `sync.pull()` for details.
+-   **callback(err, transfer)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **transfer** A `PullTransfer` instance (see below)
+-   Returns: `Promise`
+-   Resolves with: `transfer` (see callback)
 
-#### client.push(serial, contents, path[, mode]&#91;, callback])
+#### device.push(contents, path[, mode])
 
 A convenience shortcut for `sync.push()`, mainly for one-off use cases. The connection cannot be reused, resulting in poorer performance over multiple calls. However, the Sync client will be closed automatically for you, so that's one less thing to worry about.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **contents** See `sync.push()` for details.
-* **path** See `sync.push()` for details.
-* **mode** See `sync.push()` for details.
-* **callback(err, transfer)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **transfer** A `PushTransfer` instance (see below)
-* Returns: `Promise`
-* Resolves with: `transfer` (see callback)
+-   **contents** See `sync.push()` for details.
+-   **path** See `sync.push()` for details.
+-   **mode** See `sync.push()` for details.
+-   **callback(err, transfer)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **transfer** A `PushTransfer` instance (see below)
+-   Returns: `Promise`
+-   Resolves with: `transfer` (see callback)
 
-#### client.readdir(serial, path[, callback])
+#### device.readdir(path)
 
 A convenience shortcut for `sync.readdir()`, mainly for one-off use cases. The connection cannot be reused, resulting in poorer performance over multiple calls. However, the Sync client will be closed automatically for you, so that's one less thing to worry about.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **path** See `sync.readdir()` for details.
-* **callback(err, files)** Optional. Use this or the returned `Promise`. See `sync.readdir()` for details.
-* Returns: `Promise`
-* Resolves with: See `sync.readdir()` for details.
+-   **path** See `sync.readdir()` for details.
+-   **callback(err, files)** Optional. Use this or the returned `Promise`. See `sync.readdir()` for details.
+-   Returns: `Promise`
+-   Resolves with: See `sync.readdir()` for details.
 
-#### client.reboot(serial[, callback])
+#### device.reboot()
 
 Reboots the device. Similar to `adb reboot`. Note that the method resolves when ADB reports that the device has been rebooted (i.e. the reboot command was successful), not when the device becomes available again.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **callback(err)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-* Returns: `Promise`
-* Resolves with: `true`
+-   **callback(err)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+-   Returns: `Promise`
+-   Resolves with: `true`
 
-#### client.remount(serial[, callback])
+#### device.remount()
 
 Attempts to remount the `/system` partition in read-write mode. This will usually only work on emulators and developer devices.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **callback(err)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-* Returns: `Promise`
-* Resolves with: `true`
+-   **callback(err)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+-   Returns: `Promise`
+-   Resolves with: `true`
 
-#### client.reverse(serial, remote, local[, callback])
+#### device.reverse(remote, local)
 
 Reverses socket connections from the device (remote) to the ADB server host (local). This is analogous to `adb reverse <remote> <local>`. It's important to note that if you are connected to a remote ADB server, the reverse will be created on that host.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **remote** A string representing the remote endpoint on the device. At time of writing, can be one of:
-    - `tcp:<port>`
-    - `localabstract:<unix domain socket name>`
-    - `localreserved:<unix domain socket name>`
-    - `localfilesystem:<unix domain socket name>`
-* **local** A string representing the local endpoint on the ADB host.  At time of writing, can be any value accepted by the `remote` argument.
-* **callback(err)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-* Returns: `Promise`
-* Resolves with: `true`
+-   **remote** A string representing the remote endpoint on the device. At time of writing, can be one of:
+    -   `tcp:<port>`
+    -   `localabstract:<unix domain socket name>`
+    -   `localreserved:<unix domain socket name>`
+    -   `localfilesystem:<unix domain socket name>`
+-   **local** A string representing the local endpoint on the ADB host. At time of writing, can be any value accepted by the `remote` argument.
+-   **callback(err)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+-   Returns: `Promise`
+-   Resolves with: `true`
 
-#### client.root(serial[, callback])
+#### device.root()
 
-Puts the device into root mode which may be needed by certain shell commands.  A remount is generally required after a successful root call. **Note that this will only work if your device supports this feature. Production devices almost never do.**
+Puts the device into root mode which may be needed by certain shell commands. A remount is generally required after a successful root call. **Note that this will only work if your device supports this feature. Production devices almost never do.**
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **callback(err)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-* Returns: `Promise`
-* Resolves with: `true`
+-   **callback(err)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+-   Returns: `Promise`
+-   Resolves with: `true`
 
-#### client.screencap(serial[, callback])
+#### device.screencap()
 
 Takes a screenshot in PNG format using the built-in `screencap` utility. This is analogous to `adb shell screencap -p`. Sadly, the utility is not available on most Android `<=2.3` devices, but a silent fallback to the `client.framebuffer()` command in PNG mode is attempted, so you should have its dependencies installed just in case.
 
@@ -740,42 +728,84 @@ Generating the PNG on the device naturally requires considerably more processing
 
 For convenience purposes, if the screencap command fails (e.g. because it doesn't exist on older Androids), we fall back to `client.framebuffer(serial, 'png')`, which is slower and has additional installation requirements.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **callback(err, screencap)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **screencap** The PNG stream.
-* Returns: `Promise`
-* Resolves with: `screencap` (see callback)
+-   **callback(err, screencap)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **screencap** The PNG stream.
+-   Returns: `Promise`
+-   Resolves with: `screencap` (see callback)
 
-#### client.shell(serial, command[, callback])
+#### device.shell(command)
 
 Runs a shell command on the device. Note that you'll be limited to the permissions of the `shell` user, which ADB uses.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **command** The shell command to execute. When `String`, the command is run as-is. When `Array`, the elements will be rudimentarily escaped (for convenience, not security) and joined to form a command.
-* **callback(err, output)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **output** A Buffer containing all the output. Call `output.toString('utf-8')` to get a readable String from it.
-* Returns: `Promise`
-* Resolves with: `output` (see callback)
+-   **command** The shell command to execute. When `String`, the command is run as-is. When `Array`, the elements will be rudimentarily escaped (for convenience, not security) and joined to form a command.
+-   **callback(err, conn)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **conn** A readable stream (`Socket` actually) containing the progressive `stdout` of the command. Use with `adb.util.readAll` to get a readable String from it.
+-   Returns: `Promise`
+-   Resolves with: `conn` (see callback)
 
 ##### Example
 
-```js
-var Promise = require('bluebird')
-var adb = require('adbkit')
-var client = adb.createClient()
+* Read the output of an instantaneous command
+```typescript
+import Bluebird from 'bluebird';
+import Adb from '@devicefarmer/adbkit';
+
+const client = Adb.createClient();
+
+client
+    .listDevices()
+    .then(function (devices) {
+      return Promise.map(devices, function (device) {
+        const device = client.getDevice(device.id);
+          return (
+              device
+                  .shell('echo $RANDOM')
+                  // Use the readAll() utility to read all the content without
+                  // having to deal with the readable stream. `output` will be a Buffer
+                  // containing all the output.
+                  .then(adb.util.readAll)
+                  .then(function (output) {
+                      console.log('[%s] %s', device.id, output.toString().trim());
+                  })
+          );
+      });
+    })
+    .then(function () {
+        console.log('Done.');
+    })
+    .catch(function (err) {
+        console.error('Something went wrong:', err.stack);
+    });
+```
+
+* Progressively read the output of a long-running command and terminate it
+```typescript
+import Bluebird from 'bluebird';
+import Adb from '@devicefarmer/adbkit';
 
+const client = Adb.createClient();
 client.listDevices()
   .then(function(devices) {
-    return Promise.map(devices, function(device) {
-      return client.shell(device.id, 'echo $RANDOM')
-        // Use the readAll() utility to read all the content without
-        // having to deal with the events. `output` will be a Buffer
-        // containing all the output.
-        .then(adb.util.readAll)
-        .then(function(output) {
-          console.log('[%s] %s', device.id, output.toString().trim())
+    return Bluebird.map(devices, function(device) {
+      const device = client.getDevice(device.id);
+      return device.shell('logcat') // logcat just for illustration,
+                                    // prefer client.openLogcat in real use 
+        .then(function(conn) {
+          var line = 0
+          conn.on('data', function(data) {
+            // here `ps` on the device shows the running logcat process
+            console.log(data.toString())
+            line += 1
+            // close the stream and the running process
+            // on the device will be gone, gracefully
+            if (line > 100) conn.end()
+          });
+          conn.on('close', function() {
+            // here `ps` on the device shows the logcat process is gone
+            console.log('100 lines read already, bye')
+          })
         })
     })
   })
@@ -787,177 +817,138 @@ client.listDevices()
   })
 ```
 
-#### client.startActivity(serial, options[, callback])
+
+#### device.startActivity(options)
 
 Starts the configured activity on the device. Roughly analogous to `adb shell am start <options>`.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **options** The activity configuration. The following options are available:
-    - **debug** Set to `true` to enable debugging.
-    - **wait** Set to `true` to wait for the activity to launch.
-    - **user** The user to run as. Not set by default. If the option is unsupported by the device, an attempt will be made to run the same command again without the user option.
-    - **action** The action.
-    - **data** The data URI, if any.
-    - **mimeType** The mime type, if any.
-    - **category** The category. For multiple categories, pass an `Array`.
-    - **component** The component.
-    - **flags** Numeric flags.
-    - **extras** Any extra data.
-        * When an `Array`, each item must be an `Object` the following properties:
-            - **key** The key name.
-            - **type** The type, which can be one of `'string'`, `'null'`, `'bool'`, `'int'`, `'long'`, `'float'`, `'uri'`, `'component'`.
-            - **value** The value. Optional and unused if type is `'null'`. If an `Array`, type is automatically set to be an array of `<type>`.
-        * When an `Object`, each key is treated as the key name. Simple values like `null`, `String`, `Boolean` and `Number` are type-mapped automatically (`Number` maps to `'int'`) and can be used as-is. For more complex types, like arrays and URIs, set the value to be an `Object` like in the Array syntax (see above), but leave out the `key` property.
-* **callback(err)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-* Returns: `Promise`
-* Resolves with: `true`
-
-#### client.startService(serial, options[, callback])
+-   **options** The activity configuration. The following options are available:
+    -   **debug** Set to `true` to enable debugging.
+    -   **wait** Set to `true` to wait for the activity to launch.
+    -   **user** The user to run as. Not set by default. If the option is unsupported by the device, an attempt will be made to run the same command again without the user option.
+    -   **action** The action.
+    -   **data** The data URI, if any.
+    -   **mimeType** The mime type, if any.
+    -   **category** The category. For multiple categories, pass an `Array`.
+    -   **component** The component.
+    -   **flags** Numeric flags.
+    -   **extras** Any extra data.
+        -   When an `Array`, each item must be an `Object` the following properties:
+            -   **key** The key name.
+            -   **type** The type, which can be one of `'string'`, `'null'`, `'bool'`, `'int'`, `'long'`, `'float'`, `'uri'`, `'component'`.
+            -   **value** The value. Optional and unused if type is `'null'`. If an `Array`, type is automatically set to be an array of `<type>`.
+        -   When an `Object`, each key is treated as the key name. Simple values like `null`, `String`, `Boolean` and `Number` are type-mapped automatically (`Number` maps to `'int'`) and can be used as-is. For more complex types, like arrays and URIs, set the value to be an `Object` like in the Array syntax (see above), but leave out the `key` property.
+-   **callback(err)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+-   Returns: `Promise`
+-   Resolves with: `true`
+
+#### device.startService(options)
 
 Starts the configured service on the device. Roughly analogous to `adb shell am startservice <options>`.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **options** The service configuration. The following options are available:
-    - **user** The user to run as. Defaults to `0`. If the option is unsupported by the device, an attempt will be made to run the same command again without the user option.
-    - **action** See `client.startActivity()` for details.
-    - **data** See `client.startActivity()` for details.
-    - **mimeType** See `client.startActivity()` for details.
-    - **category** See `client.startActivity()` for details.
-    - **component** See `client.startActivity()` for details.
-    - **flags** See `client.startActivity()` for details.
-    - **extras** See `client.startActivity()` for details.
-* Returns: `Promise`
-* Resolves with: `true`
-
-#### client.stat(serial, path[, callback])
+-   **options** The service configuration. The following options are available:
+    -   **user** The user to run as. Defaults to `0`. If the option is unsupported by the device, an attempt will be made to run the same command again without the user option.
+    -   **action** See `client.startActivity()` for details.
+    -   **data** See `client.startActivity()` for details.
+    -   **mimeType** See `client.startActivity()` for details.
+    -   **category** See `client.startActivity()` for details.
+    -   **component** See `client.startActivity()` for details.
+    -   **flags** See `client.startActivity()` for details.
+    -   **extras** See `client.startActivity()` for details.
+-   Returns: `Promise`
+-   Resolves with: `true`
+
+#### device.stat(path)
 
 A convenience shortcut for `sync.stat()`, mainly for one-off use cases. The connection cannot be reused, resulting in poorer performance over multiple calls. However, the Sync client will be closed automatically for you, so that's one less thing to worry about.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **path** See `sync.stat()` for details.
-* **callback(err, stats)** Optional. Use this or the returned `Promise`. See `sync.stat()` for details.
-* Returns: `Promise`
-* Resolves with: See `sync.stat()` for details.
+-   **path** See `sync.stat()` for details.
+-   **callback(err, stats)** Optional. Use this or the returned `Promise`. See `sync.stat()` for details.
+-   Returns: `Promise`
+-   Resolves with: See `sync.stat()` for details.
 
-#### client.syncService(serial[, callback])
+#### device.syncService()
 
 Establishes a new Sync connection that can be used to push and pull files. This method provides the most freedom and the best performance for repeated use, but can be a bit cumbersome to use. For simple use cases, consider using `client.stat()`, `client.push()` and `client.pull()`.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **callback(err, sync)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **sync** The Sync client. See below for details. Call `sync.end()` when done.
-* Returns: `Promise`
-* Resolves with: `sync` (see callback)
+-   **callback(err, sync)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **sync** The Sync client. See below for details. Call `sync.end()` when done.
+-   Returns: `Promise`
+-   Resolves with: `sync` (see callback)
 
-#### client.tcpip(serial, port[, callback])
+#### device.tcpip(port)
 
 Puts the device's ADB daemon into tcp mode, allowing you to use `adb connect` or `client.connect()` to connect to it. Note that the device will still be visible to ADB as a regular USB-connected device until you unplug it. Same as `adb tcpip <port>`.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **port** Optional. The port the device should listen on. Defaults to `5555`.
-* **callback(err, port)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **port** The port the device started listening on.
-* Returns: `Promise`
-* Resolves with: `port` (see callback)
-
-#### client.trackDevices([callback])
-
-Gets a device tracker. Events will be emitted when devices are added, removed, or their type changes (i.e. to/from `offline`). Note that the same events will be emitted for the initially connected devices also, so that you don't need to use both `client.listDevices()` and `client.trackDevices()`.
+-   **port** Optional. The port the device should listen on. Defaults to `5555`.
+-   **callback(err, port)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **port** The port the device started listening on.
+-   Returns: `Promise`
+-   Resolves with: `port` (see callback)
 
-Note that as the tracker will keep a connection open, you must call `tracker.end()` if you wish to stop tracking devices.
 
-* **callback(err, tracker)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **tracker** The device tracker, which is an [`EventEmitter`][node-events]. The following events are available:
-        * **add** **(device)** Emitted when a new device is connected, once per device. See `client.listDevices()` for details on the device object.
-        * **remove** **(device)** Emitted when a device is unplugged, once per device. This does not include `offline` devices, those devices are connected but unavailable to ADB. See `client.listDevices()` for details on the device object.
-        * **change** **(device)** Emitted when the `type` property of a device changes, once per device. The current value of `type` is the new value. This event usually occurs the type changes from `'device'` to `'offline'` or the other way around. See `client.listDevices()` for details on the device object and the `'offline'` type.
-        * **changeSet** **(changes)** Emitted once for all changes reported by ADB in a single run. Multiple changes can occur when, for example, a USB hub is connected/unplugged and the device list changes quickly. If you wish to process all changes at once, use this event instead of the once-per-device ones. Keep in mind that the other events will still be emitted, though.
-            - **changes** An object with the following properties always present:
-                * **added** An array of added device objects, each one as in the `add` event. Empty if none.
-                * **removed** An array of removed device objects, each one as in the `remove` event. Empty if none.
-                * **changed** An array of changed device objects, each one as in the `change` event. Empty if none.
-        * **end** Emitted when the underlying connection ends.
-        * **error** **(err)** Emitted if there's an error.
-* Returns: `Promise`
-* Resolves with: `tracker` (see callback)
-
-#### client.trackJdwp(serial[, callback])
+#### device.trackJdwp()
 
 Starts a JDWP tracker for the given device.
 
 Note that as the tracker will keep a connection open, you must call `tracker.end()` if you wish to stop tracking JDWP processes.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **callback(err, tracker)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **tracker** The JDWP tracker, which is an [`EventEmitter`][node-events]. The following events are available:
-        * **add** **(pid)** Emitted when a new JDWP process becomes available, once per pid.
-        * **remove** **(pid)** Emitted when a JDWP process becomes unavailable, once per pid.
-        * **changeSet** **(changes, pids)** All changes in a single event.
-            - **changes** An object with the following properties always present:
-                * **added** An array of pids that were added. Empty if none.
-                * **removed** An array of pids that were removed. Empty if none.
-            - **pids** All currently active pids (including pids from previous runs).
-        * **end** Emitted when the underlying connection ends.
-        * **error** **(err)** Emitted if there's an error.
-* Returns: `Promise`
-* Resolves with: `tracker` (see callback)
-
-#### client.uninstall(serial, pkg[, callback])
+-   **callback(err, tracker)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **tracker** The JDWP tracker, which is an [`EventEmitter`][node-events]. The following events are available:
+        -   **add** **(pid)** Emitted when a new JDWP process becomes available, once per pid.
+        -   **remove** **(pid)** Emitted when a JDWP process becomes unavailable, once per pid.
+        -   **changeSet** **(changes, pids)** All changes in a single event.
+            -   **changes** An object with the following properties always present:
+                -   **added** An array of pids that were added. Empty if none.
+                -   **removed** An array of pids that were removed. Empty if none.
+            -   **pids** All currently active pids (including pids from previous runs).
+        -   **end** Emitted when the underlying connection ends.
+        -   **error** **(err)** Emitted if there's an error.
+-   Returns: `Promise`
+-   Resolves with: `tracker` (see callback)
+
+#### device.uninstall(pkg)
 
 Uninstalls the package from the device. This is roughly analogous to `adb uninstall <pkg>`.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **pkg** The package name. This is NOT the APK.
-* **callback(err)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-* Returns: `Promise`
-* Resolves with: `true`
+-   **pkg** The package name. This is NOT the APK.
+-   **callback(err)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+-   Returns: `Promise`
+-   Resolves with: `true`
 
-#### client.usb(serial[, callback])
+#### device.usb()
 
 Puts the device's ADB daemon back into USB mode. Reverses `client.tcpip()`. Same as `adb usb`.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **callback(err)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-* Returns: `Promise`
-* Resolves with: `true`
-
-#### client.version([callback])
-
-Queries the ADB server for its version. This is mainly useful for backwards-compatibility purposes.
+-   **callback(err)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+-   Returns: `Promise`
+-   Resolves with: `true`
 
-* **callback(err, version)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **version** The version of the ADB server.
-* Returns: `Promise`
-* Resolves with: `version` (see callback)
 
-#### client.waitBootComplete(serial[, callback])
+#### device.waitBootComplete()
 
 Waits until the device has finished booting. Note that the device must already be seen by ADB. This is roughly analogous to periodically checking `adb shell getprop sys.boot_completed`.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **callback(err)** Optional. Use this or the returned `Promise`.
-    - **err** `null` if the device has completed booting, `Error` otherwise (can occur if the connection dies while checking).
-* Returns: `Promise`
-* Resolves with: `true`
+-   **callback(err)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` if the device has completed booting, `Error` otherwise (can occur if the connection dies while checking).
+-   Returns: `Promise`
+-   Resolves with: `true`
 
-#### client.waitForDevice(serial[, callback])
+#### device.waitForDevice()
 
 Waits until ADB can see the device. Note that you must know the serial in advance. Other than that, works like `adb -s serial wait-for-device`. If you're planning on reacting to random devices being plugged in and out, consider using `client.trackDevices()` instead.
 
-* **serial** The serial number of the device. Corresponds to the device ID in `client.listDevices()`.
-* **callback(err, id)** Optional. Use this or the returned `Promise`.
-    - **err** `null` if the device has completed booting, `Error` otherwise (can occur if the connection dies while checking).
-    - **id** The device ID. Can be useful for chaining.
-* Returns: `Promise`
-* Resolves with: `id` (see callback)
+-   **callback(err, id)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` if the device has completed booting, `Error` otherwise (can occur if the connection dies while checking).
+    -   **id** The device ID. Can be useful for chaining.
+-   Returns: `Promise`
+-   Resolves with: `id` (see callback)
 
 ### Sync
 
@@ -965,77 +956,77 @@ Waits until ADB can see the device. Note that you must know the serial in advanc
 
 Closes the Sync connection, allowing Node to quit (assuming nothing else is keeping it alive, of course).
 
-* Returns: The sync instance.
+-   Returns: The sync instance.
 
 #### sync.pull(path)
 
 Pulls a file from the device as a `PullTransfer` [`Stream`][node-stream].
 
-* **path** The path to pull from.
-* Returns: A `PullTransfer` instance. See below for details.
+-   **path** The path to pull from.
+-   Returns: A `PullTransfer` instance. See below for details.
 
 #### sync.push(contents, path[, mode])
 
 Attempts to identify `contents` and calls the appropriate `push*` method for it.
 
-* **contents** When `String`, treated as a local file path and forwarded to `sync.pushFile()`. Otherwise, treated as a [`Stream`][node-stream] and forwarded to `sync.pushStream()`.
-* **path** The path to push to.
-* **mode** Optional. The mode of the file. Defaults to `0644`.
-* Returns: A `PushTransfer` instance. See below for details.
+-   **contents** When `String`, treated as a local file path and forwarded to `sync.pushFile()`. Otherwise, treated as a [`Stream`][node-stream] and forwarded to `sync.pushStream()`.
+-   **path** The path to push to.
+-   **mode** Optional. The mode of the file. Defaults to `0644`.
+-   Returns: A `PushTransfer` instance. See below for details.
 
 #### sync.pushFile(file, path[, mode])
 
 Pushes a local file to the given path. Note that the path must be writable by the ADB user (usually `shell`). When in doubt, use `'/data/local/tmp'` with an appropriate filename.
 
-* **file** The local file path.
-* **path** See `sync.push()` for details.
-* **mode** See `sync.push()` for details.
-* Returns: See `sync.push()` for details.
+-   **file** The local file path.
+-   **path** See `sync.push()` for details.
+-   **mode** See `sync.push()` for details.
+-   Returns: See `sync.push()` for details.
 
 #### sync.pushStream(stream, path[, mode])
 
 Pushes a [`Stream`][node-stream] to the given path. Note that the path must be writable by the ADB user (usually `shell`). When in doubt, use `'/data/local/tmp'` with an appropriate filename.
 
-* **stream** The readable stream.
-* **path** See `sync.push()` for details.
-* **mode** See `sync.push()` for details.
-* Returns: See `sync.push()` for details.
+-   **stream** The readable stream.
+-   **path** See `sync.push()` for details.
+-   **mode** See `sync.push()` for details.
+-   Returns: See `sync.push()` for details.
 
-#### sync.readdir(path[, callback])
+#### sync.readdir(path)
 
 Retrieves a list of directory entries (e.g. files) in the given path, not including the `.` and `..` entries, just like [`fs.readdir`][node-fs]. If given a non-directory path, no entries are returned.
 
-* **path** The path.
-* **callback(err, files)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **files** An `Array` of [`fs.Stats`][node-fs-stats]-compatible instances. While the `stats.is*` methods are available, only the following properties are supported (in addition to the `name` field which contains the filename):
-        * **name** The filename.
-        * **mode** The raw mode.
-        * **size** The file size.
-        * **mtime** The time of last modification as a `Date`.
-* Returns: `Promise`
-* Resolves with: `files` (see callback)
+-   **path** The path.
+-   **callback(err, files)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **files** An `Array` of [`fs.Stats`][node-fs-stats]-compatible instances. While the `stats.is*` methods are available, only the following properties are supported (in addition to the `name` field which contains the filename):
+        -   **name** The filename.
+        -   **mode** The raw mode.
+        -   **size** The file size.
+        -   **mtime** The time of last modification as a `Date`.
+-   Returns: `Promise`
+-   Resolves with: `files` (see callback)
 
-#### sync.stat(path[, callback])
+#### sync.stat(path)
 
 Retrieves information about the given path.
 
-* **path** The path.
-* **callback(err, stats)** Optional. Use this or the returned `Promise`.
-    - **err** `null` when successful, `Error` otherwise.
-    - **stats** An [`fs.Stats`][node-fs-stats] instance. While the `stats.is*` methods are available, only the following properties are supported:
-        * **mode** The raw mode.
-        * **size** The file size.
-        * **mtime** The time of last modification as a `Date`.
-* Returns: `Promise`
-* Resolves with: `stats` (see callback)
+-   **path** The path.
+-   **callback(err, stats)** Optional. Use this or the returned `Promise`.
+    -   **err** `null` when successful, `Error` otherwise.
+    -   **stats** An [`fs.Stats`][node-fs-stats] instance. While the `stats.is*` methods are available, only the following properties are supported:
+        -   **mode** The raw mode.
+        -   **size** The file size.
+        -   **mtime** The time of last modification as a `Date`.
+-   Returns: `Promise`
+-   Resolves with: `stats` (see callback)
 
 #### sync.tempFile(path)
 
 A simple helper method for creating appropriate temporary filenames for pushing files. This is essentially the same as taking the basename of the file and appending it to `'/data/local/tmp/'`.
 
-* **path** The path of the file.
-* Returns: An appropriate temporary file path.
+-   **path** The path of the file.
+-   Returns: An appropriate temporary file path.
 
 ### PushTransfer
 
@@ -1043,18 +1034,18 @@ A simple EventEmitter, mainly for keeping track of the progress.
 
 List of events:
 
-* **progress** **(stats)** Emitted when a chunk has been flushed to the ADB connection.
-    - **stats** An object with the following stats about the transfer:
-        * **bytesTransferred** The number of bytes transferred so far.
-* **error** **(err)** Emitted on error.
-    - **err** An `Error`.
-* **end** Emitted when the transfer has successfully completed.
+-   **progress** **(stats)** Emitted when a chunk has been flushed to the ADB connection.
+    -   **stats** An object with the following stats about the transfer:
+        -   **bytesTransferred** The number of bytes transferred so far.
+-   **error** **(err)** Emitted on error.
+    -   **err** An `Error`.
+-   **end** Emitted when the transfer has successfully completed.
 
 #### pushTransfer.cancel()
 
 Cancels the transfer by ending both the stream that is being pushed and the sync connection. This will most likely end up creating a broken file on your device. **Use at your own risk.** Also note that you must create a new sync connection if you wish to continue using the sync service.
 
-* Returns: The pushTransfer instance.
+-   Returns: The pushTransfer instance.
 
 ### PullTransfer
 
@@ -1062,18 +1053,18 @@ Cancels the transfer by ending both the stream that is being pushed and the sync
 
 List of events:
 
-* **progress** **(stats)** Emitted when a new chunk is received.
-    - **stats** An object with the following stats about the transfer:
-        * **bytesTransferred** The number of bytes transferred so far.
-* **error** **(err)** Emitted on error.
-    - **err** An `Error`.
-* **end** Emitted when the transfer has successfully completed.
+-   **progress** **(stats)** Emitted when a new chunk is received.
+    -   **stats** An object with the following stats about the transfer:
+        -   **bytesTransferred** The number of bytes transferred so far.
+-   **error** **(err)** Emitted on error.
+    -   **err** An `Error`.
+-   **end** Emitted when the transfer has successfully completed.
 
 #### pullTransfer.cancel()
 
 Cancels the transfer by ending the connection. Can be useful for reading endless streams of data, such as `/dev/urandom` or `/dev/zero`, perhaps for benchmarking use. Note that you must create a new sync connection if you wish to continue using the sync service.
 
-* Returns: The pullTransfer instance.
+-   Returns: The pullTransfer instance.
 
 # Incompatible changes in version 2.x
 
@@ -1091,11 +1082,11 @@ Test coverage was also massively improved, although we've still got ways to go.
 
 ## More information
 
-* [Android Debug Bridge][adb-site]
-    - [SERVICES.TXT][adb-services] (ADB socket protocol)
-* [Android ADB Protocols][adb-protocols] (a blog post explaining the protocol)
-* [adb.js][adb-js] (another Node.js ADB implementation)
-* [ADB Chrome extension][chrome-adb]
+-   [Android Debug Bridge][adb-site]
+    -   [SERVICES.TXT][adb-services] (ADB socket protocol)
+-   [Android ADB Protocols][adb-protocols] (a blog post explaining the protocol)
+-   [adb.js][adb-js] (another Node.js ADB implementation)
+-   [ADB Chrome extension][chrome-adb]
 
 ## Contributing
 
@@ -1107,25 +1098,24 @@ See [LICENSE](LICENSE).
 
 Copyright © The OpenSTF Project. All Rights Reserved.
 
-[nodejs]: <http://nodejs.org/>
-[coffeescript]: <http://coffeescript.org/>
-[npm]: <https://npmjs.org/>
-[adb-js]: <https://github.com/flier/adb.js>
-[adb-site]: <http://developer.android.com/tools/help/adb.html>
-[adb-services]: <https://github.com/android/platform_system_core/blob/master/adb/SERVICES.TXT>
-[adb-protocols]: <http://blogs.kgsoft.co.uk/2013_03_15_prg.htm>
-[file_sync_service.h]: <https://github.com/android/platform_system_core/blob/master/adb/file_sync_service.h>
-[chrome-adb]: <https://chrome.google.com/webstore/detail/adb/dpngiggdglpdnjdoaefidgiigpemgage>
-[node-debug]: <https://npmjs.org/package/debug>
-[net-connect]: <http://nodejs.org/api/net.html#net_net_connect_options_connectionlistener>
-[node-events]: <http://nodejs.org/api/events.html>
-[node-stream]: <http://nodejs.org/api/stream.html>
-[node-buffer]: <http://nodejs.org/api/buffer.html>
-[node-net]: <http://nodejs.org/api/net.html>
-[node-fs]: <http://nodejs.org/api/fs.html>
-[node-fs-stats]: <http://nodejs.org/api/fs.html#fs_class_fs_stats>
-[node-gm]: <https://github.com/aheckmann/gm>
-[graphicsmagick]: <http://www.graphicsmagick.org/>
-[imagemagick]: <http://www.imagemagick.org/>
-[adbkit-logcat]: <https://npmjs.org/package/adbkit-logcat>
-[adbkit-monkey]: <https://npmjs.org/package/adbkit-monkey>
+[nodejs]: http://nodejs.org/
+[npm]: https://npmjs.org/
+[adb-js]: https://github.com/flier/adb.js
+[adb-site]: http://developer.android.com/tools/help/adb.html
+[adb-services]: https://github.com/android/platform_system_core/blob/master/adb/SERVICES.TXT
+[adb-protocols]: http://blogs.kgsoft.co.uk/2013_03_15_prg.htm
+[file_sync_service.h]: https://github.com/android/platform_system_core/blob/master/adb/file_sync_service.h
+[chrome-adb]: https://chrome.google.com/webstore/detail/adb/dpngiggdglpdnjdoaefidgiigpemgage
+[node-debug]: https://npmjs.org/package/debug
+[net-connect]: http://nodejs.org/api/net.html#net_net_connect_options_connectionlistener
+[node-events]: http://nodejs.org/api/events.html
+[node-stream]: http://nodejs.org/api/stream.html
+[node-buffer]: http://nodejs.org/api/buffer.html
+[node-net]: http://nodejs.org/api/net.html
+[node-fs]: http://nodejs.org/api/fs.html
+[node-fs-stats]: http://nodejs.org/api/fs.html#fs_class_fs_stats
+[node-gm]: https://github.com/aheckmann/gm
+[graphicsmagick]: http://www.graphicsmagick.org/
+[imagemagick]: http://www.imagemagick.org/
+[adbkit-logcat]: https://npmjs.org/package/adbkit-logcat
+[adbkit-monkey]: https://npmjs.org/package/adbkit-monkey