yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-04 18:29:17 +02:00
Code Issues Releases Wiki Activity

Use wireutil.reply() where possible.

Browse source
This commit is contained in:
Simo Kinnunen 2014-04-11 14:54:19 +09:00
parent 90b39306a8
commit 7f74ecd7af
8 changed files with 32 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/roles/app.js
View file

@ -474,16 +474,12 @@ module.exports = function(options) {
}
})
.catch(function(err) {
var reply = wireutil.reply('storage')
log.error('Storage upload had an error', err.stack)
leaveChannel(responseChannel)
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
'storage'
, 0
, false
, 'fail'
))
, reply.fail('fail')
])
})
})

31
lib/roles/device/plugins/clipboard.js
View file

@ -13,57 +13,38 @@ module.exports = syrup.serial()
router.on(wire.PasteMessage, function(channel, message) {
log.info('Pasting "%s" to clipboard', message.text)
var seq = 0
var reply = wireutil.reply(options.serial)
input.paste(message.text)
.then(function() {
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, true
))
, reply.okay()
])
})
.catch(function(err) {
log.error('Paste failed', err.stack)
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, false
, err.message
))
, reply.fail(err.message)
])
})
})
router.on(wire.CopyMessage, function(channel) {
log.info('Copying clipboard contents')
var seq = 0
var reply = wireutil.reply(options.serial)
input.copy()
.then(function(content) {
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, true
, content
))
, reply.okay(content)
])
})
.catch(function(err) {
log.error('Copy failed', err.stack)
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, false
, err.message
))
, reply.fail(err.message)
])
})
})

7
lib/roles/device/plugins/input.js
View file

@ -337,14 +337,11 @@ module.exports = syrup.serial()
.then(function() {
router
.on(wire.PhysicalIdentifyMessage, function(channel) {
var reply = wireutil.reply(options.serial)
identity()
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, 0
, true
))
, reply.okay()
])
})
.on(wire.KeyDownMessage, function(channel, message) {

39
lib/roles/device/plugins/install.js
View file

@ -19,17 +19,12 @@ module.exports = syrup.serial()
router.on(wire.InstallMessage, function(channel, message) {
log.info('Installing "%s"', message.url)
var seq = 0
var reply = wireutil.reply(options.serial)
function sendProgress(data, progress) {
push.send([
channel
, wireutil.envelope(new wire.TransactionProgressMessage(
options.serial
, seq++
, data
, progress
))
, reply.progress(data, progress)
])
}
@ -124,24 +119,14 @@ module.exports = syrup.serial()
.then(function() {
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, true
, 'success'
))
, reply.okay('success')
])
})
.catch(function(err) {
log.error('Installation failed', err.stack)
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, false
, 'fail'
))
, reply.fail('fail')
])
})
})
@ -149,30 +134,20 @@ module.exports = syrup.serial()
router.on(wire.UninstallMessage, function(channel, message) {
log.info('Uninstalling "%s"', message.packageName)
var seq = 0
var reply = wireutil.reply(options.serial)
adb.uninstall(options.serial, message.packageName)
.then(function() {
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, true
, 'success'
))
, reply.okay('success')
])
})
.catch(function(err) {
log.error('Uninstallation failed', err.stack)
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, false
, 'fail'
))
, reply.fail('fail')
])
})
})

34
lib/roles/device/plugins/owner.js
View file

@ -68,63 +68,43 @@ module.exports = syrup.serial()
router
.on(wire.GroupMessage, function(channel, message) {
var seq = 0
var reply = wireutil.reply(options.serial)
if (devutil.matchesRequirements(identity, message.requirements)) {
if (!isGrouped()) {
joinGroup(message.owner, message.timeout)
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, true
))
, reply.okay()
])
}
else if (isOwnedBy(message.owner)) {
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, true
))
, reply.okay()
])
}
else {
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, false
))
, reply.fail()
])
}
}
})
.on(wire.UngroupMessage, function(channel, message) {
var seq = 0
var reply = wireutil.reply(options.serial)
if (devutil.matchesRequirements(identity, message.requirements)) {
if (isGrouped()) {
leaveGroup()
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, true
))
, reply.okay()
])
}
else {
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, true
))
, reply.okay()
])
}
}

21
lib/roles/device/plugins/shell.js
View file

@ -14,7 +14,7 @@ module.exports = syrup.serial()
var log = logger.createLogger('device:plugins:shell')
router.on(wire.ShellCommandMessage, function(channel, message) {
var seq = 0
var reply = wireutil.reply(options.serial)
log.info('Running shell command "%s"', message.command)
@ -34,11 +34,7 @@ module.exports = syrup.serial()
while ((chunk = stream.read())) {
push.send([
channel
, wireutil.envelope(new wire.TransactionProgressMessage(
options.serial
, seq++
, chunk
))
, reply.progress(chunk)
])
}
}
@ -46,11 +42,7 @@ module.exports = syrup.serial()
function endListener() {
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, true
))
, reply.okay()
])
resolver.resolve()
}
@ -85,12 +77,7 @@ module.exports = syrup.serial()
log.error('Shell command "%s" failed', message.command, err.stack)
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, false
, err.message
))
, reply.fail(err.message)
])
})
})

18
lib/roles/storage/temp.js
View file

@ -15,7 +15,6 @@ var zmq = require('zmq')
var logger = require('../../util/logger')
var requtil = require('../../util/requtil')
var Storage = require('../../util/storage')
var wire = require('../../wire')
var wireutil = require('../../wire/util')
module.exports = function(options) {
@ -129,18 +128,13 @@ module.exports = function(options) {
}
app.post('/api/v1/resources', function(req, res) {
var seq = 0
var reply = wireutil.reply(options.id)
function sendProgress(data, progress) {
if (req.query.channel) {
push.send([
req.query.channel
, wireutil.envelope(new wire.TransactionProgressMessage(
options.id
, seq++
, data
, progress
))
, reply.progress(data, progress)
])
}
}
@ -149,13 +143,7 @@ module.exports = function(options) {
if (req.query.channel) {
push.send([
req.query.channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.id
, seq++
, success
, data
, body ? JSON.stringify(body) : null
))
, reply.okay(data, body)
])
}
}

2
lib/wire/util.js
View file

@ -37,7 +37,7 @@ var wireutil = {
)
.encodeNB()
}
, response: function(source) {
, reply: function(source) {
var seq = 0
return {
okay: function(data, body) {