diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/relay/index.js | 17 | ||||
| -rw-r--r-- | app/server/index.js | 15 |
2 files changed, 5 insertions, 27 deletions
diff --git a/app/relay/index.js b/app/relay/index.js index eaec38b..a5a01b9 100644 --- a/app/relay/index.js +++ b/app/relay/index.js @@ -1,7 +1,6 @@ require('dotenv').config() const io = require('socket.io-client') -const ss = require('socket.io-stream') const zerorpc = require('zerorpc') const Readable = require('stream').Readable; @@ -51,20 +50,8 @@ let relay = new zerorpc.Server({ send_frame: function (fn, frame, reply) { reply() - console.log('got frame, ' + frame.length + ' bytes') - remote.emit('frame', fn, frame) - // var stream = ss.createStream() - // stream.on('data', () => { console.log('stream data...') }) - // // console.log(stream) - - // var rs = new Readable() - // rs.on('data', (d) => { console.log('rs data...', d.length) }) - // rs._read = function noop() {} - // rs.pipe(stream) - // rs.push(frame) - // rs.push(null) - // ss(remote).on('frame', () => console.log('frame??')) - // ss(remote).emit('frame', stream, {name: fn}, function(){ console.log('where am i') }) + // console.log('got frame, ' + frame.length + ' bytes') + remote.emit('frame', { fn: fn, frame: frame }) } }) relay.on("error", function(error) { diff --git a/app/server/index.js b/app/server/index.js index 0478b81..429cbb1 100644 --- a/app/server/index.js +++ b/app/server/index.js @@ -34,21 +34,12 @@ client.on('connect', socket => { relay.on('connect', socket => { console.log('Relay connected') socket.on('res', data => { - console.log('received response', data.cmd) + console.log('Received response', data.cmd) client.emit('res', data) }) - socket.on('frame', (fn, data) => { - console.log('relay frame', fn, data.length) - client.emit('frame', fn, data) - }) - - ss(relay).on('frame', (stream, data) => { - console.log('received frame', data) - Object.values(client.connected).map(socket => { - console.log('emitting to socket') - ss(socket).emit('frame', stream, data) - }) + socket.on('frame', (data) => { + client.emit('frame', data) }) socket.on('disconnect', () => { |
