From fb6fdb97692e178461d6b91d1190435c5c7dcf4e Mon Sep 17 00:00:00 2001
From: UncleJim <unclejim@noreply.gitea.tendokyu.moe>
Date: Tue, 9 Jan 2024 14:21:52 +0000
Subject: [PATCH] revert b89679e6399a8bb0d92b836d410fb1d97715a7e0

revert revert 9605c13e8e667428f9d6382170bfa719e1f51107

revert implemented simple queue online matchmaking
---
 titles/idac/matching.py | 80 ++++++++++++++++++++++++++---------------
 1 file changed, 52 insertions(+), 28 deletions(-)

diff --git a/titles/idac/matching.py b/titles/idac/matching.py
index 396eec8..f4cf06a 100644
--- a/titles/idac/matching.py
+++ b/titles/idac/matching.py
@@ -8,58 +8,82 @@ from core import CoreConfig
 from titles.idac.season2 import IDACBase
 from titles.idac.config import IDACConfig
 
+from random import randint
 
 class IDACMatching(resource.Resource):
     isLeaf = True
 
+    SessionQueue = {}
+    Rooms = {}
+
     def __init__(self, cfg: CoreConfig, game_cfg: IDACConfig) -> None:
         self.core_config = cfg
         self.game_config = game_cfg
         self.base = IDACBase(cfg, game_cfg)
         self.logger = logging.getLogger("idac")
 
-        self.queue = 0
-
-    def get_matching_state(self):
-        if self.queue >= 1:
-            self.queue -= 1
-            return 0
+    def getMatchingState(self, machineSerial): #We use official state code here
+        if len(self.SessionQueue) == 1:
+            self.logger.info(f"IDAC Matching queued player {machineSerial}: empty dict, returned by default")
+            return self.SessionQueue[machineSerial]
+        elif self.SessionQueue[machineSerial] == 0:
+            self.logger.info(f"IDAC Matching queued player {machineSerial}: matched player, returned by default")
+            return self.SessionQueue[machineSerial]
         else:
-            return 1
+            for sessionID in self.SessionQueue.keys():
+                if sessionID == machineSerial:
+                    continue
+                if self.SessionQueue[sessionID] == 1:
+                    #uncomment these to process into actual game
+                    #self.SessionQueue[machineSerial] = 0
+                    #self.SessionQueue[sessionID] = 0
+                    self.joinRoom(machineSerial, sessionID)
+                    self.logger.info(f"IDAC Matching queued player {machineSerial}: rival {sessionID} found!! return matched state")
+                    return self.SessionQueue[machineSerial]
+        self.logger.info(f"IDAC Matching queued player {machineSerial}: cannot find any rival, returned by default")
+        return self.SessionQueue[machineSerial]
+
+    def joinRoom(self, machineSerial, sessionID): #Random room name, It should be handled by game itself in later process
+        roomName = "INDTA-Zenkoku-Room" #+randint(1, 1001)
+        self.Rooms[machineSerial] = roomName
+        self.Rooms[sessionID] = roomName
 
     def render_POST(self, req) -> bytes:
         url = req.uri.decode()
         req_data = json.loads(req.content.getvalue().decode())
         header_application = self.decode_header(req.getAllHeaders())
-        user_id = int(header_application["session"])
-
-        # self.getMatchingStatus(user_id)
+        machineSerial = header_application["a_serial"]
 
         self.logger.info(
             f"IDAC Matching request from {req.getClientIP()}: {url} - {req_data}"
         )
 
-        resp = {"status_code": "0"}
         if url == "/regist":
-            self.queue = self.queue + 1
+            self.SessionQueue[machineSerial] = 1
+            self.logger.info(f"IDAC Matching registed player {machineSerial}")
+            return json.dumps({"status_code": "0"}, ensure_ascii=False).encode("utf-8")
+
         elif url == "/status":
-            if req_data.get("cancel_flag"):
-                self.queue = self.queue - 1
-                self.logger.info(
-                    f"IDAC Matching endpoint {req.getClientIP()} had quited"
-                )
+            if req_data.get('cancel_flag'):
+                if machineSerial in self.SessionQueue:
+                     self.SessionQueue.pop(machineSerial)
+                self.logger.info(f"IDAC Matching endpoint {req.getClientIP()} had quited")
+                return json.dumps({"status_code": "0", "host": "", "port": self.game_config.server.matching_p2p, "room_name": self.Rooms[machineSerial], "state": 1}, ensure_ascii=False).encode("utf-8")
+            if machineSerial not in self.Rooms.keys():
+                self.Rooms[machineSerial] = "None"
+            return json.dumps({"status_code": "0", "host": self.game_config.server.matching_host, "port": self.game_config.server.matching_p2p, "room_name": self.Rooms[machineSerial], "state": self.getMatchingState(machineSerial)}, ensure_ascii=False).encode("utf-8")
 
-            resp = {
-                "status_code": "0",
-                # Only IPv4 is supported
-                "host": self.game_config.server.matching_host,
-                "port": self.game_config.server.matching_p2p,
-                "room_name": "INDTA",
-                "state": 1,
-            }
-
-        self.logger.debug(f"Response {resp}")
-        return json.dumps(resp, ensure_ascii=False).encode("utf-8")
+        #    resp = {
+        #        "status_code": "0",
+        #        # Only IPv4 is supported
+        #        "host": self.game_config.server.matching_host,
+        #        "port": self.game_config.server.matching_p2p,
+        #        "room_name": "INDTA",
+        #        "state": self.get_matching_state(),
+        #    }
+        #
+        #self.logger.debug(f"Response {resp}")
+        #return json.dumps(resp, ensure_ascii=False).encode("utf-8")
 
     def decode_header(self, data: Dict) -> Dict:
         app: str = data[b"application"].decode()