v0.4.8 update :

 - Open release download page if client is outdated
 - Server checks client verson
 - Great stability improvment

Author: LiteApplication

lelonmo/main_online.py

@@ -2,8 +2,9 @@
 
 from lelonmo import persist_data, socket_client
 
-
+server_ip = str()
 def main_online(host=''):
+    global server_ip
     try:
         if not host:
             if bool(persist_data.DATA["debug"]["RANDOMIZE_UUID"]):
@@ -13,14 +14,17 @@ def main_online(host=''):
             if not host:
                 host = persist_data.DATA['online']['last_ip']
             persist_data.update_key("last_ip", host, "online")
+        socket_client.atexit.register(socket_client.exit_server)
         socket_client.main(host)
         while socket_client.human_to_bool("Do you want to play again ?\n"):
             socket_client.main(host)
         exit()
     except KeyboardInterrupt:
+        socket_client.exit_server()
         print("Exiting ...")
         exit(0)
     except Exception as e:
+        socket_client.exit_server()
         print("Something went wrong :", e)
         exit(-1)
 

lelonmo/persist_data.py

@@ -7,7 +7,8 @@
 save_file = home + ".lelonmo_save.json"
 
 default_data = dict(
-    version="0.4.7",
+    version="00.4.8",
+    update_url='https://github.com/claj-ndc/LeLonMo/releases/latest',
     online=dict(
         uuid=str(uuid.uuid4()),
         name="",
@@ -68,6 +69,8 @@ def _repair_data():
             if DATA[key1] != default_data[key1]:
                 print("Version changed")
                 DATA[key1] = default_data[key1]
+        elif key1 == "update_url":
+            DATA[key1] = default_data[key1]
         else:
             for key2 in default_data[key1].keys():
                 if not key2 in DATA[key1]:

lelonmo/socket_client.py

@@ -1,4 +1,3 @@
-
 import json
 import sys
 import socket
@@ -23,21 +22,26 @@ def _send_data(data: str, host: str):
 
         # Allow identifying users at anytime
         s.send(
-            bytearray(f"{persist_data.DATA['online']['uuid']}%{data}", "utf-8"))
+            bytearray(
+                "%llm_client%" \
+                f"{persist_data.DATA['version'].replace('.', str())}%" \
+                f"{persist_data.DATA['online']['uuid']}%" \
+                f"{data}",
+                "utf-8"
+            )
+        )
         # UUID is never shared with other players
         v = s.recv(1024)
         s.close()
         return v
     except ConnectionRefusedError:
         print("Server error : Connexion refused")
-        exit_server()
         s.close()
-        sys.exit()
+        exit()
     except Exception as e:
-        exit_server()
         s.close()
         print("Server error :", e)
-        sys.exit(0)
+        exit(0)
 
 
 def _status(host):  # Small function to get server status
@@ -53,8 +57,12 @@ def _wait_for_status(key, host):  # Wait for a specific status in order to conti
 def _join_game(wb, ip="localhost"):  # Initiate the connexion between client and server
     player_id = _send_data("join%" + persist_data.DATA["online"]["name"], ip)
     if player_id == b"started":
+        wb.clear()
         wb.add("The game you tried to join already started")
-        exit()
+        wb.add("Press [ENTER] to try again")
+        wait(1) # Avoid spam
+        input() 
+        return _join_game(wb, ip)
     elif player_id == b"wait%":
         wb.add("Waiting for admin to restart the game ...")
         while player_id == b"wait%":
@@ -64,6 +72,16 @@ def _join_game(wb, ip="localhost"):  # Initiate the connexion between client and
         return int(player_id)
     elif player_id == b"":
         wb.add("Error while joining, try again later")
+    elif player_id == b"outdated%":
+        wb.add("Your client is outdated, please download the latest version")
+        import webbrowser
+        webbrowser.open(persist_data.DATA["update_url"])
+        exit_server()
+    elif player_id == b"outdated%update":
+        wb.add("Your client is outdated and automatic update install is not available")
+        import webbrowser
+        webbrowser.open(persist_data.DATA["update_url"])
+        exit_server()
     else:
         try:
             int(player_id)
@@ -229,6 +247,7 @@ def main(host="localhost"):
     playerboard = PlayerUpdate(wb, host)
     playerboard.start()
     _wait_for_status("results", host)
+    wait(0.25) # Avoid replay spam for the last player if it has low ping
     playerboard.enable = False
     wb.updatable = ""
 
@@ -249,13 +268,12 @@ def exit_server():
     try:
         s.connect((server_ip, PORT))
         s.send(
-            bytearray(f"{persist_data.DATA['online']['uuid']}%{'leave%'}", "utf-8"))
+            bytearray(f"%llm_client%{persist_data.DATA['version'].replace('.', str())}%{persist_data.DATA['online']['uuid']}%leave%", "utf-8"))
         s.close()
     except:
         pass
-
-
-atexit.register(exit_server)
+    finally:
+        s.close()
 
 
 if __name__ == "__main__":

main.py

@@ -58,7 +58,7 @@
             import Quartz
             import objc
         except:
-            print("Quartz and objc is not installed, trying to install it automatically ...")
+            print("Quartz and objc are not installed, trying to install it automatically ...")
             import subprocess
             import sys
             command = [sys.executable, "-m", "pip", "install",

server/persist_data.py

@@ -7,7 +7,8 @@
 save_file = home + ".lelonmo_server_save.json"
 
 default_data = dict(
-    version="0.4.7",
+    version="0.4.8",
+    client_version="0048",
     online=dict(
         uuid=str(uuid.uuid4()),
         name="",
@@ -59,6 +60,8 @@ def _repair_data():
             if DATA[key1] != default_data[key1]:
                 print("Version changed")
                 DATA[key1] = default_data[key1]
+        elif key1 in ["client_version", "update_url"]:
+            DATA[key1] = default_data[key1]
         else:
             for key2 in default_data[key1].keys():
                 if not key2 in DATA[key1]:

server/socket_server.py

@@ -4,16 +4,17 @@
 import threading
 import socket
 
-from server import letter_generator
+from server import letter_generator, persist_data
 from server import word_check
 
 
 class Game():
-    def __init__(self, LANGUAGE):
+    def __init__(self, LANGUAGE, MAX_PLAYERS = 10):
         self.state = 0
         print("[I] Waiting for admin ...")
         self.game_data = dict(players=list())
         self.LANGUAGE = LANGUAGE
+        self.MAX_PLAYERS = MAX_PLAYERS
 
     def _new_player(self, uuid, name, ip, status="Connected"):
         if name in [i['name'] for i in self.game_data["players"]]:
@@ -28,9 +29,11 @@ def _new_player(self, uuid, name, ip, status="Connected"):
         elif name == "":
             print("[V] Refused", uuid, ": Empty name")
             return -1
+        elif len(self.game_data["players"]) > self.MAX_PLAYERS:
+            print("Refused", uuid, ": Too many people")
         else: 
             self.game_data["players"].append(
-                dict(uuid=uuid, name=name, ip=ip, word="", status=status, computer_afk="false"))
+                dict(uuid=uuid, name=name, ip=ip, word="", status=status, computer_afk=False))
             print("[I] Added player", name, "with uuid", uuid)
             return len(self.game_data["players"])-1
 
@@ -85,9 +88,21 @@ def _reset(self):
         self.game_data = dict(players=list())
 
     def handle_data(self, data: str, client_socket, client_thread):
-        r = re.search("(.{36})%(.*)", data)
-        uuid = r.group(1)
-        msg = r.group(2)
+        try:
+            r = re.search("%llm_client%(.{4})%(.{36})%(.*)", data)
+            version = r.group(1)
+            uuid = r.group(2)
+            msg = r.group(3)
+        except:
+            print("[W] Invalid request :", data)
+            return data, client_socket, client_socket
+        try:
+            if int(version) < int(persist_data.DATA["client_version"]):
+                self._answer("outdated%", client_socket)
+                return
+        except:
+            self._answer("outdated%", client_socket)
+            return
         try:
             admin = uuid == self.game_data["admin"]["uuid"]
         except KeyError:
@@ -145,7 +160,7 @@ def handle_data(self, data: str, client_socket, client_thread):
                             f'[I] {self.game_data["players"][self._get_player_id(uuid)]["name"]} finished')
                         all_finished = True
                         for i in self.game_data["players"]:
-                            if i["status"] != "Finished":
+                            if i["status"] != "Finished" and not i["computer_afk"]:
                                 all_finished = False
                                 break
                         if all_finished:
@@ -166,6 +181,7 @@ def handle_data(self, data: str, client_socket, client_thread):
                 self.handle_data(data, client_socket, client_thread)
             elif msg.startswith("join%"):
                 self._answer("wait%", client_socket)
+        return
 
 
 class ClientThread(threading.Thread):
@@ -177,8 +193,11 @@ def __init__(self, ip, port, clientsocket, game):
         self.clientsocket = clientsocket
 
     def run(self):
-        data = self.clientsocket.recv(1024)
-        self.game.handle_data(data.decode("utf-8"), self.clientsocket, self)
+        data = self.clientsocket.recv(1024).decode("utf-8")
+        if data.startswith("%llm_client%"):
+            self.game.handle_data(data, self.clientsocket, self)
+        else:
+            self.game._answer("outdated%", self.clientsocket)
 
 
 class MainThread(threading.Thread):