begin move

titles/idz/handlers/load_server_info.py

@@ -24,10 +24,10 @@ class IDZHandlerLoadServerInfo(IDZHandlerBase):
         
         t_port = Utils.get_title_port(self.core_config)
 
-        news_str = f"http://{self.core_config.title.hostname}:{t_port}/idz/news/news80**.txt"
-        err_str = f"http://{self.core_config.title.hostname}:{t_port}/idz/error"
+        news_str = f"http://{self.core_config.server.hostname}:{t_port}/idz/news/news80**.txt"
+        err_str = f"http://{self.core_config.server.hostname}:{t_port}/idz/error"
 
-        len_hostname = len(self.core_config.title.hostname)
+        len_hostname = len(self.core_config.server.hostname)
         len_news = len(news_str)
         len_error = len(err_str)
 
@@ -36,7 +36,7 @@ class IDZHandlerLoadServerInfo(IDZHandlerBase):
             f"{len_hostname}s",
             ret,
             0x4 + offset,
-            self.core_config.title.hostname.encode(),
+            self.core_config.server.hostname.encode(),
         )
         struct.pack_into("<I", ret, 0x84 + offset, self.game_cfg.ports.userdb)
         struct.pack_into("<I", ret, 0x86 + offset, self.game_cfg.ports.userdb + 1)
@@ -45,7 +45,7 @@ class IDZHandlerLoadServerInfo(IDZHandlerBase):
             f"{len_hostname}s",
             ret,
             0x88 + offset,
-            self.core_config.title.hostname.encode(),
+            self.core_config.server.hostname.encode(),
         )
         struct.pack_into("<I", ret, 0x108 + offset, self.game_cfg.ports.match - 1)
         struct.pack_into("<I", ret, 0x10A + offset, self.game_cfg.ports.match - 3)
@@ -59,7 +59,7 @@ class IDZHandlerLoadServerInfo(IDZHandlerBase):
             f"{len_hostname}s",
             ret,
             0x114 + offset,
-            self.core_config.title.hostname.encode(),
+            self.core_config.server.hostname.encode(),
         )
         struct.pack_into("<I", ret, 0x194 + offset, self.game_cfg.ports.echo + 2)
 
@@ -67,7 +67,7 @@ class IDZHandlerLoadServerInfo(IDZHandlerBase):
             f"{len_hostname}s",
             ret,
             0x0199 + offset,
-            self.core_config.title.hostname.encode(),
+            self.core_config.server.hostname.encode(),
         )
         struct.pack_into("<I", ret, 0x0219 + offset, self.game_cfg.ports.echo + 3)
 
@@ -75,19 +75,19 @@ class IDZHandlerLoadServerInfo(IDZHandlerBase):
             f"{len_hostname}s",
             ret,
             0x021C + offset,
-            self.core_config.title.hostname.encode(),
+            self.core_config.server.hostname.encode(),
         )
         struct.pack_into(
             f"{len_hostname}s",
             ret,
             0x029C + offset,
-            self.core_config.title.hostname.encode(),
+            self.core_config.server.hostname.encode(),
         )
         struct.pack_into(
             f"{len_hostname}s",
             ret,
             0x031C + offset,
-            self.core_config.title.hostname.encode(),
+            self.core_config.server.hostname.encode(),
         )
 
         struct.pack_into("<I", ret, 0x39C + offset, self.game_cfg.ports.echo)

titles/idz/index.py

@@ -1,12 +1,12 @@
-from twisted.web.http import Request
+from starlette.requests import Request
+from starlette.responses import Response, PlainTextResponse
+from starlette.routing import Route
 import yaml
 import logging
 import coloredlogs
 from logging.handlers import TimedRotatingFileHandler
 from os import path
 from typing import Tuple, List, Dict
-from twisted.internet import reactor, endpoints
-from twisted.web import server, resource
 import importlib
 
 from core.config import CoreConfig
@@ -83,16 +83,15 @@ class IDZServlet(BaseServlet):
 
         return True
     
-    def get_endpoint_matchers(self) -> Tuple[List[Tuple[str, str, Dict]], List[Tuple[str, str, Dict]]]:
-        return[
-            [("render_GET", "/idz/news/{endpoint:.*?}", {}),
-             ("render_GET", "/idz/error", {})],
-            []
+    def get_routes(self) -> List[Route]:
+        return [
+            Route("/idz/news/{endpoint:str}", self.render_GET),
+            Route("/idz/error", self.render_GET)
         ]
     
     def get_allnet_info(self, game_code: str, game_ver: int, keychip: str) -> Tuple[str, str]:
         hostname = (
-            self.core_cfg.title.hostname
+            self.core_cfg.server.hostname
             if not self.game_cfg.server.hostname
             else self.game_cfg.server.hostname
         )
@@ -135,7 +134,8 @@ class IDZServlet(BaseServlet):
 
             except AttributeError as e:
                 continue
-
+        
+        """
         endpoints.serverFromString(
             reactor,
             f"tcp:{self.game_cfg.ports.userdb}:interface={self.core_cfg.server.listen_address}",
@@ -155,18 +155,15 @@ class IDZServlet(BaseServlet):
         reactor.listenUDP(
             self.game_cfg.ports.userdb + 1, IDZEcho(self.core_cfg, self.game_cfg)
         )
-
+        """
         self.logger.info(f"UserDB Listening on port {self.game_cfg.ports.userdb}")
 
-    def render_GET(self, request: Request, game_code: str, matchers: Dict) -> bytes:
-        url_path = matchers['endpoint']
+    async def render_GET(self, request: Request) -> bytes:
+        url_path = request.path_params.get('endpoint', '')
+        if not url_path:
+            return Response()
+
         self.logger.info(f"IDZ GET request: {url_path}")
-        request.responseHeaders.setRawHeaders(
-            "Content-Type", [b"text/plain; charset=utf-8"]
-        )
-        request.responseHeaders.setRawHeaders(
-            "Last-Modified", [b"Sun, 23 Apr 2023 05:33:20 GMT"]
-        )
 
         news = (
             self.game_cfg.server.news
@@ -176,4 +173,4 @@ class IDZServlet(BaseServlet):
         news += "\r\n"
         news = "1979/01/01 00:00:00 2099/12/31 23:59:59 " + news
 
-        return news.encode()
+        return PlainTextResponse(news, media_type="text/plain; charset=utf-8", headers={"Last-Modified": "Sun, 23 Apr 2023 05:33:20 GMT"})

titles/idz/userdb.py

@@ -5,7 +5,7 @@ import struct
 from typing import Dict, Optional, List, Type
 from twisted.web import server, resource
 from twisted.internet import reactor, endpoints
-from twisted.web.http import Request
+from starlette.requests import Request
 from routes import Mapper
 import random
 from os import walk