ThaiSDR/IDRB
1
0
Fork 0
mirror of https://github.com/damp11113/IDRB.git synced 2025-04-27 22:48:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ZeroMQ (WebSocket) update

Browse Source 
this update can use cloudflare tunnel for forward port
This commit is contained in:
dharm pimsen 2024-01-20 20:10:51 +07:00
parent 39701b2225
commit 4e678678ae
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Client/client.py
View File

@ -113,7 +113,12 @@ class App:
s = context.socket(zmq.SUB) s = context.socket(zmq.SUB)
s.connect(f"tcp://{ip}:{port}") s.connect(f"tcp://{ip}:{port}")
s.setsockopt_string(zmq.SUBSCRIBE, "") s.setsockopt_string(zmq.SUBSCRIBE, "")
elif protocol == "ZeroMQ (WS)":
context = zmq.Context()
s = context.socket(zmq.SUB)
s.connect(f"ws://{ip}:{port}")
s.setsockopt_string(zmq.SUBSCRIBE, "")
self.cprotocol = "ZeroMQ"
self.working = True self.working = True
self.device_index_output = 0 self.device_index_output = 0
@ -382,7 +387,7 @@ class App:
dpg.add_button(label="select server", tag="selectserverbutton") dpg.add_button(label="select server", tag="selectserverbutton")
dpg.add_input_text(label="server ip", tag="serverip", default_value="localhost") dpg.add_input_text(label="server ip", tag="serverip", default_value="localhost")
dpg.add_input_int(label="port", tag="serverport", max_value=65535, default_value=6980) dpg.add_input_int(label="port", tag="serverport", max_value=65535, default_value=6980)
dpg.add_combo(["TCP", "ZeroMQ"], label="protocol", tag="serverprotocol", default_value="TCP") dpg.add_combo(["TCP", "ZeroMQ", "ZeroMQ (WS)"], label="protocol", tag="serverprotocol", default_value="TCP")
dpg.add_button(label="connect", callback=self.connecttoserver, tag="connectbutton") dpg.add_button(label="connect", callback=self.connecttoserver, tag="connectbutton")
dpg.add_spacer() dpg.add_spacer()
dpg.add_button(label="More RDS info", callback=lambda: dpg.configure_item("RDSwindow", show=True), tag="morerdsbutton", show=False) dpg.add_button(label="More RDS info", callback=lambda: dpg.configure_item("RDSwindow", show=True), tag="morerdsbutton", show=False)

7
Server/server.py
View File

@ -39,7 +39,7 @@ def encrypt_data(message_bytes, password):
return encrypted_message, salt, iv return encrypted_message, salt, iv
protocol = "ZMQ" protocol = "ZMQ_WS"
server_port = ('*', 6980) server_port = ('*', 6980)
if protocol == "TCP": if protocol == "TCP":
@ -52,6 +52,11 @@ elif protocol == "ZMQ":
context = zmq.Context() context = zmq.Context()
s = context.socket(zmq.PUB) s = context.socket(zmq.PUB)
s.bind(f"tcp://{server_port[0]}:{server_port[1]}") s.bind(f"tcp://{server_port[0]}:{server_port[1]}")
elif protocol == "ZMQ_WS":
context = zmq.Context()
s = context.socket(zmq.PUB)
s.bind(f"ws://{server_port[0]}:{server_port[1]}")
protocol = "ZMQ"
else: else:
print(f"{protocol} not supported") print(f"{protocol} not supported")
exit() exit()