first work on the websocket connection
This commit is contained in:
23
owrx/config.py
Normal file
23
owrx/config.py
Normal file
@ -0,0 +1,23 @@
|
||||
class Property(object):
|
||||
def __init__(self, value = None):
|
||||
self.value = value
|
||||
def getValue(self):
|
||||
return self.value
|
||||
def setValue(self, value):
|
||||
self.value = value
|
||||
|
||||
class PropertyManager(object):
|
||||
sharedInstance = None
|
||||
@staticmethod
|
||||
def getSharedInstance():
|
||||
if PropertyManager.sharedInstance is None:
|
||||
PropertyManager.sharedInstance = PropertyManager()
|
||||
return PropertyManager.sharedInstance
|
||||
|
||||
def __init__(self):
|
||||
self.properties = {}
|
||||
|
||||
def getProperty(self, name):
|
||||
if not name in self.properties:
|
||||
self.properties[name] = Property()
|
||||
return self.properties[name]
|
@ -1,4 +1,6 @@
|
||||
import mimetypes
|
||||
from owrx.websocket import WebSocketConnection
|
||||
from owrx.config import PropertyManager
|
||||
|
||||
class Controller(object):
|
||||
def __init__(self, handler, matches):
|
||||
@ -12,16 +14,6 @@ class Controller(object):
|
||||
if (type(content) == str):
|
||||
content = content.encode()
|
||||
self.handler.wfile.write(content)
|
||||
def serve_file(self, file):
|
||||
try:
|
||||
f = open('htdocs/' + file, 'rb')
|
||||
data = f.read()
|
||||
f.close()
|
||||
|
||||
(content_type, encoding) = mimetypes.MimeTypes().guess_type(file)
|
||||
self.send_response(data, content_type = content_type)
|
||||
except FileNotFoundError:
|
||||
self.send_response("file not found", code = 404)
|
||||
def render_template(self, template, **variables):
|
||||
f = open('htdocs/' + template)
|
||||
data = f.read()
|
||||
@ -38,6 +30,33 @@ class IndexController(Controller):
|
||||
self.render_template("index.wrx")
|
||||
|
||||
class AssetsController(Controller):
|
||||
def serve_file(self, file):
|
||||
try:
|
||||
f = open('htdocs/' + file, 'rb')
|
||||
data = f.read()
|
||||
f.close()
|
||||
|
||||
(content_type, encoding) = mimetypes.MimeTypes().guess_type(file)
|
||||
self.send_response(data, content_type = content_type)
|
||||
except FileNotFoundError:
|
||||
self.send_response("file not found", code = 404)
|
||||
def handle_request(self):
|
||||
filename = self.matches.group(1)
|
||||
self.serve_file(filename)
|
||||
self.serve_file(filename)
|
||||
|
||||
|
||||
class WebSocketController(Controller):
|
||||
def handle_request(self):
|
||||
conn = WebSocketConnection(self.handler)
|
||||
conn.send("CLIENT DE SERVER openwebrx.py")
|
||||
|
||||
config = {}
|
||||
pm = PropertyManager.getSharedInstance()
|
||||
|
||||
for key in ["waterfall_colors", "waterfall_min_level", "waterfall_max_level", "waterfall_auto_level_margin",
|
||||
"shown_center_freq", "samp_rate", "fft_size", "fft_fps", "audio_compression", "fft_compression",
|
||||
"max_clients"]:
|
||||
|
||||
config[key] = pm.getProperty(key).getValue()
|
||||
|
||||
conn.send({"type":"config","value":config})
|
||||
|
@ -1,4 +1,4 @@
|
||||
from owrx.controllers import StatusController, IndexController, AssetsController
|
||||
from owrx.controllers import StatusController, IndexController, AssetsController, WebSocketController
|
||||
from http.server import BaseHTTPRequestHandler
|
||||
import re
|
||||
|
||||
@ -13,7 +13,8 @@ class Router(object):
|
||||
mappings = [
|
||||
{"route": "/", "controller": IndexController},
|
||||
{"route": "/status", "controller": StatusController},
|
||||
{"regex": "/static/(.+)", "controller": AssetsController}
|
||||
{"regex": "/static/(.+)", "controller": AssetsController},
|
||||
{"route": "/ws/", "controller": WebSocketController}
|
||||
]
|
||||
def find_controller(self, path):
|
||||
for m in Router.mappings:
|
||||
|
47
owrx/websocket.py
Normal file
47
owrx/websocket.py
Normal file
@ -0,0 +1,47 @@
|
||||
import base64
|
||||
import hashlib
|
||||
import json
|
||||
|
||||
class WebSocketConnection(object):
|
||||
def __init__(self, handler):
|
||||
self.handler = handler
|
||||
my_headers = self.handler.headers.items()
|
||||
my_header_keys = list(map(lambda x:x[0],my_headers))
|
||||
h_key_exists = lambda x:my_header_keys.count(x)
|
||||
h_value = lambda x:my_headers[my_header_keys.index(x)][1]
|
||||
if (not h_key_exists("Upgrade")) or not (h_value("Upgrade")=="websocket") or (not h_key_exists("Sec-WebSocket-Key")):
|
||||
raise WebSocketException
|
||||
ws_key = h_value("Sec-WebSocket-Key")
|
||||
shakey = hashlib.sha1()
|
||||
shakey.update("{ws_key}258EAFA5-E914-47DA-95CA-C5AB0DC85B11".format(ws_key = ws_key).encode())
|
||||
ws_key_toreturn = base64.b64encode(shakey.digest())
|
||||
self.handler.wfile.write("HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: {0}\r\nCQ-CQ-de: HA5KFU\r\n\r\n".format(ws_key_toreturn.decode()).encode())
|
||||
|
||||
def get_header(self, size, opcode):
|
||||
ws_first_byte = 0b10000000 | (opcode & 0x0F)
|
||||
if(size>125):
|
||||
return bytes([ws_first_byte, 126, (size>>8) & 0xff, size & 0xff])
|
||||
else:
|
||||
# 256 bytes binary message in a single unmasked frame
|
||||
return bytes([ws_first_byte, size])
|
||||
|
||||
def send(self, data):
|
||||
# convenience
|
||||
if (type(data) == dict):
|
||||
data = json.dumps(data)
|
||||
|
||||
# string-type messages are sent as text frames
|
||||
if (type(data) == str):
|
||||
header = self.get_header(len(data), 1)
|
||||
self.handler.wfile.write(header)
|
||||
self.handler.wfile.write(data.encode('utf-8'))
|
||||
self.handler.wfile.flush()
|
||||
# anything else as binary
|
||||
else:
|
||||
header = self.get_header(len(data), 2)
|
||||
self.handler.wfile.write(header)
|
||||
self.handler.wfile.write(data.encode())
|
||||
self.handler.wfile.flush()
|
||||
|
||||
class WebSocketException(Exception):
|
||||
pass
|
Reference in New Issue
Block a user