1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-04 18:29:17 +02:00

Merge DeviceIdentityMessage on the app side.

This commit is contained in:
Simo Kinnunen 2014-02-03 19:56:01 +09:00
parent 2086d7d439
commit eb332ff36a
4 changed files with 10 additions and 2 deletions

View file

@ -187,6 +187,9 @@ module.exports = function(options) {
.on(wire.DeviceStatusMessage, function(channel, message) { .on(wire.DeviceStatusMessage, function(channel, message) {
socket.emit('device.status', message) socket.emit('device.status', message)
}) })
.on(wire.DeviceIdentityMessage, function(channel, message) {
socket.emit('device.identity', message)
})
.handler() .handler()
// Global messages // Global messages

View file

@ -331,7 +331,7 @@ module.exports = function(options) {
sub.on('message', wirerouter() sub.on('message', wirerouter()
.on(wire.ProbeMessage, function(channel, message) { .on(wire.ProbeMessage, function(channel, message) {
push.send([channel, push.send([wireutil.global,
wireutil.makeDeviceIdentityMessage(options.serial, identity)]) wireutil.makeDeviceIdentityMessage(options.serial, identity)])
channels.keepalive(channel) channels.keepalive(channel)
}) })

View file

@ -60,8 +60,9 @@ module.exports = function(options) {
devDealer.send([message.channel, wireutil.makeProbeMessage()]) devDealer.send([message.channel, wireutil.makeProbeMessage()])
}) })
}) })
.on(wire.DeviceIdentityMessage, function(channel, message) { .on(wire.DeviceIdentityMessage, function(channel, message, data) {
dbapi.saveDeviceIdentity(message.serial, message) dbapi.saveDeviceIdentity(message.serial, message)
appDealer.send([channel, data])
}) })
.on(wire.ShellCommandDataMessage, function(channel, message, data) { .on(wire.ShellCommandDataMessage, function(channel, message, data) {
appDealer.send([channel, data]) appDealer.send([channel, data])

View file

@ -47,6 +47,10 @@ define(['./module', 'oboe'], function(mod, oboe) {
remove(data) remove(data)
}) })
socket.on('device.identity', function(data) {
modify(get(data), data)
})
oboe('/api/v1/devices') oboe('/api/v1/devices')
.node('devices[*]', function(device) { .node('devices[*]', function(device) {
// We want to skip other arguments // We want to skip other arguments