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

Invite/kick now uses transactions so that you can know whether the device actually joined or not. It's a bit messy right now, should introduce some sugar to make it cleaner.

Browse Source
This commit is contained in:
Simo Kinnunen
2014-02-26 19:03:11 +09:00
parent b177d198b3
commit be9d1c9579
3 changed files with 116 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
lib/roles/app.js
View File

@@ -275,29 +275,6 @@ module.exports = function(options) {
new Promise(function(resolve, reject) {
socket.on('disconnect', resolve)
// Grouping
.on('group.invite', function(data) {
push.send([
wireutil.global
, wireutil.envelope(new wire.GroupMessage(
new wire.OwnerMessage(
user.email
, user.name
, user.group
)
, options.groupTimeout
, wireutil.toDeviceRequirements(data)
))
])
})
.on('group.kick', function(data) {
push.send([
user.group
, wireutil.envelope(new wire.UngroupMessage(
wireutil.toDeviceRequirements(data)
))
])
})
// Touch events
.on('input.touchDown', createTouchHandler(wire.TouchDownMessage))
.on('input.touchMove', createTouchHandler(wire.TouchMoveMessage))
@@ -316,6 +293,36 @@ module.exports = function(options) {
])
})
// Transactions
.on('group.invite', function(channel, responseChannel, data) {
joinChannel(responseChannel)
push.send([
channel
, wireutil.transaction(
responseChannel
, new wire.GroupMessage(
new wire.OwnerMessage(
user.email
, user.name
, user.group
)
, options.groupTimeout
, wireutil.toDeviceRequirements(data)
)
)
])
})
.on('group.kick', function(channel, responseChannel, data) {
joinChannel(responseChannel)
push.send([
channel
, wireutil.transaction(
responseChannel
, new wire.UngroupMessage(
wireutil.toDeviceRequirements(data)
)
)
])
})
.on('tx.cleanup', function(channel) {
leaveChannel(channel)
})

66
lib/roles/device.js
View File

@@ -342,15 +342,65 @@ module.exports = function(options) {
wireutil.makeDeviceIdentityMessage(options.serial, identity)])
})
.on(wire.GroupMessage, function(channel, message) {
if (!isGrouped() &&
devutil.matchesRequirements(identity, message.requirements)) {
joinGroup(message.owner, message.timeout)
var seq = 0
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
))
])
}
else if (isOwnedBy(message.owner)) {
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, true
))
])
}
else {
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, false
))
])
}
}
})
.on(wire.UngroupMessage, function(channel, message) {
if (isGrouped() &&
devutil.matchesRequirements(identity, message.requirements)) {
leaveGroup()
var seq = 0
if (devutil.matchesRequirements(identity, message.requirements)) {
if (isGrouped()) {
leaveGroup()
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, true
))
])
}
else {
push.send([
channel
, wireutil.envelope(new wire.TransactionDoneMessage(
options.serial
, seq++
, true
))
])
}
}
})
.on(wire.TouchDownMessage, function(channel, message) {
@@ -526,6 +576,10 @@ module.exports = function(options) {
])
}
function isOwnedBy(someOwner) {
return owner && owner.group == someOwner.group
}
function joinGroup(newOwner, timeout) {
log.info('Now owned by "%s"', newOwner.email)
log.info('Subscribing to group channel "%s"', newOwner.group)