From 59951b2d38b28d24a15f3de0159c820a2c5c4a41 Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Wed, 8 Nov 2023 21:10:51 -0500 Subject: [PATCH] cxb: switch to .read --- titles/cxb/index.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/titles/cxb/index.py b/titles/cxb/index.py index e7c80bd..7e6cd7c 100644 --- a/titles/cxb/index.py +++ b/titles/cxb/index.py @@ -96,7 +96,12 @@ class CxbServlet(BaseServlet): ] ) - def preprocess(self, req_bytes: bytes) -> Dict: + def preprocess(self, req: Request) -> Dict: + try: + req_bytes = req.content.getvalue() + except: + req_bytes = req.content.read() # Can we just use this one? + try: req_json: Dict = json.loads(req_bytes) @@ -115,7 +120,7 @@ class CxbServlet(BaseServlet): return req_json def handle_data(self, request: Request, game_code: str, matchers: Dict) -> bytes: - req_json = self.preprocess(request.content.getvalue()) + req_json = self.preprocess(request) func_to_find = "handle_data_" version_string = "Base" internal_ver = 0 @@ -187,7 +192,7 @@ class CxbServlet(BaseServlet): return json.dumps(resp, ensure_ascii=False).encode("utf-8") def handle_action(self, request: Request, game_code: str, matchers: Dict) -> bytes: - req_json = self.preprocess(request.content.getvalue()) + req_json = self.preprocess(request) subcmd = list(req_json.keys())[0] func_to_find = f"handle_action_{subcmd}_request" @@ -215,7 +220,7 @@ class CxbServlet(BaseServlet): return json.dumps(resp, ensure_ascii=False).encode("utf-8") def handle_auth(self, request: Request, game_code: str, matchers: Dict) -> bytes: - req_json = self.preprocess(request.content.getvalue()) + req_json = self.preprocess(request) subcmd = list(req_json.keys())[0] func_to_find = f"handle_auth_{subcmd}_request"