joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improved api

Browse Source
This commit is contained in:
Jakob Ketterl 2019-09-22 13:16:24 +02:00
parent 52afe3fb02
commit cfb4208db2
2 changed files with 36 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
owrx/connection.py
View File

@ -23,15 +23,14 @@ class Client(object):
while run: while run:
try: try:
data = self.multiprocessingPipe.get() data = self.multiprocessingPipe.get()
self.protected_send(data) self.send(data)
except (EOFError, OSError): except (EOFError, OSError):
run = False run = False
self.passThruThread = threading.Thread(target=mp_passthru) threading.Thread(target=mp_passthru).start()
self.passThruThread.start()
def protected_send(self, data): def send(self, data):
self.conn.protected_send(data) self.conn.send(data)
def close(self): def close(self):
self.conn.close() self.conn.close()
@ -173,13 +172,13 @@ class OpenWebRxReceiverClient(Client):
self.dsp.setProperty(key, value) self.dsp.setProperty(key, value)
def write_spectrum_data(self, data): def write_spectrum_data(self, data):
self.protected_send(bytes([0x01]) + data) self.send(bytes([0x01]) + data)
def write_dsp_data(self, data): def write_dsp_data(self, data):
self.protected_send(bytes([0x02]) + data) self.send(bytes([0x02]) + data)
def write_s_meter_level(self, level): def write_s_meter_level(self, level):
self.protected_send({"type": "smeter", "value": level}) self.send({"type": "smeter", "value": level})
def write_cpu_usage(self, usage): def write_cpu_usage(self, usage):
self.mp_send({"type": "cpuusage", "value": usage}) self.mp_send({"type": "cpuusage", "value": usage})
@ -188,37 +187,37 @@ class OpenWebRxReceiverClient(Client):
self.mp_send({"type": "clients", "value": clients}) self.mp_send({"type": "clients", "value": clients})
def write_secondary_fft(self, data): def write_secondary_fft(self, data):
self.protected_send(bytes([0x03]) + data) self.send(bytes([0x03]) + data)
def write_secondary_demod(self, data): def write_secondary_demod(self, data):
self.protected_send(bytes([0x04]) + data) self.send(bytes([0x04]) + data)
def write_secondary_dsp_config(self, cfg): def write_secondary_dsp_config(self, cfg):
self.protected_send({"type": "secondary_config", "value": cfg}) self.send({"type": "secondary_config", "value": cfg})
def write_config(self, cfg): def write_config(self, cfg):
self.protected_send({"type": "config", "value": cfg}) self.send({"type": "config", "value": cfg})
def write_receiver_details(self, details): def write_receiver_details(self, details):
self.protected_send({"type": "receiver_details", "value": details}) self.send({"type": "receiver_details", "value": details})
def write_profiles(self, profiles): def write_profiles(self, profiles):
self.protected_send({"type": "profiles", "value": profiles}) self.send({"type": "profiles", "value": profiles})
def write_features(self, features): def write_features(self, features):
self.protected_send({"type": "features", "value": features}) self.send({"type": "features", "value": features})
def write_metadata(self, metadata): def write_metadata(self, metadata):
self.protected_send({"type": "metadata", "value": metadata}) self.send({"type": "metadata", "value": metadata})
def write_wsjt_message(self, message): def write_wsjt_message(self, message):
self.protected_send({"type": "wsjt_message", "value": message}) self.send({"type": "wsjt_message", "value": message})
def write_dial_frequendies(self, frequencies): def write_dial_frequendies(self, frequencies):
self.protected_send({"type": "dial_frequencies", "value": frequencies}) self.send({"type": "dial_frequencies", "value": frequencies})
def write_aprs_data(self, data): def write_aprs_data(self, data):
self.protected_send({"type": "aprs_data", "value": data}) self.send({"type": "aprs_data", "value": data})
class MapConnection(Client): class MapConnection(Client):
@ -235,7 +234,7 @@ class MapConnection(Client):
super().close() super().close()
def write_config(self, cfg): def write_config(self, cfg):
self.protected_send({"type": "config", "value": cfg}) self.send({"type": "config", "value": cfg})
def write_update(self, update): def write_update(self, update):
self.mp_send({"type": "update", "value": update}) self.mp_send({"type": "update", "value": update})

37
owrx/websocket.py
View File

@ -98,27 +98,18 @@ class WebSocketConnection(object):
for i in range(0, len(l), n): for i in range(0, len(l), n):
yield l[i : i + n] yield l[i : i + n]
with self.sendLock:
for chunk in chunks(data_to_send, 1024):
(_, write, _) = select.select([], [self.handler.wfile], [], 10)
if self.handler.wfile in write:
written = self.handler.wfile.write(chunk)
if written != len(chunk):
logger.error("incomplete write! closing socket!")
self.close()
else:
logger.debug("socket not returned from select; closing")
self.close()
def protected_read(self, num):
data = self.handler.rfile.read(num)
if data is None or len(data) != num:
raise IncompleteRead()
return data
def protected_send(self, data):
try: try:
self.send(data) with self.sendLock:
for chunk in chunks(data_to_send, 1024):
(_, write, _) = select.select([], [self.handler.wfile], [], 10)
if self.handler.wfile in write:
written = self.handler.wfile.write(chunk)
if written != len(chunk):
logger.error("incomplete write! closing socket!")
self.close()
else:
logger.debug("socket not returned from select; closing")
self.close()
# these exception happen when the socket is closed # these exception happen when the socket is closed
except OSError: except OSError:
logger.exception("OSError while writing data") logger.exception("OSError while writing data")
@ -127,6 +118,12 @@ class WebSocketConnection(object):
logger.exception("ValueError while writing data") logger.exception("ValueError while writing data")
self.close() self.close()
def protected_read(self, num):
data = self.handler.rfile.read(num)
if data is None or len(data) != num:
raise IncompleteRead()
return data
def interrupt(self): def interrupt(self):
self.interruptPipeSend.send(bytes(0x00)) self.interruptPipeSend.send(bytes(0x00))