begin move

titles/wacca/index.py

@@ -1,16 +1,19 @@
+from starlette.routing import Route
 import yaml
 import logging, coloredlogs
 from logging.handlers import TimedRotatingFileHandler
 import logging
 import json
 from hashlib import md5
-from twisted.web.http import Request
+from starlette.requests import Request
+from starlette.responses import JSONResponse, Response
 from typing import Dict, Tuple, List
 from os import path
 import traceback
 import sys
 
 from core import CoreConfig, Utils
+from core.title import BaseServlet
 from .config import WaccaConfig
 from .config import WaccaConfig
 from .const import WaccaConstants
@@ -23,7 +26,7 @@ from .handlers.base import BaseResponse, BaseRequest
 from .handlers.helpers import Version
 
 
-class WaccaServlet:
+class WaccaServlet(BaseServlet):
     def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None:
         self.core_cfg = core_cfg
         self.game_cfg = WaccaConfig()
@@ -62,15 +65,12 @@ class WaccaServlet:
         coloredlogs.install(
             level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str
         )
-
-    def get_endpoint_matchers(self) -> Tuple[List[Tuple[str, str, Dict]], List[Tuple[str, str, Dict]]]:
-        return (
-            [], 
-            [
-                ("render_POST", "/WaccaServlet/api/{api}/{endpoint}", {}),
-                ("render_POST", "/WaccaServlet/api/{api}/{branch}/{endpoint}", {})
-            ]
-        )
+    
+    def get_routes(self) -> List[Route]:
+        return [
+            Route("/WaccaServlet/api/{api:str}/{endpoint:str}", self.render_POST, methods=['POST']),
+            Route("/WaccaServlet/api/{api:str}/{branch:str}/{endpoint:str}", self.render_POST, methods=['POST']),
+        ]
 
     @classmethod
     def is_game_enabled(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> bool:
@@ -88,22 +88,22 @@ class WaccaServlet:
     def get_allnet_info(self, game_code: str, game_ver: int, keychip: str) -> Tuple[str, str]:
         if not self.core_cfg.server.is_using_proxy and Utils.get_title_port(self.core_cfg) != 80:
             return (
-                f"http://{self.core_cfg.title.hostname}:{Utils.get_title_port(self.core_cfg)}/WaccaServlet",
-                self.core_cfg.title.hostname,
+                f"http://{self.core_cfg.server.hostname}:{Utils.get_title_port(self.core_cfg)}/WaccaServlet",
+                self.core_cfg.server.hostname,
             )
 
-        return (f"http://{self.core_cfg.title.hostname}/WaccaServlet", self.core_cfg.title.hostname)
+        return (f"http://{self.core_cfg.server.hostname}/WaccaServlet", self.core_cfg.server.hostname)
     
-    def render_POST(self, request: Request, game_code: str, matchers: Dict) -> bytes:
+    async def render_POST(self, request: Request) -> bytes:
         def end(resp: Dict) -> bytes:
             hash = md5(json.dumps(resp, ensure_ascii=False).encode()).digest()
-            request.responseHeaders.addRawHeader(b"X-Wacca-Hash", hash.hex().encode())
-            return json.dumps(resp).encode()
+            return JSONResponse(resp, headers=["X-Wacca-Hash", hash.hex()])
 
-        api = matchers['api']
-        branch = matchers.get('branch', '')
-        endpoint = matchers['endpoint']
+        api = request.path_params.get('api', '')
+        branch = request.path_params.get('branch', '')
+        endpoint = request.path_params.get('endpoint', '')
         client_ip = Utils.get_ip_addr(request)
+        bod = await request.body()
         
         if branch:
             url_path = f"{api}/{branch}/{endpoint}"
@@ -114,13 +114,13 @@ class WaccaServlet:
             func_to_find = f"handle_{api}_{endpoint}_request"
 
         try:
-            req_json = json.loads(request.content.getvalue())
+            req_json = json.loads(bod)
             version_full = Version(req_json["appVersion"])
             req = BaseRequest(req_json)
         
         except KeyError as e:
             self.logger.error(
-                f"Failed to parse request to {request.content.getvalue()} -> Missing required value {e}"
+                f"Failed to parse request to {bod} -> Missing required value {e}"
             )
             resp = BaseResponse()
             resp.status = 1
@@ -129,7 +129,7 @@ class WaccaServlet:
         
         except Exception as e:
             self.logger.error(
-                f"Failed to parse request to {url_path} -> {request.content.getvalue()} -> {e}"
+                f"Failed to parse request to {url_path} -> {bod} -> {e}"
             )
             resp = BaseResponse()
             resp.status = 1
@@ -176,7 +176,7 @@ class WaccaServlet:
 
         try:
             handler = getattr(self.versions[internal_ver], func_to_find)
-            resp = handler(req_json)
+            resp = await handler(req_json)
 
             self.logger.debug(f"{req.appVersion} response {resp}")
             return end(resp)