From 4e678678ae6226819731181cc8d78a266b7b65df Mon Sep 17 00:00:00 2001
From: damp11113 <damp51252@gmail.com>
Date: Sat, 20 Jan 2024 20:10:51 +0700
Subject: [PATCH] ZeroMQ (WebSocket) update

this update can use cloudflare tunnel for forward port
---
 Client/client.py | 9 +++++++--
 Server/server.py | 7 ++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Client/client.py b/Client/client.py
index 3399160..d43c7e1 100644
--- a/Client/client.py
+++ b/Client/client.py
@@ -113,7 +113,12 @@ class App:
             s = context.socket(zmq.SUB)
             s.connect(f"tcp://{ip}:{port}")
             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.device_index_output = 0
@@ -382,7 +387,7 @@ class App:
                 dpg.add_button(label="select server", tag="selectserverbutton")
                 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_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_spacer()
             dpg.add_button(label="More RDS info", callback=lambda: dpg.configure_item("RDSwindow", show=True), tag="morerdsbutton", show=False)
diff --git a/Server/server.py b/Server/server.py
index 52b1e8d..63eecc9 100644
--- a/Server/server.py
+++ b/Server/server.py
@@ -39,7 +39,7 @@ def encrypt_data(message_bytes, password):
     return encrypted_message, salt, iv
 
 
-protocol = "ZMQ"
+protocol = "ZMQ_WS"
 server_port = ('*', 6980)
 
 if protocol == "TCP":
@@ -52,6 +52,11 @@ elif protocol == "ZMQ":
     context = zmq.Context()
     s = context.socket(zmq.PUB)
     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:
     print(f"{protocol} not supported")
     exit()