starred/stf
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-18 14:53:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

ADB connect now respects auth keys in the settings page.

Browse Source
This commit is contained in:
Simo Kinnunen
2014-10-01 18:41:18 +09:00
parent 0a67c8c272
commit e6c1de5194
12 changed files with 322 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
lib/units/device/plugins/connect.js
View File

@@ -13,7 +13,8 @@ module.exports = syrup.serial()
.dependency(require('../support/router'))
.dependency(require('../support/push'))
.dependency(require('./group'))
.define(function(options, adb, router, push, group) {
.dependency(require('./solo'))
.define(function(options, adb, router, push, group, solo) {
var log = logger.createLogger('device:plugins:connect')
, plugin = Object.create(null)
, activeServer = null
@@ -27,7 +28,53 @@ module.exports = syrup.serial()
return resolve(plugin.url)
}
var server = adb.createTcpUsbBridge(options.serial)
var server = adb.createTcpUsbBridge(options.serial, {
auth: function(key) {
var resolver = Promise.defer()
function notify() {
push.send([
solo.channel
, wireutil.envelope(new wire.JoinGroupByAdbFingerprintMessage(
options.serial
, key.fingerprint
, key.comment
))
])
}
function joinListener(group, identifier) {
if (identifier !== key.fingerprint) {
resolver.reject(new Error('Somebody else took the device'))
}
}
function autojoinListener(identifier, joined) {
if (identifier === key.fingerprint) {
if (joined) {
resolver.resolve()
}
else {
resolver.reject(new Error('Device is already in use'))
}
}
}
group.on('join', joinListener)
group.on('autojoin', autojoinListener)
router.on(wire.AdbKeysUpdatedMessage, notify)
notify()
return resolver.promise
.timeout(120000)
.finally(function() {
group.removeListener('join', joinListener)
group.removeListener('autojoin', autojoinListener)
router.removeListener(wire.AdbKeysUpdatedMessage, notify)
})
}
})
server.on('listening', function() {
resolve(plugin.url)

13
lib/units/device/plugins/group.js
View File

@@ -30,7 +30,7 @@ module.exports = syrup.serial()
return currentGroup
})
plugin.join = function(newGroup, timeout) {
plugin.join = function(newGroup, timeout, identifier) {
return plugin.get()
.then(function() {
if (currentGroup.group !== newGroup.group) {
@@ -60,7 +60,7 @@ module.exports = syrup.serial()
))
])
plugin.emit('join', currentGroup)
plugin.emit('join', currentGroup, identifier)
return currentGroup
})
@@ -134,6 +134,15 @@ module.exports = syrup.serial()
])
})
})
.on(wire.AutoGroupMessage, function(channel, message) {
return plugin.join(message.owner, message.timeout, message.identifier)
.then(function() {
plugin.emit('autojoin', message.identifier, true)
})
.catch(grouputil.AlreadyGroupedError, function() {
plugin.emit('autojoin', message.identifier, false)
})
})
.on(wire.UngroupMessage, function(channel, message) {
var reply = wireutil.reply(options.serial)
grouputil.match(ident, message.requirements)