Move support plugins to their own folder.

lib/roles/device/plugins/adb.js

@@ -1,25 +0,0 @@
-var syrup = require('syrup')
-
-var adbkit = require('adbkit')
-
-var logger = require('../../../util/logger')
-var promiseutil = require('../../../util/promiseutil')
-
-module.exports = syrup()
-  .define(function(options) {
-    var log = logger.createLogger('device:plugins:adb')
-    var adb = adbkit.createClient()
-
-    function ensureBootComplete() {
-      return promiseutil.periodicNotify(
-          adb.waitBootComplete(options.serial)
-        , 1000
-        )
-        .progressed(function() {
-          log.info('Waiting for boot to complete')
-        })
-    }
-
-    return ensureBootComplete()
-      .return(adb)
-  })

lib/roles/device/plugins/channels.js

@@ -1,14 +0,0 @@
-var syrup = require('syrup')
-
-var logger = require('../../../util/logger')
-var ChannelManager = require('../../../wire/channelmanager')
-
-module.exports = syrup()
-  .define(function(options, router) {
-    var log = logger.createLogger('device:plugins:channels')
-    var channels = new ChannelManager()
-    channels.on('timeout', function(channel) {
-      log.info('Channel "%s" timed out', channel)
-    })
-    return channels
-  })

lib/roles/device/plugins/heartbeat.js

@@ -4,7 +4,7 @@ var wire = require('../../../wire')
 var wireutil = require('../../../wire/util')
 
 module.exports = syrup()
-  .dependency(require('./push'))
+  .dependency(require('../support/push'))
   .define(function(options, push) {
     function heartbeat() {
       push.send([

lib/roles/device/plugins/http.js

@@ -12,8 +12,8 @@ var logger = require('../../../util/logger')
 var devutil = require('../../../util/devutil')
 
 module.exports = syrup()
-  .dependency(require('./adb'))
-  .dependency(require('./quit'))
+  .dependency(require('../support/adb'))
+  .dependency(require('../support/quit'))
   .dependency(require('../resources/remote'))
   .define(function(options, adb, quit, remote) {
     var log = logger.createLogger('device:plugins:http')

lib/roles/device/plugins/identity.js

@@ -4,7 +4,7 @@ var devutil = require('../../../util/devutil')
 var logger = require('../../../util/logger')
 
 module.exports = syrup()
-  .dependency(require('./adb'))
+  .dependency(require('../support/adb'))
   .define(function(options, adb) {
     var log = logger.createLogger('device:plugins:identity')
 

lib/roles/device/plugins/input.js

@@ -11,9 +11,9 @@ var streamutil = require('../../../util/streamutil')
 var logger = require('../../../util/logger')
 
 module.exports = syrup()
-  .dependency(require('./adb'))
-  .dependency(require('./router'))
-  .dependency(require('./quit'))
+  .dependency(require('../support/adb'))
+  .dependency(require('../support/router'))
+  .dependency(require('../support/quit'))
   .dependency(require('../resources/inputagent'))
   .define(function(options, adb, router, quit, apk) {
     var log = logger.createLogger('device:plugins:input')

lib/roles/device/plugins/logcat.js

@@ -5,9 +5,9 @@ var wire = require('../../../wire')
 var wireutil = require('../../../wire/util')
 
 module.exports = syrup()
-  .dependency(require('./adb'))
-  .dependency(require('./router'))
-  .dependency(require('./quit'))
+  .dependency(require('../support/adb'))
+  .dependency(require('../support/router'))
+  .dependency(require('../support/quit'))
   .define(function(options, adb, router, quit) {
     var log = logger.createLogger('device:plugins:logcat')
 

lib/roles/device/plugins/logsender.js

@@ -5,7 +5,7 @@ var wire = require('../../../wire')
 var wireutil = require('../../../wire/util')
 
 module.exports = syrup()
-  .dependency(require('./push'))
+  .dependency(require('../support/push'))
   .define(function(options, push) {
     // Forward all logs
     logger.on('entry', function(entry) {

lib/roles/device/plugins/owner.js

@@ -7,14 +7,14 @@ var wireutil = require('../../../wire/util')
 var devutil = require('../../../util/devutil')
 
 module.exports = syrup()
-  .dependency(require('./router'))
   .dependency(require('./identity'))
-  .dependency(require('./push'))
-  .dependency(require('./sub'))
-  .dependency(require('./channels'))
   .dependency(require('./input'))
-  .dependency(require('./quit'))
-  .define(function(options, router, identity, push, sub, channels, input, quit) {
+  .dependency(require('../support/router'))
+  .dependency(require('../support/push'))
+  .dependency(require('../support/sub'))
+  .dependency(require('../support/channels'))
+  .dependency(require('../support/quit'))
+  .define(function(options, identity, input, router, push, sub, channels, quit) {
     var log = logger.createLogger('device:plugins:owner')
     var owner = null
 

lib/roles/device/plugins/push.js

@@ -1,19 +0,0 @@
-var syrup = require('syrup')
-
-var zmq = require('zmq')
-
-var logger = require('../../../util/logger')
-
-module.exports = syrup()
-  .define(function(options) {
-    var log = logger.createLogger('device:plugins:push')
-
-    // Output
-    var push = zmq.socket('push')
-    options.endpoints.push.forEach(function(endpoint) {
-      log.info('Sending output to %s', endpoint)
-      push.connect(endpoint)
-    })
-
-    return push
-  })

lib/roles/device/plugins/quit.js

@@ -1,38 +0,0 @@
-var Promise = require('bluebird')
-var syrup = require('syrup')
-
-var logger = require('../../../util/logger')
-
-module.exports = syrup()
-  .define(function(options) {
-    var log = logger.createLogger('device:plugins:quit')
-    var cleanup = []
-
-    function graceful() {
-      log.info('Winding down for graceful exit')
-
-      var wait = Promise.all(cleanup.map(function(fn) {
-        return fn()
-      }))
-
-      return wait.then(function() {
-        process.exit(0)
-      })
-    }
-
-    function fatal() {
-      log.fatal('Shutting down due to fatal error')
-      process.exit(1)
-    }
-
-    process.on('SIGINT', graceful)
-    process.on('SIGTERM', graceful)
-
-    return {
-      graceful: graceful
-    , fatal: fatal
-    , observe: function(promise) {
-        cleanup.push(promise)
-      }
-    }
-  })

lib/roles/device/plugins/router.js

@@ -1,15 +0,0 @@
-var syrup = require('syrup')
-
-var wirerouter = require('../../../wire/router')
-
-module.exports = syrup()
-  .dependency(require('./sub'))
-  .dependency(require('./channels'))
-  .define(function(options, sub, channels) {
-    var router = wirerouter()
-    sub.on('message', router.handler())
-    router.on('message', function(channel) {
-      channels.keepalive(channel)
-    })
-    return router
-  })

lib/roles/device/plugins/shell.js

@@ -6,10 +6,10 @@ var wire = require('../../../wire')
 var wireutil = require('../../../wire/util')
 
 module.exports = syrup()
-  .dependency(require('./adb'))
-  .dependency(require('./router'))
-  .dependency(require('./push'))
-  .dependency(require('./sub'))
+  .dependency(require('../support/adb'))
+  .dependency(require('../support/router'))
+  .dependency(require('../support/push'))
+  .dependency(require('../support/sub'))
   .define(function(options, adb, router, push, sub) {
     var log = logger.createLogger('device:plugins:shell')
 

lib/roles/device/plugins/solo.js

@@ -5,9 +5,9 @@ var wire = require('../../../wire')
 var wireutil = require('../../../wire/util')
 
 module.exports = syrup()
-  .dependency(require('./sub'))
-  .dependency(require('./push'))
-  .dependency(require('./channels'))
+  .dependency(require('../support/sub'))
+  .dependency(require('../support/push'))
+  .dependency(require('../support/channels'))
   .define(function(options, sub, push, channels) {
     var log = logger.createLogger('device:plugins:solo')
     var channel = wireutil.makePrivateChannel()

lib/roles/device/plugins/stats.js

@@ -5,8 +5,8 @@ var logger = require('../../../util/logger')
 var devutil = require('../../../util/devutil')
 
 module.exports = syrup()
-  .dependency(require('./adb'))
-  .dependency(require('./quit'))
+  .dependency(require('../support/adb'))
+  .dependency(require('../support/quit'))
   .dependency(require('../resources/remote'))
   .define(function(options, adb, quit, remote) {
     var log = logger.createLogger('device:plugins:stats')

lib/roles/device/plugins/sub.js

@@ -1,28 +0,0 @@
-var syrup = require('syrup')
-
-var zmq = require('zmq')
-
-var logger = require('../../../util/logger')
-var wireutil = require('../../../wire/util')
-
-module.exports = syrup()
-  .dependency(require('./channels'))
-  .define(function(options, channels) {
-    var log = logger.createLogger('device:plugins:sub')
-
-    // Input
-    var sub = zmq.socket('sub')
-    options.endpoints.sub.forEach(function(endpoint) {
-      log.info('Receiving input from %s', endpoint)
-      sub.connect(endpoint)
-    })
-
-    // Establish always-on channels
-    ;[wireutil.global].forEach(function(channel) {
-      log.info('Subscribing to permanent channel "%s"', channel)
-      sub.subscribe(channel)
-      channels.register(channel, Infinity)
-    })
-
-    return sub
-  })

lib/roles/device/plugins/touch.js

@@ -8,9 +8,9 @@ var devutil = require('../../../util/devutil')
 var logger = require('../../../util/logger')
 
 module.exports = syrup()
-  .dependency(require('./adb'))
-  .dependency(require('./router'))
-  .dependency(require('./quit'))
+  .dependency(require('../support/adb'))
+  .dependency(require('../support/router'))
+  .dependency(require('../support/quit'))
   .dependency(require('../resources/remote'))
   .define(function(options, adb, router, quit, remote) {
     var log = logger.createLogger('device:plugins:touch')