Merge remote-tracking branch 'refs/remotes/origin/main'

client.py

@@ -16,13 +16,18 @@ def make_payload(name, msg):
     return json.dumps(payload).encode("utf-8")
 
 def read_msg(s):
+    global run
     while run:
         ready_to_read, _, _ = select.select([s], [], [], 1.0)
         if ready_to_read:
             data = s.recv(1024)
+            if data:
                 msg = json.loads(data.decode("utf-8"))
                 print(f"{msg["name"]} {datetime.datetime.fromtimestamp(float(msg["time"])).strftime("%d-%m-%Y %H:%M")}")
                 print(msg["msg"])
+            else:
+                print("Server disconnected")
+                run = False
             # print(f"Received {data!r}")
 
 def event_handel(name, s):
@@ -32,15 +37,14 @@ def event_handel(name, s):
         if msg in ["", " "]:
             run = False
             print("Closing socket and exit")
-
-        else:
+        elif run:
             payload = make_payload(name, msg)
             s.sendall(payload)
 
 if __name__ == "__main__":
     try:
-        Host = input("Enter ip: (default 127.0.0.1) ")
-        if Host == "":
+        HOST = input("Enter ip: (default 127.0.0.1) ")
+        if HOST == "":
             HOST = "127.0.0.1"
         PORT_str = input("Enter port: (default 65432) ")
         if PORT_str == "":