Use wireutil.reply() where possible.

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

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()
])
}
}