From 6f0b747283cb3dc4f426a22d963d356602483478 Mon Sep 17 00:00:00 2001 From: Ian Gulliver Date: Thu, 5 May 2016 00:33:30 +0000 Subject: [PATCH] Get reports through to the browser. --- server/server.py | 9 +++++++-- server/static/control.js | 9 +++++++++ server/static/root.html | 8 +++++++- 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 server/static/control.js diff --git a/server/server.py b/server/server.py index 77900c6..d0e6956 100755 --- a/server/server.py +++ b/server/server.py @@ -139,6 +139,7 @@ class HTTPRequestHandler(object): _MIME_TYPES = { '.html': 'text/html', '.iso': 'application/octet-stream', + '.js': 'application/javascript', '.json': 'application/json', } _BLOCK_SIZE = 2 ** 16 @@ -150,10 +151,14 @@ class HTTPRequestHandler(object): self._image_types = image_types slave_ws_handler = GetSlaveWSHandler(image_types, websockets) - self._slave_ws_handler = wsgiutils.WebSocketWSGIApplication(handler_cls=slave_ws_handler) + self._slave_ws_handler = wsgiutils.WebSocketWSGIApplication( + protocols=['iconograph-slave'], + handler_cls=slave_ws_handler) master_ws_handler = GetMasterWSHandler(image_types, websockets) - self._master_ws_handler = wsgiutils.WebSocketWSGIApplication(handler_cls=master_ws_handler) + self._master_ws_handler = wsgiutils.WebSocketWSGIApplication( + protocols=['iconograph-master'], + handler_cls=master_ws_handler) def __call__(self, env, start_response): path = env['PATH_INFO'] diff --git a/server/static/control.js b/server/static/control.js new file mode 100644 index 0000000..c4d8d1e --- /dev/null +++ b/server/static/control.js @@ -0,0 +1,9 @@ +"use strict"; + +document.addEventListener('DOMContentLoaded', (e) => { + let ws = new WebSocket('wss://' + location.host + '/ws/master', 'iconograph-master'); + ws.addEventListener('message', (e) => { + let parsed = JSON.parse(e.data); + console.log(parsed); + }); +}); diff --git a/server/static/root.html b/server/static/root.html index 9daeafb..6b9a602 100644 --- a/server/static/root.html +++ b/server/static/root.html @@ -1 +1,7 @@ -test + + + + + + +