HUGE WebUI overhaul

- Removed ugly styles in header
- Properly implemented Bootstrap's NavBar
- Added username to session

.gitattributes

@@ -1,3 +0,0 @@
-*.csv binary
-*.txt binary
-*.json binary

Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.9.15-slim-bullseye
 
-RUN apt update && apt install default-libmysqlclient-dev build-essential libtk nodejs npm pkg-config -y
+RUN apt update && apt install default-libmysqlclient-dev build-essential libtk nodejs npm -y
 
 WORKDIR /app
 COPY requirements.txt requirements.txt
@@ -12,10 +12,10 @@ RUN chmod +x entrypoint.sh
 
 COPY index.py index.py
 COPY dbutils.py dbutils.py
-COPY read.py read.py
 ADD core core
 ADD titles titles
-ADD logs logs
+ADD config config
+ADD log log
 ADD cert cert
 
-ENTRYPOINT [ "/app/entrypoint.sh" ]
+ENTRYPOINT [ "/app/entrypoint.sh" ]

changelog.md

@@ -1,101 +1,6 @@
 # Changelog
 Documenting updates to ARTEMiS, to be updated every time the master branch is pushed to.
 
-## 20240109
-### System
-+ Removed `ADD config config` from dockerfile
-
-### Aimedb
-+ Fixed an error that resulted from trying to scan a banned or locked card
-
-## 20240108
-### System
-+ Change how the underlying system handles URLs
-  + This can now allow for things like version-specific, or even keychip-specific URLs
-  + Specific changes to games are noted below
-+ Fix docker files [#60](https://gitea.tendokyu.moe/Hay1tsme/artemis/pulls/60) (Thanks Rylie!)
-+ Fix support for python 3.8 - 3.10
-
-### Aimedb
-+ Add support for SegaAuth key in games that support it (for now only Chunithm)
-  + This is a JWT that is sent to games, by Aimedb, that the games send to their game server, to verify that the access code the game is sending to the server was obtained via aimedb.
-  + Requires a base64-encoded secret to be set in the `core.yaml`
-
-### Chunithm
-+ Fix Air support
-+ Add saving for userRecentPlayerList
-+ Add support for SegaAuthKey
-+ Fix a bug arising if a user set their name to be 'true' or 'false'
-+ Add support for Sun+ [#78](https://gitea.tendokyu.moe/Hay1tsme/artemis/pulls/78) (Thanks EmmyHeart!)
-+ Add `matching` section to `chuni.yaml`
-+ ~~Change `udpHolePunchUri` and `reflectorUri` to be STUN and TURN servers~~ Reverted
-+ Imrpove `GetGameSetting` request handling for different versions
-+ Fix issue where songs would not always return all scores [#92](https://gitea.tendokyu.moe/Hay1tsme/artemis/pulls/92) (Thanks Kumubou!)
-
-### maimai DX
-+ Fix user charges failing to save
-
-### maimai
-+ Made it functional
-
-### CXB
-+ Improvements to request dispatching
-+ Add support for non-omnimix music lists
-
-
-### IDZ
-+ Fix news urls in accordance with the system change to URLs
-
-### Initial D THE ARCADE
-+ Added support for Initial D THE ARCADE S2
-  + Story mode progress added
-  + Bunta Challenge/Touhou Project modes added
-  + Time Trials added
-  + Leaderboards added, but doesn't refresh sometimes
-  + Theory of Street mode added (with CPUs)
-  + Play Stamp/Timetrial events added
-  + Frontend to download profile added
-  + Importer to import profiles added
-
-### ONGEKI
-+ Now supports HTTPS on a per-version basis
-+ Merg PR [#61](https://gitea.tendokyu.moe/Hay1tsme/artemis/pulls/61) (Thanks phantomlan!)
-  + Add Ranking Event Support
-  + Add reward list support
-  + Add version segregation to Event Ranking, Tech Challenge, and Music Ranking
-  + Now stores ClientTestmode and ClientSetting data
-+ Fix mission points not adding correctly [#68](https://gitea.tendokyu.moe/Hay1tsme/artemis/pulls/68) (Thanks phantomlan!)
-+ Fix tech challenge [#70](https://gitea.tendokyu.moe/Hay1tsme/artemis/pulls/70) (Thanks phantomlan!)
-
-### SAO
-+ Change endpoint in accordance with the system change to URLs
-+ Update request header class to be more accurate
-+ Encrypted requests are now supported
-+ Change to using handler classes instead of raw structs for simplicity
-
-### Wacca
-+ Fix a server error causing a seperate error that casued issues
-+ Add better error printing
-+ Add better request validation
-+ Fix HousingStartV2
-+ Fix Lily's housing/get handler
-
-## 20231107
-### CXB
-+  Hotfix `render_POST` sometimes failing to read the request body on large requests
-
-## 20231106
-### CXB
-+ Hotfix `render_POST` function signature signature
-+ Hotfix `handle_action_addenergy_request` hard failing if `get_energy` returns None
-
-## 20231015
-### maimai DX
-+ Added support for FESTiVAL PLUS
-
-### Card Maker
-+ Added support for maimai DX FESTiVAL PLUS
-
 ## 20230716
 ### General
 + Docker files added (#19)

core/adb_handlers/felica.py

@@ -52,7 +52,6 @@ class ADBFelicaLookup2Response(ADBBaseResponse):
         self.access_code = access_code if access_code is not None else "00000000000000000000"
         self.company = CompanyCodes.SEGA
         self.portal_status = PortalRegStatus.NO_REG
-        self.auth_key = [0] * 256
 
     @classmethod
     def from_req(cls, req: ADBHeader, user_id: Union[int, None] = None, access_code: Union[str, None] = None) -> "ADBFelicaLookup2Response":
@@ -77,7 +76,7 @@ class ADBFelicaLookup2Response(ADBBaseResponse):
             access_code = bytes.fromhex(self.access_code),
             portal_status = self.portal_status.value,
             company_code = self.company.value,
-            auth_key = self.auth_key
+            auth_key = [0] * 256 # Unsupported
         ))
 
         self.head.length = HEADER_SIZE + len(resp_struct)

core/adb_handlers/lookup.py

@@ -52,7 +52,6 @@ class ADBLookupExResponse(ADBBaseResponse):
         super().__init__(code, length, status, game_id, store_id, keychip_id)
         self.user_id = user_id if user_id is not None else -1
         self.portal_reg = PortalRegStatus.NO_REG
-        self.auth_key = [0] * 256
 
     @classmethod
     def from_req(cls, req: ADBHeader, user_id: Union[int, None]) -> "ADBLookupExResponse":
@@ -73,7 +72,7 @@ class ADBLookupExResponse(ADBBaseResponse):
         body = resp_struct.build(dict(
             user_id = self.user_id,
             portal_reg = self.portal_reg.value,
-            auth_key = self.auth_key,
+            auth_key = [0] * 256,
             relation1 = -1,
             relation2 = -1
         ))

core/aimedb.py

@@ -7,7 +7,6 @@ from typing_extensions import Final
 from logging.handlers import TimedRotatingFileHandler
 
 from core.config import CoreConfig
-from core.utils import create_sega_auth_key
 from core.data import Data
 from .adb_handlers import *
 
@@ -146,16 +145,8 @@ class AimedbProtocol(Protocol):
     def handle_lookup(self, data: bytes, resp_code: int) -> ADBBaseResponse:
         req = ADBLookupRequest(data)
         user_id = self.data.card.get_user_id_from_card(req.access_code)
-        is_banned = self.data.card.get_card_banned(req.access_code)
-        is_locked = self.data.card.get_card_locked(req.access_code)
 
         ret = ADBLookupResponse.from_req(req.head, user_id)
-        if is_banned and is_locked:
-            ret.head.status = ADBStatus.BAN_SYS_USER
-        elif is_banned:
-            ret.head.status = ADBStatus.BAN_SYS
-        elif is_locked:
-            ret.head.status = ADBStatus.LOCK_USER
         
         self.logger.info(
             f"access_code {req.access_code} -> user_id {ret.user_id}"
@@ -166,29 +157,11 @@ class AimedbProtocol(Protocol):
         req = ADBLookupRequest(data)
         user_id = self.data.card.get_user_id_from_card(req.access_code)
 
-        is_banned = self.data.card.get_card_banned(req.access_code)
-        is_locked = self.data.card.get_card_locked(req.access_code)
-
         ret = ADBLookupExResponse.from_req(req.head, user_id)
-        if is_banned and is_locked:
-            ret.head.status = ADBStatus.BAN_SYS_USER
-        elif is_banned:
-            ret.head.status = ADBStatus.BAN_SYS
-        elif is_locked:
-            ret.head.status = ADBStatus.LOCK_USER
-
+        
         self.logger.info(
             f"access_code {req.access_code} -> user_id {ret.user_id}"
         )
-
-        if user_id and user_id > 0 and self.config.aimedb.id_secret:
-            auth_key = create_sega_auth_key(user_id, req.head.game_id, req.head.store_id, req.head.keychip_id, self.config.aimedb.id_secret, self.config.aimedb.id_lifetime_seconds)
-            if auth_key is not None:
-                auth_key_extra_len = 256 - len(auth_key)
-                auth_key_full = auth_key.encode() + (b"\0" * auth_key_extra_len)
-                self.logger.debug(f"Generated auth token {auth_key}")
-                ret.auth_key = auth_key_full
-
         return ret
 
     def handle_felica_lookup(self, data: bytes, resp_code: int) -> bytes:
@@ -251,17 +224,7 @@ class AimedbProtocol(Protocol):
             f"idm {req.idm} ipm {req.pmm} -> access_code {access_code} user_id {user_id}"
         )
 
-        resp = ADBFelicaLookup2Response.from_req(req.head, user_id, access_code)
-
-        if user_id and user_id > 0 and self.config.aimedb.id_secret:
-            auth_key = create_sega_auth_key(user_id, req.head.game_id, req.head.store_id, req.head.keychip_id, self.config.aimedb.id_secret, self.config.aimedb.id_lifetime_seconds)
-            if auth_key is not None:
-                auth_key_extra_len = 256 - len(auth_key)
-                auth_key_full = auth_key.encode() + (b"\0" * auth_key_extra_len)
-                self.logger.debug(f"Generated auth token {auth_key}")
-                resp.auth_key = auth_key_full
-
-        return resp
+        return ADBFelicaLookup2Response.from_req(req.head, user_id, access_code)
 
     def handle_campaign_clear(self, data: bytes, resp_code: int) -> ADBBaseResponse:
         req = ADBCampaignClearRequest(data)
@@ -274,7 +237,7 @@ class AimedbProtocol(Protocol):
     def handle_register(self, data: bytes, resp_code: int) -> bytes:
         req = ADBLookupRequest(data)
         user_id = -1
-
+        
         if self.config.server.allow_user_registration:
             user_id = self.data.user.create_user()
 

core/allnet.py

@@ -16,11 +16,10 @@ from os import path
 import urllib.parse
 import math
 
-from .config import CoreConfig
-from .utils import Utils
-from .data import Data
-from .const import *
-from .title import TitleServlet
+from core.config import CoreConfig
+from core.utils import Utils
+from core.data import Data
+from core.const import *
 
 BILLING_DT_FORMAT: Final[str] = "%Y%m%d%H%M%S"
 
@@ -34,67 +33,13 @@ class ALLNET_STAT(Enum):
     bad_machine = -2
     bad_shop = -3
 
-class DLI_STATUS(Enum):
-    START = 0
-    GET_DOWNLOAD_CONFIGURATION = 1
-    WAIT_DOWNLOAD = 2
-    DOWNLOADING = 3
-
-    NOT_SPECIFY_DLI = 100
-    ONLY_POST_REPORT = 101
-    STOPPED_BY_APP_RELEASE = 102
-    STOPPED_BY_OPT_RELEASE = 103
-
-    DOWNLOAD_COMPLETE_RECENTLY = 110
-
-    DOWNLOAD_COMPLETE_WAIT_RELEASE_TIME = 120
-    DOWNLOAD_COMPLETE_BUT_NOT_SYNC_SERVER = 121
-    DOWNLOAD_COMPLETE_BUT_NOT_FIRST_RESUME = 122
-    DOWNLOAD_COMPLETE_BUT_NOT_FIRST_LAUNCH = 123
-    DOWNLOAD_COMPLETE_WAIT_UPDATE = 124
-
-    DOWNLOAD_COMPLETE_AND_ALREADY_UPDATE = 130
-
-    ERROR_AUTH_FAILURE = 200
-
-    ERROR_GET_DLI_HTTP = 300
-    ERROR_GET_DLI = 301
-    ERROR_PARSE_DLI = 302
-    ERROR_INVALID_GAME_ID = 303
-    ERROR_INVALID_IMAGE_LIST = 304
-    ERROR_GET_DLI_APP = 305
-
-    ERROR_GET_BOOT_ID = 400
-    ERROR_ACCESS_SERVER = 401
-    ERROR_NO_IMAGE = 402
-    ERROR_ACCESS_IMAGE = 403
-
-    ERROR_DOWNLOAD_APP = 500
-    ERROR_DOWNLOAD_OPT = 501
-
-    ERROR_DISK_FULL = 600
-    ERROR_UNINSTALL = 601
-    ERROR_INSTALL_APP = 602
-    ERROR_INSTALL_OPT = 603
-
-    ERROR_GET_DLI_INTERNAL = 900
-    ERROR_ICF = 901
-    ERROR_CHECK_RELEASE_INTERNAL = 902
-    UNKNOWN = 999 # Not the actual enum val but it needs to be here as a catch-all
-
-    @classmethod
-    def from_int(cls, num: int) -> "DLI_STATUS":
-        try:
-            return cls(num)
-        except ValueError:
-            return cls.UNKNOWN
-
 class AllnetServlet:
     def __init__(self, core_cfg: CoreConfig, cfg_folder: str):
         super().__init__()
         self.config = core_cfg
         self.config_folder = cfg_folder
         self.data = Data(core_cfg)
+        self.uri_registry: Dict[str, Tuple[str, str]] = {}
 
         self.logger = logging.getLogger("allnet")
         if not hasattr(self.logger, "initialized"):
@@ -125,8 +70,18 @@ class AllnetServlet:
         if len(plugins) == 0:
             self.logger.error("No games detected!")
 
+        for _, mod in plugins.items():
+            if hasattr(mod, "index") and hasattr(mod.index, "get_allnet_info"):
+                for code in mod.game_codes:
+                    enabled, uri, host = mod.index.get_allnet_info(
+                        code, self.config, self.config_folder
+                    )
+
+                    if enabled:
+                        self.uri_registry[code] = (uri, host)
+
         self.logger.info(
-            f"Serving {len(TitleServlet.title_registry)} game codes port {core_cfg.allnet.port}"
+            f"Serving {len(self.uri_registry)} game codes port {core_cfg.allnet.port}"
         )
 
     def handle_poweron(self, request: Request, _: Dict):
@@ -192,7 +147,7 @@ class AllnetServlet:
                     resp_dict = {k: v for k, v in vars(resp).items() if v is not None}
                     return (urllib.parse.unquote(urllib.parse.urlencode(resp_dict)) + "\n").encode("utf-8")
                 
-                elif (not arcade["ip"] or arcade["ip"] is None) and self.config.server.strict_ip_checking:
+                elif not arcade["ip"] or arcade["ip"] is None and self.config.server.strict_ip_checking:
                     msg = f"Serial {req.serial} attempted allnet auth from bad IP {req.ip}, but arcade {arcade['id']} has no IP set! (strict checking enabled)."
                     self.data.base.log_event(
                         "allnet", "ALLNET_AUTH_NO_SHOP_IP", logging.ERROR, msg
@@ -221,21 +176,21 @@ class AllnetServlet:
                 else AllnetJapanRegionId.AICHI.value
             )
             resp.region_name0 = (
-                arcade["state"]
-                if arcade["state"] is not None
-                else AllnetJapanRegionId.AICHI.name
-            )
-            resp.region_name1 = (
                 arcade["country"]
                 if arcade["country"] is not None
                 else AllnetCountryCode.JAPAN.value
             )
+            resp.region_name1 = (
+                arcade["state"]
+                if arcade["state"] is not None
+                else AllnetJapanRegionId.AICHI.name
+            )
             resp.region_name2 = arcade["city"] if arcade["city"] is not None else ""
-            resp.client_timezone = ( # lmao
-                arcade["timezone"] if arcade["timezone"] is not None else "+0900" if req.format_ver == 3 else "+09:00"
+            resp.client_timezone = (
+                arcade["timezone"] if arcade["timezone"] is not None else "+0900"
             )
         
-        if req.game_id not in TitleServlet.title_registry:
+        if req.game_id not in self.uri_registry:
             if not self.config.server.is_develop:
                 msg = f"Unrecognised game {req.game_id} attempted allnet auth from {request_ip}."
                 self.data.base.log_event(
@@ -260,9 +215,11 @@ class AllnetServlet:
                 self.logger.debug(f"Allnet response: {resp_str}")
                 return (resp_str + "\n").encode("utf-8")
 
-        
+        resp.uri, resp.host = self.uri_registry[req.game_id]
+
         int_ver = req.ver.replace(".", "")
-        resp.uri, resp.host = TitleServlet.title_registry[req.game_id].get_allnet_info(req.game_id, int(int_ver), req.serial)
+        resp.uri = resp.uri.replace("$v", int_ver)
+        resp.host = resp.host.replace("$v", int_ver)
 
         msg = f"{req.serial} authenticated from {request_ip}: {req.game_id} v{req.ver}"
         self.data.base.log_event("allnet", "ALLNET_AUTH_SUCCESS", logging.INFO, msg)
@@ -338,6 +295,7 @@ class AllnetServlet:
                 return self.to_dfi(res_str)"""
 
             return res_str
+            
 
     def handle_dlorder_ini(self, request: Request, match: Dict) -> bytes:
         if "file" not in match:
@@ -358,7 +316,6 @@ class AllnetServlet:
 
     def handle_dlorder_report(self, request: Request, match: Dict) -> bytes:
         req_raw = request.content.getvalue()
-        client_ip = Utils.get_ip_addr(request)
         try:
             req_dict: Dict = json.loads(req_raw)
         except Exception as e:
@@ -376,17 +333,11 @@ class AllnetServlet:
             self.logger.warning(f"Failed to parse DL Report: Invalid format - contains neither appimage nor optimage")
             return "NG"
 
-        rep = DLReport(dl_data, dl_data_type)
+        dl_report_data = DLReport(dl_data, dl_data_type)
 
-        if not rep.validate():
-            self.logger.warning(f"Failed to parse DL Report: Invalid format - {rep.err}")
+        if not dl_report_data.validate():
+            self.logger.warning(f"Failed to parse DL Report: Invalid format - {dl_report_data.err}")
             return "NG"
-        
-        msg = f"{rep.serial} @ {client_ip} reported {rep.rep_type.name} download state {rep.rf_state.name} for {rep.gd} v{rep.dav}:"\
-              f" {rep.tdsc}/{rep.tsc} segments downloaded for working files {rep.wfl} with {rep.dfl if rep.dfl else 'none'} complete."
-        
-        self.data.base.log_event("allnet", "DL_REPORT", logging.INFO, msg, dl_data)
-        self.logger.info(msg)
 
         return "OK"
 
@@ -432,17 +383,16 @@ class AllnetServlet:
         signer = PKCS1_v1_5.new(rsa)
         digest = SHA.new()
         traces: List[TraceData] = []
-        try:
-            req = BillingInfo(req_dict[0])
-        except KeyError as e:
-            self.logger.error(f"Billing request failed to parse: {e}")
-            return f"result=5&linelimit=&message=field is missing or formatting is incorrect\r\n".encode()
 
-        for x in range(1, len(req_dict)):
-            if not req_dict[x]:
-                continue
-            
-            try:
+        try:
+            for x in range(len(req_dict)):
+                if not req_dict[x]:
+                    continue
+                
+                if x == 0:                    
+                    req = BillingInfo(req_dict[x])
+                    continue
+
                 tmp = TraceData(req_dict[x])
                 if tmp.trace_type == TraceDataType.CHARGE:
                     tmp = TraceDataCharge(req_dict[x])
@@ -452,12 +402,12 @@ class AllnetServlet:
                     tmp = TraceDataCredit(req_dict[x])
                 
                 traces.append(tmp)
-            
-            except KeyError as e:
-                self.logger.warn(f"Tracelog failed to parse: {e}")
 
-        kc_serial_bytes = req.keychipid.encode()
+            kc_serial_bytes = req.keychipid.encode()
         
+        except KeyError as e:
+            self.logger.error(f"Billing request failed to parse: {e}")
+            return f"result=5&linelimit=&message=field is missing or formatting is incorrect\r\n".encode()
 
         machine = self.data.arcade.get_machine(req.keychipid)
         if machine is None and not self.config.server.allow_unregistered_serials:
@@ -575,7 +525,7 @@ class AllnetPowerOnResponse:
         self.stat = 1
         self.uri = ""
         self.host = ""
-        self.place_id = "0123"
+        self.place_id = "123"
         self.name = "ARTEMiS"
         self.nickname = "ARTEMiS"
         self.region0 = "1"
@@ -694,17 +644,9 @@ class TraceData:
             self.seq_number = int(data.get("sn", None))
             self.trace_type = TraceDataType(int(data.get("tt", None)))
             self.date_sync_flg = bool(data.get("ds", None))
-            
-            dt = data.get("dt", None)
-            if dt is None:
-                raise KeyError("dt not present")
-            if dt == "20000000000000": # Not sure what causes it to send like this...
-                self.date = datetime(2000, 1, 1, 0, 0, 0, 0)
-            else:
-                self.date = datetime.strptime(data.get("dt", None), BILLING_DT_FORMAT)
-            
+            self.date = datetime.strptime(data.get("dt", None), BILLING_DT_FORMAT)
             self.keychip = str(data.get("kn", None))
-            self.lib_ver = float(data.get("alib", 0))
+            self.lib_ver = float(data.get("alib", None))
         except Exception as e:
             raise KeyError(e)
 
@@ -712,8 +654,8 @@ class TraceDataCharge(TraceData):
     def __init__(self, data: Dict) -> None:
         super().__init__(data)
         try:
-            self.game_id = str(data.get("gi", None)) # these seem optional...?
-            self.game_version = float(data.get("gv", 0))
+            self.game_id = str(data.get("gi", None))
+            self.game_version = float(data.get("gv", None))
             self.board_serial = str(data.get("bn", None))
             self.shop_ip = str(data.get("ti", None))
             self.play_count = int(data.get("pc", None))
@@ -798,13 +740,13 @@ class DLReport:
         self.ot = data.get("ot")
         self.rt = data.get("rt")
         self.as_ = data.get("as")
-        self.rf_state = DLI_STATUS.from_int(data.get("rf_state"))
+        self.rf_state = data.get("rf_state")
         self.gd = data.get("gd")
         self.dav = data.get("dav")
         self.wdav = data.get("wdav") # app only
         self.dov = data.get("dov")
         self.wdov = data.get("wdov") # app only
-        self.rep_type = report_type
+        self.__type = report_type
         self.err = ""
     
     def validate(self) -> bool:
@@ -812,6 +754,14 @@ class DLReport:
             self.err = "serial not provided"
             return False
         
+        if self.dfl is None: 
+            self.err = "dfl not provided"
+            return False
+        
+        if self.wfl is None:
+            self.err = "wfl not provided"
+            return False
+        
         if self.tsc is None:
             self.err = "tsc not provided"
             return False
@@ -820,6 +770,18 @@ class DLReport:
             self.err = "tdsc not provided"
             return False
         
+        if self.at is None:
+            self.err = "at not provided"
+            return False
+        
+        if self.ot is None:
+            self.err = "ot not provided"
+            return False
+        
+        if self.rt is None:
+            self.err = "rt not provided"
+            return False
+        
         if self.as_ is None:
             self.err = "as not provided"
             return False
@@ -840,11 +802,11 @@ class DLReport:
             self.err = "dov not provided"
             return False
         
-        if (self.wdav is None or self.wdov is None) and self.rep_type == DLIMG_TYPE.app:
+        if (self.wdav is None or self.wdov is None) and self.__type == DLIMG_TYPE.app:
             self.err = "wdav or wdov not provided in app image"
             return False
         
-        if (self.wdav is not None or self.wdov is not None) and self.rep_type == DLIMG_TYPE.opt:
+        if (self.wdav is not None or self.wdov is not None) and self.__type == DLIMG_TYPE.opt:
             self.err = "wdav or wdov provided in opt image"
             return False
         

core/config.py

@@ -36,12 +36,6 @@ class ServerConfig:
             self.__config, "core", "server", "is_develop", default=True
         )
 
-    @property
-    def is_using_proxy(self) -> bool:
-        return CoreConfig.get_config_field(
-            self.__config, "core", "server", "is_using_proxy", default=False
-        )
-
     @property
     def threading(self) -> bool:
         return CoreConfig.get_config_field(
@@ -90,36 +84,6 @@ class TitleConfig:
         return CoreConfig.get_config_field(
             self.__config, "core", "title", "port", default=8080
         )
-        
-    @property
-    def port_ssl(self) -> int:
-        return CoreConfig.get_config_field(
-            self.__config, "core", "title", "port_ssl", default=0
-        )
-
-    @property
-    def ssl_key(self) -> str:
-        return CoreConfig.get_config_field(
-            self.__config, "core", "title", "ssl_key", default="cert/title.key"
-        )
-
-    @property
-    def ssl_cert(self) -> str:
-        return CoreConfig.get_config_field(
-            self.__config, "core", "title", "ssl_cert", default="cert/title.pem"
-        )
-
-    @property
-    def reboot_start_time(self) -> str:
-        return CoreConfig.get_config_field(
-            self.__config, "core", "title", "reboot_start_time", default=""
-        )
-
-    @property
-    def reboot_end_time(self) -> str:
-        return CoreConfig.get_config_field(
-            self.__config, "core", "title", "reboot_end_time", default=""
-        )
 
 
 class DatabaseConfig:
@@ -186,12 +150,6 @@ class DatabaseConfig:
             default=10000,
         )
 
-    @property
-    def enable_memcached(self) -> bool:
-        return CoreConfig.get_config_field(
-            self.__config, "core", "database", "enable_memcached", default=True
-        )
-
     @property
     def memcached_host(self) -> str:
         return CoreConfig.get_config_field(
@@ -314,18 +272,6 @@ class AimedbConfig:
             self.__config, "core", "aimedb", "key", default=""
         )
 
-    @property
-    def id_secret(self) -> str:
-        return CoreConfig.get_config_field(
-            self.__config, "core", "aimedb", "id_secret", default=""
-        )
-
-    @property
-    def id_lifetime_seconds(self) -> int:
-        return CoreConfig.get_config_field(
-            self.__config, "core", "aimedb", "id_lifetime_seconds", default=86400
-        )
-
 
 class MuchaConfig:
     def __init__(self, parent_config: "CoreConfig") -> None:

core/data/cache.py

@@ -17,7 +17,7 @@ except ModuleNotFoundError:
 
 def cached(lifetime: int = 10, extra_key: Any = None) -> Callable:
     def _cached(func: Callable) -> Callable:
-        if has_mc and (cfg and cfg.database.enable_memcached):
+        if has_mc:
             hostname = "127.0.0.1"
             if cfg:
                 hostname = cfg.database.memcached_host

core/data/schema/arcade.py

@@ -41,6 +41,7 @@ machine = Table(
     Column("country", String(3)),  # overwrites if not null
     Column("timezone", String(255)),
     Column("ota_enable", Boolean),
+    Column("is_cab", Boolean),
     Column("memo", String(255)),
     Column("is_cab", Boolean),
     Column("data", JSON),
@@ -217,16 +218,9 @@ class ArcadeData(BaseData):
         
         return True
 
-    def get_arcade_by_name(self, name: str) -> Optional[List[Row]]:
+    def find_arcade_by_name(self, name: str) -> List[Row]:
         sql = arcade.select(or_(arcade.c.name.like(f"%{name}%"), arcade.c.nickname.like(f"%{name}%")))
         result = self.execute(sql)
         if result is None:
-            return None
-        return result.fetchall()
-
-    def get_arcades_by_ip(self, ip: str) -> Optional[List[Row]]:
-        sql = arcade.select().where(arcade.c.ip == ip)
-        result = self.execute(sql)
-        if result is None:
-            return None
+            return False
         return result.fetchall()

core/data/schema/base.py

@@ -157,8 +157,6 @@ class BaseData:
 
     def fix_bools(self, data: Dict) -> Dict:
         for k, v in data.items():
-            if k == "userName" or k == "teamName":
-                continue
             if type(v) == str and v.lower() == "true":
                 data[k] = True
             elif type(v) == str and v.lower() == "false":

core/data/schema/card.py

@@ -64,27 +64,6 @@ class CardData(BaseData):
 
         return int(card["user"])
 
-    def get_card_banned(self, access_code: str) -> Optional[bool]:
-        """
-        Given a 20 digit access code as a string, check if the card is banned
-        """
-        card = self.get_card_by_access_code(access_code)
-        if card is None:
-            return None
-        if card["is_banned"]:
-            return True
-        return False
-    def get_card_locked(self, access_code: str) -> Optional[bool]:
-        """
-        Given a 20 digit access code as a string, check if the card is locked
-        """
-        card = self.get_card_by_access_code(access_code)
-        if card is None:
-            return None
-        if card["is_locked"]:
-            return True
-        return False
-
     def delete_card(self, card_id: int) -> None:
         sql = aime_card.delete(aime_card.c.id == card_id)
 

core/data/schema/versions/SBZV_5_rollback.sql

@@ -1,2 +0,0 @@
-ALTER TABLE diva_profile
-    DROP skn_eqp;

core/data/schema/versions/SBZV_6_upgrade.sql

@@ -1,2 +0,0 @@
-ALTER TABLE diva_profile
-    ADD skn_eqp INT NOT NULL DEFAULT 0;

core/data/schema/versions/SDBT_4_rollback.sql

@@ -1,12 +0,0 @@
-SET FOREIGN_KEY_CHECKS = 0;
-
-ALTER TABLE chuni_score_playlog
-  CHANGE COLUMN isClear isClear TINYINT(1) NULL DEFAULT NULL;
-
-ALTER TABLE chuni_score_best
-  CHANGE COLUMN isSuccess isSuccess TINYINT(1) NULL DEFAULT NULL ;
-
-ALTER TABLE chuni_score_playlog
-  DROP COLUMN ticketId;
-
-SET FOREIGN_KEY_CHECKS = 1;

core/data/schema/versions/SDBT_5_upgrade.sql

@@ -1,12 +0,0 @@
-SET FOREIGN_KEY_CHECKS = 0;
-
-ALTER TABLE chuni_score_playlog
-  CHANGE COLUMN isClear isClear TINYINT(6) NULL DEFAULT NULL;
-
-ALTER TABLE chuni_score_best
-  CHANGE COLUMN isSuccess isSuccess INT(11) NULL DEFAULT NULL ;
-
-ALTER TABLE chuni_score_playlog
-  ADD COLUMN ticketId INT(11) NULL AFTER machineType;
-
-SET FOREIGN_KEY_CHECKS = 1;

core/data/schema/versions/SDDT_5_rollback.sql

@@ -1,22 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-
-ALTER TABLE ongeki_user_event_point DROP COLUMN version;
-ALTER TABLE ongeki_user_event_point DROP COLUMN rank;
-ALTER TABLE ongeki_user_event_point DROP COLUMN type;
-ALTER TABLE ongeki_user_event_point DROP COLUMN date;
-
-ALTER TABLE ongeki_user_tech_event DROP COLUMN version;
-
-ALTER TABLE ongeki_user_mission_point DROP COLUMN version;
-
-ALTER TABLE ongeki_static_events DROP COLUMN endDate;
-
-DROP TABLE ongeki_tech_event_ranking;
-DROP TABLE ongeki_static_music_ranking_list;
-DROP TABLE ongeki_static_rewards;
-DROP TABLE ongeki_static_present_list;
-DROP TABLE ongeki_static_tech_music;
-DROP TABLE ongeki_static_client_testmode;
-DROP TABLE ongeki_static_game_point;
-
-SET FOREIGN_KEY_CHECKS=1;

core/data/schema/versions/SDDT_6_upgrade.sql

@@ -1,98 +0,0 @@
-SET FOREIGN_KEY_CHECKS=0;
-
-ALTER TABLE ongeki_user_event_point ADD COLUMN version INTEGER NOT NULL;
-ALTER TABLE ongeki_user_event_point ADD COLUMN rank INTEGER;
-ALTER TABLE ongeki_user_event_point ADD COLUMN type INTEGER NOT NULL;
-ALTER TABLE ongeki_user_event_point ADD COLUMN date VARCHAR(25);
-
-ALTER TABLE ongeki_user_tech_event ADD COLUMN version INTEGER NOT NULL;
-
-ALTER TABLE ongeki_user_mission_point ADD COLUMN version INTEGER NOT NULL;
-
-ALTER TABLE ongeki_static_events ADD COLUMN endDate TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
-
-CREATE TABLE ongeki_tech_event_ranking (
-	id INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
-	user INT NOT NULL,
-	version INT NOT NULL,
-	date VARCHAR(25),
-	eventId INT NOT NULL,
-	rank INT,
-	totalPlatinumScore INT NOT NULL,
-	totalTechScore INT NOT NULL,
-	UNIQUE KEY ongeki_tech_event_ranking_uk (user, eventId),
-	CONSTRAINT ongeki_tech_event_ranking_ibfk1 FOREIGN KEY (user) REFERENCES aime_user(id) ON DELETE CASCADE ON UPDATE CASCADE
-);
-
-CREATE TABLE ongeki_static_music_ranking_list (
-	id INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
-	version INT NOT NULL,
-	musicId INT NOT NULL,
-	point INT NOT NULL,
-	userName VARCHAR(255),
-	UNIQUE KEY ongeki_static_music_ranking_list_uk (version, musicId)
-);
-
-CREATE TABLE ongeki_static_rewards (
-	id INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
-	version INT NOT NULL,
-	rewardId INT NOT NULL,
-	rewardName VARCHAR(255) NOT NULL,
-	itemKind INT NOT NULL,
-	itemId INT NOT NULL,
-	UNIQUE KEY ongeki_tech_event_ranking_uk (version, rewardId)
-);
-
-CREATE TABLE ongeki_static_present_list (
-	id INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
-	version INT NOT NULL,
-	presentId INT NOT NULL,
-	presentName VARCHAR(255) NOT NULL,
-	rewardId INT NOT NULL,
-	stock INT NOT NULL,
-	message VARCHAR(255),
-	startDate VARCHAR(25) NOT NULL,
-	endDate VARCHAR(25) NOT NULL,
-	UNIQUE KEY ongeki_static_present_list_uk (version, presentId, rewardId)
-);
-
-CREATE TABLE ongeki_static_tech_music (
-	id INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
-	version INT NOT NULL,
-	eventId INT NOT NULL,
-	musicId INT NOT NULL,
-	level INT NOT NULL,
-	UNIQUE KEY ongeki_static_tech_music_uk (version, musicId, eventId)
-);
-
-CREATE TABLE ongeki_static_client_testmode (
-	id INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
-	regionId INT NOT NULL,
-	placeId INT NOT NULL,
-	clientId VARCHAR(11) NOT NULL,
-	updateDate TIMESTAMP NOT NULL,
-	isDelivery BOOLEAN NOT NULL,
-	groupId INT NOT NULL,
-	groupRole INT NOT NULL,
-	continueMode INT NOT NULL,
-	selectMusicTime INT NOT NULL,
-	advertiseVolume INT NOT NULL,
-	eventMode INT NOT NULL,
-	eventMusicNum INT NOT NULL,
-	patternGp INT NOT NULL,
-	limitGp INT NOT NULL,
-	maxLeverMovable INT NOT NULL,
-	minLeverMovable INT NOT NULL,
-	UNIQUE KEY ongeki_static_client_testmode_uk (clientId)
-);
-
-CREATE TABLE ongeki_static_game_point (
-	id INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
-	type INT NOT NULL,
-	cost INT NOT NULL,
-	startDate VARCHAR(25) NOT NULL DEFAULT "2000-01-01 05:00:00.0",
-	endDate VARCHAR(25) NOT NULL DEFAULT "2099-01-01 05:00:00.0",
-	UNIQUE KEY ongeki_static_game_point_uk (type)
-);
-
-SET FOREIGN_KEY_CHECKS=1;

core/data/schema/versions/SDEZ_7_rollback.sql

@@ -1,10 +0,0 @@
-ALTER TABLE mai2_profile_detail
-    DROP COLUMN mapStock;
-
-ALTER TABLE mai2_profile_extend
-    DROP COLUMN selectResultScoreViewType;
-
-ALTER TABLE mai2_profile_option
-    DROP COLUMN outFrameType,
-    DROP COLUMN touchVolume,
-    DROP COLUMN breakSlideVolume;

core/data/schema/versions/SDEZ_8_upgrade.sql

@@ -1,10 +0,0 @@
-ALTER TABLE mai2_profile_detail
-    ADD mapStock INT NULL AFTER playCount;
-
-ALTER TABLE mai2_profile_extend
-    ADD selectResultScoreViewType INT NULL AFTER selectResultDetails;
-
-ALTER TABLE mai2_profile_option
-    ADD outFrameType INT NULL AFTER dispCenter,
-    ADD touchVolume INT NULL AFTER slideVolume,
-    ADD breakSlideVolume INT NULL AFTER slideVolume;

core/frontend.py

@@ -18,26 +18,28 @@ from core.data import Data
 
 
 class IUserSession(Interface):
-    userId = Attribute("User's ID")
+    user_id = Attribute("User's ID")
+    username = Attribute("User's username")
     current_ip = Attribute("User's current ip address")
     permissions = Attribute("User's permission level")
-    ongeki_version = Attribute("User's selected Ongeki Version")
+
 
 class PermissionOffset(Enum):
-    USER = 0 # Regular user
-    USERMOD = 1 # Can moderate other users
-    ACMOD = 2 # Can add arcades and cabs
-    SYSADMIN = 3 # Can change settings
+    USER = 0  # Regular user
+    USERMOD = 1  # Can moderate other users
+    ACMOD = 2  # Can add arcades and cabs
+    SYSADMIN = 3  # Can change settings
     # 4 - 6 reserved for future use
-    OWNER = 7 # Can do anything
+    OWNER = 7  # Can do anything
+
 
 @implementer(IUserSession)
 class UserSession(object):
     def __init__(self, session):
-        self.userId = 0
+        self.user_id = 0
+        self.username = None
         self.current_ip = "0.0.0.0"
         self.permissions = 0
-        self.ongeki_version = 7
 
 
 class FrontendServlet(resource.Resource):
@@ -108,6 +110,7 @@ class FrontendServlet(resource.Resource):
             server_name=self.config.server.name,
             title=self.config.server.name,
             game_list=self.game_list,
+            active_page="/",
             sesh=vars(IUserSession(request.getSession())),
         ).encode("utf-16")
 
@@ -136,7 +139,7 @@ class FE_Gate(FE_Base):
 
         sesh = request.getSession()
         usr_sesh = IUserSession(sesh)
-        if usr_sesh.userId > 0:
+        if usr_sesh.user_id > 0:
             return redirectTo(b"/user", request)
 
         if uri.startswith("/gate/create"):
@@ -155,6 +158,7 @@ class FE_Gate(FE_Base):
         return template.render(
             title=f"{self.core_config.server.name} | Login Gate",
             error=err,
+            active_page="gate",
             sesh=vars(usr_sesh),
         ).encode("utf-16")
 
@@ -163,7 +167,7 @@ class FE_Gate(FE_Base):
         ip = Utils.get_ip_addr(request)
 
         if uri == "/gate/gate.login":
-            access_code: str = request.args[b"access_code"][0].decode()
+            access_code: str = request.args[b"access-code"][0].decode()
             passwd: bytes = request.args[b"passwd"][0]
             if passwd == b"":
                 passwd = None
@@ -189,9 +193,10 @@ class FE_Gate(FE_Base):
 
             sesh = request.getSession()
             usr_sesh = IUserSession(sesh)
-            usr_sesh.userId = uid
+            usr_sesh.user_id = uid
+            usr_sesh.username = user["username"]
             usr_sesh.current_ip = ip
-            usr_sesh.permissions = user['permissions']
+            usr_sesh.permissions = user["permissions"]
 
             return redirectTo(b"/user", request)
 
@@ -230,20 +235,23 @@ class FE_Gate(FE_Base):
         card = self.data.card.get_card_by_access_code(ac)
         if card is None:
             return redirectTo(b"/gate?e=1", request)
-        
-        user = self.data.user.get_user(card['user'])
+
+        user = self.data.user.get_user(card["user"])
         if user is None:
-            self.logger.warning(f"Card {ac} exists with no/invalid associated user ID {card['user']}")
+            self.logger.warning(
+                f"Card {ac} exists with no/invalid associated user ID {card['user']}"
+            )
             return redirectTo(b"/gate?e=0", request)
 
-        if user['password'] is not None:
+        if user["password"] is not None:
             return redirectTo(b"/gate?e=1", request)
 
         template = self.environment.get_template("core/frontend/gate/create.jinja")
         return template.render(
             title=f"{self.core_config.server.name} | Create User",
             code=ac,
-            sesh={"userId": 0, "permissions": 0},
+            active_page="gate",
+            sesh={"user_id": 0, "permissions": 0},
         ).encode("utf-16")
 
 
@@ -254,48 +262,51 @@ class FE_User(FE_Base):
 
         sesh: Session = request.getSession()
         usr_sesh = IUserSession(sesh)
-        if usr_sesh.userId == 0:
+        if usr_sesh.user_id == 0:
             return redirectTo(b"/gate", request)
-        
+
         m = re.match("\/user\/(\d*)", uri)
-        
-        if m is not None:            
+
+        if m is not None:
             usrid = m.group(1)
-            if usr_sesh.permissions < 1 << PermissionOffset.USERMOD.value or not usrid == usr_sesh.userId:
+            if (
+                usr_sesh.permissions < 1 << PermissionOffset.USERMOD.value
+                or not usrid == usr_sesh.user_id
+            ):
                 return redirectTo(b"/user", request)
-        
+
         else:
-            usrid = usr_sesh.userId
-        
+            usrid = usr_sesh.user_id
+
         user = self.data.user.get_user(usrid)
         if user is None:
             return redirectTo(b"/user", request)
-        
+
         cards = self.data.card.get_user_cards(usrid)
         arcades = self.data.arcade.get_arcades_managed_by_user(usrid)
-        
+
         card_data = []
         arcade_data = []
 
-        for c in cards:
-            if c['is_locked']:
-                status = 'Locked'
-            elif c['is_banned']:
-                status = 'Banned'
+        for i, c in enumerate(cards):
+            if c["is_locked"]:
+                status = "Locked"
+            elif c["is_banned"]:
+                status = "Banned"
             else:
-                status = 'Active'
-            
-            card_data.append({'access_code': c['access_code'], 'status': status})
-        
-        for a in arcades:
-            arcade_data.append({'id': a['id'], 'name': a['name']})
+                status = "Active"
+
+            card_data.append({"index": i+1, "access_code": c["access_code"], "status": status})
+
+        for i, a in enumerate(arcades):
+            arcade_data.append({"index": i+1, "id": a["id"], "name": a["name"]})
 
         return template.render(
-            title=f"{self.core_config.server.name} | Account", 
-            sesh=vars(usr_sesh), 
-            cards=card_data, 
-            username=user['username'],
-            arcades=arcade_data
+            title=f"{self.core_config.server.name} | Account",
+            sesh=vars(usr_sesh),
+            cards=card_data,
+            arcades=arcade_data,
+            active_page="user",
         ).encode("utf-16")
 
     def render_POST(self, request: Request):
@@ -306,17 +317,22 @@ class FE_System(FE_Base):
     def render_GET(self, request: Request):
         uri = request.uri.decode()
         template = self.environment.get_template("core/frontend/sys/index.jinja")
-        usrlist: List[Dict] = []
-        aclist: List[Dict] = []
-        cablist: List[Dict] = []
+        usrlist = []
+        aclist = []
+        cablist = []
 
         sesh: Session = request.getSession()
         usr_sesh = IUserSession(sesh)
-        if usr_sesh.userId == 0 or usr_sesh.permissions < 1 << PermissionOffset.USERMOD.value:
+        if (
+            usr_sesh.user_id == 0
+            or usr_sesh.permissions < 1 << PermissionOffset.USERMOD.value
+        ):
             return redirectTo(b"/gate", request)
-        
+
         if uri.startswith("/sys/lookup.user?"):
-            uri_parse = parse.parse_qs(uri.replace("/sys/lookup.user?", "")) # lop off the first bit
+            uri_parse = parse.parse_qs(
+                uri.replace("/sys/lookup.user?", "")
+            )  # lop off the first bit
             uid_search = uri_parse.get("usrId")
             email_search = uri_parse.get("usrEmail")
             uname_search = uri_parse.get("usrName")
@@ -337,11 +353,12 @@ class FE_System(FE_Base):
                     usrlist.append(u._asdict())
 
         elif uri.startswith("/sys/lookup.arcade?"):
-            uri_parse = parse.parse_qs(uri.replace("/sys/lookup.arcade?", "")) # lop off the first bit
+            uri_parse = parse.parse_qs(
+                uri.replace("/sys/lookup.arcade?", "")
+            )  # lop off the first bit
             ac_id_search = uri_parse.get("arcadeId")
             ac_name_search = uri_parse.get("arcadeName")
             ac_user_search = uri_parse.get("arcadeUser")
-            ac_ip_search = uri_parse.get("arcadeIp")
 
             if ac_id_search is not None:
                 u = self.data.arcade.get_arcade(ac_id_search[0])
@@ -349,25 +366,19 @@ class FE_System(FE_Base):
                     aclist.append(u._asdict())
 
             elif ac_name_search is not None:
-                ul = self.data.arcade.get_arcade_by_name(ac_name_search[0])
-                if ul is not None:
-                    for u in ul:
-                        aclist.append(u._asdict())
+                ul = self.data.arcade.find_arcade_by_name(ac_name_search[0])
+                for u in ul:
+                    aclist.append(u._asdict())
 
             elif ac_user_search is not None:
                 ul = self.data.arcade.get_arcades_managed_by_user(ac_user_search[0])
-                if ul is not None:
-                    for u in ul:
-                        aclist.append(u._asdict())
+                for u in ul:
+                    aclist.append(u._asdict())
 
-            elif ac_ip_search is not None:
-                ul = self.data.arcade.get_arcades_by_ip(ac_ip_search[0])
-                if ul is not None:
-                    for u in ul:
-                        aclist.append(u._asdict())
-        
         elif uri.startswith("/sys/lookup.cab?"):
-            uri_parse = parse.parse_qs(uri.replace("/sys/lookup.cab?", "")) # lop off the first bit
+            uri_parse = parse.parse_qs(
+                uri.replace("/sys/lookup.cab?", "")
+            )  # lop off the first bit
             cab_id_search = uri_parse.get("cabId")
             cab_serial_search = uri_parse.get("cabSerial")
             cab_acid_search = uri_parse.get("cabAcId")
@@ -388,11 +399,12 @@ class FE_System(FE_Base):
                     cablist.append(u._asdict())
 
         return template.render(
-            title=f"{self.core_config.server.name} | System", 
-            sesh=vars(usr_sesh), 
+            title=f"{self.core_config.server.name} | System",
+            sesh=vars(usr_sesh),
             usrlist=usrlist,
             aclist=aclist,
             cablist=cablist,
+            active_page="sys",
         ).encode("utf-16")
 
 
@@ -414,31 +426,32 @@ class FE_Arcade(FE_Base):
         uri = request.uri.decode()
         template = self.environment.get_template("core/frontend/arcade/index.jinja")
         managed = []
-        
+
         sesh: Session = request.getSession()
         usr_sesh = IUserSession(sesh)
-        if usr_sesh.userId == 0:
+        if usr_sesh.user_id == 0:
             return redirectTo(b"/gate", request)
-        
+
         m = re.match("\/arcade\/(\d*)", uri)
-        
+
         if m is not None:
             arcadeid = m.group(1)
-            perms = self.data.arcade.get_manager_permissions(usr_sesh.userId, arcadeid)
+            perms = self.data.arcade.get_manager_permissions(usr_sesh.user_id, arcadeid)
             arcade = self.data.arcade.get_arcade(arcadeid)
 
             if perms is None:
                 perms = 0
-        
+
         else:
             return redirectTo(b"/user", request)
-        
+
         return template.render(
-            title=f"{self.core_config.server.name} | Arcade", 
+            title=f"{self.core_config.server.name} | Arcade",
             sesh=vars(usr_sesh),
             error=0,
             perms=perms,
-            arcade=arcade._asdict()
+            arcade=arcade._asdict(),
+            active_page="arcade",
         ).encode("utf-16")
 
 
@@ -446,15 +459,16 @@ class FE_Machine(FE_Base):
     def render_GET(self, request: Request):
         uri = request.uri.decode()
         template = self.environment.get_template("core/frontend/machine/index.jinja")
-        
+
         sesh: Session = request.getSession()
         usr_sesh = IUserSession(sesh)
-        if usr_sesh.userId == 0:
+        if usr_sesh.user_id == 0:
             return redirectTo(b"/gate", request)
-        
+
         return template.render(
-            title=f"{self.core_config.server.name} | Machine", 
-            sesh=vars(usr_sesh), 
+            title=f"{self.core_config.server.name} | Machine",
+            sesh=vars(usr_sesh),
             arcade={},
             error=0,
-        ).encode("utf-16")
+            active_page="machine",
+        ).encode("utf-16")

core/frontend/gate/create.jinja

@@ -1,24 +1,44 @@
 {% extends "core/frontend/index.jinja" %}
 {% block content %}
-<h1>Create User</h1>
-<form id="create" style="max-width: 240px; min-width: 10%;" action="/gate/gate.create" method="post">
-    <div class="form-group row">
-        <label for="access_code">Card Access Code</label><br>
-        <input class="form-control" name="access_code" id="access_code" type="text" placeholder="00000000000000000000" value={{ code }} maxlength="20" readonly>
+<div class="row justify-content-md-center form-signin">
+    <div class="col col-lg-4">
+        <form id="create" action="/gate/gate.create" method="post">
+            <h1 class="h3 mb-3 fw-normal">Sign-up</h1>
+
+            <div class="form-floating mb-3">
+                <input class="form-control" name="access-code" id="access-code" type="text"
+                    placeholder="00000000000000000000" value={{ code }} maxlength="20" required>
+                <label for="access-code">Access Code*</label>
+            </div>
+            <div class="form-floating mb-3">
+                <input type="text" class="form-control" name="username" id="username" placeholder="username">
+                <label for="username">Username*</label>
+            </div>
+            <div class="form-floating mb-3">
+                <input type="email" class="form-control" name="email" id="email" placeholder="example@example.com">
+                <label for="email">E-Mail*</label>
+            </div>
+            <div class="form-floating mb-3">
+                <input type="password" class="form-control" name="passwd" id="passwd" placeholder="Password">
+                <label for="passwd">Password*</label>
+            </div>
+            
+            <!--
+            <div class="form-check text-start my-3">
+                <input class="form-check-input" type="checkbox" value="remember-me" id="remember-me">
+                <label class="form-check-label" for="remember-me">
+                    Remember me
+                </label>
+            </div>
+            -->
+
+            <div class="alert alert-warning" role="alert">
+                If you have not registered a card with this server, you cannot create a WebUI account!
+            </div>
+
+            <button class="btn btn-primary w-100 py-2" type="submit">Sign-up</button>
+            <!-- <p class="mt-5 mb-3 text-body-secondary">© 2023 ARTEMiS</p>-->
+        </form>
     </div>
-    <div class="form-group row">
-        <label for="username">Username</label><br>
-        <input id="username" class="form-control" name="username" type="text" placeholder="username">
-    </div>
-    <div class="form-group row">
-        <label for="email">Email</label><br>
-        <input id="email" class="form-control" name="email" type="email" placeholder="example@example.com">
-    </div>
-    <div class="form-group row">
-        <label for="passwd">Password</label><br>
-        <input id="passwd" class="form-control" name="passwd" type="password" placeholder="password">
-    </div>
-    <p></p>
-    <input id="submit" class="btn btn-primary" style="display: block; margin: 0 auto;" type="submit" value="Create">
-</form>
+</div>
 {% endblock content %}

core/frontend/gate/gate.jinja

@@ -1,32 +1,52 @@
 {% extends "core/frontend/index.jinja" %}
 {% block content %}
-<h1>Gate</h1>
-{% include "core/frontend/widgets/err_banner.jinja" %}
 <style>
-    /* Chrome, Safari, Edge, Opera */
-    input::-webkit-outer-spin-button,
-    input::-webkit-inner-spin-button {
-        -webkit-appearance: none;
-        margin: 0;
+    .form-signin input[type="text"] {
+        margin-bottom: -1px;
+        border-bottom-right-radius: 0;
+        border-bottom-left-radius: 0;
     }
 
-    /* Firefox */
-    input[type=number] {
-        -moz-appearance: textfield;
+    .form-signin input[type="password"] {
+        margin-bottom: 10px;
+        border-top-left-radius: 0;
+        border-top-right-radius: 0;
     }
 </style>
-<form id="login" style="max-width: 240px; min-width: 10%;" action="/gate/gate.login" method="post">
-    <div class="form-group row">
-        <label for="access_code">Card Access Code</label><br>
-        <input form="login" class="form-control" name="access_code" id="access_code" type="number" placeholder="00000000000000000000" maxlength="20" required>
+<div class="row justify-content-md-center form-signin">
+    <div class="col col-lg-4">
+        <form id="login" action="/gate/gate.login" method="post">
+            <h1 class="h3 mb-3 fw-normal">Login</h1>
+
+            {% include "core/frontend/widgets/err_banner.jinja" %}
+
+            <div class="form-floating">
+                <input form="login" class="form-control" name="access-code" id="access-code" type="text"
+                    placeholder="00000000000000000000" maxlength="20" required>
+                <label for="access-code">Access Code</label>
+            </div>
+            <div class="form-floating">
+                <input form="login" type="password" class="form-control" name="passwd" id="passwd" placeholder="Password">
+                <label for="passwd">Password</label>
+            </div>
+            
+            <!--
+            <div class="form-check text-start my-3">
+                <input class="form-check-input" type="checkbox" value="remember-me" id="remember-me">
+                <label class="form-check-label" for="remember-me">
+                    Remember me
+                </label>
+            </div>
+            -->
+
+            <div class="alert alert-info" role="alert">
+                To register for the WebUI, type in the <strong>access code</strong> of your card, as shown in a game, and leave the
+                password field blank.
+            </div>
+
+            <button class="btn btn-primary w-100 py-2" type="submit">Sign in</button>
+            <!-- <p class="mt-5 mb-3 text-body-secondary">© 2023 ARTEMiS</p>-->
+        </form>
     </div>
-    <div class="form-group row">
-        <label for="passwd">Password</label><br>
-        <input id="passwd" class="form-control" name="passwd" type="password" placeholder="password">
-    </div>
-    <p></p>
-    <input id="submit" class="btn btn-primary" style="display: block; margin: 0 auto;" form="login" type="submit" value="Login">
-</form>
-<h6>*To register for the webui, type in the access code of your card, as shown in a game, and leave the password field blank.</h6>
-<h6>*If you have not registered a card with this server, you cannot create a webui account.</h6>
+</div>
 {% endblock content %}

core/frontend/index.jinja

@@ -1,92 +1,25 @@
 <!DOCTYPE html>
-<html>
-    <head>
-        <title>{{ title }}</title>
-        <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
-        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4" crossorigin="anonymous"></script>
-        <script src="https://cdn.jsdelivr.net/npm/jquery@3.2.1/dist/jquery.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
-        <style>
-            html {
-                background-color: #181a1b !important;
-                margin: 10px;
-            }
-            html {
-                color-scheme: dark !important;
-            }
-            html, body, input, textarea, select, button, dialog {
-                background-color: #181a1b;
-            }
-            html, body, input, textarea, select, button {
-                border-color: #736b5e;
-                color: #e8e6e3;
-            }
-            a {
-                color: #3391ff;
-            }
-            table {
-                border-color: #545b5e;
-            }
-            ::placeholder {
-                color: #b2aba1;
-            }
-            input:-webkit-autofill,
-            textarea:-webkit-autofill,
-            select:-webkit-autofill {
-                background-color: #404400 !important;
-                color: #e8e6e3 !important;
-            }
-            ::-webkit-scrollbar {
-                background-color: #202324;
-                color: #aba499;
-            }
-            ::-webkit-scrollbar-thumb {
-                background-color: #454a4d;
-            }
-            ::-webkit-scrollbar-thumb:hover {
-                background-color: #575e62;
-            }
-            ::-webkit-scrollbar-thumb:active {
-                background-color: #484e51;
-            }
-            ::-webkit-scrollbar-corner {
-                background-color: #181a1b;
-            }
-            * {
-                scrollbar-color: #454a4d #202324;
-            }
-            ::selection {
-                background-color: #004daa !important;
-                color: #e8e6e3 !important;
-            }
-            ::-moz-selection {
-                background-color: #004daa !important;
-                color: #e8e6e3 !important;
-            }
-            input[type="text"], input[type="text"]:focus, input[type="password"], input[type="password"]:focus, input[type="email"], input[type="email"]:focus {
-                background-color: #202324 !important;
-                color: #e8e6e3;
-            }
-            form {
-                outline: 1px solid grey; 
-                padding: 20px;
-                padding-top: 10px;
-                padding-bottom: 10px;
-            }
-            .err-banner {
-                background-color: #AA0000;
-                padding: 20px;
-                margin-bottom: 10px;
-                width: 15%;
-            }
-            .modal-content {
-                background-color: #181a1b;
-            }
-        </style>
-    </head>
-    <body>
+<html lang="en" data-bs-theme="dark">
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>{{ title }}</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css" rel="stylesheet"
+        integrity="sha384-4bw+/aepP/YC94hEpVNVgiZdgIC5+VKNBQNGCHeKRQN+PtmoHDEXuppvnDJzQIu9" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.5/font/bootstrap-icons.css">
+</head>
+
+<body>
     {% include "core/frontend/widgets/topbar.jinja" %}
-    {% block content %}
-    <h1>{{ server_name }}</h1>
-    {% endblock content %}
-    </body>
+    <div class="container">
+        {% block content %}
+        <h1>{{ server_name }}</h1>
+        {% endblock content %}
+    </div>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js"
+        integrity="sha384-HwwvtgBNo3bZJJLYd8oVXjrBZt8cqVSpeBNS5n7C8IVInixGAoxmnlMuBnhbgrkm"
+        crossorigin="anonymous"></script>
+</body>
+
 </html>

core/frontend/sys/index.jinja

@@ -8,8 +8,8 @@
         <form id="usrLookup" name="usrLookup" action="/sys/lookup.user" class="form-inline">
             <h3>User Search</h3>
             <div class="form-group">
-                <label for="usrId">User ID</label>
-                <input type="number" class="form-control" id="usrId" name="usrId">
+                <label for="usrEmail">Email address</label>
+                <input type="email" class="form-control" id="usrEmail" name="usrEmail" aria-describedby="emailHelp">
             </div>
             OR
             <div class="form-group">
@@ -18,8 +18,8 @@
             </div>
             OR
             <div class="form-group">
-                <label for="usrEmail">Email address</label>
-                <input type="email" class="form-control" id="usrEmail" name="usrEmail" aria-describedby="emailHelp">
+                <label for="usrId">User ID</label>
+                <input type="number" class="form-control" id="usrId" name="usrId">
             </div>
             <br />
             <button type="submit" class="btn btn-primary">Search</button>
@@ -30,24 +30,19 @@
     <div class="col-sm-6" style="max-width: 25%;">
         <form id="arcadeLookup" name="arcadeLookup" action="/sys/lookup.arcade" class="form-inline" >
             <h3>Arcade Search</h3>
-            <div class="form-group">
-                <label for="arcadeId">Arcade ID</label>
-                <input type="number" class="form-control" id="arcadeId" name="arcadeId">
-            </div>
-            OR
             <div class="form-group">
                 <label for="arcadeName">Arcade Name</label>
                 <input type="text" class="form-control" id="arcadeName" name="arcadeName">
             </div>
             OR
             <div class="form-group">
-                <label for="arcadeUser">Owner User ID</label>
-                <input type="number" class="form-control" id="arcadeUser" name="arcadeUser">
+                <label for="arcadeId">Arcade ID</label>
+                <input type="number" class="form-control" id="arcadeId" name="arcadeId">
             </div>
             OR
             <div class="form-group">
-                <label for="arcadeIp">Assigned IP Address</label>
-                <input type="text" class="form-control" id="arcadeIp" name="arcadeIp">
+                <label for="arcadeUser">Owner User ID</label>
+                <input type="number" class="form-control" id="arcadeUser" name="arcadeUser">
             </div>
             <br />
             <button type="submit" class="btn btn-primary">Search</button>
@@ -57,13 +52,13 @@
         <form id="cabLookup" name="cabLookup" action="/sys/lookup.cab" class="form-inline" >
             <h3>Machine Search</h3>
             <div class="form-group">
-                <label for="cabId">Machine ID</label>
-                <input type="number" class="form-control" id="cabId" name="cabId">
+                <label for="cabSerial">Machine Serial</label>
+                <input type="text" class="form-control" id="cabSerial" name="cabSerial">
             </div>
             OR
             <div class="form-group">
-                <label for="cabSerial">Machine Serial</label>
-                <input type="text" class="form-control" id="cabSerial" name="cabSerial">
+                <label for="cabId">Machine ID</label>
+                <input type="number" class="form-control" id="cabId" name="cabId">
             </div>
             OR
             <div class="form-group">
@@ -80,19 +75,19 @@
     {% if sesh.permissions >= 2 %}
     <div id="userSearchResult" class="col-sm-6" style="max-width: 25%;">
         {% for usr in usrlist %}
-        <a href=/user/{{ usr.id }}><pre>{{ usr.id }} | {{ usr.username if usr.username != None else "<i>No Name Set</i>"}}</pre></a>
+        <pre><a href=/user/{{ usr.id }}>{{ usr.id }} | {{ usr.username }}</a></pre>
         {% endfor %}
     </div>
     {% endif %}
     {% if sesh.permissions >= 4 %}
     <div id="arcadeSearchResult" class="col-sm-6" style="max-width: 25%;">
         {% for ac in aclist %}
-        <pre><a href=/arcade/{{ ac.id }}>{{ ac.id }} | {{ ac.name if ac.name != None else "<i>No Name Set</i>" }} | {{ ac.ip if ac.ip != None else "<i>No IP Assigned</i>"}}</pre></a>
+        <pre><a href=/arcade/{{ ac.id }}>{{ ac.id }} | {{ ac.name }}</a></pre>
         {% endfor %}
     </div
     ><div id="cabSearchResult" class="col-sm-6" style="max-width: 25%;">
         {% for cab in cablist %}
-        <a href=/cab/{{ cab.id }}><pre>{{ cab.id }} | {{ cab.game if cab.game != None else "<i>ANY </i>" }} | {{ cab.serial }}</pre></a>
+        <a href=/cab/{{ cab.id }}><pre>{{ cab.id }} | {{ cab.game if cab.game is defined else "ANY "  }} | {{ cab.serial }}</pre></a>
         {% endfor %}
     </div>
     {% endif %}

core/frontend/user/index.jinja

@@ -1,41 +1,126 @@
 {% extends "core/frontend/index.jinja" %}
 {% block content %}
-<h1>Management for {{ username }}</h1>
-<h2>Cards <button class="btn btn-success" data-bs-toggle="modal" data-bs-target="#card_add">Add</button></h2>
-<ul style="font-size: 20px;">
-{% for c in cards %}
-<li>{{ c.access_code }}: {{ c.status }}&nbsp;{% if c.status == 'Active'%}<button class="btn-warning btn">Lock</button>{% elif c.status == 'Locked' %}<button class="btn-warning btn">Unlock</button>{% endif %}&nbsp;<button class="btn-danger btn">Delete</button></li>
-{% endfor %}
-</ul>
+<h1>{{ sesh["username"] }}'s Account</h1>
 
-{% if arcades is defined %}
-<h2>Arcades</h2>
-  <ul style="font-size: 20px;">
-  {% for a in arcades %}
-    <li><a href=/arcade/{{ a.id }}>{{ a.name }}</a></li>
-  {% endfor %}
-  </ul>
-{% endif %}
-
-<div class="modal fade" id="card_add" tabindex="-1" aria-labelledby="card_add_label" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h1 class="modal-title fs-5" id="card_add_label">Add Card</h1>
-        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-      </div>
-      <div class="modal-body">
-        HOW TO:<br>
-        Scan your card on any networked game and press the "View Access Code" button (varies by game) and enter the 20 digit code below.<br>
-        !!FOR AMUSEIC CARDS: DO NOT ENTER THE CODE SHOWN ON THE BACK OF THE CARD ITSELF OR IT WILL NOT WORK!!
-        <p /><label for="card_add_frm_access_code">Access Code:&nbsp;</label><input id="card_add_frm_access_code" maxlength="20" type="text" required> 
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-primary">Add</button>
-        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-      </div>
+<div class="card mb-3">
+    <div class="card-body">
+        <h3 class="card-title">Cards</h3>
+        <!--<h4 class="card-subtitle mb-2 text-body-secondary">Card subtitle</h4>-->
+        <p class="card-text">All aime cards are listed here for the given user.</p>
+        <a href="#" data-bs-toggle="modal" data-bs-target="#card-add" class="btn btn-primary mb-3">Add Card</a>
+        {% if cards is defined and cards|length > 0 %}
+        <div class="container">
+            <div class="row">
+                <div class="col-12">
+                    <table class="table table-hover">
+                        <thead>
+                            <tr>
+                                <th scope="col">#</th>
+                                <th scope="col">Access Code</th>
+                                <th scope="col">Status</th>
+                                <th scope="col">Actions</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {% for c in cards %}
+                            <tr class="align-middle">
+                                <th scope="row">{{ c.index }}</th>
+                                <td>{{ c.access_code }}</td>
+                                <td>
+                                    {% if c.status == 'Active'%}
+                                    <span class="badge rounded-pill text-bg-success">Active</span>
+                                    {% elif c.status == 'Locked' %}
+                                    <span class="badge rounded-pill text-bg-warning">Locked</span>
+                                    {% endif %}
+                                </td>
+                                <td>
+                                    {% if c.status == 'Active'%}
+                                    <button type="button" class="btn btn-warning btn-sm">Lock</i></button>
+                                    {% elif c.status == 'Locked' %}
+                                    <button type="button" class="btn btn-success btn-sm">Unlock</i></button>
+                                    {% endif %}
+                                    <button type="button" class="btn btn-danger btn-sm">Delete</i></button>
+                                </td>
+                            </tr>
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+        {% else %}
+        <div class="alert alert-warning" role="alert">
+            You have no cards registered to your account. Please add one.
+        </div>
+        {% endif %}
+        <!--<a href="#" data-bs-toggle="modal" data-bs-target="#card-add" class="card-link">Add Card</a>-->
+    </div>
+</div>
+
+<div class="card">
+    <div class="card-body">
+        <h3 class="card-title">Arcades</h3>
+        <!--<h4 class="card-subtitle mb-2 text-body-secondary">Card subtitle</h4>-->
+        <p class="card-text">All arcades connected to the given account are listed here.</p>
+        {% if arcades is defined and arcades|length > 0 %}
+        <div class="container">
+            <div class="row">
+                <div class="col-12">
+                    <table class="table table-hover">
+                        <thead>
+                            <tr>
+                                <th scope="col">#</th>
+                                <th scope="col">Name</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {% for a in arcades %}
+                            <tr class="align-middle clickable-row" data-href=/arcade/{{ a.id }}>
+                                <th scope="row">{{ a.index }}</th>
+                                <td>{{ a.name }}</td>
+                            </tr>
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+        {% else %}
+        <div class="alert alert-info" role="alert">
+            You have no arcades connected to your account.
+        </div>
+        {% endif %}
+    </div>
+</div>
+
+<div class="modal fade" id="card-add" tabindex="-1" aria-labelledby="card-add-label" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h1 class="modal-title fs-5" id="card-add-label">Add Card</h1>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
+            <div class="modal-body">
+                <h3 class="fs-5">How to:</h3>
+                Scan your card on any networked game and press the "View Access Code" button (varies by game) and enter
+                the 20
+                digit code below.
+                <hr>
+                FOR AMUSE IC CARDS: DO NOT ENTER THE CODE SHOWN ON THE BACK OF THE CARD ITSELF OR IT WILL NOT WORK!
+                <form>
+                    <div class="form-floating mt-3">
+                        <label for="access-code" class="col-form-label">Access Code</label>
+                        <input maxlength="20" type="text" required pattern="[0-9]{20}" class="form-control"
+                            id="access-code">
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-primary">Add</button>
+            </div>
+        </div>
     </div>
-  </div>
 </div>
 
 {% endblock content %}

core/frontend/widgets/err_banner.jinja

@@ -1,6 +1,5 @@
 {% if error > 0 %}
-<div class="err-banner">
-<h3>Error</h3>
+<div class="alert alert-danger" role="alert">
 {% if error == 1 %}
 Card not registered, or wrong password
 {% elif error == 2 %}

core/frontend/widgets/topbar.jinja

@@ -1,21 +1,56 @@
-<div style="background: #333; color: #f9f9f9; width: 10%; height: 50px; line-height: 50px; text-align: center; float: left;">
-    Navigation
-</div>
-<div style="background: #333; color: #f9f9f9; width: 80%; height: 50px; line-height: 50px; padding-left: 10px; float: left;">
-    <a href=/><button class="btn btn-primary">Home</button></a>&nbsp;
-    {% for game in game_list %}    
-    <a href=/game/{{ game.url }}><button class="btn btn-success">{{ game.name }}</button></a>&nbsp;
-    {% endfor %}
-</div>
-</div>
-<div style="background: #333; color: #f9f9f9; width: 10%; height: 50px; line-height: 50px; text-align: center; float: left;">
-    {% if sesh is defined and sesh["permissions"] >= 2 %}
-    <a href="/sys"><button class="btn btn-primary">System</button></a>
-    {% endif %}
-    {% if sesh is defined and sesh["userId"] > 0 %}
-    <a href="/user"><button class="btn btn-primary">Account</button></a>
-    {% else %}
-    <a href="/gate"><button class="btn btn-primary">Gate</button></a>
-    {% endif %}
-    
-</div>
+<nav class="p-3 mb-3 navbar navbar-expand-lg bg-body-tertiary" aria-label="Thirteenth navbar example">
+    <div class="container">
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarsExample11"
+            aria-controls="navbarsExample11" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+
+        <div class="collapse navbar-collapse d-lg-flex" id="navbarsExample11">
+            <a class="navbar-brand col-lg-3 me-0" href= />ARTEMiS</a>
+            <ul class="navbar-nav col-lg-6 justify-content-lg-center nav-pills">
+                <li class="nav-item">
+                    <a class="nav-link {% if active_page == '/' %}active{% endif %}" aria-current="page" href= />Home</a>
+                </li>
+                {% for game in game_list %}
+                <li class="nav-item">
+                    <a class="nav-link {% if active_page == game.url %}active{% endif %}" href=/game/{{ game.url }}>{{ game.name }}</a>
+                </li>
+                {% endfor %}
+                <!--
+                    <li class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle" href="#" data-bs-toggle="dropdown"
+                            aria-expanded="false">Dropdown</a>
+                        <ul class="dropdown-menu">
+                            <li><a class="dropdown-item" href="#">Action</a></li>
+                            <li><a class="dropdown-item" href="#">Another action</a></li>
+                            <li><a class="dropdown-item" href="#">Something else here</a></li>
+                        </ul>
+                    </li>
+                    -->
+            </ul>
+            <div class="d-lg-flex col-lg-3 justify-content-lg-end">
+                {% if sesh is defined and sesh["user_id"] > 0 %}
+                <div class="btn-group dropdown">
+                    <a href="#" class="d-block link-body-emphasis text-decoration-none dropdown-toggle"
+                        data-bs-toggle="dropdown" aria-expanded="false">
+                       {{ sesh["username"] }}
+                    </a>
+                    <ul class="dropdown-menu text-small">
+                        {% if sesh["permissions"] >= 2 %}
+                        <li><a class="dropdown-item {% if active_page == 'sys' %}active{% endif %}" href="/sys">System</a></li>
+                        {% endif %}
+                        <li><a class="dropdown-item" href="#">Settings</a></li>
+                        <li><a class="dropdown-item {% if active_page == 'user' %}active{% endif %}" href="/user">Account</a></li>
+                        <li>
+                            <hr class="dropdown-divider">
+                        </li>
+                        <li><a class="dropdown-item" href="#">Sign out</a></li>
+                    </ul>
+                </div>
+                {% else %}
+                <a href="/gate"><button class="btn {% if active_page == 'gate' %}btn-primary{% else %}btn-outline-primary{% endif %}">Login</button></a>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+</nav>

core/mucha.py

@@ -7,15 +7,15 @@ from datetime import datetime
 from Crypto.Cipher import Blowfish
 import pytz
 
-from .config import CoreConfig
-from .utils import Utils
-from .title import TitleServlet
+from core import CoreConfig
+from core.utils import Utils
+
 
 class MuchaServlet:
-    mucha_registry: List[str] = []
     def __init__(self, cfg: CoreConfig, cfg_dir: str) -> None:
         self.config = cfg
         self.config_dir = cfg_dir
+        self.mucha_registry: List[str] = []
 
         self.logger = logging.getLogger("mucha")
         log_fmt_str = "[%(asctime)s] Mucha | %(levelname)s | %(message)s"
@@ -37,9 +37,11 @@ class MuchaServlet:
         self.logger.setLevel(cfg.mucha.loglevel)
         coloredlogs.install(level=cfg.mucha.loglevel, logger=self.logger, fmt=log_fmt_str)
 
-        for _, mod in TitleServlet.title_registry.items():
-            if hasattr(mod, "get_mucha_info"):
-                enabled, game_cd = mod.get_mucha_info(
+        all_titles = Utils.get_all_titles()
+
+        for _, mod in all_titles.items():
+            if hasattr(mod, "index") and hasattr(mod.index, "get_mucha_info"):
+                enabled, game_cd = mod.index.get_mucha_info(
                     self.config, self.config_dir
                 )
                 if enabled:

core/title.py

@@ -1,4 +1,4 @@
-from typing import Dict, List, Tuple
+from typing import Dict, Any
 import logging, coloredlogs
 from logging.handlers import TimedRotatingFileHandler
 from twisted.web.http import Request
@@ -7,88 +7,14 @@ from core.config import CoreConfig
 from core.data import Data
 from core.utils import Utils
 
-class BaseServlet:
-    def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None:
-        self.core_cfg = core_cfg
-        self.game_cfg = None
-        self.logger = logging.getLogger("title")
-
-    @classmethod
-    def is_game_enabled(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> bool:
-        """Called during boot to check if a specific game code should load.
-
-        Args:
-            game_code (str): 4 character game code
-            core_cfg (CoreConfig): CoreConfig class
-            cfg_dir (str): Config directory
-
-        Returns:
-            bool: True if the game is enabled and set to run, False otherwise
-        
-        """
-        return False
-    
-    def get_endpoint_matchers(self) -> Tuple[List[Tuple[str, str, Dict]], List[Tuple[str, str, Dict]]]:
-        """Called during boot to get all matcher endpoints this title servlet handles
-
-        Returns:
-            Tuple[List[Tuple[str, str, Dict]], List[Tuple[str, str, Dict]]]: A 2-length tuple where offset 0 is GET and offset 1 is POST, 
-            containing a list of 3-length tuples where offset 0 is the name of the function in the handler that should be called, offset 1
-            is the matching string, and offset 2 is a dict containing rules for the matcher.
-        """
-        return (
-            [("render_GET", "/{game}/{version}/{endpoint}", {'game': R'S...'})], 
-            [("render_POST", "/{game}/{version}/{endpoint}", {'game': R'S...'})]
-        )
-    
-    def setup(self) -> None:
-        """Called once during boot, should contain any additional setup the handler must do, such as starting any sub-services
-        """
-        pass
-
-    def get_allnet_info(self, game_code: str, game_ver: int, keychip: str) -> Tuple[str, str]:
-        """Called any time a request to PowerOn is made to retrieve the url/host strings to be sent back to the game
-
-        Args:
-            game_code (str): 4 character game code
-            game_ver (int): version, expressed as an integer by multiplying by 100 (1.10 -> 110)
-            keychip (str): Keychip serial of the requesting machine, can be used to deliver specific URIs to different machines
-
-        Returns:
-            Tuple[str, str]: A tuple where offset 0 is the allnet uri field, and offset 1 is the allnet host field
-        """
-        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)}/{game_code}/{game_ver}/", "")
-
-        return (f"http://{self.core_cfg.title.hostname}/{game_code}/{game_ver}/", "")
-
-    def get_mucha_info(self, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str]:
-        """Called once during boot to check if this game is a mucha game
-
-        Args:
-            core_cfg (CoreConfig): CoreConfig class
-            cfg_dir (str): Config directory
-
-        Returns:
-            Tuple[bool, str]: Tuple where offset 0 is true if the game is enabled, false otherwise, and offset 1 is the game CD
-        """
-        return (False, "")
-
-    def render_POST(self, request: Request, game_code: str, matchers: Dict) -> bytes:
-        self.logger.warn(f"{game_code} Does not dispatch POST")
-        return None
-
-    def render_GET(self, request: Request, game_code: str, matchers: Dict) -> bytes:
-        self.logger.warn(f"{game_code} Does not dispatch GET")
-        return None
 
 class TitleServlet:
-    title_registry: Dict[str, BaseServlet] = {}
     def __init__(self, core_cfg: CoreConfig, cfg_folder: str):
         super().__init__()
         self.config = core_cfg
         self.config_folder = cfg_folder
         self.data = Data(core_cfg)
+        self.title_registry: Dict[str, Any] = {}
 
         self.logger = logging.getLogger("title")
         if not hasattr(self.logger, "initialized"):
@@ -117,62 +43,62 @@ class TitleServlet:
         plugins = Utils.get_all_titles()
 
         for folder, mod in plugins.items():
-            if hasattr(mod, "game_codes") and hasattr(mod, "index") and hasattr(mod.index, "is_game_enabled"):
+            if hasattr(mod, "game_codes") and hasattr(mod, "index"):
                 should_call_setup = True
-                game_servlet: BaseServlet = mod.index
-                game_codes: List[str] = mod.game_codes
-                
-                for code in game_codes:
-                    if game_servlet.is_game_enabled(code, self.config, self.config_folder):
-                        handler_cls = game_servlet(self.config, self.config_folder)
 
-                        if hasattr(handler_cls, "setup") and should_call_setup:
-                            handler_cls.setup()
-                            should_call_setup = False
+                if hasattr(mod.index, "get_allnet_info"):
+                    for code in mod.game_codes:
+                        enabled, _, _ = mod.index.get_allnet_info(
+                            code, self.config, self.config_folder
+                        )
 
-                        self.title_registry[code] = handler_cls
+                        if enabled:
+                            handler_cls = mod.index(self.config, self.config_folder)
+
+                            if hasattr(handler_cls, "setup") and should_call_setup:
+                                handler_cls.setup()
+                                should_call_setup = False
+
+                            self.title_registry[code] = handler_cls
+
+                else:
+                    self.logger.warning(f"Game {folder} has no get_allnet_info")
 
             else:
-                self.logger.error(f"{folder} missing game_code or index in __init__.py, or is_game_enabled in index")
+                self.logger.error(f"{folder} missing game_code or index in __init__.py")
 
         self.logger.info(
             f"Serving {len(self.title_registry)} game codes {'on port ' + str(core_cfg.title.port) if core_cfg.title.port > 0 else ''}"
         )
 
     def render_GET(self, request: Request, endpoints: dict) -> bytes:
-        code = endpoints["title"]
-        subaction = endpoints['subaction']
-        
+        code = endpoints["game"]
         if code not in self.title_registry:
             self.logger.warning(f"Unknown game code {code}")
             request.setResponseCode(404)
             return b""
 
         index = self.title_registry[code]
-        handler = getattr(index, f"{subaction}", None)
-        if handler is None:
-            self.logger.error(f"{code} does not have handler for GET subaction {subaction}")
-            request.setResponseCode(500)
+        if not hasattr(index, "render_GET"):
+            self.logger.warning(f"{code} does not dispatch GET")
+            request.setResponseCode(405)
             return b""
 
-        return handler(request, code, endpoints)
+        return index.render_GET(request, int(endpoints["version"]), endpoints["endpoint"])
 
     def render_POST(self, request: Request, endpoints: dict) -> bytes:
-        code = endpoints["title"]
-        subaction = endpoints['subaction']
-
+        code = endpoints["game"]
         if code not in self.title_registry:
             self.logger.warning(f"Unknown game code {code}")
             request.setResponseCode(404)
             return b""
 
         index = self.title_registry[code]
-        handler = getattr(index, f"{subaction}", None)
-        if handler is None:
-            self.logger.error(f"{code} does not have handler for POST subaction {subaction}")
-            request.setResponseCode(500)
+        if not hasattr(index, "render_POST"):
+            self.logger.warning(f"{code} does not dispatch POST")
+            request.setResponseCode(405)
             return b""
 
-        endpoints.pop("title")
-        endpoints.pop("subaction")
-        return handler(request, code, endpoints)
+        return index.render_POST(
+            request, int(endpoints["version"]), endpoints["endpoint"]
+        )

core/utils.py

@@ -1,18 +1,12 @@
-from typing import Dict, Any, Optional
+from typing import Dict, Any
 from types import ModuleType
 from twisted.web.http import Request
 import logging
 import importlib
 from os import walk
-import jwt
-from base64 import b64decode
-from datetime import datetime, timezone
 
-from .config import CoreConfig
 
 class Utils:
-    real_title_port = None
-    real_title_port_ssl = None
     @classmethod
     def get_all_titles(cls) -> Dict[str, ModuleType]:
         ret: Dict[str, Any] = {}
@@ -39,59 +33,3 @@ class Utils:
             if b"x-forwarded-for" in req.getAllHeaders()
             else req.getClientAddress().host
         )
-    
-    @classmethod
-    def get_title_port(cls, cfg: CoreConfig):
-        if cls.real_title_port is not None: return cls.real_title_port
-
-        if cfg.title.port == 0:
-            cls.real_title_port = cfg.allnet.port
-        
-        else:
-            cls.real_title_port = cfg.title.port
-        
-        return cls.real_title_port
-
-    @classmethod
-    def get_title_port_ssl(cls, cfg: CoreConfig):
-        if cls.real_title_port_ssl is not None: return cls.real_title_port_ssl
-
-        if cfg.title.port_ssl == 0:
-            cls.real_title_port_ssl = 443
-        
-        else:
-            cls.real_title_port_ssl = cfg.title.port_ssl
-        
-        return cls.real_title_port_ssl
-
-def create_sega_auth_key(aime_id: int, game: str, place_id: int, keychip_id: str, b64_secret: str, exp_seconds: int = 86400, err_logger: str = 'aimedb') -> Optional[str]:
-    logger = logging.getLogger(err_logger)
-    try:
-        return jwt.encode({ "aime_id": aime_id, "game": game, "place_id": place_id, "keychip_id": keychip_id, "exp": int(datetime.now(tz=timezone.utc).timestamp()) + exp_seconds }, b64decode(b64_secret), algorithm="HS256")
-    except jwt.InvalidKeyError:
-        logger.error("Failed to encode Sega Auth Key because the secret is invalid!")
-        return None
-    except Exception as e:
-        logger.error(f"Unknown exception occoured when encoding Sega Auth Key! {e}")
-        return None
-
-def decode_sega_auth_key(token: str, b64_secret: str, err_logger: str = 'aimedb') -> Optional[Dict]:
-    logger = logging.getLogger(err_logger)
-    try:
-        return jwt.decode(token, "secret", b64decode(b64_secret), algorithms=["HS256"], options={"verify_signature": True})
-    except jwt.ExpiredSignatureError:
-        logger.error("Sega Auth Key failed to validate due to an expired signature!")
-        return None
-    except jwt.InvalidSignatureError:
-        logger.error("Sega Auth Key failed to validate due to an invalid signature!")
-        return None
-    except jwt.DecodeError as e:
-        logger.error(f"Sega Auth Key failed to decode! {e}")
-        return None
-    except jwt.InvalidTokenError as e:
-        logger.error(f"Sega Auth Key is invalid! {e}")
-        return None
-    except Exception as e:
-        logger.error(f"Unknown exception occoured when decoding Sega Auth Key! {e}")
-        return None
-    

docker-compose.yml

@@ -5,23 +5,22 @@ services:
     build: .
     volumes:
       - ./aime:/app/aime
-      - ./configs/config:/app/config
 
     environment:
       CFG_DEV: 1
       CFG_CORE_SERVER_HOSTNAME: 0.0.0.0
       CFG_CORE_DATABASE_HOST: ma.db
       CFG_CORE_MEMCACHED_HOSTNAME: ma.memcached
-      CFG_CORE_AIMEDB_KEY: <INSERT AIMEDB KEY HERE>
+      CFG_CORE_AIMEDB_KEY: keyhere
       CFG_CHUNI_SERVER_LOGLEVEL: debug
 
     ports:
-      - "80:80"
-      - "8443:8443"
-      - "22345:22345"
+    - "80:80"
+    - "8443:8443"
+    - "22345:22345"
 
-      - "8080:8080"
-      - "8090:8090"
+    - "8080:8080"
+    - "8090:8090"
 
     depends_on:
       db:
@@ -29,29 +28,21 @@ services:
 
   db:
     hostname: ma.db
-    image: yobasystems/alpine-mariadb:10.11.5
+    image: mysql:8.0.31-debian
     environment:
       MYSQL_DATABASE: aime
       MYSQL_USER: aime
       MYSQL_PASSWORD: aime
       MYSQL_ROOT_PASSWORD: AimeRootPassword
-      MYSQL_CHARSET: utf8mb4
-      MYSQL_COLLATION: utf8mb4_general_ci
-    ##Note: expose port 3306 to allow read.py importer into database, comment out when not needed
-    #ports:
-    #  - "3306:3306"
-    ##Note: uncomment to allow mysql to create a persistent database, leave commented if you want to rebuild database from scratch often
-    #volumes:
-    #  - ./AimeDB:/var/lib/mysql
     healthcheck:
-      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost", "-pAimeRootPassword"]
+      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
       timeout: 5s
       retries: 5
 
+
   memcached:
     hostname: ma.memcached
-    image: memcached:1.6.22-alpine3.18
-    command: [ "memcached", "-m", "1024", "-I", "128m" ]
+    image: memcached:1.6.17-bullseye
 
   phpmyadmin:
     hostname: ma.phpmyadmin
@@ -62,5 +53,5 @@ services:
       PMA_PASSWORD: AimeRootPassword
       APACHE_PORT: 8080
     ports:
-    - "9090:8080"
+    - "8080:8080"
 

docs/INSTALL_DOCKER.md

@@ -1,246 +0,0 @@
-# ARTEMiS - Docker Installation Guide
-
-This step-by-step guide will allow you to install a Contenerized Version of ARTEMiS inside Docker, some steps can be skipped assuming you already have pre-requisite components and modules installed.
-
-This guide assumes using Debian 12(bookworm-stable) as a Host Operating System for most of packages and modules.
-
-## Pre-Requisites:
-
-- Linux-Based Operating System (e.g. Debian, Ubuntu)
-- Docker (https://get.docker.com)
-- Python 3.9+
-- (optional) Git
-
-## Install Python3.9+ and Docker
-
-```
-(if this is a fresh install of the system)
-sudo apt update && sudo apt upgrade
-
-(installs python3 and pip)
-sudo apt install python3 python3-pip
-
-(installs docker)
-curl -fsSL https://get.docker.com -o get-docker.sh
-sh get-docker.sh
-
-(optionally install git)
-sudo apt install git
-```
-
-## Get ARTEMiS
-
-If you installed git, clone into your choice of ARTEMiS git repository, e.g.:
-```
-git clone <ARTEMiS Repo> <folder>
-```
-If not, download the source package, and unpack it to the folder of your choice.
-
-## Prepare development/home configuration
-
-To build our Docker setup, first we need to create some folders and copy some files around
-- Create 'aime', 'configs', 'AimeDB', and 'logs' folder in ARTEMiS root folder (where all source files exist)
-- Inside configs folder, create 'config' folder, and copy all .yaml files from example_config to config (thats all files without nginx_example.conf)
-- Edit .yaml files inside configs/config to suit your server needs
-- Edit core.yaml inside configs/config:
-```
-set server.listen_address: to "0.0.0.0"
-set title.hostname: to machine's IP address, e.g. "192.168.x.x", depending on your network, or actual hostname if your configuration is already set for dns resolve
-set database.host: to "ma.db"
-set database.memcached_host: to "ma.memcached"
-set aimedb.key: to "<actual AIMEDB key>"
-```
-
-## Running Docker Compose
-
-After configuring, go to ARTEMiS root folder, and execute:
-
-```
-docker compose up -d
-```
-
-("-d" argument means detached or daemon, meaning you will regain control of your terminal and Containers will run in background)
-
-This will start pulling and building required images from network, after it's done, a development server should be running, with server accessible under machine's IP, frontend with port 8090, and PHPMyAdmin under port 9090.
-
-- To turn off the server, from ARTEMiS root folder, execute:
-
-```
-docker compose down
-```
-
-- If you changed some files around, and don't see your changes applied, execute:
-
-```
-(turn off the server)
-docker compose down
-(rebuild)
-docker compose build
-(turn on)
-docker compose up -d
-```
-
-- If you need to see logs from containers running, execute:
-
-```
-docker compose logs
-```
-
-- add '-f' to the end if you want to follow logs.
-
-## Running commands
-
-If you need to execute python scripts supplied with the application, use `docker compose exec app python3 <script> <command>`, for example `docker compose exec app python3 dbutils.py version`
-
-## Persistent DB
-
-By default, in development mode, ARTEMiS database is stored temporarily, if you wish to keep your database saved between restarts, we need to bind the database inside the container to actual storage/folder inside our server, to do this we need to make a few changes:
-
-- First off, edit docker-compose.yml, and uncomment 2 lines:
-
-```
-(uncomment these two)
-#volumes:
-#  - ./AimeDB:/var/lib/mysql
-```
-
-- After that, start up the server, this time Database will be saved in AimeDB folder we created in our configuration steps.
-- If you wish to save it in another folder and/or storage device, change the "./AimeDB" target folder to folder/device of your choice
-
-NOTE (NEEDS FIX): at the moment running development mode with persistent DB will always run database creation script at the start of application, while it doesn't break database outright, it might create some issues, a temporary fix can be applied:
-
-- Start up containers with persistent DB already enabled, let application create database
-- After startup, `docker compose down` the instance
-- Edit entrypoint.sh and remove the `python3 dbutils.py create` line from Development mode statement
-- Execute `docker compose build` and `docker compose up -d` to rebuild the app and start the containers back
-
-## Adding importer data
-
-To add data using importer, we can do that a few ways:
-
-### Use importer locally on server
-
-For that we need actual GameData and Options supplied somehow to the server system, be it wsl2 mounting layer, a pendrive with data, network share, or a direct copy to the server storage
-With python3 installed on system, install requirements.txt directly to the system, or through python3 virtual-environment (python3-venv)
-Default mysql/mariadb client development packages will also be required
-
-- In the system:
-
-```
-sudo apt install default-libmysqlclient-dev build-essential pkg-config libmemcached-dev
-sudo apt install mysql-client
-OR
-sudo apt install libmariadb-dev
-```
-
-- In the root ARTEMiS folder
-
-```
-python3 -m pip install -r requirements.txt
-```
-
-- If we wish to layer that with python3 virtual-environment, install required system packages, then:
-
-```
-sudo apt install python3-venv
-python3 -m venv /path/to/venv
-cd /path/to/venv/bin
-python3 -m pip install -r /path/to/artemis/requirements.txt
-```
-
-- Depending on how you installed, now you can run read.py using:
-- For direct installation, from root ARTEMiS folder:
-
-```
-python3 read.py <args>
-```
-
-- Or from python3 virtual environment, from root ARTEMiS folder:
-
-```
-/path/to/python3-venv/bin/python3 /path/to/artemis/read.py <args>
-```
-
-- We need to expose database container port, so that read.py can communicate with the database, inside docker-compose.yml, uncomment 2 lines in the database container declaration (db):
-
-```
-#ports:
-#  - "3306:3306"
-```
-
-- Now, `docker compose down && docker compose build && docker compose up -d` to restart containers
-
-Now to insert the data, by default, docker doesn't expose container hostnames to root system, when trying to run read.py against a container, it will Error that hostname is not available, to fix that, we can add database hostname by hand to /etc/hosts:
-
-```
-sudo <editor of your choice> /etc/hosts
-add '127.0.0.1  ma.db' to the table
-save and close
-```
-
-- You can remove the line in /etc/hosts and de-expose the database port after successful import (this assumes you're using Persistent DB, as restarting the container without it will clear imported data).
-
-### Use importer on remote Linux system
-
-Follow the system and python portion of the guide, installing required packages and python3 modules, Download the ARTEMiS source.
-
-- Edit core.yaml and insert it into config catalog:
-
-```
-database:
-  host: "<hostname of target system>"
-```
-
-- Expose port 3306 from database docker container to system, and allow port 3306 through system firewall to expose port to the system from which you will be importing data. (Remember to close down the database ports after finishing!)
-
-- Import data using read.py
-
-### Use importer on remote Windows system
-
-Follow the [windows](docs/INSTALL_WINDOWS.md) guide for installing python dependencies, download the ARTEMiS source.
-
-- Edit core.yaml and insert it into config catalog:
-
-```
-database:
-  host: "<hostname of target system>"
-```
-
-- Expose port 3306 from database docker container to system, and allow port 3306 through system firewall to expose port to the system from which you will be importing data.
-- For Windows, also allow port 3306 outside the system so that read.py can communicate with remote database. (Remember to close down the database ports after finishing!)
-
-# Troubleshooting
-
-## Game does not connect to ARTEMiS Allnet Server
-Double check your core.yaml if all addresses are correct and ports are correctly set and/or opened.
-
-## Game does not connect to Title Server
-Title server hostname requires your actual system hostname, from which you set up the Containers, or it's IP address, you can get the IP by using command `ip a` which will list all interfaces, and one of them should be your system IP (typically under eth0).
-
-## Unhandled command in AimeDB
-Make sure you have a proper AimeDB Key added to configuration.
-
-## Memcached Error in ARTEMiS application causes errors in loading data
-Currently when running ARTEMiS from master branch, there is a small bug that causes app to always configure memcached service to 127.0.0.1, to fix that, locate cache.py file in core/data, and edit:
-
-```
-memcache = pylibmc.Client([hostname]), binary=True)
-```
-
-to:
-
-```
-memcache = pylibmc.Client(["ma.memcached"], binary=True)
-```
-
-And build the containers again.
-This will fix errors loading data from server.
-(This is fixed in development branch)
-
-## read.py "Can't connect to local server through socket '/run/mysqld/mysqld.sock'"
-
-sqlalchemy by default reads any ip based connection as socket, thus trying to connect locally, please use a hostname (such as ma.db as in guide, and do not localhost) to force it to use a network interface.
-
-### TODO:
-
-- Production environment

docs/INSTALL_WINDOWS.md

@@ -10,11 +10,11 @@ This step-by-step guide assumes that you are using a fresh install of Windows 10
     3. Make sure that you enable "Create shortcuts for installed applications" and "Add Python to environment variables" and hit Install
 
 ## Install MySQL 8.0
-1. Download MySQL 8.0 Server : [Link](https://dev.mysql.com/get/Downloads/MySQLInstaller/mysql-installer-community-8.0.34.0.msi)
-2. Install mysql-installer-web-community-8.0.34.0.msi
+1. Download MySQL 8.0 Server : [Link](https://cdn.mysql.com//Downloads/MySQLInstaller/mysql-installer-web-community-8.0.31.0.msi)
+2. Install mysql-installer-web-community-8.0.31.0.msi
     1. Click on "Add ..." on the side
     2. Click on the "+" next to MySQL Servers
-    3. Make sure MySQL Server 8.0.34 - X64 is under the products to be installed.
+    3. Make sure MySQL Server 8.0.29 - X64 is under the products to be installed.
     4. Hit Next and Next once installed
     5. Select the configuration type "Development Computer"
     6. Hit Next
@@ -23,10 +23,9 @@ This step-by-step guide assumes that you are using a fresh install of Windows 10
     9. Leave everything under Windows Service as default and hit Next >
     10. Click on Execute and for it to finish and hit Next> and then Finish
 3. Open MySQL 8.0 Command Line Client and login as your root user
-4. Change `<Enter Password Here>` to a new password for the user aime, type those commands to create your user and the database
-
-```sql
-CREATE USER 'aime'@'localhost' IDENTIFIED BY '<Enter Password Here>';
+4. Type those commands to create your user and the database
+```
+CREATE USER 'aime'@'localhost' IDENTIFIED BY 'MyStrongPass.';
 CREATE DATABASE aime;
 GRANT Alter,Create,Delete,Drop,Index,Insert,References,Select,Update ON aime.* TO 'aime'@'localhost';
 FLUSH PRIVILEGES;
@@ -35,50 +34,33 @@ exit;
 
 ## Install Python modules
 1. Change your work path to the artemis-master folder using 'cd' and install the requirements:
+> pip install -r requirements.txt
 
-```shell
-pip install -r requirements.txt
-```	
+## Copy/Rename the folder example_config to config
 
-## Copy/Rename the folder `example_config` to `config`
+## Adjust /config/core.yaml
 
-## Adjust `config/core.yaml`
-
-1. Make sure to change the server `hostname` to be set to your local machine IP (ex.: 192.168.xxx.xxx) 
+1. Make sure to change the server listen_address to be set to your local machine IP (ex.: 192.168.1.xxx) 
     - In case you want to run this only locally, set the following values:
-
-```yaml
+```
 server:
     listen_address: 0.0.0.0
 title: 
-    hostname: 192.168.xxx.xxx
-```
-
-1. Adjust the proper MySQL information you created earlier
-```yaml
-database:
-  host: "localhost"
-  username: "aime"
-  password: "<Enter Password Here>"
-  name: "aime"
+    hostname: localhost
 ```
+2. Adjust the proper MySQL information you created earlier
 3. Add the AimeDB key at the bottom of the file
 4. If the webui is needed, change the flag from False to True
 
 ## Create the database tables for ARTEMiS
-
-```shell
-python dbutils.py create
-```
+> python dbutils.py create
 
 ## Firewall Adjustements 
 Make sure the following ports are open both on your router and local Windows firewall in case you want to use this for public use (NOT recommended):
 > Port 80 (TCP), 443 (TCP), 8443 (TCP), 22345 (TCP), 8080 (TCP), 8090 (TCP) **webui, 8444 (TCP) **mucha
 
 ## Running the ARTEMiS instance
-```shell
-python index.py
-```
+> python index.py
 
 # Troubleshooting
 
@@ -96,7 +78,6 @@ python index.py
 ## AttributeError: module 'collections' has no attribute 'Hashable'
 1. This means the pyYAML module is obsolete, simply rerun pip with the -U (force update) flag, as shown below.
     - Change your work path to the artemis-master (or artemis-develop) folder using 'cd' and run the following commands:
-
-```shell
+```
 pip install -r requirements.txt -U
 ```

docs/config.md

@@ -6,18 +6,11 @@
 - `name`: Name for the server, used by some games in their default MOTDs. Default `ARTEMiS`
 - `is_develop`: Flags that the server is a development instance without a proxy standing in front of it. Setting to `False` tells the server not to listen for SSL, because the proxy should be handling all SSL-related things, among other things. Default `True`
 - `threading`: Flags that `reactor.run` should be called via the `Thread` standard library. May provide a speed boost, but removes the ability to kill the server via `Ctrl + C`. Default: `False`
-- `check_arcade_ip`: Checks IPs against the `arcade` table in the database, if one is defined. Default `False`
-- `strict_ip_checking`: Rejects clients if there is no IP in the `arcade` table for the respective arcade
 - `log_dir`: Directory to store logs. Server MUST have read and write permissions to this directory or you will have issues. Default `logs`
 ## Title
 - `loglevel`: Logging level for the title server. Default `info`
 - `hostname`: Hostname that gets sent to clients to tell them where to connect. Games must be able to connect to your server via the hostname or IP you spcify here. Note that most games will reject `localhost` or `127.0.0.1`. Default `localhost`
 - `port`: Port that the title server will listen for connections on. Set to 0 to use the Allnet handler to reduce the port footprint. Default `8080`
-- `port_ssl`: Port that the secure title server will listen for connections on. Set to 0 to use the Allnet handler to reduce the port footprint. Default `0`
-- `ssl_key`: Location of the ssl server key for the secure title server. Ignored if `port_ssl` is set to `0` or `is_develop` set to `False`. Default `cert/title.key`
-- `ssl_cert`: Location of the ssl server certificate for the secure title server. Must not be a self-signed SSL. Ignored if `port_ssl` is set to `0` or `is_develop` is set to `False`. Default `cert/title.pem`
-- `reboot_start_time`: 24 hour JST time that clients will see as the start of maintenance period. Leave blank for no maintenance time. Default: ""
-- `reboot_end_time`: 24 hour JST time that clients will see as the end of maintenance period. Leave blank for no maintenance time. Default: ""
 ## Database
 - `host`: Host of the database. Default `localhost`
 - `username`: Username of the account the server should connect to the database with. Default `aime`

docs/game_specific_info.md

@@ -6,12 +6,6 @@ the corresponding importer and database upgrades.
 **Important: The described database upgrades are only required if you are using an old database schema, f.e. still
 using the megaime database. Clean installations always create the latest database structure!**
 
-To upgrade the core database and the database for every game, execute:
-
-```shell
-python dbutils.py autoupgrade
-```
-
 # Table of content
 
 - [Supported Games](#supported-games)
@@ -22,7 +16,6 @@ python dbutils.py autoupgrade
     - [Card Maker](#card-maker)
     - [WACCA](#wacca)
     - [Sword Art Online Arcade](#sao)
-	- [Initial D THE ARCADE](#initial-d-the-arcade)
 
 
 # Supported Games
@@ -34,7 +27,7 @@ Games listed below have been tested and confirmed working.
 ### SDBT
 
 | Version ID | Version Name          |
-| ---------- | --------------------- |
+|------------|-----------------------|
 | 0          | CHUNITHM              |
 | 1          | CHUNITHM PLUS         |
 | 2          | CHUNITHM AIR          |
@@ -50,11 +43,10 @@ Games listed below have been tested and confirmed working.
 ### SDHD/SDBT
 
 | Version ID | Version Name        |
-| ---------- | ------------------- |
+|------------|---------------------|
 | 11         | CHUNITHM NEW!!      |
 | 12         | CHUNITHM NEW PLUS!! |
 | 13         | CHUNITHM SUN        |
-| 14         | CHUNITHM SUN PLUS   |
 
 
 ### Importer
@@ -67,30 +59,11 @@ python read.py --game SDBT --version <version ID> --binfolder /path/to/game/fold
 
 The importer for Chunithm will import: Events, Music, Charge Items and Avatar Accesories.
 
-### Config
-
-Config file is located in `config/chuni.yaml`.
-
-| Option           | Info                                                                                                           |
-|------------------|----------------------------------------------------------------------------------------------------------------|
-| `news_msg`       | If this is set, the news at the top of the main screen will be displayed (up to Chunithm Paradise Lost)        |
-| `name`           | If this is set, all players that are not on a team will use this one by default.                               |
-| `use_login_bonus`| This is used to enable the login bonuses                                                                       |
-| `crypto`         | This option is used to enable the TLS Encryption                                                               |
-
-
-**If you would like to use network encryption, the following will be required underneath but key, iv and hash are required:**
-
-```yaml
-crypto:
-  encrypted_only: False
-  keys:
-    13: ["0000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000", "0000000000000000"]
-```
-
 ### Database upgrade
 
-Always make sure your database (tables) are up-to-date:
+Always make sure your database (tables) are up-to-date, to do so go to the `core/data/schema/versions` folder and see
+which version is the latest, f.e. `SDBT_4_upgrade.sql`. In order to upgrade to version 4 in this case you need to
+perform all previous updates as well:
 
 ```shell
 python dbutils.py --game SDBT upgrade
@@ -115,37 +88,13 @@ After a failed Online Battle the room will be deleted. The host is used for the
 - Timer countdown should be handled globally and not by one user
 - Game can freeze or can crash if someone (especially the host) leaves the matchmaking
 
-### Rivals
-
-You can configure up to 4 rivals in Chunithm on a per-user basis. There is no UI to do this currently, so in the database, you can do this:
-```sql
-INSERT INTO aime.chuni_item_favorite (user, version, favId, favKind) VALUES (<user1>, <version>, <user2>, 2);
-INSERT INTO aime.chuni_item_favorite (user, version, favId, favKind) VALUES (<user2>, <version>, <user1>, 2);
-```
-Note that the version **must match**, otherwise song lookup may not work.
-
-### Teams
-
-You can also configure teams for users to be on. There is no UI to do this currently, so in the database, you can do this:
-```sql
-INSERT INTO aime.chuni_profile_team (teamName) VALUES (<teamName>);
-```
-Team names can be regular ASCII, and they will be displayed ingame.
-
-### Favorite songs
-You can set the songs that will be in a user's Favorite Songs category using the following SQL entries:
-```sql
-INSERT INTO aime.chuni_item_favorite (user, version, favId, favKind) VALUES (<user>, <version>, <songId>, 1);
-```
-The songId is based on the actual ID within your version of Chunithm.
-
 
 ## crossbeats REV.
 
 ### SDCA
 
 | Version ID | Version Name                       |
-| ---------- | ---------------------------------- |
+|------------|------------------------------------|
 | 0          | crossbeats REV.                    |
 | 1          | crossbeats REV. SUNRISE            |
 | 2          | crossbeats REV. SUNRISE S2         |
@@ -165,12 +114,26 @@ The importer for crossbeats REV. will import Music.
 
 Config file is located in `config/cxb.yaml`.
 
+| Option                 | Info                                                       |
+|------------------------|------------------------------------------------------------|
+| `hostname`             | Requires a proper `hostname` (not localhost!) to run       |
+| `ssl_enable`           | Enables/Disables the use of the `ssl_cert` and `ssl_key`   |
+| `port`                 | Set your unsecure port number                              |
+| `port_secure`          | Set your secure/SSL port number                            |
+| `ssl_cert`, `ssl_key`  | Enter your SSL certificate (requires not self signed cert) |
+
+
 ## maimai DX
 
-### Versions
+### SDEZ
 
 | Game Code | Version ID | Version Name            |
-| --------- | ---------- | ----------------------- |
+|-----------|------------|-------------------------|
+
+
+For versions pre-dx
+| Game Code | Version ID | Version Name            |
+|-----------|------------|-------------------------|
 | SBXL      | 0          | maimai                  |
 | SBXL      | 1          | maimai PLUS             |
 | SBZF      | 2          | maimai GreeN            |
@@ -179,19 +142,18 @@ Config file is located in `config/cxb.yaml`.
 | SDBM      | 5          | maimai ORANGE PLUS      |
 | SDCQ      | 6          | maimai PiNK             |
 | SDCQ      | 7          | maimai PiNK PLUS        |
-| SDDK      | 8          | maimai MURASAKi         |
-| SDDK      | 9          | maimai MURASAKi PLUS    |
-| SDDZ      | 10         | maimai MiLK             |
-| SDDZ      | 11         | maimai MiLK PLUS        |
+| SDDK      | 8          | maimai MURASAKI         |
+| SDDK      | 9          | maimai MURASAKI PLUS    |
+| SDDZ      | 10         | maimai MILK             |
+| SDDZ      | 11         | maimai MILK PLUS        |
 | SDEY      | 12         | maimai FiNALE           |
 | SDEZ      | 13         | maimai DX               |
 | SDEZ      | 14         | maimai DX PLUS          |
 | SDEZ      | 15         | maimai DX Splash        |
 | SDEZ      | 16         | maimai DX Splash PLUS   |
-| SDEZ      | 17         | maimai DX UNiVERSE      |
-| SDEZ      | 18         | maimai DX UNiVERSE PLUS |
-| SDEZ      | 19         | maimai DX FESTiVAL      |
-| SDEZ      | 20         | maimai DX FESTiVAL PLUS |
+| SDEZ      | 17         | maimai DX Universe      |
+| SDEZ      | 18         | maimai DX Universe PLUS |
+| SDEZ      | 19         | maimai DX Festival      |
 
 ### Importer
 
@@ -212,12 +174,11 @@ The importer for maimai Pre-DX will import Events and Music. Not all games will
 
 ### Database upgrade
 
-Always make sure your database (tables) are up-to-date:
+Always make sure your database (tables) are up-to-date, to do so go to the `core/data/schema/versions` folder and see which version is the latest, f.e. `SDEZ_2_upgrade.sql`. In order to upgrade to version 2 in this case you need to perform all previous updates as well:
 
 ```shell
 python dbutils.py --game SDEZ upgrade
 ```
-
 Pre-Dx uses the same database as DX, so only upgrade using the SDEZ game code!
 
 ## Hatsune Miku Project Diva
@@ -225,7 +186,7 @@ Pre-Dx uses the same database as DX, so only upgrade using the SDEZ game code!
 ### SBZV
 
 | Version ID | Version Name                    |
-| ---------- | ------------------------------- |
+|------------|---------------------------------|
 | 0          | Project Diva Arcade             |
 | 1          | Project Diva Arcade Future Tone |
 
@@ -246,17 +207,16 @@ the Shop, Modules and Customizations.
 Config file is located in `config/diva.yaml`.
 
 | Option               | Info                                                                                            |
-| -------------------- | ----------------------------------------------------------------------------------------------- |
+|----------------------|-------------------------------------------------------------------------------------------------|
 | `unlock_all_modules` | Unlocks all modules (costumes) by default, if set to `False` all modules need to be purchased   |
 | `unlock_all_items`   | Unlocks all items (customizations) by default, if set to `False` all items need to be purchased |
 
-### Custom PV Lists (databanks)
-
-In order to use custom PV Lists, simply drop in your .dat files inside of /titles/diva/data/ and make sure they are called PvList0.dat, PvList1.dat, PvList2.dat, PvList3.dat and PvList4.dat exactly.
 
 ### Database upgrade
 
-Always make sure your database (tables) are up-to-date:
+Always make sure your database (tables) are up-to-date, to do so go to the `core/data/schema/versions` folder and see
+which version is the latest, f.e. `SBZV_4_upgrade.sql`. In order to upgrade to version 4 in this case you need to
+perform all previous updates as well:
 
 ```shell
 python dbutils.py --game SBZV upgrade
@@ -267,7 +227,7 @@ python dbutils.py --game SBZV upgrade
 ### SDDT
 
 | Version ID | Version Name               |
-| ---------- | -------------------------- |
+|------------|----------------------------|
 | 0          | O.N.G.E.K.I.               |
 | 1          | O.N.G.E.K.I. +             |
 | 2          | O.N.G.E.K.I. SUMMER        |
@@ -295,118 +255,42 @@ The importer for O.N.G.E.K.I. will all all Cards, Music and Events.
 Config file is located in `config/ongeki.yaml`.
 
 | Option           | Info                                                                                                           |
-| ---------------- | -------------------------------------------------------------------------------------------------------------- |
+|------------------|----------------------------------------------------------------------------------------------------------------|
 | `enabled_gachas` | Enter all gacha IDs for Card Maker to work, other than default may not work due to missing cards added to them |
-| `crypto`         | This option is used to enable the TLS Encryption                                                               |
 
 Note: 1149 and higher are only for Card Maker 1.35 and higher and will be ignored on lower versions.
 
-**If you would like to use network encryption, the following will be required underneath but key, iv and hash are required:**
-
-```yaml
-crypto:
-  encrypted_only: False
-  keys:
-    7: ["0000000000000000000000000000000000000000000000000000000000000000", "00000000000000000000000000000000", "0000000000000000"]
-```
-
 ### Database upgrade
 
-Always make sure your database (tables) are up-to-date:
+Always make sure your database (tables) are up-to-date, to do so go to the `core/data/schema/versions` folder and see
+which version is the latest, f.e. `SDDT_4_upgrade.sql`. In order to upgrade to version 4 in this case you need to
+perform all previous updates as well:
 
 ```shell
 python dbutils.py --game SDDT upgrade
 ```
 
-### Controlling Events (Ranking Event, Technical Challenge Event, Mission Event)
-
-Events are controlled by 2 types of enabled events:
-- RankingEvent (type 6), TechChallengeEvent (type 17)
-- AcceptRankingEvent (type 7), AcceptTechChallengeEvent (type 18)
-
-Both Ranking and Accept must be enabled for event to function properly
-
-Event will run for the time specified in startDate and endDate
-
-AcceptRankingEvent and AcceptTechChallengeEvent are reward period for events, which specify from what startDate until endDate you can collect the rewards for attending the event, so the reward period must start in the future, e.g. :
-
-- RankingEvent startDate 2023-12-01 - endDate 2023-12-30 - period in which whole event is running
-- AcceptRankingEvent startDate 2023-12-23 - endDate 2023-12-30 - period in which you can collect rewards for the event
-
-If player misses the AcceptRankingEvent period - ranking will be invalidated and receive lowest reward from the event (typically 500x money)
-
-Technical Challenge Song List:
-
-Songs that are used for Technical Challenge are not stored anywhere in data files, so you need to fill the database table by yourself, you can gather all songs that should be in Technical Challenges from ONGEKI japanese wikis, or, you can create your own sets:
-
-Database table : `ongeki_static_tech_music`
-
-```
-id: Id in table, just increment for each entry
-version: version of the game you want the tech challenge to be in (from RED and up)
-eventId: Id of the event in ongeki_static_events, insert the Id of the TechChallengeEvent (type 17) you want the song be assigned to
-musicId: Id of the song you want to add, use songId from ongeki_static_music table
-level: Difficulty of the song you want to track during the event, from 0(basic) to 3(master)
-
-```
-
-Current implementation of Ranking and Technical Challenge Events are updated on every profile save to the Network, and Ranked on each player login, in official specification, calculation for current rank on the network should be done in the maintenance window
-
-Mission Event (type 13) is a monthly type of event, which is used when another event doesn't have it's own Ranking or Technical Challenge Event running, only one Mission Event should be running at a time, so enable only the specific Mission you want to run currently on the Network
-
-If you're often trying fresh cards, registering new profiles etc., you can also consider disabling all Announcement Events (type 1), as it will disable all the banners that pop up on login (they show up only once though, so if you click through them once they won't show again)
-
-Event type 2 in Database are Advertisement Movies, enable only 1 you want to currently play, and disable others
-
-
-Present and Reward List - populate reward list using read.py
-
-Create present for players by adding an entry in `ongeki_static_present_list`
-```
-id: unique for each entry
-version: game version you want the present be in
-presentId: id of the present - starts with 1001 and go up from that, must be unique for each reward(don't set multiple rewardIds with same presentId)
-presentName: present name which will be shown on the bottom when received
-rewardId: ID of item from ongeki_static_rewards
-stock: how many you want to give (like 5 copies of same card, or 10000 money, etc.)
-message: no idea, can be left empty
-startDate: date when to start giving out
-endDate: date when ends
-```
-
-After inserting present to the table, add the presentId into players `ongeki_static_item`, where itemKind is 9, itemId is the presentId, and stock set 1 and isValid to 1
-
-After that, on next login the present should be received (or whenever it supposed to happen)
-
-
-
 ## Card Maker
 
 ### SDED
 
 | Version ID | Version Name    |
-| ---------- | --------------- |
+|------------|-----------------|
 | 0          | Card Maker 1.30 |
 | 1          | Card Maker 1.35 |
 
 
 ### Support status
 
-#### Card Maker 1.30:
-* CHUNITHM NEW!!: Yes
-* maimai DX UNiVERSE: Yes
-* O.N.G.E.K.I. bright: Yes
+* Card Maker 1.30:
+  * CHUNITHM NEW!!: Yes
+  * maimai DX UNiVERSE: Yes
+  * O.N.G.E.K.I. bright: Yes
 
-#### Card Maker 1.35:
-* CHUNITHM: 
-  * NEW!!: Yes
-  * NEW PLUS!!: Yes (added in A028)
-  * SUN: Yes (added in A032)
-* maimai DX:
-  * UNiVERSE PLUS: Yes
-  * FESTiVAL: Yes (added in A031)
-  * FESTiVAL PLUS: Yes (added in A035)
-* O.N.G.E.K.I. bright MEMORY: Yes
+* Card Maker 1.35:
+  * CHUNITHM SUN: Yes (NEW PLUS!! up to A032)
+  * maimai DX FESTiVAL: Yes (up to A035) (UNiVERSE PLUS up to A031)
+  * O.N.G.E.K.I. bright MEMORY: Yes
 
 
 ### Importer
@@ -507,7 +391,7 @@ Gacha IDs up to 1140 will be loaded for CM 1.34 and all gachas will be loaded fo
 ### SDFE
 
 | Version ID | Version Name  |
-| ---------- | ------------- |
+|------------|---------------|
 | 0          | WACCA         |
 | 1          | WACCA S       |
 | 2          | WACCA Lily    |
@@ -530,7 +414,7 @@ The importer for WACCA will import all Music data.
 Config file is located in `config/wacca.yaml`.
 
 | Option             | Info                                                                        |
-| ------------------ | --------------------------------------------------------------------------- |
+|--------------------|-----------------------------------------------------------------------------|
 | `always_vip`       | Enables/Disables VIP, if disabled it needs to be purchased manually in game |
 | `infinite_tickets` | Always set the "unlock expert" tickets to 5                                 |
 | `infinite_wp`      | Sets the user WP to `999999`                                                |
@@ -539,7 +423,7 @@ Config file is located in `config/wacca.yaml`.
 
 ### Database upgrade
 
-Always make sure your database (tables) are up-to-date:
+Always make sure your database (tables) are up-to-date, to do so go to the `core/data/schema/versions` folder and see which version is the latest, f.e. `SDFE_3_upgrade.sql`. In order to upgrade to version 3 in this case you need to perform all previous updates as well:
 
 ```shell
 python dbutils.py --game SDFE upgrade
@@ -584,9 +468,9 @@ Below is a list of VIP rewards. Currently, VIP is not implemented, and thus thes
 
 ### SDEW
 
-| Version ID | Version Name |
-| ---------- | ------------ |
-| 0          | SAO          |
+| Version ID | Version Name  |
+|------------|---------------|
+| 0          | SAO           |
 
 
 ### Importer
@@ -603,16 +487,16 @@ The importer for SAO will import all items, heroes, support skills and titles da
 
 Config file is located in `config/sao.yaml`.
 
-| Option          | Info                                                              |
-| --------------- | ----------------------------------------------------------------- |
-| `hostname`      | Changes the server listening address for Mucha                    |
-| `port`          | Changes the listing port                                          |
-| `auto_register` | Allows the game to handle the automatic registration of new cards |
+| Option             | Info                                                                        |
+|--------------------|-----------------------------------------------------------------------------|
+| `hostname`         | Changes the server listening address for Mucha                              |
+| `port`             | Changes the listing port                                                    |
+| `auto_register`    | Allows the game to handle the automatic registration of new cards           |
 
 
 ### Database upgrade
 
-Always make sure your database (tables) are up-to-date:
+Always make sure your database (tables) are up-to-date, to do so go to the `core/data/schema/versions` folder and see which version is the latest, f.e. `SDEW_1_upgrade.sql`. In order to upgrade to version 3 in this case you need to perform all previous updates as well:
 
 ```shell
 python dbutils.py --game SDEW upgrade
@@ -625,141 +509,8 @@ python dbutils.py --game SDEW upgrade
 - Player title is currently static and cannot be changed in-game
 - QR Card Scanning currently only load a static hero
 
-**Network hashing in GssSite.dll must be disabled**
-
 ### Credits for SAO support:
 
 - Midorica - Limited Network Support
 - Dniel97 - Helping with network base
-- tungnotpunk - Source
-
-## Initial D THE ARCADE
-
-### SDGT
-
-| Version ID | Version Name                  |
-| ---------- | ----------------------------- |
-| 0          | Initial D THE ARCADE Season 1 |
-| 1          | Initial D THE ARCADE Season 2 |
-
-**Important: Only version 1.50.00 (Season 2) is currently working and actively supported!**
-
-### Profile Importer
-
-In order to use the profile importer download the `idac_profile.json` file from the frontend
-and either directly use the folder path with `idac_profile.json` in it or specify the complete
-path to the `.json` file
-
-```shell
-python read.py --game SDGT --version <Version ID> --optfolder /path/to/game/download/folder
-```
-
-The importer for SDGT will import the complete profile data with personal high scores as well.
-
-### Config
-
-Config file is located in `config/idac.yaml`.
-
-| Option                        | Info                                                                                                        |
-| ----------------------------- | ----------------------------------------------------------------------------------------------------------- |
-| `ssl`                         | Enables/Disables the use of the `ssl_cert` and `ssl_key` (currently unsuported)                             |
-| `matching_host`               | IPv4 address of your PC for the Online Battle (currently unsupported)                                       |
-| `port_matching`               | Port number for the Online Battle Matching                                                                  |
-| `port_echo1/2`                | Port numbers for Echos                                                                                      |
-| `port_matching_p2p`           | Port number for Online Battle (currently unsupported)                                                       |
-| `stamp.enable`               | Enables/Disabled the play stamp events                                                                      |
-| `stamp.enabled_stamps`        | Define up to 3 play stamp events (without `.json` extension, which are placed in `titles/idac/data/stamps`) |
-| `timetrial.enable`           | Enables/Disables the time trial event                                                                       |
-| `timetrial.enabled_timetrial` | Define one! trial event (without `.json` extension, which are placed in `titles/idac/data/timetrial`)       |
-
-
-### Database upgrade
-
-Always make sure your database (tables) are up-to-date:
-
-```shell
-python dbutils.py --game SDGT upgrade
-```
-
-### Notes
-- Online Battle is not supported
-- Online Battle Matching is not supported
-
-### Item categories
-
-| Category ID | Category Name            |
-| ----------- | ------------------------ |
-| 1           | D Coin                   |
-| 3           | Car Dressup Token        |
-| 5           | Avatar Dressup Token     |
-| 6           | Tachometer               |
-| 7           | Aura                     |
-| 8           | Aura Color               |
-| 9           | Avatar Face              |
-| 10          | Avatar Eye               |
-| 11          | Avatar Mouth             |
-| 12          | Avatar Hair              |
-| 13          | Avatar Glasses           |
-| 14          | Avatar Face accessories  |
-| 15          | Avatar Body              |
-| 18          | Avatar Background        |
-| 21          | Chat Stamp               |
-| 22          | Keychain                 |
-| 24          | Title                    |
-| 25          | FullTune Ticket          |
-| 26          | Paper Cup                |
-| 27          | BGM                      |
-| 28          | Drifting Text            |
-| 31          | Start Menu BG            |
-| 32          | Car Color/Paint          |
-| 33          | Aura Level               |
-| 34          | FullTune Ticket Fragment |
-| 35          | Underneon Lights         |
-
-### TimeRelease Chapter:
-
-1. Story: 1, 2, 3, 4, 5, 6, 7, 8, 9, 19 (Chapter 10), (29 Chapter 11?)
-2. MF Ghost: 10, 11, 12, 13, 14, 15
-3. Bunta: 15, 16, 17, 18, 19, 20, (21, 21, 22?)
-4. Special Event: 23, 24, 25, 26, 27, 28 (Touhou Project)
-
-### TimeRelease Courses:
-
-
-| Course ID | Course Name               | Direction                |
-| --------- | ------------------------- | ------------------------ |
-| 0         | Akina Lake(秋名湖)        | CounterClockwise(左周り) |
-| 2         | Akina Lake(秋名湖)        | Clockwise(右周り)        |
-| 52        | Hakone(箱根)              | Downhill(下り)           |
-| 54        | Hakone(箱根)              | Hillclimb(上り)          |
-| 36        | Usui(碓氷)                | CounterClockwise(左周り) |
-| 38        | Usui(碓氷)                | Clockwise(右周り)        |
-| 4         | Myogi(妙義)               | Downhill(下り)           |
-| 6         | Myogi(妙義)               | Hillclimb(上り)          |
-| 8         | Akagi(赤城)               | Downhill(下り)           |
-| 10        | Akagi(赤城)               | Hillclimb(上り)          |
-| 12        | Akina(秋名)               | Downhill(下り)           |
-| 14        | Akina(秋名)               | Hillclimb(上り)          |
-| 16        | Irohazaka(いろは坂)       | Downhill(下り)           |
-| 18        | Irohazaka(いろは坂)       | Reverse(逆走)            |
-| 56        | Momiji Line(もみじライン) | Downhill(下り)           |
-| 58        | Momiji Line(もみじライン) | Hillclimb(上り)          |
-| 20        | Tsukuba(筑波)             | Outbound(往路)           |
-| 22        | Tsukuba(筑波)             | Inbound(復路)            |
-| 24        | Happogahara(八方ヶ原)     | Outbound(往路)           |
-| 26        | Happogahara(八方ヶ原)     | Inbound(復路)            |
-| 40        | Sadamine(定峰)            | Downhill(下り)           |
-| 42        | Sadamine(定峰)            | Hillclimb(上り)          |
-| 44        | Tsuchisaka(土坂)          | Outbound(往路)           |
-| 46        | Tsuchisaka(土坂)          | Inbound(復路)            |
-| 48        | Akina Snow(秋名雪)        | Downhill(下り)           |
-| 50        | Akina Snow(秋名雪)        | Hillclimb(上り)          |
-| 68        | Odawara(小田原)           | Forward(順走)            |
-| 70        | Odawara(小田原)           | Reverse(逆走)            |
-
-### Credits
-- Bottersnike: For the HUGE Reverse Engineering help
-- Kinako: For helping with the timeRelease unlocking of courses and special mode
-
-A huge thanks to all people who helped shaping this project to what it is now and don't want to be mentioned here.
-
+- tungnotpunk - Source

example_config/chuni.yaml

@@ -1,10 +1,9 @@
 server:
   enable: True
   loglevel: "info"
-  news_msg: ""
 
 team:
-  name: ARTEMiS # If this is set, all players that are not on a team will use this one by default.
+  name: ARTEMiS
 
 mods:
   use_login_bonus: True
@@ -19,14 +18,6 @@ version:
   13:
     rom: 2.10.00
     data: 2.10.00
-  14:
-    rom: 2.15.00
-    data: 2.15.00
 
 crypto:
-  encrypted_only: False
-
-matching:
-  enable: False
-  match_time_limit: 60
-  match_error_limit: 9999
+  encrypted_only: False

example_config/core.yaml

@@ -4,7 +4,6 @@ server:
   allow_unregistered_serials: True
   name: "ARTEMiS"
   is_develop: True
-  is_using_proxy: False
   threading: False
   log_dir: "logs"
   check_arcade_ip: False
@@ -14,12 +13,6 @@ title:
   loglevel: "info"
   hostname: "localhost"
   port: 8080
-  port_ssl: 0
-  ssl_cert: "cert/title.crt"
-  ssl_key: "cert/title.key"
-  reboot_start_time: "04:00"
-  reboot_end_time: "05:00"
-
 
 database:
   host: "localhost"
@@ -31,7 +24,6 @@ database:
   sha2_password: False
   loglevel: "warn"
   user_table_autoincrement_start: 10000
-  enable_memcached: True
   memcached_host: "localhost"
 
 frontend:
@@ -56,8 +48,6 @@ aimedb:
   loglevel: "info"
   port: 22345
   key: ""
-  id_secret: ""
-  id_lifetime_seconds: 86400
 
 mucha:
   enable: False

example_config/cxb.yaml

@@ -1,3 +1,9 @@
 server:
   enable: True
-  loglevel: "info"
+  loglevel: "info"
+  hostname: "localhost"
+  ssl_enable: False
+  port: 8082
+  port_secure: 443
+  ssl_cert: "cert/title.crt"
+  ssl_key: "cert/title.key"

example_config/idac.yaml

@@ -1,22 +0,0 @@
-server:
-  enable: True
-  loglevel: "info"
-  ssl: False
-  ssl_key: "cert/idac.key"
-  ssl_cert: "cert/idac.crt"
-  matching_host: "127.0.0.1"
-  port_matching: 20000
-  port_echo1: 20001
-  port_echo2: 20002
-  port_matching_p2p: 20003
-
-stamp:
-  enable: True
-  enabled_stamps: # max 3 play stamps
-    - "touhou_remilia_scarlet"
-    - "touhou_flandre_scarlet"
-    - "touhou_sakuya_izayoi"
-
-timetrial:
-  enable: True
-  enabled_timetrial: "touhou_remilia_scarlet"

example_config/nginx_example.conf

@@ -24,7 +24,8 @@ server {
 
 # SSL titles, comment out if you don't plan on accepting SSL titles
 server {
-	listen 443 ssl;
+	listen 443 ssl default_server;
+	listen [::]:443 ssl default_server;	
 	server_name your.hostname.here;
 
 	ssl_certificate /path/to/cert/title.crt;
@@ -54,7 +55,7 @@ server {
 	ssl_session_tickets off;
 
 	ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
-	ssl_ciphers "ALL:@SECLEVEL=0";
+	ssl_ciphers "ALL:@SECLEVEL=1";
 	ssl_prefer_server_ciphers off;
 
 	location / {
@@ -74,7 +75,7 @@ server {
 	ssl_session_tickets off;
 
 	ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
-	ssl_ciphers "ALL:@SECLEVEL=0";
+	ssl_ciphers "ALL:@SECLEVEL=1";
 	ssl_prefer_server_ciphers off;
 
 	location / {
@@ -84,6 +85,28 @@ server {
 	}
 }
 
+# CXB, comment this out if you don't plan on serving crossbeats.
+server {
+	listen 443 ssl;	
+	server_name cxb.hostname.here;
+	
+	ssl_certificate /path/to/cert/cxb.pem;
+	ssl_certificate_key /path/to/cert/cxb.key;
+	ssl_session_timeout 1d;
+	ssl_session_cache shared:MozSSL:10m;
+	ssl_session_tickets off;
+
+	ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+	ssl_ciphers "ALL:@SECLEVEL=1";
+	ssl_prefer_server_ciphers off;
+
+	location / {
+		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+		proxy_pass_request_headers on;
+		proxy_pass http://localhost:8080/SDBT/104/;
+	}
+}
+
 # Frontend, set to redirect to HTTPS. Comment out if you don't intend to use the frontend
 server {
     listen 80;
@@ -120,4 +143,4 @@ server {
 		proxy_pass_request_headers on;
 		proxy_pass http://localhost:8090/;
 	}
-}
+}

example_config/ongeki.yaml

@@ -1,7 +1,6 @@
 server:
   enable: True
   loglevel: "info"
-  use_https: False
 
 gachas:
   enabled_gachas:
@@ -36,6 +35,3 @@ version:
     card_maker: 1.30.01
   7:
     card_maker: 1.35.03
-
-crypto:
-  encrypted_only: False

example_config/sao.yaml

@@ -1,13 +1,6 @@
 server:
+  hostname: "localhost"
   enable: True
   loglevel: "info"
-  auto_register: True
-
-crypt:
-  enable: False
-  key: ""
-  iv: ""
-
-hash:
-  verify_hash: False
-  hash_base: ""
+  port: 9000
+  auto_register: True

index.py

@@ -22,8 +22,8 @@ class HttpDispatcher(resource.Resource):
         self.map_post = Mapper()
         self.logger = logging.getLogger("core")
 
-        self.title = TitleServlet(cfg, config_dir)
         self.allnet = AllnetServlet(cfg, config_dir)
+        self.title = TitleServlet(cfg, config_dir)
         self.mucha = MuchaServlet(cfg, config_dir)
 
         self.map_get.connect(
@@ -144,32 +144,22 @@ class HttpDispatcher(resource.Resource):
             conditions=dict(method=["POST"]),
         )
 
-        for code, game in self.title.title_registry.items():
-            get_matchers, post_matchers = game.get_endpoint_matchers()
-            
-            for m in get_matchers:
-                self.map_get.connect(
-                    "title_get",
-                    m[1],
-                    controller="title",
-                    action="render_GET",
-                    title=code,
-                    subaction=m[0],
-                    conditions=dict(method=["GET"]),
-                    requirements=m[2],
-                )
-                
-            for m in post_matchers:
-                self.map_post.connect(
-                    "title_post",
-                    m[1],
-                    controller="title",
-                    action="render_POST",
-                    title=code,
-                    subaction=m[0],
-                    conditions=dict(method=["POST"]),
-                    requirements=m[2],
-                )
+        self.map_get.connect(
+            "title_get",
+            "/{game}/{version}/{endpoint:.*?}",
+            controller="title",
+            action="render_GET",
+            conditions=dict(method=["GET"]),
+            requirements=dict(game=R"S..."),
+        )
+        self.map_post.connect(
+            "title_post",
+            "/{game}/{version}/{endpoint:.*?}",
+            controller="title",
+            action="render_POST",
+            conditions=dict(method=["POST"]),
+            requirements=dict(game=R"S..."),
+        )
 
     def render_GET(self, request: Request) -> bytes:
         test = self.map_get.match(request.uri.decode())
@@ -289,7 +279,6 @@ if __name__ == "__main__":
 
     allnet_server_str = f"tcp:{cfg.allnet.port}:interface={cfg.server.listen_address}"
     title_server_str = f"tcp:{cfg.title.port}:interface={cfg.server.listen_address}"
-    title_https_server_str = f"ssl:{cfg.title.port_ssl}:interface={cfg.server.listen_address}:privateKey={cfg.title.ssl_key}:certKey={cfg.title.ssl_cert}"
     adb_server_str = f"tcp:{cfg.aimedb.port}:interface={cfg.server.listen_address}"
     frontend_server_str = (
         f"tcp:{cfg.frontend.port}:interface={cfg.server.listen_address}"
@@ -323,11 +312,6 @@ if __name__ == "__main__":
         endpoints.serverFromString(reactor, title_server_str).listen(
             server.Site(dispatcher)
         )
-    
-    if cfg.title.port_ssl > 0:
-        endpoints.serverFromString(reactor, title_https_server_str).listen(
-            server.Site(dispatcher)
-        )
 
     if cfg.server.threading:
         Thread(target=reactor.run, args=(False,)).start()

readme.md

@@ -5,13 +5,13 @@ A network service emulator for games running SEGA'S ALL.NET service, and similar
 Games listed below have been tested and confirmed working. Only game versions older then the version currently active in arcades, or games versions that have not recieved a major update in over one year, are supported.
 
 + CHUNITHM
-    + All versions up to SUN PLUS
+    + All versions up to SUN
 
 + crossbeats REV.
     + All versions + omnimix
 
 + maimai DX
-    + All versions up to FESTiVAL PLUS
+    + All versions up to FESTiVAL
 
 + Hatsune Miku: Project DIVA Arcade
     + All versions
@@ -33,9 +33,6 @@ Games listed below have been tested and confirmed working. Only game versions ol
 + Sword Art Online Arcade (partial support)
     + Final
 
-+ Initial D THE ARCADE
-    + Season 2
-
 ## Requirements
 - python 3 (tested working with 3.9 and 3.10, other versions YMMV)
 - pip
@@ -43,7 +40,7 @@ Games listed below have been tested and confirmed working. Only game versions ol
 - mysql/mariadb server
 
 ## Setup guides
-Follow the platform-specific guides for [windows](docs/INSTALL_WINDOWS.md), [ubuntu](docs/INSTALL_UBUNTU.md) or [docker](docs/INSTALL_DOCKER.md) to setup and run the server.
+Follow the platform-specific guides for [windows](docs/INSTALL_WINDOWS.md) and [ubuntu](docs/INSTALL_UBUNTU.md) to setup and run the server.
 
 ## Game specific information
 Read [Games specific info](docs/game_specific_info.md) for all supported games, importer settings, configuration option and database upgrades.

requirements.txt

@@ -1,21 +1,20 @@
-mypy
-wheel
-twisted
-pytz
-pyyaml
-sqlalchemy==1.4.46
-mysqlclient
-pyopenssl
-service_identity
-PyCryptodome
-inflection
-coloredlogs
-pylibmc; platform_system != "Windows"
-wacky
-Routes
-bcrypt
-jinja2
-protobuf
-autobahn
-pillow
-pyjwt
+mypy
+wheel
+twisted
+pytz
+pyyaml
+sqlalchemy==1.4.46
+mysqlclient
+pyopenssl
+service_identity
+PyCryptodome
+inflection
+coloredlogs
+pylibmc; platform_system != "Windows"
+wacky
+Routes
+bcrypt
+jinja2
+protobuf
+autobahn
+pillow

titles/chuni/__init__.py

@@ -6,5 +6,5 @@ from titles.chuni.read import ChuniReader
 index = ChuniServlet
 database = ChuniData
 reader = ChuniReader
-game_codes = [ChuniConstants.GAME_CODE, ChuniConstants.GAME_CODE_NEW, ChuniConstants.GAME_CODE_INT]
-current_schema_version = 5
+game_codes = [ChuniConstants.GAME_CODE, ChuniConstants.GAME_CODE_NEW]
+current_schema_version = 4

titles/chuni/base.py

@@ -10,7 +10,7 @@ from core.config import CoreConfig
 from titles.chuni.const import ChuniConstants
 from titles.chuni.database import ChuniData
 from titles.chuni.config import ChuniConfig
-SCORE_BUFFER = {}
+
 
 class ChuniBase:
     def __init__(self, core_cfg: CoreConfig, game_cfg: ChuniConfig) -> None:
@@ -181,50 +181,21 @@ class ChuniBase:
         return {"type": data["type"], "length": 0, "gameIdlistList": []}
 
     def handle_get_game_message_api_request(self, data: Dict) -> Dict:
-        return {
-            "type": data["type"], 
-            "length": 1, 
-            "gameMessageList": [{ 
-                "id": 1, 
-                "type": 1,
-                "message": f"Welcome to {self.core_cfg.server.name} network!" if not self.game_cfg.server.news_msg else self.game_cfg.server.news_msg,
-                "startDate": "2017-12-05 07:00:00.0",
-                "endDate": "2099-12-31 00:00:00.0"
-            }]
-        }
+        return {"type": data["type"], "length": "0", "gameMessageList": []}
 
     def handle_get_game_ranking_api_request(self, data: Dict) -> Dict:
-        rankings = self.data.score.get_rankings(self.version)
-        return {"type": data["type"], "gameRankingList": rankings}
+        return {"type": data["type"], "gameRankingList": []}
 
     def handle_get_game_sale_api_request(self, data: Dict) -> Dict:
         return {"type": data["type"], "length": 0, "gameSaleList": []}
 
     def handle_get_game_setting_api_request(self, data: Dict) -> Dict:
-        # if reboot start/end time is not defined use the default behavior of being a few hours ago
-        if self.core_cfg.title.reboot_start_time == "" or self.core_cfg.title.reboot_end_time == "":
-            reboot_start = datetime.strftime(
-                datetime.utcnow() + timedelta(hours=6), self.date_time_format
-            )
-            reboot_end = datetime.strftime(
-                datetime.utcnow() + timedelta(hours=7), self.date_time_format
-            )
-        else:
-            # get current datetime in JST
-            current_jst = datetime.now(pytz.timezone('Asia/Tokyo')).date()
-
-            # parse config start/end times into datetime
-            reboot_start_time = datetime.strptime(self.core_cfg.title.reboot_start_time, "%H:%M")
-            reboot_end_time = datetime.strptime(self.core_cfg.title.reboot_end_time, "%H:%M")
-
-            # offset datetimes with current date/time
-            reboot_start_time = reboot_start_time.replace(year=current_jst.year, month=current_jst.month, day=current_jst.day, tzinfo=pytz.timezone('Asia/Tokyo'))
-            reboot_end_time = reboot_end_time.replace(year=current_jst.year, month=current_jst.month, day=current_jst.day, tzinfo=pytz.timezone('Asia/Tokyo'))
-
-            # create strings for use in gameSetting
-            reboot_start = reboot_start_time.strftime(self.date_time_format)
-            reboot_end = reboot_end_time.strftime(self.date_time_format)
-
+        reboot_start = datetime.strftime(
+            datetime.now() - timedelta(hours=4), self.date_time_format
+        )
+        reboot_end = datetime.strftime(
+            datetime.now() - timedelta(hours=3), self.date_time_format
+        )
         return {
             "gameSetting": {
                 "dataVersion": "1.00.00",
@@ -240,6 +211,7 @@ class ChuniBase:
             "isDumpUpload": "false",
             "isAou": "false",
         }
+
     def handle_get_user_activity_api_request(self, data: Dict) -> Dict:
         user_activity_list = self.data.profile.get_profile_activity(
             data["userId"], data["kind"]
@@ -312,13 +284,6 @@ class ChuniBase:
             "userChargeList": charge_list,
         }
 
-    def handle_get_user_recent_player_api_request(self, data: Dict) -> Dict:
-        return {
-            "userId": data["userId"],
-            "length": 0,
-            "userRecentPlayerList": [], # playUserId, playUserName, playDate, friendPoint
-        }
-
     def handle_get_user_course_api_request(self, data: Dict) -> Dict:
         user_course_list = self.data.score.get_courses(data["userId"])
         if user_course_list is None:
@@ -330,8 +295,8 @@ class ChuniBase:
             }
 
         course_list = []
-        next_idx = int(data.get("nextIndex", 0))
-        max_ct = int(data.get("maxCount", 300))
+        next_idx = int(data["nextIndex"])
+        max_ct = int(data["maxCount"])
 
         for x in range(next_idx, len(user_course_list)):
             tmp = user_course_list[x]._asdict()
@@ -396,77 +361,11 @@ class ChuniBase:
             "userDuelList": duel_list,
         }
 
-    def handle_get_user_rival_data_api_request(self, data: Dict) -> Dict:
-        p = self.data.profile.get_rival(data["rivalId"])
-        if p is None:
-            return {}
-        userRivalData = {
-            "rivalId": p.user,
-            "rivalName": p.userName
-        }
-        return {
-            "userId": data["userId"],
-            "userRivalData": userRivalData
-        }
-    
-    def handle_get_user_rival_music_api_request(self, data: Dict) -> Dict:
-        rival_id = data["rivalId"]
-        next_index = int(data["nextIndex"])
-        max_count = int(data["maxCount"])
-        user_rival_music_list = []
-
-        # Fetch all the rival music entries for the user
-        all_entries = self.data.score.get_rival_music(rival_id)
-
-        # Process the entries based on max_count and nextIndex
-        for music in all_entries:
-            music_id = music["musicId"]
-            level = music["level"]
-            score = music["scoreMax"]
-            rank = music["scoreRank"]
-
-            # Create a music entry for the current music_id if it's unique
-            music_entry = next((entry for entry in user_rival_music_list if entry["musicId"] == music_id), None)
-            if music_entry is None:
-                music_entry = {
-                    "musicId": music_id,
-                    "length": 0,
-                    "userRivalMusicDetailList": []
-                }
-                user_rival_music_list.append(music_entry)
-
-            # Create a level entry for the current level if it's unique or has a higher score
-            level_entry = next((entry for entry in music_entry["userRivalMusicDetailList"] if entry["level"] == level), None)
-            if level_entry is None:
-                level_entry = {
-                    "level": level,
-                    "scoreMax": score,
-                    "scoreRank": rank
-                }
-                music_entry["userRivalMusicDetailList"].append(level_entry)
-            elif score > level_entry["scoreMax"]:
-                level_entry["scoreMax"] = score
-                level_entry["scoreRank"] = rank
-
-        # Calculate the length for each "musicId" by counting the unique levels
-        for music_entry in user_rival_music_list:
-            music_entry["length"] = len(music_entry["userRivalMusicDetailList"])
-
-        # Prepare the result dictionary with user rival music data
-        result = {
-            "userId": data["userId"],
-            "rivalId": data["rivalId"],
-            "nextIndex": str(next_index + len(user_rival_music_list[next_index: next_index + max_count]) if max_count <= len(user_rival_music_list[next_index: next_index + max_count]) else -1),
-            "userRivalMusicList": user_rival_music_list[next_index: next_index + max_count]
-        }
-        return result
-
-    
     def handle_get_user_favorite_item_api_request(self, data: Dict) -> Dict:
         user_fav_item_list = []
 
         # still needs to be implemented on WebUI
-        # 1: Music, 2: User, 3: Character
+        # 1: Music, 3: Character
         fav_list = self.data.item.get_all_favorites(
             data["userId"], self.version, fav_kind=int(data["kind"])
         )
@@ -591,37 +490,22 @@ class ChuniBase:
             tmp.pop("id")
 
             for song in song_list:
-                score_buf = SCORE_BUFFER.get(str(data["userId"])) or []
                 if song["userMusicDetailList"][0]["musicId"] == tmp["musicId"]:
                     found = True
                     song["userMusicDetailList"].append(tmp)
                     song["length"] = len(song["userMusicDetailList"])
-                    score_buf.append(tmp["musicId"])
-                    SCORE_BUFFER[str(data["userId"])] = score_buf
 
-            score_buf = SCORE_BUFFER.get(str(data["userId"])) or []
-            if not found and tmp["musicId"] not in score_buf:
+            if not found:
                 song_list.append({"length": 1, "userMusicDetailList": [tmp]})
-                score_buf.append(tmp["musicId"])
-                SCORE_BUFFER[str(data["userId"])] = score_buf
 
             if len(song_list) >= max_ct:
                 break
-    
-        for songIdx in range(len(song_list)): 
-            for recordIdx in range(x+1, len(music_detail)):
-                if song_list[songIdx]["userMusicDetailList"][0]["musicId"] == music_detail[recordIdx]["musicId"]:
-                    music = music_detail[recordIdx]._asdict()
-                    music.pop("user")
-                    music.pop("id")
-                    song_list[songIdx]["userMusicDetailList"].append(music)
-                    song_list[songIdx]["length"] += 1
-    
-        if len(song_list) >= max_ct:
-            next_idx += len(song_list)
+
+        if len(song_list) >= next_idx + max_ct:
+            next_idx += max_ct
         else:
             next_idx = -1
-            SCORE_BUFFER[str(data["userId"])] = []
+
         return {
             "userId": data["userId"],
             "length": len(song_list),
@@ -716,95 +600,39 @@ class ChuniBase:
         }
 
     def handle_get_user_team_api_request(self, data: Dict) -> Dict:
-        # Default values
-        team_id = 65535
+        # TODO: use the database "chuni_profile_team" with a GUI
         team_name = self.game_cfg.team.team_name
-        team_rank = 0
-
-        # Get user profile
-        profile = self.data.profile.get_profile_data(data["userId"], self.version)
-        if profile and profile["teamId"]:
-            # Get team by id
-            team = self.data.profile.get_team_by_id(profile["teamId"])
-
-            if team:
-                team_id = team["id"]
-                team_name = team["teamName"]
-                team_rank = self.data.profile.get_team_rank(team["id"])
-
-        # Don't return anything if no team name has been defined for defaults and there is no team set for the player
-        if not profile["teamId"] and team_name == "":
+        if team_name == "":
             return {"userId": data["userId"], "teamId": 0}
 
         return {
             "userId": data["userId"],
-            "teamId": team_id,
-            "teamRank": team_rank,
+            "teamId": 1,
+            "teamRank": 1,
             "teamName": team_name,
             "userTeamPoint": {
                 "userId": data["userId"],
-                "teamId": team_id,
+                "teamId": 1,
                 "orderId": 1,
                 "teamPoint": 1,
                 "aggrDate": data["playDate"],
             },
         }
-    
+
     def handle_get_team_course_setting_api_request(self, data: Dict) -> Dict:
         return {
             "userId": data["userId"],
             "length": 0,
-            "nextIndex": -1,
+            "nextIndex": 0,
             "teamCourseSettingList": [],
         }
 
-    def handle_get_team_course_setting_api_request_proto(self, data: Dict) -> Dict:
-        return {
-            "userId": data["userId"],
-            "length": 1,
-            "nextIndex": -1,
-            "teamCourseSettingList": [
-                {
-                    "orderId": 1,
-                    "courseId": 1,
-                    "classId": 1,
-                    "ruleId": 1,
-                    "courseName": "Test",
-                    "teamCourseMusicList": [
-                        {"track": 184, "type": 1, "level": 3, "selectLevel": -1},
-                        {"track": 184, "type": 1, "level": 3, "selectLevel": -1},
-                        {"track": 184, "type": 1, "level": 3, "selectLevel": -1}
-                    ],
-                    "teamCourseRankingInfoList": [],
-                    "recodeDate": "2099-12-31 11:59:99.0",
-                    "isPlayed": False
-                }
-            ],
-        }
-
     def handle_get_team_course_rule_api_request(self, data: Dict) -> Dict:
         return {
             "userId": data["userId"],
             "length": 0,
-            "nextIndex": -1,
-            "teamCourseRuleList": []
-        }
-
-    def handle_get_team_course_rule_api_request_proto(self, data: Dict) -> Dict:
-        return {
-            "userId": data["userId"],
-            "length": 1,
-            "nextIndex": -1,
-            "teamCourseRuleList": [
-                {
-                    "recoveryLife": 0,
-                    "clearLife": 100,
-                    "damageMiss": 1,
-                    "damageAttack": 1,
-                    "damageJustice": 1,
-                    "damageJusticeC": 1
-                }
-            ],
+            "nextIndex": 0,
+            "teamCourseRuleList": [],
         }
 
     def handle_upsert_user_all_api_request(self, data: Dict) -> Dict:
@@ -875,34 +703,15 @@ class ChuniBase:
         if "userPlaylogList" in upsert:
             for playlog in upsert["userPlaylogList"]:
                 # convert the player names to utf-8
-                if playlog["playedUserName1"] is not None:
-                  playlog["playedUserName1"] = self.read_wtf8(playlog["playedUserName1"])
-                if playlog["playedUserName2"] is not None:
-                  playlog["playedUserName2"] = self.read_wtf8(playlog["playedUserName2"])
-                if playlog["playedUserName3"] is not None:
-                  playlog["playedUserName3"] = self.read_wtf8(playlog["playedUserName3"])
-                self.data.score.put_playlog(user_id, playlog, self.version)
+                playlog["playedUserName1"] = self.read_wtf8(playlog["playedUserName1"])
+                playlog["playedUserName2"] = self.read_wtf8(playlog["playedUserName2"])
+                playlog["playedUserName3"] = self.read_wtf8(playlog["playedUserName3"])
+                self.data.score.put_playlog(user_id, playlog)
 
         if "userTeamPoint" in upsert:
-            team_points = upsert["userTeamPoint"]
-            try:
-                for tp in team_points:
-                    if tp["teamId"] != '65535':
-                        # Fetch the current team data
-                        current_team = self.data.profile.get_team_by_id(tp["teamId"])
+            # TODO: team stuff
+            pass
 
-                        # Calculate the new teamPoint
-                        new_team_point = int(tp["teamPoint"]) + current_team["teamPoint"]
-
-                        # Prepare the data to update
-                        team_data = {
-                            "teamPoint": new_team_point
-                        }
-
-                        # Update the team data
-                        self.data.profile.update_team(tp["teamId"], team_data)
-            except:
-                pass # Probably a better way to catch if the team is not set yet (new profiles), but let's just pass
         if "userMapAreaList" in upsert:
             for map_area in upsert["userMapAreaList"]:
                 self.data.item.put_map_area(user_id, map_area)
@@ -920,10 +729,6 @@ class ChuniBase:
                 self.data.item.put_login_bonus(
                     user_id, self.version, login["presetId"], isWatched=True
                 )
-        
-        if "userRecentPlayerList" in upsert: # TODO: Seen in Air, maybe implement sometime
-            for rp in upsert["userRecentPlayerList"]:
-                pass
 
         return {"returnCode": "1"}
 
@@ -952,4 +757,4 @@ class ChuniBase:
         return {
             "userId": data["userId"],
             "userNetBattleData": {"recentNBSelectMusicList": []},
-        }
+        }

titles/chuni/config.py

@@ -19,12 +19,6 @@ class ChuniServerConfig:
                 self.__config, "chuni", "server", "loglevel", default="info"
             )
         )
-        
-    @property
-    def news_msg(self) -> str:
-        return CoreConfig.get_config_field(
-            self.__config, "chuni", "server", "news_msg", default=""
-        )
 
 
 class ChuniTeamConfig:
@@ -36,11 +30,6 @@ class ChuniTeamConfig:
         return CoreConfig.get_config_field(
             self.__config, "chuni", "team", "name", default=""
         )
-    @property
-    def rank_scale(self) -> str:
-        return CoreConfig.get_config_field(
-            self.__config, "chuni", "team", "rank_scale", default="False"
-        )
 
 
 class ChuniModsConfig:
@@ -89,27 +78,6 @@ class ChuniCryptoConfig:
             self.__config, "chuni", "crypto", "encrypted_only", default=False
         )
 
-class ChuniMatchingConfig:
-    def __init__(self, parent_config: "ChuniConfig") -> None:
-        self.__config = parent_config
-    
-    @property
-    def enable(self) -> bool:
-        return CoreConfig.get_config_field(
-            self.__config, "chuni", "matching", "enable", default=False
-        )
-    
-    @property
-    def match_time_limit(self) -> int:
-        return CoreConfig.get_config_field(
-            self.__config, "chuni", "matching", "match_time_limit", default=60
-        )
-    
-    @property
-    def match_error_limit(self) -> int:
-        return CoreConfig.get_config_field(
-            self.__config, "chuni", "matching", "match_error_limit", default=9999
-        )
 
 class ChuniConfig(dict):
     def __init__(self) -> None:
@@ -118,4 +86,3 @@ class ChuniConfig(dict):
         self.mods = ChuniModsConfig(self)
         self.version = ChuniVersionConfig(self)
         self.crypto = ChuniCryptoConfig(self)
-        self.matching = ChuniMatchingConfig(self)

titles/chuni/const.py

@@ -1,7 +1,6 @@
 class ChuniConstants:
     GAME_CODE = "SDBT"
     GAME_CODE_NEW = "SDHD"
-    GAME_CODE_INT = "SDGS"
 
     CONFIG_NAME = "chuni.yaml"
 
@@ -19,7 +18,7 @@ class ChuniConstants:
     VER_CHUNITHM_NEW = 11
     VER_CHUNITHM_NEW_PLUS = 12
     VER_CHUNITHM_SUN = 13
-    VER_CHUNITHM_SUN_PLUS = 14
+
     VERSION_NAMES = [
         "CHUNITHM",
         "CHUNITHM PLUS",
@@ -34,10 +33,9 @@ class ChuniConstants:
         "CHUNITHM PARADISE",
         "CHUNITHM NEW!!",
         "CHUNITHM NEW PLUS!!",
-        "CHUNITHM SUN",
-        "CHUNITHM SUN PLUS"
+        "CHUNITHM SUN"
     ]
 
     @classmethod
     def game_ver_to_string(cls, ver: int):
-        return cls.VERSION_NAMES[ver]
+        return cls.VERSION_NAMES[ver]