diff --git a/lib/cli.js b/lib/cli.js index 9b0ed5c9..a10a6e44 100644 --- a/lib/cli.js +++ b/lib/cli.js @@ -103,6 +103,7 @@ program , '--connect-push', options.connectPush.join(',') , '--screen-port', ports.shift() , '--connect-port', ports.shift() + , '--vnc-port', ports.shift() , '--public-ip', options.publicIp , '--group-timeout', options.groupTimeout , '--storage-url', options.storageUrl @@ -142,6 +143,9 @@ program .option('--connect-port ' , 'port allocated to adb connect' , Number) + .option('--vnc-port ' + , 'port allocated to vnc' + , Number) .option('--connect-url-pattern ' , 'adb connect URL pattern' , String @@ -193,6 +197,9 @@ program if (!options.connectPort) { this.missingArgument('--connect-port') } + if (!options.vncPort) { + this.missingArgument('--vnc-port') + } if (!options.storageUrl) { this.missingArgument('--storage-url') } @@ -213,6 +220,7 @@ program , screenPort: options.screenPort , connectUrlPattern: options.connectUrlPattern , connectPort: options.connectPort + , vncPort: options.vncPort , heartbeatInterval: options.heartbeatInterval , muteMaster: options.muteMaster , lockRotation: options.lockRotation diff --git a/lib/units/device/index.js b/lib/units/device/index.js index fa2a3a29..26fbafb0 100644 --- a/lib/units/device/index.js +++ b/lib/units/device/index.js @@ -20,6 +20,7 @@ module.exports = function(options) { .dependency(require('./plugins/solo')) .dependency(require('./plugins/screen/stream')) .dependency(require('./plugins/screen/capture')) + .dependency(require('./plugins/vnc')) .dependency(require('./plugins/service')) .dependency(require('./plugins/browser')) .dependency(require('./plugins/store')) diff --git a/lib/units/device/plugins/vnc.js b/lib/units/device/plugins/vnc.js new file mode 100644 index 00000000..51b93286 --- /dev/null +++ b/lib/units/device/plugins/vnc.js @@ -0,0 +1,10 @@ +var syrup = require('stf-syrup') +var Promise = require('bluebird') +var _ = require('lodash') + +var logger = require('../../../util/logger') + +module.exports = syrup.serial() + .define(function(options) { + + }) diff --git a/lib/units/provider/index.js b/lib/units/provider/index.js index 981875a0..3d196b41 100644 --- a/lib/units/provider/index.js +++ b/lib/units/provider/index.js @@ -316,7 +316,7 @@ module.exports = function(options) { // Spawn a device worker function spawn() { - var allocatedPorts = ports.splice(0, 2) + var allocatedPorts = ports.splice(0, 4) , proc = options.fork(device, allocatedPorts) , resolver = Promise.defer()