aboutsummaryrefslogtreecommitdiffstats
path: root/glutte_serial_web.py
diff options
context:
space:
mode:
authorMaximilien Cuony <maximilien@theglu.org>2016-09-11 03:02:00 +0200
committerMaximilien Cuony <maximilien@theglu.org>2016-09-11 03:02:00 +0200
commit007ea5571e2dca4d2ce6db7b3e7f98b86bf929ab (patch)
tree1485b4bb170f99cf5937bac13aef98b021160810 /glutte_serial_web.py
parentd381c117e8ac5986805ede5db2beca273b967e2f (diff)
downloadglutte-serial-web-007ea5571e2dca4d2ce6db7b3e7f98b86bf929ab.tar.gz
glutte-serial-web-007ea5571e2dca4d2ce6db7b3e7f98b86bf929ab.tar.bz2
glutte-serial-web-007ea5571e2dca4d2ce6db7b3e7f98b86bf929ab.zip
Use websocket and add multiple-user at the same time
Diffstat (limited to 'glutte_serial_web.py')
-rwxr-xr-xglutte_serial_web.py58
1 files changed, 40 insertions, 18 deletions
diff --git a/glutte_serial_web.py b/glutte_serial_web.py
index bcb3261..016c8da 100755
--- a/glutte_serial_web.py
+++ b/glutte_serial_web.py
@@ -2,7 +2,7 @@
#
# The MIT License (MIT)
#
-# Copyright (c) 2016 Matthias P. Braendli
+# Copyright (c) 2016 Matthias P. Braendli, Maximilien Cuony
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -22,35 +22,57 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-from gevent.wsgi import WSGIServer
+from geventwebsocket.handler import WebSocketHandler
+from gevent import pywsgi, Timeout
from time import sleep
from flask import Flask, render_template
+from flask_sockets import Sockets
import serialrx
app = Flask(__name__)
+sockets = Sockets(app)
ser = serialrx.SerialRX()
+
@app.route('/')
def index():
return render_template('index.html')
-@app.route('/stream')
-def stream():
- def generate():
- while True:
- line = ser.get_line()
- if line is not None:
- yield line
+
+@sockets.route('/stream')
+def stream(socket):
+
+ try:
+
+ queue = ser.register_client()
+
+ while not socket.closed:
+ # Force to check if the client is still here
+ try:
+ with Timeout(0.1, False):
+ socket.receive()
+ except:
+ pass
+ try:
+ line = queue.popleft()
+ socket.send(line)
+ except IndexError:
+ pass
sleep(0.1)
+ except:
+ raise
+ finally:
+ ser.unregister_client(queue)
- return app.response_class(generate(), mimetype='text/plain')
+ser.start()
-try:
- ser.start()
- http_server = WSGIServer(('', 5000), app)
- http_server.serve_forever()
-except KeyboardInterrupt:
- print("Ctrl-C received, quitting")
-finally:
- ser.stop()
+if __name__ == "__main__":
+ print("You're running in dev mode, only one client at a time will works ! Please use gunicorn to fix this :)")
+ try:
+ http_server = pywsgi.WSGIServer(('', 5000), app, handler_class=WebSocketHandler)
+ http_server.serve_forever()
+ except KeyboardInterrupt:
+ print("Ctrl-C received, quitting")
+ finally:
+ ser.stop()