WIP: whitelist, queue

src/fivemserver/queuemanager.py

@@ -1,128 +1,57 @@
+# queue_manager.py — Aucune dépendance Qt
 import requests
-from PySide6.QtCore import QThread, Signal
+import time
+from typing import Callable
 
 from config.constants import Urls, ApiEndPoints
 
-
-class JoinQueueThread(QThread):
-    result = Signal(dict)
-    error = Signal(str)
-
-    def __init__(self, user_id: str):
-        super().__init__()
+class QueueManager:
+    def __init__(self, user_id: str, on_update: Callable[[str], None]):
         self.user_id = user_id
-        self.api_url = Urls.API_URL.value
-
-    def run(self):
-        try:
-            res = requests.post(
-                f"{self.api_url}{ApiEndPoints.QUEUE_JOIN.value}",
-                headers={"Content-Type": "application/json"},
-                json={"uuid": self.user_id}
-            )
-            self.result.emit(res.json())
-        except Exception as e:
-            self.error.emit(str(e))
-
-
-class CheckStatusThread(QThread):
-    result = Signal(dict)
-    error = Signal(str)
-
-    def __init__(self, user_id: str):
-        super().__init__()
-        self.user_id = user_id
-        self.api_url = Urls.API_URL.value
-
-    def run(self):
-        try:
-            res = requests.get(f"{self.api_url}{ApiEndPoints.QUEUE_STATUS.value}{self.user_id}")
-            self.result.emit(res.json())
-        except Exception as e:
-            self.error.emit(str(e))
-
-
-class LeaveQueueThread(QThread):
-    done = Signal()
-    error = Signal(str)
-
-    def __init__(self, user_id: str):
-        super().__init__()
-        self.user_id = user_id
-        self.api_url = Urls.API_URL.value
-
-    def run(self):
-        try:
-            requests.post(
-                f"{self.api_url}{ApiEndPoints.QUEUE_LEAVE.value}",
-                headers={"Content-Type": "application/json"},
-                json={"uuid": self.user_id}
-            )
-            self.done.emit()
-        except Exception as e:
-            self.error.emit(str(e))
-
-
-class QueueManager(QThread):
-    """
-    Équivalent de startQueue() — gère tout le cycle :
-    join → poll toutes les 5s → lance FiveM quand c'est le tour
-    """
-    update_ui = Signal(str)   # → updateQueueUI()
-    launch_game = Signal()    # → launchFiveM()
-    error = Signal(str)
-
-    def __init__(self, user_id: str, parent=None):
-        super().__init__(parent)
-        self.user_id = user_id
-        self.api_url = Urls.API_URL.value
+        self.on_update = on_update  # Callback pour envoyer les mises à jour
         self._running = True
 
     def stop(self):
         self._running = False
 
-    def run(self):
-        # 1. Join queue
-        try:
-            res = requests.post(
-                f"{self.api_url}/queue/join",
-                headers={"Content-Type": "application/json"},
-                json={"uuid": self.user_id}
-            )
-            join = res.json()
-        except Exception as e:
-            self.error.emit(str(e))
-            return
+    def join_queue(self) -> dict:
+        res = requests.post(
+            f"{Urls.API_URL.value}{ApiEndPoints.QUEUE_JOIN.value}",
+            json={"uuid": self.user_id},
+            verify=False
+        )
+        return res.json()
 
-        # 2. Slot dispo directement
-        if join.get("status") == "ok":
-            self.update_ui.emit("Slot dispo, lancement du jeu...")
-            self.launch_game.emit()
-            return
+    def check_status(self) -> dict:
+        res = requests.get(f"{Urls.API_URL.value}{ApiEndPoints.QUEUE_STATUS.value}/{self.user_id}")
+        return res.json()
 
-        # 3. En file d'attente → poll toutes les 5s
-        self.update_ui.emit(
-            f"⏳ Vous êtes en file d'attente : position {join.get('position')} / {join.get('queueSize')}"
+    def leave_queue(self):
+        requests.post(
+            f"{Urls.API_URL.value}{ApiEndPoints.QUEUE_LEAVE.value}",
+            json={"uuid": self.user_id},
+            verify=False
         )
 
-        while self._running:
-            self.sleep(5)  # Équivalent setInterval 5000ms
+    def start(self):
+        join = self.join_queue()
+        # print(f"[QueueManager] join response: {join}")  # ← Debug
 
+        if join.get("position") == 0:  # Position 0 = slot libre
+            self.on_update("ok")
+            return
+
+        self.on_update(f"position:{join.get('position')}:{join.get('queueSize')}")
+
+        while self._running:
+            time.sleep(5)
             if not self._running:
                 break
 
-            try:
-                res = requests.get(f"{self.api_url}/queue/status/{self.user_id}")
-                status = res.json()
-            except Exception as e:
-                self.error.emit(str(e))
-                return
+            status = self.check_status()
 
-            if status.get("status") == "queued":
-                self.update_ui.emit(
-                    f"⏳ Votre position : {status.get('position')} / {status.get('queueSize')}"
-                )
-            else:
-                self.update_ui.emit("🚀 C'est votre tour !")
-                self.launch_game.emit()
+            if status.get("position") == 0:  # Position 0 = c'est le tour
+                self.on_update("ready")
                 return
+            else:
+                self.on_update(f"position:{status.get('position')}:{status.get('queueSize')}")