Revert "Fix adbkit API invocations (#524)"

lib/units/api/controllers/user.js

@@ -7,7 +7,7 @@ var util = require('util')
 var _ = require('lodash')
 var Promise = require('bluebird')
 var uuid = require('uuid')
-var adbkit = require('@devicefarmer/adbkit').Adb
+var adbkit = require('@devicefarmer/adbkit')
 var dbapi = require('../../../db/api')
 var logger = require('../../../util/logger')
 var datautil = require('../../../util/datautil')

lib/units/device/plugins/screen/capture.js

@@ -1,7 +1,7 @@
 var util = require('util')
 
 var syrup = require('@devicefarmer/stf-syrup')
-var adbkit = require('@devicefarmer/adbkit').Adb
+var adbkit = require('@devicefarmer/adbkit')
 
 var logger = require('../../../../util/logger')
 var wire = require('../../../../wire')

lib/units/device/plugins/screen/stream.js

@@ -6,7 +6,7 @@ var WebSocket = require('ws')
 var uuid = require('uuid')
 var EventEmitter = require('eventemitter3')
 var split = require('split')
-var adbkit = require('@devicefarmer/adbkit').Adb
+var adbkit = require('@devicefarmer/adbkit')
 
 var logger = require('../../../../util/logger')
 var lifecycle = require('../../../../util/lifecycle')

lib/units/device/plugins/touch/index.js

@@ -4,8 +4,8 @@ var Promise = require('bluebird')
 var syrup = require('@devicefarmer/stf-syrup')
 var split = require('split')
 var EventEmitter = require('eventemitter3')
-var adbkit = require('@devicefarmer/adbkit').Adb
-var Parser = require('@devicefarmer/adbkit').Parser
+var adbkit = require('@devicefarmer/adbkit')
+var Parser = require('@devicefarmer/adbkit/lib/adb/parser')
 
 var wire = require('../../../../wire')
 var logger = require('../../../../util/logger')

lib/units/device/resources/minicap.js

@@ -10,7 +10,6 @@ var pathutil = require('../../../util/pathutil')
 var devutil = require('../../../util/devutil')
 var streamutil = require('../../../util/streamutil')
 var Resource = require('./util/resource')
-var deviceClient = require('@devicefarmer/adbkit').DeviceClient
 
 module.exports = syrup.serial()
   .dependency(require('../support/adb'))
@@ -68,11 +67,9 @@ module.exports = syrup.serial()
       , mode: 0755
       })
     }
-
-    var client = deviceClient(adb, options.serial)
 
     function removeResource(res) {
-      return client.shell(['rm', '-f', res.dest])
+      return adb.shell(options.serial, ['rm', '-f', res.dest])
         .timeout(10000)
         .then(function(out) {
           return streamutil.readAll(out)
@@ -81,7 +78,7 @@ module.exports = syrup.serial()
     }
 
     function pushResource(res) {
-      return client.push(res.src, res.dest, res.mode)
+      return adb.push(options.serial, res.src, res.dest, res.mode)
         .timeout(10000)
         .then(function(transfer) {
           return new Promise(function(resolve, reject) {
@@ -96,7 +93,7 @@ module.exports = syrup.serial()
       log.info('Installing "%s" as "%s"', res.src, res.dest)
 
       function checkExecutable(res) {
-        return client.stat(res.dest)
+        return adb.stat(options.serial, res.dest)
           .timeout(5000)
           .then(function(stats) {
             // Can't use fs.constants.S_IXUSR due to differences on Windows.

lib/units/device/resources/service.js

@@ -3,7 +3,6 @@ var util = require('util')
 var syrup = require('@devicefarmer/stf-syrup')
 var ProtoBuf = require('protobufjs')
 var semver = require('semver')
-var deviceClient = require('@devicefarmer/adbkit').DeviceClient
 
 var pathutil = require('../../../util/pathutil')
 var streamutil = require('../../../util/streamutil')
@@ -31,8 +30,7 @@ module.exports = syrup.serial()
     }
 
     function getPath() {
-      var client = deviceClient(adb, options.serial)
-      return client.shell(['pm', 'path', resource.pkg])
+      return adb.shell(options.serial, ['pm', 'path', resource.pkg])
         .timeout(10000)
         .then(function(out) {
           return streamutil.findLine(out, (/^package:/))
@@ -48,8 +46,7 @@ module.exports = syrup.serial()
       return getPath()
         .then(function(installedPath) {
           log.info('Running version check')
-          var client = deviceClient(adb, options.serial)
-          return client.shell(util.format(
+          return adb.shell(options.serial, util.format(
             "export CLASSPATH='%s';" +
             " exec app_process /system/bin '%s' --version 2>/dev/null"
           , installedPath
@@ -77,13 +74,11 @@ module.exports = syrup.serial()
           log.info('Installing STFService')
           // Uninstall first to make sure we don't have any certificate
           // issues.
-          var client = deviceClient(adb, options.serial)
-
-          return client.uninstall(resource.pkg)
+          return adb.uninstall(options.serial, resource.pkg)
             .timeout(15000)
             .then(function() {
               return promiseutil.periodicNotify(
-                  client.install(resource.apk)
+                  adb.install(options.serial, resource.apk)
                 , 20000
                 )
                 .timeout(65000)

lib/units/device/support/adb.js

@@ -1,7 +1,6 @@
 var syrup = require('@devicefarmer/stf-syrup')
 
-var adbkit = require('@devicefarmer/adbkit').Adb
-var deviceClient = require('@devicefarmer/adbkit').DeviceClient
+var adbkit = require('@devicefarmer/adbkit')
 
 var logger = require('../../../util/logger')
 var promiseutil = require('../../../util/promiseutil')
@@ -16,9 +15,8 @@ module.exports = syrup.serial()
     adb.Keycode = adbkit.Keycode
 
     function ensureBootComplete() {
-      var client = deviceClient(adb, options.serial)
       return promiseutil.periodicNotify(
-          client.waitBootComplete()
+          adb.waitBootComplete(options.serial)
         , 1000
         )
         .progressed(function() {

lib/units/device/support/properties.js

@@ -1,5 +1,4 @@
 var syrup = require('@devicefarmer/stf-syrup')
-var deviceClient = require('@devicefarmer/adbkit').DeviceClient
 
 var logger = require('../../../util/logger')
 
@@ -10,8 +9,7 @@ module.exports = syrup.serial()
 
     function load() {
       log.info('Loading properties')
-      var client = deviceClient(adb, options.serial)
-      return client.getProperties()
+      return adb.getProperties(options.serial)
         .timeout(10000)
     }
 

lib/units/provider/index.js

@@ -1,4 +1,4 @@
-var adb = require('@devicefarmer/adbkit').Adb
+var adb = require('@devicefarmer/adbkit')
 var Promise = require('bluebird')
 var _ = require('lodash')
 var EventEmitter = require('eventemitter3')

lib/units/websocket/index.js

@@ -10,7 +10,7 @@ var socketio = require('socket.io')
 var Promise = require('bluebird')
 var _ = require('lodash')
 var request = Promise.promisifyAll(require('request'))
-var adbkit = require('@devicefarmer/adbkit').Adb
+var adbkit = require('@devicefarmer/adbkit')
 var uuid = require('uuid')
 
 var logger = require('../../util/logger')

lib/util/devutil.js

@@ -3,7 +3,6 @@ var util = require('util')
 var split = require('split')
 var Promise = require('bluebird')
 var androidDeviceList = require('android-device-list')
-var deviceClient = require('@devicefarmer/adbkit').DeviceClient
 
 var devutil = module.exports = Object.create(null)
 
@@ -72,8 +71,7 @@ devutil.listPidsByComm = function(adb, serial, comm, bin) {
     })
   }
 
-  var client = deviceClient(adb, serial)
-  return client.shell('ps 2>/dev/null')
+  return adb.shell(serial, 'ps 2>/dev/null')
      .then(findProcess)
      .then(function(res) {
        // return pids if process can be found in the output of 'ps' command
@@ -83,7 +81,7 @@ devutil.listPidsByComm = function(adb, serial, comm, bin) {
        }
        // otherwise try to run 'ps -elf'
        else {
-         return client.shell('ps -lef 2>/dev/null')
+         return adb.shell(serial, 'ps -lef 2>/dev/null')
            .then(findProcess)
            .then(function(res) {
               return Promise.resolve(res.pids)

lib/util/keyutil.js

@@ -1,6 +1,6 @@
 var util = require('util')
 
-var adb = require('@devicefarmer/adbkit').Adb
+var adb = require('@devicefarmer/adbkit')
 var Promise = require('bluebird')
 
 var keyutil = module.exports = Object.create(null)

package.json

@@ -33,7 +33,7 @@
     "prepare": "bower install && not-in-install && gulp build || in-install"
   },
   "dependencies": {
-    "@devicefarmer/adbkit": "^3.2.3",
+    "@devicefarmer/adbkit": "^2.11.3",
     "@devicefarmer/adbkit-apkreader": "^3.2.3",
     "@devicefarmer/adbkit-monkey": "^1.2.0",
     "@devicefarmer/minicap-prebuilt": "^2.7.1",