From 118bb7aa727bd2f1aed26a0af14a30cd77d738aa Mon Sep 17 00:00:00 2001
From: damp11113 <damp51252@gmail.com>
Date: Mon, 29 Jan 2024 18:42:33 +0700
Subject: [PATCH] update

---
 Client/client.py                       |  56 ++++++++++++++++++++++++-
 Server/__pycache__/RDS.cpython-310.pyc | Bin 2415 -> 2415 bytes
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/Client/client.py b/Client/client.py
index d43c7e1..942fb62 100644
--- a/Client/client.py
+++ b/Client/client.py
@@ -242,6 +242,23 @@ class App:
                     if len(data) == 0:
                         dpg.configure_item("serverstatus", default_value='lost connected', color=(255, 0, 0))
                         socket.close()
+                        if self.cprotocol == "TCP":
+                            socket.close()
+                        elif self.cprotocol == "ZeroMQ":
+                            try:
+                                message = socket.recv(zmq.NOBLOCK)
+                                if message is None:
+                                    break  # No more messages
+                                # Process the received message if needed
+                                print(f"Received message: {message.decode()}")
+                            except zmq.error.ZMQError as e:
+                                if e.errno == zmq.EAGAIN:
+                                    break  # No more messages
+                                else:
+                                    raise
+                            socket.close()
+                        else:
+                            socket.close()
                         self.disconnectserver()
                         break
 
@@ -306,6 +323,9 @@ class App:
                     if not self.firstrun:
                         data = datadecoded["channel"][self.readchannel]["Content"]
 
+                        if len(data) == 0:
+                            dpg.configure_item("serverstatus", default_value=f'connected but no audio', color=(255, 0, 0))
+
                         if self.ccisdecryptpassword and self.ccisencrypt:
                             try:
                                 # decrypt data
@@ -358,7 +378,24 @@ class App:
                     bytesconunt_frame += 1
                 else:
                     streamoutput.close()
-                    socket.close()
+                    if self.cprotocol == "TCP":
+                        socket.close()
+                    elif self.cprotocol == "ZeroMQ":
+                        try:
+                            message = socket.recv(zmq.NOBLOCK)
+                            if message is None:
+                                break  # No more messages
+                            # Process the received message if needed
+                            print(f"Received message: {message.decode()}")
+                        except zmq.error.ZMQError as e:
+                            if e.errno == zmq.EAGAIN:
+                                break  # No more messages
+                            else:
+                                raise
+                        socket.close()
+                    else:
+                        socket.close()
+                    self.disconnectserver()
                     break
             except Exception as e:
                 if str(e) == "An error occurred while decoding an Opus-encoded packet: corrupted stream":
@@ -370,6 +407,23 @@ class App:
                     except:
                         pass
                     socket.close()
+                    if self.cprotocol == "TCP":
+                        socket.close()
+                    elif self.cprotocol == "ZeroMQ":
+                        try:
+                            message = socket.recv(zmq.NOBLOCK)
+                            if message is None:
+                                break  # No more messages
+                            # Process the received message if needed
+                            print(f"Received message: {message.decode()}")
+                        except zmq.error.ZMQError as e:
+                            if e.errno == zmq.EAGAIN:
+                                break  # No more messages
+                            else:
+                                raise
+                        socket.close()
+                    else:
+                        socket.close()
                     self.disconnectserver()
                     raise
                     break
diff --git a/Server/__pycache__/RDS.cpython-310.pyc b/Server/__pycache__/RDS.cpython-310.pyc
index c204398ce46c206cb0d02e49e0557b8194455122..5b6fdb3ad7b545544e46cd0bad46bf63704d0ca4 100644
GIT binary patch
delta 155
zcmaDa^j?TNpO=@50SMZAw{PTL$HI7P^DY({Mn>()57=ZUe_<_SRGFO3CM~HBRC0^0
zv?Mt%zx)<UkV~*pkp@txNOSUhHU~xnpz01rrOBD>5!@h^2sw$#PuO+%je%mCj72OU
ginmB(vOI^rC|I37NU=7EFaQz8K+_~9S95#;0N`~dcmMzZ

delta 155
zcmaDa^j?TNpO=@50SFXgr*7n4$HEx3c^8WeBcs;j2W+yFzp$1uDo@U4la^EiD!Ij0
zT9TZXUw(@v$R*gQNF69tq%nCun**ahP<02R;^a*B2yT!{gq+0WC+s@>MnEx5#v&FF
g#apC4S)M~*6s%4Uq*x0?=z|C&plK45t2w>^05c{fE&u=k