From c9fdaf31a1f06862946bd7c13155c71015d5332c Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 21 May 2018 19:55:16 +0200 Subject: statuses --- app/client/socket.js | 10 ++++++++++ app/relay/index.js | 5 +++++ app/server/index.js | 5 +++++ 3 files changed, 20 insertions(+) (limited to 'app') 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) }) -- cgit v1.2.3-70-g09d2