Further simplify message handling by abstracting message mapping to library code.

This commit is contained in:
Simo Kinnunen
2014-02-02 20:37:48 +09:00
parent b9ca8b04e1
commit 5c1c9fd344
8 changed files with 79 additions and 75 deletions

View File

@@ -328,12 +328,12 @@ module.exports = function(options) {
})
sub.on('message', wirerouter()
.on(wire.MessageType.ProbeMessage, function(channel, message) {
.on(wire.ProbeMessage, function(channel, message) {
push.send([channel,
wireutil.makeDeviceIdentityMessage(options.serial, identity)])
channels.keepalive(channel)
})
.on(wire.MessageType.GroupMessage, function(channel, message) {
.on(wire.GroupMessage, function(channel, message) {
var groupChannel = message.channel
if (devutil.matchesRequirements(identity, message.requirements)) {
channels.register(groupChannel, message.timeout)
@@ -344,7 +344,7 @@ module.exports = function(options) {
}
channels.keepalive(channel)
})
.on(wire.MessageType.UngroupMessage, function(channel, message) {
.on(wire.UngroupMessage, function(channel, message) {
var groupChannel = message.channel
if (devutil.matchesRequirements(identity, message.requirements)) {
channels.unregister(groupChannel)
@@ -355,7 +355,7 @@ module.exports = function(options) {
}
channels.keepalive(channel)
})
.on(wire.MessageType.ShellCommandMessage, function(channel, message) {
.on(wire.ShellCommandMessage, function(channel, message) {
log.info('Running shell command "%s"', message.command.join(' '))
adb.shellAsync(options.serial, message.command)
.then(function(stream) {