diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2018-05-20 15:05:54 +0200 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2018-05-20 15:05:54 +0200 |
| commit | 20ac24f66da37cc011e2459c5a347a7083c3272c (patch) | |
| tree | 4a4c4de7b144dbac0f4f59d238697f6ee2d1f3f2 | |
| parent | 83e20713c1c3b55532f6f022eaaf290471d3b5c5 (diff) | |
move rpc around.. serve html
| -rw-r--r-- | app/server/index.js | 39 | ||||
| -rw-r--r-- | public/assets/css/css.css | 2 | ||||
| -rw-r--r-- | public/index.html | 21 | ||||
| -rw-r--r-- | rpc/__init__.py | 1 | ||||
| -rw-r--r-- | rpc/__main__.py | 8 | ||||
| -rw-r--r-- | rpc/rpc.py | 12 |
6 files changed, 52 insertions, 31 deletions
diff --git a/app/server/index.js b/app/server/index.js index f80541c..55daba4 100644 --- a/app/server/index.js +++ b/app/server/index.js @@ -1,9 +1,22 @@ require('dotenv').config() const express = require('express') const app = express() -const io = require('socket.io')(server) +const http = require('http') +const socket_io = require('socket.io') const ss = require('socket.io-stream') +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 = http.createServer(app) +server.listen(process.env.EXPRESS_PORT, () => { + console.log("Cortex remote listening on http://localhost:" + process.env.EXPRESS_PORT) +}) + +const io = socket_io(server) const client = io.of('/client') const relay = io.of('/relay') @@ -35,27 +48,3 @@ relay.on('connect', socket => { }) }) -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/public/assets/css/css.css b/public/assets/css/css.css new file mode 100644 index 0000000..38d2045 --- /dev/null +++ b/public/assets/css/css.css @@ -0,0 +1,2 @@ +* { box-sizing: border-box } +html,body { margin: 0; padding: 0; width: 100%; height: 100%; font-family: 'Helvetica', sans-serif; font-weight: 300; } diff --git a/public/index.html b/public/index.html new file mode 100644 index 0000000..bea6e33 --- /dev/null +++ b/public/index.html @@ -0,0 +1,21 @@ +<!doctype html> +<html lang="en" class="loading"> +<head> + <title> + live.cortex + </title> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <link rel="stylesheet" href="/assets/css/css.css"> +</head> +<body> + <div id="container"></div> +</body> +<script src="/socket.io/socket.io.js"></script> +<script> + var s = document.createElement('script'); + s.setAttribute('src','bundle.js?' + Date.now()); + document.body.appendChild(s) +</script> +</html>
\ No newline at end of file diff --git a/rpc/__init__.py b/rpc/__init__.py new file mode 100644 index 0000000..93f5256 --- /dev/null +++ b/rpc/__init__.py @@ -0,0 +1 @@ +__init__.py
\ No newline at end of file diff --git a/rpc/__main__.py b/rpc/__main__.py new file mode 100644 index 0000000..894f748 --- /dev/null +++ b/rpc/__main__.py @@ -0,0 +1,8 @@ +from rpc import CortexRPC + +if __name__ == '__main__': + def log_param(key, value): + print("log param. {}: {}".format(key, value)) + + # this will block + rpc = CortexRPC(log_param) @@ -27,9 +27,9 @@ class CortexRPC(object): val = None try: val = self.relay.connected("rpc") - print("rpc connected...".format(val)) + print("RPC connected...".format(val)) except zerorpc.TimeoutExpired: - print("rpc timeout :(") + print("RPC timeout :(") # print("defer sending a file...") # gevent.sleep(2) # self.send_file("test.png") @@ -44,20 +44,20 @@ class CortexRPC(object): return "ok" def get_params(self): - print("get params call received") + print("Get params call received!") return "lmao ok" def send_frame(self, frame): if self.relay is not None: - print("sending a frame...") + print("Sending a frame...") frame = '01234567' * 8 * 8 * 8 * 8 * 2 self.relay.send_frame('frame_00000.png', frame) else: - print("Relay not ready...") + print("Can't send frame, relay not ready...") if __name__ == '__main__': def log_param(key, value): - print("log param. {}: {}".format(key, value)) + print("Log param. {}: {}".format(key, value)) # this will block rpc = CortexRPC(log_param) |