summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2018-05-21 19:55:16 +0200
committerJules Laplace <julescarbon@gmail.com>2018-05-21 19:55:16 +0200
commitc9fdaf31a1f06862946bd7c13155c71015d5332c (patch)
tree1b91b0c00fcd571a1bd40f3e0526a9c1e041534b /app
parentdd469b4ff7f9945864aa2da0e23fd466334884aa (diff)
statuses
Diffstat (limited to 'app')
-rw-r--r--app/client/socket.js10
-rw-r--r--app/relay/index.js5
-rw-r--r--app/server/index.js5
3 files changed, 20 insertions, 0 deletions
diff --git a/app/client/socket.js b/app/client/socket.js
index b845152..ecbd6c3 100644
--- a/app/client/socket.js
+++ b/app/client/socket.js
@@ -63,6 +63,16 @@ socket.on('frame', (data) => {
img.src = url
})
+socket.on('status', (data) => {
+ console.log('got status', data.key, data.value)
+ switch (data.key) {
+ case 'processing':
+ break
+ default:
+ break
+ }
+})
+
setInterval(() => {
store.dispatch({
type: 'SET_FPS',
diff --git a/app/relay/index.js b/app/relay/index.js
index b38f0c8..00f3dfa 100644
--- a/app/relay/index.js
+++ b/app/relay/index.js
@@ -60,6 +60,11 @@ let relay = new zerorpc.Server({
reply()
// console.log('got frame, ' + frame.length + ' bytes')
remote.emit('frame', { fn: fn, meta: meta, frame: frame })
+ },
+
+ send_status: function(key, value, reply) {
+ reply()
+ remote.emit('status', { key: key, value: value })
}
})
relay.on('error', function(error) {
diff --git a/app/server/index.js b/app/server/index.js
index b095bcd..2adfbdc 100644
--- a/app/server/index.js
+++ b/app/server/index.js
@@ -37,6 +37,11 @@ function bind_relay(socket) {
client.emit('res', data)
})
+ socket.on('status', data => {
+ console.log('Received status', data.key)
+ client.emit('status', data)
+ })
+
socket.on('frame', (data) => {
client.volatile.emit('frame', data)
})