From 83e20713c1c3b55532f6f022eaaf290471d3b5c5 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sun, 20 May 2018 14:45:16 +0200 Subject: rename rpc --- app/server/index.js | 37 +++++++++++++++++++++++++------ python/relay.py | 25 --------------------- python/rpc.py | 63 ----------------------------------------------------- rpc/relay.py | 25 +++++++++++++++++++++ rpc/rpc.py | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 118 insertions(+), 95 deletions(-) delete mode 100644 python/relay.py delete mode 100644 python/rpc.py create mode 100644 rpc/relay.py create mode 100644 rpc/rpc.py diff --git a/app/server/index.js b/app/server/index.js index 3fcb8ee..f80541c 100644 --- a/app/server/index.js +++ b/app/server/index.js @@ -1,6 +1,6 @@ require('dotenv').config() -const app = require('express')() -const server = require('http').createServer(app) +const express = require('express') +const app = express() const io = require('socket.io')(server) const ss = require('socket.io-stream') @@ -8,17 +8,17 @@ const client = io.of('/client') const relay = io.of('/relay') client.on('connect', socket => { - console.log('client connected') + console.log('Client connected') socket.on('cmd', data => { relay.emit('cmd', data) }) socket.on('disconnect', () => { - console.log("client disconnected") + console.log("Client disconnected") }) }) relay.on('connect', socket => { - console.log('relay connected') + console.log('Relay connected') socket.on('params', data => { client.emit('params', data) }) @@ -31,8 +31,31 @@ relay.on('connect', socket => { }) socket.on('disconnect', () => { - console.log("relay disconnected") + console.log("Relay disconnected") }) }) -server.listen(process.env.EXPRESS_PORT) \ No newline at end of file +app.use(express.static('public', { extensions: ['html'] })) + +// app.get('/images', site.images) +// app.post('/print', bodyParser.urlencoded({ extended: false }), site.print) +// app.use("/upload", require('./upload')) + +let server; +if (process.env.USE_HTTPS === 'true') { + credentials = { + key: fs.readFileSync('ssl/key.nocrypt.pem', 'utf8'), + cert: fs.readFileSync('ssl/cert.pem', 'utf8') + } + server = https.createServer(credentials, app).listen(8443, function () { + var port = server.address().port; + console.log('Cortex remote listening at https://lvh.me:%s', port); + }); +} else { + const server = require('http').createServer(app) + server.listen(process.env.EXPRESS_PORT, () => { + console.log("Cortex remote listening on http://localhost:" + process.env.EXPRESS_PORT) + }) +} + +ws.init(server) diff --git a/python/relay.py b/python/relay.py deleted file mode 100644 index 9e56001..0000000 --- a/python/relay.py +++ /dev/null @@ -1,25 +0,0 @@ -from dotenv import load_dotenv, find_dotenv -import os -import zerorpc -import gevent - -load_dotenv(find_dotenv()) - -class RelayRPC(object): - def start(self): - print("Relay running on port {}".format(os.getenv('RELAY_PORT'))) - - def connected(self, msg): - print("got connect, trying to call back.") - print("Connecting to RPC on port {}".format(os.getenv('RPC_PORT'))) - client = zerorpc.Client() - client.connect("tcp://127.0.0.1:" + os.getenv('RPC_PORT')) - client.send_param("key", "value") - - def send_frame(self, frame): - print("got frame: {} bytes".format(len(frame))) - -rpc = RelayRPC() -server = zerorpc.Server(rpc) -server.bind("tcp://127.0.0.1:" + os.getenv('RELAY_PORT')) -server.run() diff --git a/python/rpc.py b/python/rpc.py deleted file mode 100644 index 461ba21..0000000 --- a/python/rpc.py +++ /dev/null @@ -1,63 +0,0 @@ -from dotenv import load_dotenv, find_dotenv -import os -import zerorpc -import gevent -import time - -load_dotenv(find_dotenv()) - -class CortexRPC(object): - def __init__(self, fn): - super().__init__() - self._listener = fn - self.connect() - - def connect(self): - print("Connecting to RPC on port {}".format(os.getenv('RPC_PORT'))) - self.rpc = zerorpc.Server(self) - self.rpc.bind("tcp://127.0.0.1:" + os.getenv('RPC_PORT')) - gevent.spawn(self.connected) - self.rpc.run() - - def connected(self): - print("RPC running on port {}".format(os.getenv('RPC_PORT'))) - print("Connecting to Relay on port {}".format(os.getenv('RELAY_PORT'))) - self.relay = zerorpc.Client() - self.relay.connect("tcp://127.0.0.1:" + os.getenv('RELAY_PORT')) - val = None - try: - val = self.relay.connected("rpc") - print("rpc connected...".format(val)) - except zerorpc.TimeoutExpired: - print("rpc timeout :(") - # print("defer sending a file...") - # gevent.sleep(2) - # self.send_file("test.png") - return val - - def send_param(self, key, value): - print("aloha. {}: {}".format(key, value)) - if self._listener is not None: - self._listener(key, value) - else: - print("No listener provided to CortexRPC") - return "ok" - - def get_params(self): - print("get params call received") - return "lmao ok" - - def send_frame(self, frame): - if self.relay is not None: - print("sending a frame...") - frame = '01234567' * 8 * 8 * 8 * 8 * 2 - self.relay.send_frame('frame_00000.png', frame) - else: - print("Relay not ready...") - -if __name__ == '__main__': - def log_param(key, value): - print("log param. {}: {}".format(key, value)) - - # this will block - rpc = CortexRPC(log_param) diff --git a/rpc/relay.py b/rpc/relay.py new file mode 100644 index 0000000..9e56001 --- /dev/null +++ b/rpc/relay.py @@ -0,0 +1,25 @@ +from dotenv import load_dotenv, find_dotenv +import os +import zerorpc +import gevent + +load_dotenv(find_dotenv()) + +class RelayRPC(object): + def start(self): + print("Relay running on port {}".format(os.getenv('RELAY_PORT'))) + + def connected(self, msg): + print("got connect, trying to call back.") + print("Connecting to RPC on port {}".format(os.getenv('RPC_PORT'))) + client = zerorpc.Client() + client.connect("tcp://127.0.0.1:" + os.getenv('RPC_PORT')) + client.send_param("key", "value") + + def send_frame(self, frame): + print("got frame: {} bytes".format(len(frame))) + +rpc = RelayRPC() +server = zerorpc.Server(rpc) +server.bind("tcp://127.0.0.1:" + os.getenv('RELAY_PORT')) +server.run() diff --git a/rpc/rpc.py b/rpc/rpc.py new file mode 100644 index 0000000..461ba21 --- /dev/null +++ b/rpc/rpc.py @@ -0,0 +1,63 @@ +from dotenv import load_dotenv, find_dotenv +import os +import zerorpc +import gevent +import time + +load_dotenv(find_dotenv()) + +class CortexRPC(object): + def __init__(self, fn): + super().__init__() + self._listener = fn + self.connect() + + def connect(self): + print("Connecting to RPC on port {}".format(os.getenv('RPC_PORT'))) + self.rpc = zerorpc.Server(self) + self.rpc.bind("tcp://127.0.0.1:" + os.getenv('RPC_PORT')) + gevent.spawn(self.connected) + self.rpc.run() + + def connected(self): + print("RPC running on port {}".format(os.getenv('RPC_PORT'))) + print("Connecting to Relay on port {}".format(os.getenv('RELAY_PORT'))) + self.relay = zerorpc.Client() + self.relay.connect("tcp://127.0.0.1:" + os.getenv('RELAY_PORT')) + val = None + try: + val = self.relay.connected("rpc") + print("rpc connected...".format(val)) + except zerorpc.TimeoutExpired: + print("rpc timeout :(") + # print("defer sending a file...") + # gevent.sleep(2) + # self.send_file("test.png") + return val + + def send_param(self, key, value): + print("aloha. {}: {}".format(key, value)) + if self._listener is not None: + self._listener(key, value) + else: + print("No listener provided to CortexRPC") + return "ok" + + def get_params(self): + print("get params call received") + return "lmao ok" + + def send_frame(self, frame): + if self.relay is not None: + print("sending a frame...") + frame = '01234567' * 8 * 8 * 8 * 8 * 2 + self.relay.send_frame('frame_00000.png', frame) + else: + print("Relay not ready...") + +if __name__ == '__main__': + def log_param(key, value): + print("log param. {}: {}".format(key, value)) + + # this will block + rpc = CortexRPC(log_param) -- cgit v1.2.3-70-g09d2