From 3acc2dc197a73e96d33d16de744199d2d8cae4b9 Mon Sep 17 00:00:00 2001 From: Dniel97 Date: Fri, 3 Mar 2023 23:46:29 +0100 Subject: [PATCH 01/63] Initial Card Maker ONGEKI support --- core/data/schema/versions/SDDT_3_rollback.sql | 1 + core/data/schema/versions/SDDT_4_upgrade.sql | 1 + core/data/schema/versions/SDED_1_upgrade.sql | 99 +++ example_config/cardmaker.yaml | 3 + example_config/ongeki.yaml | 23 + titles/chuni/base.py | 5 +- titles/cm/__init__.py | 15 + titles/cm/base.py | 84 +++ titles/cm/cm_data/MU3/static_cards.csv | Bin 0 -> 333451 bytes titles/cm/cm_data/MU3/static_gacha_cards.csv | Bin 0 -> 6759 bytes titles/cm/cm_data/MU3/static_gachas.csv | Bin 0 -> 5458 bytes titles/cm/config.py | 19 + titles/cm/const.py | 10 + titles/cm/index.py | 91 +++ titles/cm/read.py | 199 ++++++ titles/mai2/base.py | 9 +- titles/ongeki/bright.py | 609 +++++++++++++++++- titles/ongeki/config.py | 18 +- titles/ongeki/const.py | 18 +- titles/ongeki/schema/item.py | 129 +++- titles/ongeki/schema/profile.py | 3 +- titles/ongeki/schema/static.py | 203 ++++++ 22 files changed, 1526 insertions(+), 13 deletions(-) create mode 100644 core/data/schema/versions/SDDT_3_rollback.sql create mode 100644 core/data/schema/versions/SDDT_4_upgrade.sql create mode 100644 core/data/schema/versions/SDED_1_upgrade.sql create mode 100644 example_config/cardmaker.yaml create mode 100644 titles/cm/__init__.py create mode 100644 titles/cm/base.py create mode 100644 titles/cm/cm_data/MU3/static_cards.csv create mode 100644 titles/cm/cm_data/MU3/static_gacha_cards.csv create mode 100644 titles/cm/cm_data/MU3/static_gachas.csv create mode 100644 titles/cm/config.py create mode 100644 titles/cm/const.py create mode 100644 titles/cm/index.py create mode 100644 titles/cm/read.py diff --git a/core/data/schema/versions/SDDT_3_rollback.sql b/core/data/schema/versions/SDDT_3_rollback.sql new file mode 100644 index 0000000..a248ce3 --- /dev/null +++ b/core/data/schema/versions/SDDT_3_rollback.sql @@ -0,0 +1 @@ +ALTER TABLE ongeki_profile_data DROP COLUMN lastEmoneyCredit; \ No newline at end of file diff --git a/core/data/schema/versions/SDDT_4_upgrade.sql b/core/data/schema/versions/SDDT_4_upgrade.sql new file mode 100644 index 0000000..45510c2 --- /dev/null +++ b/core/data/schema/versions/SDDT_4_upgrade.sql @@ -0,0 +1 @@ +ALTER TABLE ongeki_profile_data ADD COLUMN lastEmoneyCredit INTEGER DEFAULT 0; diff --git a/core/data/schema/versions/SDED_1_upgrade.sql b/core/data/schema/versions/SDED_1_upgrade.sql new file mode 100644 index 0000000..c601745 --- /dev/null +++ b/core/data/schema/versions/SDED_1_upgrade.sql @@ -0,0 +1,99 @@ +CREATE TABLE ongeki_user_gacha ( + id INT PRIMARY KEY NOT NULL AUTO_INCREMENT, + user INT NOT NULL, + gachaId INT NOT NULL, + totalGachaCnt INT DEFAULT 0, + ceilingGachaCnt INT DEFAULT 0, + selectPoint INT DEFAULT 0, + useSelectPoint INT DEFAULT 0, + dailyGachaCnt INT DEFAULT 0, + fiveGachaCnt INT DEFAULT 0, + elevenGachaCnt INT DEFAULT 0, + dailyGachaDate TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + CONSTRAINT ongeki_user_gacha_uk UNIQUE (user, gachaId), + CONSTRAINT ongeki_user_gacha_ibfk_1 FOREIGN KEY (user) REFERENCES aime_user (id) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE ongeki_user_gacha_supply ( + id INT PRIMARY KEY NOT NULL AUTO_INCREMENT, + user INT NOT NULL, + cardId INT NOT NULL, + CONSTRAINT ongeki_user_gacha_supply_uk UNIQUE (user, cardId), + CONSTRAINT ongeki_user_gacha_supply_ibfk_1 FOREIGN KEY (user) REFERENCES aime_user (id) ON DELETE CASCADE ON UPDATE CASCADE +); + +CREATE TABLE ongeki_static_gachas ( + id INT PRIMARY KEY NOT NULL AUTO_INCREMENT, + version INT NOT NULL, + gachaId INT NOT NULL, + gachaName VARCHAR(255) NOT NULL, + kind INT NOT NULL, + type INT DEFAULT 0, + isCeiling BOOLEAN DEFAULT 0, + maxSelectPoint INT DEFAULT 0, + ceilingCnt INT DEFAULT 10, + changeRateCnt1 INT DEFAULT 0, + changeRateCnt2 INT DEFAULT 0, + startDate TIMESTAMP DEFAULT '2018-01-01 00:00:00.0', + endDate TIMESTAMP DEFAULT '2018-01-01 00:00:00.0', + noticeStartDate TIMESTAMP DEFAULT '2018-01-01 00:00:00.0', + noticeEndDate TIMESTAMP DEFAULT '2038-01-01 00:00:00.0', + convertEndDate TIMESTAMP DEFAULT '2038-01-01 00:00:00.0', + CONSTRAINT ongeki_static_gachas_uk UNIQUE (version, gachaId, gachaName) +); + +CREATE TABLE ongeki_static_gacha_cards ( + id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, + gachaId INT NOT NULL, + cardId INT NOT NULL, + rarity INT NOT NULL, + weight INT DEFAULT 1, + isPickup BOOLEAN DEFAULT 0, + isSelect BOOLEAN DEFAULT 1, + CONSTRAINT ongeki_static_gacha_cards_uk UNIQUE (gachaId, cardId) +); + + +CREATE TABLE ongeki_static_cards ( + id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, + version INT NOT NULL, + cardId INT NOT NULL, + name VARCHAR(255) NOT NULL, + charaId INT NOT NULL, + nickName VARCHAR(255), + school VARCHAR(255) NOT NULL, + attribute VARCHAR(5) NOT NULL, + gakunen VARCHAR(255) NOT NULL, + rarity INT NOT NULL, + levelParam VARCHAR(255) NOT NULL, + skillId INT NOT NULL, + choKaikaSkillId INT NOT NULL, + cardNumber VARCHAR(255), + CONSTRAINT ongeki_static_cards_uk UNIQUE (version, cardId) +) CHARACTER SET utf8mb4; + +CREATE TABLE ongeki_user_print_detail ( + id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, + user INT NOT NULL, + cardId INT NOT NULL, + cardType INT DEFAULT 0, + printDate TIMESTAMP NOT NULL, + serialId VARCHAR(20) NOT NULL, + placeId INT NOT NULL, + clientId VARCHAR(11) NOT NULL, + printerSerialId VARCHAR(20) NOT NULL, + isHolograph BOOLEAN DEFAULT 0, + isAutographed BOOLEAN DEFAULT 0, + printOption1 BOOLEAN DEFAULT 1, + printOption2 BOOLEAN DEFAULT 1, + printOption3 BOOLEAN DEFAULT 1, + printOption4 BOOLEAN DEFAULT 1, + printOption5 BOOLEAN DEFAULT 1, + printOption6 BOOLEAN DEFAULT 1, + printOption7 BOOLEAN DEFAULT 1, + printOption8 BOOLEAN DEFAULT 1, + printOption9 BOOLEAN DEFAULT 1, + printOption10 BOOLEAN DEFAULT 0, + FOREIGN KEY (user) REFERENCES aime_user(id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT ongeki_user_print_detail_uk UNIQUE (serialId) +) CHARACTER SET utf8mb4; \ No newline at end of file diff --git a/example_config/cardmaker.yaml b/example_config/cardmaker.yaml new file mode 100644 index 0000000..a04dda5 --- /dev/null +++ b/example_config/cardmaker.yaml @@ -0,0 +1,3 @@ +server: + enable: True + loglevel: "info" diff --git a/example_config/ongeki.yaml b/example_config/ongeki.yaml index a04dda5..6ebd18a 100644 --- a/example_config/ongeki.yaml +++ b/example_config/ongeki.yaml @@ -1,3 +1,26 @@ server: enable: True loglevel: "info" + +gachas: + enabled_gachas: + - 1011 + - 1012 + - 1043 + - 1067 + - 1068 + - 1069 + - 1070 + - 1071 + - 1072 + - 1073 + - 1074 + - 1075 + - 1076 + - 1077 + - 1081 + - 1085 + - 1089 + - 1104 + - 1111 + - 1135 \ No newline at end of file diff --git a/titles/chuni/base.py b/titles/chuni/base.py index bf32f63..d557583 100644 --- a/titles/chuni/base.py +++ b/titles/chuni/base.py @@ -20,7 +20,10 @@ class ChuniBase(): self.logger = logging.getLogger("chuni") self.game = ChuniConstants.GAME_CODE self.version = ChuniConstants.VER_CHUNITHM - + + def handle_ping_request(self, data: Dict) -> Dict: + return {"returnCode": 1} + def handle_game_login_api_request(self, data: Dict) -> Dict: #self.data.base.log_event("chuni", "login", logging.INFO, {"version": self.version, "user": data["userId"]}) return { "returnCode": 1 } diff --git a/titles/cm/__init__.py b/titles/cm/__init__.py new file mode 100644 index 0000000..040bec7 --- /dev/null +++ b/titles/cm/__init__.py @@ -0,0 +1,15 @@ +from titles.cm.index import CardMakerServlet +from titles.cm.const import CardMakerConstants +from titles.cm.read import CardMakerReader + +index = CardMakerServlet +reader = CardMakerReader + +use_default_title = True +include_protocol = True +title_secure = False +game_codes = [CardMakerConstants.GAME_CODE] +trailing_slash = True +use_default_host = True + +current_schema_version = 1 diff --git a/titles/cm/base.py b/titles/cm/base.py new file mode 100644 index 0000000..c22fa41 --- /dev/null +++ b/titles/cm/base.py @@ -0,0 +1,84 @@ +from datetime import date, datetime, timedelta +from typing import Any, Dict, List +import json +import logging +from enum import Enum + +from core.config import CoreConfig +from core.data.cache import cached +from titles.cm.const import CardMakerConstants +from titles.cm.config import CardMakerConfig + + +class CardMakerBase(): + def __init__(self, core_cfg: CoreConfig, game_cfg: CardMakerConfig) -> None: + self.core_cfg = core_cfg + self.game_cfg = game_cfg + self.date_time_format = "%Y-%m-%d %H:%M:%S" + self.date_time_format_ext = "%Y-%m-%d %H:%M:%S.%f" # needs to be lopped off at [:-5] + self.date_time_format_short = "%Y-%m-%d" + self.logger = logging.getLogger("cardmaker") + self.game = CardMakerConstants.GAME_CODE + self.version = CardMakerConstants.VER_CARD_MAKER + + def handle_get_game_connect_api_request(self, data: Dict) -> Dict: + uri = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}" + + # CHUNITHM = 0, maimai = 1, ONGEKI = 2 + return { + "length": 3, + "gameConnectList": [ + { + "modelKind": 0, + "type": 1, + "titleUri": f"{uri}/SDHD/200/" + }, + { + "modelKind": 1, + "type": 1, + "titleUri": f"{uri}/SDEZ/120/" + }, + { + "modelKind": 2, + "type": 1, + "titleUri": f"{uri}/SDDT/130/" + } + ] + } + + def handle_get_game_setting_api_request(self, data: Dict) -> Dict: + reboot_start = date.strftime(datetime.now() + timedelta(hours=3), self.date_time_format) + reboot_end = date.strftime(datetime.now() + timedelta(hours=4), self.date_time_format) + + return { + "gameSetting": { + "dataVersion": "1.30.00", + "ongekiCmVersion": "1.30.01", + "chuniCmVersion": "2.00.00", + "maimaiCmVersion": "1.20.00", + "requestInterval": 10, + "rebootStartTime": reboot_start, + "rebootEndTime": reboot_end, + "maxCountCharacter": 100, + "maxCountItem": 100, + "maxCountCard": 100, + "watermark": False, + "isMaintenance": False, + "isBackgroundDistribute": False + }, + "isDumpUpload": False, + "isAou": False + } + + def handle_get_client_bookkeeping_api_request(self, data: Dict) -> Dict: + return { + "placeId": data["placeId"], + "length": 0, + "clientBookkeepingList": [] + } + + def handle_upsert_client_setting_api_request(self, data: Dict) -> Dict: + return {"returnCode": 1, "apiName": "UpsertClientSettingApi"} + + def handle_upsert_client_bookkeeping_api_request(self, data: Dict) -> Dict: + return {"returnCode": 1, "apiName": "UpsertClientBookkeepingApi"} diff --git a/titles/cm/cm_data/MU3/static_cards.csv b/titles/cm/cm_data/MU3/static_cards.csv new file mode 100644 index 0000000000000000000000000000000000000000..53e6e566e85af902acb7fa78d5213b9fef257331 GIT binary patch literal 333451 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 z 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 literal 0 HcmV?d00001 diff --git a/titles/cm/cm_data/MU3/static_gacha_cards.csv b/titles/cm/cm_data/MU3/static_gacha_cards.csv new file mode 100644 index 0000000000000000000000000000000000000000..303e71a710e45c9db10e70441483bcd779422c8f GIT binary patch literal 6759 zcmZvgOO9nH42I`fMvd=)*MW1EkXfXxpj6%JE+vDg(@~V&$6y|0&{zv5Bub|yzYGbinZYP(rmn*S3xpsLQp=n%}jntysUrCo^?b7&7-R_B#OEVu+E;I@c=V-E+ z9uuo)#HBvy$6)d9nd~_lx`XB7)jXnJ6Nl?W6zC@HbxOmR2wT+%u2@iF>7~lav@-?u^bf}_$D?ee#>8B6=T4xM9jIa zhjCU`AkNHU^KvP9mNVv(b?bvQPRZ$&Ml}v`87#HxSgR&3qKkRc^-QdIy$kD^sy5}kdB-(amq z#{$^}-()@G8?Sd^-(b6`dfk#uOl3XovBM8xCRT$*(N_V!T7~-w#ub< zMYqfBG3RKocwN|=SS}HxO-YXsMs_{x{%&$q75ARt|Ed=WWw1 zJ$gGk_(rkX<#P6W&eWT{+-WafHx;j&inp7tL;S9T?zp3@Z#Db9)O@mWh}GqF)8*q= z4{@o7oYzCF8Xe<3ewFS^&-`BM=sBCe#pkk8-*D?4YPTM0qtYGab$zVrq5i7P<>+f? zW_%MlV}qI9i^!Sy2{Y$In2CWf6Dwvmros;UvpHfpTUWxo?v`_rGjSGX>Ohz|3xjPn zDa_kVG!sHDMb6tz_H2pV!R{fy+nHuvnqzmn*`CWGxAhWXUN_m^BsP35ldWfwJH)`& zF3Z^-%j~e{WY4t79rkSdf$YWCWU}Xy-cA=jSxq!6uXCboh6#hc9!WZ?5sqSUwQv(F2}o@*?4#Nm?G0$0=soSos6QT zJsX+&3vA4P#s_V1sQnM2Ce)2r4($V>aI;z-E4d&AJCh z=bUQ;*}=xFE0CLK3mL{#_S_EZ(Y)d8&Nn-(_vkxnu~pB=^u3Ah?ueHV$=fzs+&Z*WI($Tjvs)kIQqYq38DgKC|!QdOnwJ z_Jb)0-=&bbdL}s+17a@c#9ZuSrn_v5U%ciwvSs(8?;uWYem6rozrV}wZ+wGVvFh(% z3LMP`A>dm`8O%tL1W3+&ubWKm(t49=zweCS$)SFJl>|pocuj!ql zYkH?L?46Urd7F%Vqsw^uRx>luGnw=%NB<5iU2(JKf za7=hZ0&x=z3IC;IjpP-7p?8KyB$1kok3p6#&Gk3)-S2*P^ z@!ABgQv~M%7WO zjmQUwtXs21wpSo5|H9aQCXWCHR6b^`)k$Jal;npuf|zsU74RhOxX8b`gOx`(Ou`ro->056L&-xWujSY0aZ zR?wEst{BfIh%v4k#hiRlpzWDBn4hzivV788!CbcVuDZbMuSm5NRkQM8fWX$)fwiAv zGjEN9_a5_2&MKgkZL>$!`$8dm>9>Nh)l|V)(ug%yN93TZnR~_F?-~355Vn|Muj(KL zh*>#UVudBbR;J`94pth&ThPDi_H(vB?V;L%AcLTU_C_c_lzyG!Tzk#ifp*Mqu&>M| zUR+039n~VM_}7tCN3lo)@PuB}iu7nMMJ_#)#z1x*awZMHCFg=&(xZ9Lyx@i8XeGd# zrHh)<7|@&B?QJ)WcQ09Lm1-NpOW^1vkGtC|0fULh)h83&S?uJE#WkwVqJuUxT!8|n@sc~M zE~qeyZAR2vk?JW?eps^qwIj|(tOP(h<9Lqua1G7{oqU6;X_``5dI2_4q;LhU3qF#n zYgC8Xfzd-Zz@1a#Ze>t_=bEg;f)T()OsfO~U?m{||n0=k~pB0w2rLd24Hld%2pCa8K@l z2@O6VZSi=F?-U|~k6oi(@~II!gAizj?jL$yOZ zAfWn)JP69St^00!xTCvMdTq@SNaA None: + self.__config = parent_config + + @property + def enable(self) -> bool: + return CoreConfig.get_config_field(self.__config, 'cardmaker', 'server', 'enable', default=True) + + @property + def loglevel(self) -> int: + return CoreConfig.str_to_loglevel(CoreConfig.get_config_field(self.__config, 'cardmaker', 'server', 'loglevel', default="info")) + + +class CardMakerConfig(dict): + def __init__(self) -> None: + self.server = CardMakerServerConfig(self) diff --git a/titles/cm/const.py b/titles/cm/const.py new file mode 100644 index 0000000..f59af5d --- /dev/null +++ b/titles/cm/const.py @@ -0,0 +1,10 @@ +class CardMakerConstants(): + GAME_CODE = "SDED" + + VER_CARD_MAKER = 0 + + VERSION_NAMES = ["Card Maker 1.34"] + + @classmethod + def game_ver_to_string(cls, ver: int): + return cls.VERSION_NAMES[ver] diff --git a/titles/cm/index.py b/titles/cm/index.py new file mode 100644 index 0000000..6ba7382 --- /dev/null +++ b/titles/cm/index.py @@ -0,0 +1,91 @@ +from twisted.web.http import Request +import json +import inflection +import yaml +import string +import logging +import coloredlogs +import zlib +from logging.handlers import TimedRotatingFileHandler + +from core.config import CoreConfig +from titles.cm.config import CardMakerConfig +from titles.cm.const import CardMakerConstants +from titles.cm.base import CardMakerBase + + +class CardMakerServlet(): + def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None: + self.core_cfg = core_cfg + self.game_cfg = CardMakerConfig() + self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/cardmaker.yaml"))) + + self.versions = [ + CardMakerBase(core_cfg, self.game_cfg) + ] + + self.logger = logging.getLogger("cardmaker") + log_fmt_str = "[%(asctime)s] Card Maker | %(levelname)s | %(message)s" + log_fmt = logging.Formatter(log_fmt_str) + fileHandler = TimedRotatingFileHandler("{0}/{1}.log".format(self.core_cfg.server.log_dir, "cardmaker"), encoding='utf8', + when="d", backupCount=10) + + fileHandler.setFormatter(log_fmt) + + consoleHandler = logging.StreamHandler() + consoleHandler.setFormatter(log_fmt) + + self.logger.addHandler(fileHandler) + self.logger.addHandler(consoleHandler) + + self.logger.setLevel(self.game_cfg.server.loglevel) + coloredlogs.install(level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str) + + def render_POST(self, request: Request, version: int, url_path: str) -> bytes: + req_raw = request.content.getvalue() + url_split = url_path.split("/") + internal_ver = 0 + endpoint = url_split[len(url_split) - 1] + + print(f"version: {version}") + + if version >= 130 and version < 135: # Card Maker + internal_ver = CardMakerConstants.VER_CARD_MAKER + + if all(c in string.hexdigits for c in endpoint) and len(endpoint) == 32: + # If we get a 32 character long hex string, it's a hash and we're + # doing encrypted. The likelyhood of false positives is low but + # technically not 0 + self.logger.error("Encryption not supported at this time") + + try: + unzip = zlib.decompress(req_raw) + + except zlib.error as e: + self.logger.error(f"Failed to decompress v{version} {endpoint} request -> {e}") + return zlib.compress("{\"stat\": \"0\"}".encode("utf-8")) + + req_data = json.loads(unzip) + + self.logger.info(f"v{version} {endpoint} request - {req_data}") + + func_to_find = "handle_" + inflection.underscore(endpoint) + "_request" + + try: + handler = getattr(self.versions[internal_ver], func_to_find) + resp = handler(req_data) + + except AttributeError as e: + self.logger.warning(f"Unhandled v{version} request {endpoint} - {e}") + return zlib.compress("{\"stat\": \"0\"}".encode("utf-8")) + + except Exception as e: + self.logger.error(f"Error handling v{version} method {endpoint} - {e}") + return zlib.compress("{\"stat\": \"0\"}".encode("utf-8")) + + if resp is None: + resp = {'returnCode': 1} + + self.logger.info(f"Response {resp}") + + return zlib.compress(json.dumps(resp, ensure_ascii=False).encode("utf-8")) diff --git a/titles/cm/read.py b/titles/cm/read.py new file mode 100644 index 0000000..b9cb674 --- /dev/null +++ b/titles/cm/read.py @@ -0,0 +1,199 @@ +from decimal import Decimal +import logging +import os +import re +import csv +import xml.etree.ElementTree as ET +from typing import Any, Dict, List, Optional + +from read import BaseReader +from core.config import CoreConfig +from titles.ongeki.database import OngekiData +from titles.cm.const import CardMakerConstants +from titles.ongeki.const import OngekiConstants +from titles.ongeki.config import OngekiConfig + + +class CardMakerReader(BaseReader): + def __init__(self, config: CoreConfig, version: int, bin_dir: Optional[str], + opt_dir: Optional[str], extra: Optional[str]) -> None: + super().__init__(config, version, bin_dir, opt_dir, extra) + self.ongeki_data = OngekiData(config) + + try: + self.logger.info( + f"Start importer for {CardMakerConstants.game_ver_to_string(version)}") + except IndexError: + self.logger.error(f"Invalid ongeki version {version}") + exit(1) + + def read(self) -> None: + static_datas = { + "static_cards.csv": "read_ongeki_card_csv", + "static_gachas.csv": "read_ongeki_gacha_csv", + "static_gacha_cards.csv": "read_ongeki_gacha_card_csv" + } + + if self.bin_dir is not None: + for file, func in static_datas.items(): + if os.path.exists(f"{self.bin_dir}/MU3/{file}"): + read_csv = getattr(CardMakerReader, func) + read_csv(self, f"{self.bin_dir}/MU3/{file}") + else: + self.logger.warn(f"Couldn't find {file} file in {self.bin_dir}, skipping") + + if self.opt_dir is not None: + dir = self.get_data_directories(self.opt_dir) + + # ONGEKI (MU3) cnnot easily access the bin data(A000.pac) + # so only opt_dir will work for now + self.read_gacha(f"{dir}/MU3/gacha") + self.read_card(f"{dir}/MU3/card") + + def read_ongeki_card_csv(self, file_path: str) -> None: + self.logger.info(f"Reading cards from {file_path}...") + + with open(file_path, encoding="utf-8") as f: + reader = csv.DictReader(f) + for row in reader: + self.ongeki_data.static.put_card( + row["version"], + row["cardId"], + name=row["name"], + charaId=row["charaId"], + nickName=row["nickName"] if row["nickName"] != "" else None, + school=row["school"], + attribute=row["attribute"], + gakunen=row["gakunen"], + rarity=row["rarity"], + levelParam=row["levelParam"], + skillId=row["skillId"], + choKaikaSkillId=row["choKaikaSkillId"], + cardNumber=row["cardNumber"] if row["cardNumber"] != "" else None + ) + + self.logger.info(f"Added card {row['cardId']}") + + def read_ongeki_gacha_csv(self, file_path: str) -> None: + self.logger.info(f"Reading gachas from {file_path}...") + + with open(file_path, encoding="utf-8") as f: + reader = csv.DictReader(f) + for row in reader: + self.ongeki_data.static.put_gacha( + row["version"], + row["gachaId"], + row["gachaName"], + row["kind"], + type=row["type"], + isCeiling=True if row["isCeiling"] == "1" else False, + maxSelectPoint=row["maxSelectPoint"], + ceilingCnt=row["ceilingCnt"], + changeRateCnt1=row["changeRateCnt1"], + changeRateCnt2=row["changeRateCnt2"] + ) + + self.logger.info(f"Added gacha {row['gachaId']}") + + def read_ongeki_gacha_card_csv(self, file_path: str) -> None: + self.logger.info(f"Reading gacha cards from {file_path}...") + + with open(file_path, encoding="utf-8") as f: + reader = csv.DictReader(f) + for row in reader: + self.ongeki_data.static.put_gacha_card( + row["gachaId"], + row["cardId"], + rarity=row["rarity"], + weight=row["weight"], + isPickup=True if row["isPickup"] == "1" else False, + isSelect=True if row["isSelect"] == "1" else False + ) + + self.logger.info(f"Added card {row['cardId']} to gacha") + + def read_ongeki_card(self, base_dir: str) -> None: + self.logger.info(f"Reading cards from {base_dir}...") + + version_ids = { + '1000': OngekiConstants.VER_ONGEKI, + '1005': OngekiConstants.VER_ONGEKI_PLUS, + '1010': OngekiConstants.VER_ONGEKI_SUMMER, + '1015': OngekiConstants.VER_ONGEKI_SUMMER_PLUS, + '1020': OngekiConstants.VER_ONGEKI_RED, + '1025': OngekiConstants.VER_ONGEKI_RED_PLUS, + '1030': OngekiConstants.VER_ONGEKI_BRIGHT, + '1035': OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY + } + + for root, dirs, files in os.walk(base_dir): + for dir in dirs: + if os.path.exists(f"{root}/{dir}/Card.xml"): + with open(f"{root}/{dir}/Card.xml", "r", encoding="utf-8") as f: + troot = ET.fromstring(f.read()) + + card_id = int(troot.find('Name').find('id').text) + name = troot.find('Name').find('str').text + chara_id = int(troot.find('CharaID').find('id').text) + nick_name = troot.find('NickName').text + school = troot.find('School').find('str').text + attribute = troot.find('Attribute').text + gakunen = troot.find('Gakunen').find('str').text + rarity = OngekiConstants.RARITY_TYPES[ + troot.find('Rarity').text].value + + level_param = [] + for lvl in troot.find('LevelParam').findall('int'): + level_param.append(lvl.text) + + skill_id = int(troot.find('SkillID').find('id').text) + cho_kai_ka_skill_id = int(troot.find('ChoKaikaSkillID').find('id').text) + + version = version_ids[ + troot.find('VersionID').find('id').text] + card_number = troot.find('CardNumberString').text + + self.ongeki_data.static.put_card( + version, + card_id, + name=name, + charaId=chara_id, + nickName=nick_name, + school=school, + attribute=attribute, + gakunen=gakunen, + rarity=rarity, + levelParam=','.join(level_param), + skillId=skill_id, + choKaikaSkillId=cho_kai_ka_skill_id, + cardNumber=card_number + ) + self.logger.info(f"Added card {card_id}") + + def read_ongeki_gacha(self, base_dir: str) -> None: + self.logger.info(f"Reading gachas from {base_dir}...") + + # assuming some GachaKinds based on the GachaType + type_to_kind = { + "Normal": "Normal", + "Pickup": "Pickup", + "RecoverFiveShotFlag": "BonusRestored", + "Free": "Free", + "FreeSR": "Free" + } + + for root, dirs, files in os.walk(base_dir): + for dir in dirs: + if os.path.exists(f"{root}/{dir}/Gacha.xml"): + with open(f"{root}/{dir}/Gacha.xml", "r", encoding="utf-8") as f: + troot = ET.fromstring(f.read()) + + name = troot.find('Name').find('str').text + id = int(troot.find('Name').find('id').text) + + gacha_kind = OngekiConstants.CM_GACHA_KINDS[ + type_to_kind[troot.find('Type').text]].value + + self.ongeki_data.static.put_gacha( + self.version, id, name, gacha_kind) + self.logger.info(f"Added gacha {id}") diff --git a/titles/mai2/base.py b/titles/mai2/base.py index 4b0b81c..3817890 100644 --- a/titles/mai2/base.py +++ b/titles/mai2/base.py @@ -16,6 +16,9 @@ class Mai2Base(): self.data = Mai2Data(cfg) self.logger = logging.getLogger("mai2") + def handle_ping_request(self, data: Dict) -> Dict: + return {"returnCode": 1} + def handle_get_game_setting_api_request(self, data: Dict): reboot_start = date.strftime(datetime.now() + timedelta(hours=3), Mai2Constants.DATE_TIME_FORMAT) reboot_end = date.strftime(datetime.now() + timedelta(hours=4), Mai2Constants.DATE_TIME_FORMAT) @@ -202,9 +205,9 @@ class Mai2Base(): for fav in upsert["userFavoriteList"]: self.data.item.put_favorite(user_id, fav["kind"], fav["itemIdList"]) - if "isNewFriendSeasonRankingList" in upsert and int(upsert["isNewFriendSeasonRankingList"]) > 0: - for fsr in upsert["userFriendSeasonRankingList"]: - pass + # if "isNewFriendSeasonRankingList" in upsert and int(upsert["isNewFriendSeasonRankingList"]) > 0: + # for fsr in upsert["userFriendSeasonRankingList"]: + # pass def handle_user_logout_api_request(self, data: Dict) -> Dict: pass diff --git a/titles/ongeki/bright.py b/titles/ongeki/bright.py index d92ed48..57660b5 100644 --- a/titles/ongeki/bright.py +++ b/titles/ongeki/bright.py @@ -1,5 +1,6 @@ from datetime import date, datetime, timedelta from typing import Any, Dict +from random import randint import pytz import json @@ -8,8 +9,8 @@ from titles.ongeki.base import OngekiBase from titles.ongeki.const import OngekiConstants from titles.ongeki.config import OngekiConfig -class OngekiBright(OngekiBase): +class OngekiBright(OngekiBase): def __init__(self, core_cfg: CoreConfig, game_cfg: OngekiConfig) -> None: super().__init__(core_cfg, game_cfg) self.version = OngekiConstants.VER_ONGEKI_BRIGHT @@ -19,3 +20,609 @@ class OngekiBright(OngekiBase): ret["gameSetting"]["dataVersion"] = "1.30.00" ret["gameSetting"]["onlineDataVersion"] = "1.30.00" return ret + + def handle_cm_get_user_data_api_request(self, data: Dict) -> Dict: + # first check for a bright memory profile after that check for a + # bright profile + p = (self.data.profile.get_profile_data(data["userId"], self.version+1) + or self.data.profile.get_profile_data(data["userId"], self.version)) + if p is None: + return {} + + cards = self.data.card.get_user_cards(data["userId"]) + if cards is None or len(cards) == 0: + # This should never happen + self.logger.error( + f"handle_get_user_data_api_request: Internal error - No cards found for user id {data['userId']}") + return {} + + # get the dict representation of the row so we can modify values + user_data = p._asdict() + + # remove the values the game doesn't want + user_data.pop("id") + user_data.pop("user") + user_data.pop("version") + + # TODO: replace datetime objects with strings + + # add access code that we don't store + user_data["accessCode"] = cards[0]["access_code"] + + # hardcode Card Maker version for now + user_data["compatibleCmVersion"] = "1.30.01" + + return {"userId": data["userId"], "userData": user_data} + + def handle_printer_login_api_request(self, data: Dict): + return {"returnCode": 1} + + def handle_printer_logout_api_request(self, data: Dict): + return {"returnCode": 1} + + def handle_cm_get_user_card_api_request(self, data: Dict) -> Dict: + user_cards = self.data.item.get_cards(data["userId"]) + if user_cards is None: + return {} + + max_ct = data["maxCount"] + next_idx = data["nextIndex"] + start_idx = next_idx + end_idx = max_ct + start_idx + + if len(user_cards[start_idx:]) > max_ct: + next_idx += max_ct + else: + next_idx = -1 + + card_list = [] + for card in user_cards: + tmp = card._asdict() + tmp.pop("id") + tmp.pop("user") + card_list.append(tmp) + + return { + "userId": data["userId"], + "length": len(card_list[start_idx:end_idx]), + "nextIndex": next_idx, + "userCardList": card_list[start_idx:end_idx] + } + + def handle_cm_get_user_character_api_request(self, data: Dict) -> Dict: + user_characters = self.data.item.get_characters(data["userId"]) + if user_characters is None: + return {} + + max_ct = data["maxCount"] + next_idx = data["nextIndex"] + start_idx = next_idx + end_idx = max_ct + start_idx + + if len(user_characters[start_idx:]) > max_ct: + next_idx += max_ct + else: + next_idx = -1 + + character_list = [] + for character in user_characters: + tmp = character._asdict() + tmp.pop("id") + tmp.pop("user") + character_list.append(tmp) + + return { + "userId": data["userId"], + "length": len(character_list[start_idx:end_idx]), + "nextIndex": next_idx, + "userCharacterList": character_list[start_idx:end_idx] + } + + def handle_get_user_gacha_api_request(self, data: Dict) -> Dict: + user_gachas = self.data.item.get_user_gachas(data["userId"]) + if user_gachas is None: + return { + "userId": data["userId"], + "length": 0, + "userGachaList": [] + } + + user_gacha_list = [] + for gacha in user_gachas: + tmp = gacha._asdict() + tmp.pop("id") + tmp.pop("user") + tmp["dailyGachaDate"] = datetime.strftime( + tmp["dailyGachaDate"], "%Y-%m-%d") + user_gacha_list.append(tmp) + + return { + "userId": data["userId"], + "length": len(user_gacha_list), + "userGachaList": user_gacha_list + } + + def handle_cm_get_user_item_api_request(self, data: Dict) -> Dict: + return self.handle_get_user_item_api_request(data) + + def handle_cm_get_user_gacha_supply_api_request(self, data: Dict) -> Dict: + # not used for now? not sure what it even does + user_gacha_supplies = self.data.item.get_user_gacha_supplies( + data["userId"]) + if user_gacha_supplies is None: + return { + "supplyId": 1, + "length": 0, + "supplyCardList": [] + } + + supply_list = [gacha["cardId"] for gacha in user_gacha_supplies] + + return { + "supplyId": 1, + "length": len(supply_list), + "supplyCardList": supply_list + } + + def handle_get_game_gacha_api_request(self, data: Dict) -> Dict: + """ + returns all current active banners (gachas) + "Select Gacha" requires maxSelectPoint set and isCeiling set to 1 + """ + game_gachas = [] + # for every gacha_id in the OngekiConfig, grab the banner from the db + for gacha_id in self.game_cfg.gachas.enabled_gachas: + game_gacha = self.data.static.get_gacha(self.version, gacha_id) + if game_gacha: + game_gachas.append(game_gacha) + + # clean the database rows + game_gacha_list = [] + for gacha in game_gachas: + tmp = gacha._asdict() + tmp.pop("id") + tmp.pop("version") + tmp["startDate"] = datetime.strftime( + tmp["startDate"], "%Y-%m-%d %H:%M:%S") + tmp["endDate"] = datetime.strftime( + tmp["endDate"], "%Y-%m-%d %H:%M:%S") + tmp["noticeStartDate"] = datetime.strftime( + tmp["noticeStartDate"], "%Y-%m-%d %H:%M:%S") + tmp["noticeEndDate"] = datetime.strftime( + tmp["noticeEndDate"], "%Y-%m-%d %H:%M:%S") + tmp["convertEndDate"] = datetime.strftime( + tmp["convertEndDate"], "%Y-%m-%d %H:%M:%S") + + # make sure to only show gachas for the current version + # so only up to bright, 1140 is the first bright memory gacha + if tmp["gachaId"] < 1140: + game_gacha_list.append(tmp) + + return { + "length": len(game_gacha_list), + "gameGachaList": game_gacha_list, + # no clue + "registIdList": [] + } + + def handle_roll_gacha_api_request(self, data: Dict) -> Dict: + """ + Handle a gacha roll API request + """ + gacha_id = data["gachaId"] + num_rolls = data["times"] + # change_rate is the 5 gacha rool SR gurantee once a week + change_rate = data["changeRate"] + # SSR book which guarantees a SSR card, itemKind=15, itemId=1 + book_used = data["bookUseCount"] + if num_rolls not in {1, 5, 11}: + return {} + + # https://gamerch.com/ongeki/entry/462978 + + # 77% chance of gett ing a R card + # 20% chance of getting a SR card + # 3% chance of getting a SSR card + rarity = [1 for _ in range(77)] + rarity += [2 for _ in range(20)] + rarity += [3 for _ in range(3)] + + # gachaId 1011 is "無料ガチャ" (free gacha), which requires GatchaTickets + # itemKind=11, itemId=1 and appearenty sucks + # 94% chance of getting a R card + # 5% chance of getting a SR card + # 1% chance of getting a SSR card + if gacha_id == 1011: + rarity = [1 for _ in range(94)] + rarity += [2 for _ in range(5)] + rarity += [3 for _ in range(1)] + + # gachaId 1012 is "無料ガチャ（SR確定）" (SR confirmed! free gacha), which + # requires GatchaTickets itemKind=11, itemId=4 and always guarantees + # a SR card or higher + # 92% chance of getting a SR card + # 8% chance of getting a SSR card + elif gacha_id == 1012: + rarity = [2 for _ in range(92)] + rarity += [3 for _ in range(8)] + + assert len(rarity) == 100 + + # uniform distribution to get the rarity of the card + rolls = [rarity[randint(0, len(rarity)-1)] for _ in range(num_rolls)] + + # if SSR book used, make sure you always get one SSR + if book_used == 1: + if rolls.count(3) == 0: + # if there is no SSR, re-roll + return self.handle_roll_gacha_api_request(data) + # make sure that 11 rolls always have at least 1 SR or SSR + elif (num_rolls == 5 and change_rate is True) or num_rolls == 11: + if rolls.count(2) == 0 and rolls.count(3) == 0: + # if there is no SR or SSR, re-roll + return self.handle_roll_gacha_api_request(data) + + # get a list of cards for each rarity + cards_r = self.data.static.get_cards_by_rarity(self.version, 1) + cards_sr, cards_ssr = [], [] + + # free gachas are only allowed to get their specific cards! (R irrelevant) + if gacha_id in {1011, 1012}: + gacha_cards = self.data.static.get_gacha_cards(gacha_id) + for card in gacha_cards: + if card["rarity"] == 3: + cards_sr.append({ + "cardId": card["cardId"], + "rarity": 2 + }) + elif card["rarity"] == 4: + cards_ssr.append({ + "cardId": card["cardId"], + "rarity": 3 + }) + else: + cards_sr = self.data.static.get_cards_by_rarity(self.version, 2) + cards_ssr = self.data.static.get_cards_by_rarity(self.version, 3) + + # get the promoted cards for that gacha and add them multiple + # times to increase chances by factor chances + chances = 10 + + gacha_cards = self.data.static.get_gacha_cards(gacha_id) + for card in gacha_cards: + # make sure to add the cards to the corresponding rarity + if card["rarity"] == 2: + cards_r += [{ + "cardId": card["cardId"], + "rarity": 1 + }] * chances + if card["rarity"] == 3: + cards_sr += [{ + "cardId": card["cardId"], + "rarity": 2 + }] * chances + elif card["rarity"] == 4: + cards_ssr += [{ + "cardId": card["cardId"], + "rarity": 3 + }] * chances + + # get the card id for each roll + rolled_cards = [] + for i in range(len(rolls)): + if rolls[i] == 1: + rolled_cards.append(cards_r[randint(0, len(cards_r)-1)]) + elif rolls[i] == 2: + rolled_cards.append(cards_sr[randint(0, len(cards_sr)-1)]) + elif rolls[i] == 3: + rolled_cards.append(cards_ssr[randint(0, len(cards_ssr)-1)]) + + game_gacha_card_list = [] + for card in rolled_cards: + game_gacha_card_list.append({ + "gachaId": data["gachaId"], + "cardId": card["cardId"], + # +1 because Card Maker is weird + "rarity": card["rarity"] + 1, + "weight": 1, + "isPickup": False, + "isSelect": False + }) + + return { + "length": len(game_gacha_card_list), + "gameGachaCardList": game_gacha_card_list + } + + def handle_cm_upsert_user_gacha_api_request(self, data: Dict): + upsert = data["cmUpsertUserGacha"] + user_id = data["userId"] + + gacha_id = data["gachaId"] + gacha_count = data["gachaCnt"] + play_date = datetime.strptime(data["playDate"][:10], '%Y-%m-%d') + select_point = data["selectPoint"] + + total_gacha_count, ceiling_gacha_count = 0, 0 + daily_gacha_cnt, five_gacha_cnt, eleven_gacha_cnt = 0, 0, 0 + daily_gacha_date = datetime.strptime('2000-01-01', '%Y-%m-%d') + + # check if the user previously rolled the exact same gacha + user_gacha = self.data.item.get_user_gacha(user_id, gacha_id) + if user_gacha: + total_gacha_count = user_gacha["totalGachaCnt"] + ceiling_gacha_count = user_gacha["ceilingGachaCnt"] + daily_gacha_cnt = user_gacha["dailyGachaCnt"] + five_gacha_cnt = user_gacha["fiveGachaCnt"] + eleven_gacha_cnt = user_gacha["elevenGachaCnt"] + # parse just the year, month and date + daily_gacha_date = user_gacha["dailyGachaDate"] + + # if the saved dailyGachaDate is different from the roll, + # reset dailyGachaCnt and change the date + if daily_gacha_date != play_date: + daily_gacha_date = play_date + daily_gacha_cnt = 0 + + self.data.item.put_user_gacha( + user_id, + gacha_id, + totalGachaCnt=total_gacha_count + gacha_count, + ceilingGachaCnt=ceiling_gacha_count + gacha_count, + selectPoint=select_point, + useSelectPoint=0, + dailyGachaCnt=daily_gacha_cnt + gacha_count, + fiveGachaCnt=five_gacha_cnt+1 if gacha_count == 5 else five_gacha_cnt, + elevenGachaCnt=eleven_gacha_cnt+1 if gacha_count == 11 else eleven_gacha_cnt, + dailyGachaDate=daily_gacha_date + ) + + if "userData" in upsert and len(upsert["userData"]) > 0: + # check if the profile is a bright memory profile + p = self.data.profile.get_profile_data(data["userId"], self.version+1) + if p is not None: + # save the bright memory profile + self.data.profile.put_profile_data( + user_id, self.version+1, upsert["userData"][0]) + else: + # save the bright profile + self.data.profile.put_profile_data( + user_id, self.version, upsert["userData"][0]) + + if "userCharacterList" in upsert: + for x in upsert["userCharacterList"]: + self.data.item.put_character(user_id, x) + + if "userItemList" in upsert: + for x in upsert["userItemList"]: + self.data.item.put_item(user_id, x) + + if "userCardList" in upsert: + for x in upsert["userCardList"]: + self.data.item.put_card(user_id, x) + + # TODO? + # if "gameGachaCardList" in upsert: + # for x in upsert["gameGachaCardList"]: + + return {'returnCode': 1, 'apiName': 'CMUpsertUserGachaApi'} + + def handle_cm_upsert_user_select_gacha_api_request(self, data: Dict) -> Dict: + upsert = data["cmUpsertUserSelectGacha"] + user_id = data["userId"] + + if "userData" in upsert and len(upsert["userData"]) > 0: + # check if the profile is a bright memory profile + p = self.data.profile.get_profile_data(data["userId"], self.version+1) + if p is not None: + # save the bright memory profile + self.data.profile.put_profile_data( + user_id, self.version+1, upsert["userData"][0]) + else: + # save the bright profile + self.data.profile.put_profile_data( + user_id, self.version, upsert["userData"][0]) + + if "userCharacterList" in upsert: + for x in upsert["userCharacterList"]: + self.data.item.put_character(user_id, x) + + if "userCardList" in upsert: + for x in upsert["userCardList"]: + self.data.item.put_card(user_id, x) + + if "selectGachaLogList" in data: + for x in data["selectGachaLogList"]: + self.data.item.put_user_gacha( + user_id, + x["gachaId"], + selectPoint=0, + useSelectPoint=x["useSelectPoint"] + ) + + return {'returnCode': 1, 'apiName': 'cmUpsertUserSelectGacha'} + + def handle_get_game_gacha_card_by_id_api_request(self, data: Dict) -> Dict: + game_gacha_cards = self.data.static.get_gacha_cards(data["gachaId"]) + if game_gacha_cards == []: + # fallback to be at least able to select that gacha + return { + "gachaId": data["gachaId"], + "length": 6, + "isPickup": False, + "gameGachaCardList": [ + { + "gachaId": data["gachaId"], + "cardId": 100984, + "rarity": 4, + "weight": 1, + "isPickup": False, + "isSelect": True + }, + { + "gachaId": data["gachaId"], + "cardId": 100997, + "rarity": 3, + "weight": 2, + "isPickup": False, + "isSelect": True + }, + { + "gachaId": data["gachaId"], + "cardId": 100998, + "rarity": 3, + "weight": 2, + "isPickup": False, + "isSelect": True + }, + { + "gachaId": data["gachaId"], + "cardId": 101020, + "rarity": 2, + "weight": 3, + "isPickup": False, + "isSelect": True + }, + { + "gachaId": data["gachaId"], + "cardId": 101021, + "rarity": 2, + "weight": 3, + "isPickup": False, + "isSelect": True + }, + { + "gachaId": data["gachaId"], + "cardId": 101022, + "rarity": 2, + "weight": 3, + "isPickup": False, + "isSelect": True + } + ], + "emissionList": [], + "afterCalcList": [], + "ssrBookCalcList": [] + } + + game_gacha_card_list = [] + for gacha_card in game_gacha_cards: + tmp = gacha_card._asdict() + tmp.pop("id") + game_gacha_card_list.append(tmp) + + return { + "gachaId": data["gachaId"], + "length": len(game_gacha_card_list), + "isPickup": False, + "gameGachaCardList": game_gacha_card_list, + # again no clue + "emissionList": [], + "afterCalcList": [], + "ssrBookCalcList": [] + } + + def handle_get_game_theater_api_request(self, data: Dict) -> Dict: + """ + shows a banner after every print, not sure what its used for + """ + + """ + return { + "length": 1, + "gameTheaterList": [{ + "theaterId": 1, + "theaterName": "theaterName", + "startDate": "2018-01-01 00:00:00.0", + "endDate": "2038-01-01 00:00:00.0", + "gameSubTheaterList": [{ + "theaterId": 1, + "id": 2, + "no": 4 + }] + } + ], + "registIdList": [] + } + """ + + return { + "length": 0, + "gameTheaterList": [], + "registIdList": [] + } + + def handle_cm_upsert_user_print_playlog_api_request(self, data: Dict) -> Dict: + return { + "returnCode": 1, + "orderId": 0, + "serialId": "11111111111111111111", + "apiName": "CMUpsertUserPrintPlaylogApi" + } + + def handle_cm_upsert_user_printlog_api_request(self, data: Dict) -> Dict: + return { + "returnCode": 1, + "orderId": 0, + "serialId": "11111111111111111111", + "apiName": "CMUpsertUserPrintlogApi" + } + + def handle_cm_upsert_user_print_api_request(self, data: Dict) -> Dict: + user_print_detail = data["userPrintDetail"] + + # generate random serial id + serial_id = ''.join([str(randint(0, 9)) for _ in range(20)]) + + # not needed because are either zero or unset + user_print_detail.pop("orderId") + user_print_detail.pop("printNumber") + user_print_detail.pop("serialId") + user_print_detail["printDate"] = datetime.strptime( + user_print_detail["printDate"], '%Y-%m-%d' + ) + + # add the entry to the user print table with the random serialId + self.data.item.put_user_print_detail( + data["userId"], + serial_id, + user_print_detail + ) + + return { + "returnCode": 1, + "serialId": serial_id, + "apiName": "CMUpsertUserPrintApi" + } + + def handle_cm_upsert_user_all_api_request(self, data: Dict) -> Dict: + upsert = data["cmUpsertUserAll"] + user_id = data["userId"] + + if "userData" in upsert and len(upsert["userData"]) > 0: + # check if the profile is a bright memory profile + p = self.data.profile.get_profile_data(data["userId"], self.version+1) + if p is not None: + # save the bright memory profile + self.data.profile.put_profile_data( + user_id, self.version+1, upsert["userData"][0]) + else: + # save the bright profile + self.data.profile.put_profile_data( + user_id, self.version, upsert["userData"][0]) + + if "userActivityList" in upsert: + for act in upsert["userActivityList"]: + self.data.profile.put_profile_activity( + user_id, act["kind"], act["id"], act["sortNumber"], + act["param1"], act["param2"], act["param3"], act["param4"]) + + if "userItemList" in upsert: + for x in upsert["userItemList"]: + self.data.item.put_item(user_id, x) + + if "userCardList" in upsert: + for x in upsert["userCardList"]: + self.data.item.put_card(user_id, x) + + return {'returnCode': 1, 'apiName': 'cmUpsertUserAll'} diff --git a/titles/ongeki/config.py b/titles/ongeki/config.py index 722677c..3a89f29 100644 --- a/titles/ongeki/config.py +++ b/titles/ongeki/config.py @@ -1,17 +1,31 @@ +from typing import List + from core.config import CoreConfig + class OngekiServerConfig(): def __init__(self, parent_config: "OngekiConfig") -> None: self.__config = parent_config - + @property def enable(self) -> bool: return CoreConfig.get_config_field(self.__config, 'ongeki', 'server', 'enable', default=True) - + @property def loglevel(self) -> int: return CoreConfig.str_to_loglevel(CoreConfig.get_config_field(self.__config, 'ongeki', 'server', 'loglevel', default="info")) + +class OngekiGachaConfig(): + def __init__(self, parent_config: "OngekiConfig") -> None: + self.__config = parent_config + + @property + def enabled_gachas(self) -> List[int]: + return CoreConfig.get_config_field(self.__config, 'ongeki', 'gachas', 'enabled_gachas', default=[]) + + class OngekiConfig(dict): def __init__(self) -> None: self.server = OngekiServerConfig(self) + self.gachas = OngekiGachaConfig(self) diff --git a/titles/ongeki/const.py b/titles/ongeki/const.py index dd6c0f5..518459a 100644 --- a/titles/ongeki/const.py +++ b/titles/ongeki/const.py @@ -1,5 +1,7 @@ from typing import Final, Dict from enum import Enum + + class OngekiConstants(): GAME_CODE = "SDDT" @@ -35,6 +37,20 @@ class OngekiConstants(): 'SilverJewelEvent', ]) + class CM_GACHA_KINDS(Enum): + Normal = 0 + Pickup = 1 + BonusRestored = 2 + Free = 3 + PickupBonusRestored = 4 + + class RARITY_TYPES(Enum): + N = 0 + R = 1 + SR = 2 + SSR = 3 + SRPlus = 12 + # The game expects the server to give Lunatic an ID of 10, while the game uses 4 internally... except in Music.xml class DIFF_NAME(Enum): Basic = 0 @@ -48,4 +64,4 @@ class OngekiConstants(): @classmethod def game_ver_to_string(cls, ver: int): - return cls.VERSION_NAMES[ver] \ No newline at end of file + return cls.VERSION_NAMES[ver] diff --git a/titles/ongeki/schema/item.py b/titles/ongeki/schema/item.py index c3f8c7e..001388a 100644 --- a/titles/ongeki/schema/item.py +++ b/titles/ongeki/schema/item.py @@ -2,6 +2,7 @@ from typing import Dict, Optional, List from sqlalchemy import Table, Column, UniqueConstraint, PrimaryKeyConstraint, and_ from sqlalchemy.types import Integer, String, TIMESTAMP, Boolean, JSON from sqlalchemy.schema import ForeignKey +from sqlalchemy.engine import Row from sqlalchemy.sql import func, select from sqlalchemy.dialects.mysql import insert @@ -242,6 +243,63 @@ tech_event = Table( mysql_charset='utf8mb4' ) +gacha = Table( + "ongeki_user_gacha", + metadata, + Column("id", Integer, primary_key=True, nullable=False), + Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column("gachaId", Integer, nullable=False), + Column("totalGachaCnt", Integer, server_default="0"), + Column("ceilingGachaCnt", Integer, server_default="0"), + Column("selectPoint", Integer, server_default="0"), + Column("useSelectPoint", Integer, server_default="0"), + Column("dailyGachaCnt", Integer, server_default="0"), + Column("fiveGachaCnt", Integer, server_default="0"), + Column("elevenGachaCnt", Integer, server_default="0"), + Column("dailyGachaDate", TIMESTAMP, nullable=False, server_default=func.now()), + UniqueConstraint("user", "gachaId", name="ongeki_user_gacha_uk"), + mysql_charset='utf8mb4' +) + +gacha_supply = Table( + "ongeki_user_gacha_supply", + metadata, + Column("id", Integer, primary_key=True, nullable=False), + Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column("cardId", Integer, nullable=False), + UniqueConstraint("user", "cardId", name="ongeki_user_gacha_supply_uk"), + mysql_charset='utf8mb4' +) + + +print_detail = Table( + "ongeki_user_print_detail", + metadata, + Column("id", Integer, primary_key=True, nullable=False), + Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column("cardId", Integer, nullable=False), + Column("cardType", Integer, server_default="0"), + Column("printDate", TIMESTAMP, nullable=False), + Column("serialId", String(20), nullable=False), + Column("placeId", Integer, nullable=False), + Column("clientId", String(11), nullable=False), + Column("printerSerialId", String(20), nullable=False), + Column("isHolograph", Boolean, server_default="0"), + Column("isAutographed", Boolean, server_default="0"), + Column("printOption1", Boolean, server_default="1"), + Column("printOption2", Boolean, server_default="1"), + Column("printOption3", Boolean, server_default="1"), + Column("printOption4", Boolean, server_default="1"), + Column("printOption5", Boolean, server_default="1"), + Column("printOption6", Boolean, server_default="1"), + Column("printOption7", Boolean, server_default="1"), + Column("printOption8", Boolean, server_default="1"), + Column("printOption9", Boolean, server_default="1"), + Column("printOption10", Boolean, server_default="0"), + UniqueConstraint("serialId", name="ongeki_user_print_detail_uk"), + mysql_charset='utf8mb4' +) + class OngekiItemData(BaseData): def put_card(self, aime_id: int, card_data: Dict) -> Optional[int]: @@ -545,7 +603,7 @@ class OngekiItemData(BaseData): if result is None: return None return result.fetchall() - + def put_memorychapter(self, aime_id: int, memorychapter_data: Dict) -> Optional[int]: memorychapter_data["user"] = aime_id @@ -557,10 +615,73 @@ class OngekiItemData(BaseData): self.logger.warn(f"put_memorychapter: Failed to update! aime_id: {aime_id}") return None return result.lastrowid - + def get_memorychapters(self, aime_id: int) -> Optional[List[Dict]]: sql = select(memorychapter).where(memorychapter.c.user == aime_id) result = self.execute(sql) - if result is None: return None - return result.fetchall() \ No newline at end of file + if result is None: + return None + return result.fetchall() + + def get_user_gacha(self, aime_id: int, gacha_id: int) -> Optional[Row]: + sql = gacha.select(and_( + gacha.c.user == aime_id, + gacha.c.gachaId == gacha_id + )) + + result = self.execute(sql) + if result is None: + return None + return result.fetchone() + + def get_user_gachas(self, aime_id: int) -> Optional[List[Row]]: + sql = gacha.select(gacha.c.user == aime_id) + + result = self.execute(sql) + if result is None: + return None + return result.fetchall() + + def get_user_gacha_supplies(self, aime_id: int) -> Optional[List[Row]]: + sql = gacha_supply.select(gacha_supply.c.user == aime_id) + + result = self.execute(sql) + if result is None: + return None + return result.fetchall() + + def put_user_gacha(self, aime_id: int, gacha_id: int, **data) -> Optional[int]: + sql = insert(gacha).values( + user=aime_id, + gachaId=gacha_id, + **data) + + conflict = sql.on_duplicate_key_update( + user=aime_id, + gachaId=gacha_id, + **data) + result = self.execute(conflict) + + if result is None: + self.logger.warn(f"put_user_gacha: Failed to insert! aime_id: {aime_id}") + return None + return result.lastrowid + + def put_user_print_detail(self, aime_id: int, serial_id: str, + user_print_data: Dict) -> Optional[int]: + sql = insert(print_detail).values( + user=aime_id, + serialId=serial_id, + **user_print_data) + + conflict = sql.on_duplicate_key_update( + user=aime_id, + serialId=serial_id, + **user_print_data) + result = self.execute(conflict) + + if result is None: + self.logger.warn(f"put_user_print_detail: Failed to insert! aime_id: {aime_id}") + return None + return result.lastrowid diff --git a/titles/ongeki/schema/profile.py b/titles/ongeki/schema/profile.py index 26c79b5..d7514c6 100644 --- a/titles/ongeki/schema/profile.py +++ b/titles/ongeki/schema/profile.py @@ -78,7 +78,8 @@ profile = Table( Column("overDamageBattlePoint", Integer, server_default="0"), Column("bestBattlePoint", Integer, server_default="0"), Column("lastEmoneyBrand", Integer, server_default="0"), - Column("isDialogWatchedSuggestMemory", Boolean), + Column("lastEmoneyCredit", Integer, server_default="0"), + Column("isDialogWatchedSuggestMemory", Boolean, server_default="0"), UniqueConstraint("user", "version", name="ongeki_profile_profile_uk"), mysql_charset='utf8mb4' ) diff --git a/titles/ongeki/schema/static.py b/titles/ongeki/schema/static.py index e98ec58..2e1bc51 100644 --- a/titles/ongeki/schema/static.py +++ b/titles/ongeki/schema/static.py @@ -37,7 +37,210 @@ music = Table( mysql_charset='utf8mb4' ) +gachas = Table( + "ongeki_static_gachas", + metadata, + Column("id", Integer, primary_key=True, nullable=False), + Column("version", Integer, nullable=False), + Column("gachaId", Integer, nullable=False), + Column("gachaName", String(255), nullable=False), + Column("type", Integer, nullable=False, server_default="0"), + Column("kind", Integer, nullable=False, server_default="0"), + Column("isCeiling", Boolean, server_default="0"), + Column("maxSelectPoint", Integer, server_default="0"), + Column("ceilingCnt", Integer, server_default="10"), + Column("changeRateCnt1", Integer, server_default="0"), + Column("changeRateCnt2", Integer, server_default="0"), + Column("startDate", TIMESTAMP, server_default="2018-01-01 00:00:00.0"), + Column("endDate", TIMESTAMP, server_default="2038-01-01 00:00:00.0"), + Column("noticeStartDate", TIMESTAMP, server_default="2018-01-01 00:00:00.0"), + Column("noticeEndDate", TIMESTAMP, server_default="2038-01-01 00:00:00.0"), + Column("convertEndDate", TIMESTAMP, server_default="2038-01-01 00:00:00.0"), + UniqueConstraint("version", "gachaId", "gachaName", name="ongeki_static_gachas_uk"), + mysql_charset='utf8mb4' +) + +gacha_cards = Table( + "ongeki_static_gacha_cards", + metadata, + Column("id", Integer, primary_key=True, nullable=False), + Column("gachaId", Integer, nullable=False), + Column("cardId", Integer, nullable=False), + Column("rarity", Integer, nullable=False), + Column("weight", Integer, server_default="1"), + Column("isPickup", Boolean, server_default="0"), + Column("isSelect", Boolean, server_default="0"), + UniqueConstraint("gachaId", "cardId", name="ongeki_static_gacha_cards_uk"), + mysql_charset='utf8mb4' +) + +cards = Table( + "ongeki_static_cards", + metadata, + Column("id", Integer, primary_key=True, nullable=False), + Column("version", Integer, nullable=False), + Column("cardId", Integer, nullable=False), + Column("name", String(255), nullable=False), + Column("charaId", Integer, nullable=False), + Column("nickName", String(255)), + Column("school", String(255), nullable=False), + Column("attribute", String(5), nullable=False), + Column("gakunen", String(255), nullable=False), + Column("rarity", Integer, nullable=False), + Column("levelParam", String(255), nullable=False), + Column("skillId", Integer, nullable=False), + Column("choKaikaSkillId", Integer, nullable=False), + Column("cardNumber", String(255)), + UniqueConstraint("version", "cardId", name="ongeki_static_cards_uk"), + mysql_charset='utf8mb4' +) + + class OngekiStaticData(BaseData): + def put_card(self, version: int, card_id: int, **card_data) -> Optional[int]: + sql = insert(cards).values( + version=version, + cardId=card_id, + **card_data) + + conflict = sql.on_duplicate_key_update(**card_data) + + result = self.execute(conflict) + if result is None: + self.logger.warn(f"Failed to insert card! card_id {card_id}") + return None + return result.lastrowid + + def get_card(self, version: int, card_id: int) -> Optional[Dict]: + sql = cards.select(and_( + cards.c.version <= version, + cards.c.cardId == card_id + )) + + result = self.execute(sql) + if result is None: + return None + return result.fetchone() + + def get_card_by_card_number(self, version: int, card_number: str) -> Optional[Dict]: + if not card_number.startswith("[O.N.G.E.K.I.]"): + card_number = f"[O.N.G.E.K.I.]{card_number}" + + sql = cards.select(and_( + cards.c.version <= version, + cards.c.cardNumber == card_number + )) + + result = self.execute(sql) + if result is None: + return None + return result.fetchone() + + def get_card_by_name(self, version: int, name: str) -> Optional[Dict]: + sql = cards.select(and_( + cards.c.version <= version, + cards.c.name == name + )) + + result = self.execute(sql) + if result is None: + return None + return result.fetchone() + + def get_cards(self, version: int) -> Optional[List[Dict]]: + sql = cards.select(cards.c.version <= version) + + result = self.execute(sql) + if result is None: + return None + return result.fetchall() + + def get_cards_by_rarity(self, version: int, rarity: int) -> Optional[List[Dict]]: + sql = cards.select(and_( + cards.c.version <= version, + cards.c.rarity == rarity + )) + + result = self.execute(sql) + if result is None: + return None + return result.fetchall() + + def put_gacha(self, version: int, gacha_id: int, gacha_name: int, + gacha_kind: int, **gacha_data) -> Optional[int]: + sql = insert(gachas).values( + version=version, + gachaId=gacha_id, + gachaName=gacha_name, + kind=gacha_kind, + **gacha_data + ) + + conflict = sql.on_duplicate_key_update( + version=version, + gachaId=gacha_id, + gachaName=gacha_name, + kind=gacha_kind, + **gacha_data + ) + + result = self.execute(conflict) + if result is None: + self.logger.warn(f"Failed to insert gacha! gacha_id {gacha_id}") + return None + return result.lastrowid + + def get_gacha(self, version: int, gacha_id: int) -> Optional[Dict]: + sql = gachas.select(and_( + gachas.c.version == version, + gachas.c.gachaId == gacha_id + )) + + result = self.execute(sql) + if result is None: + return None + return result.fetchone() + + def get_gachas(self, version: int) -> Optional[List[Dict]]: + sql = gachas.select( + gachas.c.version == version).order_by( + gachas.c.gachaId.asc() + ) + + result = self.execute(sql) + if result is None: + return None + return result.fetchall() + + def put_gacha_card(self, gacha_id: int, card_id: int, **gacha_card) -> Optional[int]: + sql = insert(gacha_cards).values( + gachaId=gacha_id, + cardId=card_id, + **gacha_card + ) + + conflict = sql.on_duplicate_key_update( + gachaId=gacha_id, + cardId=card_id, + **gacha_card + ) + + result = self.execute(conflict) + if result is None: + self.logger.warn(f"Failed to insert gacha card! gacha_id {gacha_id}") + return None + return result.lastrowid + + def get_gacha_cards(self, gacha_id: int) -> Optional[List[Dict]]: + sql = gacha_cards.select( + gacha_cards.c.gachaId == gacha_id + ) + + result = self.execute(sql) + if result is None: + return None + return result.fetchall() + def put_event(self, version: int, event_id: int, event_type: int, event_name: str) -> Optional[int]: sql = insert(events).values( version = version, From 4f3d3d8395b5ca416792e2f12f273b171398d48e Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Fri, 3 Mar 2023 19:23:14 -0500 Subject: [PATCH 02/63] database: fix error when trying to upgrade the schema for a game that wasn't created yet --- core/data/schema/base.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/data/schema/base.py b/core/data/schema/base.py index 78f3ab4..fd49ac1 100644 --- a/core/data/schema/base.py +++ b/core/data/schema/base.py @@ -85,7 +85,12 @@ class BaseData(): result = self.execute(sql) if result is None: return None - return result.fetchone()["version"] + + row = result.fetchone() + if row is None: + return None + + return row["version"] def set_schema_ver(self, ver: int, game: str = "CORE") -> Optional[int]: sql = insert(schema_ver).values(game = game, version = ver) From dc5e5c14407a400f7d85bac7c2a6a9c0c4731890 Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Fri, 3 Mar 2023 19:56:12 -0500 Subject: [PATCH 03/63] database: fix event logging table --- core/data/schema/base.py | 7 ++++--- core/data/schema/versions/CORE_2_rollback.sql | 1 + core/data/schema/versions/CORE_3_upgrade.sql | 1 + dbutils.py | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 core/data/schema/versions/CORE_2_rollback.sql create mode 100644 core/data/schema/versions/CORE_3_upgrade.sql diff --git a/core/data/schema/base.py b/core/data/schema/base.py index fd49ac1..955c772 100644 --- a/core/data/schema/base.py +++ b/core/data/schema/base.py @@ -29,6 +29,7 @@ event_log = Table( Column("system", String(255), nullable=False), Column("type", String(255), nullable=False), Column("severity", Integer, nullable=False), + Column("message", String(1000), nullable=False), Column("details", JSON, nullable=False), Column("when_logged", TIMESTAMP, nullable=False, server_default=func.now()), mysql_charset='utf8mb4' @@ -102,12 +103,12 @@ class BaseData(): return None return result.lastrowid - def log_event(self, system: str, type: str, severity: int, details: Dict) -> Optional[int]: - sql = event_log.insert().values(system = system, type = type, severity = severity, details = json.dumps(details)) + def log_event(self, system: str, type: str, severity: int, message: str, details: Dict = {}) -> Optional[int]: + sql = event_log.insert().values(system = system, type = type, severity = severity, message = message, details = json.dumps(details)) result = self.execute(sql) if result is None: - self.logger.error(f"{__name__}: Failed to insert event into event log! system = {system}, type = {type}, severity = {severity}, details = {details}") + self.logger.error(f"{__name__}: Failed to insert event into event log! system = {system}, type = {type}, severity = {severity}, message = {message}") return None return result.lastrowid diff --git a/core/data/schema/versions/CORE_2_rollback.sql b/core/data/schema/versions/CORE_2_rollback.sql new file mode 100644 index 0000000..8944df0 --- /dev/null +++ b/core/data/schema/versions/CORE_2_rollback.sql @@ -0,0 +1 @@ +ALTER TABLE `event_log` DROP COLUMN `message`; \ No newline at end of file diff --git a/core/data/schema/versions/CORE_3_upgrade.sql b/core/data/schema/versions/CORE_3_upgrade.sql new file mode 100644 index 0000000..cc0e8c6 --- /dev/null +++ b/core/data/schema/versions/CORE_3_upgrade.sql @@ -0,0 +1 @@ +ALTER TABLE `event_log` ADD COLUMN `message` VARCHAR(1000) NOT NULL AFTER `severity`; \ No newline at end of file diff --git a/dbutils.py b/dbutils.py index 4500a13..6285e30 100644 --- a/dbutils.py +++ b/dbutils.py @@ -28,7 +28,7 @@ if __name__=='__main__': if args.game is None: data.logger.info("No game set, upgrading core schema") - data.migrate_database("CORE", int(args.version)) + data.migrate_database("CORE", int(args.version), args.action) else: data.migrate_database(args.game, int(args.version), args.action) From 279f48dc0cc78619f38a3dbe684ef472c0f00753 Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Fri, 3 Mar 2023 21:31:23 -0500 Subject: [PATCH 04/63] frontend: fix login, remove frontend_session in favor of twisted sessions --- core/data/database.py | 2 +- core/data/schema/user.py | 62 ++++--------------- core/data/schema/versions/CORE_3_rollback.sql | 12 ++++ core/data/schema/versions/CORE_4_upgrade.sql | 1 + core/frontend.py | 62 +++++++++++++------ core/frontend/gate/gate.jinja | 15 ++++- core/frontend/widgets/topbar.jinja | 5 ++ 7 files changed, 88 insertions(+), 71 deletions(-) create mode 100644 core/data/schema/versions/CORE_3_rollback.sql create mode 100644 core/data/schema/versions/CORE_4_upgrade.sql diff --git a/core/data/database.py b/core/data/database.py index 65b01aa..4ba3b3a 100644 --- a/core/data/database.py +++ b/core/data/database.py @@ -31,7 +31,7 @@ class Data: self.arcade = ArcadeData(self.config, self.session) self.card = CardData(self.config, self.session) self.base = BaseData(self.config, self.session) - self.schema_ver_latest = 2 + self.schema_ver_latest = 4 log_fmt_str = "[%(asctime)s] %(levelname)s | Database | %(message)s" log_fmt = logging.Formatter(log_fmt_str) diff --git a/core/data/schema/user.py b/core/data/schema/user.py index 9e79891..b7f72e2 100644 --- a/core/data/schema/user.py +++ b/core/data/schema/user.py @@ -9,6 +9,7 @@ from sqlalchemy.sql import func, select, Delete from uuid import uuid4 from datetime import datetime, timedelta from sqlalchemy.engine import Row +import bcrypt from core.data.schema.base import BaseData, metadata @@ -26,17 +27,6 @@ aime_user = Table( mysql_charset='utf8mb4' ) -frontend_session = Table( - "frontend_session", - metadata, - Column("id", Integer, primary_key=True, unique=True), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), - Column("ip", String(15)), - Column('session_cookie', String(32), nullable=False, unique=True), - Column("expires", TIMESTAMP, nullable=False), - mysql_charset='utf8mb4' -) - class PermissionBits(Enum): PermUser = 1 PermMod = 2 @@ -74,50 +64,20 @@ class UserData(BaseData): if result is None: return None return result.lastrowid - def login(self, user_id: int, passwd: bytes = None, ip: str = "0.0.0.0") -> Optional[str]: - sql = select(aime_user).where(and_(aime_user.c.id == user_id, aime_user.c.password == passwd)) - - result = self.execute(sql) - if result is None: return None - - usr = result.fetchone() - if usr is None: return None - - return self.create_session(user_id, ip) - - def check_session(self, cookie: str, ip: str = "0.0.0.0") -> Optional[Row]: - sql = select(frontend_session).where( - and_( - frontend_session.c.session_cookie == cookie, - frontend_session.c.ip == ip - ) - ) - - result = self.execute(sql) - if result is None: return None - return result.fetchone() - - def delete_session(self, session_id: int) -> bool: - sql = Delete(frontend_session).where(frontend_session.c.id == session_id) - + def get_user(self, user_id: int) -> Optional[Row]: + sql = select(aime_user).where(aime_user.c.id == user_id) result = self.execute(sql) if result is None: return False - return True + return result.fetchone() + + def check_password(self, user_id: int, passwd: bytes = None) -> bool: + usr = self.get_user(user_id) + if usr is None: return False - def create_session(self, user_id: int, ip: str = "0.0.0.0", expires: datetime = datetime.now() + timedelta(days=1)) -> Optional[str]: - cookie = uuid4().hex + if usr['password'] is None: + return False - sql = insert(frontend_session).values( - user = user_id, - ip = ip, - session_cookie = cookie, - expires = expires - ) - - result = self.execute(sql) - if result is None: - return None - return cookie + return bcrypt.checkpw(passwd, usr['password'].encode()) def reset_autoincrement(self, ai_value: int) -> None: # ALTER TABLE isn't in sqlalchemy so we do this the ugly way diff --git a/core/data/schema/versions/CORE_3_rollback.sql b/core/data/schema/versions/CORE_3_rollback.sql new file mode 100644 index 0000000..9132cc3 --- /dev/null +++ b/core/data/schema/versions/CORE_3_rollback.sql @@ -0,0 +1,12 @@ +CREATE TABLE `frontend_session` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `user` int(11) NOT NULL, + `ip` varchar(15) DEFAULT NULL, + `session_cookie` varchar(32) NOT NULL, + `expires` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + PRIMARY KEY (`id`), + UNIQUE KEY `id` (`id`), + UNIQUE KEY `session_cookie` (`session_cookie`), + KEY `user` (`user`), + CONSTRAINT `frontend_session_ibfk_1` FOREIGN KEY (`user`) REFERENCES `aime_user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4; \ No newline at end of file diff --git a/core/data/schema/versions/CORE_4_upgrade.sql b/core/data/schema/versions/CORE_4_upgrade.sql new file mode 100644 index 0000000..6a04c74 --- /dev/null +++ b/core/data/schema/versions/CORE_4_upgrade.sql @@ -0,0 +1 @@ +DROP TABLE `frontend_session`; \ No newline at end of file diff --git a/core/frontend.py b/core/frontend.py index 780698e..6f95073 100644 --- a/core/frontend.py +++ b/core/frontend.py @@ -4,6 +4,9 @@ from twisted.web import resource from twisted.web.util import redirectTo from twisted.web.http import Request from logging.handlers import TimedRotatingFileHandler +from twisted.web.server import Session +from zope.interface import Interface, Attribute, implementer +from twisted.python.components import registerAdapter import jinja2 import bcrypt @@ -11,6 +14,18 @@ from core.config import CoreConfig from core.data import Data from core.utils import Utils +class IUserSession(Interface): + userId = Attribute("User's ID") + current_ip = Attribute("User's current ip address") + permissions = Attribute("User's permission level") + +@implementer(IUserSession) +class UserSession(object): + def __init__(self, session): + self.userId = 0 + self.current_ip = "0.0.0.0" + self.permissions = 0 + class FrontendServlet(resource.Resource): def getChild(self, name: bytes, request: Request): self.logger.debug(f"{request.getClientIP()} -> {name.decode()}") @@ -38,6 +53,7 @@ class FrontendServlet(resource.Resource): self.logger.setLevel(cfg.frontend.loglevel) coloredlogs.install(level=cfg.frontend.loglevel, logger=self.logger, fmt=log_fmt_str) + registerAdapter(UserSession, Session, IUserSession) fe_game = FE_Game(cfg, self.environment) games = Utils.get_all_titles() @@ -59,8 +75,8 @@ class FrontendServlet(resource.Resource): def render_GET(self, request): self.logger.debug(f"{request.getClientIP()} -> {request.uri.decode()}") - template = self.environment.get_template("core/frontend/index.jinja") - return template.render(server_name=self.config.server.name, title=self.config.server.name, game_list=self.game_list).encode("utf-16") + template = self.environment.get_template("core/frontend/index.jinja") + return template.render(server_name=self.config.server.name, title=self.config.server.name, game_list=self.game_list, sesh=vars(IUserSession(request.getSession()))).encode("utf-16") class FE_Base(resource.Resource): """ @@ -80,6 +96,12 @@ class FE_Gate(FE_Base): def render_GET(self, request: Request): self.logger.debug(f"{request.getClientIP()} -> {request.uri.decode()}") uri: str = request.uri.decode() + + sesh = request.getSession() + usr_sesh = IUserSession(sesh) + if usr_sesh.userId > 0: + return redirectTo(b"/user", request) + if uri.startswith("/gate/create"): return self.create_user(request) @@ -92,7 +114,7 @@ class FE_Gate(FE_Base): else: err = 0 template = self.environment.get_template("core/frontend/gate/gate.jinja") - return template.render(title=f"{self.core_config.server.name} | Login Gate", error=err).encode("utf-16") + return template.render(title=f"{self.core_config.server.name} | Login Gate", error=err, sesh=vars(usr_sesh)).encode("utf-16") def render_POST(self, request: Request): uri = request.uri.decode() @@ -100,7 +122,7 @@ class FE_Gate(FE_Base): if uri == "/gate/gate.login": access_code: str = request.args[b"access_code"][0].decode() - passwd: str = request.args[b"passwd"][0] + passwd: bytes = request.args[b"passwd"][0] if passwd == b"": passwd = None @@ -109,20 +131,22 @@ class FE_Gate(FE_Base): return redirectTo(b"/gate?e=1", request) if passwd is None: - sesh = self.data.user.login(uid, ip=ip) + sesh = self.data.user.check_password(uid) if sesh is not None: return redirectTo(f"/gate/create?ac={access_code}".encode(), request) return redirectTo(b"/gate?e=1", request) - salt = bcrypt.gensalt() - hashed = bcrypt.hashpw(passwd, salt) - sesh = self.data.user.login(uid, hashed, ip) - - if sesh is None: + if not self.data.user.check_password(uid, passwd): return redirectTo(b"/gate?e=1", request) - - request.addCookie('session', sesh) + + self.logger.info(f"Successful login of user {uid} at {ip}") + + sesh = request.getSession() + usr_sesh = IUserSession(sesh) + usr_sesh.userId = uid + usr_sesh.current_ip = ip + return redirectTo(b"/user", request) elif uri == "/gate/gate.create": @@ -142,10 +166,8 @@ class FE_Gate(FE_Base): if result is None: return redirectTo(b"/gate?e=3", request) - sesh = self.data.user.login(uid, hashed, ip) - if sesh is None: + if not self.data.user.check_password(uid, passwd.encode()): return redirectTo(b"/gate", request) - request.addCookie('session', sesh) return redirectTo(b"/user", request) @@ -159,14 +181,18 @@ class FE_Gate(FE_Base): ac = request.args[b'ac'][0].decode() template = self.environment.get_template("core/frontend/gate/create.jinja") - return template.render(title=f"{self.core_config.server.name} | Create User", code=ac).encode("utf-16") + return template.render(title=f"{self.core_config.server.name} | Create User", code=ac, sesh={"userId": 0}).encode("utf-16") class FE_User(FE_Base): def render_GET(self, request: Request): template = self.environment.get_template("core/frontend/user/index.jinja") - return template.render().encode("utf-16") - if b'session' not in request.cookies: + + sesh: Session = request.getSession() + usr_sesh = IUserSession(sesh) + if usr_sesh.userId == 0: return redirectTo(b"/gate", request) + + return template.render(title=f"{self.core_config.server.name} | Account", sesh=vars(usr_sesh)).encode("utf-16") class FE_Game(FE_Base): isLeaf = False diff --git a/core/frontend/gate/gate.jinja b/core/frontend/gate/gate.jinja index 760fbab..4f4e2fb 100644 --- a/core/frontend/gate/gate.jinja +++ b/core/frontend/gate/gate.jinja @@ -2,10 +2,23 @@ {% block content %}

Gate

{% include "core/frontend/widgets/err_banner.jinja" %} +

- +

diff --git a/core/frontend/widgets/topbar.jinja b/core/frontend/widgets/topbar.jinja index 6bef3e3..d196361 100644 --- a/core/frontend/widgets/topbar.jinja +++ b/core/frontend/widgets/topbar.jinja @@ -9,5 +9,10 @@
+ {% if sesh is defined and sesh["userId"] > 0 %} + + {% else %} + {% endif %} +
\ No newline at end of file From 3181e1f4f857fa2003f81355470278817dd71560 Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Fri, 3 Mar 2023 21:38:26 -0500 Subject: [PATCH 05/63] frontend: add registration instructions --- core/frontend/gate/gate.jinja | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/frontend/gate/gate.jinja b/core/frontend/gate/gate.jinja index 4f4e2fb..90abb98 100644 --- a/core/frontend/gate/gate.jinja +++ b/core/frontend/gate/gate.jinja @@ -27,4 +27,6 @@

+
*To register for the webui, type in the access code of your card, as shown in a game, and leave the password field blank.
+
*If you have not registered a card with this server, you cannot create a webui account.
{% endblock content %} \ No newline at end of file From f5d4f519d389cb8be97a6df71223658f3222f06c Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Sat, 4 Mar 2023 00:04:47 -0500 Subject: [PATCH 06/63] database: add create-owner, migrate-card, and cleanup commands --- core/data/database.py | 66 +++++++++++++++++++++++++++++++++++++--- core/data/schema/card.py | 36 ++++++++++++++++++---- core/data/schema/user.py | 32 +++++++++++++------ dbutils.py | 13 ++++++++ 4 files changed, 127 insertions(+), 20 deletions(-) diff --git a/core/data/database.py b/core/data/database.py index 4ba3b3a..ab4c587 100644 --- a/core/data/database.py +++ b/core/data/database.py @@ -1,12 +1,12 @@ import logging, coloredlogs -from typing import Any, Dict, List +from typing import Optional from sqlalchemy.orm import scoped_session, sessionmaker from sqlalchemy.exc import SQLAlchemyError from sqlalchemy import create_engine from logging.handlers import TimedRotatingFileHandler -from datetime import datetime -import importlib, os, json - +import importlib, os +import secrets, string +import bcrypt from hashlib import sha256 from core.config import CoreConfig @@ -138,3 +138,61 @@ class Data: return None self.logger.info(f"Successfully migrated {game} to schema version {version}") + + def create_owner(self, email: Optional[str] = None) -> None: + pw = ''.join(secrets.choice(string.ascii_letters + string.digits) for i in range(20)) + hash = bcrypt.hashpw(pw.encode(), bcrypt.gensalt()) + + user_id = self.user.create_user(email=email, permission=255, password=hash) + if user_id is None: + self.logger.error(f"Failed to create owner with email {email}") + return + + card_id = self.card.create_card(user_id, "00000000000000000000") + if card_id is None: + self.logger.error(f"Failed to create card for owner with id {user_id}") + return + + self.logger.warn(f"Successfully created owner with email {email}, access code 00000000000000000000, and password {pw} Make sure to change this password and assign a real card ASAP!") + + def migrate_card(self, old_ac: str, new_ac: str, should_force: bool) -> None: + if old_ac == new_ac: + self.logger.error("Both access codes are the same!") + return + + new_card = self.card.get_card_by_access_code(new_ac) + if new_card is None: + self.card.update_access_code(old_ac, new_ac) + return + + if not should_force: + self.logger.warn(f"Card already exists for access code {new_ac} (id {new_card['id']}). If you wish to continue, rerun with the '--force' flag."\ + f" All exiting data on the target card {new_ac} will be perminently erased and replaced with data from card {old_ac}.") + return + + self.logger.info(f"All exiting data on the target card {new_ac} will be perminently erased and replaced with data from card {old_ac}.") + self.card.delete_card(new_card["id"]) + self.card.update_access_code(old_ac, new_ac) + + hanging_user = self.user.get_user(new_card["user"]) + if hanging_user["password"] is None: + self.logger.info(f"Delete hanging user {hanging_user['id']}") + self.user.delete_user(hanging_user['id']) + + def delete_hanging_users(self) -> None: + """ + Finds and deletes users that have not registered for the webui that have no cards assocated with them. + """ + unreg_users = self.user.get_unregistered_users() + if unreg_users is None: + self.logger.error("Error occoured finding unregistered users") + + for user in unreg_users: + cards = self.card.get_user_cards(user['id']) + if cards is None: + self.logger.error(f"Error getting cards for user {user['id']}") + continue + + if not cards: + self.logger.info(f"Delete hanging user {user['id']}") + self.user.delete_user(user['id']) diff --git a/core/data/schema/card.py b/core/data/schema/card.py index 7c0c945..dc74832 100644 --- a/core/data/schema/card.py +++ b/core/data/schema/card.py @@ -3,6 +3,7 @@ from sqlalchemy import Table, Column, UniqueConstraint from sqlalchemy.types import Integer, String, Boolean, TIMESTAMP from sqlalchemy.sql.schema import ForeignKey from sqlalchemy.sql import func +from sqlalchemy.engine import Row from core.data.schema.base import BaseData, metadata @@ -21,21 +22,44 @@ aime_card = Table( ) class CardData(BaseData): - def get_user_id_from_card(self, access_code: str) -> Optional[int]: - """ - Given a 20 digit access code as a string, get the user id associated with that card - """ + def get_card_by_access_code(self, access_code: str) -> Optional[Row]: sql = aime_card.select(aime_card.c.access_code == access_code) result = self.execute(sql) if result is None: return None + return result.fetchone() - card = result.fetchone() + def get_card_by_id(self, card_id: int) -> Optional[Row]: + sql = aime_card.select(aime_card.c.id == card_id) + + result = self.execute(sql) + if result is None: return None + return result.fetchone() + + def update_access_code(self, old_ac: str, new_ac: str) -> None: + sql = aime_card.update(aime_card.c.access_code == old_ac).values(access_code = new_ac) + + result = self.execute(sql) + if result is None: + self.logger.error(f"Failed to change card access code from {old_ac} to {new_ac}") + + def get_user_id_from_card(self, access_code: str) -> Optional[int]: + """ + Given a 20 digit access code as a string, get the user id associated with that card + """ + card = self.get_card_by_access_code(access_code) if card is None: return None return int(card["user"]) + + def delete_card(self, card_id: int) -> None: + sql = aime_card.delete(aime_card.c.id == card_id) - def get_user_cards(self, aime_id: int) -> Optional[List[Dict]]: + result = self.execute(sql) + if result is None: + self.logger.error(f"Failed to delete card with id {card_id}") + + def get_user_cards(self, aime_id: int) -> Optional[List[Row]]: """ Returns all cards owned by a user """ diff --git a/core/data/schema/user.py b/core/data/schema/user.py index b7f72e2..aee07e9 100644 --- a/core/data/schema/user.py +++ b/core/data/schema/user.py @@ -1,13 +1,10 @@ from enum import Enum -from typing import Dict, Optional -from sqlalchemy import Table, Column, and_ +from typing import Optional, List +from sqlalchemy import Table, Column from sqlalchemy.types import Integer, String, TIMESTAMP -from sqlalchemy.sql.schema import ForeignKey from sqlalchemy.sql import func from sqlalchemy.dialects.mysql import insert -from sqlalchemy.sql import func, select, Delete -from uuid import uuid4 -from datetime import datetime, timedelta +from sqlalchemy.sql import func, select from sqlalchemy.engine import Row import bcrypt @@ -34,9 +31,6 @@ class PermissionBits(Enum): class UserData(BaseData): def create_user(self, id: int = None, username: str = None, email: str = None, password: str = None, permission: int = 1) -> Optional[int]: - if email is None: - permission = 1 - if id is None: sql = insert(aime_user).values( username=username, @@ -82,4 +76,22 @@ class UserData(BaseData): def reset_autoincrement(self, ai_value: int) -> None: # ALTER TABLE isn't in sqlalchemy so we do this the ugly way sql = f"ALTER TABLE aime_user AUTO_INCREMENT={ai_value}" - self.execute(sql) \ No newline at end of file + self.execute(sql) + + def delete_user(self, user_id: int) -> None: + sql = aime_user.delete(aime_user.c.id == user_id) + + result = self.execute(sql) + if result is None: + self.logger.error(f"Failed to delete user with id {user_id}") + + def get_unregistered_users(self) -> List[Row]: + """ + Returns a list of users who have not registered with the webui. They may or may not have cards. + """ + sql = select(aime_user).where(aime_user.c.password == None) + + result = self.execute(sql) + if result is None: + return None + return result.fetchall() \ No newline at end of file diff --git a/dbutils.py b/dbutils.py index 6285e30..b80a070 100644 --- a/dbutils.py +++ b/dbutils.py @@ -8,6 +8,10 @@ if __name__=='__main__': parser.add_argument("--config", "-c", type=str, help="Config folder to use", default="config") parser.add_argument("--version", "-v", type=str, help="Version of the database to upgrade/rollback to") parser.add_argument("--game", "-g", type=str, help="Game code of the game who's schema will be updated/rolled back. Ex. SDFE") + parser.add_argument("--email", "-e", type=str, help="Email for the new user") + parser.add_argument("--old_ac", "-o", type=str, help="Access code to transfer from") + parser.add_argument("--new_ac", "-n", type=str, help="Access code to transfer to") + parser.add_argument("--force", "-f", type=bool, help="Force the action to happen") parser.add_argument("action", type=str, help="DB Action, create, recreate, upgrade, or rollback") args = parser.parse_args() @@ -33,4 +37,13 @@ if __name__=='__main__': else: data.migrate_database(args.game, int(args.version), args.action) + elif args.action == "create-owner": + data.create_owner(args.email) + + elif args.action == "migrate-card": + data.migrate_card(args.old_ac, args.new_ac, args.force) + + elif args.action == "cleanup": + data.delete_hanging_users() + data.logger.info("Done") From fe8f40c62718cd0d49aef362b96a2d469cd4a7de Mon Sep 17 00:00:00 2001 From: Dniel97 Date: Sat, 4 Mar 2023 11:09:03 +0100 Subject: [PATCH 07/63] Fixed upgrade script endDate --- core/data/schema/versions/SDED_1_upgrade.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/data/schema/versions/SDED_1_upgrade.sql b/core/data/schema/versions/SDED_1_upgrade.sql index c601745..a4d666e 100644 --- a/core/data/schema/versions/SDED_1_upgrade.sql +++ b/core/data/schema/versions/SDED_1_upgrade.sql @@ -35,7 +35,7 @@ CREATE TABLE ongeki_static_gachas ( changeRateCnt1 INT DEFAULT 0, changeRateCnt2 INT DEFAULT 0, startDate TIMESTAMP DEFAULT '2018-01-01 00:00:00.0', - endDate TIMESTAMP DEFAULT '2018-01-01 00:00:00.0', + endDate TIMESTAMP DEFAULT '2038-01-01 00:00:00.0', noticeStartDate TIMESTAMP DEFAULT '2018-01-01 00:00:00.0', noticeEndDate TIMESTAMP DEFAULT '2038-01-01 00:00:00.0', convertEndDate TIMESTAMP DEFAULT '2038-01-01 00:00:00.0', From a340bcf1dd4ebde9b7a2c204fab6c4b4707900cd Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Sat, 4 Mar 2023 21:27:52 -0500 Subject: [PATCH 08/63] change how allnet uri/host is generated --- core/allnet.py | 79 +++++++++++++++++++++----------------- core/title.py | 20 +++++++--- example_config/pokken.yaml | 4 ++ titles/pokken/__init__.py | 11 ------ titles/pokken/base.py | 14 +++---- titles/pokken/config.py | 18 ++++++++- titles/pokken/index.py | 14 +++++++ 7 files changed, 101 insertions(+), 59 deletions(-) diff --git a/core/allnet.py b/core/allnet.py index 71eeb33..792cdff 100644 --- a/core/allnet.py +++ b/core/allnet.py @@ -48,49 +48,58 @@ class AllnetServlet: self.logger.error("No games detected!") for _, mod in plugins.items(): - for code in mod.game_codes: - if hasattr(mod, "use_default_title") and mod.use_default_title: - if hasattr(mod, "include_protocol") and mod.include_protocol: - if hasattr(mod, "title_secure") and mod.title_secure: - uri = "https://" + if 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) + + else: + for code in mod.game_codes: + if hasattr(mod, "use_default_title") and mod.use_default_title: + if hasattr(mod, "include_protocol") and mod.include_protocol: + if hasattr(mod, "title_secure") and mod.title_secure: + uri = "https://" + + else: + uri = "http://" + + else: + uri = "" + + if core_cfg.server.is_develop: + uri += f"{core_cfg.title.hostname}:{core_cfg.title.port}" else: - uri = "http://" + uri += f"{core_cfg.title.hostname}" + + uri += f"/{code}/$v" - else: - uri = "" - - if core_cfg.server.is_develop: - uri += f"{core_cfg.title.hostname}:{core_cfg.title.port}" + if hasattr(mod, "trailing_slash") and mod.trailing_slash: + uri += "/" else: - uri += f"{core_cfg.title.hostname}" - - uri += f"/{code}/$v" + if hasattr(mod, "uri"): + uri = mod.uri + else: + uri = "" - if hasattr(mod, "trailing_slash") and mod.trailing_slash: - uri += "/" - - else: - if hasattr(mod, "uri"): - uri = mod.uri - else: - uri = "" - - if hasattr(mod, "host"): - host = mod.host - - elif hasattr(mod, "use_default_host") and mod.use_default_host: - if core_cfg.server.is_develop: - host = f"{core_cfg.title.hostname}:{core_cfg.title.port}" + if hasattr(mod, "host"): + host = mod.host + + elif hasattr(mod, "use_default_host") and mod.use_default_host: + if core_cfg.server.is_develop: + host = f"{core_cfg.title.hostname}:{core_cfg.title.port}" + + else: + host = f"{core_cfg.title.hostname}" else: - host = f"{core_cfg.title.hostname}" - - else: - host = "" - - self.uri_registry[code] = (uri, host) + host = "" + + self.uri_registry[code] = (uri, host) + self.logger.info(f"Allnet serving {len(self.uri_registry)} games on port {core_cfg.allnet.port}") def handle_poweron(self, request: Request, _: Dict): diff --git a/core/title.py b/core/title.py index 252a130..c704e9a 100644 --- a/core/title.py +++ b/core/title.py @@ -37,16 +37,26 @@ class TitleServlet(): for folder, mod in plugins.items(): if hasattr(mod, "game_codes") and hasattr(mod, "index"): - handler_cls = mod.index(self.config, self.config_folder) - if hasattr(handler_cls, "setup"): - handler_cls.setup() + should_call_setup = True for code in mod.game_codes: - self.title_registry[code] = handler_cls + if hasattr(mod.index, "get_allnet_info"): + enabled, _, _ = mod.index.get_allnet_info(code, self.config, self.config_folder) + + else: + enabled = True + + 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.error(f"{folder} missing game_code or index in __init__.py") - + self.logger.info(f"Serving {len(self.title_registry)} game codes on port {core_cfg.title.port}") def render_GET(self, request: Request, endpoints: dict) -> bytes: diff --git a/example_config/pokken.yaml b/example_config/pokken.yaml index 5523996..e465ceb 100644 --- a/example_config/pokken.yaml +++ b/example_config/pokken.yaml @@ -1,7 +1,11 @@ server: + hostname: "localhost" enable: True loglevel: "info" port: 9000 port_matching: 9001 + port_stun: 9002 + port_turn: 9003 + port_admission: 9004 ssl_cert: cert/pokken.crt ssl_key: cert/pokken.key \ No newline at end of file diff --git a/titles/pokken/__init__.py b/titles/pokken/__init__.py index 3b574fd..6340de8 100644 --- a/titles/pokken/__init__.py +++ b/titles/pokken/__init__.py @@ -4,16 +4,5 @@ from titles.pokken.database import PokkenData index = PokkenServlet database = PokkenData - -use_default_title = True -include_protocol = True -title_secure = True game_codes = [PokkenConstants.GAME_CODE] -trailing_slash = True -use_default_host = False - -include_port = True -uri="https://$h:$p/" -host="$h:$p/" - current_schema_version = 1 \ No newline at end of file diff --git a/titles/pokken/base.py b/titles/pokken/base.py index bd95295..33232e4 100644 --- a/titles/pokken/base.py +++ b/titles/pokken/base.py @@ -35,19 +35,19 @@ class PokkenBase(): regist_pcb.server_time = int(datetime.now().timestamp() / 1000) biwa_setting = { "MatchingServer": { - "host": f"https://{self.core_cfg.title.hostname}", - "port": 9000, + "host": f"https://{self.game_cfg.server.hostname}", + "port": self.game_cfg.server.port_matching, "url": "/matching" }, "StunServer": { - "addr": self.core_cfg.title.hostname, - "port": 3333 + "addr": self.game_cfg.server.hostname, + "port": self.game_cfg.server.port_stun }, "TurnServer": { - "addr": self.core_cfg.title.hostname, - "port": 4444 + "addr": self.game_cfg.server.hostname, + "port": self.game_cfg.server.port_turn }, - "AdmissionUrl": f"ws://{self.core_cfg.title.hostname}:1111", + "AdmissionUrl": f"ws://{self.game_cfg.server.hostname}:{self.game_cfg.server.port_admission}", "locationId": 123, "logfilename": "JackalMatchingLibrary.log", "biwalogfilename": "./biwa.log" diff --git a/titles/pokken/config.py b/titles/pokken/config.py index b6596f2..9b2ae0f 100644 --- a/titles/pokken/config.py +++ b/titles/pokken/config.py @@ -4,6 +4,10 @@ class PokkenServerConfig(): def __init__(self, parent_config: "PokkenConfig"): self.__config = parent_config + @property + def hostname(self) -> str: + return CoreConfig.get_config_field(self.__config, 'pokken', 'server', 'hostname', default="localhost") + @property def enable(self) -> bool: return CoreConfig.get_config_field(self.__config, 'pokken', 'server', 'enable', default=True) @@ -18,7 +22,19 @@ class PokkenServerConfig(): @property def port_matching(self) -> int: - return CoreConfig.get_config_field(self.__config, 'pokken', 'server', 'port', default=9001) + return CoreConfig.get_config_field(self.__config, 'pokken', 'server', 'port_matching', default=9001) + + @property + def port_stun(self) -> int: + return CoreConfig.get_config_field(self.__config, 'pokken', 'server', 'port_stun', default=9002) + + @property + def port_turn(self) -> int: + return CoreConfig.get_config_field(self.__config, 'pokken', 'server', 'port_turn', default=9003) + + @property + def port_admission(self) -> int: + return CoreConfig.get_config_field(self.__config, 'pokken', 'server', 'port_admission', default=9004) @property def ssl_cert(self) -> str: diff --git a/titles/pokken/index.py b/titles/pokken/index.py index a47cac7..13fdf6c 100644 --- a/titles/pokken/index.py +++ b/titles/pokken/index.py @@ -1,3 +1,4 @@ +from typing import Tuple from twisted.web.http import Request from twisted.web import resource, server from twisted.internet import reactor, endpoints @@ -40,6 +41,19 @@ class PokkenServlet(resource.Resource): self.logger.inited = True self.base = PokkenBase(core_cfg, self.game_cfg) + + @classmethod + def get_allnet_info(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: + game_cfg = PokkenConfig() + game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/pokken.yaml"))) + + if not game_cfg.server.enable: + return (False, "", "") + + if core_cfg.server.is_develop: + return (True, f"https://{game_cfg.server.hostname}:{game_cfg.server.port}/{game_code}/$v/", f"{game_cfg.server.hostname}:{game_cfg.server.port}/") + + return (True, f"https://{game_cfg.server.hostname}/{game_code}/$v/", f"{game_cfg.server.hostname}/") def setup(self): """ From b8fd0baee53f50af22de71400b4e493627cd5f5c Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Sat, 4 Mar 2023 21:34:35 -0500 Subject: [PATCH 09/63] wacca: move to get_allnet_info, add safety for loading config --- titles/wacca/index.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/titles/wacca/index.py b/titles/wacca/index.py index 37d3f9e..8b30dc6 100644 --- a/titles/wacca/index.py +++ b/titles/wacca/index.py @@ -3,10 +3,10 @@ import logging, coloredlogs from logging.handlers import TimedRotatingFileHandler import logging import json -from datetime import datetime from hashlib import md5 from twisted.web.http import Request -from typing import Dict +from typing import Dict, Tuple +from os import path from core.config import CoreConfig from titles.wacca.config import WaccaConfig @@ -24,7 +24,8 @@ class WaccaServlet(): def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None: self.core_cfg = core_cfg self.game_cfg = WaccaConfig() - self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/wacca.yaml"))) + if path.exists(f"{cfg_dir}/wacca.yaml"): + self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/wacca.yaml"))) self.versions = [ WaccaBase(core_cfg, self.game_cfg), @@ -51,6 +52,19 @@ class WaccaServlet(): self.logger.setLevel(self.game_cfg.server.loglevel) coloredlogs.install(level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str) + @classmethod + def get_allnet_info(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: + game_cfg = WaccaConfig() + game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/wacca.yaml"))) + + if not game_cfg.server.enable: + return (False, "", "") + + if core_cfg.server.is_develop: + return (True, f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/", "") + + return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", "") + def render_POST(self, request: Request, version: int, url_path: str) -> bytes: def end(resp: Dict) -> bytes: hash = md5(json.dumps(resp, ensure_ascii=False).encode()).digest() From e0fdd937e67eb00a5b4b80a0af32186795201823 Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Sat, 4 Mar 2023 21:36:15 -0500 Subject: [PATCH 10/63] pokken: add safety for loading config that doesn't exist --- titles/pokken/index.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/titles/pokken/index.py b/titles/pokken/index.py index 13fdf6c..908d247 100644 --- a/titles/pokken/index.py +++ b/titles/pokken/index.py @@ -19,7 +19,8 @@ class PokkenServlet(resource.Resource): self.core_cfg = core_cfg self.config_dir = cfg_dir self.game_cfg = PokkenConfig() - self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/pokken.yaml"))) + if path.exists(f"{cfg_dir}/pokken.yaml"): + self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/pokken.yaml"))) self.logger = logging.getLogger("pokken") if not hasattr(self.logger, "inited"): From b2b28850ddf8c593f58a42110e9ff36ceb1b3511 Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Sat, 4 Mar 2023 21:39:38 -0500 Subject: [PATCH 11/63] ongeki: add get_allnet_info, --- titles/ongeki/__init__.py | 8 -------- titles/ongeki/index.py | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/titles/ongeki/__init__.py b/titles/ongeki/__init__.py index 26e107c..7f03a8f 100644 --- a/titles/ongeki/__init__.py +++ b/titles/ongeki/__init__.py @@ -6,13 +6,5 @@ from titles.ongeki.read import OngekiReader index = OngekiServlet database = OngekiData reader = OngekiReader - -use_default_title = True -include_protocol = True -title_secure = False game_codes = [OngekiConstants.GAME_CODE] -trailing_slash = True -use_default_host = False -host = "" - current_schema_version = 2 \ No newline at end of file diff --git a/titles/ongeki/index.py b/titles/ongeki/index.py index c636659..9e512b2 100644 --- a/titles/ongeki/index.py +++ b/titles/ongeki/index.py @@ -6,6 +6,8 @@ import string import logging, coloredlogs import zlib from logging.handlers import TimedRotatingFileHandler +from os import path +from typing import Tuple from core.config import CoreConfig from titles.ongeki.config import OngekiConfig @@ -23,7 +25,8 @@ class OngekiServlet(): def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None: self.core_cfg = core_cfg self.game_cfg = OngekiConfig() - self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/ongeki.yaml"))) + if path.exists(f"{cfg_dir}/ongeki.yaml"): + self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/ongeki.yaml"))) self.versions = [ OngekiBase(core_cfg, self.game_cfg), @@ -52,6 +55,19 @@ class OngekiServlet(): self.logger.setLevel(self.game_cfg.server.loglevel) coloredlogs.install(level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str) + + @classmethod + def get_allnet_info(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: + game_cfg = OngekiConfig() + game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/ongeki.yaml"))) + + if not game_cfg.server.enable: + return (False, "", "") + + if core_cfg.server.is_develop: + return (True, f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/", f"{core_cfg.title.hostname}:{core_cfg.title.port}/") + + return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", f"{core_cfg.title.hostname}/") def render_POST(self, request: Request, version: int, url_path: str) -> bytes: req_raw = request.content.getvalue() From bfe5294d51593a6a00b7c7186a9e2af226b6c205 Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Sat, 4 Mar 2023 21:58:51 -0500 Subject: [PATCH 12/63] add get_allnet_info and config loading safety to all games --- core/allnet.py | 44 +--------------------------------------- core/title.py | 23 +++++++++++---------- dbutils.py | 4 +++- index.py | 3 ++- read.py | 5 +++-- titles/chuni/__init__.py | 8 -------- titles/chuni/const.py | 2 ++ titles/chuni/index.py | 19 ++++++++++++++++- titles/cxb/__init__.py | 11 ---------- titles/cxb/index.py | 20 ++++++++++++++++-- titles/diva/__init__.py | 8 -------- titles/diva/const.py | 2 ++ titles/diva/index.py | 20 +++++++++++++++++- titles/mai2/__init__.py | 8 -------- titles/mai2/index.py | 20 +++++++++++++++++- titles/ongeki/const.py | 2 ++ titles/ongeki/index.py | 8 +++++--- titles/pokken/index.py | 5 ++++- titles/wacca/__init__.py | 8 -------- titles/wacca/index.py | 11 +++++----- 20 files changed, 116 insertions(+), 115 deletions(-) diff --git a/core/allnet.py b/core/allnet.py index 792cdff..ec39158 100644 --- a/core/allnet.py +++ b/core/allnet.py @@ -56,49 +56,7 @@ class AllnetServlet: self.uri_registry[code] = (uri, host) else: - for code in mod.game_codes: - if hasattr(mod, "use_default_title") and mod.use_default_title: - if hasattr(mod, "include_protocol") and mod.include_protocol: - if hasattr(mod, "title_secure") and mod.title_secure: - uri = "https://" - - else: - uri = "http://" - - else: - uri = "" - - if core_cfg.server.is_develop: - uri += f"{core_cfg.title.hostname}:{core_cfg.title.port}" - - else: - uri += f"{core_cfg.title.hostname}" - - uri += f"/{code}/$v" - - if hasattr(mod, "trailing_slash") and mod.trailing_slash: - uri += "/" - - else: - if hasattr(mod, "uri"): - uri = mod.uri - else: - uri = "" - - if hasattr(mod, "host"): - host = mod.host - - elif hasattr(mod, "use_default_host") and mod.use_default_host: - if core_cfg.server.is_develop: - host = f"{core_cfg.title.hostname}:{core_cfg.title.port}" - - else: - host = f"{core_cfg.title.hostname}" - - else: - host = "" - - self.uri_registry[code] = (uri, host) + self.logger.warn("Game {_} has no get_allnet_info method.") self.logger.info(f"Allnet serving {len(self.uri_registry)} games on port {core_cfg.allnet.port}") diff --git a/core/title.py b/core/title.py index c704e9a..f201d8b 100644 --- a/core/title.py +++ b/core/title.py @@ -39,20 +39,21 @@ class TitleServlet(): if hasattr(mod, "game_codes") and hasattr(mod, "index"): should_call_setup = True - for code in mod.game_codes: - if hasattr(mod.index, "get_allnet_info"): + 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) - - else: - enabled = True - 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 + 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 + self.title_registry[code] = handler_cls + + else: + self.logger.warn(f"Game {folder} has no get_allnet_info") else: self.logger.error(f"{folder} missing game_code or index in __init__.py") diff --git a/dbutils.py b/dbutils.py index b80a070..a2aa36b 100644 --- a/dbutils.py +++ b/dbutils.py @@ -2,6 +2,7 @@ import yaml import argparse from core.config import CoreConfig from core.data import Data +from os import path if __name__=='__main__': parser = argparse.ArgumentParser(description="Database utilities") @@ -16,7 +17,8 @@ if __name__=='__main__': args = parser.parse_args() cfg = CoreConfig() - cfg.update(yaml.safe_load(open(f"{args.config}/core.yaml"))) + if path.exists(f"{args.config}/core.yaml"): + cfg.update(yaml.safe_load(open(f"{args.config}/core.yaml"))) data = Data(cfg) if args.action == "create": diff --git a/index.py b/index.py index 51842bd..4c0ece9 100644 --- a/index.py +++ b/index.py @@ -90,7 +90,8 @@ if __name__ == "__main__": exit(1) cfg: CoreConfig = CoreConfig() - cfg.update(yaml.safe_load(open(f"{args.config}/core.yaml"))) + if path.exists(f"{args.config}/core.yaml"): + cfg.update(yaml.safe_load(open(f"{args.config}/core.yaml"))) logger = logging.getLogger("core") log_fmt_str = "[%(asctime)s] Core | %(levelname)s | %(message)s" diff --git a/read.py b/read.py index 869ad97..1f89cb6 100644 --- a/read.py +++ b/read.py @@ -3,7 +3,7 @@ import argparse import re import os import yaml -import importlib +from os import path import logging, coloredlogs from logging.handlers import TimedRotatingFileHandler @@ -79,7 +79,8 @@ if __name__ == "__main__": args = parser.parse_args() config = CoreConfig() - config.update(yaml.safe_load(open(f"{args.config}/core.yaml"))) + if path.exists(f"{args.config}/core.yaml"): + config.update(yaml.safe_load(open(f"{args.config}/core.yaml"))) log_fmt_str = "[%(asctime)s] Reader | %(levelname)s | %(message)s" log_fmt = logging.Formatter(log_fmt_str) diff --git a/titles/chuni/__init__.py b/titles/chuni/__init__.py index 3883aeb..7256b10 100644 --- a/titles/chuni/__init__.py +++ b/titles/chuni/__init__.py @@ -6,13 +6,5 @@ from titles.chuni.read import ChuniReader index = ChuniServlet database = ChuniData reader = ChuniReader - -use_default_title = True -include_protocol = True -title_secure = False game_codes = [ChuniConstants.GAME_CODE, ChuniConstants.GAME_CODE_NEW] -trailing_slash = True -use_default_host = False -host = "" - current_schema_version = 1 diff --git a/titles/chuni/const.py b/titles/chuni/const.py index ebc8cf2..3a111f8 100644 --- a/titles/chuni/const.py +++ b/titles/chuni/const.py @@ -2,6 +2,8 @@ class ChuniConstants(): GAME_CODE = "SDBT" GAME_CODE_NEW = "SDHD" + CONFIG_NAME = "chuni.yaml" + VER_CHUNITHM = 0 VER_CHUNITHM_PLUS = 1 VER_CHUNITHM_AIR = 2 diff --git a/titles/chuni/index.py b/titles/chuni/index.py index a0f8b55..866e9d9 100644 --- a/titles/chuni/index.py +++ b/titles/chuni/index.py @@ -8,6 +8,8 @@ import inflection import string from Crypto.Cipher import AES from Crypto.Util.Padding import pad +from os import path +from typing import Tuple from core import CoreConfig from titles.chuni.config import ChuniConfig @@ -30,7 +32,8 @@ class ChuniServlet(): def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None: self.core_cfg = core_cfg self.game_cfg = ChuniConfig() - self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/chuni.yaml"))) + if path.exists(f"{cfg_dir}/{ChuniConstants.CONFIG_NAME}"): + self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{ChuniConstants.CONFIG_NAME}"))) self.versions = [ ChuniBase(core_cfg, self.game_cfg), @@ -68,6 +71,20 @@ class ChuniServlet(): coloredlogs.install(level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str) self.logger.inited = True + @classmethod + def get_allnet_info(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: + game_cfg = ChuniConfig() + if path.exists(f"{cfg_dir}/{ChuniConstants.CONFIG_NAME}"): + game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{ChuniConstants.CONFIG_NAME}"))) + + if not game_cfg.server.enable: + return (False, "", "") + + if core_cfg.server.is_develop: + return (True, f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/", "") + + return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", "") + def render_POST(self, request: Request, version: int, url_path: str) -> bytes: req_raw = request.content.getvalue() url_split = url_path.split("/") diff --git a/titles/cxb/__init__.py b/titles/cxb/__init__.py index d57dde0..0a9db97 100644 --- a/titles/cxb/__init__.py +++ b/titles/cxb/__init__.py @@ -6,16 +6,5 @@ from titles.cxb.read import CxbReader index = CxbServlet database = CxbData reader = CxbReader - -use_default_title = False -include_protocol = True -title_secure = True game_codes = [CxbConstants.GAME_CODE] -trailing_slash = True -use_default_host = False - -include_port = True -uri = "http://$h:$p/" # If you care about the allnet response you're probably running with no SSL -host = "" - current_schema_version = 1 \ No newline at end of file diff --git a/titles/cxb/index.py b/titles/cxb/index.py index f01cf3b..ad852a8 100644 --- a/titles/cxb/index.py +++ b/titles/cxb/index.py @@ -7,7 +7,8 @@ import re import inflection import logging, coloredlogs from logging.handlers import TimedRotatingFileHandler -from typing import Dict +from typing import Dict, Tuple +from os import path from core.config import CoreConfig from titles.cxb.config import CxbConfig @@ -22,7 +23,8 @@ class CxbServlet(resource.Resource): self.cfg_dir = cfg_dir self.core_cfg = core_cfg self.game_cfg = CxbConfig() - self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/cxb.yaml"))) + if path.exists(f"{cfg_dir}/{CxbConstants.CONFIG_NAME}"): + self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{CxbConstants.CONFIG_NAME}"))) self.logger = logging.getLogger("cxb") if not hasattr(self.logger, "inited"): @@ -49,6 +51,20 @@ class CxbServlet(resource.Resource): CxbRevSunriseS2(core_cfg, self.game_cfg), ] + @classmethod + def get_allnet_info(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: + game_cfg = CxbConfig() + if path.exists(f"{cfg_dir}/{CxbConstants.CONFIG_NAME}"): + game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{CxbConstants.CONFIG_NAME}"))) + + if not game_cfg.server.enable: + return (False, "", "") + + if core_cfg.server.is_develop: + return (True, f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/", "") + + return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", "") + def setup(self): if self.game_cfg.server.enable: endpoints.serverFromString(reactor, f"tcp:{self.game_cfg.server.port}:interface={self.core_cfg.server.listen_address}")\ diff --git a/titles/diva/__init__.py b/titles/diva/__init__.py index acc7ce4..e14aee2 100644 --- a/titles/diva/__init__.py +++ b/titles/diva/__init__.py @@ -6,13 +6,5 @@ from titles.diva.read import DivaReader index = DivaServlet database = DivaData reader = DivaReader - -use_default_title = True -include_protocol = True -title_secure = False game_codes = [DivaConstants.GAME_CODE] -trailing_slash = True -use_default_host = False -host = "" - current_schema_version = 1 \ No newline at end of file diff --git a/titles/diva/const.py b/titles/diva/const.py index 44bbe36..2ea7024 100644 --- a/titles/diva/const.py +++ b/titles/diva/const.py @@ -1,6 +1,8 @@ class DivaConstants(): GAME_CODE = "SBZV" + CONFIG_NAME = "diva.yaml" + VER_PROJECT_DIVA_ARCADE = 0 VER_PROJECT_DIVA_ARCADE_FUTURE_TONE = 1 diff --git a/titles/diva/index.py b/titles/diva/index.py index d48a125..b049fef 100644 --- a/titles/diva/index.py +++ b/titles/diva/index.py @@ -6,16 +6,20 @@ import zlib import json import urllib.parse import base64 +from os import path +from typing import Tuple from core.config import CoreConfig from titles.diva.config import DivaConfig +from titles.diva.const import DivaConstants from titles.diva.base import DivaBase class DivaServlet(): def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None: self.core_cfg = core_cfg self.game_cfg = DivaConfig() - self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/diva.yaml"))) + if path.exists(f"{cfg_dir}/{DivaConstants.CONFIG_NAME}"): + self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{DivaConstants.CONFIG_NAME}"))) self.base = DivaBase(core_cfg, self.game_cfg) @@ -36,6 +40,20 @@ class DivaServlet(): self.logger.setLevel(self.game_cfg.server.loglevel) coloredlogs.install(level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str) + @classmethod + def get_allnet_info(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: + game_cfg = DivaConfig() + if path.exists(f"{cfg_dir}/{DivaConstants.CONFIG_NAME}"): + game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{DivaConstants.CONFIG_NAME}"))) + + if not game_cfg.server.enable: + return (False, "", "") + + if core_cfg.server.is_develop: + return (True, f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/", "") + + return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", "") + def render_POST(self, req: Request, version: int, url_path: str) -> bytes: req_raw = req.content.getvalue() url_header = req.getAllHeaders() diff --git a/titles/mai2/__init__.py b/titles/mai2/__init__.py index 3cc5f97..71dbd5e 100644 --- a/titles/mai2/__init__.py +++ b/titles/mai2/__init__.py @@ -6,13 +6,5 @@ from titles.mai2.read import Mai2Reader index = Mai2Servlet database = Mai2Data reader = Mai2Reader - -use_default_title = True -include_protocol = True -title_secure = False game_codes = [Mai2Constants.GAME_CODE] -trailing_slash = True -use_default_host = False -host = "" - current_schema_version = 2 \ No newline at end of file diff --git a/titles/mai2/index.py b/titles/mai2/index.py index a4a8f3e..64a38a6 100644 --- a/titles/mai2/index.py +++ b/titles/mai2/index.py @@ -6,6 +6,8 @@ import string import logging, coloredlogs import zlib from logging.handlers import TimedRotatingFileHandler +from os import path +from typing import Tuple from core.config import CoreConfig from titles.mai2.config import Mai2Config @@ -22,7 +24,8 @@ class Mai2Servlet(): def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None: self.core_cfg = core_cfg self.game_cfg = Mai2Config() - self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{Mai2Constants.CONFIG_NAME}"))) + if path.exists(f"{cfg_dir}/{Mai2Constants.CONFIG_NAME}"): + self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{Mai2Constants.CONFIG_NAME}"))) self.versions = [ Mai2Base(core_cfg, self.game_cfg), @@ -50,6 +53,21 @@ class Mai2Servlet(): self.logger.setLevel(self.game_cfg.server.loglevel) coloredlogs.install(level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str) + @classmethod + def get_allnet_info(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: + game_cfg = Mai2Config() + + if path.exists(f"{cfg_dir}/{Mai2Constants.CONFIG_NAME}"): + game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{Mai2Constants.CONFIG_NAME}"))) + + if not game_cfg.server.enable: + return (False, "", "") + + if core_cfg.server.is_develop: + return (True, f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/", f"{core_cfg.title.hostname}:{core_cfg.title.port}/") + + return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", f"{core_cfg.title.hostname}/") + def render_POST(self, request: Request, version: int, url_path: str) -> bytes: req_raw = request.content.getvalue() url = request.uri.decode() diff --git a/titles/ongeki/const.py b/titles/ongeki/const.py index dd6c0f5..a68ca02 100644 --- a/titles/ongeki/const.py +++ b/titles/ongeki/const.py @@ -3,6 +3,8 @@ from enum import Enum class OngekiConstants(): GAME_CODE = "SDDT" + CONFIG_NAME = "ongeki.yaml" + VER_ONGEKI = 0 VER_ONGEKI_PLUS = 1 VER_ONGEKI_SUMMER = 2 diff --git a/titles/ongeki/index.py b/titles/ongeki/index.py index 9e512b2..c5e78f6 100644 --- a/titles/ongeki/index.py +++ b/titles/ongeki/index.py @@ -25,8 +25,8 @@ class OngekiServlet(): def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None: self.core_cfg = core_cfg self.game_cfg = OngekiConfig() - if path.exists(f"{cfg_dir}/ongeki.yaml"): - self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/ongeki.yaml"))) + if path.exists(f"{cfg_dir}/{OngekiConstants.CONFIG_NAME}"): + self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{OngekiConstants.CONFIG_NAME}"))) self.versions = [ OngekiBase(core_cfg, self.game_cfg), @@ -59,7 +59,9 @@ class OngekiServlet(): @classmethod def get_allnet_info(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: game_cfg = OngekiConfig() - game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/ongeki.yaml"))) + + if path.exists(f"{cfg_dir}/{OngekiConstants.CONFIG_NAME}"): + game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{OngekiConstants.CONFIG_NAME}"))) if not game_cfg.server.enable: return (False, "", "") diff --git a/titles/pokken/index.py b/titles/pokken/index.py index 908d247..a8b13f2 100644 --- a/titles/pokken/index.py +++ b/titles/pokken/index.py @@ -12,6 +12,7 @@ from google.protobuf.message import DecodeError from core.config import CoreConfig from titles.pokken.config import PokkenConfig from titles.pokken.base import PokkenBase +from titles.pokken.const import PokkenConstants class PokkenServlet(resource.Resource): def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None: @@ -46,7 +47,9 @@ class PokkenServlet(resource.Resource): @classmethod def get_allnet_info(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: game_cfg = PokkenConfig() - game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/pokken.yaml"))) + + if path.exists(f"{cfg_dir}/{PokkenConstants.CONFIG_NAME}"): + game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{PokkenConstants.CONFIG_NAME}"))) if not game_cfg.server.enable: return (False, "", "") diff --git a/titles/wacca/__init__.py b/titles/wacca/__init__.py index 41d8dc2..55205ed 100644 --- a/titles/wacca/__init__.py +++ b/titles/wacca/__init__.py @@ -8,13 +8,5 @@ index = WaccaServlet database = WaccaData reader = WaccaReader frontend = WaccaFrontend - -use_default_title = True -include_protocol = True -title_secure = False game_codes = [WaccaConstants.GAME_CODE] -trailing_slash = False -use_default_host = False -host = "" - current_schema_version = 3 \ No newline at end of file diff --git a/titles/wacca/index.py b/titles/wacca/index.py index 8b30dc6..e2f9758 100644 --- a/titles/wacca/index.py +++ b/titles/wacca/index.py @@ -24,8 +24,8 @@ class WaccaServlet(): def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None: self.core_cfg = core_cfg self.game_cfg = WaccaConfig() - if path.exists(f"{cfg_dir}/wacca.yaml"): - self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/wacca.yaml"))) + if path.exists(f"{cfg_dir}/{WaccaConstants.CONFIG_NAME}"): + self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{WaccaConstants.CONFIG_NAME}"))) self.versions = [ WaccaBase(core_cfg, self.game_cfg), @@ -55,15 +55,16 @@ class WaccaServlet(): @classmethod def get_allnet_info(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: game_cfg = WaccaConfig() - game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/wacca.yaml"))) + if path.exists(f"{cfg_dir}/{WaccaConstants.CONFIG_NAME}"): + game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{WaccaConstants.CONFIG_NAME}"))) if not game_cfg.server.enable: return (False, "", "") if core_cfg.server.is_develop: - return (True, f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/", "") + return (True, f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v", "") - return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", "") + return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v", "") def render_POST(self, request: Request, version: int, url_path: str) -> bytes: def end(resp: Dict) -> bytes: From b12f61198f75361913e2f88da82816c864b5ac22 Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Sat, 4 Mar 2023 22:46:26 -0500 Subject: [PATCH 13/63] mucha: fixups --- core/allnet.py | 3 --- core/mucha.py | 35 ++++++++++++++++++++++++++++++----- index.py | 2 +- titles/pokken/index.py | 12 ++++++++++++ 4 files changed, 43 insertions(+), 9 deletions(-) diff --git a/core/allnet.py b/core/allnet.py index ec39158..a02c902 100644 --- a/core/allnet.py +++ b/core/allnet.py @@ -54,9 +54,6 @@ class AllnetServlet: if enabled: self.uri_registry[code] = (uri, host) - - else: - self.logger.warn("Game {_} has no get_allnet_info method.") self.logger.info(f"Allnet serving {len(self.uri_registry)} games on port {core_cfg.allnet.port}") diff --git a/core/mucha.py b/core/mucha.py index 0848c70..6cabd59 100644 --- a/core/mucha.py +++ b/core/mucha.py @@ -1,4 +1,4 @@ -from typing import Dict, Any, Optional +from typing import Dict, Any, Optional, List import logging, coloredlogs from logging.handlers import TimedRotatingFileHandler from twisted.web import resource @@ -7,10 +7,13 @@ from datetime import datetime import pytz from core.config import CoreConfig +from core.utils import Utils class MuchaServlet: - def __init__(self, cfg: CoreConfig) -> None: + 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" @@ -28,6 +31,16 @@ class MuchaServlet: self.logger.setLevel(logging.INFO) coloredlogs.install(level=logging.INFO, logger=self.logger, fmt=log_fmt_str) + 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: + self.mucha_registry.append(game_cd) + + self.logger.info(f"Serving {len(self.mucha_registry)} games on port {self.config.mucha.port}") + def handle_boardauth(self, request: Request, _: Dict) -> bytes: req_dict = self.mucha_preprocess(request.content.getvalue()) if req_dict is None: @@ -36,6 +49,13 @@ class MuchaServlet: req = MuchaAuthRequest(req_dict) self.logger.debug(f"Mucha request {vars(req)}") + self.logger.info(f"Boardauth request from {request.getClientAddress().host} for {req.gameVer}") + + if req.gameCd not in self.mucha_registry: + self.logger.warn(f"Unknown gameCd {req.gameCd}") + return b"" + + # TODO: Figure out why the S/N is the way it is. if self.config.server.is_develop: resp = MuchaAuthResponse(mucha_url=f"{self.config.mucha.hostname}:{self.config.mucha.port}") @@ -54,11 +74,16 @@ class MuchaServlet: req = MuchaUpdateRequest(req_dict) self.logger.debug(f"Mucha request {vars(req)}") + self.logger.info(f"Updatecheck request from {request.getClientAddress().host} for {req.gameVer}") + + if req.gameCd not in self.mucha_registry: + self.logger.warn(f"Unknown gameCd {req.gameCd}") + return b"" if self.config.server.is_develop: - resp = MuchaUpdateResponse(mucha_url=f"{self.config.mucha.hostname}:{self.config.mucha.port}") + resp = MuchaUpdateResponse(req.gameVer, f"{self.config.mucha.hostname}:{self.config.mucha.port}") else: - resp = MuchaUpdateResponse(mucha_url=f"{self.config.mucha.hostname}") + resp = MuchaUpdateResponse(req.gameVer, f"{self.config.mucha.hostname}") self.logger.debug(f"Mucha response {vars(resp)}") @@ -94,7 +119,7 @@ class MuchaServlet: class MuchaAuthRequest(): def __init__(self, request: Dict) -> None: self.gameVer = "" if "gameVer" not in request else request["gameVer"] - self.sendDate = "" if "sendDate" not in request else request["sendDate"] + self.sendDate = "" if "sendDate" not in request else datetime.strptime(request["sendDate"], "%Y%m%d") self.serialNum = "" if "serialNum" not in request else request["serialNum"] self.gameCd = "" if "gameCd" not in request else request["gameCd"] self.boardType = "" if "boardType" not in request else request["boardType"] diff --git a/index.py b/index.py index 4c0ece9..f545edb 100644 --- a/index.py +++ b/index.py @@ -23,7 +23,7 @@ class HttpDispatcher(resource.Resource): self.allnet = AllnetServlet(cfg, config_dir) self.title = TitleServlet(cfg, config_dir) - self.mucha = MuchaServlet(cfg) + self.mucha = MuchaServlet(cfg, config_dir) self.map_post.connect('allnet_ping', '/naomitest.html', controller="allnet", action='handle_naomitest', conditions=dict(method=['GET'])) self.map_post.connect('allnet_poweron', '/sys/servlet/PowerOn', controller="allnet", action='handle_poweron', conditions=dict(method=['POST'])) diff --git a/titles/pokken/index.py b/titles/pokken/index.py index a8b13f2..ccf21de 100644 --- a/titles/pokken/index.py +++ b/titles/pokken/index.py @@ -58,6 +58,18 @@ class PokkenServlet(resource.Resource): return (True, f"https://{game_cfg.server.hostname}:{game_cfg.server.port}/{game_code}/$v/", f"{game_cfg.server.hostname}:{game_cfg.server.port}/") return (True, f"https://{game_cfg.server.hostname}/{game_code}/$v/", f"{game_cfg.server.hostname}/") + + @classmethod + def get_mucha_info(cls, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: + game_cfg = PokkenConfig() + + if path.exists(f"{cfg_dir}/{PokkenConstants.CONFIG_NAME}"): + game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{PokkenConstants.CONFIG_NAME}"))) + + if not game_cfg.server.enable: + return (False, "", "") + + return (True, "PKFN") def setup(self): """ From a7a830c6b70973a1a43267bcf6f02136ef360d27 Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Sat, 4 Mar 2023 22:48:12 -0500 Subject: [PATCH 14/63] mucha: remove default values from response classes --- core/mucha.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mucha.py b/core/mucha.py index 6cabd59..bbfe045 100644 --- a/core/mucha.py +++ b/core/mucha.py @@ -131,7 +131,7 @@ class MuchaAuthRequest(): self.allToken = "" if "allToken" not in request else request["allToken"] class MuchaAuthResponse(): - def __init__(self, mucha_url: str = "localhost") -> None: + def __init__(self, mucha_url: str) -> None: self.RESULTS = "001" self.AUTH_INTERVAL = "86400" self.SERVER_TIME = datetime.strftime(datetime.now(), "%Y%m%d%H%M") @@ -184,7 +184,7 @@ class MuchaUpdateRequest(): self.storeRouterIp = "" if "storeRouterIp" not in request else request["storeRouterIp"] class MuchaUpdateResponse(): - def __init__(self, game_ver: str = "PKFN0JPN01.01", mucha_url: str = "localhost") -> None: + def __init__(self, game_ver: str, mucha_url: str) -> None: self.RESULTS = "001" self.UPDATE_VER_1 = game_ver self.UPDATE_URL_1 = f"https://{mucha_url}/updUrl1/" From ff6ef16b89a96609136bff5bc4c28b638004fd6f Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Sat, 4 Mar 2023 22:52:17 -0500 Subject: [PATCH 15/63] mucha: small cleanup with a oneliner --- core/mucha.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/core/mucha.py b/core/mucha.py index bbfe045..b85b535 100644 --- a/core/mucha.py +++ b/core/mucha.py @@ -56,11 +56,8 @@ class MuchaServlet: return b"" # TODO: Figure out why the S/N is the way it is. - - if self.config.server.is_develop: - resp = MuchaAuthResponse(mucha_url=f"{self.config.mucha.hostname}:{self.config.mucha.port}") - else: - resp = MuchaAuthResponse(mucha_url=f"{self.config.mucha.hostname}") + + resp = MuchaAuthResponse(f"{self.config.mucha.hostname}{':' + self.config.mucha.port if self.config.server.is_develop else ''}") self.logger.debug(f"Mucha response {vars(resp)}") @@ -80,10 +77,7 @@ class MuchaServlet: self.logger.warn(f"Unknown gameCd {req.gameCd}") return b"" - if self.config.server.is_develop: - resp = MuchaUpdateResponse(req.gameVer, f"{self.config.mucha.hostname}:{self.config.mucha.port}") - else: - resp = MuchaUpdateResponse(req.gameVer, f"{self.config.mucha.hostname}") + resp = MuchaUpdateResponse(req.gameVer, f"{self.config.mucha.hostname}{':' + self.config.mucha.port if self.config.server.is_develop else ''}") self.logger.debug(f"Mucha response {vars(resp)}") From f25152a6bf947e59603c1c52d57745cda0cc9d97 Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Sat, 4 Mar 2023 23:00:21 -0500 Subject: [PATCH 16/63] add RIP contributing guide --- contributing.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 contributing.md diff --git a/contributing.md b/contributing.md new file mode 100644 index 0000000..5397f70 --- /dev/null +++ b/contributing.md @@ -0,0 +1,8 @@ +# Contributing to ARTEMiS +If you would like to contribute to artemis, either by adding features, games, or fixing bugs, you can do so by forking the repo and submitting a pull request [here](https://gitea.tendokyu.moe/Hay1tsme/artemis/pulls). Please make sure, if you're submitting a PR for a game or game version, that you're following the n-0/y-1 guidelines, or it will be rejected. + +## Adding games +Guide WIP + +## Adding game versions +Guide WIP \ No newline at end of file From 59b2401a672c33db61baf59e0952d161c6b9a98d Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Sun, 5 Mar 2023 09:43:05 -0500 Subject: [PATCH 17/63] mucha: add updatecheck response stub --- core/mucha.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/mucha.py b/core/mucha.py index b85b535..cdfadd1 100644 --- a/core/mucha.py +++ b/core/mucha.py @@ -77,7 +77,8 @@ class MuchaServlet: self.logger.warn(f"Unknown gameCd {req.gameCd}") return b"" - resp = MuchaUpdateResponse(req.gameVer, f"{self.config.mucha.hostname}{':' + self.config.mucha.port if self.config.server.is_develop else ''}") + #resp = MuchaUpdateResponse(req.gameVer, f"{self.config.mucha.hostname}{':' + self.config.mucha.port if self.config.server.is_develop else ''}") + resp = MuchaUpdateResponseStub(req.gameVer) self.logger.debug(f"Mucha response {vars(resp)}") @@ -190,3 +191,8 @@ class MuchaUpdateResponse(): self.COM_SIZE_1 = "0" self.COM_TIME_1 = "0" self.LAN_INFO_SIZE_1 = "0" + +class MuchaUpdateResponseStub(): + def __init__(self, game_ver: str) -> None: + self.RESULTS = "001" + self.UPDATE_VER_1 = game_ver From 82b159e5b17a52c9a491d0c6a07e50b8de3f122a Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Sun, 5 Mar 2023 09:45:34 -0500 Subject: [PATCH 18/63] MuchaUpdateResponse: add missing values --- core/mucha.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/mucha.py b/core/mucha.py index cdfadd1..370042f 100644 --- a/core/mucha.py +++ b/core/mucha.py @@ -191,6 +191,8 @@ class MuchaUpdateResponse(): self.COM_SIZE_1 = "0" self.COM_TIME_1 = "0" self.LAN_INFO_SIZE_1 = "0" + self.USER_ID = "" + self.PASSWORD = "" class MuchaUpdateResponseStub(): def __init__(self, game_ver: str) -> None: From 36054ebb66978ee06a329357ec006ae512de0d64 Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Sun, 5 Mar 2023 11:42:03 -0500 Subject: [PATCH 19/63] mucha: add missing boardath values --- core/mucha.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/mucha.py b/core/mucha.py index 370042f..1f0312a 100644 --- a/core/mucha.py +++ b/core/mucha.py @@ -55,7 +55,7 @@ class MuchaServlet: self.logger.warn(f"Unknown gameCd {req.gameCd}") return b"" - # TODO: Figure out why the S/N is the way it is. + # TODO: Decrypt S/N resp = MuchaAuthResponse(f"{self.config.mucha.hostname}{':' + self.config.mucha.port if self.config.server.is_develop else ''}") @@ -77,7 +77,6 @@ class MuchaServlet: self.logger.warn(f"Unknown gameCd {req.gameCd}") return b"" - #resp = MuchaUpdateResponse(req.gameVer, f"{self.config.mucha.hostname}{':' + self.config.mucha.port if self.config.server.is_develop else ''}") resp = MuchaUpdateResponseStub(req.gameVer) self.logger.debug(f"Mucha response {vars(resp)}") @@ -113,12 +112,13 @@ class MuchaServlet: class MuchaAuthRequest(): def __init__(self, request: Dict) -> None: - self.gameVer = "" if "gameVer" not in request else request["gameVer"] - self.sendDate = "" if "sendDate" not in request else datetime.strptime(request["sendDate"], "%Y%m%d") + self.gameVer = "" if "gameVer" not in request else request["gameVer"] # gameCd + boardType + countryCd + version + self.sendDate = "" if "sendDate" not in request else request["sendDate"] # %Y%m%d self.serialNum = "" if "serialNum" not in request else request["serialNum"] self.gameCd = "" if "gameCd" not in request else request["gameCd"] self.boardType = "" if "boardType" not in request else request["boardType"] self.boardId = "" if "boardId" not in request else request["boardId"] + self.mac = "" if "mac" not in request else request["mac"] self.placeId = "" if "placeId" not in request else request["placeId"] self.storeRouterIp = "" if "storeRouterIp" not in request else request["storeRouterIp"] self.countryCd = "" if "countryCd" not in request else request["countryCd"] From 74f3ab7c3f4e9ea63fa4ca0cb097c2e3a8e49b33 Mon Sep 17 00:00:00 2001 From: Dniel97 Date: Sun, 5 Mar 2023 23:54:13 +0100 Subject: [PATCH 20/63] cm: added support for 1.36, fixed importer - Added support for Card Maker 1.36.xx - Added cards importer to ONGEKI importer - Added 4 new 1.36 gachas (requires importing them from opt files) - Fixed version for Card Maker opt importer --- example_config/ongeki.yaml | 7 +- readme.md | 4 + titles/cm/__init__.py | 5 +- titles/cm/cm136.py | 50 ++++++++ titles/cm/cm_data/MU3/static_cards.csv | Bin 333451 -> 0 bytes titles/cm/cm_data/MU3/static_gacha_cards.csv | Bin 6759 -> 10059 bytes titles/cm/cm_data/MU3/static_gachas.csv | Bin 5458 -> 2786 bytes titles/cm/const.py | 3 +- titles/cm/index.py | 26 ++-- titles/cm/read.py | 127 +++++-------------- titles/ongeki/__init__.py | 2 +- titles/ongeki/bright.py | 24 ++-- titles/ongeki/brightmemory.py | 26 +++- titles/ongeki/read.py | 104 ++++++++++++--- titles/ongeki/schema/profile.py | 9 +- titles/ongeki/schema/static.py | 2 +- 16 files changed, 242 insertions(+), 147 deletions(-) create mode 100644 titles/cm/cm136.py delete mode 100644 titles/cm/cm_data/MU3/static_cards.csv diff --git a/example_config/ongeki.yaml b/example_config/ongeki.yaml index 6ebd18a..3db7098 100644 --- a/example_config/ongeki.yaml +++ b/example_config/ongeki.yaml @@ -23,4 +23,9 @@ gachas: - 1089 - 1104 - 1111 - - 1135 \ No newline at end of file + - 1135 + # can be used for Card Maker 1.35 and up, else will be ignored + - 1149 + - 1156 + - 1163 + - 1164 diff --git a/readme.md b/readme.md index 24440fc..d64cede 100644 --- a/readme.md +++ b/readme.md @@ -15,6 +15,10 @@ Games listed below have been tested and confirmed working. Only game versions ol + Hatsune Miku Arcade + All versions ++ Card Maker + + 1.34.xx + + 1.36.xx + + Ongeki + All versions up to Bright Memory diff --git a/titles/cm/__init__.py b/titles/cm/__init__.py index 040bec7..7c03605 100644 --- a/titles/cm/__init__.py +++ b/titles/cm/__init__.py @@ -10,6 +10,7 @@ include_protocol = True title_secure = False game_codes = [CardMakerConstants.GAME_CODE] trailing_slash = True -use_default_host = True +use_default_host = False +host = "" -current_schema_version = 1 +current_schema_version = 1 \ No newline at end of file diff --git a/titles/cm/cm136.py b/titles/cm/cm136.py new file mode 100644 index 0000000..2859c24 --- /dev/null +++ b/titles/cm/cm136.py @@ -0,0 +1,50 @@ +from datetime import date, datetime, timedelta +from typing import Any, Dict, List +import json +import logging +from enum import Enum + +from core.config import CoreConfig +from core.data.cache import cached +from titles.cm.base import CardMakerBase +from titles.cm.const import CardMakerConstants +from titles.cm.config import CardMakerConfig + + +class CardMaker136(CardMakerBase): + def __init__(self, core_cfg: CoreConfig, game_cfg: CardMakerConfig) -> None: + super().__init__(core_cfg, game_cfg) + self.version = CardMakerConstants.VER_CARD_MAKER_136 + + def handle_get_game_connect_api_request(self, data: Dict) -> Dict: + uri = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}" + + # CHUNITHM = 0, maimai = 1, ONGEKI = 2 + return { + "length": 3, + "gameConnectList": [ + { + "modelKind": 0, + "type": 1, + "titleUri": f"{uri}/SDHD/205/" + }, + { + "modelKind": 1, + "type": 1, + "titleUri": f"{uri}/SDEZ/125/" + }, + { + "modelKind": 2, + "type": 1, + "titleUri": f"{uri}/SDDT/135/" + } + ] + } + + def handle_get_game_setting_api_request(self, data: Dict) -> Dict: + ret = super().handle_get_game_setting_api_request(data) + ret["gameSetting"]["dataVersion"] = "1.35.00" + ret["gameSetting"]["ongekiCmVersion"] = "1.35.04" + ret["gameSetting"]["chuniCmVersion"] = "2.05.00" + ret["gameSetting"]["maimaiCmVersion"] = "1.25.00" + return ret diff --git a/titles/cm/cm_data/MU3/static_cards.csv b/titles/cm/cm_data/MU3/static_cards.csv deleted file mode 100644 index 53e6e566e85af902acb7fa78d5213b9fef257331..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 333451 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 z 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 diff --git a/titles/cm/cm_data/MU3/static_gacha_cards.csv b/titles/cm/cm_data/MU3/static_gacha_cards.csv index 303e71a710e45c9db10e70441483bcd779422c8f..9588c6f8e4c907554dca0fccc022d5a0b3c3308d 100644 GIT binary patch literal 10059 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 delta 7 OcmX@@_uOPdx)cBpvjb)T diff --git a/titles/cm/cm_data/MU3/static_gachas.csv b/titles/cm/cm_data/MU3/static_gachas.csv index 20615740c04d64f035cc024dddafabe6e12657fd..5554cdbc12828cf315aab69b66d66811b0ea47e9 100644 GIT binary patch delta 183 zcmcbl^+>T z$zjZPlV>wqPrl0>GTDN~dU6#I?_sf+{F}vRvLCDU{gSP1Mv%X^T}!)wv)3stR}DKFrWMqh}Ai5CuegSPF@Vew}Dug%V4q> fm;K}kTpp9}b0tsqe literal 5458 zcmbVQOIO=Q7~T6<3|^!gA0Nx+l_gC{!)Yj~NfzDJAujj?>>luGnw=%NB<5iU2(JKf za7=hZ0&x=z3IC;IjpP-7p?8KyB$1kok3p6#&Gk3)-S2*P^ z@!ABgQv~M%7WO zjmQUwtXs21wpSo5|H9aQCXWCHR6b^`)k$Jal;npuf|zsU74RhOxX8b`gOx`(Ou`ro->056L&-xWujSY0aZ zR?wEst{BfIh%v4k#hiRlpzWDBn4hzivV788!CbcVuDZbMuSm5NRkQM8fWX$)fwiAv zGjEN9_a5_2&MKgkZL>$!`$8dm>9>Nh)l|V)(ug%yN93TZnR~_F?-~355Vn|Muj(KL zh*>#UVudBbR;J`94pth&ThPDi_H(vB?V;L%AcLTU_C_c_lzyG!Tzk#ifp*Mqu&>M| zUR+039n~VM_}7tCN3lo)@PuB}iu7nMMJ_#)#z1x*awZMHCFg=&(xZ9Lyx@i8XeGd# zrHh)<7|@&B?QJ)WcQ09Lm1-NpOW^1vkGtC|0fULh)h83&S?uJE#WkwVqJuUxT!8|n@sc~M zE~qeyZAR2vk?JW?eps^qwIj|(tOP(h<9Lqua1G7{oqU6;X_``5dI2_4q;LhU3qF#n zYgC8Xfzd-Zz@1a#Ze>t_=bEg;f)T()OsfO~U?m{||n0=k~pB0w2rLd24Hld%2pCa8K@l z2@O6VZSi=F?-U|~k6oi(@~II!gAizj?jL$yOZ zAfWn)JP69St^00!xTCvMdTq@SNaA bytes: req_raw = request.content.getvalue() @@ -51,18 +54,21 @@ class CardMakerServlet(): if version >= 130 and version < 135: # Card Maker internal_ver = CardMakerConstants.VER_CARD_MAKER + elif version >= 135 and version < 140: # Card Maker + internal_ver = CardMakerConstants.VER_CARD_MAKER_136 if all(c in string.hexdigits for c in endpoint) and len(endpoint) == 32: - # If we get a 32 character long hex string, it's a hash and we're - # doing encrypted. The likelyhood of false positives is low but + # If we get a 32 character long hex string, it's a hash and we're + # doing encrypted. The likelyhood of false positives is low but # technically not 0 self.logger.error("Encryption not supported at this time") - try: + try: unzip = zlib.decompress(req_raw) except zlib.error as e: - self.logger.error(f"Failed to decompress v{version} {endpoint} request -> {e}") + self.logger.error( + f"Failed to decompress v{version} {endpoint} request -> {e}") return zlib.compress("{\"stat\": \"0\"}".encode("utf-8")) req_data = json.loads(unzip) @@ -76,11 +82,13 @@ class CardMakerServlet(): resp = handler(req_data) except AttributeError as e: - self.logger.warning(f"Unhandled v{version} request {endpoint} - {e}") + self.logger.warning( + f"Unhandled v{version} request {endpoint} - {e}") return zlib.compress("{\"stat\": \"0\"}".encode("utf-8")) except Exception as e: - self.logger.error(f"Error handling v{version} method {endpoint} - {e}") + self.logger.error( + f"Error handling v{version} method {endpoint} - {e}") return zlib.compress("{\"stat\": \"0\"}".encode("utf-8")) if resp is None: diff --git a/titles/cm/read.py b/titles/cm/read.py index b9cb674..57d9279 100644 --- a/titles/cm/read.py +++ b/titles/cm/read.py @@ -24,16 +24,17 @@ class CardMakerReader(BaseReader): self.logger.info( f"Start importer for {CardMakerConstants.game_ver_to_string(version)}") except IndexError: - self.logger.error(f"Invalid ongeki version {version}") + self.logger.error(f"Invalid Card Maker version {version}") exit(1) def read(self) -> None: static_datas = { - "static_cards.csv": "read_ongeki_card_csv", "static_gachas.csv": "read_ongeki_gacha_csv", "static_gacha_cards.csv": "read_ongeki_gacha_card_csv" } + data_dirs = [] + if self.bin_dir is not None: for file, func in static_datas.items(): if os.path.exists(f"{self.bin_dir}/MU3/{file}"): @@ -43,36 +44,12 @@ class CardMakerReader(BaseReader): self.logger.warn(f"Couldn't find {file} file in {self.bin_dir}, skipping") if self.opt_dir is not None: - dir = self.get_data_directories(self.opt_dir) + data_dirs += self.get_data_directories(self.opt_dir) # ONGEKI (MU3) cnnot easily access the bin data(A000.pac) # so only opt_dir will work for now - self.read_gacha(f"{dir}/MU3/gacha") - self.read_card(f"{dir}/MU3/card") - - def read_ongeki_card_csv(self, file_path: str) -> None: - self.logger.info(f"Reading cards from {file_path}...") - - with open(file_path, encoding="utf-8") as f: - reader = csv.DictReader(f) - for row in reader: - self.ongeki_data.static.put_card( - row["version"], - row["cardId"], - name=row["name"], - charaId=row["charaId"], - nickName=row["nickName"] if row["nickName"] != "" else None, - school=row["school"], - attribute=row["attribute"], - gakunen=row["gakunen"], - rarity=row["rarity"], - levelParam=row["levelParam"], - skillId=row["skillId"], - choKaikaSkillId=row["choKaikaSkillId"], - cardNumber=row["cardNumber"] if row["cardNumber"] != "" else None - ) - - self.logger.info(f"Added card {row['cardId']}") + for dir in data_dirs: + self.read_ongeki_gacha(f"{dir}/MU3/gacha") def read_ongeki_gacha_csv(self, file_path: str) -> None: self.logger.info(f"Reading gachas from {file_path}...") @@ -87,10 +64,7 @@ class CardMakerReader(BaseReader): row["kind"], type=row["type"], isCeiling=True if row["isCeiling"] == "1" else False, - maxSelectPoint=row["maxSelectPoint"], - ceilingCnt=row["ceilingCnt"], - changeRateCnt1=row["changeRateCnt1"], - changeRateCnt2=row["changeRateCnt2"] + maxSelectPoint=row["maxSelectPoint"] ) self.logger.info(f"Added gacha {row['gachaId']}") @@ -112,64 +86,6 @@ class CardMakerReader(BaseReader): self.logger.info(f"Added card {row['cardId']} to gacha") - def read_ongeki_card(self, base_dir: str) -> None: - self.logger.info(f"Reading cards from {base_dir}...") - - version_ids = { - '1000': OngekiConstants.VER_ONGEKI, - '1005': OngekiConstants.VER_ONGEKI_PLUS, - '1010': OngekiConstants.VER_ONGEKI_SUMMER, - '1015': OngekiConstants.VER_ONGEKI_SUMMER_PLUS, - '1020': OngekiConstants.VER_ONGEKI_RED, - '1025': OngekiConstants.VER_ONGEKI_RED_PLUS, - '1030': OngekiConstants.VER_ONGEKI_BRIGHT, - '1035': OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY - } - - for root, dirs, files in os.walk(base_dir): - for dir in dirs: - if os.path.exists(f"{root}/{dir}/Card.xml"): - with open(f"{root}/{dir}/Card.xml", "r", encoding="utf-8") as f: - troot = ET.fromstring(f.read()) - - card_id = int(troot.find('Name').find('id').text) - name = troot.find('Name').find('str').text - chara_id = int(troot.find('CharaID').find('id').text) - nick_name = troot.find('NickName').text - school = troot.find('School').find('str').text - attribute = troot.find('Attribute').text - gakunen = troot.find('Gakunen').find('str').text - rarity = OngekiConstants.RARITY_TYPES[ - troot.find('Rarity').text].value - - level_param = [] - for lvl in troot.find('LevelParam').findall('int'): - level_param.append(lvl.text) - - skill_id = int(troot.find('SkillID').find('id').text) - cho_kai_ka_skill_id = int(troot.find('ChoKaikaSkillID').find('id').text) - - version = version_ids[ - troot.find('VersionID').find('id').text] - card_number = troot.find('CardNumberString').text - - self.ongeki_data.static.put_card( - version, - card_id, - name=name, - charaId=chara_id, - nickName=nick_name, - school=school, - attribute=attribute, - gakunen=gakunen, - rarity=rarity, - levelParam=','.join(level_param), - skillId=skill_id, - choKaikaSkillId=cho_kai_ka_skill_id, - cardNumber=card_number - ) - self.logger.info(f"Added card {card_id}") - def read_ongeki_gacha(self, base_dir: str) -> None: self.logger.info(f"Reading gachas from {base_dir}...") @@ -189,11 +105,34 @@ class CardMakerReader(BaseReader): troot = ET.fromstring(f.read()) name = troot.find('Name').find('str').text - id = int(troot.find('Name').find('id').text) + gacha_id = int(troot.find('Name').find('id').text) + + # skip already existing gachas + if self.ongeki_data.static.get_gacha( + OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY, gacha_id) is not None: + self.logger.info(f"Gacha {gacha_id} already added, skipping") + continue + + # 1140 is the first bright memory gacha + if gacha_id < 1140: + version = OngekiConstants.VER_ONGEKI_BRIGHT + else: + version = OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY gacha_kind = OngekiConstants.CM_GACHA_KINDS[ type_to_kind[troot.find('Type').text]].value + # hardcode which gachas get "Select Gacha" with 33 points + is_ceiling, max_select_point = 0, 0 + if gacha_id in {1163, 1164, 1165, 1166, 1167, 1168}: + is_ceiling = 1 + max_select_point = 33 + self.ongeki_data.static.put_gacha( - self.version, id, name, gacha_kind) - self.logger.info(f"Added gacha {id}") + version, + gacha_id, + name, + gacha_kind, + isCeiling=is_ceiling, + maxSelectPoint=max_select_point) + self.logger.info(f"Added gacha {gacha_id}") diff --git a/titles/ongeki/__init__.py b/titles/ongeki/__init__.py index 26e107c..8ca6862 100644 --- a/titles/ongeki/__init__.py +++ b/titles/ongeki/__init__.py @@ -15,4 +15,4 @@ trailing_slash = True use_default_host = False host = "" -current_schema_version = 2 \ No newline at end of file +current_schema_version = 2 diff --git a/titles/ongeki/bright.py b/titles/ongeki/bright.py index 57660b5..8f66f93 100644 --- a/titles/ongeki/bright.py +++ b/titles/ongeki/bright.py @@ -22,10 +22,8 @@ class OngekiBright(OngekiBase): return ret def handle_cm_get_user_data_api_request(self, data: Dict) -> Dict: - # first check for a bright memory profile after that check for a - # bright profile - p = (self.data.profile.get_profile_data(data["userId"], self.version+1) - or self.data.profile.get_profile_data(data["userId"], self.version)) + # check for a bright profile + p = self.data.profile.get_profile_data(data["userId"], self.version) if p is None: return {} @@ -50,6 +48,8 @@ class OngekiBright(OngekiBase): user_data["accessCode"] = cards[0]["access_code"] # hardcode Card Maker version for now + # Card Maker 1.34.00 = 1.30.01 + # Card Maker 1.36.00 = 1.35.04 user_data["compatibleCmVersion"] = "1.30.01" return {"userId": data["userId"], "userData": user_data} @@ -195,7 +195,9 @@ class OngekiBright(OngekiBase): # make sure to only show gachas for the current version # so only up to bright, 1140 is the first bright memory gacha - if tmp["gachaId"] < 1140: + if self.version == OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY: + game_gacha_list.append(tmp) + elif self.version == OngekiConstants.VER_ONGEKI_BRIGHT and tmp["gachaId"] < 1140: game_gacha_list.append(tmp) return { @@ -379,11 +381,11 @@ class OngekiBright(OngekiBase): if "userData" in upsert and len(upsert["userData"]) > 0: # check if the profile is a bright memory profile - p = self.data.profile.get_profile_data(data["userId"], self.version+1) + p = self.data.profile.get_profile_data(data["userId"], self.version) if p is not None: # save the bright memory profile self.data.profile.put_profile_data( - user_id, self.version+1, upsert["userData"][0]) + user_id, self.version, upsert["userData"][0]) else: # save the bright profile self.data.profile.put_profile_data( @@ -413,11 +415,11 @@ class OngekiBright(OngekiBase): if "userData" in upsert and len(upsert["userData"]) > 0: # check if the profile is a bright memory profile - p = self.data.profile.get_profile_data(data["userId"], self.version+1) + p = self.data.profile.get_profile_data(data["userId"], self.version) if p is not None: # save the bright memory profile self.data.profile.put_profile_data( - user_id, self.version+1, upsert["userData"][0]) + user_id, self.version, upsert["userData"][0]) else: # save the bright profile self.data.profile.put_profile_data( @@ -601,11 +603,11 @@ class OngekiBright(OngekiBase): if "userData" in upsert and len(upsert["userData"]) > 0: # check if the profile is a bright memory profile - p = self.data.profile.get_profile_data(data["userId"], self.version+1) + p = self.data.profile.get_profile_data(data["userId"], self.version) if p is not None: # save the bright memory profile self.data.profile.put_profile_data( - user_id, self.version+1, upsert["userData"][0]) + user_id, self.version, upsert["userData"][0]) else: # save the bright profile self.data.profile.put_profile_data( diff --git a/titles/ongeki/brightmemory.py b/titles/ongeki/brightmemory.py index a99f806..c3e4ef1 100644 --- a/titles/ongeki/brightmemory.py +++ b/titles/ongeki/brightmemory.py @@ -5,11 +5,12 @@ import json from core.config import CoreConfig from titles.ongeki.base import OngekiBase +from titles.ongeki.bright import OngekiBright from titles.ongeki.const import OngekiConstants from titles.ongeki.config import OngekiConfig -class OngekiBrightMemory(OngekiBase): +class OngekiBrightMemory(OngekiBright): def __init__(self, core_cfg: CoreConfig, game_cfg: OngekiConfig) -> None: super().__init__(core_cfg, game_cfg) self.version = OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY @@ -28,7 +29,7 @@ class OngekiBrightMemory(OngekiBase): def handle_get_user_memory_chapter_api_request(self, data: Dict) -> Dict: memories = self.data.item.get_memorychapters(data["userId"]) - if not memories: + if not memories: return {"userId": data["userId"], "length":6, "userMemoryChapterList":[ {"gaugeId":0, "isClear": False, "gaugeNum": 0, "chapterId": 70001, "jewelCount": 0, "isBossWatched": False, "isStoryWatched": False, "isDialogWatched": False, "isEndingWatched": False, "lastPlayMusicId": 0, "lastPlayMusicLevel": 0, "lastPlayMusicCategory": 0}, {"gaugeId":0, "isClear": False, "gaugeNum": 0, "chapterId": 70002, "jewelCount": 0, "isBossWatched": False, "isStoryWatched": False, "isDialogWatched": False, "isEndingWatched": False, "lastPlayMusicId": 0, "lastPlayMusicLevel": 0, "lastPlayMusicCategory": 0}, @@ -37,17 +38,17 @@ class OngekiBrightMemory(OngekiBase): {"gaugeId":0, "isClear": False, "gaugeNum": 0, "chapterId": 70005, "jewelCount": 0, "isBossWatched": False, "isStoryWatched": False, "isDialogWatched": False, "isEndingWatched": False, "lastPlayMusicId": 0, "lastPlayMusicLevel": 0, "lastPlayMusicCategory": 0}, {"gaugeId":0, "isClear": False, "gaugeNum": 0, "chapterId": 70099, "jewelCount": 0, "isBossWatched": False, "isStoryWatched": False, "isDialogWatched": False, "isEndingWatched": False, "lastPlayMusicId": 0, "lastPlayMusicLevel": 0, "lastPlayMusicCategory": 0} ]} - + memory_chp = [] for chp in memories: tmp = chp._asdict() tmp.pop("id") tmp.pop("user") memory_chp.append(tmp) - + return { - "userId": data["userId"], - "length": len(memory_chp), + "userId": data["userId"], + "length": len(memory_chp), "userMemoryChapterList": memory_chp } @@ -55,4 +56,15 @@ class OngekiBrightMemory(OngekiBase): return { "techScore": 0, "cardNum": 0 - } \ No newline at end of file + } + + def handle_cm_get_user_data_api_request(self, data: Dict) -> Dict: + # check for a bright memory profile + user_data = super().handle_cm_get_user_data_api_request(data) + + # hardcode Card Maker version for now + # Card Maker 1.34.00 = 1.30.01 + # Card Maker 1.36.00 = 1.35.04 + user_data["userData"]["compatibleCmVersion"] = "1.35.04" + + return user_data diff --git a/titles/ongeki/read.py b/titles/ongeki/read.py index 8b1be3d..397fa8c 100644 --- a/titles/ongeki/read.py +++ b/titles/ongeki/read.py @@ -11,29 +11,99 @@ from titles.ongeki.database import OngekiData from titles.ongeki.const import OngekiConstants from titles.ongeki.config import OngekiConfig + class OngekiReader(BaseReader): - def __init__(self, config: CoreConfig, version: int, bin_dir: Optional[str], opt_dir: Optional[str], extra: Optional[str]) -> None: + def __init__(self, config: CoreConfig, version: int, bin_dir: Optional[str], + opt_dir: Optional[str], extra: Optional[str]) -> None: super().__init__(config, version, bin_dir, opt_dir, extra) self.data = OngekiData(config) try: - self.logger.info(f"Start importer for {OngekiConstants.game_ver_to_string(version)}") + self.logger.info( + f"Start importer for {OngekiConstants.game_ver_to_string(version)}") except IndexError: self.logger.error(f"Invalid ongeki version {version}") exit(1) - + def read(self) -> None: data_dirs = [] if self.bin_dir is not None: data_dirs += self.get_data_directories(self.bin_dir) - + if self.opt_dir is not None: data_dirs += self.get_data_directories(self.opt_dir) - + for dir in data_dirs: self.read_events(f"{dir}/event") self.read_music(f"{dir}/music") - + self.read_card(f"{dir}/card") + + def read_card(self, base_dir: str) -> None: + self.logger.info(f"Reading cards from {base_dir}...") + + version_ids = { + '1000': OngekiConstants.VER_ONGEKI, + '1005': OngekiConstants.VER_ONGEKI_PLUS, + '1010': OngekiConstants.VER_ONGEKI_SUMMER, + '1015': OngekiConstants.VER_ONGEKI_SUMMER_PLUS, + '1020': OngekiConstants.VER_ONGEKI_RED, + '1025': OngekiConstants.VER_ONGEKI_RED_PLUS, + '1030': OngekiConstants.VER_ONGEKI_BRIGHT, + '1035': OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY + } + + for root, dirs, files in os.walk(base_dir): + for dir in dirs: + if os.path.exists(f"{root}/{dir}/Card.xml"): + with open(f"{root}/{dir}/Card.xml", "r", encoding="utf-8") as f: + troot = ET.fromstring(f.read()) + + card_id = int(troot.find('Name').find('id').text) + + # skip already existing cards + if self.data.static.get_card( + OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY, card_id) is not None: + + self.logger.info(f"Card {card_id} already added, skipping") + continue + + name = troot.find('Name').find('str').text + chara_id = int(troot.find('CharaID').find('id').text) + nick_name = troot.find('NickName').text + school = troot.find('School').find('str').text + attribute = troot.find('Attribute').text + gakunen = troot.find('Gakunen').find('str').text + rarity = OngekiConstants.RARITY_TYPES[ + troot.find('Rarity').text].value + + level_param = [] + for lvl in troot.find('LevelParam').findall('int'): + level_param.append(lvl.text) + + skill_id = int(troot.find('SkillID').find('id').text) + cho_kai_ka_skill_id = int(troot.find('ChoKaikaSkillID').find('id').text) + + version = version_ids[ + troot.find('VersionID').find('id').text] + card_number = troot.find('CardNumberString').text + + self.data.static.put_card( + version, + card_id, + name=name, + charaId=chara_id, + nickName=nick_name, + school=school, + attribute=attribute, + gakunen=gakunen, + rarity=rarity, + levelParam=','.join(level_param), + skillId=skill_id, + choKaikaSkillId=cho_kai_ka_skill_id, + cardNumber=card_number + ) + self.logger.info(f"Added card {card_id}") + def read_events(self, base_dir: str) -> None: self.logger.info(f"Reading events from {base_dir}...") @@ -45,12 +115,13 @@ class OngekiReader(BaseReader): name = troot.find('Name').find('str').text id = int(troot.find('Name').find('id').text) - event_type = OngekiConstants.EVT_TYPES[troot.find('EventType').text].value - + event_type = OngekiConstants.EVT_TYPES[troot.find( + 'EventType').text].value - self.data.static.put_event(self.version, id, event_type, name) + self.data.static.put_event( + self.version, id, event_type, name) self.logger.info(f"Added event {id}") - + def read_music(self, base_dir: str) -> None: self.logger.info(f"Reading music from {base_dir}...") @@ -72,9 +143,9 @@ class OngekiReader(BaseReader): title = name.find('str').text artist = troot.find('ArtistName').find('str').text genre = troot.find('Genre').find('str').text - + fumens = troot.find("FumenData") - for fumens_data in fumens.findall('FumenData'): + for fumens_data in fumens.findall('FumenData'): path = fumens_data.find('FumenFile').find('path').text if path is None or not os.path.exists(f"{root}/{dir}/{path}"): continue @@ -82,8 +153,9 @@ class OngekiReader(BaseReader): chart_id = int(path.split(".")[0].split("_")[1]) level = float( f"{fumens_data.find('FumenConstIntegerPart').text}.{fumens_data.find('FumenConstFractionalPart').text}" - ) - - self.data.static.put_chart(self.version, song_id, chart_id, title, artist, genre, level) - self.logger.info(f"Added song {song_id} chart {chart_id}") + ) + self.data.static.put_chart( + self.version, song_id, chart_id, title, artist, genre, level) + self.logger.info( + f"Added song {song_id} chart {chart_id}") diff --git a/titles/ongeki/schema/profile.py b/titles/ongeki/schema/profile.py index d7514c6..ce07490 100644 --- a/titles/ongeki/schema/profile.py +++ b/titles/ongeki/schema/profile.py @@ -180,7 +180,7 @@ region = Table( mysql_charset='utf8mb4' ) -training_room = Table ( +training_room = Table( "ongeki_profile_training_room", metadata, Column("id", Integer, primary_key=True, nullable=False), @@ -193,7 +193,7 @@ training_room = Table ( mysql_charset='utf8mb4' ) -kop = Table ( +kop = Table( "ongeki_profile_kop", metadata, Column("id", Integer, primary_key=True, nullable=False), @@ -219,6 +219,7 @@ rival = Table( mysql_charset='utf8mb4' ) + class OngekiProfileData(BaseData): def __init__(self, cfg: CoreConfig, conn: Connection) -> None: super().__init__(cfg, conn) @@ -287,14 +288,14 @@ class OngekiProfileData(BaseData): result = self.execute(sql) if result is None: return None return result.fetchall() - + def get_kop(self, aime_id: int) -> Optional[List[Row]]: sql = select(kop).where(kop.c.user == aime_id) result = self.execute(sql) if result is None: return None return result.fetchall() - + def get_rivals(self, aime_id: int) -> Optional[List[Row]]: sql = select(rival.c.rivalUserId).where(rival.c.user == aime_id) diff --git a/titles/ongeki/schema/static.py b/titles/ongeki/schema/static.py index 2e1bc51..7c5ed68 100644 --- a/titles/ongeki/schema/static.py +++ b/titles/ongeki/schema/static.py @@ -192,7 +192,7 @@ class OngekiStaticData(BaseData): def get_gacha(self, version: int, gacha_id: int) -> Optional[Dict]: sql = gachas.select(and_( - gachas.c.version == version, + gachas.c.version <= version, gachas.c.gachaId == gacha_id )) From 6609732546f96cc6745a137ccfbebd519021c043 Mon Sep 17 00:00:00 2001 From: Dniel97 Date: Mon, 6 Mar 2023 16:06:17 +0100 Subject: [PATCH 21/63] cm: added get_allnet_info --- titles/cm/__init__.py | 8 +------- titles/cm/const.py | 2 ++ titles/cm/index.py | 22 ++++++++++++++++++++-- titles/ongeki/__init__.py | 2 +- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/titles/cm/__init__.py b/titles/cm/__init__.py index 7c03605..ae4e9f0 100644 --- a/titles/cm/__init__.py +++ b/titles/cm/__init__.py @@ -5,12 +5,6 @@ from titles.cm.read import CardMakerReader index = CardMakerServlet reader = CardMakerReader -use_default_title = True -include_protocol = True -title_secure = False game_codes = [CardMakerConstants.GAME_CODE] -trailing_slash = True -use_default_host = False -host = "" -current_schema_version = 1 \ No newline at end of file +current_schema_version = 1 diff --git a/titles/cm/const.py b/titles/cm/const.py index 54cc009..3dec4fe 100644 --- a/titles/cm/const.py +++ b/titles/cm/const.py @@ -1,6 +1,8 @@ class CardMakerConstants(): GAME_CODE = "SDED" + CONFIG_NAME = "cardmaker.yaml" + VER_CARD_MAKER = 0 VER_CARD_MAKER_136 = 1 diff --git a/titles/cm/index.py b/titles/cm/index.py index 34fafb0..b2751b0 100644 --- a/titles/cm/index.py +++ b/titles/cm/index.py @@ -1,4 +1,3 @@ -from twisted.web.http import Request import json import inflection import yaml @@ -6,6 +5,10 @@ import string import logging import coloredlogs import zlib + +from os import path +from typing import Tuple +from twisted.web.http import Request from logging.handlers import TimedRotatingFileHandler from core.config import CoreConfig @@ -19,7 +22,8 @@ class CardMakerServlet(): def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None: self.core_cfg = core_cfg self.game_cfg = CardMakerConfig() - self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/cardmaker.yaml"))) + if path.exists(f"{cfg_dir}/{CardMakerConstants.CONFIG_NAME}"): + self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{CardMakerConstants.CONFIG_NAME}"))) self.versions = [ CardMakerBase(core_cfg, self.game_cfg), @@ -44,6 +48,20 @@ class CardMakerServlet(): coloredlogs.install(level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str) + @classmethod + def get_allnet_info(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: + game_cfg = CardMakerConfig() + if path.exists(f"{cfg_dir}/{CardMakerConstants.CONFIG_NAME}"): + game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{CardMakerConstants.CONFIG_NAME}"))) + + if not game_cfg.server.enable: + return (False, "", "") + + if core_cfg.server.is_develop: + return (True, f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/", "") + + return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", "") + def render_POST(self, request: Request, version: int, url_path: str) -> bytes: req_raw = request.content.getvalue() url_split = url_path.split("/") diff --git a/titles/ongeki/__init__.py b/titles/ongeki/__init__.py index 8ca6862..26e107c 100644 --- a/titles/ongeki/__init__.py +++ b/titles/ongeki/__init__.py @@ -15,4 +15,4 @@ trailing_slash = True use_default_host = False host = "" -current_schema_version = 2 +current_schema_version = 2 \ No newline at end of file From fb6a026b84929e92a384957e22830e7c848f8ae3 Mon Sep 17 00:00:00 2001 From: Midorica Date: Thu, 9 Mar 2023 09:10:36 -0500 Subject: [PATCH 22/63] Adding the music list for crossbeats again --- titles/cxb/data/Export.csv | Bin 0 -> 52970 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 titles/cxb/data/Export.csv diff --git a/titles/cxb/data/Export.csv b/titles/cxb/data/Export.csv new file mode 100644 index 0000000000000000000000000000000000000000..ee913dd20b33f6a98a0f708342b3b9c6d7cda95c GIT binary patch literal 52970 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 Date: Thu, 9 Mar 2023 10:35:58 -0500 Subject: [PATCH 23/63] cardmaker: simplify handle_get_game_connect_api_request, add develop mode check --- titles/cm/base.py | 5 ++++- titles/cm/cm136.py | 32 +++++++++----------------------- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/titles/cm/base.py b/titles/cm/base.py index c22fa41..636e0ee 100644 --- a/titles/cm/base.py +++ b/titles/cm/base.py @@ -22,7 +22,10 @@ class CardMakerBase(): self.version = CardMakerConstants.VER_CARD_MAKER def handle_get_game_connect_api_request(self, data: Dict) -> Dict: - uri = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}" + if self.core_cfg.server.is_develop: + uri = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}" + else: + f"http://{self.core_cfg.title.hostname}" # CHUNITHM = 0, maimai = 1, ONGEKI = 2 return { diff --git a/titles/cm/cm136.py b/titles/cm/cm136.py index 2859c24..2298dc8 100644 --- a/titles/cm/cm136.py +++ b/titles/cm/cm136.py @@ -17,29 +17,15 @@ class CardMaker136(CardMakerBase): self.version = CardMakerConstants.VER_CARD_MAKER_136 def handle_get_game_connect_api_request(self, data: Dict) -> Dict: - uri = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}" - - # CHUNITHM = 0, maimai = 1, ONGEKI = 2 - return { - "length": 3, - "gameConnectList": [ - { - "modelKind": 0, - "type": 1, - "titleUri": f"{uri}/SDHD/205/" - }, - { - "modelKind": 1, - "type": 1, - "titleUri": f"{uri}/SDEZ/125/" - }, - { - "modelKind": 2, - "type": 1, - "titleUri": f"{uri}/SDDT/135/" - } - ] - } + ret = super().handle_get_game_connect_api_request(data) + if self.core_cfg.server.is_develop: + uri = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}" + else: + uri = f"http://{self.core_cfg.title.hostname}" + + ret["gameConnectList"][0]["titleUri"] = f"{uri}/SDHD/205/" + ret["gameConnectList"][1]["titleUri"] = f"{uri}/SDEZ/125/" + ret["gameConnectList"][2]["titleUri"] = f"{uri}/SDDT/135/" def handle_get_game_setting_api_request(self, data: Dict) -> Dict: ret = super().handle_get_game_setting_api_request(data) From 6dcd7b67ef9369b6f9672a8233ca7b1dea838ec6 Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Thu, 9 Mar 2023 10:37:29 -0500 Subject: [PATCH 24/63] cm: hotfix for handle_get_game_connect_api_request --- titles/cm/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/titles/cm/base.py b/titles/cm/base.py index 636e0ee..b5d65b7 100644 --- a/titles/cm/base.py +++ b/titles/cm/base.py @@ -25,7 +25,7 @@ class CardMakerBase(): if self.core_cfg.server.is_develop: uri = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}" else: - f"http://{self.core_cfg.title.hostname}" + uri = f"http://{self.core_cfg.title.hostname}" # CHUNITHM = 0, maimai = 1, ONGEKI = 2 return { From c8d4bc6109e3263bddc4c8e4af59c0c382935532 Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Thu, 9 Mar 2023 10:52:49 -0500 Subject: [PATCH 25/63] add special-case ping handlers to mai2, ongeki and chuni --- titles/chuni/base.py | 3 --- titles/chuni/index.py | 3 +++ titles/mai2/base.py | 3 --- titles/mai2/index.py | 3 +++ titles/ongeki/index.py | 3 +++ 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/titles/chuni/base.py b/titles/chuni/base.py index d557583..65d991d 100644 --- a/titles/chuni/base.py +++ b/titles/chuni/base.py @@ -21,9 +21,6 @@ class ChuniBase(): self.game = ChuniConstants.GAME_CODE self.version = ChuniConstants.VER_CHUNITHM - def handle_ping_request(self, data: Dict) -> Dict: - return {"returnCode": 1} - def handle_game_login_api_request(self, data: Dict) -> Dict: #self.data.base.log_event("chuni", "login", logging.INFO, {"version": self.version, "user": data["userId"]}) return { "returnCode": 1 } diff --git a/titles/chuni/index.py b/titles/chuni/index.py index 866e9d9..66e8c65 100644 --- a/titles/chuni/index.py +++ b/titles/chuni/index.py @@ -86,6 +86,9 @@ class ChuniServlet(): return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", "") def render_POST(self, request: Request, version: int, url_path: str) -> bytes: + if url_path == "/ping": + return zlib.compress(json.dumps({'returnCode': 1}, ensure_ascii=False).encode("utf-8")) + req_raw = request.content.getvalue() url_split = url_path.split("/") encrtped = False diff --git a/titles/mai2/base.py b/titles/mai2/base.py index 3817890..ea98681 100644 --- a/titles/mai2/base.py +++ b/titles/mai2/base.py @@ -16,9 +16,6 @@ class Mai2Base(): self.data = Mai2Data(cfg) self.logger = logging.getLogger("mai2") - def handle_ping_request(self, data: Dict) -> Dict: - return {"returnCode": 1} - def handle_get_game_setting_api_request(self, data: Dict): reboot_start = date.strftime(datetime.now() + timedelta(hours=3), Mai2Constants.DATE_TIME_FORMAT) reboot_end = date.strftime(datetime.now() + timedelta(hours=4), Mai2Constants.DATE_TIME_FORMAT) diff --git a/titles/mai2/index.py b/titles/mai2/index.py index 64a38a6..051cba0 100644 --- a/titles/mai2/index.py +++ b/titles/mai2/index.py @@ -69,6 +69,9 @@ class Mai2Servlet(): return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", f"{core_cfg.title.hostname}/") def render_POST(self, request: Request, version: int, url_path: str) -> bytes: + if url_path == "/ping": + return zlib.compress(json.dumps({'returnCode': 1}, ensure_ascii=False).encode("utf-8")) + req_raw = request.content.getvalue() url = request.uri.decode() url_split = url_path.split("/") diff --git a/titles/ongeki/index.py b/titles/ongeki/index.py index c5e78f6..c3d4b26 100644 --- a/titles/ongeki/index.py +++ b/titles/ongeki/index.py @@ -72,6 +72,9 @@ class OngekiServlet(): return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", f"{core_cfg.title.hostname}/") def render_POST(self, request: Request, version: int, url_path: str) -> bytes: + if url_path == "/ping": + return zlib.compress(json.dumps({'returnCode': 1}, ensure_ascii=False).encode("utf-8")) + req_raw = request.content.getvalue() url_split = url_path.split("/") internal_ver = 0 From 6761915a3fc2484da06c7d66e2c2d23d3285e062 Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Thu, 9 Mar 2023 10:56:30 -0500 Subject: [PATCH 26/63] add .lower() to ping requsts --- titles/chuni/index.py | 2 +- titles/mai2/index.py | 2 +- titles/ongeki/index.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/titles/chuni/index.py b/titles/chuni/index.py index 66e8c65..ce6bda9 100644 --- a/titles/chuni/index.py +++ b/titles/chuni/index.py @@ -86,7 +86,7 @@ class ChuniServlet(): return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", "") def render_POST(self, request: Request, version: int, url_path: str) -> bytes: - if url_path == "/ping": + if url_path.lower() == "/ping": return zlib.compress(json.dumps({'returnCode': 1}, ensure_ascii=False).encode("utf-8")) req_raw = request.content.getvalue() diff --git a/titles/mai2/index.py b/titles/mai2/index.py index 051cba0..80b3ac8 100644 --- a/titles/mai2/index.py +++ b/titles/mai2/index.py @@ -69,7 +69,7 @@ class Mai2Servlet(): return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", f"{core_cfg.title.hostname}/") def render_POST(self, request: Request, version: int, url_path: str) -> bytes: - if url_path == "/ping": + if url_path.lower() == "/ping": return zlib.compress(json.dumps({'returnCode': 1}, ensure_ascii=False).encode("utf-8")) req_raw = request.content.getvalue() diff --git a/titles/ongeki/index.py b/titles/ongeki/index.py index c3d4b26..2bbdb46 100644 --- a/titles/ongeki/index.py +++ b/titles/ongeki/index.py @@ -72,7 +72,7 @@ class OngekiServlet(): return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", f"{core_cfg.title.hostname}/") def render_POST(self, request: Request, version: int, url_path: str) -> bytes: - if url_path == "/ping": + if url_path.lower() == "/ping": return zlib.compress(json.dumps({'returnCode': 1}, ensure_ascii=False).encode("utf-8")) req_raw = request.content.getvalue() From fa7206848cc1165ee1da1ab846be5e1c9a40dc21 Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Thu, 9 Mar 2023 11:29:36 -0500 Subject: [PATCH 27/63] general code cleanup for multiple games --- titles/chuni/index.py | 28 +++++++++++++++------------- titles/cm/index.py | 13 ++++++------- titles/mai2/index.py | 14 +++++++------- titles/ongeki/index.py | 15 ++++++++------- titles/wacca/index.py | 22 +++++++++++----------- 5 files changed, 47 insertions(+), 45 deletions(-) diff --git a/titles/chuni/index.py b/titles/chuni/index.py index ce6bda9..5ee03a4 100644 --- a/titles/chuni/index.py +++ b/titles/chuni/index.py @@ -87,7 +87,7 @@ class ChuniServlet(): def render_POST(self, request: Request, version: int, url_path: str) -> bytes: if url_path.lower() == "/ping": - return zlib.compress(json.dumps({'returnCode': 1}, ensure_ascii=False).encode("utf-8")) + return zlib.compress(b'{"returnCode": "1"}') req_raw = request.content.getvalue() url_split = url_path.split("/") @@ -138,13 +138,13 @@ class ChuniServlet(): except: self.logger.error(f"Failed to decrypt v{version} request to {endpoint} -> {req_raw}") - return zlib.compress("{\"stat\": \"0\"}".encode("utf-8")) + return zlib.compress(b'{"stat": "0"}') encrtped = True if not encrtped and self.game_cfg.crypto.encrypted_only: self.logger.error(f"Unencrypted v{version} {endpoint} request, but config is set to encrypted only: {req_raw}") - return zlib.compress("{\"stat\": \"0\"}".encode("utf-8")) + return zlib.compress(b'{"stat": "0"}') try: unzip = zlib.decompress(req_raw) @@ -160,17 +160,19 @@ class ChuniServlet(): func_to_find = "handle_" + inflection.underscore(endpoint) + "_request" - try: - handler = getattr(self.versions[internal_ver], func_to_find) - resp = handler(req_data) - - except AttributeError as e: - self.logger.warning(f"Unhandled v{version} request {endpoint} - {e}") - return zlib.compress("{\"stat\": \"0\"}".encode("utf-8")) + if not hasattr(self.versions[internal_ver], func_to_find): + self.logger.warning(f"Unhandled v{version} request {endpoint}") + resp = {"returnCode": 1} + + else: - except Exception as e: - self.logger.error(f"Error handling v{version} method {endpoint} - {e}") - return zlib.compress("{\"stat\": \"0\"}".encode("utf-8")) + try: + handler = getattr(self.versions[internal_ver], func_to_find) + resp = handler(req_data) + + except Exception as e: + self.logger.error(f"Error handling v{version} method {endpoint} - {e}") + return zlib.compress(b'{"stat": "0"}') if resp == None: resp = {'returnCode': 1} diff --git a/titles/cm/index.py b/titles/cm/index.py index b2751b0..ff9ea1f 100644 --- a/titles/cm/index.py +++ b/titles/cm/index.py @@ -87,7 +87,7 @@ class CardMakerServlet(): except zlib.error as e: self.logger.error( f"Failed to decompress v{version} {endpoint} request -> {e}") - return zlib.compress("{\"stat\": \"0\"}".encode("utf-8")) + return zlib.compress(b'{"stat": "0"}') req_data = json.loads(unzip) @@ -95,19 +95,18 @@ class CardMakerServlet(): func_to_find = "handle_" + inflection.underscore(endpoint) + "_request" + if not hasattr(self.versions[internal_ver], func_to_find): + self.logger.warning(f"Unhandled v{version} request {endpoint}") + return zlib.compress(b'{"returnCode": 1}') + try: handler = getattr(self.versions[internal_ver], func_to_find) resp = handler(req_data) - except AttributeError as e: - self.logger.warning( - f"Unhandled v{version} request {endpoint} - {e}") - return zlib.compress("{\"stat\": \"0\"}".encode("utf-8")) - except Exception as e: self.logger.error( f"Error handling v{version} method {endpoint} - {e}") - return zlib.compress("{\"stat\": \"0\"}".encode("utf-8")) + return zlib.compress(b'{"stat": "0"}') if resp is None: resp = {'returnCode': 1} diff --git a/titles/mai2/index.py b/titles/mai2/index.py index 80b3ac8..305e389 100644 --- a/titles/mai2/index.py +++ b/titles/mai2/index.py @@ -70,7 +70,7 @@ class Mai2Servlet(): def render_POST(self, request: Request, version: int, url_path: str) -> bytes: if url_path.lower() == "/ping": - return zlib.compress(json.dumps({'returnCode': 1}, ensure_ascii=False).encode("utf-8")) + return zlib.compress(b'{"returnCode": "1"}') req_raw = request.content.getvalue() url = request.uri.decode() @@ -102,7 +102,7 @@ class Mai2Servlet(): except zlib.error as e: self.logger.error(f"Failed to decompress v{version} {endpoint} request -> {e}") - return zlib.compress("{\"stat\": \"0\"}".encode("utf-8")) + return zlib.compress(b'{"stat": "0"}') req_data = json.loads(unzip) @@ -110,17 +110,17 @@ class Mai2Servlet(): func_to_find = "handle_" + inflection.underscore(endpoint) + "_request" + if not hasattr(self.versions[internal_ver], func_to_find): + self.logger.warning(f"Unhandled v{version} request {endpoint}") + return zlib.compress(b'{"returnCode": 1}') + try: handler = getattr(self.versions[internal_ver], func_to_find) resp = handler(req_data) - - except AttributeError as e: - self.logger.warning(f"Unhandled v{version} request {endpoint} - {e}") - return zlib.compress("{\"stat\": \"0\"}".encode("utf-8")) except Exception as e: self.logger.error(f"Error handling v{version} method {endpoint} - {e}") - return zlib.compress("{\"stat\": \"0\"}".encode("utf-8")) + return zlib.compress(b'{"stat": "0"}') if resp == None: resp = {'returnCode': 1} diff --git a/titles/ongeki/index.py b/titles/ongeki/index.py index 2bbdb46..09ab18c 100644 --- a/titles/ongeki/index.py +++ b/titles/ongeki/index.py @@ -73,7 +73,7 @@ class OngekiServlet(): def render_POST(self, request: Request, version: int, url_path: str) -> bytes: if url_path.lower() == "/ping": - return zlib.compress(json.dumps({'returnCode': 1}, ensure_ascii=False).encode("utf-8")) + return zlib.compress(b'{"returnCode": 1}') req_raw = request.content.getvalue() url_split = url_path.split("/") @@ -102,13 +102,14 @@ class OngekiServlet(): # doing encrypted. The likelyhood of false positives is low but # technically not 0 self.logger.error("Encryption not supported at this time") + return b"" try: unzip = zlib.decompress(req_raw) except zlib.error as e: self.logger.error(f"Failed to decompress v{version} {endpoint} request -> {e}") - return zlib.compress("{\"stat\": \"0\"}".encode("utf-8")) + return zlib.compress(b'{"stat": "0"}') req_data = json.loads(unzip) @@ -116,17 +117,17 @@ class OngekiServlet(): func_to_find = "handle_" + inflection.underscore(endpoint) + "_request" + if not hasattr(self.versions[internal_ver], func_to_find): + self.logger.warning(f"Unhandled v{version} request {endpoint}") + return zlib.compress(b'{"returnCode": 1}') + try: handler = getattr(self.versions[internal_ver], func_to_find) resp = handler(req_data) - - except AttributeError as e: - self.logger.warning(f"Unhandled v{version} request {endpoint} - {e}") - return zlib.compress("{\"stat\": \"0\"}".encode("utf-8")) except Exception as e: self.logger.error(f"Error handling v{version} method {endpoint} - {e}") - return zlib.compress("{\"stat\": \"0\"}".encode("utf-8")) + return zlib.compress(b'{"stat": "0"}') if resp == None: resp = {'returnCode': 1} diff --git a/titles/wacca/index.py b/titles/wacca/index.py index e2f9758..b4a4aea 100644 --- a/titles/wacca/index.py +++ b/titles/wacca/index.py @@ -117,24 +117,24 @@ class WaccaServlet(): self.logger.info(f"v{req_json['appVersion']} {url_path} request from {request.getClientAddress().host} with chipId {req_json['chipId']}") self.logger.debug(req_json) + if not hasattr(self.versions[internal_ver], func_to_find): + self.logger.warn(f"{req_json['appVersion']} has no handler for {func_to_find}") + resp = BaseResponse().make() + return end(resp) + try: handler = getattr(self.versions[internal_ver], func_to_find) - if handler is not None: - resp = handler(req_json) - - else: - self.logger.warn(f"{req_json['appVersion']} has no handler for {func_to_find}") - resp = None - - if resp is None: - resp = BaseResponse().make() + resp = handler(req_json) self.logger.debug(f"{req_json['appVersion']} response {resp}") return end(resp) except Exception as e: self.logger.error(f"{req_json['appVersion']} Error handling method {url_path} -> {e}") - if self.game_cfg.server.loglevel <= logging.DEBUG: + if self.core_cfg.server.is_develop: raise - resp = BaseResponse().make() + + resp = BaseResponse() + resp.status = 1 + resp.message = "A server error occoured." return end(resp) From a76bb94eb15dbd14f6ac0bd4c63d19ef461b4ecb Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Thu, 9 Mar 2023 11:38:58 -0500 Subject: [PATCH 28/63] let black do it's magic --- core/__init__.py | 2 +- core/aimedb.py | 167 +++++-- core/allnet.py | 188 ++++--- core/config.py | 215 +++++--- core/const.py | 11 +- core/data/__init__.py | 2 +- core/data/cache.py | 14 +- core/data/database.py | 137 ++++-- core/data/schema/__init__.py | 2 +- core/data/schema/arcade.py | 207 +++++--- core/data/schema/base.py | 62 ++- core/data/schema/card.py | 45 +- core/data/schema/user.py | 67 +-- core/frontend.py | 117 +++-- core/mucha.py | 106 ++-- core/title.py | 53 +- core/utils.py | 3 +- dbutils.py | 26 +- index.py | 174 +++++-- read.py | 72 +-- titles/chuni/air.py | 7 +- titles/chuni/airplus.py | 7 +- titles/chuni/amazon.py | 5 +- titles/chuni/amazonplus.py | 5 +- titles/chuni/base.py | 340 +++++++------ titles/chuni/config.py | 35 +- titles/chuni/const.py | 21 +- titles/chuni/crystal.py | 5 +- titles/chuni/crystalplus.py | 5 +- titles/chuni/database.py | 3 +- titles/chuni/index.py | 122 +++-- titles/chuni/new.py | 75 +-- titles/chuni/newplus.py | 19 +- titles/chuni/paradise.py | 5 +- titles/chuni/plus.py | 7 +- titles/chuni/read.py | 153 +++--- titles/chuni/schema/__init__.py | 2 +- titles/chuni/schema/item.py | 112 +++-- titles/chuni/schema/profile.py | 249 ++++++---- titles/chuni/schema/score.py | 49 +- titles/chuni/schema/static.py | 222 +++++---- titles/chuni/star.py | 7 +- titles/chuni/starplus.py | 7 +- titles/cm/base.py | 44 +- titles/cm/cm136.py | 2 +- titles/cm/config.py | 12 +- titles/cm/const.py | 2 +- titles/cm/index.py | 43 +- titles/cm/read.py | 47 +- titles/cxb/__init__.py | 2 +- titles/cxb/base.py | 625 ++++++++++++++---------- titles/cxb/config.py | 42 +- titles/cxb/const.py | 11 +- titles/cxb/database.py | 2 +- titles/cxb/index.py | 109 +++-- titles/cxb/read.py | 81 +++- titles/cxb/rev.py | 276 ++++++----- titles/cxb/rss1.py | 287 ++++++----- titles/cxb/rss2.py | 299 +++++++----- titles/cxb/schema/item.py | 31 +- titles/cxb/schema/profile.py | 56 ++- titles/cxb/schema/score.py | 97 ++-- titles/cxb/schema/static.py | 83 ++-- titles/diva/__init__.py | 2 +- titles/diva/base.py | 498 ++++++++++++------- titles/diva/config.py | 22 +- titles/diva/const.py | 4 +- titles/diva/database.py | 10 +- titles/diva/index.py | 99 ++-- titles/diva/read.py | 214 +++++--- titles/diva/schema/__init__.py | 12 +- titles/diva/schema/customize.py | 29 +- titles/diva/schema/item.py | 32 +- titles/diva/schema/module.py | 23 +- titles/diva/schema/profile.py | 55 ++- titles/diva/schema/pv_customize.py | 47 +- titles/diva/schema/score.py | 117 +++-- titles/diva/schema/static.py | 261 ++++++---- titles/mai2/__init__.py | 2 +- titles/mai2/base.py | 384 +++++++++------ titles/mai2/config.py | 18 +- titles/mai2/const.py | 32 +- titles/mai2/database.py | 10 +- titles/mai2/index.py | 82 ++-- titles/mai2/plus.py | 3 +- titles/mai2/read.py | 98 ++-- titles/mai2/schema/__init__.py | 2 +- titles/mai2/schema/item.py | 212 +++++--- titles/mai2/schema/profile.py | 158 ++++-- titles/mai2/schema/score.py | 62 ++- titles/mai2/schema/static.py | 194 ++++---- titles/mai2/splash.py | 3 +- titles/mai2/splashplus.py | 3 +- titles/mai2/universe.py | 3 +- titles/mai2/universeplus.py | 3 +- titles/ongeki/__init__.py | 2 +- titles/ongeki/base.py | 456 ++++++++++------- titles/ongeki/bright.py | 193 ++++---- titles/ongeki/brightmemory.py | 105 +++- titles/ongeki/config.py | 18 +- titles/ongeki/const.py | 61 ++- titles/ongeki/database.py | 3 +- titles/ongeki/index.py | 92 ++-- titles/ongeki/plus.py | 3 +- titles/ongeki/read.py | 104 ++-- titles/ongeki/red.py | 3 +- titles/ongeki/redplus.py | 3 +- titles/ongeki/schema/__init__.py | 8 +- titles/ongeki/schema/item.py | 201 ++++---- titles/ongeki/schema/log.py | 32 +- titles/ongeki/schema/profile.py | 246 ++++++---- titles/ongeki/schema/score.py | 44 +- titles/ongeki/schema/static.py | 184 +++---- titles/ongeki/summer.py | 3 +- titles/ongeki/summerplus.py | 3 +- titles/pokken/__init__.py | 2 +- titles/pokken/base.py | 27 +- titles/pokken/config.py | 52 +- titles/pokken/const.py | 6 +- titles/pokken/database.py | 3 +- titles/pokken/index.py | 91 ++-- titles/pokken/proto/jackal_pb2.py | 244 +++++----- titles/wacca/__init__.py | 2 +- titles/wacca/base.py | 701 ++++++++++++++++++--------- titles/wacca/config.py | 48 +- titles/wacca/const.py | 156 +++--- titles/wacca/database.py | 3 +- titles/wacca/frontend.py | 13 +- titles/wacca/handlers/__init__.py | 2 +- titles/wacca/handlers/advertise.py | 31 +- titles/wacca/handlers/base.py | 8 +- titles/wacca/handlers/helpers.py | 421 ++++++++++------ titles/wacca/handlers/housing.py | 85 +++- titles/wacca/handlers/user_info.py | 14 +- titles/wacca/handlers/user_misc.py | 16 +- titles/wacca/handlers/user_music.py | 39 +- titles/wacca/handlers/user_status.py | 117 +++-- titles/wacca/handlers/user_trial.py | 12 +- titles/wacca/handlers/user_vip.py | 22 +- titles/wacca/index.py | 75 ++- titles/wacca/lily.py | 255 +++++++--- titles/wacca/lilyr.py | 39 +- titles/wacca/read.py | 97 +++- titles/wacca/reverse.py | 156 ++++-- titles/wacca/s.py | 5 +- titles/wacca/schema/__init__.py | 2 +- titles/wacca/schema/item.py | 164 ++++--- titles/wacca/schema/profile.py | 419 +++++++++------- titles/wacca/schema/score.py | 181 ++++--- titles/wacca/schema/static.py | 68 ++- 150 files changed, 8474 insertions(+), 4843 deletions(-) diff --git a/core/__init__.py b/core/__init__.py index 717de33..185d9bc 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -4,4 +4,4 @@ from core.aimedb import AimedbFactory from core.title import TitleServlet from core.utils import Utils from core.mucha import MuchaServlet -from core.frontend import FrontendServlet \ No newline at end of file +from core.frontend import FrontendServlet diff --git a/core/aimedb.py b/core/aimedb.py index 78ce350..64bac8d 100644 --- a/core/aimedb.py +++ b/core/aimedb.py @@ -8,17 +8,18 @@ from logging.handlers import TimedRotatingFileHandler from core.config import CoreConfig from core.data import Data + class AimedbProtocol(Protocol): AIMEDB_RESPONSE_CODES = { "felica_lookup": 0x03, "lookup": 0x06, - "log": 0x0a, - "campaign": 0x0c, - "touch": 0x0e, + "log": 0x0A, + "campaign": 0x0C, + "touch": 0x0E, "lookup2": 0x10, "felica_lookup2": 0x12, "log2": 0x14, - "hello": 0x65 + "hello": 0x65, } request_list: Dict[int, Any] = {} @@ -30,14 +31,14 @@ class AimedbProtocol(Protocol): if core_cfg.aimedb.key == "": self.logger.error("!!!KEY NOT SET!!!") exit(1) - + self.request_list[0x01] = self.handle_felica_lookup self.request_list[0x04] = self.handle_lookup self.request_list[0x05] = self.handle_register - self.request_list[0x09] = self.handle_log - self.request_list[0x0b] = self.handle_campaign - self.request_list[0x0d] = self.handle_touch - self.request_list[0x0f] = self.handle_lookup2 + self.request_list[0x09] = self.handle_log + self.request_list[0x0B] = self.handle_campaign + self.request_list[0x0D] = self.handle_touch + self.request_list[0x0F] = self.handle_lookup2 self.request_list[0x11] = self.handle_felica_lookup2 self.request_list[0x13] = self.handle_log2 self.request_list[0x64] = self.handle_hello @@ -53,8 +54,10 @@ class AimedbProtocol(Protocol): self.logger.debug(f"{self.transport.getPeer().host} Connected") def connectionLost(self, reason) -> None: - self.logger.debug(f"{self.transport.getPeer().host} Disconnected - {reason.value}") - + self.logger.debug( + f"{self.transport.getPeer().host} Disconnected - {reason.value}" + ) + def dataReceived(self, data: bytes) -> None: cipher = AES.new(self.config.aimedb.key.encode(), AES.MODE_ECB) @@ -66,7 +69,7 @@ class AimedbProtocol(Protocol): self.logger.debug(f"{self.transport.getPeer().host} wrote {decrypted.hex()}") - if not decrypted[1] == 0xa1 and not decrypted[0] == 0x3e: + if not decrypted[1] == 0xA1 and not decrypted[0] == 0x3E: self.logger.error(f"Bad magic") return None @@ -90,30 +93,46 @@ class AimedbProtocol(Protocol): except ValueError as e: self.logger.error(f"Failed to encrypt {resp.hex()} because {e}") return None - + def handle_campaign(self, data: bytes) -> bytes: self.logger.info(f"campaign from {self.transport.getPeer().host}") - ret = struct.pack("<5H", 0xa13e, 0x3087, self.AIMEDB_RESPONSE_CODES["campaign"], 0x0200, 0x0001) + ret = struct.pack( + "<5H", + 0xA13E, + 0x3087, + self.AIMEDB_RESPONSE_CODES["campaign"], + 0x0200, + 0x0001, + ) return self.append_padding(ret) - + def handle_hello(self, data: bytes) -> bytes: self.logger.info(f"hello from {self.transport.getPeer().host}") - ret = struct.pack("<5H", 0xa13e, 0x3087, self.AIMEDB_RESPONSE_CODES["hello"], 0x0020, 0x0001) + ret = struct.pack( + "<5H", 0xA13E, 0x3087, self.AIMEDB_RESPONSE_CODES["hello"], 0x0020, 0x0001 + ) return self.append_padding(ret) def handle_lookup(self, data: bytes) -> bytes: - luid = data[0x20: 0x2a].hex() + luid = data[0x20:0x2A].hex() user_id = self.data.card.get_user_id_from_card(access_code=luid) - if user_id is None: user_id = -1 + if user_id is None: + user_id = -1 - self.logger.info(f"lookup from {self.transport.getPeer().host}: luid {luid} -> user_id {user_id}") + self.logger.info( + f"lookup from {self.transport.getPeer().host}: luid {luid} -> user_id {user_id}" + ) - ret = struct.pack("<5H", 0xa13e, 0x3087, self.AIMEDB_RESPONSE_CODES["lookup"], 0x0130, 0x0001) + ret = struct.pack( + "<5H", 0xA13E, 0x3087, self.AIMEDB_RESPONSE_CODES["lookup"], 0x0130, 0x0001 + ) ret += bytes(0x20 - len(ret)) - if user_id is None: ret += struct.pack(" bytes: @@ -125,66 +144,98 @@ class AimedbProtocol(Protocol): return bytes(ret) def handle_felica_lookup(self, data: bytes) -> bytes: - idm = data[0x20: 0x28].hex() - pmm = data[0x28: 0x30].hex() + idm = data[0x20:0x28].hex() + pmm = data[0x28:0x30].hex() access_code = self.data.card.to_access_code(idm) - self.logger.info(f"felica_lookup from {self.transport.getPeer().host}: idm {idm} pmm {pmm} -> access_code {access_code}") + self.logger.info( + f"felica_lookup from {self.transport.getPeer().host}: idm {idm} pmm {pmm} -> access_code {access_code}" + ) - ret = struct.pack("<5H", 0xa13e, 0x3087, self.AIMEDB_RESPONSE_CODES["felica_lookup"], 0x0030, 0x0001) + ret = struct.pack( + "<5H", + 0xA13E, + 0x3087, + self.AIMEDB_RESPONSE_CODES["felica_lookup"], + 0x0030, + 0x0001, + ) ret += bytes(26) ret += bytes.fromhex(access_code) return self.append_padding(ret) def handle_felica_lookup2(self, data: bytes) -> bytes: - idm = data[0x30: 0x38].hex() - pmm = data[0x38: 0x40].hex() + idm = data[0x30:0x38].hex() + pmm = data[0x38:0x40].hex() access_code = self.data.card.to_access_code(idm) user_id = self.data.card.get_user_id_from_card(access_code=access_code) - if user_id is None: user_id = -1 + if user_id is None: + user_id = -1 - self.logger.info(f"felica_lookup2 from {self.transport.getPeer().host}: idm {idm} ipm {pmm} -> access_code {access_code} user_id {user_id}") + self.logger.info( + f"felica_lookup2 from {self.transport.getPeer().host}: idm {idm} ipm {pmm} -> access_code {access_code} user_id {user_id}" + ) - ret = struct.pack("<5H", 0xa13e, 0x3087, self.AIMEDB_RESPONSE_CODES["felica_lookup2"], 0x0140, 0x0001) + ret = struct.pack( + "<5H", + 0xA13E, + 0x3087, + self.AIMEDB_RESPONSE_CODES["felica_lookup2"], + 0x0140, + 0x0001, + ) ret += bytes(22) - ret += struct.pack(" bytes: self.logger.info(f"touch from {self.transport.getPeer().host}") - ret = struct.pack("<5H", 0xa13e, 0x3087, self.AIMEDB_RESPONSE_CODES["touch"], 0x0050, 0x0001) + ret = struct.pack( + "<5H", 0xA13E, 0x3087, self.AIMEDB_RESPONSE_CODES["touch"], 0x0050, 0x0001 + ) ret += bytes(5) - ret += struct.pack("<3H", 0x6f, 0, 1) + ret += struct.pack("<3H", 0x6F, 0, 1) return self.append_padding(ret) - def handle_register(self, data: bytes) -> bytes: - luid = data[0x20: 0x2a].hex() + def handle_register(self, data: bytes) -> bytes: + luid = data[0x20:0x2A].hex() if self.config.server.allow_user_registration: user_id = self.data.user.create_user() - if user_id is None: + if user_id is None: user_id = -1 self.logger.error("Failed to register user!") else: card_id = self.data.card.create_card(user_id, luid) - if card_id is None: + if card_id is None: user_id = -1 self.logger.error("Failed to register card!") - self.logger.info(f"register from {self.transport.getPeer().host}: luid {luid} -> user_id {user_id}") - + self.logger.info( + f"register from {self.transport.getPeer().host}: luid {luid} -> user_id {user_id}" + ) + else: - self.logger.info(f"register from {self.transport.getPeer().host} blocked!: luid {luid}") + self.logger.info( + f"register from {self.transport.getPeer().host} blocked!: luid {luid}" + ) user_id = -1 - ret = struct.pack("<5H", 0xa13e, 0x3087, self.AIMEDB_RESPONSE_CODES["lookup"], 0x0030, 0x0001 if user_id > -1 else 0) + ret = struct.pack( + "<5H", + 0xA13E, + 0x3087, + self.AIMEDB_RESPONSE_CODES["lookup"], + 0x0030, + 0x0001 if user_id > -1 else 0, + ) ret += bytes(0x20 - len(ret)) ret += struct.pack(" bytes: # TODO: Save aimedb logs self.logger.info(f"log from {self.transport.getPeer().host}") - ret = struct.pack("<5H", 0xa13e, 0x3087, self.AIMEDB_RESPONSE_CODES["log"], 0x0020, 0x0001) + ret = struct.pack( + "<5H", 0xA13E, 0x3087, self.AIMEDB_RESPONSE_CODES["log"], 0x0020, 0x0001 + ) return self.append_padding(ret) def handle_log2(self, data: bytes) -> bytes: self.logger.info(f"log2 from {self.transport.getPeer().host}") - ret = struct.pack("<5H", 0xa13e, 0x3087, self.AIMEDB_RESPONSE_CODES["log2"], 0x0040, 0x0001) + ret = struct.pack( + "<5H", 0xA13E, 0x3087, self.AIMEDB_RESPONSE_CODES["log2"], 0x0040, 0x0001 + ) ret += bytes(22) ret += struct.pack("H", 1) return self.append_padding(ret) + class AimedbFactory(Factory): protocol = AimedbProtocol + def __init__(self, cfg: CoreConfig) -> None: self.config = cfg log_fmt_str = "[%(asctime)s] Aimedb | %(levelname)s | %(message)s" log_fmt = logging.Formatter(log_fmt_str) self.logger = logging.getLogger("aimedb") - fileHandler = TimedRotatingFileHandler("{0}/{1}.log".format(self.config.server.log_dir, "aimedb"), when="d", backupCount=10) + fileHandler = TimedRotatingFileHandler( + "{0}/{1}.log".format(self.config.server.log_dir, "aimedb"), + when="d", + backupCount=10, + ) fileHandler.setFormatter(log_fmt) - + consoleHandler = logging.StreamHandler() consoleHandler.setFormatter(log_fmt) self.logger.addHandler(fileHandler) self.logger.addHandler(consoleHandler) - + self.logger.setLevel(self.config.aimedb.loglevel) - coloredlogs.install(level=cfg.aimedb.loglevel, logger=self.logger, fmt=log_fmt_str) - + coloredlogs.install( + level=cfg.aimedb.loglevel, logger=self.logger, fmt=log_fmt_str + ) + if self.config.aimedb.key == "": self.logger.error("Please set 'key' field in your config file.") exit(1) self.logger.info(f"Ready on port {self.config.aimedb.port}") - + def buildProtocol(self, addr): return AimedbProtocol(self.config) diff --git a/core/allnet.py b/core/allnet.py index a02c902..4c0c542 100644 --- a/core/allnet.py +++ b/core/allnet.py @@ -16,8 +16,9 @@ from core.data import Data from core.utils import Utils from core.const import * + class AllnetServlet: - def __init__(self, core_cfg: CoreConfig, cfg_folder: str): + def __init__(self, core_cfg: CoreConfig, cfg_folder: str): super().__init__() self.config = core_cfg self.config_folder = cfg_folder @@ -27,35 +28,45 @@ class AllnetServlet: self.logger = logging.getLogger("allnet") if not hasattr(self.logger, "initialized"): log_fmt_str = "[%(asctime)s] Allnet | %(levelname)s | %(message)s" - log_fmt = logging.Formatter(log_fmt_str) + log_fmt = logging.Formatter(log_fmt_str) - fileHandler = TimedRotatingFileHandler("{0}/{1}.log".format(self.config.server.log_dir, "allnet"), when="d", backupCount=10) + fileHandler = TimedRotatingFileHandler( + "{0}/{1}.log".format(self.config.server.log_dir, "allnet"), + when="d", + backupCount=10, + ) fileHandler.setFormatter(log_fmt) - + consoleHandler = logging.StreamHandler() consoleHandler.setFormatter(log_fmt) self.logger.addHandler(fileHandler) self.logger.addHandler(consoleHandler) - + self.logger.setLevel(core_cfg.allnet.loglevel) - coloredlogs.install(level=core_cfg.allnet.loglevel, logger=self.logger, fmt=log_fmt_str) + coloredlogs.install( + level=core_cfg.allnet.loglevel, logger=self.logger, fmt=log_fmt_str + ) self.logger.initialized = True plugins = Utils.get_all_titles() if len(plugins) == 0: self.logger.error("No games detected!") - + for _, mod in plugins.items(): if 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) - + 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"Allnet serving {len(self.uri_registry)} games on port {core_cfg.allnet.port}") + self.logger.info( + f"Allnet serving {len(self.uri_registry)} games on port {core_cfg.allnet.port}" + ) def handle_poweron(self, request: Request, _: Dict): request_ip = request.getClientAddress().host @@ -67,14 +78,22 @@ class AllnetServlet: req = AllnetPowerOnRequest(req_dict[0]) # Validate the request. Currently we only validate the fields we plan on using - if not req.game_id or not req.ver or not req.token or not req.serial or not req.ip: - raise AllnetRequestException(f"Bad auth request params from {request_ip} - {vars(req)}") - + if ( + not req.game_id + or not req.ver + or not req.token + or not req.serial + or not req.ip + ): + raise AllnetRequestException( + f"Bad auth request params from {request_ip} - {vars(req)}" + ) + except AllnetRequestException as e: if e.message != "": self.logger.error(e) return b"" - + if req.format_ver == 3: resp = AllnetPowerOnResponse3(req.token) else: @@ -83,26 +102,32 @@ class AllnetServlet: self.logger.debug(f"Allnet request: {vars(req)}") if req.game_id not in self.uri_registry: msg = f"Unrecognised game {req.game_id} attempted allnet auth from {request_ip}." - self.data.base.log_event("allnet", "ALLNET_AUTH_UNKNOWN_GAME", logging.WARN, msg) + self.data.base.log_event( + "allnet", "ALLNET_AUTH_UNKNOWN_GAME", logging.WARN, msg + ) self.logger.warn(msg) resp.stat = 0 return self.dict_to_http_form_string([vars(resp)]) - + resp.uri, resp.host = self.uri_registry[req.game_id] machine = self.data.arcade.get_machine(req.serial) if machine is None and not self.config.server.allow_unregistered_serials: msg = f"Unrecognised serial {req.serial} attempted allnet auth from {request_ip}." - self.data.base.log_event("allnet", "ALLNET_AUTH_UNKNOWN_SERIAL", logging.WARN, msg) + self.data.base.log_event( + "allnet", "ALLNET_AUTH_UNKNOWN_SERIAL", logging.WARN, msg + ) self.logger.warn(msg) resp.stat = 0 return self.dict_to_http_form_string([vars(resp)]) - + if machine is not None: arcade = self.data.arcade.get_arcade(machine["arcade"]) - country = arcade["country"] if machine["country"] is None else machine["country"] + country = ( + arcade["country"] if machine["country"] is None else machine["country"] + ) if country is None: country = AllnetCountryCode.JAPAN.value @@ -111,16 +136,30 @@ class AllnetServlet: resp.allnet_id = machine["id"] resp.name = arcade["name"] if arcade["name"] is not None else "" resp.nickname = arcade["nickname"] if arcade["nickname"] is not None else "" - resp.region0 = arcade["region_id"] if arcade["region_id"] is not None else AllnetJapanRegionId.AICHI.value - resp.region_name0 = 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.region0 = ( + arcade["region_id"] + if arcade["region_id"] is not None + else AllnetJapanRegionId.AICHI.value + ) + resp.region_name0 = ( + 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 = arcade["timezone"] if arcade["timezone"] is not None else "+0900" - + resp.client_timezone = ( + arcade["timezone"] if arcade["timezone"] is not None else "+0900" + ) + int_ver = req.ver.replace(".", "") 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) self.logger.info(msg) @@ -139,8 +178,10 @@ class AllnetServlet: # Validate the request. Currently we only validate the fields we plan on using if not req.game_id or not req.ver or not req.serial: - raise AllnetRequestException(f"Bad download request params from {request_ip} - {vars(req)}") - + raise AllnetRequestException( + f"Bad download request params from {request_ip} - {vars(req)}" + ) + except AllnetRequestException as e: if e.message != "": self.logger.error(e) @@ -149,8 +190,8 @@ class AllnetServlet: resp = AllnetDownloadOrderResponse() if not self.config.allnet.allow_online_updates: return self.dict_to_http_form_string([vars(resp)]) - - else: # TODO: Actual dlorder response + + else: # TODO: Actual dlorder response return self.dict_to_http_form_string([vars(resp)]) def handle_billing_request(self, request: Request, _: Dict): @@ -159,10 +200,10 @@ class AllnetServlet: if req_dict is None: self.logger.error(f"Failed to parse request {request.content.getvalue()}") return b"" - + self.logger.debug(f"request {req_dict}") - rsa = RSA.import_key(open(self.config.billing.signing_key, 'rb').read()) + rsa = RSA.import_key(open(self.config.billing.signing_key, "rb").read()) signer = PKCS1_v1_5.new(rsa) digest = SHA.new() @@ -178,30 +219,34 @@ class AllnetServlet: machine = self.data.arcade.get_machine(kc_serial) if machine is None and not self.config.server.allow_unregistered_serials: msg = f"Unrecognised serial {kc_serial} attempted billing checkin from {request_ip} for game {kc_game}." - self.data.base.log_event("allnet", "BILLING_CHECKIN_NG_SERIAL", logging.WARN, msg) + self.data.base.log_event( + "allnet", "BILLING_CHECKIN_NG_SERIAL", logging.WARN, msg + ) self.logger.warn(msg) resp = BillingResponse("", "", "", "") resp.result = "1" return self.dict_to_http_form_string([vars(resp)]) - msg = f"Billing checkin from {request.getClientIP()}: game {kc_game} keychip {kc_serial} playcount " \ + msg = ( + f"Billing checkin from {request.getClientIP()}: game {kc_game} keychip {kc_serial} playcount " f"{kc_playcount} billing_type {kc_billigtype} nearfull {kc_nearfull} playlimit {kc_playlimit}" + ) self.logger.info(msg) - self.data.base.log_event('billing', 'BILLING_CHECKIN_OK', logging.INFO, msg) + self.data.base.log_event("billing", "BILLING_CHECKIN_OK", logging.INFO, msg) while kc_playcount > kc_playlimit: kc_playlimit += 1024 kc_nearfull += 1024 - + playlimit = kc_playlimit nearfull = kc_nearfull + (kc_billigtype * 0x00010000) - digest.update(playlimit.to_bytes(4, 'little') + kc_serial_bytes) + digest.update(playlimit.to_bytes(4, "little") + kc_serial_bytes) playlimit_sig = signer.sign(digest).hex() digest = SHA.new() - digest.update(nearfull.to_bytes(4, 'little') + kc_serial_bytes) + digest.update(nearfull.to_bytes(4, "little") + kc_serial_bytes) nearfull_sig = signer.sign(digest).hex() # TODO: playhistory @@ -222,16 +267,16 @@ class AllnetServlet: def kvp_to_dict(self, kvp: List[str]) -> List[Dict[str, Any]]: ret: List[Dict[str, Any]] = [] for x in kvp: - items = x.split('&') + items = x.split("&") tmp = {} for item in items: - kvp = item.split('=') + kvp = item.split("=") if len(kvp) == 2: tmp[kvp[0]] = kvp[1] ret.append(tmp) - + return ret def billing_req_to_dict(self, data: bytes): @@ -241,8 +286,8 @@ class AllnetServlet: try: decomp = zlib.decompressobj(-zlib.MAX_WBITS) unzipped = decomp.decompress(data) - sections = unzipped.decode('ascii').split('\r\n') - + sections = unzipped.decode("ascii").split("\r\n") + return self.kvp_to_dict(sections) except Exception as e: @@ -252,33 +297,38 @@ class AllnetServlet: def allnet_req_to_dict(self, data: str) -> Optional[List[Dict[str, Any]]]: """ Parses an allnet request string into a python dictionary - """ + """ try: zipped = base64.b64decode(data) unzipped = zlib.decompress(zipped) - sections = unzipped.decode('utf-8').split('\r\n') - + sections = unzipped.decode("utf-8").split("\r\n") + return self.kvp_to_dict(sections) except Exception as e: self.logger.error(f"allnet_req_to_dict: {e} while parsing {data}") return None - def dict_to_http_form_string(self, data:List[Dict[str, Any]], crlf: bool = False, trailing_newline: bool = True) -> Optional[str]: + def dict_to_http_form_string( + self, + data: List[Dict[str, Any]], + crlf: bool = False, + trailing_newline: bool = True, + ) -> Optional[str]: """ Takes a python dictionary and parses it into an allnet response string """ try: urlencode = "" for item in data: - for k,v in item.items(): + for k, v in item.items(): urlencode += f"{k}={v}&" if crlf: urlencode = urlencode[:-1] + "\r\n" else: urlencode = urlencode[:-1] + "\n" - + if not trailing_newline: if crlf: urlencode = urlencode[:-2] @@ -286,23 +336,24 @@ class AllnetServlet: urlencode = urlencode[:-1] return urlencode - + except Exception as e: self.logger.error(f"dict_to_http_form_string: {e} while parsing {data}") return None -class AllnetPowerOnRequest(): + +class AllnetPowerOnRequest: def __init__(self, req: Dict) -> None: if req is None: raise AllnetRequestException("Request processing failed") self.game_id: str = req["game_id"] if "game_id" in req else "" self.ver: str = req["ver"] if "ver" in req else "" - self.serial: str = req["serial"] if "serial" in req else "" - self.ip: str = req["ip"] if "ip" in req else "" + self.serial: str = req["serial"] if "serial" in req else "" + self.ip: str = req["ip"] if "ip" in req else "" self.firm_ver: str = req["firm_ver"] if "firm_ver" in req else "" self.boot_ver: str = req["boot_ver"] if "boot_ver" in req else "" self.encode: str = req["encode"] if "encode" in req else "" - + try: self.hops = int(req["hops"]) if "hops" in req else 0 self.format_ver = int(req["format_ver"]) if "format_ver" in req else 2 @@ -310,7 +361,8 @@ class AllnetPowerOnRequest(): except ValueError as e: raise AllnetRequestException(f"Failed to parse int: {e}") -class AllnetPowerOnResponse3(): + +class AllnetPowerOnResponse3: def __init__(self, token) -> None: self.stat = 1 self.uri = "" @@ -326,12 +378,15 @@ class AllnetPowerOnResponse3(): self.country = "JPN" self.allnet_id = "123" self.client_timezone = "+0900" - self.utc_time = datetime.now(tz=pytz.timezone('UTC')).strftime("%Y-%m-%dT%H:%M:%SZ") + self.utc_time = datetime.now(tz=pytz.timezone("UTC")).strftime( + "%Y-%m-%dT%H:%M:%SZ" + ) self.setting = "" self.res_ver = "3" self.token = str(token) -class AllnetPowerOnResponse2(): + +class AllnetPowerOnResponse2: def __init__(self) -> None: self.stat = 1 self.uri = "" @@ -355,23 +410,31 @@ class AllnetPowerOnResponse2(): self.timezone = "+0900" self.res_class = "PowerOnResponseV2" -class AllnetDownloadOrderRequest(): + +class AllnetDownloadOrderRequest: def __init__(self, req: Dict) -> None: self.game_id = req["game_id"] if "game_id" in req else "" self.ver = req["ver"] if "ver" in req else "" self.serial = req["serial"] if "serial" in req else "" self.encode = req["encode"] if "encode" in req else "" -class AllnetDownloadOrderResponse(): + +class AllnetDownloadOrderResponse: def __init__(self, stat: int = 1, serial: str = "", uri: str = "null") -> None: self.stat = stat self.serial = serial self.uri = uri -class BillingResponse(): - def __init__(self, playlimit: str = "", playlimit_sig: str = "", nearfull: str = "", nearfull_sig: str = "", - playhistory: str = "000000/0:000000/0:000000/0") -> None: +class BillingResponse: + def __init__( + self, + playlimit: str = "", + playlimit_sig: str = "", + nearfull: str = "", + nearfull_sig: str = "", + playhistory: str = "000000/0:000000/0:000000/0", + ) -> None: self.result = "0" self.waitime = "100" self.linelimit = "1" @@ -383,10 +446,11 @@ class BillingResponse(): self.nearfullsig = nearfull_sig self.fixlogincnt = "0" self.fixinterval = "5" - self.playhistory = playhistory + self.playhistory = playhistory # playhistory -> YYYYMM/C:... # YYYY -> 4 digit year, MM -> 2 digit month, C -> Playcount during that period + class AllnetRequestException(Exception): def __init__(self, message="") -> None: self.message = message diff --git a/core/config.py b/core/config.py index 04ad280..383f053 100644 --- a/core/config.py +++ b/core/config.py @@ -1,33 +1,47 @@ import logging, os from typing import Any + class ServerConfig: def __init__(self, parent_config: "CoreConfig") -> None: self.__config = parent_config @property def listen_address(self) -> str: - return CoreConfig.get_config_field(self.__config, 'core', 'server', 'listen_address', default='127.0.0.1') + return CoreConfig.get_config_field( + self.__config, "core", "server", "listen_address", default="127.0.0.1" + ) @property def allow_user_registration(self) -> bool: - return CoreConfig.get_config_field(self.__config, 'core', 'server', 'allow_user_registration', default=True) + return CoreConfig.get_config_field( + self.__config, "core", "server", "allow_user_registration", default=True + ) @property def allow_unregistered_serials(self) -> bool: - return CoreConfig.get_config_field(self.__config, 'core', 'server', 'allow_unregistered_serials', default=True) + return CoreConfig.get_config_field( + self.__config, "core", "server", "allow_unregistered_serials", default=True + ) @property def name(self) -> str: - return CoreConfig.get_config_field(self.__config, 'core', 'server', 'name', default="ARTEMiS") + return CoreConfig.get_config_field( + self.__config, "core", "server", "name", default="ARTEMiS" + ) @property def is_develop(self) -> bool: - return CoreConfig.get_config_field(self.__config, 'core', 'server', 'is_develop', default=True) + return CoreConfig.get_config_field( + self.__config, "core", "server", "is_develop", default=True + ) @property def log_dir(self) -> str: - return CoreConfig.get_config_field(self.__config, 'core', 'server', 'log_dir', default='logs') + return CoreConfig.get_config_field( + self.__config, "core", "server", "log_dir", default="logs" + ) + class TitleConfig: def __init__(self, parent_config: "CoreConfig") -> None: @@ -35,15 +49,24 @@ class TitleConfig: @property def loglevel(self) -> int: - return CoreConfig.str_to_loglevel(CoreConfig.get_config_field(self.__config, 'core', 'title', 'loglevel', default="info")) + return CoreConfig.str_to_loglevel( + CoreConfig.get_config_field( + self.__config, "core", "title", "loglevel", default="info" + ) + ) @property def hostname(self) -> str: - return CoreConfig.get_config_field(self.__config, 'core', 'title', 'hostname', default="localhost") + return CoreConfig.get_config_field( + self.__config, "core", "title", "hostname", default="localhost" + ) @property def port(self) -> int: - return CoreConfig.get_config_field(self.__config, 'core', 'title', 'port', default=8080) + return CoreConfig.get_config_field( + self.__config, "core", "title", "port", default=8080 + ) + class DatabaseConfig: def __init__(self, parent_config: "CoreConfig") -> None: @@ -51,43 +74,70 @@ class DatabaseConfig: @property def host(self) -> str: - return CoreConfig.get_config_field(self.__config, 'core', 'database', 'host', default="localhost") + return CoreConfig.get_config_field( + self.__config, "core", "database", "host", default="localhost" + ) @property def username(self) -> str: - return CoreConfig.get_config_field(self.__config, 'core', 'database', 'username', default='aime') + return CoreConfig.get_config_field( + self.__config, "core", "database", "username", default="aime" + ) @property def password(self) -> str: - return CoreConfig.get_config_field(self.__config, 'core', 'database', 'password', default='aime') + return CoreConfig.get_config_field( + self.__config, "core", "database", "password", default="aime" + ) @property def name(self) -> str: - return CoreConfig.get_config_field(self.__config, 'core', 'database', 'name', default='aime') + return CoreConfig.get_config_field( + self.__config, "core", "database", "name", default="aime" + ) @property def port(self) -> int: - return CoreConfig.get_config_field(self.__config, 'core', 'database', 'port', default=3306) + return CoreConfig.get_config_field( + self.__config, "core", "database", "port", default=3306 + ) @property def protocol(self) -> str: - return CoreConfig.get_config_field(self.__config, 'core', 'database', 'type', default="mysql") - + return CoreConfig.get_config_field( + self.__config, "core", "database", "type", default="mysql" + ) + @property def sha2_password(self) -> bool: - return CoreConfig.get_config_field(self.__config, 'core', 'database', 'sha2_password', default=False) - + return CoreConfig.get_config_field( + self.__config, "core", "database", "sha2_password", default=False + ) + @property def loglevel(self) -> int: - return CoreConfig.str_to_loglevel(CoreConfig.get_config_field(self.__config, 'core', 'database', 'loglevel', default="info")) + return CoreConfig.str_to_loglevel( + CoreConfig.get_config_field( + self.__config, "core", "database", "loglevel", default="info" + ) + ) @property def user_table_autoincrement_start(self) -> int: - return CoreConfig.get_config_field(self.__config, 'core', 'database', 'user_table_autoincrement_start', default=10000) - + return CoreConfig.get_config_field( + self.__config, + "core", + "database", + "user_table_autoincrement_start", + default=10000, + ) + @property def memcached_host(self) -> str: - return CoreConfig.get_config_field(self.__config, 'core', 'database', 'memcached_host', default="localhost") + return CoreConfig.get_config_field( + self.__config, "core", "database", "memcached_host", default="localhost" + ) + class FrontendConfig: def __init__(self, parent_config: "CoreConfig") -> None: @@ -95,15 +145,24 @@ class FrontendConfig: @property def enable(self) -> int: - return CoreConfig.get_config_field(self.__config, 'core', 'frontend', 'enable', default=False) + return CoreConfig.get_config_field( + self.__config, "core", "frontend", "enable", default=False + ) @property def port(self) -> int: - return CoreConfig.get_config_field(self.__config, 'core', 'frontend', 'port', default=8090) - + return CoreConfig.get_config_field( + self.__config, "core", "frontend", "port", default=8090 + ) + @property def loglevel(self) -> int: - return CoreConfig.str_to_loglevel(CoreConfig.get_config_field(self.__config, 'core', 'frontend', 'loglevel', default="info")) + return CoreConfig.str_to_loglevel( + CoreConfig.get_config_field( + self.__config, "core", "frontend", "loglevel", default="info" + ) + ) + class AllnetConfig: def __init__(self, parent_config: "CoreConfig") -> None: @@ -111,15 +170,24 @@ class AllnetConfig: @property def loglevel(self) -> int: - return CoreConfig.str_to_loglevel(CoreConfig.get_config_field(self.__config, 'core', 'allnet', 'loglevel', default="info")) + return CoreConfig.str_to_loglevel( + CoreConfig.get_config_field( + self.__config, "core", "allnet", "loglevel", default="info" + ) + ) @property def port(self) -> int: - return CoreConfig.get_config_field(self.__config, 'core', 'allnet', 'port', default=80) - + return CoreConfig.get_config_field( + self.__config, "core", "allnet", "port", default=80 + ) + @property def allow_online_updates(self) -> int: - return CoreConfig.get_config_field(self.__config, 'core', 'allnet', 'allow_online_updates', default=False) + return CoreConfig.get_config_field( + self.__config, "core", "allnet", "allow_online_updates", default=False + ) + class BillingConfig: def __init__(self, parent_config: "CoreConfig") -> None: @@ -127,35 +195,53 @@ class BillingConfig: @property def port(self) -> int: - return CoreConfig.get_config_field(self.__config, 'core', 'billing', 'port', default=8443) + return CoreConfig.get_config_field( + self.__config, "core", "billing", "port", default=8443 + ) @property def ssl_key(self) -> str: - return CoreConfig.get_config_field(self.__config, 'core', 'billing', 'ssl_key', default="cert/server.key") + return CoreConfig.get_config_field( + self.__config, "core", "billing", "ssl_key", default="cert/server.key" + ) @property def ssl_cert(self) -> str: - return CoreConfig.get_config_field(self.__config, 'core', 'billing', 'ssl_cert', default="cert/server.pem") - + return CoreConfig.get_config_field( + self.__config, "core", "billing", "ssl_cert", default="cert/server.pem" + ) + @property def signing_key(self) -> str: - return CoreConfig.get_config_field(self.__config, 'core', 'billing', 'signing_key', default="cert/billing.key") + return CoreConfig.get_config_field( + self.__config, "core", "billing", "signing_key", default="cert/billing.key" + ) + class AimedbConfig: def __init__(self, parent_config: "CoreConfig") -> None: self.__config = parent_config - + @property def loglevel(self) -> int: - return CoreConfig.str_to_loglevel(CoreConfig.get_config_field(self.__config, 'core', 'aimedb', 'loglevel', default="info")) + return CoreConfig.str_to_loglevel( + CoreConfig.get_config_field( + self.__config, "core", "aimedb", "loglevel", default="info" + ) + ) @property def port(self) -> int: - return CoreConfig.get_config_field(self.__config, 'core', 'aimedb', 'port', default=22345) + return CoreConfig.get_config_field( + self.__config, "core", "aimedb", "port", default=22345 + ) @property def key(self) -> str: - return CoreConfig.get_config_field(self.__config, 'core', 'aimedb', 'key', default="") + return CoreConfig.get_config_field( + self.__config, "core", "aimedb", "key", default="" + ) + class MuchaConfig: def __init__(self, parent_config: "CoreConfig") -> None: @@ -163,27 +249,42 @@ class MuchaConfig: @property def enable(self) -> int: - return CoreConfig.get_config_field(self.__config, 'core', 'mucha', 'enable', default=False) - + return CoreConfig.get_config_field( + self.__config, "core", "mucha", "enable", default=False + ) + @property def loglevel(self) -> int: - return CoreConfig.str_to_loglevel(CoreConfig.get_config_field(self.__config, 'core', 'mucha', 'loglevel', default="info")) - + return CoreConfig.str_to_loglevel( + CoreConfig.get_config_field( + self.__config, "core", "mucha", "loglevel", default="info" + ) + ) + @property def hostname(self) -> str: - return CoreConfig.get_config_field(self.__config, 'core', 'mucha', 'hostname', default="localhost") + return CoreConfig.get_config_field( + self.__config, "core", "mucha", "hostname", default="localhost" + ) @property def port(self) -> int: - return CoreConfig.get_config_field(self.__config, 'core', 'mucha', 'port', default=8444) - + return CoreConfig.get_config_field( + self.__config, "core", "mucha", "port", default=8444 + ) + @property def ssl_cert(self) -> str: - return CoreConfig.get_config_field(self.__config, 'core', 'mucha', 'ssl_cert', default="cert/server.pem") - + return CoreConfig.get_config_field( + self.__config, "core", "mucha", "ssl_cert", default="cert/server.pem" + ) + @property def signing_key(self) -> str: - return CoreConfig.get_config_field(self.__config, 'core', 'mucha', 'signing_key', default="cert/billing.key") + return CoreConfig.get_config_field( + self.__config, "core", "mucha", "signing_key", default="cert/billing.key" + ) + class CoreConfig(dict): def __init__(self) -> None: @@ -200,20 +301,22 @@ class CoreConfig(dict): def str_to_loglevel(cls, level_str: str): if level_str.lower() == "error": return logging.ERROR - elif level_str.lower().startswith("warn"): # Fits warn or warning + elif level_str.lower().startswith("warn"): # Fits warn or warning return logging.WARN elif level_str.lower() == "debug": return logging.DEBUG else: - return logging.INFO + return logging.INFO @classmethod - def get_config_field(cls, __config: dict, module, *path: str, default: Any = "") -> Any: - envKey = f'CFG_{module}_' + def get_config_field( + cls, __config: dict, module, *path: str, default: Any = "" + ) -> Any: + envKey = f"CFG_{module}_" for arg in path: - envKey += arg + '_' - - if envKey.endswith('_'): + envKey += arg + "_" + + if envKey.endswith("_"): envKey = envKey[:-1] if envKey in os.environ: diff --git a/core/const.py b/core/const.py index da018ee..98effb6 100644 --- a/core/const.py +++ b/core/const.py @@ -1,6 +1,7 @@ from enum import Enum -class MainboardPlatformCodes(): + +class MainboardPlatformCodes: RINGEDGE = "AALE" RINGWIDE = "AAML" NU = "AAVE" @@ -8,7 +9,8 @@ class MainboardPlatformCodes(): ALLS_UX = "ACAE" ALLS_HX = "ACAX" -class MainboardRevisions(): + +class MainboardRevisions: RINGEDGE = 1 RINGEDGE2 = 2 @@ -26,12 +28,14 @@ class MainboardRevisions(): ALLS_UX2 = 2 ALLS_HX2 = 12 -class KeychipPlatformsCodes(): + +class KeychipPlatformsCodes: RING = "A72E" NU = ("A60E", "A60E", "A60E") NUSX = ("A61X", "A69X") ALLS = "A63E" + class AllnetCountryCode(Enum): JAPAN = "JPN" UNITED_STATES = "USA" @@ -41,6 +45,7 @@ class AllnetCountryCode(Enum): TAIWAN = "TWN" CHINA = "CHN" + class AllnetJapanRegionId(Enum): NONE = 0 AICHI = 1 diff --git a/core/data/__init__.py b/core/data/__init__.py index 4eee928..eb30d05 100644 --- a/core/data/__init__.py +++ b/core/data/__init__.py @@ -1,2 +1,2 @@ from core.data.database import Data -from core.data.cache import cached \ No newline at end of file +from core.data.cache import cached diff --git a/core/data/cache.py b/core/data/cache.py index cdea825..cabf597 100644 --- a/core/data/cache.py +++ b/core/data/cache.py @@ -1,4 +1,3 @@ - from typing import Any, Callable from functools import wraps import hashlib @@ -6,15 +5,17 @@ import pickle import logging from core.config import CoreConfig -cfg:CoreConfig = None # type: ignore +cfg: CoreConfig = None # type: ignore # Make memcache optional try: import pylibmc # type: ignore + has_mc = True except ModuleNotFoundError: has_mc = False -def cached(lifetime: int=10, extra_key: Any=None) -> Callable: + +def cached(lifetime: int = 10, extra_key: Any = None) -> Callable: def _cached(func: Callable) -> Callable: if has_mc: hostname = "127.0.0.1" @@ -22,11 +23,10 @@ def cached(lifetime: int=10, extra_key: Any=None) -> Callable: hostname = cfg.database.memcached_host memcache = pylibmc.Client([hostname], binary=True) memcache.behaviors = {"tcp_nodelay": True, "ketama": True} - + @wraps(func) def wrapper(*args: Any, **kwargs: Any) -> Any: if lifetime is not None: - # Hash function args items = kwargs.items() hashable_args = (args[1:], sorted(list(items))) @@ -41,7 +41,7 @@ def cached(lifetime: int=10, extra_key: Any=None) -> Callable: except pylibmc.Error as e: logging.getLogger("database").error(f"Memcache failed: {e}") result = None - + if result is not None: logging.getLogger("database").debug(f"Cache hit: {result}") return result @@ -55,7 +55,9 @@ def cached(lifetime: int=10, extra_key: Any=None) -> Callable: memcache.set(cache_key, result, lifetime) return result + else: + @wraps(func) def wrapper(*args: Any, **kwargs: Any) -> Any: return func(*args, **kwargs) diff --git a/core/data/database.py b/core/data/database.py index ab4c587..1af5c08 100644 --- a/core/data/database.py +++ b/core/data/database.py @@ -13,6 +13,7 @@ from core.config import CoreConfig from core.data.schema import * from core.utils import Utils + class Data: def __init__(self, cfg: CoreConfig) -> None: self.config = cfg @@ -22,7 +23,7 @@ class Data: self.__url = f"{self.config.database.protocol}://{self.config.database.username}:{passwd.hex()}@{self.config.database.host}/{self.config.database.name}?charset=utf8mb4" else: self.__url = f"{self.config.database.protocol}://{self.config.database.username}:{self.config.database.password}@{self.config.database.host}/{self.config.database.name}?charset=utf8mb4" - + self.__engine = create_engine(self.__url, pool_recycle=3600) session = sessionmaker(bind=self.__engine, autoflush=True, autocommit=True) self.session = scoped_session(session) @@ -38,11 +39,15 @@ class Data: self.logger = logging.getLogger("database") # Prevent the logger from adding handlers multiple times - if not getattr(self.logger, 'handler_set', None): - fileHandler = TimedRotatingFileHandler("{0}/{1}.log".format(self.config.server.log_dir, "db"), encoding="utf-8", - when="d", backupCount=10) + if not getattr(self.logger, "handler_set", None): + fileHandler = TimedRotatingFileHandler( + "{0}/{1}.log".format(self.config.server.log_dir, "db"), + encoding="utf-8", + when="d", + backupCount=10, + ) fileHandler.setFormatter(log_fmt) - + consoleHandler = logging.StreamHandler() consoleHandler.setFormatter(log_fmt) @@ -50,8 +55,10 @@ class Data: self.logger.addHandler(consoleHandler) self.logger.setLevel(self.config.database.loglevel) - coloredlogs.install(cfg.database.loglevel, logger=self.logger, fmt=log_fmt_str) - self.logger.handler_set = True # type: ignore + coloredlogs.install( + cfg.database.loglevel, logger=self.logger, fmt=log_fmt_str + ) + self.logger.handler_set = True # type: ignore def create_database(self): self.logger.info("Creating databases...") @@ -60,24 +67,32 @@ class Data: except SQLAlchemyError as e: self.logger.error(f"Failed to create databases! {e}") return - + games = Utils.get_all_titles() for game_dir, game_mod in games.items(): try: title_db = game_mod.database(self.config) metadata.create_all(self.__engine.connect()) - self.base.set_schema_ver(game_mod.current_schema_version, game_mod.game_codes[0]) + self.base.set_schema_ver( + game_mod.current_schema_version, game_mod.game_codes[0] + ) except Exception as e: - self.logger.warning(f"Could not load database schema from {game_dir} - {e}") - + self.logger.warning( + f"Could not load database schema from {game_dir} - {e}" + ) + self.logger.info(f"Setting base_schema_ver to {self.schema_ver_latest}") self.base.set_schema_ver(self.schema_ver_latest) - self.logger.info(f"Setting user auto_incrememnt to {self.config.database.user_table_autoincrement_start}") - self.user.reset_autoincrement(self.config.database.user_table_autoincrement_start) - + self.logger.info( + f"Setting user auto_incrememnt to {self.config.database.user_table_autoincrement_start}" + ) + self.user.reset_autoincrement( + self.config.database.user_table_autoincrement_start + ) + def recreate_database(self): self.logger.info("Dropping all databases...") self.base.execute("SET FOREIGN_KEY_CHECKS=0") @@ -86,61 +101,79 @@ class Data: except SQLAlchemyError as e: self.logger.error(f"Failed to drop databases! {e}") return - + for root, dirs, files in os.walk("./titles"): - for dir in dirs: + for dir in dirs: if not dir.startswith("__"): try: mod = importlib.import_module(f"titles.{dir}") - + try: title_db = mod.database(self.config) metadata.drop_all(self.__engine.connect()) except Exception as e: - self.logger.warning(f"Could not load database schema from {dir} - {e}") + self.logger.warning( + f"Could not load database schema from {dir} - {e}" + ) except ImportError as e: - self.logger.warning(f"Failed to load database schema dir {dir} - {e}") + self.logger.warning( + f"Failed to load database schema dir {dir} - {e}" + ) break - + self.base.execute("SET FOREIGN_KEY_CHECKS=1") self.create_database() - + def migrate_database(self, game: str, version: int, action: str) -> None: old_ver = self.base.get_schema_ver(game) sql = "" - + if old_ver is None: - self.logger.error(f"Schema for game {game} does not exist, did you run the creation script?") - return - - if old_ver == version: - self.logger.info(f"Schema for game {game} is already version {old_ver}, nothing to do") - return - - if not os.path.exists(f"core/data/schema/versions/{game.upper()}_{version}_{action}.sql"): - self.logger.error(f"Could not find {action} script {game.upper()}_{version}_{action}.sql in core/data/schema/versions folder") + self.logger.error( + f"Schema for game {game} does not exist, did you run the creation script?" + ) return - with open(f"core/data/schema/versions/{game.upper()}_{version}_{action}.sql", "r", encoding="utf-8") as f: + if old_ver == version: + self.logger.info( + f"Schema for game {game} is already version {old_ver}, nothing to do" + ) + return + + if not os.path.exists( + f"core/data/schema/versions/{game.upper()}_{version}_{action}.sql" + ): + self.logger.error( + f"Could not find {action} script {game.upper()}_{version}_{action}.sql in core/data/schema/versions folder" + ) + return + + with open( + f"core/data/schema/versions/{game.upper()}_{version}_{action}.sql", + "r", + encoding="utf-8", + ) as f: sql = f.read() - + result = self.base.execute(sql) if result is None: self.logger.error("Error execuing sql script!") return None - + result = self.base.set_schema_ver(version, game) if result is None: self.logger.error("Error setting version in schema_version table!") return None - + self.logger.info(f"Successfully migrated {game} to schema version {version}") def create_owner(self, email: Optional[str] = None) -> None: - pw = ''.join(secrets.choice(string.ascii_letters + string.digits) for i in range(20)) + pw = "".join( + secrets.choice(string.ascii_letters + string.digits) for i in range(20) + ) hash = bcrypt.hashpw(pw.encode(), bcrypt.gensalt()) user_id = self.user.create_user(email=email, permission=255, password=hash) @@ -153,32 +186,38 @@ class Data: self.logger.error(f"Failed to create card for owner with id {user_id}") return - self.logger.warn(f"Successfully created owner with email {email}, access code 00000000000000000000, and password {pw} Make sure to change this password and assign a real card ASAP!") - + self.logger.warn( + f"Successfully created owner with email {email}, access code 00000000000000000000, and password {pw} Make sure to change this password and assign a real card ASAP!" + ) + def migrate_card(self, old_ac: str, new_ac: str, should_force: bool) -> None: if old_ac == new_ac: self.logger.error("Both access codes are the same!") return - + new_card = self.card.get_card_by_access_code(new_ac) if new_card is None: self.card.update_access_code(old_ac, new_ac) return - + if not should_force: - self.logger.warn(f"Card already exists for access code {new_ac} (id {new_card['id']}). If you wish to continue, rerun with the '--force' flag."\ - f" All exiting data on the target card {new_ac} will be perminently erased and replaced with data from card {old_ac}.") + self.logger.warn( + f"Card already exists for access code {new_ac} (id {new_card['id']}). If you wish to continue, rerun with the '--force' flag." + f" All exiting data on the target card {new_ac} will be perminently erased and replaced with data from card {old_ac}." + ) return - - self.logger.info(f"All exiting data on the target card {new_ac} will be perminently erased and replaced with data from card {old_ac}.") + + self.logger.info( + f"All exiting data on the target card {new_ac} will be perminently erased and replaced with data from card {old_ac}." + ) self.card.delete_card(new_card["id"]) self.card.update_access_code(old_ac, new_ac) hanging_user = self.user.get_user(new_card["user"]) if hanging_user["password"] is None: self.logger.info(f"Delete hanging user {hanging_user['id']}") - self.user.delete_user(hanging_user['id']) - + self.user.delete_user(hanging_user["id"]) + def delete_hanging_users(self) -> None: """ Finds and deletes users that have not registered for the webui that have no cards assocated with them. @@ -186,13 +225,13 @@ class Data: unreg_users = self.user.get_unregistered_users() if unreg_users is None: self.logger.error("Error occoured finding unregistered users") - + for user in unreg_users: - cards = self.card.get_user_cards(user['id']) + cards = self.card.get_user_cards(user["id"]) if cards is None: self.logger.error(f"Error getting cards for user {user['id']}") continue if not cards: self.logger.info(f"Delete hanging user {user['id']}") - self.user.delete_user(user['id']) + self.user.delete_user(user["id"]) diff --git a/core/data/schema/__init__.py b/core/data/schema/__init__.py index 9032a68..45931d7 100644 --- a/core/data/schema/__init__.py +++ b/core/data/schema/__init__.py @@ -3,4 +3,4 @@ from core.data.schema.card import CardData from core.data.schema.base import BaseData, metadata from core.data.schema.arcade import ArcadeData -__all__ = ["UserData", "CardData", "BaseData", "metadata", "ArcadeData"] \ No newline at end of file +__all__ = ["UserData", "CardData", "BaseData", "metadata", "ArcadeData"] diff --git a/core/data/schema/arcade.py b/core/data/schema/arcade.py index af4069d..e1d9b1f 100644 --- a/core/data/schema/arcade.py +++ b/core/data/schema/arcade.py @@ -14,131 +14,186 @@ arcade = Table( metadata, Column("id", Integer, primary_key=True, nullable=False), Column("name", String(255)), - Column("nickname", String(255)), + Column("nickname", String(255)), Column("country", String(3)), Column("country_id", Integer), Column("state", String(255)), Column("city", String(255)), Column("region_id", Integer), Column("timezone", String(255)), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) machine = Table( "machine", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("arcade", ForeignKey("arcade.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "arcade", + ForeignKey("arcade.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("serial", String(15), nullable=False), Column("board", String(15)), Column("game", String(4)), - Column("country", String(3)), # overwrites if not null + Column("country", String(3)), # overwrites if not null Column("timezone", String(255)), Column("ota_enable", Boolean), Column("is_cab", Boolean), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) arcade_owner = Table( - 'arcade_owner', + "arcade_owner", metadata, - Column('user', Integer, ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), - Column('arcade', Integer, ForeignKey("arcade.id", ondelete="cascade", onupdate="cascade"), nullable=False), - Column('permissions', Integer, nullable=False), - PrimaryKeyConstraint('user', 'arcade', name='arcade_owner_pk'), - mysql_charset='utf8mb4' + Column( + "user", + Integer, + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), + Column( + "arcade", + Integer, + ForeignKey("arcade.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), + Column("permissions", Integer, nullable=False), + PrimaryKeyConstraint("user", "arcade", name="arcade_owner_pk"), + mysql_charset="utf8mb4", ) + class ArcadeData(BaseData): def get_machine(self, serial: str = None, id: int = None) -> Optional[Dict]: if serial is not None: serial = serial.replace("-", "") if len(serial) == 11: sql = machine.select(machine.c.serial.like(f"{serial}%")) - + elif len(serial) == 15: sql = machine.select(machine.c.serial == serial) - + else: self.logger.error(f"{__name__ }: Malformed serial {serial}") return None - + elif id is not None: sql = machine.select(machine.c.id == id) - - else: + + else: self.logger.error(f"{__name__ }: Need either serial or ID to look up!") return None - + result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() - - def put_machine(self, arcade_id: int, serial: str = "", board: str = None, game: str = None, is_cab: bool = False) -> Optional[int]: + + def put_machine( + self, + arcade_id: int, + serial: str = "", + board: str = None, + game: str = None, + is_cab: bool = False, + ) -> Optional[int]: if arcade_id: self.logger.error(f"{__name__ }: Need arcade id!") return None - sql = machine.insert().values(arcade = arcade_id, keychip = serial, board = board, game = game, is_cab = is_cab) - - result = self.execute(sql) - if result is None: return None - return result.lastrowid - - def set_machine_serial(self, machine_id: int, serial: str) -> None: - result = self.execute(machine.update(machine.c.id == machine_id).values(keychip = serial)) - if result is None: - self.logger.error(f"Failed to update serial for machine {machine_id} -> {serial}") - return result.lastrowid - - def set_machine_boardid(self, machine_id: int, boardid: str) -> None: - result = self.execute(machine.update(machine.c.id == machine_id).values(board = boardid)) - if result is None: - self.logger.error(f"Failed to update board id for machine {machine_id} -> {boardid}") - - def get_arcade(self, id: int) -> Optional[Dict]: - sql = arcade.select(arcade.c.id == id) - result = self.execute(sql) - if result is None: return None - return result.fetchone() - - def put_arcade(self, name: str, nickname: str = None, country: str = "JPN", country_id: int = 1, - state: str = "", city: str = "", regional_id: int = 1) -> Optional[int]: - if nickname is None: nickname = name - - sql = arcade.insert().values(name = name, nickname = nickname, country = country, country_id = country_id, - state = state, city = city, regional_id = regional_id) - - result = self.execute(sql) - if result is None: return None - return result.lastrowid - - def get_arcade_owners(self, arcade_id: int) -> Optional[Dict]: - sql = select(arcade_owner).where(arcade_owner.c.arcade==arcade_id) - - result = self.execute(sql) - if result is None: return None - return result.fetchall() - - def add_arcade_owner(self, arcade_id: int, user_id: int) -> None: - sql = insert(arcade_owner).values( - arcade=arcade_id, - user=user_id + sql = machine.insert().values( + arcade=arcade_id, keychip=serial, board=board, game=game, is_cab=is_cab ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.lastrowid - def format_serial(self, platform_code: str, platform_rev: int, serial_num: int, append: int = 4152) -> str: - return f"{platform_code}{platform_rev:02d}A{serial_num:04d}{append:04d}" # 0x41 = A, 0x52 = R - + def set_machine_serial(self, machine_id: int, serial: str) -> None: + result = self.execute( + machine.update(machine.c.id == machine_id).values(keychip=serial) + ) + if result is None: + self.logger.error( + f"Failed to update serial for machine {machine_id} -> {serial}" + ) + return result.lastrowid + + def set_machine_boardid(self, machine_id: int, boardid: str) -> None: + result = self.execute( + machine.update(machine.c.id == machine_id).values(board=boardid) + ) + if result is None: + self.logger.error( + f"Failed to update board id for machine {machine_id} -> {boardid}" + ) + + def get_arcade(self, id: int) -> Optional[Dict]: + sql = arcade.select(arcade.c.id == id) + result = self.execute(sql) + if result is None: + return None + return result.fetchone() + + def put_arcade( + self, + name: str, + nickname: str = None, + country: str = "JPN", + country_id: int = 1, + state: str = "", + city: str = "", + regional_id: int = 1, + ) -> Optional[int]: + if nickname is None: + nickname = name + + sql = arcade.insert().values( + name=name, + nickname=nickname, + country=country, + country_id=country_id, + state=state, + city=city, + regional_id=regional_id, + ) + + result = self.execute(sql) + if result is None: + return None + return result.lastrowid + + def get_arcade_owners(self, arcade_id: int) -> Optional[Dict]: + sql = select(arcade_owner).where(arcade_owner.c.arcade == arcade_id) + + result = self.execute(sql) + if result is None: + return None + return result.fetchall() + + def add_arcade_owner(self, arcade_id: int, user_id: int) -> None: + sql = insert(arcade_owner).values(arcade=arcade_id, user=user_id) + + result = self.execute(sql) + if result is None: + return None + return result.lastrowid + + def format_serial( + self, platform_code: str, platform_rev: int, serial_num: int, append: int = 4152 + ) -> str: + return f"{platform_code}{platform_rev:02d}A{serial_num:04d}{append:04d}" # 0x41 = A, 0x52 = R + def validate_keychip_format(self, serial: str) -> bool: serial = serial.replace("-", "") if len(serial) != 11 or len(serial) != 15: - self.logger.error(f"Serial validate failed: Incorrect length for {serial} (len {len(serial)})") + self.logger.error( + f"Serial validate failed: Incorrect length for {serial} (len {len(serial)})" + ) return False - + platform_code = serial[:4] platform_rev = serial[4:6] const_a = serial[6] @@ -150,11 +205,15 @@ class ArcadeData(BaseData): return False if len(append) != 0 or len(append) != 4: - self.logger.error(f"Serial validate failed: {serial} had malformed append {append}") + self.logger.error( + f"Serial validate failed: {serial} had malformed append {append}" + ) return False if len(num) != 4: - self.logger.error(f"Serial validate failed: {serial} had malformed number {num}") + self.logger.error( + f"Serial validate failed: {serial} had malformed number {num}" + ) return False - + return True diff --git a/core/data/schema/base.py b/core/data/schema/base.py index 955c772..9899f29 100644 --- a/core/data/schema/base.py +++ b/core/data/schema/base.py @@ -19,7 +19,7 @@ schema_ver = Table( metadata, Column("game", String(4), primary_key=True, nullable=False), Column("version", Integer, nullable=False, server_default="1"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) event_log = Table( @@ -32,16 +32,17 @@ event_log = Table( Column("message", String(1000), nullable=False), Column("details", JSON, nullable=False), Column("when_logged", TIMESTAMP, nullable=False, server_default=func.now()), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) -class BaseData(): + +class BaseData: def __init__(self, cfg: CoreConfig, conn: Connection) -> None: self.config = cfg self.conn = conn self.logger = logging.getLogger("database") - - def execute(self, sql: str, opts: Dict[str, Any]={}) -> Optional[CursorResult]: + + def execute(self, sql: str, opts: Dict[str, Any] = {}) -> Optional[CursorResult]: res = None try: @@ -51,7 +52,7 @@ class BaseData(): except SQLAlchemyError as e: self.logger.error(f"SQLAlchemy error {e}") return None - + except UnicodeEncodeError as e: self.logger.error(f"UnicodeEncodeError error {e}") return None @@ -63,7 +64,7 @@ class BaseData(): except SQLAlchemyError as e: self.logger.error(f"SQLAlchemy error {e}") return None - + except UnicodeEncodeError as e: self.logger.error(f"UnicodeEncodeError error {e}") return None @@ -73,58 +74,71 @@ class BaseData(): raise return res - + def generate_id(self) -> int: """ Generate a random 5-7 digit id """ return randrange(10000, 9999999) - + def get_schema_ver(self, game: str) -> Optional[int]: sql = select(schema_ver).where(schema_ver.c.game == game) result = self.execute(sql) if result is None: return None - + row = result.fetchone() if row is None: return None - + return row["version"] - + def set_schema_ver(self, ver: int, game: str = "CORE") -> Optional[int]: - sql = insert(schema_ver).values(game = game, version = ver) - conflict = sql.on_duplicate_key_update(version = ver) - + sql = insert(schema_ver).values(game=game, version=ver) + conflict = sql.on_duplicate_key_update(version=ver) + result = self.execute(conflict) if result is None: - self.logger.error(f"Failed to update schema version for game {game} (v{ver})") + self.logger.error( + f"Failed to update schema version for game {game} (v{ver})" + ) return None return result.lastrowid - def log_event(self, system: str, type: str, severity: int, message: str, details: Dict = {}) -> Optional[int]: - sql = event_log.insert().values(system = system, type = type, severity = severity, message = message, details = json.dumps(details)) + def log_event( + self, system: str, type: str, severity: int, message: str, details: Dict = {} + ) -> Optional[int]: + sql = event_log.insert().values( + system=system, + type=type, + severity=severity, + message=message, + details=json.dumps(details), + ) result = self.execute(sql) if result is None: - self.logger.error(f"{__name__}: Failed to insert event into event log! system = {system}, type = {type}, severity = {severity}, message = {message}") + self.logger.error( + f"{__name__}: Failed to insert event into event log! system = {system}, type = {type}, severity = {severity}, message = {message}" + ) return None return result.lastrowid - + def get_event_log(self, entries: int = 100) -> Optional[List[Dict]]: sql = event_log.select().limit(entries).all() result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - + def fix_bools(self, data: Dict) -> Dict: - for k,v in data.items(): + for k, v in data.items(): if type(v) == str and v.lower() == "true": data[k] = True elif type(v) == str and v.lower() == "false": data[k] = False - + return data diff --git a/core/data/schema/card.py b/core/data/schema/card.py index dc74832..d8f5fc0 100644 --- a/core/data/schema/card.py +++ b/core/data/schema/card.py @@ -8,55 +8,67 @@ from sqlalchemy.engine import Row from core.data.schema.base import BaseData, metadata aime_card = Table( - 'aime_card', + "aime_card", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("access_code", String(20)), Column("created_date", TIMESTAMP, server_default=func.now()), Column("last_login_date", TIMESTAMP, onupdate=func.now()), Column("is_locked", Boolean, server_default="0"), Column("is_banned", Boolean, server_default="0"), UniqueConstraint("user", "access_code", name="aime_card_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) + class CardData(BaseData): def get_card_by_access_code(self, access_code: str) -> Optional[Row]: sql = aime_card.select(aime_card.c.access_code == access_code) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() def get_card_by_id(self, card_id: int) -> Optional[Row]: sql = aime_card.select(aime_card.c.id == card_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() - + def update_access_code(self, old_ac: str, new_ac: str) -> None: - sql = aime_card.update(aime_card.c.access_code == old_ac).values(access_code = new_ac) + sql = aime_card.update(aime_card.c.access_code == old_ac).values( + access_code=new_ac + ) result = self.execute(sql) - if result is None: - self.logger.error(f"Failed to change card access code from {old_ac} to {new_ac}") + if result is None: + self.logger.error( + f"Failed to change card access code from {old_ac} to {new_ac}" + ) def get_user_id_from_card(self, access_code: str) -> Optional[int]: """ Given a 20 digit access code as a string, get the user id associated with that card """ card = self.get_card_by_access_code(access_code) - if card is None: return None + if card is None: + return None return int(card["user"]) - + def delete_card(self, card_id: int) -> None: sql = aime_card.delete(aime_card.c.id == card_id) result = self.execute(sql) - if result is None: + if result is None: self.logger.error(f"Failed to delete card with id {card_id}") def get_user_cards(self, aime_id: int) -> Optional[List[Row]]: @@ -65,17 +77,18 @@ class CardData(BaseData): """ sql = aime_card.select(aime_card.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - def create_card(self, user_id: int, access_code: str) -> Optional[int]: """ Given a aime_user id and a 20 digit access code as a string, create a card and return the ID if successful """ sql = aime_card.insert().values(user=user_id, access_code=access_code) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.lastrowid def to_access_code(self, luid: str) -> str: @@ -88,4 +101,4 @@ class CardData(BaseData): """ Given a 20 digit access code as a string, return the 16 hex character luid """ - return f'{int(access_code):0{16}x}' \ No newline at end of file + return f"{int(access_code):0{16}x}" diff --git a/core/data/schema/user.py b/core/data/schema/user.py index aee07e9..98663d1 100644 --- a/core/data/schema/user.py +++ b/core/data/schema/user.py @@ -17,72 +17,81 @@ aime_user = Table( Column("username", String(25), unique=True), Column("email", String(255), unique=True), Column("password", String(255)), - Column("permissions", Integer), + Column("permissions", Integer), Column("created_date", TIMESTAMP, server_default=func.now()), Column("last_login_date", TIMESTAMP, onupdate=func.now()), Column("suspend_expire_time", TIMESTAMP), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) + class PermissionBits(Enum): PermUser = 1 PermMod = 2 PermSysAdmin = 4 + class UserData(BaseData): - def create_user(self, id: int = None, username: str = None, email: str = None, password: str = None, permission: int = 1) -> Optional[int]: + def create_user( + self, + id: int = None, + username: str = None, + email: str = None, + password: str = None, + permission: int = 1, + ) -> Optional[int]: if id is None: sql = insert(aime_user).values( - username=username, - email=email, - password=password, - permissions=permission + username=username, + email=email, + password=password, + permissions=permission, ) else: sql = insert(aime_user).values( - id=id, - username=username, - email=email, - password=password, - permissions=permission + id=id, + username=username, + email=email, + password=password, + permissions=permission, ) conflict = sql.on_duplicate_key_update( - username=username, - email=email, - password=password, - permissions=permission + username=username, email=email, password=password, permissions=permission ) - + result = self.execute(conflict) - if result is None: return None + if result is None: + return None return result.lastrowid - + def get_user(self, user_id: int) -> Optional[Row]: sql = select(aime_user).where(aime_user.c.id == user_id) result = self.execute(sql) - if result is None: return False + if result is None: + return False return result.fetchone() - + def check_password(self, user_id: int, passwd: bytes = None) -> bool: usr = self.get_user(user_id) - if usr is None: return False - - if usr['password'] is None: + if usr is None: return False - return bcrypt.checkpw(passwd, usr['password'].encode()) + if usr["password"] is None: + return False + + return bcrypt.checkpw(passwd, usr["password"].encode()) def reset_autoincrement(self, ai_value: int) -> None: # ALTER TABLE isn't in sqlalchemy so we do this the ugly way sql = f"ALTER TABLE aime_user AUTO_INCREMENT={ai_value}" self.execute(sql) - + def delete_user(self, user_id: int) -> None: sql = aime_user.delete(aime_user.c.id == user_id) result = self.execute(sql) - if result is None: + if result is None: self.logger.error(f"Failed to delete user with id {user_id}") def get_unregistered_users(self) -> List[Row]: @@ -92,6 +101,6 @@ class UserData(BaseData): sql = select(aime_user).where(aime_user.c.password == None) result = self.execute(sql) - if result is None: + if result is None: return None - return result.fetchall() \ No newline at end of file + return result.fetchall() diff --git a/core/frontend.py b/core/frontend.py index 6f95073..2fdefae 100644 --- a/core/frontend.py +++ b/core/frontend.py @@ -14,11 +14,13 @@ from core.config import CoreConfig from core.data import Data from core.utils import Utils + class IUserSession(Interface): userId = Attribute("User's ID") current_ip = Attribute("User's current ip address") permissions = Attribute("User's permission level") - + + @implementer(IUserSession) class UserSession(object): def __init__(self, session): @@ -26,10 +28,11 @@ class UserSession(object): self.current_ip = "0.0.0.0" self.permissions = 0 + class FrontendServlet(resource.Resource): def getChild(self, name: bytes, request: Request): self.logger.debug(f"{request.getClientIP()} -> {name.decode()}") - if name == b'': + if name == b"": return self return resource.Resource.getChild(self, name, request) @@ -42,17 +45,23 @@ class FrontendServlet(resource.Resource): self.game_list: List[Dict[str, str]] = [] self.children: Dict[str, Any] = {} - fileHandler = TimedRotatingFileHandler("{0}/{1}.log".format(self.config.server.log_dir, "frontend"), when="d", backupCount=10) + fileHandler = TimedRotatingFileHandler( + "{0}/{1}.log".format(self.config.server.log_dir, "frontend"), + when="d", + backupCount=10, + ) fileHandler.setFormatter(log_fmt) - + consoleHandler = logging.StreamHandler() consoleHandler.setFormatter(log_fmt) self.logger.addHandler(fileHandler) self.logger.addHandler(consoleHandler) - + self.logger.setLevel(cfg.frontend.loglevel) - coloredlogs.install(level=cfg.frontend.loglevel, logger=self.logger, fmt=log_fmt_str) + coloredlogs.install( + level=cfg.frontend.loglevel, logger=self.logger, fmt=log_fmt_str + ) registerAdapter(UserSession, Session, IUserSession) fe_game = FE_Game(cfg, self.environment) @@ -65,18 +74,26 @@ class FrontendServlet(resource.Resource): fe_game.putChild(game_dir.encode(), game_fe) except: raise - + self.environment.globals["game_list"] = self.game_list self.putChild(b"gate", FE_Gate(cfg, self.environment)) self.putChild(b"user", FE_User(cfg, self.environment)) self.putChild(b"game", fe_game) - self.logger.info(f"Ready on port {self.config.frontend.port} serving {len(fe_game.children)} games") + self.logger.info( + f"Ready on port {self.config.frontend.port} serving {len(fe_game.children)} games" + ) def render_GET(self, request): self.logger.debug(f"{request.getClientIP()} -> {request.uri.decode()}") template = self.environment.get_template("core/frontend/index.jinja") - return template.render(server_name=self.config.server.name, title=self.config.server.name, game_list=self.game_list, sesh=vars(IUserSession(request.getSession()))).encode("utf-16") + return template.render( + server_name=self.config.server.name, + title=self.config.server.name, + game_list=self.game_list, + sesh=vars(IUserSession(request.getSession())), + ).encode("utf-16") + class FE_Base(resource.Resource): """ @@ -84,43 +101,51 @@ class FE_Base(resource.Resource): Initializes the environment, data, logger, config, and sets isLeaf to true It is expected that game implementations of this class overwrite many of these """ - isLeaf = True + + isLeaf = True + def __init__(self, cfg: CoreConfig, environment: jinja2.Environment) -> None: self.core_config = cfg self.data = Data(cfg) - self.logger = logging.getLogger('frontend') + self.logger = logging.getLogger("frontend") self.environment = environment self.nav_name = "nav_name" + class FE_Gate(FE_Base): - def render_GET(self, request: Request): + def render_GET(self, request: Request): self.logger.debug(f"{request.getClientIP()} -> {request.uri.decode()}") uri: str = request.uri.decode() - + sesh = request.getSession() usr_sesh = IUserSession(sesh) if usr_sesh.userId > 0: return redirectTo(b"/user", request) - + if uri.startswith("/gate/create"): return self.create_user(request) - if b'e' in request.args: + if b"e" in request.args: try: - err = int(request.args[b'e'][0].decode()) + err = int(request.args[b"e"][0].decode()) except: err = 0 - else: err = 0 + else: + err = 0 + + template = self.environment.get_template("core/frontend/gate/gate.jinja") + return template.render( + title=f"{self.core_config.server.name} | Login Gate", + error=err, + sesh=vars(usr_sesh), + ).encode("utf-16") - template = self.environment.get_template("core/frontend/gate/gate.jinja") - return template.render(title=f"{self.core_config.server.name} | Login Gate", error=err, sesh=vars(usr_sesh)).encode("utf-16") - def render_POST(self, request: Request): uri = request.uri.decode() ip = request.getClientAddress().host - - if uri == "/gate/gate.login": + + if uri == "/gate/gate.login": access_code: str = request.args[b"access_code"][0].decode() passwd: bytes = request.args[b"passwd"][0] if passwd == b"": @@ -129,26 +154,28 @@ class FE_Gate(FE_Base): uid = self.data.card.get_user_id_from_card(access_code) if uid is None: return redirectTo(b"/gate?e=1", request) - + if passwd is None: sesh = self.data.user.check_password(uid) if sesh is not None: - return redirectTo(f"/gate/create?ac={access_code}".encode(), request) + return redirectTo( + f"/gate/create?ac={access_code}".encode(), request + ) return redirectTo(b"/gate?e=1", request) if not self.data.user.check_password(uid, passwd): return redirectTo(b"/gate?e=1", request) - + self.logger.info(f"Successful login of user {uid} at {ip}") - + sesh = request.getSession() usr_sesh = IUserSession(sesh) usr_sesh.userId = uid usr_sesh.current_ip = ip - + return redirectTo(b"/user", request) - + elif uri == "/gate/gate.create": access_code: str = request.args[b"access_code"][0].decode() username: str = request.args[b"username"][0] @@ -162,26 +189,33 @@ class FE_Gate(FE_Base): salt = bcrypt.gensalt() hashed = bcrypt.hashpw(passwd, salt) - result = self.data.user.create_user(uid, username, email, hashed.decode(), 1) + result = self.data.user.create_user( + uid, username, email, hashed.decode(), 1 + ) if result is None: return redirectTo(b"/gate?e=3", request) - + if not self.data.user.check_password(uid, passwd.encode()): return redirectTo(b"/gate", request) - + return redirectTo(b"/user", request) else: return b"" def create_user(self, request: Request): - if b'ac' not in request.args or len(request.args[b'ac'][0].decode()) != 20: + if b"ac" not in request.args or len(request.args[b"ac"][0].decode()) != 20: return redirectTo(b"/gate?e=2", request) - ac = request.args[b'ac'][0].decode() - - 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}).encode("utf-16") + ac = request.args[b"ac"][0].decode() + + 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}, + ).encode("utf-16") + class FE_User(FE_Base): def render_GET(self, request: Request): @@ -191,17 +225,20 @@ class FE_User(FE_Base): usr_sesh = IUserSession(sesh) if usr_sesh.userId == 0: return redirectTo(b"/gate", request) - - return template.render(title=f"{self.core_config.server.name} | Account", sesh=vars(usr_sesh)).encode("utf-16") + + return template.render( + title=f"{self.core_config.server.name} | Account", sesh=vars(usr_sesh) + ).encode("utf-16") + class FE_Game(FE_Base): isLeaf = False children: Dict[str, Any] = {} def getChild(self, name: bytes, request: Request): - if name == b'': + if name == b"": return self return resource.Resource.getChild(self, name, request) def render_GET(self, request: Request) -> bytes: - return redirectTo(b"/user", request) \ No newline at end of file + return redirectTo(b"/user", request) diff --git a/core/mucha.py b/core/mucha.py index 1f0312a..1b73b84 100644 --- a/core/mucha.py +++ b/core/mucha.py @@ -9,25 +9,30 @@ import pytz from core.config import CoreConfig from core.utils import Utils + class MuchaServlet: - def __init__(self, cfg: CoreConfig, cfg_dir: str) -> None: + 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') + self.logger = logging.getLogger("mucha") log_fmt_str = "[%(asctime)s] Mucha | %(levelname)s | %(message)s" log_fmt = logging.Formatter(log_fmt_str) - - fileHandler = TimedRotatingFileHandler("{0}/{1}.log".format(self.config.server.log_dir, "mucha"), when="d", backupCount=10) + + fileHandler = TimedRotatingFileHandler( + "{0}/{1}.log".format(self.config.server.log_dir, "mucha"), + when="d", + backupCount=10, + ) fileHandler.setFormatter(log_fmt) - + consoleHandler = logging.StreamHandler() consoleHandler.setFormatter(log_fmt) self.logger.addHandler(fileHandler) self.logger.addHandler(consoleHandler) - + self.logger.setLevel(logging.INFO) coloredlogs.install(level=logging.INFO, logger=self.logger, fmt=log_fmt_str) @@ -35,43 +40,57 @@ class MuchaServlet: 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) + enabled, game_cd = mod.index.get_mucha_info( + self.config, self.config_dir + ) if enabled: self.mucha_registry.append(game_cd) - - self.logger.info(f"Serving {len(self.mucha_registry)} games on port {self.config.mucha.port}") + + self.logger.info( + f"Serving {len(self.mucha_registry)} games on port {self.config.mucha.port}" + ) def handle_boardauth(self, request: Request, _: Dict) -> bytes: req_dict = self.mucha_preprocess(request.content.getvalue()) if req_dict is None: - self.logger.error(f"Error processing mucha request {request.content.getvalue()}") + self.logger.error( + f"Error processing mucha request {request.content.getvalue()}" + ) return b"" req = MuchaAuthRequest(req_dict) self.logger.debug(f"Mucha request {vars(req)}") - self.logger.info(f"Boardauth request from {request.getClientAddress().host} for {req.gameVer}") + self.logger.info( + f"Boardauth request from {request.getClientAddress().host} for {req.gameVer}" + ) if req.gameCd not in self.mucha_registry: self.logger.warn(f"Unknown gameCd {req.gameCd}") return b"" # TODO: Decrypt S/N - - resp = MuchaAuthResponse(f"{self.config.mucha.hostname}{':' + self.config.mucha.port if self.config.server.is_develop else ''}") + + resp = MuchaAuthResponse( + f"{self.config.mucha.hostname}{':' + self.config.mucha.port if self.config.server.is_develop else ''}" + ) self.logger.debug(f"Mucha response {vars(resp)}") return self.mucha_postprocess(vars(resp)) - + def handle_updatecheck(self, request: Request, _: Dict) -> bytes: req_dict = self.mucha_preprocess(request.content.getvalue()) if req_dict is None: - self.logger.error(f"Error processing mucha request {request.content.getvalue()}") + self.logger.error( + f"Error processing mucha request {request.content.getvalue()}" + ) return b"" req = MuchaUpdateRequest(req_dict) self.logger.debug(f"Mucha request {vars(req)}") - self.logger.info(f"Updatecheck request from {request.getClientAddress().host} for {req.gameVer}") + self.logger.info( + f"Updatecheck request from {request.getClientAddress().host} for {req.gameVer}" + ) if req.gameCd not in self.mucha_registry: self.logger.warn(f"Unknown gameCd {req.gameCd}") @@ -86,14 +105,14 @@ class MuchaServlet: def mucha_preprocess(self, data: bytes) -> Optional[Dict]: try: ret: Dict[str, Any] = {} - - for x in data.decode().split('&'): - kvp = x.split('=') + + for x in data.decode().split("&"): + kvp = x.split("=") if len(kvp) == 2: ret[kvp[0]] = kvp[1] return ret - + except: self.logger.error(f"Error processing mucha request {data}") return None @@ -101,7 +120,7 @@ class MuchaServlet: def mucha_postprocess(self, data: dict) -> Optional[bytes]: try: urlencode = "" - for k,v in data.items(): + for k, v in data.items(): urlencode += f"{k}={v}&" return urlencode.encode() @@ -110,36 +129,44 @@ class MuchaServlet: self.logger.error("Error processing mucha response") return None -class MuchaAuthRequest(): + +class MuchaAuthRequest: def __init__(self, request: Dict) -> None: - self.gameVer = "" if "gameVer" not in request else request["gameVer"] # gameCd + boardType + countryCd + version - self.sendDate = "" if "sendDate" not in request else request["sendDate"] # %Y%m%d + self.gameVer = ( + "" if "gameVer" not in request else request["gameVer"] + ) # gameCd + boardType + countryCd + version + self.sendDate = ( + "" if "sendDate" not in request else request["sendDate"] + ) # %Y%m%d self.serialNum = "" if "serialNum" not in request else request["serialNum"] self.gameCd = "" if "gameCd" not in request else request["gameCd"] self.boardType = "" if "boardType" not in request else request["boardType"] self.boardId = "" if "boardId" not in request else request["boardId"] self.mac = "" if "mac" not in request else request["mac"] self.placeId = "" if "placeId" not in request else request["placeId"] - self.storeRouterIp = "" if "storeRouterIp" not in request else request["storeRouterIp"] + self.storeRouterIp = ( + "" if "storeRouterIp" not in request else request["storeRouterIp"] + ) self.countryCd = "" if "countryCd" not in request else request["countryCd"] self.useToken = "" if "useToken" not in request else request["useToken"] self.allToken = "" if "allToken" not in request else request["allToken"] -class MuchaAuthResponse(): + +class MuchaAuthResponse: def __init__(self, mucha_url: str) -> None: - self.RESULTS = "001" + self.RESULTS = "001" self.AUTH_INTERVAL = "86400" self.SERVER_TIME = datetime.strftime(datetime.now(), "%Y%m%d%H%M") self.UTC_SERVER_TIME = datetime.strftime(datetime.now(pytz.UTC), "%Y%m%d%H%M") - self.CHARGE_URL = f"https://{mucha_url}/charge/" + self.CHARGE_URL = f"https://{mucha_url}/charge/" self.FILE_URL = f"https://{mucha_url}/file/" self.URL_1 = f"https://{mucha_url}/url1/" self.URL_2 = f"https://{mucha_url}/url2/" self.URL_3 = f"https://{mucha_url}/url3/" - - self.PLACE_ID = "JPN123" - self.COUNTRY_CD = "JPN" + + self.PLACE_ID = "JPN123" + self.COUNTRY_CD = "JPN" self.SHOP_NAME = "TestShop!" self.SHOP_NICKNAME = "TestShop" self.AREA_0 = "008" @@ -150,7 +177,7 @@ class MuchaAuthResponse(): self.AREA_FULL_1 = "" self.AREA_FULL_2 = "" self.AREA_FULL_3 = "" - + self.SHOP_NAME_EN = "TestShop!" self.SHOP_NICKNAME_EN = "TestShop" self.AREA_0_EN = "008" @@ -162,23 +189,27 @@ class MuchaAuthResponse(): self.AREA_FULL_2_EN = "" self.AREA_FULL_3_EN = "" - self.PREFECTURE_ID = "1" + self.PREFECTURE_ID = "1" self.EXPIRATION_DATE = "null" self.USE_TOKEN = "0" self.CONSUME_TOKEN = "0" self.DONGLE_FLG = "1" self.FORCE_BOOT = "0" -class MuchaUpdateRequest(): + +class MuchaUpdateRequest: def __init__(self, request: Dict) -> None: self.gameVer = "" if "gameVer" not in request else request["gameVer"] self.gameCd = "" if "gameCd" not in request else request["gameCd"] self.serialNum = "" if "serialNum" not in request else request["serialNum"] self.countryCd = "" if "countryCd" not in request else request["countryCd"] self.placeId = "" if "placeId" not in request else request["placeId"] - self.storeRouterIp = "" if "storeRouterIp" not in request else request["storeRouterIp"] + self.storeRouterIp = ( + "" if "storeRouterIp" not in request else request["storeRouterIp"] + ) -class MuchaUpdateResponse(): + +class MuchaUpdateResponse: def __init__(self, game_ver: str, mucha_url: str) -> None: self.RESULTS = "001" self.UPDATE_VER_1 = game_ver @@ -194,7 +225,8 @@ class MuchaUpdateResponse(): self.USER_ID = "" self.PASSWORD = "" -class MuchaUpdateResponseStub(): + +class MuchaUpdateResponseStub: def __init__(self, game_ver: str) -> None: self.RESULTS = "001" self.UPDATE_VER_1 = game_ver diff --git a/core/title.py b/core/title.py index f201d8b..c9580d2 100644 --- a/core/title.py +++ b/core/title.py @@ -7,8 +7,9 @@ from core.config import CoreConfig from core.data import Data from core.utils import Utils -class TitleServlet(): - def __init__(self, core_cfg: CoreConfig, cfg_folder: str): + +class TitleServlet: + def __init__(self, core_cfg: CoreConfig, cfg_folder: str): super().__init__() self.config = core_cfg self.config_folder = cfg_folder @@ -18,47 +19,57 @@ class TitleServlet(): self.logger = logging.getLogger("title") if not hasattr(self.logger, "initialized"): log_fmt_str = "[%(asctime)s] Title | %(levelname)s | %(message)s" - log_fmt = logging.Formatter(log_fmt_str) + log_fmt = logging.Formatter(log_fmt_str) - fileHandler = TimedRotatingFileHandler("{0}/{1}.log".format(self.config.server.log_dir, "title"), when="d", backupCount=10) + fileHandler = TimedRotatingFileHandler( + "{0}/{1}.log".format(self.config.server.log_dir, "title"), + when="d", + backupCount=10, + ) fileHandler.setFormatter(log_fmt) - + consoleHandler = logging.StreamHandler() consoleHandler.setFormatter(log_fmt) self.logger.addHandler(fileHandler) self.logger.addHandler(consoleHandler) - + self.logger.setLevel(core_cfg.title.loglevel) - coloredlogs.install(level=core_cfg.title.loglevel, logger=self.logger, fmt=log_fmt_str) + coloredlogs.install( + level=core_cfg.title.loglevel, logger=self.logger, fmt=log_fmt_str + ) self.logger.initialized = True - + plugins = Utils.get_all_titles() - + for folder, mod in plugins.items(): if hasattr(mod, "game_codes") and hasattr(mod, "index"): should_call_setup = True - - if hasattr(mod.index, "get_allnet_info"): + + 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) + enabled, _, _ = mod.index.get_allnet_info( + code, self.config, self.config_folder + ) 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.warn(f"Game {folder} has no get_allnet_info") - + else: 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 {core_cfg.title.port}") + self.logger.info( + f"Serving {len(self.title_registry)} game codes on port {core_cfg.title.port}" + ) def render_GET(self, request: Request, endpoints: dict) -> bytes: code = endpoints["game"] @@ -66,7 +77,7 @@ class TitleServlet(): self.logger.warn(f"Unknown game code {code}") request.setResponseCode(404) return b"" - + index = self.title_registry[code] if not hasattr(index, "render_GET"): self.logger.warn(f"{code} does not dispatch GET") @@ -74,18 +85,20 @@ class TitleServlet(): return b"" return index.render_GET(request, endpoints["version"], endpoints["endpoint"]) - + def render_POST(self, request: Request, endpoints: dict) -> bytes: code = endpoints["game"] if code not in self.title_registry: self.logger.warn(f"Unknown game code {code}") request.setResponseCode(404) return b"" - + index = self.title_registry[code] if not hasattr(index, "render_POST"): self.logger.warn(f"{code} does not dispatch POST") request.setResponseCode(405) return b"" - return index.render_POST(request, int(endpoints["version"]), endpoints["endpoint"]) + return index.render_POST( + request, int(endpoints["version"]), endpoints["endpoint"] + ) diff --git a/core/utils.py b/core/utils.py index d4b7f16..24417bb 100644 --- a/core/utils.py +++ b/core/utils.py @@ -4,13 +4,14 @@ import logging import importlib from os import walk + class Utils: @classmethod def get_all_titles(cls) -> Dict[str, ModuleType]: ret: Dict[str, Any] = {} for root, dirs, files in walk("titles"): - for dir in dirs: + for dir in dirs: if not dir.startswith("__"): try: mod = importlib.import_module(f"titles.{dir}") diff --git a/dbutils.py b/dbutils.py index a2aa36b..ea9555a 100644 --- a/dbutils.py +++ b/dbutils.py @@ -4,16 +4,30 @@ from core.config import CoreConfig from core.data import Data from os import path -if __name__=='__main__': +if __name__ == "__main__": parser = argparse.ArgumentParser(description="Database utilities") - parser.add_argument("--config", "-c", type=str, help="Config folder to use", default="config") - parser.add_argument("--version", "-v", type=str, help="Version of the database to upgrade/rollback to") - parser.add_argument("--game", "-g", type=str, help="Game code of the game who's schema will be updated/rolled back. Ex. SDFE") + parser.add_argument( + "--config", "-c", type=str, help="Config folder to use", default="config" + ) + parser.add_argument( + "--version", + "-v", + type=str, + help="Version of the database to upgrade/rollback to", + ) + parser.add_argument( + "--game", + "-g", + type=str, + help="Game code of the game who's schema will be updated/rolled back. Ex. SDFE", + ) parser.add_argument("--email", "-e", type=str, help="Email for the new user") parser.add_argument("--old_ac", "-o", type=str, help="Access code to transfer from") parser.add_argument("--new_ac", "-n", type=str, help="Access code to transfer to") parser.add_argument("--force", "-f", type=bool, help="Force the action to happen") - parser.add_argument("action", type=str, help="DB Action, create, recreate, upgrade, or rollback") + parser.add_argument( + "action", type=str, help="DB Action, create, recreate, upgrade, or rollback" + ) args = parser.parse_args() cfg = CoreConfig() @@ -23,7 +37,7 @@ if __name__=='__main__': if args.action == "create": data.create_database() - + elif args.action == "recreate": data.recreate_database() diff --git a/index.py b/index.py index f545edb..d30d51f 100644 --- a/index.py +++ b/index.py @@ -12,6 +12,7 @@ from twisted.internet import reactor, endpoints from twisted.web.http import Request from routes import Mapper + class HttpDispatcher(resource.Resource): def __init__(self, cfg: CoreConfig, config_dir: str): super().__init__() @@ -20,73 +21,142 @@ class HttpDispatcher(resource.Resource): self.map_get = Mapper() self.map_post = Mapper() self.logger = logging.getLogger("core") - + self.allnet = AllnetServlet(cfg, config_dir) self.title = TitleServlet(cfg, config_dir) self.mucha = MuchaServlet(cfg, config_dir) - self.map_post.connect('allnet_ping', '/naomitest.html', controller="allnet", action='handle_naomitest', conditions=dict(method=['GET'])) - self.map_post.connect('allnet_poweron', '/sys/servlet/PowerOn', controller="allnet", action='handle_poweron', conditions=dict(method=['POST'])) - self.map_post.connect('allnet_downloadorder', '/sys/servlet/DownloadOrder', controller="allnet", action='handle_dlorder', conditions=dict(method=['POST'])) - self.map_post.connect('allnet_billing', '/request', controller="allnet", action='handle_billing_request', conditions=dict(method=['POST'])) - self.map_post.connect('allnet_billing', '/request/', controller="allnet", action='handle_billing_request', conditions=dict(method=['POST'])) + self.map_post.connect( + "allnet_ping", + "/naomitest.html", + controller="allnet", + action="handle_naomitest", + conditions=dict(method=["GET"]), + ) + self.map_post.connect( + "allnet_poweron", + "/sys/servlet/PowerOn", + controller="allnet", + action="handle_poweron", + conditions=dict(method=["POST"]), + ) + self.map_post.connect( + "allnet_downloadorder", + "/sys/servlet/DownloadOrder", + controller="allnet", + action="handle_dlorder", + conditions=dict(method=["POST"]), + ) + self.map_post.connect( + "allnet_billing", + "/request", + controller="allnet", + action="handle_billing_request", + conditions=dict(method=["POST"]), + ) + self.map_post.connect( + "allnet_billing", + "/request/", + controller="allnet", + action="handle_billing_request", + conditions=dict(method=["POST"]), + ) - self.map_post.connect('mucha_boardauth', '/mucha/boardauth.do', controller="mucha", action='handle_boardauth', conditions=dict(method=['POST'])) - self.map_post.connect('mucha_updatacheck', '/mucha/updatacheck.do', controller="mucha", action='handle_updatacheck', conditions=dict(method=['POST'])) + self.map_post.connect( + "mucha_boardauth", + "/mucha/boardauth.do", + controller="mucha", + action="handle_boardauth", + conditions=dict(method=["POST"]), + ) + self.map_post.connect( + "mucha_updatacheck", + "/mucha/updatacheck.do", + controller="mucha", + action="handle_updatacheck", + conditions=dict(method=["POST"]), + ) - 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...")) + 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: + def render_GET(self, request: Request) -> bytes: test = self.map_get.match(request.uri.decode()) if test is None: - self.logger.debug(f"Unknown GET endpoint {request.uri.decode()} from {request.getClientAddress().host} to port {request.getHost().port}") + self.logger.debug( + f"Unknown GET endpoint {request.uri.decode()} from {request.getClientAddress().host} to port {request.getHost().port}" + ) request.setResponseCode(404) return b"Endpoint not found." return self.dispatch(test, request) - def render_POST(self, request: Request) -> bytes: + def render_POST(self, request: Request) -> bytes: test = self.map_post.match(request.uri.decode()) if test is None: - self.logger.debug(f"Unknown POST endpoint {request.uri.decode()} from {request.getClientAddress().host} to port {request.getHost().port}") + self.logger.debug( + f"Unknown POST endpoint {request.uri.decode()} from {request.getClientAddress().host} to port {request.getHost().port}" + ) request.setResponseCode(404) return b"Endpoint not found." - + return self.dispatch(test, request) def dispatch(self, matcher: Dict, request: Request) -> bytes: controller = getattr(self, matcher["controller"], None) if controller is None: - self.logger.error(f"Controller {matcher['controller']} not found via endpoint {request.uri.decode()}") + self.logger.error( + f"Controller {matcher['controller']} not found via endpoint {request.uri.decode()}" + ) request.setResponseCode(404) return b"Endpoint not found." - + handler = getattr(controller, matcher["action"], None) if handler is None: - self.logger.error(f"Action {matcher['action']} not found in controller {matcher['controller']} via endpoint {request.uri.decode()}") + self.logger.error( + f"Action {matcher['action']} not found in controller {matcher['controller']} via endpoint {request.uri.decode()}" + ) request.setResponseCode(404) return b"Endpoint not found." - + url_vars = matcher url_vars.pop("controller") url_vars.pop("action") ret = handler(request, url_vars) - + if type(ret) == str: return ret.encode() elif type(ret) == bytes: return ret else: return b"" - + + if __name__ == "__main__": parser = argparse.ArgumentParser(description="ARTEMiS main entry point") - parser.add_argument("--config", "-c", type=str, default="config", help="Configuration folder") + parser.add_argument( + "--config", "-c", type=str, default="config", help="Configuration folder" + ) args = parser.parse_args() if not path.exists(f"{args.config}/core.yaml"): - print(f"The config folder you specified ({args.config}) does not exist or does not contain core.yaml.\nDid you copy the example folder?") + print( + f"The config folder you specified ({args.config}) does not exist or does not contain core.yaml.\nDid you copy the example folder?" + ) exit(1) cfg: CoreConfig = CoreConfig() @@ -95,56 +165,74 @@ if __name__ == "__main__": logger = logging.getLogger("core") log_fmt_str = "[%(asctime)s] Core | %(levelname)s | %(message)s" - log_fmt = logging.Formatter(log_fmt_str) + log_fmt = logging.Formatter(log_fmt_str) - fileHandler = TimedRotatingFileHandler("{0}/{1}.log".format(cfg.server.log_dir, "core"), when="d", backupCount=10) + fileHandler = TimedRotatingFileHandler( + "{0}/{1}.log".format(cfg.server.log_dir, "core"), when="d", backupCount=10 + ) fileHandler.setFormatter(log_fmt) - + consoleHandler = logging.StreamHandler() consoleHandler.setFormatter(log_fmt) logger.addHandler(fileHandler) logger.addHandler(consoleHandler) - + log_lv = logging.DEBUG if cfg.server.is_develop else logging.INFO logger.setLevel(log_lv) coloredlogs.install(level=log_lv, logger=logger, fmt=log_fmt_str) if not path.exists(cfg.server.log_dir): mkdir(cfg.server.log_dir) - + if not access(cfg.server.log_dir, W_OK): - logger.error(f"Log directory {cfg.server.log_dir} NOT writable, please check permissions") + logger.error( + f"Log directory {cfg.server.log_dir} NOT writable, please check permissions" + ) exit(1) if not cfg.aimedb.key: logger.error("!!AIMEDB KEY BLANK, SET KEY IN CORE.YAML!!") exit(1) - - logger.info(f"ARTEMiS starting in {'develop' if cfg.server.is_develop else 'production'} mode") - allnet_server_str = f"tcp:{cfg.allnet.port}:interface={cfg.server.listen_address}" + logger.info( + f"ARTEMiS starting in {'develop' if cfg.server.is_develop else 'production'} mode" + ) + + 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}" 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}" + frontend_server_str = ( + f"tcp:{cfg.frontend.port}:interface={cfg.server.listen_address}" + ) billing_server_str = f"tcp:{cfg.billing.port}:interface={cfg.server.listen_address}" if cfg.server.is_develop: - billing_server_str = f"ssl:{cfg.billing.port}:interface={cfg.server.listen_address}"\ + billing_server_str = ( + f"ssl:{cfg.billing.port}:interface={cfg.server.listen_address}" f":privateKey={cfg.billing.ssl_key}:certKey={cfg.billing.ssl_cert}" - + ) + dispatcher = HttpDispatcher(cfg, args.config) - endpoints.serverFromString(reactor, allnet_server_str).listen(server.Site(dispatcher)) + endpoints.serverFromString(reactor, allnet_server_str).listen( + server.Site(dispatcher) + ) endpoints.serverFromString(reactor, adb_server_str).listen(AimedbFactory(cfg)) if cfg.frontend.enable: - endpoints.serverFromString(reactor, frontend_server_str).listen(server.Site(FrontendServlet(cfg, args.config))) + endpoints.serverFromString(reactor, frontend_server_str).listen( + server.Site(FrontendServlet(cfg, args.config)) + ) if cfg.billing.port > 0: - endpoints.serverFromString(reactor, billing_server_str).listen(server.Site(dispatcher)) - - if cfg.title.port > 0: - endpoints.serverFromString(reactor, title_server_str).listen(server.Site(dispatcher)) - - reactor.run() # type: ignore \ No newline at end of file + endpoints.serverFromString(reactor, billing_server_str).listen( + server.Site(dispatcher) + ) + + if cfg.title.port > 0: + endpoints.serverFromString(reactor, title_server_str).listen( + server.Site(dispatcher) + ) + + reactor.run() # type: ignore diff --git a/read.py b/read.py index 1f89cb6..538198a 100644 --- a/read.py +++ b/read.py @@ -12,56 +12,64 @@ from typing import List, Optional from core import CoreConfig from core.utils import Utils -class BaseReader(): - def __init__(self, config: CoreConfig, version: int, bin_dir: Optional[str], opt_dir: Optional[str], extra: Optional[str]) -> None: + +class BaseReader: + def __init__( + self, + config: CoreConfig, + version: int, + bin_dir: Optional[str], + opt_dir: Optional[str], + extra: Optional[str], + ) -> None: self.logger = logging.getLogger("reader") self.config = config self.bin_dir = bin_dir self.opt_dir = opt_dir self.version = version self.extra = extra - - + def get_data_directories(self, directory: str) -> List[str]: ret: List[str] = [] for root, dirs, files in os.walk(directory): - for dir in dirs: - if re.fullmatch("[A-Z0-9]{4,4}", dir) is not None: - ret.append(f"{root}/{dir}") - + for dir in dirs: + if re.fullmatch("[A-Z0-9]{4,4}", dir) is not None: + ret.append(f"{root}/{dir}") + return ret + if __name__ == "__main__": - parser = argparse.ArgumentParser(description='Import Game Information') + parser = argparse.ArgumentParser(description="Import Game Information") parser.add_argument( - '--series', - action='store', + "--series", + action="store", type=str, required=True, - help='The game series we are importing.', + help="The game series we are importing.", ) parser.add_argument( - '--version', - dest='version', - action='store', + "--version", + dest="version", + action="store", type=int, required=True, - help='The game version we are importing.', + help="The game version we are importing.", ) parser.add_argument( - '--binfolder', - dest='bin', - action='store', + "--binfolder", + dest="bin", + action="store", type=str, - help='Folder containing A000 base data', + help="Folder containing A000 base data", ) parser.add_argument( - '--optfolder', - dest='opt', - action='store', + "--optfolder", + dest="opt", + action="store", type=str, - help='Folder containing Option data folders', + help="Folder containing Option data folders", ) parser.add_argument( "--config", @@ -86,15 +94,17 @@ if __name__ == "__main__": log_fmt = logging.Formatter(log_fmt_str) logger = logging.getLogger("reader") - fileHandler = TimedRotatingFileHandler("{0}/{1}.log".format(config.server.log_dir, "reader"), when="d", backupCount=10) + fileHandler = TimedRotatingFileHandler( + "{0}/{1}.log".format(config.server.log_dir, "reader"), when="d", backupCount=10 + ) fileHandler.setFormatter(log_fmt) - + consoleHandler = logging.StreamHandler() consoleHandler.setFormatter(log_fmt) logger.addHandler(fileHandler) logger.addHandler(consoleHandler) - + log_lv = logging.DEBUG if config.server.is_develop else logging.INFO logger.setLevel(log_lv) coloredlogs.install(level=log_lv, logger=logger, fmt=log_fmt_str) @@ -102,8 +112,8 @@ if __name__ == "__main__": if args.series is None or args.version is None: logger.error("Game or version not specified") parser.print_help() - exit(1) - + exit(1) + if args.bin is None and args.opt is None: logger.error("Must specify either bin or opt directory") parser.print_help() @@ -113,7 +123,7 @@ if __name__ == "__main__": bin_arg = args.bin[:-1] else: bin_arg = args.bin - + if args.opt is not None and (args.opt.endswith("\\") or args.opt.endswith("/")): opt_arg = args.opt[:-1] else: @@ -127,5 +137,5 @@ if __name__ == "__main__": if args.series in mod.game_codes: handler = mod.reader(config, args.version, bin_arg, opt_arg, args.extra) handler.read() - + logger.info("Done") diff --git a/titles/chuni/air.py b/titles/chuni/air.py index 46f8337..b9bc1d3 100644 --- a/titles/chuni/air.py +++ b/titles/chuni/air.py @@ -5,12 +5,13 @@ from titles.chuni.base import ChuniBase from titles.chuni.const import ChuniConstants from titles.chuni.config import ChuniConfig + class ChuniAir(ChuniBase): def __init__(self, core_cfg: CoreConfig, game_cfg: ChuniConfig) -> None: super().__init__(core_cfg, game_cfg) self.version = ChuniConstants.VER_CHUNITHM_AIR - + def handle_get_game_setting_api_request(self, data: Dict) -> Dict: - ret = super().handle_get_game_setting_api_request(data) + ret = super().handle_get_game_setting_api_request(data) ret["gameSetting"]["dataVersion"] = "1.10.00" - return ret \ No newline at end of file + return ret diff --git a/titles/chuni/airplus.py b/titles/chuni/airplus.py index 77498fb..f0d8224 100644 --- a/titles/chuni/airplus.py +++ b/titles/chuni/airplus.py @@ -5,12 +5,13 @@ from titles.chuni.base import ChuniBase from titles.chuni.const import ChuniConstants from titles.chuni.config import ChuniConfig + class ChuniAirPlus(ChuniBase): def __init__(self, core_cfg: CoreConfig, game_cfg: ChuniConfig) -> None: super().__init__(core_cfg, game_cfg) self.version = ChuniConstants.VER_CHUNITHM_AIR_PLUS - + def handle_get_game_setting_api_request(self, data: Dict) -> Dict: - ret = super().handle_get_game_setting_api_request(data) + ret = super().handle_get_game_setting_api_request(data) ret["gameSetting"]["dataVersion"] = "1.15.00" - return ret \ No newline at end of file + return ret diff --git a/titles/chuni/amazon.py b/titles/chuni/amazon.py index d822665..b765c2f 100644 --- a/titles/chuni/amazon.py +++ b/titles/chuni/amazon.py @@ -7,12 +7,13 @@ from titles.chuni.base import ChuniBase from titles.chuni.const import ChuniConstants from titles.chuni.config import ChuniConfig + class ChuniAmazon(ChuniBase): def __init__(self, core_cfg: CoreConfig, game_cfg: ChuniConfig) -> None: super().__init__(core_cfg, game_cfg) self.version = ChuniConstants.VER_CHUNITHM_AMAZON - + def handle_get_game_setting_api_request(self, data: Dict) -> Dict: - ret = super().handle_get_game_setting_api_request(data) + ret = super().handle_get_game_setting_api_request(data) ret["gameSetting"]["dataVersion"] = "1.30.00" return ret diff --git a/titles/chuni/amazonplus.py b/titles/chuni/amazonplus.py index 5e901cd..ea8d704 100644 --- a/titles/chuni/amazonplus.py +++ b/titles/chuni/amazonplus.py @@ -7,12 +7,13 @@ from titles.chuni.base import ChuniBase from titles.chuni.const import ChuniConstants from titles.chuni.config import ChuniConfig + class ChuniAmazonPlus(ChuniBase): def __init__(self, core_cfg: CoreConfig, game_cfg: ChuniConfig) -> None: super().__init__(core_cfg, game_cfg) self.version = ChuniConstants.VER_CHUNITHM_AMAZON_PLUS - + def handle_get_game_setting_api_request(self, data: Dict) -> Dict: - ret = super().handle_get_game_setting_api_request(data) + ret = super().handle_get_game_setting_api_request(data) ret["gameSetting"]["dataVersion"] = "1.35.00" return ret diff --git a/titles/chuni/base.py b/titles/chuni/base.py index 65d991d..f66eac8 100644 --- a/titles/chuni/base.py +++ b/titles/chuni/base.py @@ -11,7 +11,8 @@ from titles.chuni.const import ChuniConstants from titles.chuni.database import ChuniData from titles.chuni.config import ChuniConfig -class ChuniBase(): + +class ChuniBase: def __init__(self, core_cfg: CoreConfig, game_cfg: ChuniConfig) -> None: self.core_cfg = core_cfg self.game_cfg = game_cfg @@ -22,32 +23,31 @@ class ChuniBase(): self.version = ChuniConstants.VER_CHUNITHM def handle_game_login_api_request(self, data: Dict) -> Dict: - #self.data.base.log_event("chuni", "login", logging.INFO, {"version": self.version, "user": data["userId"]}) - return { "returnCode": 1 } - + # self.data.base.log_event("chuni", "login", logging.INFO, {"version": self.version, "user": data["userId"]}) + return {"returnCode": 1} + def handle_game_logout_api_request(self, data: Dict) -> Dict: - #self.data.base.log_event("chuni", "logout", logging.INFO, {"version": self.version, "user": data["userId"]}) - return { "returnCode": 1 } + # self.data.base.log_event("chuni", "logout", logging.INFO, {"version": self.version, "user": data["userId"]}) + return {"returnCode": 1} def handle_get_game_charge_api_request(self, data: Dict) -> Dict: game_charge_list = self.data.static.get_enabled_charges(self.version) charges = [] - for x in range(len(game_charge_list)): - charges.append({ - "orderId": x, - "chargeId": game_charge_list[x]["chargeId"], - "price": 1, - "startDate": "2017-12-05 07:00:00.0", - "endDate": "2099-12-31 00:00:00.0", - "salePrice": 1, - "saleStartDate": "2017-12-05 07:00:00.0", - "saleEndDate": "2099-12-31 00:00:00.0" - }) - return { - "length": len(charges), - "gameChargeList": charges - } + for x in range(len(game_charge_list)): + charges.append( + { + "orderId": x, + "chargeId": game_charge_list[x]["chargeId"], + "price": 1, + "startDate": "2017-12-05 07:00:00.0", + "endDate": "2099-12-31 00:00:00.0", + "salePrice": 1, + "saleStartDate": "2017-12-05 07:00:00.0", + "saleEndDate": "2099-12-31 00:00:00.0", + } + ) + return {"length": len(charges), "gameChargeList": charges} def handle_get_game_event_api_request(self, data: Dict) -> Dict: game_events = self.data.static.get_enabled_events(self.version) @@ -62,26 +62,30 @@ class ChuniBase(): event_list.append(tmp) return { - "type": data["type"], - "length": len(event_list), - "gameEventList": event_list + "type": data["type"], + "length": len(event_list), + "gameEventList": event_list, } def handle_get_game_idlist_api_request(self, data: Dict) -> Dict: - return { "type": data["type"], "length": 0, "gameIdlistList": [] } + return {"type": data["type"], "length": 0, "gameIdlistList": []} def handle_get_game_message_api_request(self, data: Dict) -> Dict: - return { "type": data["type"], "length": "0", "gameMessageList": [] } + return {"type": data["type"], "length": "0", "gameMessageList": []} def handle_get_game_ranking_api_request(self, data: Dict) -> Dict: - return { "type": data["type"], "gameRankingList": [] } + return {"type": data["type"], "gameRankingList": []} def handle_get_game_sale_api_request(self, data: Dict) -> Dict: - return { "type": data["type"], "length": 0, "gameSaleList": [] } + return {"type": data["type"], "length": 0, "gameSaleList": []} def handle_get_game_setting_api_request(self, data: Dict) -> Dict: - 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) + 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", @@ -94,15 +98,17 @@ class ChuniBase(): "maxCountItem": 300, "maxCountMusic": 300, }, - "isDumpUpload": "false", - "isAou": "false", + "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"]) - + user_activity_list = self.data.profile.get_profile_activity( + data["userId"], data["kind"] + ) + activity_list = [] - + for activity in user_activity_list: tmp = activity._asdict() tmp.pop("user") @@ -111,15 +117,16 @@ class ChuniBase(): activity_list.append(tmp) return { - "userId": data["userId"], - "length": len(activity_list), - "kind": data["kind"], - "userActivityList": activity_list + "userId": data["userId"], + "length": len(activity_list), + "kind": data["kind"], + "userActivityList": activity_list, } def handle_get_user_character_api_request(self, data: Dict) -> Dict: characters = self.data.item.get_characters(data["userId"]) - if characters is None: return {} + if characters is None: + return {} next_idx = -1 characterList = [] @@ -131,15 +138,17 @@ class ChuniBase(): if len(characterList) >= int(data["maxCount"]): break - - if len(characterList) >= int(data["maxCount"]) and len(characters) > int(data["maxCount"]) + int(data["nextIndex"]): + + if len(characterList) >= int(data["maxCount"]) and len(characters) > int( + data["maxCount"] + ) + int(data["nextIndex"]): next_idx = int(data["maxCount"]) + int(data["nextIndex"]) + 1 - + return { - "userId": data["userId"], + "userId": data["userId"], "length": len(characterList), - "nextIndex": next_idx, - "userCharacterList": characterList + "nextIndex": next_idx, + "userCharacterList": characterList, } def handle_get_user_charge_api_request(self, data: Dict) -> Dict: @@ -153,21 +162,21 @@ class ChuniBase(): charge_list.append(tmp) return { - "userId": data["userId"], + "userId": data["userId"], "length": len(charge_list), - "userChargeList": charge_list + "userChargeList": charge_list, } 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: + if user_course_list is None: return { - "userId": data["userId"], + "userId": data["userId"], "length": 0, - "nextIndex": -1, - "userCourseList": [] + "nextIndex": -1, + "userCourseList": [], } - + course_list = [] next_idx = int(data["nextIndex"]) max_ct = int(data["maxCount"]) @@ -180,51 +189,48 @@ class ChuniBase(): if len(user_course_list) >= max_ct: break - + if len(user_course_list) >= max_ct: next_idx = next_idx + max_ct else: next_idx = -1 - + return { - "userId": data["userId"], + "userId": data["userId"], "length": len(course_list), - "nextIndex": next_idx, - "userCourseList": course_list + "nextIndex": next_idx, + "userCourseList": course_list, } def handle_get_user_data_api_request(self, data: Dict) -> Dict: p = self.data.profile.get_profile_data(data["userId"], self.version) - if p is None: return {} + if p is None: + return {} profile = p._asdict() profile.pop("id") profile.pop("user") profile.pop("version") - return { - "userId": data["userId"], - "userData": profile - } + return {"userId": data["userId"], "userData": profile} def handle_get_user_data_ex_api_request(self, data: Dict) -> Dict: p = self.data.profile.get_profile_data_ex(data["userId"], self.version) - if p is None: return {} + if p is None: + return {} profile = p._asdict() profile.pop("id") profile.pop("user") profile.pop("version") - return { - "userId": data["userId"], - "userDataEx": profile - } + return {"userId": data["userId"], "userDataEx": profile} def handle_get_user_duel_api_request(self, data: Dict) -> Dict: user_duel_list = self.data.item.get_duels(data["userId"]) - if user_duel_list is None: return {} - + if user_duel_list is None: + return {} + duel_list = [] for duel in user_duel_list: tmp = duel._asdict() @@ -233,18 +239,18 @@ class ChuniBase(): duel_list.append(tmp) return { - "userId": data["userId"], + "userId": data["userId"], "length": len(duel_list), - "userDuelList": duel_list + "userDuelList": duel_list, } def handle_get_user_favorite_item_api_request(self, data: Dict) -> Dict: return { - "userId": data["userId"], + "userId": data["userId"], "length": 0, - "kind": data["kind"], - "nextIndex": -1, - "userFavoriteItemList": [] + "kind": data["kind"], + "nextIndex": -1, + "userFavoriteItemList": [], } def handle_get_user_favorite_music_api_request(self, data: Dict) -> Dict: @@ -252,22 +258,23 @@ class ChuniBase(): This is handled via the webui, which we don't have right now """ - return { - "userId": data["userId"], - "length": 0, - "userFavoriteMusicList": [] - } + return {"userId": data["userId"], "length": 0, "userFavoriteMusicList": []} def handle_get_user_item_api_request(self, data: Dict) -> Dict: kind = int(int(data["nextIndex"]) / 10000000000) next_idx = int(int(data["nextIndex"]) % 10000000000) user_item_list = self.data.item.get_items(data["userId"], kind) - if user_item_list is None or len(user_item_list) == 0: - return {"userId": data["userId"], "nextIndex": -1, "itemKind": kind, "userItemList": []} + if user_item_list is None or len(user_item_list) == 0: + return { + "userId": data["userId"], + "nextIndex": -1, + "itemKind": kind, + "userItemList": [], + } items: list[Dict[str, Any]] = [] - for i in range(next_idx, len(user_item_list)): + for i in range(next_idx, len(user_item_list)): tmp = user_item_list[i]._asdict() tmp.pop("user") tmp.pop("id") @@ -277,38 +284,47 @@ class ChuniBase(): xout = kind * 10000000000 + next_idx + len(items) - if len(items) < int(data["maxCount"]): nextIndex = 0 - else: nextIndex = xout + if len(items) < int(data["maxCount"]): + nextIndex = 0 + else: + nextIndex = xout - return {"userId": data["userId"], "nextIndex": nextIndex, "itemKind": kind, "length": len(items), "userItemList": items} + return { + "userId": data["userId"], + "nextIndex": nextIndex, + "itemKind": kind, + "length": len(items), + "userItemList": items, + } def handle_get_user_login_bonus_api_request(self, data: Dict) -> Dict: """ Unsure how to get this to trigger... """ return { - "userId": data["userId"], + "userId": data["userId"], "length": 2, "userLoginBonusList": [ { - "presetId": '10', - "bonusCount": '0', - "lastUpdateDate": "1970-01-01 09:00:00", - "isWatched": "true" + "presetId": "10", + "bonusCount": "0", + "lastUpdateDate": "1970-01-01 09:00:00", + "isWatched": "true", }, { - "presetId": '20', - "bonusCount": '0', - "lastUpdateDate": "1970-01-01 09:00:00", - "isWatched": "true" + "presetId": "20", + "bonusCount": "0", + "lastUpdateDate": "1970-01-01 09:00:00", + "isWatched": "true", }, - ] + ], } def handle_get_user_map_api_request(self, data: Dict) -> Dict: user_map_list = self.data.item.get_maps(data["userId"]) - if user_map_list is None: return {} - + if user_map_list is None: + return {} + map_list = [] for map in user_map_list: tmp = map._asdict() @@ -317,19 +333,19 @@ class ChuniBase(): map_list.append(tmp) return { - "userId": data["userId"], + "userId": data["userId"], "length": len(map_list), - "userMapList": map_list + "userMapList": map_list, } def handle_get_user_music_api_request(self, data: Dict) -> Dict: music_detail = self.data.score.get_scores(data["userId"]) - if music_detail is None: + if music_detail is None: return { - "userId": data["userId"], - "length": 0, + "userId": data["userId"], + "length": 0, "nextIndex": -1, - "userMusicList": [] #240 + "userMusicList": [], # 240 } song_list = [] next_idx = int(data["nextIndex"]) @@ -340,66 +356,60 @@ class ChuniBase(): tmp = music_detail[x]._asdict() tmp.pop("user") tmp.pop("id") - + for song in song_list: if song["userMusicDetailList"][0]["musicId"] == tmp["musicId"]: found = True song["userMusicDetailList"].append(tmp) song["length"] = len(song["userMusicDetailList"]) - + if not found: - song_list.append({ - "length": 1, - "userMusicDetailList": [tmp] - }) - + song_list.append({"length": 1, "userMusicDetailList": [tmp]}) + if len(song_list) >= max_ct: break - + if len(song_list) >= max_ct: next_idx += max_ct else: next_idx = 0 return { - "userId": data["userId"], - "length": len(song_list), + "userId": data["userId"], + "length": len(song_list), "nextIndex": next_idx, - "userMusicList": song_list #240 + "userMusicList": song_list, # 240 } def handle_get_user_option_api_request(self, data: Dict) -> Dict: p = self.data.profile.get_profile_option(data["userId"]) - + option = p._asdict() option.pop("id") option.pop("user") - return { - "userId": data["userId"], - "userGameOption": option - } + return {"userId": data["userId"], "userGameOption": option} def handle_get_user_option_ex_api_request(self, data: Dict) -> Dict: p = self.data.profile.get_profile_option_ex(data["userId"]) - + option = p._asdict() option.pop("id") option.pop("user") - return { - "userId": data["userId"], - "userGameOptionEx": option - } + return {"userId": data["userId"], "userGameOptionEx": option} def read_wtf8(self, src): return bytes([ord(c) for c in src]).decode("utf-8") def handle_get_user_preview_api_request(self, data: Dict) -> Dict: profile = self.data.profile.get_profile_preview(data["userId"], self.version) - if profile is None: return None - profile_character = self.data.item.get_character(data["userId"], profile["characterId"]) - + if profile is None: + return None + profile_character = self.data.item.get_character( + data["userId"], profile["characterId"] + ) + if profile_character is None: chara = {} else: @@ -408,8 +418,8 @@ class ChuniBase(): chara.pop("user") return { - "userId": data["userId"], - # Current Login State + "userId": data["userId"], + # Current Login State "isLogin": False, "lastLoginDate": profile["lastPlayDate"], # User Profile @@ -421,14 +431,14 @@ class ChuniBase(): "lastGameId": profile["lastGameId"], "lastRomVersion": profile["lastRomVersion"], "lastDataVersion": profile["lastDataVersion"], - "lastPlayDate": profile["lastPlayDate"], - "trophyId": profile["trophyId"], + "lastPlayDate": profile["lastPlayDate"], + "trophyId": profile["trophyId"], "nameplateId": profile["nameplateId"], # Current Selected Character "userCharacter": chara, # User Game Options - "playerLevel": profile["playerLevel"], - "rating": profile["rating"], + "playerLevel": profile["playerLevel"], + "rating": profile["rating"], "headphone": profile["headphone"], "chargeState": "1", "userNameEx": profile["userName"], @@ -436,7 +446,7 @@ class ChuniBase(): def handle_get_user_recent_rating_api_request(self, data: Dict) -> Dict: recet_rating_list = self.data.profile.get_profile_recent_rating(data["userId"]) - if recet_rating_list is None: + if recet_rating_list is None: return { "userId": data["userId"], "length": 0, @@ -459,11 +469,8 @@ class ChuniBase(): def handle_get_user_team_api_request(self, data: Dict) -> Dict: # TODO: Team - return { - "userId": data["userId"], - "teamId": 0 - } - + return {"userId": data["userId"], "teamId": 0} + def handle_get_team_course_setting_api_request(self, data: Dict) -> Dict: return { "userId": data["userId"], @@ -486,19 +493,30 @@ class ChuniBase(): if "userData" in upsert: try: - upsert["userData"][0]["userName"] = self.read_wtf8(upsert["userData"][0]["userName"]) - except: pass + upsert["userData"][0]["userName"] = self.read_wtf8( + upsert["userData"][0]["userName"] + ) + except: + pass - self.data.profile.put_profile_data(user_id, self.version, upsert["userData"][0]) + self.data.profile.put_profile_data( + user_id, self.version, upsert["userData"][0] + ) if "userDataEx" in upsert: - self.data.profile.put_profile_data_ex(user_id, self.version, upsert["userDataEx"][0]) + self.data.profile.put_profile_data_ex( + user_id, self.version, upsert["userDataEx"][0] + ) if "userGameOption" in upsert: self.data.profile.put_profile_option(user_id, upsert["userGameOption"][0]) if "userGameOptionEx" in upsert: - self.data.profile.put_profile_option_ex(user_id, upsert["userGameOptionEx"][0]) + self.data.profile.put_profile_option_ex( + user_id, upsert["userGameOptionEx"][0] + ) if "userRecentRatingList" in upsert: - self.data.profile.put_profile_recent_rating(user_id, upsert["userRecentRatingList"]) - + self.data.profile.put_profile_recent_rating( + user_id, upsert["userRecentRatingList"] + ) + if "userCharacterList" in upsert: for character in upsert["userCharacterList"]: self.data.item.put_character(user_id, character) @@ -514,7 +532,7 @@ class ChuniBase(): if "userDuelList" in upsert: for duel in upsert["userDuelList"]: self.data.item.put_duel(user_id, duel) - + if "userItemList" in upsert: for item in upsert["userItemList"]: self.data.item.put_item(user_id, item) @@ -522,23 +540,23 @@ class ChuniBase(): if "userActivityList" in upsert: for activity in upsert["userActivityList"]: self.data.profile.put_profile_activity(user_id, activity) - + if "userChargeList" in upsert: for charge in upsert["userChargeList"]: self.data.profile.put_profile_charge(user_id, charge) - + if "userMusicDetailList" in upsert: for song in upsert["userMusicDetailList"]: self.data.score.put_score(user_id, song) - + if "userPlaylogList" in upsert: for playlog in upsert["userPlaylogList"]: self.data.score.put_playlog(user_id, playlog) - + if "userTeamPoint" in upsert: # TODO: team stuff pass - + if "userMapAreaList" in upsert: for map_area in upsert["userMapAreaList"]: self.data.item.put_map_area(user_id, map_area) @@ -551,22 +569,22 @@ class ChuniBase(): for emoney in upsert["userEmoneyList"]: self.data.profile.put_profile_emoney(user_id, emoney) - return { "returnCode": "1" } + return {"returnCode": "1"} def handle_upsert_user_chargelog_api_request(self, data: Dict) -> Dict: - return { "returnCode": "1" } + return {"returnCode": "1"} def handle_upsert_client_bookkeeping_api_request(self, data: Dict) -> Dict: - return { "returnCode": "1" } + return {"returnCode": "1"} def handle_upsert_client_develop_api_request(self, data: Dict) -> Dict: - return { "returnCode": "1" } + return {"returnCode": "1"} def handle_upsert_client_error_api_request(self, data: Dict) -> Dict: - return { "returnCode": "1" } + return {"returnCode": "1"} def handle_upsert_client_setting_api_request(self, data: Dict) -> Dict: - return { "returnCode": "1" } + return {"returnCode": "1"} def handle_upsert_client_testmode_api_request(self, data: Dict) -> Dict: - return { "returnCode": "1" } + return {"returnCode": "1"} diff --git a/titles/chuni/config.py b/titles/chuni/config.py index f3a0a7e..c4a351f 100644 --- a/titles/chuni/config.py +++ b/titles/chuni/config.py @@ -1,36 +1,49 @@ from core.config import CoreConfig from typing import Dict -class ChuniServerConfig(): + +class ChuniServerConfig: def __init__(self, parent_config: "ChuniConfig") -> None: self.__config = parent_config - + @property def enable(self) -> bool: - return CoreConfig.get_config_field(self.__config, 'chuni', 'server', 'enable', default=True) - + return CoreConfig.get_config_field( + self.__config, "chuni", "server", "enable", default=True + ) + @property def loglevel(self) -> int: - return CoreConfig.str_to_loglevel(CoreConfig.get_config_field(self.__config, 'chuni', 'server', 'loglevel', default="info")) + return CoreConfig.str_to_loglevel( + CoreConfig.get_config_field( + self.__config, "chuni", "server", "loglevel", default="info" + ) + ) -class ChuniCryptoConfig(): + +class ChuniCryptoConfig: def __init__(self, parent_config: "ChuniConfig") -> None: self.__config = parent_config - + @property def keys(self) -> Dict: """ in the form of: - internal_version: [key, iv] + internal_version: [key, iv] all values are hex strings """ - return CoreConfig.get_config_field(self.__config, 'chuni', 'crypto', 'keys', default={}) + return CoreConfig.get_config_field( + self.__config, "chuni", "crypto", "keys", default={} + ) @property def encrypted_only(self) -> bool: - return CoreConfig.get_config_field(self.__config, 'chuni', 'crypto', 'encrypted_only', default=False) + return CoreConfig.get_config_field( + self.__config, "chuni", "crypto", "encrypted_only", default=False + ) + class ChuniConfig(dict): def __init__(self) -> None: self.server = ChuniServerConfig(self) - self.crypto = ChuniCryptoConfig(self) \ No newline at end of file + self.crypto = ChuniCryptoConfig(self) diff --git a/titles/chuni/const.py b/titles/chuni/const.py index 3a111f8..6ab3cc3 100644 --- a/titles/chuni/const.py +++ b/titles/chuni/const.py @@ -1,4 +1,4 @@ -class ChuniConstants(): +class ChuniConstants: GAME_CODE = "SDBT" GAME_CODE_NEW = "SDHD" @@ -8,7 +8,7 @@ class ChuniConstants(): VER_CHUNITHM_PLUS = 1 VER_CHUNITHM_AIR = 2 VER_CHUNITHM_AIR_PLUS = 3 - VER_CHUNITHM_STAR = 4 + VER_CHUNITHM_STAR = 4 VER_CHUNITHM_STAR_PLUS = 5 VER_CHUNITHM_AMAZON = 6 VER_CHUNITHM_AMAZON_PLUS = 7 @@ -18,8 +18,21 @@ class ChuniConstants(): VER_CHUNITHM_NEW = 11 VER_CHUNITHM_NEW_PLUS = 12 - VERSION_NAMES = ["Chunithm", "Chunithm+", "Chunithm Air", "Chunithm Air+", "Chunithm Star", "Chunithm Star+", "Chunithm Amazon", - "Chunithm Amazon+", "Chunithm Crystal", "Chunithm Crystal+", "Chunithm Paradise", "Chunithm New!!", "Chunithm New!!+"] + VERSION_NAMES = [ + "Chunithm", + "Chunithm+", + "Chunithm Air", + "Chunithm Air+", + "Chunithm Star", + "Chunithm Star+", + "Chunithm Amazon", + "Chunithm Amazon+", + "Chunithm Crystal", + "Chunithm Crystal+", + "Chunithm Paradise", + "Chunithm New!!", + "Chunithm New!!+", + ] @classmethod def game_ver_to_string(cls, ver: int): diff --git a/titles/chuni/crystal.py b/titles/chuni/crystal.py index d492f0b..a727ac3 100644 --- a/titles/chuni/crystal.py +++ b/titles/chuni/crystal.py @@ -7,12 +7,13 @@ from titles.chuni.base import ChuniBase from titles.chuni.const import ChuniConstants from titles.chuni.config import ChuniConfig + class ChuniCrystal(ChuniBase): def __init__(self, core_cfg: CoreConfig, game_cfg: ChuniConfig) -> None: super().__init__(core_cfg, game_cfg) self.version = ChuniConstants.VER_CHUNITHM_CRYSTAL - + def handle_get_game_setting_api_request(self, data: Dict) -> Dict: - ret = super().handle_get_game_setting_api_request(data) + ret = super().handle_get_game_setting_api_request(data) ret["gameSetting"]["dataVersion"] = "1.40.00" return ret diff --git a/titles/chuni/crystalplus.py b/titles/chuni/crystalplus.py index b06eb5b..fbb3969 100644 --- a/titles/chuni/crystalplus.py +++ b/titles/chuni/crystalplus.py @@ -7,12 +7,13 @@ from titles.chuni.base import ChuniBase from titles.chuni.const import ChuniConstants from titles.chuni.config import ChuniConfig + class ChuniCrystalPlus(ChuniBase): def __init__(self, core_cfg: CoreConfig, game_cfg: ChuniConfig) -> None: super().__init__(core_cfg, game_cfg) self.version = ChuniConstants.VER_CHUNITHM_CRYSTAL_PLUS - + def handle_get_game_setting_api_request(self, data: Dict) -> Dict: - ret = super().handle_get_game_setting_api_request(data) + ret = super().handle_get_game_setting_api_request(data) ret["gameSetting"]["dataVersion"] = "1.45.00" return ret diff --git a/titles/chuni/database.py b/titles/chuni/database.py index c55149b..eeb588c 100644 --- a/titles/chuni/database.py +++ b/titles/chuni/database.py @@ -2,6 +2,7 @@ from core.data import Data from core.config import CoreConfig from titles.chuni.schema import * + class ChuniData(Data): def __init__(self, cfg: CoreConfig) -> None: super().__init__(cfg) @@ -9,4 +10,4 @@ class ChuniData(Data): self.item = ChuniItemData(cfg, self.session) self.profile = ChuniProfileData(cfg, self.session) self.score = ChuniScoreData(cfg, self.session) - self.static = ChuniStaticData(cfg, self.session) \ No newline at end of file + self.static = ChuniStaticData(cfg, self.session) diff --git a/titles/chuni/index.py b/titles/chuni/index.py index 5ee03a4..a8b581e 100644 --- a/titles/chuni/index.py +++ b/titles/chuni/index.py @@ -28,12 +28,15 @@ from titles.chuni.paradise import ChuniParadise from titles.chuni.new import ChuniNew from titles.chuni.newplus import ChuniNewPlus -class ChuniServlet(): + +class ChuniServlet: def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None: self.core_cfg = core_cfg self.game_cfg = ChuniConfig() if path.exists(f"{cfg_dir}/{ChuniConstants.CONFIG_NAME}"): - self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{ChuniConstants.CONFIG_NAME}"))) + self.game_cfg.update( + yaml.safe_load(open(f"{cfg_dir}/{ChuniConstants.CONFIG_NAME}")) + ) self.versions = [ ChuniBase(core_cfg, self.game_cfg), @@ -56,33 +59,47 @@ class ChuniServlet(): if not hasattr(self.logger, "inited"): log_fmt_str = "[%(asctime)s] Chunithm | %(levelname)s | %(message)s" log_fmt = logging.Formatter(log_fmt_str) - fileHandler = TimedRotatingFileHandler("{0}/{1}.log".format(self.core_cfg.server.log_dir, "chuni"), encoding='utf8', - when="d", backupCount=10) + fileHandler = TimedRotatingFileHandler( + "{0}/{1}.log".format(self.core_cfg.server.log_dir, "chuni"), + encoding="utf8", + when="d", + backupCount=10, + ) fileHandler.setFormatter(log_fmt) - + consoleHandler = logging.StreamHandler() consoleHandler.setFormatter(log_fmt) self.logger.addHandler(fileHandler) self.logger.addHandler(consoleHandler) - + self.logger.setLevel(self.game_cfg.server.loglevel) - coloredlogs.install(level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str) + coloredlogs.install( + level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str + ) self.logger.inited = True @classmethod - def get_allnet_info(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: + def get_allnet_info( + cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str + ) -> Tuple[bool, str, str]: game_cfg = ChuniConfig() if path.exists(f"{cfg_dir}/{ChuniConstants.CONFIG_NAME}"): - game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{ChuniConstants.CONFIG_NAME}"))) + game_cfg.update( + yaml.safe_load(open(f"{cfg_dir}/{ChuniConstants.CONFIG_NAME}")) + ) if not game_cfg.server.enable: return (False, "", "") - + if core_cfg.server.is_develop: - return (True, f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/", "") - + return ( + True, + f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/", + "", + ) + return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", "") def render_POST(self, request: Request, version: int, url_path: str) -> bytes: @@ -95,67 +112,75 @@ class ChuniServlet(): internal_ver = 0 endpoint = url_split[len(url_split) - 1] - if version < 105: # 1.0 + if version < 105: # 1.0 internal_ver = ChuniConstants.VER_CHUNITHM - elif version >= 105 and version < 110: # Plus + elif version >= 105 and version < 110: # Plus internal_ver = ChuniConstants.VER_CHUNITHM_PLUS - elif version >= 110 and version < 115: # Air + elif version >= 110 and version < 115: # Air internal_ver = ChuniConstants.VER_CHUNITHM_AIR - elif version >= 115 and version < 120: # Air Plus + elif version >= 115 and version < 120: # Air Plus internal_ver = ChuniConstants.VER_CHUNITHM_AIR_PLUS - elif version >= 120 and version < 125: # Star + elif version >= 120 and version < 125: # Star internal_ver = ChuniConstants.VER_CHUNITHM_STAR - elif version >= 125 and version < 130: # Star Plus + elif version >= 125 and version < 130: # Star Plus internal_ver = ChuniConstants.VER_CHUNITHM_STAR_PLUS - elif version >= 130 and version < 135: # Amazon + elif version >= 130 and version < 135: # Amazon internal_ver = ChuniConstants.VER_CHUNITHM_AMAZON - elif version >= 135 and version < 140: # Amazon Plus + elif version >= 135 and version < 140: # Amazon Plus internal_ver = ChuniConstants.VER_CHUNITHM_AMAZON_PLUS - elif version >= 140 and version < 145: # Crystal + elif version >= 140 and version < 145: # Crystal internal_ver = ChuniConstants.VER_CHUNITHM_CRYSTAL - elif version >= 145 and version < 150: # Crystal Plus + elif version >= 145 and version < 150: # Crystal Plus internal_ver = ChuniConstants.VER_CHUNITHM_CRYSTAL_PLUS - elif version >= 150 and version < 200: # Paradise + elif version >= 150 and version < 200: # Paradise internal_ver = ChuniConstants.VER_CHUNITHM_PARADISE - elif version >= 200 and version < 205: # New + elif version >= 200 and version < 205: # New internal_ver = ChuniConstants.VER_CHUNITHM_NEW - elif version >= 205 and version < 210: # New Plus + elif version >= 205 and version < 210: # New Plus internal_ver = ChuniConstants.VER_CHUNITHM_NEW_PLUS if all(c in string.hexdigits for c in endpoint) and len(endpoint) == 32: - # If we get a 32 character long hex string, it's a hash and we're - # doing encrypted. The likelyhood of false positives is low but + # If we get a 32 character long hex string, it's a hash and we're + # doing encrypted. The likelyhood of false positives is low but # technically not 0 endpoint = request.getHeader("User-Agent").split("#")[0] try: crypt = AES.new( - bytes.fromhex(self.game_cfg.crypto.keys[str(internal_ver)][0]), - AES.MODE_CBC, - bytes.fromhex(self.game_cfg.crypto.keys[str(internal_ver)][1]) + bytes.fromhex(self.game_cfg.crypto.keys[str(internal_ver)][0]), + AES.MODE_CBC, + bytes.fromhex(self.game_cfg.crypto.keys[str(internal_ver)][1]), ) req_raw = crypt.decrypt(req_raw) except: - self.logger.error(f"Failed to decrypt v{version} request to {endpoint} -> {req_raw}") + self.logger.error( + f"Failed to decrypt v{version} request to {endpoint} -> {req_raw}" + ) return zlib.compress(b'{"stat": "0"}') encrtped = True - + if not encrtped and self.game_cfg.crypto.encrypted_only: - self.logger.error(f"Unencrypted v{version} {endpoint} request, but config is set to encrypted only: {req_raw}") + self.logger.error( + f"Unencrypted v{version} {endpoint} request, but config is set to encrypted only: {req_raw}" + ) return zlib.compress(b'{"stat": "0"}') - try: + try: unzip = zlib.decompress(req_raw) - + except zlib.error as e: - self.logger.error(f"Failed to decompress v{version} {endpoint} request -> {e}") + self.logger.error( + f"Failed to decompress v{version} {endpoint} request -> {e}" + ) return b"" - + req_data = json.loads(unzip) - - self.logger.info(f"v{version} {endpoint} request from {request.getClientAddress().host}") + + self.logger.info( + f"v{version} {endpoint} request from {request.getClientAddress().host}" + ) self.logger.debug(req_data) func_to_find = "handle_" + inflection.underscore(endpoint) + "_request" @@ -163,9 +188,8 @@ class ChuniServlet(): if not hasattr(self.versions[internal_ver], func_to_find): self.logger.warning(f"Unhandled v{version} request {endpoint}") resp = {"returnCode": 1} - - else: + else: try: handler = getattr(self.versions[internal_ver], func_to_find) resp = handler(req_data) @@ -173,23 +197,23 @@ class ChuniServlet(): except Exception as e: self.logger.error(f"Error handling v{version} method {endpoint} - {e}") return zlib.compress(b'{"stat": "0"}') - + if resp == None: - resp = {'returnCode': 1} - + resp = {"returnCode": 1} + self.logger.debug(f"Response {resp}") - + zipped = zlib.compress(json.dumps(resp, ensure_ascii=False).encode("utf-8")) - + if not encrtped: return zipped padded = pad(zipped, 16) crypt = AES.new( - bytes.fromhex(self.game_cfg.crypto.keys[str(internal_ver)][0]), - AES.MODE_CBC, - bytes.fromhex(self.game_cfg.crypto.keys[str(internal_ver)][1]) + bytes.fromhex(self.game_cfg.crypto.keys[str(internal_ver)][0]), + AES.MODE_CBC, + bytes.fromhex(self.game_cfg.crypto.keys[str(internal_ver)][1]), ) return crypt.encrypt(padded) diff --git a/titles/chuni/new.py b/titles/chuni/new.py index 4b5ba2d..03ad305 100644 --- a/titles/chuni/new.py +++ b/titles/chuni/new.py @@ -9,13 +9,9 @@ from titles.chuni.database import ChuniData from titles.chuni.base import ChuniBase from titles.chuni.config import ChuniConfig -class ChuniNew(ChuniBase): - ITEM_TYPE = { - "character": 20, - "story": 21, - "card": 22 - } +class ChuniNew(ChuniBase): + ITEM_TYPE = {"character": 20, "story": 21, "card": 22} def __init__(self, core_cfg: CoreConfig, game_cfg: ChuniConfig) -> None: self.core_cfg = core_cfg @@ -25,12 +21,20 @@ class ChuniNew(ChuniBase): self.logger = logging.getLogger("chuni") self.game = ChuniConstants.GAME_CODE self.version = ChuniConstants.VER_CHUNITHM_NEW - + def handle_get_game_setting_api_request(self, data: Dict) -> Dict: - match_start = datetime.strftime(datetime.now() - timedelta(hours=10), self.date_time_format) - match_end = datetime.strftime(datetime.now() + timedelta(hours=10), self.date_time_format) - reboot_start = datetime.strftime(datetime.now() - timedelta(hours=11), self.date_time_format) - reboot_end = datetime.strftime(datetime.now() - timedelta(hours=10), self.date_time_format) + match_start = datetime.strftime( + datetime.now() - timedelta(hours=10), self.date_time_format + ) + match_end = datetime.strftime( + datetime.now() + timedelta(hours=10), self.date_time_format + ) + reboot_start = datetime.strftime( + datetime.now() - timedelta(hours=11), self.date_time_format + ) + reboot_end = datetime.strftime( + datetime.now() - timedelta(hours=10), self.date_time_format + ) return { "gameSetting": { "isMaintenance": "false", @@ -52,16 +56,16 @@ class ChuniNew(ChuniBase): "udpHolePunchUri": f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}/SDHD/200/ChuniServlet/", "reflectorUri": f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}/SDHD/200/ChuniServlet/", }, - "isDumpUpload": "false", - "isAou": "false", + "isDumpUpload": "false", + "isAou": "false", } - + def handle_delete_token_api_request(self, data: Dict) -> Dict: - return { "returnCode": "1" } - + return {"returnCode": "1"} + def handle_create_token_api_request(self, data: Dict) -> Dict: - return { "returnCode": "1" } - + return {"returnCode": "1"} + def handle_get_user_map_area_api_request(self, data: Dict) -> Dict: user_map_areas = self.data.item.get_map_areas(data["userId"]) @@ -72,32 +76,29 @@ class ChuniNew(ChuniBase): tmp.pop("user") map_areas.append(tmp) - return { - "userId": data["userId"], - "userMapAreaList": map_areas - } - + return {"userId": data["userId"], "userMapAreaList": map_areas} + def handle_get_user_symbol_chat_setting_api_request(self, data: Dict) -> Dict: - return { - "userId": data["userId"], - "symbolCharInfoList": [] - } + return {"userId": data["userId"], "symbolCharInfoList": []} def handle_get_user_preview_api_request(self, data: Dict) -> Dict: profile = self.data.profile.get_profile_preview(data["userId"], self.version) - if profile is None: return None - profile_character = self.data.item.get_character(data["userId"], profile["characterId"]) - + if profile is None: + return None + profile_character = self.data.item.get_character( + data["userId"], profile["characterId"] + ) + if profile_character is None: chara = {} else: chara = profile_character._asdict() chara.pop("id") chara.pop("user") - + data1 = { - "userId": data["userId"], - # Current Login State + "userId": data["userId"], + # Current Login State "isLogin": False, "lastLoginDate": profile["lastPlayDate"], # User Profile @@ -109,14 +110,14 @@ class ChuniNew(ChuniBase): "lastGameId": profile["lastGameId"], "lastRomVersion": profile["lastRomVersion"], "lastDataVersion": profile["lastDataVersion"], - "lastPlayDate": profile["lastPlayDate"], + "lastPlayDate": profile["lastPlayDate"], "emoneyBrandId": 0, - "trophyId": profile["trophyId"], + "trophyId": profile["trophyId"], # Current Selected Character "userCharacter": chara, # User Game Options - "playerLevel": profile["playerLevel"], - "rating": profile["rating"], + "playerLevel": profile["playerLevel"], + "rating": profile["rating"], "headphone": profile["headphone"], "chargeState": 0, "userNameEx": "0", diff --git a/titles/chuni/newplus.py b/titles/chuni/newplus.py index 7ebdc96..7e15985 100644 --- a/titles/chuni/newplus.py +++ b/titles/chuni/newplus.py @@ -7,17 +7,26 @@ from titles.chuni.new import ChuniNew from titles.chuni.const import ChuniConstants from titles.chuni.config import ChuniConfig + class ChuniNewPlus(ChuniNew): def __init__(self, core_cfg: CoreConfig, game_cfg: ChuniConfig) -> None: super().__init__(core_cfg, game_cfg) self.version = ChuniConstants.VER_CHUNITHM_NEW_PLUS - + def handle_get_game_setting_api_request(self, data: Dict) -> Dict: ret = super().handle_get_game_setting_api_request(data) ret["gameSetting"]["romVersion"] = "2.05.00" ret["gameSetting"]["dataVersion"] = "2.05.00" - ret["gameSetting"]["matchingUri"] = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}/SDHD/205/ChuniServlet/" - ret["gameSetting"]["matchingUriX"] = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}/SDHD/205/ChuniServlet/" - ret["gameSetting"]["udpHolePunchUri"] = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}/SDHD/205/ChuniServlet/" - ret["gameSetting"]["reflectorUri"] = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}/SDHD/205/ChuniServlet/" + ret["gameSetting"][ + "matchingUri" + ] = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}/SDHD/205/ChuniServlet/" + ret["gameSetting"][ + "matchingUriX" + ] = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}/SDHD/205/ChuniServlet/" + ret["gameSetting"][ + "udpHolePunchUri" + ] = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}/SDHD/205/ChuniServlet/" + ret["gameSetting"][ + "reflectorUri" + ] = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}/SDHD/205/ChuniServlet/" return ret diff --git a/titles/chuni/paradise.py b/titles/chuni/paradise.py index 19e92ca..19155d6 100644 --- a/titles/chuni/paradise.py +++ b/titles/chuni/paradise.py @@ -7,12 +7,13 @@ from titles.chuni.base import ChuniBase from titles.chuni.const import ChuniConstants from titles.chuni.config import ChuniConfig + class ChuniParadise(ChuniBase): def __init__(self, core_cfg: CoreConfig, game_cfg: ChuniConfig) -> None: super().__init__(core_cfg, game_cfg) self.version = ChuniConstants.VER_CHUNITHM_PARADISE - + def handle_get_game_setting_api_request(self, data: Dict) -> Dict: - ret = super().handle_get_game_setting_api_request(data) + ret = super().handle_get_game_setting_api_request(data) ret["gameSetting"]["dataVersion"] = "1.50.00" return ret diff --git a/titles/chuni/plus.py b/titles/chuni/plus.py index 492d4f6..62d9e0d 100644 --- a/titles/chuni/plus.py +++ b/titles/chuni/plus.py @@ -5,12 +5,13 @@ from titles.chuni.base import ChuniBase from titles.chuni.const import ChuniConstants from titles.chuni.config import ChuniConfig + class ChuniPlus(ChuniBase): def __init__(self, core_cfg: CoreConfig, game_cfg: ChuniConfig) -> None: super().__init__(core_cfg, game_cfg) self.version = ChuniConstants.VER_CHUNITHM_PLUS - + def handle_get_game_setting_api_request(self, data: Dict) -> Dict: - ret = super().handle_get_game_setting_api_request(data) + ret = super().handle_get_game_setting_api_request(data) ret["gameSetting"]["dataVersion"] = "1.05.00" - return ret \ No newline at end of file + return ret diff --git a/titles/chuni/read.py b/titles/chuni/read.py index 1a666e6..abf78e3 100644 --- a/titles/chuni/read.py +++ b/titles/chuni/read.py @@ -7,48 +7,60 @@ from core.config import CoreConfig from titles.chuni.database import ChuniData from titles.chuni.const import ChuniConstants + class ChuniReader(BaseReader): - def __init__(self, config: CoreConfig, version: int, bin_dir: Optional[str], opt_dir: Optional[str], extra: Optional[str]) -> None: + def __init__( + self, + config: CoreConfig, + version: int, + bin_dir: Optional[str], + opt_dir: Optional[str], + extra: Optional[str], + ) -> None: super().__init__(config, version, bin_dir, opt_dir, extra) self.data = ChuniData(config) try: - self.logger.info(f"Start importer for {ChuniConstants.game_ver_to_string(version)}") + self.logger.info( + f"Start importer for {ChuniConstants.game_ver_to_string(version)}" + ) except IndexError: self.logger.error(f"Invalid chunithm version {version}") exit(1) - + def read(self) -> None: data_dirs = [] if self.bin_dir is not None: data_dirs += self.get_data_directories(self.bin_dir) - + if self.opt_dir is not None: - data_dirs += self.get_data_directories(self.opt_dir) - + data_dirs += self.get_data_directories(self.opt_dir) + for dir in data_dirs: self.logger.info(f"Read from {dir}") self.read_events(f"{dir}/event") self.read_music(f"{dir}/music") self.read_charges(f"{dir}/chargeItem") self.read_avatar(f"{dir}/avatarAccessory") - + def read_events(self, evt_dir: str) -> None: for root, dirs, files in walk(evt_dir): for dir in dirs: if path.exists(f"{root}/{dir}/Event.xml"): - with open(f"{root}/{dir}/Event.xml", 'rb') as fp: + with open(f"{root}/{dir}/Event.xml", "rb") as fp: bytedata = fp.read() - strdata = bytedata.decode('UTF-8') + strdata = bytedata.decode("UTF-8") xml_root = ET.fromstring(strdata) - for name in xml_root.findall('name'): - id = name.find('id').text - name = name.find('str').text - for substances in xml_root.findall('substances'): - event_type = substances.find('type').text - - result = self.data.static.put_event(self.version, id, event_type, name) + for name in xml_root.findall("name"): + id = name.find("id").text + name = name.find("str").text + for substances in xml_root.findall("substances"): + event_type = substances.find("type").text + + result = self.data.static.put_event( + self.version, id, event_type, name + ) if result is not None: self.logger.info(f"Inserted event {id}") else: @@ -58,73 +70,90 @@ class ChuniReader(BaseReader): for root, dirs, files in walk(music_dir): for dir in dirs: if path.exists(f"{root}/{dir}/Music.xml"): - with open(f"{root}/{dir}/Music.xml", 'rb') as fp: + with open(f"{root}/{dir}/Music.xml", "rb") as fp: bytedata = fp.read() - strdata = bytedata.decode('UTF-8') + strdata = bytedata.decode("UTF-8") xml_root = ET.fromstring(strdata) - for name in xml_root.findall('name'): - song_id = name.find('id').text - title = name.find('str').text + for name in xml_root.findall("name"): + song_id = name.find("id").text + title = name.find("str").text - for artistName in xml_root.findall('artistName'): - artist = artistName.find('str').text + for artistName in xml_root.findall("artistName"): + artist = artistName.find("str").text - for genreNames in xml_root.findall('genreNames'): - for list_ in genreNames.findall('list'): - for StringID in list_.findall('StringID'): - genre = StringID.find('str').text + for genreNames in xml_root.findall("genreNames"): + for list_ in genreNames.findall("list"): + for StringID in list_.findall("StringID"): + genre = StringID.find("str").text - for jaketFile in xml_root.findall('jaketFile'): #nice typo, SEGA - jacket_path = jaketFile.find('path').text + for jaketFile in xml_root.findall("jaketFile"): # nice typo, SEGA + jacket_path = jaketFile.find("path").text + + for fumens in xml_root.findall("fumens"): + for MusicFumenData in fumens.findall("MusicFumenData"): + fumen_path = MusicFumenData.find("file").find("path") - for fumens in xml_root.findall('fumens'): - for MusicFumenData in fumens.findall('MusicFumenData'): - fumen_path = MusicFumenData.find('file').find("path") - if fumen_path is not None: - chart_id = MusicFumenData.find('type').find('id').text + chart_id = MusicFumenData.find("type").find("id").text if chart_id == "4": level = float(xml_root.find("starDifType").text) - we_chara = xml_root.find("worldsEndTagName").find("str").text + we_chara = ( + xml_root.find("worldsEndTagName") + .find("str") + .text + ) else: - level = float(f"{MusicFumenData.find('level').text}.{MusicFumenData.find('levelDecimal').text}") + level = float( + f"{MusicFumenData.find('level').text}.{MusicFumenData.find('levelDecimal').text}" + ) we_chara = None - + result = self.data.static.put_music( self.version, song_id, - chart_id, + chart_id, title, artist, level, genre, jacket_path, - we_chara + we_chara, ) if result is not None: - self.logger.info(f"Inserted music {song_id} chart {chart_id}") + self.logger.info( + f"Inserted music {song_id} chart {chart_id}" + ) else: - self.logger.warn(f"Failed to insert music {song_id} chart {chart_id}") + self.logger.warn( + f"Failed to insert music {song_id} chart {chart_id}" + ) def read_charges(self, charge_dir: str) -> None: for root, dirs, files in walk(charge_dir): for dir in dirs: if path.exists(f"{root}/{dir}/ChargeItem.xml"): - with open(f"{root}/{dir}/ChargeItem.xml", 'rb') as fp: + with open(f"{root}/{dir}/ChargeItem.xml", "rb") as fp: bytedata = fp.read() - strdata = bytedata.decode('UTF-8') + strdata = bytedata.decode("UTF-8") xml_root = ET.fromstring(strdata) - for name in xml_root.findall('name'): - id = name.find('id').text - name = name.find('str').text - expirationDays = xml_root.find('expirationDays').text - consumeType = xml_root.find('consumeType').text - sellingAppeal = bool(xml_root.find('sellingAppeal').text) + for name in xml_root.findall("name"): + id = name.find("id").text + name = name.find("str").text + expirationDays = xml_root.find("expirationDays").text + consumeType = xml_root.find("consumeType").text + sellingAppeal = bool(xml_root.find("sellingAppeal").text) - result = self.data.static.put_charge(self.version, id, name, expirationDays, consumeType, sellingAppeal) + result = self.data.static.put_charge( + self.version, + id, + name, + expirationDays, + consumeType, + sellingAppeal, + ) if result is not None: self.logger.info(f"Inserted charge {id}") @@ -135,21 +164,23 @@ class ChuniReader(BaseReader): for root, dirs, files in walk(avatar_dir): for dir in dirs: if path.exists(f"{root}/{dir}/AvatarAccessory.xml"): - with open(f"{root}/{dir}/AvatarAccessory.xml", 'rb') as fp: + with open(f"{root}/{dir}/AvatarAccessory.xml", "rb") as fp: bytedata = fp.read() - strdata = bytedata.decode('UTF-8') + strdata = bytedata.decode("UTF-8") xml_root = ET.fromstring(strdata) - for name in xml_root.findall('name'): - id = name.find('id').text - name = name.find('str').text - category = xml_root.find('category').text - for image in xml_root.findall('image'): - iconPath = image.find('path').text - for texture in xml_root.findall('texture'): - texturePath = texture.find('path').text + for name in xml_root.findall("name"): + id = name.find("id").text + name = name.find("str").text + category = xml_root.find("category").text + for image in xml_root.findall("image"): + iconPath = image.find("path").text + for texture in xml_root.findall("texture"): + texturePath = texture.find("path").text - result = self.data.static.put_avatar(self.version, id, name, category, iconPath, texturePath) + result = self.data.static.put_avatar( + self.version, id, name, category, iconPath, texturePath + ) if result is not None: self.logger.info(f"Inserted avatarAccessory {id}") diff --git a/titles/chuni/schema/__init__.py b/titles/chuni/schema/__init__.py index 18c408e..51d950b 100644 --- a/titles/chuni/schema/__init__.py +++ b/titles/chuni/schema/__init__.py @@ -3,4 +3,4 @@ from titles.chuni.schema.score import ChuniScoreData from titles.chuni.schema.item import ChuniItemData from titles.chuni.schema.static import ChuniStaticData -__all__ = ["ChuniProfileData", "ChuniScoreData", "ChuniItemData", "ChuniStaticData"] \ No newline at end of file +__all__ = ["ChuniProfileData", "ChuniScoreData", "ChuniItemData", "ChuniStaticData"] diff --git a/titles/chuni/schema/item.py b/titles/chuni/schema/item.py index 6973558..cc519fa 100644 --- a/titles/chuni/schema/item.py +++ b/titles/chuni/schema/item.py @@ -13,7 +13,11 @@ character = Table( "chuni_item_character", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("characterId", Integer), Column("level", Integer), Column("param1", Integer), @@ -26,27 +30,35 @@ character = Table( Column("assignIllust", Integer), Column("exMaxLv", Integer), UniqueConstraint("user", "characterId", name="chuni_item_character_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) item = Table( "chuni_item_item", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("itemId", Integer), Column("itemKind", Integer), Column("stock", Integer), Column("isValid", Boolean), UniqueConstraint("user", "itemId", "itemKind", name="chuni_item_item_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) duel = Table( "chuni_item_duel", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("duelId", Integer), Column("progress", Integer), Column("point", Integer), @@ -57,14 +69,18 @@ duel = Table( Column("param3", Integer), Column("param4", Integer), UniqueConstraint("user", "duelId", name="chuni_item_duel_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) map = Table( "chuni_item_map", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("mapId", Integer), Column("position", Integer), Column("isClear", Boolean), @@ -72,17 +88,21 @@ map = Table( Column("routeNumber", Integer), Column("eventId", Integer), Column("rate", Integer), - Column("statusCount", Integer), + Column("statusCount", Integer), Column("isValid", Boolean), UniqueConstraint("user", "mapId", name="chuni_item_map_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) map_area = Table( "chuni_item_map_area", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("mapAreaId", Integer), Column("rate", Integer), Column("isClear", Boolean), @@ -91,9 +111,10 @@ map_area = Table( Column("statusCount", Integer), Column("remainGridCount", Integer), UniqueConstraint("user", "mapAreaId", name="chuni_item_map_area_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) + class ChuniItemData(BaseData): def put_character(self, user_id: int, character_data: Dict) -> Optional[int]: character_data["user"] = user_id @@ -104,24 +125,26 @@ class ChuniItemData(BaseData): conflict = sql.on_duplicate_key_update(**character_data) result = self.execute(conflict) - if result is None: return None + if result is None: + return None return result.lastrowid def get_character(self, user_id: int, character_id: int) -> Optional[Dict]: - sql = select(character).where(and_( - character.c.user == user_id, - character.c.characterId == character_id - )) - + sql = select(character).where( + and_(character.c.user == user_id, character.c.characterId == character_id) + ) + result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() - + def get_characters(self, user_id: int) -> Optional[List[Row]]: sql = select(character).where(character.c.user == user_id) - + result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def put_item(self, user_id: int, item_data: Dict) -> Optional[int]: @@ -133,22 +156,23 @@ class ChuniItemData(BaseData): conflict = sql.on_duplicate_key_update(**item_data) result = self.execute(conflict) - if result is None: return None + if result is None: + return None return result.lastrowid def get_items(self, user_id: int, kind: int = None) -> Optional[List[Row]]: if kind is None: sql = select(item).where(item.c.user == user_id) else: - sql = select(item).where(and_( - item.c.user == user_id, - item.c.itemKind == kind - )) - + sql = select(item).where( + and_(item.c.user == user_id, item.c.itemKind == kind) + ) + result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - + def put_duel(self, user_id: int, duel_data: Dict) -> Optional[int]: duel_data["user"] = user_id @@ -158,14 +182,16 @@ class ChuniItemData(BaseData): conflict = sql.on_duplicate_key_update(**duel_data) result = self.execute(conflict) - if result is None: return None + if result is None: + return None return result.lastrowid def get_duels(self, user_id: int) -> Optional[List[Row]]: sql = select(duel).where(duel.c.user == user_id) - + result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def put_map(self, user_id: int, map_data: Dict) -> Optional[int]: @@ -177,16 +203,18 @@ class ChuniItemData(BaseData): conflict = sql.on_duplicate_key_update(**map_data) result = self.execute(conflict) - if result is None: return None + if result is None: + return None return result.lastrowid def get_maps(self, user_id: int) -> Optional[List[Row]]: sql = select(map).where(map.c.user == user_id) - + result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - + def put_map_area(self, user_id: int, map_area_data: Dict) -> Optional[int]: map_area_data["user"] = user_id @@ -196,12 +224,14 @@ class ChuniItemData(BaseData): conflict = sql.on_duplicate_key_update(**map_area_data) result = self.execute(conflict) - if result is None: return None + if result is None: + return None return result.lastrowid - + def get_map_areas(self, user_id: int) -> Optional[List[Row]]: sql = select(map_area).where(map_area.c.user == user_id) - + result = self.execute(sql) - if result is None: return None - return result.fetchall() \ No newline at end of file + if result is None: + return None + return result.fetchall() diff --git a/titles/chuni/schema/profile.py b/titles/chuni/schema/profile.py index f23f54d..9000b9b 100644 --- a/titles/chuni/schema/profile.py +++ b/titles/chuni/schema/profile.py @@ -13,7 +13,11 @@ profile = Table( "chuni_profile_data", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("version", Integer, nullable=False), Column("exp", Integer), Column("level", Integer), @@ -62,7 +66,7 @@ profile = Table( Column("firstTutorialCancelNum", Integer), Column("totalAdvancedHighScore", Integer), Column("masterTutorialCancelNum", Integer), - Column("ext1", Integer), # Added in chunew + Column("ext1", Integer), # Added in chunew Column("ext2", Integer), Column("ext3", Integer), Column("ext4", Integer), @@ -71,16 +75,20 @@ profile = Table( Column("ext7", Integer), Column("ext8", Integer), Column("ext9", Integer), - Column("ext10", Integer), + Column("ext10", Integer), Column("extStr1", String(255)), Column("extStr2", String(255)), Column("extLong1", Integer), Column("extLong2", Integer), Column("mapIconId", Integer), Column("compatibleCmVersion", String(25)), - Column("medal", Integer), + Column("medal", Integer), Column("voiceId", Integer), - Column("teamId", Integer, ForeignKey("chuni_profile_team.id", ondelete="SET NULL", onupdate="SET NULL")), + Column( + "teamId", + Integer, + ForeignKey("chuni_profile_team.id", ondelete="SET NULL", onupdate="SET NULL"), + ), Column("avatarBack", Integer, server_default="0"), Column("avatarFace", Integer, server_default="0"), Column("eliteRankPoint", Integer, server_default="0"), @@ -121,14 +129,18 @@ profile = Table( Column("netBattleEndState", Integer, server_default="0"), Column("avatarHead", Integer, server_default="0"), UniqueConstraint("user", "version", name="chuni_profile_profile_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) profile_ex = Table( "chuni_profile_data_ex", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("version", Integer, nullable=False), Column("ext1", Integer), Column("ext2", Integer), @@ -165,14 +177,18 @@ profile_ex = Table( Column("mapIconId", Integer), Column("compatibleCmVersion", String(25)), UniqueConstraint("user", "version", name="chuni_profile_data_ex_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) option = Table( "chuni_profile_option", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("speed", Integer), Column("bgInfo", Integer), Column("rating", Integer), @@ -195,7 +211,7 @@ option = Table( Column("successSkill", Integer), Column("successSlideHold", Integer), Column("successTapTimbre", Integer), - Column("ext1", Integer), # Added in chunew + Column("ext1", Integer), # Added in chunew Column("ext2", Integer), Column("ext3", Integer), Column("ext4", Integer), @@ -224,14 +240,18 @@ option = Table( Column("playTimingOffset", Integer, server_default="0"), Column("fieldWallPosition_120", Integer, server_default="0"), UniqueConstraint("user", name="chuni_profile_option_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) option_ex = Table( "chuni_profile_option_ex", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("ext1", Integer), Column("ext2", Integer), Column("ext3", Integer), @@ -253,51 +273,69 @@ option_ex = Table( Column("ext19", Integer), Column("ext20", Integer), UniqueConstraint("user", name="chuni_profile_option_ex_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) recent_rating = Table( "chuni_profile_recent_rating", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("recentRating", JSON), UniqueConstraint("user", name="chuni_profile_recent_rating_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) region = Table( "chuni_profile_region", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("regionId", Integer), Column("playCount", Integer), UniqueConstraint("user", "regionId", name="chuni_profile_region_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) activity = Table( "chuni_profile_activity", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("kind", Integer), - Column("activityId", Integer), # Reminder: Change this to ID in base.py or the game will be sad + Column( + "activityId", Integer + ), # Reminder: Change this to ID in base.py or the game will be sad Column("sortNumber", Integer), Column("param1", Integer), Column("param2", Integer), Column("param3", Integer), Column("param4", Integer), UniqueConstraint("user", "kind", "activityId", name="chuni_profile_activity_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) charge = Table( "chuni_profile_charge", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("chargeId", Integer), Column("stock", Integer), Column("purchaseDate", String(25)), @@ -306,14 +344,18 @@ charge = Table( Column("param2", Integer), Column("paramDate", String(25)), UniqueConstraint("user", "chargeId", name="chuni_profile_charge_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) emoney = Table( "chuni_profile_emoney", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("ext1", Integer), Column("ext2", Integer), Column("ext3", Integer), @@ -321,20 +363,24 @@ emoney = Table( Column("emoneyBrand", Integer), Column("emoneyCredit", Integer), UniqueConstraint("user", "emoneyBrand", name="chuni_profile_emoney_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) overpower = Table( "chuni_profile_overpower", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("genreId", Integer), Column("difficulty", Integer), Column("rate", Integer), Column("point", Integer), UniqueConstraint("user", "genreId", "difficulty", name="chuni_profile_emoney_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) team = Table( @@ -343,18 +389,21 @@ team = Table( Column("id", Integer, primary_key=True, nullable=False), Column("teamName", String(255)), Column("teamPoint", Integer), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) + class ChuniProfileData(BaseData): - def put_profile_data(self, aime_id: int, version: int, profile_data: Dict) -> Optional[int]: + def put_profile_data( + self, aime_id: int, version: int, profile_data: Dict + ) -> Optional[int]: profile_data["user"] = aime_id profile_data["version"] = version if "accessCode" in profile_data: profile_data.pop("accessCode") - + profile_data = self.fix_bools(profile_data) - + sql = insert(profile).values(**profile_data) conflict = sql.on_duplicate_key_update(**profile_data) result = self.execute(conflict) @@ -363,51 +412,64 @@ class ChuniProfileData(BaseData): self.logger.warn(f"put_profile_data: Failed to update! aime_id: {aime_id}") return None return result.lastrowid - + def get_profile_preview(self, aime_id: int, version: int) -> Optional[Row]: - sql = select([profile, option]).join(option, profile.c.user == option.c.user).filter( - and_(profile.c.user == aime_id, profile.c.version == version) + sql = ( + select([profile, option]) + .join(option, profile.c.user == option.c.user) + .filter(and_(profile.c.user == aime_id, profile.c.version == version)) ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() def get_profile_data(self, aime_id: int, version: int) -> Optional[Row]: - sql = select(profile).where(and_( - profile.c.user == aime_id, - profile.c.version == version, - )) + sql = select(profile).where( + and_( + profile.c.user == aime_id, + profile.c.version == version, + ) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() - - def put_profile_data_ex(self, aime_id: int, version: int, profile_ex_data: Dict) -> Optional[int]: + + def put_profile_data_ex( + self, aime_id: int, version: int, profile_ex_data: Dict + ) -> Optional[int]: profile_ex_data["user"] = aime_id profile_ex_data["version"] = version if "accessCode" in profile_ex_data: profile_ex_data.pop("accessCode") - + sql = insert(profile_ex).values(**profile_ex_data) conflict = sql.on_duplicate_key_update(**profile_ex_data) result = self.execute(conflict) if result is None: - self.logger.warn(f"put_profile_data_ex: Failed to update! aime_id: {aime_id}") + self.logger.warn( + f"put_profile_data_ex: Failed to update! aime_id: {aime_id}" + ) return None return result.lastrowid - + def get_profile_data_ex(self, aime_id: int, version: int) -> Optional[Row]: - sql = select(profile_ex).where(and_( - profile_ex.c.user == aime_id, - profile_ex.c.version == version, - )) + sql = select(profile_ex).where( + and_( + profile_ex.c.user == aime_id, + profile_ex.c.version == version, + ) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() - + def put_profile_option(self, aime_id: int, option_data: Dict) -> Optional[int]: option_data["user"] = aime_id @@ -416,7 +478,9 @@ class ChuniProfileData(BaseData): result = self.execute(conflict) if result is None: - self.logger.warn(f"put_profile_option: Failed to update! aime_id: {aime_id}") + self.logger.warn( + f"put_profile_option: Failed to update! aime_id: {aime_id}" + ) return None return result.lastrowid @@ -424,18 +488,23 @@ class ChuniProfileData(BaseData): sql = select(option).where(option.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() - - def put_profile_option_ex(self, aime_id: int, option_ex_data: Dict) -> Optional[int]: + + def put_profile_option_ex( + self, aime_id: int, option_ex_data: Dict + ) -> Optional[int]: option_ex_data["user"] = aime_id - + sql = insert(option_ex).values(**option_ex_data) conflict = sql.on_duplicate_key_update(**option_ex_data) result = self.execute(conflict) if result is None: - self.logger.warn(f"put_profile_option_ex: Failed to update! aime_id: {aime_id}") + self.logger.warn( + f"put_profile_option_ex: Failed to update! aime_id: {aime_id}" + ) return None return result.lastrowid @@ -443,27 +512,32 @@ class ChuniProfileData(BaseData): sql = select(option_ex).where(option_ex.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() - def put_profile_recent_rating(self, aime_id: int, recent_rating_data: List[Dict]) -> Optional[int]: + def put_profile_recent_rating( + self, aime_id: int, recent_rating_data: List[Dict] + ) -> Optional[int]: sql = insert(recent_rating).values( - user = aime_id, - recentRating = recent_rating_data + user=aime_id, recentRating=recent_rating_data ) - conflict = sql.on_duplicate_key_update(recentRating = recent_rating_data) + conflict = sql.on_duplicate_key_update(recentRating=recent_rating_data) result = self.execute(conflict) if result is None: - self.logger.warn(f"put_profile_recent_rating: Failed to update! aime_id: {aime_id}") + self.logger.warn( + f"put_profile_recent_rating: Failed to update! aime_id: {aime_id}" + ) return None return result.lastrowid - + def get_profile_recent_rating(self, aime_id: int) -> Optional[Row]: sql = select(recent_rating).where(recent_rating.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() def put_profile_activity(self, aime_id: int, activity_data: Dict) -> Optional[int]: @@ -471,35 +545,39 @@ class ChuniProfileData(BaseData): activity_data["user"] = aime_id activity_data["activityId"] = activity_data["id"] activity_data.pop("id") - + sql = insert(activity).values(**activity_data) conflict = sql.on_duplicate_key_update(**activity_data) result = self.execute(conflict) if result is None: - self.logger.warn(f"put_profile_activity: Failed to update! aime_id: {aime_id}") + self.logger.warn( + f"put_profile_activity: Failed to update! aime_id: {aime_id}" + ) return None return result.lastrowid def get_profile_activity(self, aime_id: int, kind: int) -> Optional[List[Row]]: - sql = select(activity).where(and_( - activity.c.user == aime_id, - activity.c.kind == kind - )) + sql = select(activity).where( + and_(activity.c.user == aime_id, activity.c.kind == kind) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def put_profile_charge(self, aime_id: int, charge_data: Dict) -> Optional[int]: charge_data["user"] = aime_id - + sql = insert(charge).values(**charge_data) conflict = sql.on_duplicate_key_update(**charge_data) result = self.execute(conflict) if result is None: - self.logger.warn(f"put_profile_charge: Failed to update! aime_id: {aime_id}") + self.logger.warn( + f"put_profile_charge: Failed to update! aime_id: {aime_id}" + ) return None return result.lastrowid @@ -507,9 +585,10 @@ class ChuniProfileData(BaseData): sql = select(charge).where(charge.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - + def add_profile_region(self, aime_id: int, region_id: int) -> Optional[int]: pass @@ -523,29 +602,35 @@ class ChuniProfileData(BaseData): conflict = sql.on_duplicate_key_update(**emoney_data) result = self.execute(conflict) - if result is None: return None + if result is None: + return None return result.lastrowid - + def get_profile_emoney(self, aime_id: int) -> Optional[List[Row]]: sql = select(emoney).where(emoney.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - def put_profile_overpower(self, aime_id: int, overpower_data: Dict) -> Optional[int]: + def put_profile_overpower( + self, aime_id: int, overpower_data: Dict + ) -> Optional[int]: overpower_data["user"] = aime_id sql = insert(overpower).values(**overpower_data) conflict = sql.on_duplicate_key_update(**overpower_data) result = self.execute(conflict) - if result is None: return None + if result is None: + return None return result.lastrowid - + def get_profile_overpower(self, aime_id: int) -> Optional[List[Row]]: sql = select(overpower).where(overpower.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() diff --git a/titles/chuni/schema/score.py b/titles/chuni/schema/score.py index 81f3212..6a94813 100644 --- a/titles/chuni/schema/score.py +++ b/titles/chuni/schema/score.py @@ -13,7 +13,11 @@ course = Table( "chuni_score_course", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("courseId", Integer), Column("classId", Integer), Column("playCount", Integer), @@ -33,14 +37,18 @@ course = Table( Column("orderId", Integer), Column("playerRating", Integer), UniqueConstraint("user", "courseId", name="chuni_score_course_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) best_score = Table( "chuni_score_best", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("musicId", Integer), Column("level", Integer), Column("playCount", Integer), @@ -60,14 +68,18 @@ best_score = Table( Column("ext1", Integer), Column("theoryCount", Integer), UniqueConstraint("user", "musicId", "level", name="chuni_score_best_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) playlog = Table( "chuni_score_playlog", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("orderId", Integer), Column("sortNumber", Integer), Column("placeId", Integer), @@ -122,15 +134,17 @@ playlog = Table( Column("charaIllustId", Integer), Column("romVersion", String(255)), Column("judgeHeaven", Integer), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) + class ChuniScoreData(BaseData): def get_courses(self, aime_id: int) -> Optional[Row]: sql = select(course).where(course.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def put_course(self, aime_id: int, course_data: Dict) -> Optional[int]: @@ -141,16 +155,18 @@ class ChuniScoreData(BaseData): conflict = sql.on_duplicate_key_update(**course_data) result = self.execute(conflict) - if result is None: return None + if result is None: + return None return result.lastrowid - + def get_scores(self, aime_id: int) -> Optional[Row]: sql = select(best_score).where(best_score.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - + def put_score(self, aime_id: int, score_data: Dict) -> Optional[int]: score_data["user"] = aime_id score_data = self.fix_bools(score_data) @@ -159,16 +175,18 @@ class ChuniScoreData(BaseData): conflict = sql.on_duplicate_key_update(**score_data) result = self.execute(conflict) - if result is None: return None + if result is None: + return None return result.lastrowid def get_playlogs(self, aime_id: int) -> Optional[Row]: sql = select(playlog).where(playlog.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - + def put_playlog(self, aime_id: int, playlog_data: Dict) -> Optional[int]: playlog_data["user"] = aime_id playlog_data = self.fix_bools(playlog_data) @@ -177,5 +195,6 @@ class ChuniScoreData(BaseData): conflict = sql.on_duplicate_key_update(**playlog_data) result = self.execute(conflict) - if result is None: return None + if result is None: + return None return result.lastrowid diff --git a/titles/chuni/schema/static.py b/titles/chuni/schema/static.py index fbfae11..0d58c45 100644 --- a/titles/chuni/schema/static.py +++ b/titles/chuni/schema/static.py @@ -19,7 +19,7 @@ events = Table( Column("name", String(255)), Column("enabled", Boolean, server_default="1"), UniqueConstraint("version", "eventId", name="chuni_static_events_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) music = Table( @@ -30,13 +30,13 @@ music = Table( Column("songId", Integer), Column("chartId", Integer), Column("title", String(255)), - Column("artist", String(255)), + Column("artist", String(255)), Column("level", Float), Column("genre", String(255)), Column("jacketPath", String(255)), Column("worldsEndTag", String(7)), UniqueConstraint("version", "songId", "chartId", name="chuni_static_music_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) charge = Table( @@ -51,7 +51,7 @@ charge = Table( Column("sellingAppeal", Boolean), Column("enabled", Boolean, server_default="1"), UniqueConstraint("version", "chargeId", name="chuni_static_charge_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) avatar = Table( @@ -65,159 +65,203 @@ avatar = Table( Column("iconPath", String(255)), Column("texturePath", String(255)), UniqueConstraint("version", "avatarAccessoryId", name="chuni_static_avatar_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) + class ChuniStaticData(BaseData): - def put_event(self, version: int, event_id: int, type: int, name: str) -> Optional[int]: + def put_event( + self, version: int, event_id: int, type: int, name: str + ) -> Optional[int]: sql = insert(events).values( - version = version, - eventId = event_id, - type = type, - name = name + version=version, eventId=event_id, type=type, name=name ) - conflict = sql.on_duplicate_key_update( - name = name - ) + conflict = sql.on_duplicate_key_update(name=name) result = self.execute(conflict) - if result is None: return None + if result is None: + return None return result.lastrowid - - def update_event(self, version: int, event_id: int, enabled: bool) -> Optional[bool]: - sql = events.update(and_(events.c.version == version, events.c.eventId == event_id)).values( - enabled = enabled - ) + + def update_event( + self, version: int, event_id: int, enabled: bool + ) -> Optional[bool]: + sql = events.update( + and_(events.c.version == version, events.c.eventId == event_id) + ).values(enabled=enabled) result = self.execute(sql) - if result is None: - self.logger.warn(f"update_event: failed to update event! version: {version}, event_id: {event_id}, enabled: {enabled}") + if result is None: + self.logger.warn( + f"update_event: failed to update event! version: {version}, event_id: {event_id}, enabled: {enabled}" + ) return None event = self.get_event(version, event_id) if event is None: - self.logger.warn(f"update_event: failed to fetch event {event_id} after updating") + self.logger.warn( + f"update_event: failed to fetch event {event_id} after updating" + ) return None return event["enabled"] def get_event(self, version: int, event_id: int) -> Optional[Row]: - sql = select(events).where(and_(events.c.version == version, events.c.eventId == event_id)) - + sql = select(events).where( + and_(events.c.version == version, events.c.eventId == event_id) + ) + result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() def get_enabled_events(self, version: int) -> Optional[List[Row]]: - sql = select(events).where(and_(events.c.version == version, events.c.enabled == True)) + sql = select(events).where( + and_(events.c.version == version, events.c.enabled == True) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def get_events(self, version: int) -> Optional[List[Row]]: sql = select(events).where(events.c.version == version) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - - def put_music(self, version: int, song_id: int, chart_id: int, title: int, artist: str, - level: float, genre: str, jacketPath: str, we_tag: str) -> Optional[int]: + def put_music( + self, + version: int, + song_id: int, + chart_id: int, + title: int, + artist: str, + level: float, + genre: str, + jacketPath: str, + we_tag: str, + ) -> Optional[int]: sql = insert(music).values( - version = version, - songId = song_id, - chartId = chart_id, - title = title, - artist = artist, - level = level, - genre = genre, - jacketPath = jacketPath, - worldsEndTag = we_tag, + version=version, + songId=song_id, + chartId=chart_id, + title=title, + artist=artist, + level=level, + genre=genre, + jacketPath=jacketPath, + worldsEndTag=we_tag, ) conflict = sql.on_duplicate_key_update( - title = title, - artist = artist, - level = level, - genre = genre, - jacketPath = jacketPath, - worldsEndTag = we_tag, + title=title, + artist=artist, + level=level, + genre=genre, + jacketPath=jacketPath, + worldsEndTag=we_tag, ) result = self.execute(conflict) - if result is None: return None + if result is None: + return None return result.lastrowid - - def put_charge(self, version: int, charge_id: int, name: str, expiration_days: int, - consume_type: int, selling_appeal: bool) -> Optional[int]: + + def put_charge( + self, + version: int, + charge_id: int, + name: str, + expiration_days: int, + consume_type: int, + selling_appeal: bool, + ) -> Optional[int]: sql = insert(charge).values( - version = version, - chargeId = charge_id, - name = name, - expirationDays = expiration_days, - consumeType = consume_type, - sellingAppeal = selling_appeal, + version=version, + chargeId=charge_id, + name=name, + expirationDays=expiration_days, + consumeType=consume_type, + sellingAppeal=selling_appeal, ) conflict = sql.on_duplicate_key_update( - name = name, - expirationDays = expiration_days, - consumeType = consume_type, - sellingAppeal = selling_appeal, + name=name, + expirationDays=expiration_days, + consumeType=consume_type, + sellingAppeal=selling_appeal, ) result = self.execute(conflict) - if result is None: return None + if result is None: + return None return result.lastrowid - + def get_enabled_charges(self, version: int) -> Optional[List[Row]]: - sql = select(charge).where(and_( - charge.c.version == version, - charge.c.enabled == True - )) + sql = select(charge).where( + and_(charge.c.version == version, charge.c.enabled == True) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - + def get_charges(self, version: int) -> Optional[List[Row]]: sql = select(charge).where(charge.c.version == version) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - def get_music_chart(self, version: int, song_id: int, chart_id: int) -> Optional[List[Row]]: - sql = select(music).where(and_( - music.c.version == version, - music.c.songId == song_id, - music.c.chartId == chart_id - )) + def get_music_chart( + self, version: int, song_id: int, chart_id: int + ) -> Optional[List[Row]]: + sql = select(music).where( + and_( + music.c.version == version, + music.c.songId == song_id, + music.c.chartId == chart_id, + ) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() - def put_avatar(self, version: int, avatarAccessoryId: int, name: str, category: int, iconPath: str, texturePath: str) -> Optional[int]: + def put_avatar( + self, + version: int, + avatarAccessoryId: int, + name: str, + category: int, + iconPath: str, + texturePath: str, + ) -> Optional[int]: sql = insert(avatar).values( - version = version, - avatarAccessoryId = avatarAccessoryId, - name = name, - category = category, - iconPath = iconPath, - texturePath = texturePath, + version=version, + avatarAccessoryId=avatarAccessoryId, + name=name, + category=category, + iconPath=iconPath, + texturePath=texturePath, ) conflict = sql.on_duplicate_key_update( - name = name, - category = category, - iconPath = iconPath, - texturePath = texturePath, + name=name, + category=category, + iconPath=iconPath, + texturePath=texturePath, ) result = self.execute(conflict) - if result is None: return None + if result is None: + return None return result.lastrowid - diff --git a/titles/chuni/star.py b/titles/chuni/star.py index 03408dc..4c071e8 100644 --- a/titles/chuni/star.py +++ b/titles/chuni/star.py @@ -5,12 +5,13 @@ from titles.chuni.base import ChuniBase from titles.chuni.const import ChuniConstants from titles.chuni.config import ChuniConfig + class ChuniStar(ChuniBase): def __init__(self, core_cfg: CoreConfig, game_cfg: ChuniConfig) -> None: super().__init__(core_cfg, game_cfg) self.version = ChuniConstants.VER_CHUNITHM_STAR - + def handle_get_game_setting_api_request(self, data: Dict) -> Dict: - ret = super().handle_get_game_setting_api_request(data) + ret = super().handle_get_game_setting_api_request(data) ret["gameSetting"]["dataVersion"] = "1.20.00" - return ret \ No newline at end of file + return ret diff --git a/titles/chuni/starplus.py b/titles/chuni/starplus.py index 95000ef..8c24cc8 100644 --- a/titles/chuni/starplus.py +++ b/titles/chuni/starplus.py @@ -5,12 +5,13 @@ from titles.chuni.base import ChuniBase from titles.chuni.const import ChuniConstants from titles.chuni.config import ChuniConfig + class ChuniStarPlus(ChuniBase): def __init__(self, core_cfg: CoreConfig, game_cfg: ChuniConfig) -> None: super().__init__(core_cfg, game_cfg) self.version = ChuniConstants.VER_CHUNITHM_STAR_PLUS - + def handle_get_game_setting_api_request(self, data: Dict) -> Dict: - ret = super().handle_get_game_setting_api_request(data) + ret = super().handle_get_game_setting_api_request(data) ret["gameSetting"]["dataVersion"] = "1.25.00" - return ret \ No newline at end of file + return ret diff --git a/titles/cm/base.py b/titles/cm/base.py index b5d65b7..ff38489 100644 --- a/titles/cm/base.py +++ b/titles/cm/base.py @@ -10,12 +10,14 @@ from titles.cm.const import CardMakerConstants from titles.cm.config import CardMakerConfig -class CardMakerBase(): +class CardMakerBase: def __init__(self, core_cfg: CoreConfig, game_cfg: CardMakerConfig) -> None: self.core_cfg = core_cfg self.game_cfg = game_cfg self.date_time_format = "%Y-%m-%d %H:%M:%S" - self.date_time_format_ext = "%Y-%m-%d %H:%M:%S.%f" # needs to be lopped off at [:-5] + self.date_time_format_ext = ( + "%Y-%m-%d %H:%M:%S.%f" # needs to be lopped off at [:-5] + ) self.date_time_format_short = "%Y-%m-%d" self.logger = logging.getLogger("cardmaker") self.game = CardMakerConstants.GAME_CODE @@ -31,27 +33,19 @@ class CardMakerBase(): return { "length": 3, "gameConnectList": [ - { - "modelKind": 0, - "type": 1, - "titleUri": f"{uri}/SDHD/200/" - }, - { - "modelKind": 1, - "type": 1, - "titleUri": f"{uri}/SDEZ/120/" - }, - { - "modelKind": 2, - "type": 1, - "titleUri": f"{uri}/SDDT/130/" - } - ] + {"modelKind": 0, "type": 1, "titleUri": f"{uri}/SDHD/200/"}, + {"modelKind": 1, "type": 1, "titleUri": f"{uri}/SDEZ/120/"}, + {"modelKind": 2, "type": 1, "titleUri": f"{uri}/SDDT/130/"}, + ], } def handle_get_game_setting_api_request(self, data: Dict) -> Dict: - reboot_start = date.strftime(datetime.now() + timedelta(hours=3), self.date_time_format) - reboot_end = date.strftime(datetime.now() + timedelta(hours=4), self.date_time_format) + reboot_start = date.strftime( + datetime.now() + timedelta(hours=3), self.date_time_format + ) + reboot_end = date.strftime( + datetime.now() + timedelta(hours=4), self.date_time_format + ) return { "gameSetting": { @@ -67,18 +61,14 @@ class CardMakerBase(): "maxCountCard": 100, "watermark": False, "isMaintenance": False, - "isBackgroundDistribute": False + "isBackgroundDistribute": False, }, "isDumpUpload": False, - "isAou": False + "isAou": False, } def handle_get_client_bookkeeping_api_request(self, data: Dict) -> Dict: - return { - "placeId": data["placeId"], - "length": 0, - "clientBookkeepingList": [] - } + return {"placeId": data["placeId"], "length": 0, "clientBookkeepingList": []} def handle_upsert_client_setting_api_request(self, data: Dict) -> Dict: return {"returnCode": 1, "apiName": "UpsertClientSettingApi"} diff --git a/titles/cm/cm136.py b/titles/cm/cm136.py index 2298dc8..5feeca4 100644 --- a/titles/cm/cm136.py +++ b/titles/cm/cm136.py @@ -22,7 +22,7 @@ class CardMaker136(CardMakerBase): uri = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}" else: uri = f"http://{self.core_cfg.title.hostname}" - + ret["gameConnectList"][0]["titleUri"] = f"{uri}/SDHD/205/" ret["gameConnectList"][1]["titleUri"] = f"{uri}/SDEZ/125/" ret["gameConnectList"][2]["titleUri"] = f"{uri}/SDDT/135/" diff --git a/titles/cm/config.py b/titles/cm/config.py index df9f65a..ea96ca1 100644 --- a/titles/cm/config.py +++ b/titles/cm/config.py @@ -1,17 +1,23 @@ from core.config import CoreConfig -class CardMakerServerConfig(): +class CardMakerServerConfig: def __init__(self, parent_config: "CardMakerConfig") -> None: self.__config = parent_config @property def enable(self) -> bool: - return CoreConfig.get_config_field(self.__config, 'cardmaker', 'server', 'enable', default=True) + return CoreConfig.get_config_field( + self.__config, "cardmaker", "server", "enable", default=True + ) @property def loglevel(self) -> int: - return CoreConfig.str_to_loglevel(CoreConfig.get_config_field(self.__config, 'cardmaker', 'server', 'loglevel', default="info")) + return CoreConfig.str_to_loglevel( + CoreConfig.get_config_field( + self.__config, "cardmaker", "server", "loglevel", default="info" + ) + ) class CardMakerConfig(dict): diff --git a/titles/cm/const.py b/titles/cm/const.py index 3dec4fe..c5627ee 100644 --- a/titles/cm/const.py +++ b/titles/cm/const.py @@ -1,4 +1,4 @@ -class CardMakerConstants(): +class CardMakerConstants: GAME_CODE = "SDED" CONFIG_NAME = "cardmaker.yaml" diff --git a/titles/cm/index.py b/titles/cm/index.py index ff9ea1f..d082aad 100644 --- a/titles/cm/index.py +++ b/titles/cm/index.py @@ -18,23 +18,29 @@ from titles.cm.base import CardMakerBase from titles.cm.cm136 import CardMaker136 -class CardMakerServlet(): +class CardMakerServlet: def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None: self.core_cfg = core_cfg self.game_cfg = CardMakerConfig() if path.exists(f"{cfg_dir}/{CardMakerConstants.CONFIG_NAME}"): - self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{CardMakerConstants.CONFIG_NAME}"))) + self.game_cfg.update( + yaml.safe_load(open(f"{cfg_dir}/{CardMakerConstants.CONFIG_NAME}")) + ) self.versions = [ CardMakerBase(core_cfg, self.game_cfg), - CardMaker136(core_cfg, self.game_cfg) + CardMaker136(core_cfg, self.game_cfg), ] self.logger = logging.getLogger("cardmaker") log_fmt_str = "[%(asctime)s] Card Maker | %(levelname)s | %(message)s" log_fmt = logging.Formatter(log_fmt_str) - fileHandler = TimedRotatingFileHandler("{0}/{1}.log".format(self.core_cfg.server.log_dir, "cardmaker"), encoding='utf8', - when="d", backupCount=10) + fileHandler = TimedRotatingFileHandler( + "{0}/{1}.log".format(self.core_cfg.server.log_dir, "cardmaker"), + encoding="utf8", + when="d", + backupCount=10, + ) fileHandler.setFormatter(log_fmt) @@ -45,20 +51,29 @@ class CardMakerServlet(): self.logger.addHandler(consoleHandler) self.logger.setLevel(self.game_cfg.server.loglevel) - coloredlogs.install(level=self.game_cfg.server.loglevel, - logger=self.logger, fmt=log_fmt_str) + coloredlogs.install( + level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str + ) @classmethod - def get_allnet_info(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: + def get_allnet_info( + cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str + ) -> Tuple[bool, str, str]: game_cfg = CardMakerConfig() if path.exists(f"{cfg_dir}/{CardMakerConstants.CONFIG_NAME}"): - game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{CardMakerConstants.CONFIG_NAME}"))) + game_cfg.update( + yaml.safe_load(open(f"{cfg_dir}/{CardMakerConstants.CONFIG_NAME}")) + ) if not game_cfg.server.enable: return (False, "", "") if core_cfg.server.is_develop: - return (True, f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/", "") + return ( + True, + f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/", + "", + ) return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", "") @@ -86,7 +101,8 @@ class CardMakerServlet(): except zlib.error as e: self.logger.error( - f"Failed to decompress v{version} {endpoint} request -> {e}") + f"Failed to decompress v{version} {endpoint} request -> {e}" + ) return zlib.compress(b'{"stat": "0"}') req_data = json.loads(unzip) @@ -104,12 +120,11 @@ class CardMakerServlet(): resp = handler(req_data) except Exception as e: - self.logger.error( - f"Error handling v{version} method {endpoint} - {e}") + self.logger.error(f"Error handling v{version} method {endpoint} - {e}") return zlib.compress(b'{"stat": "0"}') if resp is None: - resp = {'returnCode': 1} + resp = {"returnCode": 1} self.logger.info(f"Response {resp}") diff --git a/titles/cm/read.py b/titles/cm/read.py index 57d9279..3a4635f 100644 --- a/titles/cm/read.py +++ b/titles/cm/read.py @@ -15,14 +15,21 @@ from titles.ongeki.config import OngekiConfig class CardMakerReader(BaseReader): - def __init__(self, config: CoreConfig, version: int, bin_dir: Optional[str], - opt_dir: Optional[str], extra: Optional[str]) -> None: + def __init__( + self, + config: CoreConfig, + version: int, + bin_dir: Optional[str], + opt_dir: Optional[str], + extra: Optional[str], + ) -> None: super().__init__(config, version, bin_dir, opt_dir, extra) self.ongeki_data = OngekiData(config) try: self.logger.info( - f"Start importer for {CardMakerConstants.game_ver_to_string(version)}") + f"Start importer for {CardMakerConstants.game_ver_to_string(version)}" + ) except IndexError: self.logger.error(f"Invalid Card Maker version {version}") exit(1) @@ -30,7 +37,7 @@ class CardMakerReader(BaseReader): def read(self) -> None: static_datas = { "static_gachas.csv": "read_ongeki_gacha_csv", - "static_gacha_cards.csv": "read_ongeki_gacha_card_csv" + "static_gacha_cards.csv": "read_ongeki_gacha_card_csv", } data_dirs = [] @@ -41,7 +48,9 @@ class CardMakerReader(BaseReader): read_csv = getattr(CardMakerReader, func) read_csv(self, f"{self.bin_dir}/MU3/{file}") else: - self.logger.warn(f"Couldn't find {file} file in {self.bin_dir}, skipping") + self.logger.warn( + f"Couldn't find {file} file in {self.bin_dir}, skipping" + ) if self.opt_dir is not None: data_dirs += self.get_data_directories(self.opt_dir) @@ -64,7 +73,7 @@ class CardMakerReader(BaseReader): row["kind"], type=row["type"], isCeiling=True if row["isCeiling"] == "1" else False, - maxSelectPoint=row["maxSelectPoint"] + maxSelectPoint=row["maxSelectPoint"], ) self.logger.info(f"Added gacha {row['gachaId']}") @@ -81,7 +90,7 @@ class CardMakerReader(BaseReader): rarity=row["rarity"], weight=row["weight"], isPickup=True if row["isPickup"] == "1" else False, - isSelect=True if row["isSelect"] == "1" else False + isSelect=True if row["isSelect"] == "1" else False, ) self.logger.info(f"Added card {row['cardId']} to gacha") @@ -95,7 +104,7 @@ class CardMakerReader(BaseReader): "Pickup": "Pickup", "RecoverFiveShotFlag": "BonusRestored", "Free": "Free", - "FreeSR": "Free" + "FreeSR": "Free", } for root, dirs, files in os.walk(base_dir): @@ -104,13 +113,19 @@ class CardMakerReader(BaseReader): with open(f"{root}/{dir}/Gacha.xml", "r", encoding="utf-8") as f: troot = ET.fromstring(f.read()) - name = troot.find('Name').find('str').text - gacha_id = int(troot.find('Name').find('id').text) + name = troot.find("Name").find("str").text + gacha_id = int(troot.find("Name").find("id").text) # skip already existing gachas - if self.ongeki_data.static.get_gacha( - OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY, gacha_id) is not None: - self.logger.info(f"Gacha {gacha_id} already added, skipping") + if ( + self.ongeki_data.static.get_gacha( + OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY, gacha_id + ) + is not None + ): + self.logger.info( + f"Gacha {gacha_id} already added, skipping" + ) continue # 1140 is the first bright memory gacha @@ -120,7 +135,8 @@ class CardMakerReader(BaseReader): version = OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY gacha_kind = OngekiConstants.CM_GACHA_KINDS[ - type_to_kind[troot.find('Type').text]].value + type_to_kind[troot.find("Type").text] + ].value # hardcode which gachas get "Select Gacha" with 33 points is_ceiling, max_select_point = 0, 0 @@ -134,5 +150,6 @@ class CardMakerReader(BaseReader): name, gacha_kind, isCeiling=is_ceiling, - maxSelectPoint=max_select_point) + maxSelectPoint=max_select_point, + ) self.logger.info(f"Added gacha {gacha_id}") diff --git a/titles/cxb/__init__.py b/titles/cxb/__init__.py index 0a9db97..37abdab 100644 --- a/titles/cxb/__init__.py +++ b/titles/cxb/__init__.py @@ -7,4 +7,4 @@ index = CxbServlet database = CxbData reader = CxbReader game_codes = [CxbConstants.GAME_CODE] -current_schema_version = 1 \ No newline at end of file +current_schema_version = 1 diff --git a/titles/cxb/base.py b/titles/cxb/base.py index 7b021bb..6b6a5d5 100644 --- a/titles/cxb/base.py +++ b/titles/cxb/base.py @@ -11,82 +11,91 @@ from titles.cxb.config import CxbConfig from titles.cxb.const import CxbConstants from titles.cxb.database import CxbData -class CxbBase(): + +class CxbBase: def __init__(self, cfg: CoreConfig, game_cfg: CxbConfig) -> None: - self.config = cfg # Config file + self.config = cfg # Config file self.game_config = game_cfg - self.data = CxbData(cfg) # Database + self.data = CxbData(cfg) # Database self.game = CxbConstants.GAME_CODE self.logger = logging.getLogger("cxb") self.version = CxbConstants.VER_CROSSBEATS_REV - + def handle_action_rpreq_request(self, data: Dict) -> Dict: - return({}) - + return {} + def handle_action_hitreq_request(self, data: Dict) -> Dict: - return({"data":[]}) + return {"data": []} def handle_auth_usercheck_request(self, data: Dict) -> Dict: - profile = self.data.profile.get_profile_index(0, data["usercheck"]["authid"], self.version) + profile = self.data.profile.get_profile_index( + 0, data["usercheck"]["authid"], self.version + ) if profile is not None: self.logger.info(f"User {data['usercheck']['authid']} has CXB profile") - return({"exist": "true", "logout": "true"}) + return {"exist": "true", "logout": "true"} self.logger.info(f"No profile for aime id {data['usercheck']['authid']}") - return({"exist": "false", "logout": "true"}) + return {"exist": "false", "logout": "true"} def handle_auth_entry_request(self, data: Dict) -> Dict: self.logger.info(f"New profile for {data['entry']['authid']}") - return({"token": data["entry"]["authid"], "uid": data["entry"]["authid"]}) + return {"token": data["entry"]["authid"], "uid": data["entry"]["authid"]} def handle_auth_login_request(self, data: Dict) -> Dict: - profile = self.data.profile.get_profile_index(0, data["login"]["authid"], self.version) - + profile = self.data.profile.get_profile_index( + 0, data["login"]["authid"], self.version + ) + if profile is not None: self.logger.info(f"Login user {data['login']['authid']}") - return({"token": data["login"]["authid"], "uid": data["login"]["authid"]}) - + return {"token": data["login"]["authid"], "uid": data["login"]["authid"]} + self.logger.warn(f"User {data['login']['authid']} does not have a profile") - return({}) - + return {} + def handle_action_loadrange_request(self, data: Dict) -> Dict: - range_start = data['loadrange']['range'][0] - range_end = data['loadrange']['range'][1] - uid = data['loadrange']['uid'] + range_start = data["loadrange"]["range"][0] + range_end = data["loadrange"]["range"][1] + uid = data["loadrange"]["uid"] self.logger.info(f"Load data for {uid}") profile = self.data.profile.get_profile(uid, self.version) - songs = self.data.score.get_best_scores(uid) + songs = self.data.score.get_best_scores(uid) data1 = [] index = [] versionindex = [] - + for profile_index in profile: profile_data = profile_index["data"] if int(range_start) == 800000: - return({"index":range_start, "data":[], "version":10400}) - - if not ( int(range_start) <= int(profile_index[3]) <= int(range_end) ): + return {"index": range_start, "data": [], "version": 10400} + + if not (int(range_start) <= int(profile_index[3]) <= int(range_end)): continue - #Prevent loading of the coupons within the profile to use the force unlock instead + # Prevent loading of the coupons within the profile to use the force unlock instead elif 500 <= int(profile_index[3]) <= 510: continue - #Prevent loading of songs saved in the profile + # Prevent loading of songs saved in the profile elif 100000 <= int(profile_index[3]) <= 110000: continue - #Prevent loading of the shop list / unlocked titles & icons saved in the profile + # Prevent loading of the shop list / unlocked titles & icons saved in the profile elif 200000 <= int(profile_index[3]) <= 210000: continue - #Prevent loading of stories in the profile + # Prevent loading of stories in the profile elif 900000 <= int(profile_index[3]) <= 900200: continue else: index.append(profile_index[3]) - data1.append(b64encode(bytes(json.dumps(profile_data, separators=(',', ':')), 'utf-8')).decode('utf-8')) + data1.append( + b64encode( + bytes(json.dumps(profile_data, separators=(",", ":")), "utf-8") + ).decode("utf-8") + ) - ''' + """ 100000 = Songs 200000 = Shop 300000 = Courses @@ -96,101 +105,140 @@ class CxbBase(): 700000 = rcLog 800000 = Partners 900000 = Stories - ''' + """ # Coupons - for i in range(500,510): + for i in range(500, 510): index.append(str(i)) couponid = int(i) - 500 - dataValue = [{ - "couponId":str(couponid), - "couponNum":"1", - "couponLog":[], - }] - data1.append(b64encode(bytes(json.dumps(dataValue[0], separators=(',', ':')), 'utf-8')).decode('utf-8')) - + dataValue = [ + { + "couponId": str(couponid), + "couponNum": "1", + "couponLog": [], + } + ] + data1.append( + b64encode( + bytes(json.dumps(dataValue[0], separators=(",", ":")), "utf-8") + ).decode("utf-8") + ) # ShopList_Title - for i in range(200000,201451): + for i in range(200000, 201451): index.append(str(i)) shopid = int(i) - 200000 - dataValue = [{ - "shopId":shopid, - "shopState":"2", - "isDisable":"t", - "isDeleted":"f", - "isSpecialFlag":"f" - }] - data1.append(b64encode(bytes(json.dumps(dataValue[0], separators=(',', ':')), 'utf-8')).decode('utf-8')) + dataValue = [ + { + "shopId": shopid, + "shopState": "2", + "isDisable": "t", + "isDeleted": "f", + "isSpecialFlag": "f", + } + ] + data1.append( + b64encode( + bytes(json.dumps(dataValue[0], separators=(",", ":")), "utf-8") + ).decode("utf-8") + ) - #ShopList_Icon - for i in range(202000,202264): + # ShopList_Icon + for i in range(202000, 202264): index.append(str(i)) shopid = int(i) - 200000 - dataValue = [{ - "shopId":shopid, - "shopState":"2", - "isDisable":"t", - "isDeleted":"f", - "isSpecialFlag":"f" - }] - data1.append(b64encode(bytes(json.dumps(dataValue[0], separators=(',', ':')), 'utf-8')).decode('utf-8')) + dataValue = [ + { + "shopId": shopid, + "shopState": "2", + "isDisable": "t", + "isDeleted": "f", + "isSpecialFlag": "f", + } + ] + data1.append( + b64encode( + bytes(json.dumps(dataValue[0], separators=(",", ":")), "utf-8") + ).decode("utf-8") + ) - #Stories - for i in range(900000,900003): + # Stories + for i in range(900000, 900003): index.append(str(i)) storyid = int(i) - 900000 - dataValue = [{ - "storyId":storyid, - "unlockState1":["t"] * 10, - "unlockState2":["t"] * 10, - "unlockState3":["t"] * 10, - "unlockState4":["t"] * 10, - "unlockState5":["t"] * 10, - "unlockState6":["t"] * 10, - "unlockState7":["t"] * 10, - "unlockState8":["t"] * 10, - "unlockState9":["t"] * 10, - "unlockState10":["t"] * 10, - "unlockState11":["t"] * 10, - "unlockState12":["t"] * 10, - "unlockState13":["t"] * 10, - "unlockState14":["t"] * 10, - "unlockState15":["t"] * 10, - "unlockState16":["t"] * 10 - }] - data1.append(b64encode(bytes(json.dumps(dataValue[0], separators=(',', ':')), 'utf-8')).decode('utf-8')) + dataValue = [ + { + "storyId": storyid, + "unlockState1": ["t"] * 10, + "unlockState2": ["t"] * 10, + "unlockState3": ["t"] * 10, + "unlockState4": ["t"] * 10, + "unlockState5": ["t"] * 10, + "unlockState6": ["t"] * 10, + "unlockState7": ["t"] * 10, + "unlockState8": ["t"] * 10, + "unlockState9": ["t"] * 10, + "unlockState10": ["t"] * 10, + "unlockState11": ["t"] * 10, + "unlockState12": ["t"] * 10, + "unlockState13": ["t"] * 10, + "unlockState14": ["t"] * 10, + "unlockState15": ["t"] * 10, + "unlockState16": ["t"] * 10, + } + ] + data1.append( + b64encode( + bytes(json.dumps(dataValue[0], separators=(",", ":")), "utf-8") + ).decode("utf-8") + ) for song in songs: song_data = song["data"] songCode = [] - songCode.append({ - "mcode": song_data['mcode'], - "musicState": song_data['musicState'], - "playCount": song_data['playCount'], - "totalScore": song_data['totalScore'], - "highScore": song_data['highScore'], - "everHighScore": song_data['everHighScore'] if 'everHighScore' in song_data else ["0","0","0","0","0"], - "clearRate": song_data['clearRate'], - "rankPoint": song_data['rankPoint'], - "normalCR": song_data['normalCR'] if 'normalCR' in song_data else ["0","0","0","0","0"], - "survivalCR": song_data['survivalCR'] if 'survivalCR' in song_data else ["0","0","0","0","0"], - "ultimateCR": song_data['ultimateCR'] if 'ultimateCR' in song_data else ["0","0","0","0","0"], - "nohopeCR": song_data['nohopeCR'] if 'nohopeCR' in song_data else ["0","0","0","0","0"], - "combo": song_data['combo'], - "coupleUserId": song_data['coupleUserId'], - "difficulty": song_data['difficulty'], - "isFullCombo": song_data['isFullCombo'], - "clearGaugeType": song_data['clearGaugeType'], - "fieldType": song_data['fieldType'], - "gameType": song_data['gameType'], - "grade": song_data['grade'], - "unlockState": song_data['unlockState'], - "extraState": song_data['extraState'] - }) - index.append(song_data['index']) - data1.append(b64encode(bytes(json.dumps(songCode[0], separators=(',', ':')), 'utf-8')).decode('utf-8')) + songCode.append( + { + "mcode": song_data["mcode"], + "musicState": song_data["musicState"], + "playCount": song_data["playCount"], + "totalScore": song_data["totalScore"], + "highScore": song_data["highScore"], + "everHighScore": song_data["everHighScore"] + if "everHighScore" in song_data + else ["0", "0", "0", "0", "0"], + "clearRate": song_data["clearRate"], + "rankPoint": song_data["rankPoint"], + "normalCR": song_data["normalCR"] + if "normalCR" in song_data + else ["0", "0", "0", "0", "0"], + "survivalCR": song_data["survivalCR"] + if "survivalCR" in song_data + else ["0", "0", "0", "0", "0"], + "ultimateCR": song_data["ultimateCR"] + if "ultimateCR" in song_data + else ["0", "0", "0", "0", "0"], + "nohopeCR": song_data["nohopeCR"] + if "nohopeCR" in song_data + else ["0", "0", "0", "0", "0"], + "combo": song_data["combo"], + "coupleUserId": song_data["coupleUserId"], + "difficulty": song_data["difficulty"], + "isFullCombo": song_data["isFullCombo"], + "clearGaugeType": song_data["clearGaugeType"], + "fieldType": song_data["fieldType"], + "gameType": song_data["gameType"], + "grade": song_data["grade"], + "unlockState": song_data["unlockState"], + "extraState": song_data["extraState"], + } + ) + index.append(song_data["index"]) + data1.append( + b64encode( + bytes(json.dumps(songCode[0], separators=(",", ":")), "utf-8") + ).decode("utf-8") + ) for v in index: try: @@ -198,66 +246,81 @@ class CxbBase(): v_profile_data = v_profile["data"] versionindex.append(int(v_profile_data["appVersion"])) except: - versionindex.append('10400') + versionindex.append("10400") - return({"index":index, "data":data1, "version":versionindex}) + return {"index": index, "data": data1, "version": versionindex} def handle_action_saveindex_request(self, data: Dict) -> Dict: - save_data = data['saveindex'] - + save_data = data["saveindex"] + try: - #REV Omnimix Version Fetcher - gameversion = data['saveindex']['data'][0][2] + # REV Omnimix Version Fetcher + gameversion = data["saveindex"]["data"][0][2] self.logger.warning(f"Game Version is {gameversion}") except: pass - - if "10205" in gameversion: - self.logger.info(f"Saving CrossBeats REV profile for {data['saveindex']['uid']}") - #Alright.... time to bring the jank code - - for value in data['saveindex']['data']: - - if 'playedUserId' in value[1]: - self.data.profile.put_profile(data['saveindex']['uid'], self.version, value[0], value[1]) - if 'mcode' not in value[1]: - self.data.profile.put_profile(data['saveindex']['uid'], self.version, value[0], value[1]) - if 'shopId' in value: - continue - if 'mcode' in value[1] and 'musicState' in value[1]: - song_json = json.loads(value[1]) - - songCode = [] - songCode.append({ - "mcode": song_json['mcode'], - "musicState": song_json['musicState'], - "playCount": song_json['playCount'], - "totalScore": song_json['totalScore'], - "highScore": song_json['highScore'], - "clearRate": song_json['clearRate'], - "rankPoint": song_json['rankPoint'], - "combo": song_json['combo'], - "coupleUserId": song_json['coupleUserId'], - "difficulty": song_json['difficulty'], - "isFullCombo": song_json['isFullCombo'], - "clearGaugeType": song_json['clearGaugeType'], - "fieldType": song_json['fieldType'], - "gameType": song_json['gameType'], - "grade": song_json['grade'], - "unlockState": song_json['unlockState'], - "extraState": song_json['extraState'], - "index": value[0] - }) - self.data.score.put_best_score(data['saveindex']['uid'], song_json['mcode'], self.version, value[0], songCode[0]) - return({}) - else: - self.logger.info(f"Saving CrossBeats REV Sunrise profile for {data['saveindex']['uid']}") - #Sunrise + if "10205" in gameversion: + self.logger.info( + f"Saving CrossBeats REV profile for {data['saveindex']['uid']}" + ) + # Alright.... time to bring the jank code + + for value in data["saveindex"]["data"]: + if "playedUserId" in value[1]: + self.data.profile.put_profile( + data["saveindex"]["uid"], self.version, value[0], value[1] + ) + if "mcode" not in value[1]: + self.data.profile.put_profile( + data["saveindex"]["uid"], self.version, value[0], value[1] + ) + if "shopId" in value: + continue + if "mcode" in value[1] and "musicState" in value[1]: + song_json = json.loads(value[1]) + + songCode = [] + songCode.append( + { + "mcode": song_json["mcode"], + "musicState": song_json["musicState"], + "playCount": song_json["playCount"], + "totalScore": song_json["totalScore"], + "highScore": song_json["highScore"], + "clearRate": song_json["clearRate"], + "rankPoint": song_json["rankPoint"], + "combo": song_json["combo"], + "coupleUserId": song_json["coupleUserId"], + "difficulty": song_json["difficulty"], + "isFullCombo": song_json["isFullCombo"], + "clearGaugeType": song_json["clearGaugeType"], + "fieldType": song_json["fieldType"], + "gameType": song_json["gameType"], + "grade": song_json["grade"], + "unlockState": song_json["unlockState"], + "extraState": song_json["extraState"], + "index": value[0], + } + ) + self.data.score.put_best_score( + data["saveindex"]["uid"], + song_json["mcode"], + self.version, + value[0], + songCode[0], + ) + return {} + else: + self.logger.info( + f"Saving CrossBeats REV Sunrise profile for {data['saveindex']['uid']}" + ) + + # Sunrise try: - profileIndex = save_data['index'].index('0') + profileIndex = save_data["index"].index("0") except: - return({"data":""}) #Maybe + return {"data": ""} # Maybe profile = json.loads(save_data["data"][profileIndex]) aimeId = profile["aimeId"] @@ -265,65 +328,91 @@ class CxbBase(): for index, value in enumerate(data["saveindex"]["data"]): if int(data["saveindex"]["index"][index]) == 101: - self.data.profile.put_profile(aimeId, self.version, data["saveindex"]["index"][index], value) - if int(data["saveindex"]["index"][index]) >= 700000 and int(data["saveindex"]["index"][index])<= 701000: - self.data.profile.put_profile(aimeId, self.version, data["saveindex"]["index"][index], value) - if int(data["saveindex"]["index"][index]) >= 500 and int(data["saveindex"]["index"][index]) <= 510: - self.data.profile.put_profile(aimeId, self.version, data["saveindex"]["index"][index], value) - if 'playedUserId' in value: - self.data.profile.put_profile(aimeId, self.version, data["saveindex"]["index"][index], json.loads(value)) - if 'mcode' not in value and "normalCR" not in value: - self.data.profile.put_profile(aimeId, self.version, data["saveindex"]["index"][index], json.loads(value)) - if 'shopId' in value: + self.data.profile.put_profile( + aimeId, self.version, data["saveindex"]["index"][index], value + ) + if ( + int(data["saveindex"]["index"][index]) >= 700000 + and int(data["saveindex"]["index"][index]) <= 701000 + ): + self.data.profile.put_profile( + aimeId, self.version, data["saveindex"]["index"][index], value + ) + if ( + int(data["saveindex"]["index"][index]) >= 500 + and int(data["saveindex"]["index"][index]) <= 510 + ): + self.data.profile.put_profile( + aimeId, self.version, data["saveindex"]["index"][index], value + ) + if "playedUserId" in value: + self.data.profile.put_profile( + aimeId, + self.version, + data["saveindex"]["index"][index], + json.loads(value), + ) + if "mcode" not in value and "normalCR" not in value: + self.data.profile.put_profile( + aimeId, + self.version, + data["saveindex"]["index"][index], + json.loads(value), + ) + if "shopId" in value: continue # MusicList Index for the profile indexSongList = [] for value in data["saveindex"]["index"]: - if int(value) in range(100000,110000): + if int(value) in range(100000, 110000): indexSongList.append(value) - + for index, value in enumerate(data["saveindex"]["data"]): - if 'mcode' not in value: + if "mcode" not in value: continue - if 'playedUserId' in value: + if "playedUserId" in value: continue - + data1 = json.loads(value) songCode = [] - songCode.append({ - "mcode": data1['mcode'], - "musicState": data1['musicState'], - "playCount": data1['playCount'], - "totalScore": data1['totalScore'], - "highScore": data1['highScore'], - "everHighScore": data1['everHighScore'], - "clearRate": data1['clearRate'], - "rankPoint": data1['rankPoint'], - "normalCR": data1['normalCR'], - "survivalCR": data1['survivalCR'], - "ultimateCR": data1['ultimateCR'], - "nohopeCR": data1['nohopeCR'], - "combo": data1['combo'], - "coupleUserId": data1['coupleUserId'], - "difficulty": data1['difficulty'], - "isFullCombo": data1['isFullCombo'], - "clearGaugeType": data1['clearGaugeType'], - "fieldType": data1['fieldType'], - "gameType": data1['gameType'], - "grade": data1['grade'], - "unlockState": data1['unlockState'], - "extraState": data1['extraState'], - "index": indexSongList[i] - }) + songCode.append( + { + "mcode": data1["mcode"], + "musicState": data1["musicState"], + "playCount": data1["playCount"], + "totalScore": data1["totalScore"], + "highScore": data1["highScore"], + "everHighScore": data1["everHighScore"], + "clearRate": data1["clearRate"], + "rankPoint": data1["rankPoint"], + "normalCR": data1["normalCR"], + "survivalCR": data1["survivalCR"], + "ultimateCR": data1["ultimateCR"], + "nohopeCR": data1["nohopeCR"], + "combo": data1["combo"], + "coupleUserId": data1["coupleUserId"], + "difficulty": data1["difficulty"], + "isFullCombo": data1["isFullCombo"], + "clearGaugeType": data1["clearGaugeType"], + "fieldType": data1["fieldType"], + "gameType": data1["gameType"], + "grade": data1["grade"], + "unlockState": data1["unlockState"], + "extraState": data1["extraState"], + "index": indexSongList[i], + } + ) - self.data.score.put_best_score(aimeId, data1['mcode'], self.version, indexSongList[i], songCode[0]) + self.data.score.put_best_score( + aimeId, data1["mcode"], self.version, indexSongList[i], songCode[0] + ) i += 1 - return({}) - + return {} + def handle_action_sprankreq_request(self, data: Dict) -> Dict: - uid = data['sprankreq']['uid'] + uid = data["sprankreq"]["uid"] self.logger.info(f"Get best rankings for {uid}") p = self.data.score.get_best_rankings(uid) @@ -331,90 +420,122 @@ class CxbBase(): for rank in p: if rank["song_id"] is not None: - rankList.append({ - "sc": [rank["score"],rank["song_id"]], - "rid": rank["rev_id"], - "clear": rank["clear"] - }) + rankList.append( + { + "sc": [rank["score"], rank["song_id"]], + "rid": rank["rev_id"], + "clear": rank["clear"], + } + ) else: - rankList.append({ - "sc": [rank["score"]], - "rid": rank["rev_id"], - "clear": rank["clear"] - }) + rankList.append( + { + "sc": [rank["score"]], + "rid": rank["rev_id"], + "clear": rank["clear"], + } + ) - return({ + return { "uid": data["sprankreq"]["uid"], "aid": data["sprankreq"]["aid"], "rank": rankList, - "rankx":[1,1,1] - }) - + "rankx": [1, 1, 1], + } + def handle_action_getadv_request(self, data: Dict) -> Dict: - return({"data":[{"r":"1","i":"100300","c":"20"}]}) - + return {"data": [{"r": "1", "i": "100300", "c": "20"}]} + def handle_action_getmsg_request(self, data: Dict) -> Dict: - return({"msgs":[]}) - + return {"msgs": []} + def handle_auth_logout_request(self, data: Dict) -> Dict: - return({"auth":True}) - - def handle_action_rankreg_request(self, data: Dict) -> Dict: - uid = data['rankreg']['uid'] + return {"auth": True} + + def handle_action_rankreg_request(self, data: Dict) -> Dict: + uid = data["rankreg"]["uid"] self.logger.info(f"Put {len(data['rankreg']['data'])} rankings for {uid}") - for rid in data['rankreg']['data']: - #REV S2 + for rid in data["rankreg"]["data"]: + # REV S2 if "clear" in rid: try: - self.data.score.put_ranking(user_id=uid, rev_id=int(rid["rid"]), song_id=int(rid["sc"][1]), score=int(rid["sc"][0]), clear=rid["clear"]) + self.data.score.put_ranking( + user_id=uid, + rev_id=int(rid["rid"]), + song_id=int(rid["sc"][1]), + score=int(rid["sc"][0]), + clear=rid["clear"], + ) except: - self.data.score.put_ranking(user_id=uid, rev_id=int(rid["rid"]), song_id=0, score=int(rid["sc"][0]), clear=rid["clear"]) - #REV + self.data.score.put_ranking( + user_id=uid, + rev_id=int(rid["rid"]), + song_id=0, + score=int(rid["sc"][0]), + clear=rid["clear"], + ) + # REV else: try: - self.data.score.put_ranking(user_id=uid, rev_id=int(rid["rid"]), song_id=int(rid["sc"][1]), score=int(rid["sc"][0]), clear=0) + self.data.score.put_ranking( + user_id=uid, + rev_id=int(rid["rid"]), + song_id=int(rid["sc"][1]), + score=int(rid["sc"][0]), + clear=0, + ) except: - self.data.score.put_ranking(user_id=uid, rev_id=int(rid["rid"]), song_id=0, score=int(rid["sc"][0]), clear=0) - return({}) - + self.data.score.put_ranking( + user_id=uid, + rev_id=int(rid["rid"]), + song_id=0, + score=int(rid["sc"][0]), + clear=0, + ) + return {} + def handle_action_addenergy_request(self, data: Dict) -> Dict: - uid = data['addenergy']['uid'] + uid = data["addenergy"]["uid"] self.logger.info(f"Add energy to user {uid}") profile = self.data.profile.get_profile_index(0, uid, self.version) data1 = profile["data"] p = self.data.item.get_energy(uid) energy = p["energy"] - - if not p: + + if not p: self.data.item.put_energy(uid, 5) - - return({ + + return { "class": data1["myClass"], "granted": "5", "total": "5", - "threshold": "1000" - }) + "threshold": "1000", + } array = [] - + newenergy = int(energy) + 5 self.data.item.put_energy(uid, newenergy) if int(energy) <= 995: - array.append({ - "class": data1["myClass"], - "granted": "5", - "total": str(energy), - "threshold": "1000" - }) + array.append( + { + "class": data1["myClass"], + "granted": "5", + "total": str(energy), + "threshold": "1000", + } + ) else: - array.append({ - "class": data1["myClass"], - "granted": "0", - "total": str(energy), - "threshold": "1000" - }) + array.append( + { + "class": data1["myClass"], + "granted": "0", + "total": str(energy), + "threshold": "1000", + } + ) return array[0] def handle_action_eventreq_request(self, data: Dict) -> Dict: diff --git a/titles/cxb/config.py b/titles/cxb/config.py index e83c1f1..00b7290 100644 --- a/titles/cxb/config.py +++ b/titles/cxb/config.py @@ -1,40 +1,60 @@ from core.config import CoreConfig -class CxbServerConfig(): + +class CxbServerConfig: def __init__(self, parent_config: "CxbConfig"): self.__config = parent_config - + @property def enable(self) -> bool: - return CoreConfig.get_config_field(self.__config, 'cxb', 'server', 'enable', default=True) + return CoreConfig.get_config_field( + self.__config, "cxb", "server", "enable", default=True + ) @property def loglevel(self) -> int: - return CoreConfig.str_to_loglevel(CoreConfig.get_config_field(self.__config, 'cxb', 'server', 'loglevel', default="info")) + return CoreConfig.str_to_loglevel( + CoreConfig.get_config_field( + self.__config, "cxb", "server", "loglevel", default="info" + ) + ) @property def hostname(self) -> str: - return CoreConfig.get_config_field(self.__config, 'cxb', 'server', 'hostname', default="localhost") + return CoreConfig.get_config_field( + self.__config, "cxb", "server", "hostname", default="localhost" + ) @property def ssl_enable(self) -> bool: - return CoreConfig.get_config_field(self.__config, 'cxb', 'server', 'ssl_enable', default=False) + return CoreConfig.get_config_field( + self.__config, "cxb", "server", "ssl_enable", default=False + ) @property def port(self) -> int: - return CoreConfig.get_config_field(self.__config, 'cxb', 'server', 'port', default=8082) + return CoreConfig.get_config_field( + self.__config, "cxb", "server", "port", default=8082 + ) @property def port_secure(self) -> int: - return CoreConfig.get_config_field(self.__config, 'cxb', 'server', 'port_secure', default=443) - + return CoreConfig.get_config_field( + self.__config, "cxb", "server", "port_secure", default=443 + ) + @property def ssl_cert(self) -> str: - return CoreConfig.get_config_field(self.__config, 'cxb', 'server', 'ssl_cert', default="cert/title.crt") + return CoreConfig.get_config_field( + self.__config, "cxb", "server", "ssl_cert", default="cert/title.crt" + ) @property def ssl_key(self) -> str: - return CoreConfig.get_config_field(self.__config, 'cxb', 'server', 'ssl_key', default="cert/title.key") + return CoreConfig.get_config_field( + self.__config, "cxb", "server", "ssl_key", default="cert/title.key" + ) + class CxbConfig(dict): def __init__(self) -> None: diff --git a/titles/cxb/const.py b/titles/cxb/const.py index 338b8a5..8ce5480 100644 --- a/titles/cxb/const.py +++ b/titles/cxb/const.py @@ -1,4 +1,4 @@ -class CxbConstants(): +class CxbConstants: GAME_CODE = "SDCA" CONFIG_NAME = "cxb.yaml" @@ -8,8 +8,13 @@ class CxbConstants(): VER_CROSSBEATS_REV_SUNRISE_S2 = 2 VER_CROSSBEATS_REV_SUNRISE_S2_OMNI = 3 - VERSION_NAMES = ("crossbeats REV.", "crossbeats REV. SUNRISE", "crossbeats REV. SUNRISE S2", "crossbeats REV. SUNRISE S2 Omnimix") + VERSION_NAMES = ( + "crossbeats REV.", + "crossbeats REV. SUNRISE", + "crossbeats REV. SUNRISE S2", + "crossbeats REV. SUNRISE S2 Omnimix", + ) @classmethod def game_ver_to_string(cls, ver: int): - return cls.VERSION_NAMES[ver] \ No newline at end of file + return cls.VERSION_NAMES[ver] diff --git a/titles/cxb/database.py b/titles/cxb/database.py index 8fed1dc..081e2bd 100644 --- a/titles/cxb/database.py +++ b/titles/cxb/database.py @@ -1,8 +1,8 @@ - from core.data import Data from core.config import CoreConfig from titles.cxb.schema import CxbProfileData, CxbScoreData, CxbItemData, CxbStaticData + class CxbData(Data): def __init__(self, cfg: CoreConfig) -> None: super().__init__(cfg) diff --git a/titles/cxb/index.py b/titles/cxb/index.py index ad852a8..d6ab74b 100644 --- a/titles/cxb/index.py +++ b/titles/cxb/index.py @@ -17,6 +17,7 @@ from titles.cxb.rev import CxbRev from titles.cxb.rss1 import CxbRevSunriseS1 from titles.cxb.rss2 import CxbRevSunriseS2 + class CxbServlet(resource.Resource): def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None: self.isLeaf = True @@ -24,62 +25,85 @@ class CxbServlet(resource.Resource): self.core_cfg = core_cfg self.game_cfg = CxbConfig() if path.exists(f"{cfg_dir}/{CxbConstants.CONFIG_NAME}"): - self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{CxbConstants.CONFIG_NAME}"))) + self.game_cfg.update( + yaml.safe_load(open(f"{cfg_dir}/{CxbConstants.CONFIG_NAME}")) + ) self.logger = logging.getLogger("cxb") if not hasattr(self.logger, "inited"): log_fmt_str = "[%(asctime)s] CXB | %(levelname)s | %(message)s" log_fmt = logging.Formatter(log_fmt_str) - fileHandler = TimedRotatingFileHandler("{0}/{1}.log".format(self.core_cfg.server.log_dir, "cxb"), encoding='utf8', - when="d", backupCount=10) + fileHandler = TimedRotatingFileHandler( + "{0}/{1}.log".format(self.core_cfg.server.log_dir, "cxb"), + encoding="utf8", + when="d", + backupCount=10, + ) fileHandler.setFormatter(log_fmt) - + consoleHandler = logging.StreamHandler() consoleHandler.setFormatter(log_fmt) self.logger.addHandler(fileHandler) self.logger.addHandler(consoleHandler) - + self.logger.setLevel(self.game_cfg.server.loglevel) - coloredlogs.install(level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str) + coloredlogs.install( + level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str + ) self.logger.inited = True - + self.versions = [ CxbRev(core_cfg, self.game_cfg), CxbRevSunriseS1(core_cfg, self.game_cfg), CxbRevSunriseS2(core_cfg, self.game_cfg), ] - + @classmethod - def get_allnet_info(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: + def get_allnet_info( + cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str + ) -> Tuple[bool, str, str]: game_cfg = CxbConfig() if path.exists(f"{cfg_dir}/{CxbConstants.CONFIG_NAME}"): - game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{CxbConstants.CONFIG_NAME}"))) + game_cfg.update( + yaml.safe_load(open(f"{cfg_dir}/{CxbConstants.CONFIG_NAME}")) + ) if not game_cfg.server.enable: return (False, "", "") - + if core_cfg.server.is_develop: - return (True, f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/", "") - + return ( + True, + f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/", + "", + ) + return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", "") def setup(self): if self.game_cfg.server.enable: - endpoints.serverFromString(reactor, f"tcp:{self.game_cfg.server.port}:interface={self.core_cfg.server.listen_address}")\ - .listen(server.Site(CxbServlet(self.core_cfg, self.cfg_dir))) - - if self.core_cfg.server.is_develop and self.game_cfg.server.ssl_enable: - endpoints.serverFromString(reactor, f"ssl:{self.game_cfg.server.port_secure}"\ - f":interface={self.core_cfg.server.listen_address}:privateKey={self.game_cfg.server.ssl_key}:"\ - f"certKey={self.game_cfg.server.ssl_cert}")\ - .listen(server.Site(CxbServlet(self.core_cfg, self.cfg_dir))) + endpoints.serverFromString( + reactor, + f"tcp:{self.game_cfg.server.port}:interface={self.core_cfg.server.listen_address}", + ).listen(server.Site(CxbServlet(self.core_cfg, self.cfg_dir))) - self.logger.info(f"Crossbeats title server ready on port {self.game_cfg.server.port} & {self.game_cfg.server.port_secure}") + if self.core_cfg.server.is_develop and self.game_cfg.server.ssl_enable: + endpoints.serverFromString( + reactor, + f"ssl:{self.game_cfg.server.port_secure}" + f":interface={self.core_cfg.server.listen_address}:privateKey={self.game_cfg.server.ssl_key}:" + f"certKey={self.game_cfg.server.ssl_cert}", + ).listen(server.Site(CxbServlet(self.core_cfg, self.cfg_dir))) + + self.logger.info( + f"Crossbeats title server ready on port {self.game_cfg.server.port} & {self.game_cfg.server.port_secure}" + ) else: - self.logger.info(f"Crossbeats title server ready on port {self.game_cfg.server.port}") - + self.logger.info( + f"Crossbeats title server ready on port {self.game_cfg.server.port}" + ) def render_POST(self, request: Request): version = 0 @@ -96,21 +120,28 @@ class CxbServlet(resource.Resource): except Exception as e: try: - req_json: Dict = json.loads(req_bytes.decode().replace('"', '\\"').replace("'", '"')) + req_json: Dict = json.loads( + req_bytes.decode().replace('"', '\\"').replace("'", '"') + ) except Exception as f: - self.logger.warn(f"Error decoding json: {e} / {f} - {req_url} - {req_bytes}") + self.logger.warn( + f"Error decoding json: {e} / {f} - {req_url} - {req_bytes}" + ) return b"" - + if req_json == {}: self.logger.warn(f"Empty json request to {req_url}") return b"" - + cmd = url_split[len(url_split) - 1] subcmd = list(req_json.keys())[0] if subcmd == "dldate": - if not type(req_json["dldate"]) is dict or "filetype" not in req_json["dldate"]: + if ( + not type(req_json["dldate"]) is dict + or "filetype" not in req_json["dldate"] + ): self.logger.warn(f"Malformed dldate request: {req_url} {req_json}") return b"" @@ -119,7 +150,9 @@ class CxbServlet(resource.Resource): version = int(filetype_split[0]) filetype_inflect_split = inflection.underscore(filetype).split("/") - match = re.match("^([A-Za-z]*)(\d\d\d\d)$", filetype_split[len(filetype_split) - 1]) + match = re.match( + "^([A-Za-z]*)(\d\d\d\d)$", filetype_split[len(filetype_split) - 1] + ) if match: subcmd = f"{inflection.underscore(match.group(1))}xxxx" else: @@ -128,7 +161,7 @@ class CxbServlet(resource.Resource): filetype = subcmd func_to_find = f"handle_{cmd}_{subcmd}_request" - + if version <= 10102: version_string = "Rev" internal_ver = CxbConstants.VER_CROSSBEATS_REV @@ -136,28 +169,28 @@ class CxbServlet(resource.Resource): elif version == 10113 or version == 10103: version_string = "Rev SunriseS1" internal_ver = CxbConstants.VER_CROSSBEATS_REV_SUNRISE_S1 - + elif version >= 10114 or version == 10104: version_string = "Rev SunriseS2" internal_ver = CxbConstants.VER_CROSSBEATS_REV_SUNRISE_S2 - + else: version_string = "Base" - + self.logger.info(f"{version_string} Request {req_url} -> {filetype}") self.logger.debug(req_json) try: handler = getattr(self.versions[internal_ver], func_to_find) resp = handler(req_json) - - except AttributeError as e: + + except AttributeError as e: self.logger.warning(f"Unhandled {version_string} request {req_url} - {e}") resp = {} except Exception as e: self.logger.error(f"Error handling {version_string} method {req_url} - {e}") raise - - self.logger.debug(f"{version_string} Response {resp}") + + self.logger.debug(f"{version_string} Response {resp}") return json.dumps(resp, ensure_ascii=False).encode("utf-8") diff --git a/titles/cxb/read.py b/titles/cxb/read.py index 6117f4e..cf2d8e1 100644 --- a/titles/cxb/read.py +++ b/titles/cxb/read.py @@ -8,13 +8,23 @@ from core.config import CoreConfig from titles.cxb.database import CxbData from titles.cxb.const import CxbConstants + class CxbReader(BaseReader): - def __init__(self, config: CoreConfig, version: int, bin_arg: Optional[str], opt_arg: Optional[str], extra: Optional[str]) -> None: + def __init__( + self, + config: CoreConfig, + version: int, + bin_arg: Optional[str], + opt_arg: Optional[str], + extra: Optional[str], + ) -> None: super().__init__(config, version, bin_arg, opt_arg, extra) self.data = CxbData(config) try: - self.logger.info(f"Start importer for {CxbConstants.game_ver_to_string(version)}") + self.logger.info( + f"Start importer for {CxbConstants.game_ver_to_string(version)}" + ) except IndexError: self.logger.error(f"Invalid project cxb version {version}") exit(1) @@ -28,7 +38,7 @@ class CxbReader(BaseReader): if pull_bin_ram: self.read_csv(f"{self.bin_dir}") - + def read_csv(self, bin_dir: str) -> None: self.logger.info(f"Read csv from {bin_dir}") @@ -45,18 +55,73 @@ class CxbReader(BaseReader): if not "N/A" in row["standard"]: self.logger.info(f"Added song {song_id} chart 0") - self.data.static.put_music(self.version, song_id, index, 0, title, artist, genre, int(row["standard"].replace("Standard ","").replace("N/A","0"))) + self.data.static.put_music( + self.version, + song_id, + index, + 0, + title, + artist, + genre, + int( + row["standard"] + .replace("Standard ", "") + .replace("N/A", "0") + ), + ) if not "N/A" in row["hard"]: self.logger.info(f"Added song {song_id} chart 1") - self.data.static.put_music(self.version, song_id, index, 1, title, artist, genre, int(row["hard"].replace("Hard ","").replace("N/A","0"))) + self.data.static.put_music( + self.version, + song_id, + index, + 1, + title, + artist, + genre, + int(row["hard"].replace("Hard ", "").replace("N/A", "0")), + ) if not "N/A" in row["master"]: self.logger.info(f"Added song {song_id} chart 2") - self.data.static.put_music(self.version, song_id, index, 2, title, artist, genre, int(row["master"].replace("Master ","").replace("N/A","0"))) + self.data.static.put_music( + self.version, + song_id, + index, + 2, + title, + artist, + genre, + int( + row["master"].replace("Master ", "").replace("N/A", "0") + ), + ) if not "N/A" in row["unlimited"]: self.logger.info(f"Added song {song_id} chart 3") - self.data.static.put_music(self.version, song_id, index, 3, title, artist, genre, int(row["unlimited"].replace("Unlimited ","").replace("N/A","0"))) + self.data.static.put_music( + self.version, + song_id, + index, + 3, + title, + artist, + genre, + int( + row["unlimited"] + .replace("Unlimited ", "") + .replace("N/A", "0") + ), + ) if not "N/A" in row["easy"]: self.logger.info(f"Added song {song_id} chart 4") - self.data.static.put_music(self.version, song_id, index, 4, title, artist, genre, int(row["easy"].replace("Easy ","").replace("N/A","0"))) + self.data.static.put_music( + self.version, + song_id, + index, + 4, + title, + artist, + genre, + int(row["easy"].replace("Easy ", "").replace("N/A", "0")), + ) except: self.logger.warn(f"Couldn't read csv file in {self.bin_dir}, skipping") diff --git a/titles/cxb/rev.py b/titles/cxb/rev.py index 9a24c17..c78e622 100644 --- a/titles/cxb/rev.py +++ b/titles/cxb/rev.py @@ -11,155 +11,191 @@ from titles.cxb.config import CxbConfig from titles.cxb.base import CxbBase from titles.cxb.const import CxbConstants + class CxbRev(CxbBase): def __init__(self, cfg: CoreConfig, game_cfg: CxbConfig) -> None: super().__init__(cfg, game_cfg) self.version = CxbConstants.VER_CROSSBEATS_REV - + def handle_data_path_list_request(self, data: Dict) -> Dict: - return { "data": "" } - + return {"data": ""} + def handle_data_putlog_request(self, data: Dict) -> Dict: if data["putlog"]["type"] == "ResultLog": score_data = json.loads(data["putlog"]["data"]) - userid = score_data['usid'] + userid = score_data["usid"] - self.data.score.put_playlog(userid, score_data['mcode'], score_data['difficulty'], score_data["score"], int(Decimal(score_data["clearrate"]) * 100), score_data["flawless"], score_data["super"], score_data["cool"], score_data["fast"], score_data["fast2"], score_data["slow"], score_data["slow2"], score_data["fail"], score_data["combo"]) - return({"data":True}) - return {"data": True } + self.data.score.put_playlog( + userid, + score_data["mcode"], + score_data["difficulty"], + score_data["score"], + int(Decimal(score_data["clearrate"]) * 100), + score_data["flawless"], + score_data["super"], + score_data["cool"], + score_data["fast"], + score_data["fast2"], + score_data["slow"], + score_data["slow2"], + score_data["fail"], + score_data["combo"], + ) + return {"data": True} + return {"data": True} - @cached(lifetime=86400) + @cached(lifetime=86400) def handle_data_music_list_request(self, data: Dict) -> Dict: ret_str = "" with open(r"titles/cxb/rev_data/MusicArchiveList.csv") as music: lines = music.readlines() for line in lines: - line_split = line.split(',') + line_split = line.split(",") ret_str += f"{line_split[0]},{line_split[1]},{line_split[2]},{line_split[3]},{line_split[4]},{line_split[5]},{line_split[6]},{line_split[7]},{line_split[8]},{line_split[9]},{line_split[10]},{line_split[11]},{line_split[12]},{line_split[13]},{line_split[14]},\r\n" - - return({"data":ret_str}) - + + return {"data": ret_str} + @cached(lifetime=86400) def handle_data_item_list_icon_request(self, data: Dict) -> Dict: ret_str = "\r\n#ItemListIcon\r\n" - with open(r"titles/cxb/rev_data/Item/ItemArchiveList_Icon.csv", encoding="utf-8") as item: + with open( + r"titles/cxb/rev_data/Item/ItemArchiveList_Icon.csv", encoding="utf-8" + ) as item: lines = item.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) + return {"data": ret_str} - @cached(lifetime=86400) + @cached(lifetime=86400) def handle_data_item_list_skin_notes_request(self, data: Dict) -> Dict: ret_str = "\r\n#ItemListSkinNotes\r\n" - with open(r"titles/cxb/rev_data/Item/ItemArchiveList_SkinNotes.csv", encoding="utf-8") as item: + with open( + r"titles/cxb/rev_data/Item/ItemArchiveList_SkinNotes.csv", encoding="utf-8" + ) as item: lines = item.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) + return {"data": ret_str} - @cached(lifetime=86400) + @cached(lifetime=86400) def handle_data_item_list_skin_effect_request(self, data: Dict) -> Dict: ret_str = "\r\n#ItemListSkinEffect\r\n" - with open(r"titles/cxb/rev_data/Item/ItemArchiveList_SkinEffect.csv", encoding="utf-8") as item: + with open( + r"titles/cxb/rev_data/Item/ItemArchiveList_SkinEffect.csv", encoding="utf-8" + ) as item: lines = item.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) + return {"data": ret_str} - @cached(lifetime=86400) + @cached(lifetime=86400) def handle_data_item_list_skin_bg_request(self, data: Dict) -> Dict: ret_str = "\r\n#ItemListSkinBg\r\n" - with open(r"titles/cxb/rev_data/Item/ItemArchiveList_SkinBg.csv", encoding="utf-8") as item: + with open( + r"titles/cxb/rev_data/Item/ItemArchiveList_SkinBg.csv", encoding="utf-8" + ) as item: lines = item.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) + return {"data": ret_str} - @cached(lifetime=86400) + @cached(lifetime=86400) def handle_data_item_list_title_request(self, data: Dict) -> Dict: ret_str = "\r\n#ItemListTitle\r\n" - with open(r"titles/cxb/rev_data/Item/ItemList_Title.csv", encoding="shift-jis") as item: + with open( + r"titles/cxb/rev_data/Item/ItemList_Title.csv", encoding="shift-jis" + ) as item: lines = item.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) + return {"data": ret_str} - @cached(lifetime=86400) + @cached(lifetime=86400) def handle_data_shop_list_music_request(self, data: Dict) -> Dict: ret_str = "\r\n#ShopListMusic\r\n" - with open(r"titles/cxb/rev_data/Shop/ShopList_Music.csv", encoding="shift-jis") as shop: + with open( + r"titles/cxb/rev_data/Shop/ShopList_Music.csv", encoding="shift-jis" + ) as shop: lines = shop.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) + return {"data": ret_str} - @cached(lifetime=86400) + @cached(lifetime=86400) def handle_data_shop_list_icon_request(self, data: Dict) -> Dict: ret_str = "\r\n#ShopListIcon\r\n" - with open(r"titles/cxb/rev_data/Shop/ShopList_Icon.csv", encoding="shift-jis") as shop: + with open( + r"titles/cxb/rev_data/Shop/ShopList_Icon.csv", encoding="shift-jis" + ) as shop: lines = shop.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) + return {"data": ret_str} - @cached(lifetime=86400) + @cached(lifetime=86400) def handle_data_shop_list_title_request(self, data: Dict) -> Dict: ret_str = "\r\n#ShopListTitle\r\n" - with open(r"titles/cxb/rev_data/Shop/ShopList_Title.csv", encoding="shift-jis") as shop: + with open( + r"titles/cxb/rev_data/Shop/ShopList_Title.csv", encoding="shift-jis" + ) as shop: lines = shop.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) - - def handle_data_shop_list_skin_hud_request(self, data: Dict) -> Dict: - return({"data":""}) - - def handle_data_shop_list_skin_arrow_request(self, data: Dict) -> Dict: - return({"data":""}) - - def handle_data_shop_list_skin_hit_request(self, data: Dict) -> Dict: - return({"data":""}) + return {"data": ret_str} - @cached(lifetime=86400) + def handle_data_shop_list_skin_hud_request(self, data: Dict) -> Dict: + return {"data": ""} + + def handle_data_shop_list_skin_arrow_request(self, data: Dict) -> Dict: + return {"data": ""} + + def handle_data_shop_list_skin_hit_request(self, data: Dict) -> Dict: + return {"data": ""} + + @cached(lifetime=86400) def handle_data_shop_list_sale_request(self, data: Dict) -> Dict: ret_str = "\r\n#ShopListSale\r\n" - with open(r"titles/cxb/rev_data/Shop/ShopList_Sale.csv", encoding="shift-jis") as shop: + with open( + r"titles/cxb/rev_data/Shop/ShopList_Sale.csv", encoding="shift-jis" + ) as shop: lines = shop.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) + return {"data": ret_str} def handle_data_extra_stage_list_request(self, data: Dict) -> Dict: - return({"data":""}) + return {"data": ""} - @cached(lifetime=86400) + @cached(lifetime=86400) def handle_data_exxxxx_request(self, data: Dict) -> Dict: extra_num = int(data["dldate"]["filetype"][-4:]) ret_str = "" - with open(fr"titles/cxb/rev_data/Ex000{extra_num}.csv", encoding="shift-jis") as stage: + with open( + rf"titles/cxb/rev_data/Ex000{extra_num}.csv", encoding="shift-jis" + ) as stage: lines = stage.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) - - def handle_data_bonus_list10100_request(self, data: Dict) -> Dict: - return({"data": ""}) - - def handle_data_free_coupon_request(self, data: Dict) -> Dict: - return({"data": ""}) + return {"data": ret_str} - @cached(lifetime=86400) + def handle_data_bonus_list10100_request(self, data: Dict) -> Dict: + return {"data": ""} + + def handle_data_free_coupon_request(self, data: Dict) -> Dict: + return {"data": ""} + + @cached(lifetime=86400) def handle_data_news_list_request(self, data: Dict) -> Dict: ret_str = "" with open(r"titles/cxb/rev_data/NewsList.csv", encoding="UTF-8") as news: lines = news.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) - + return {"data": ret_str} + def handle_data_tips_request(self, data: Dict) -> Dict: - return({"data":""}) - + return {"data": ""} + @cached(lifetime=86400) def handle_data_license_request(self, data: Dict) -> Dict: ret_str = "" @@ -167,90 +203,104 @@ class CxbRev(CxbBase): lines = lic.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) + return {"data": ret_str} - @cached(lifetime=86400) + @cached(lifetime=86400) def handle_data_course_list_request(self, data: Dict) -> Dict: ret_str = "" - with open(r"titles/cxb/rev_data/Course/CourseList.csv", encoding="UTF-8") as course: + with open( + r"titles/cxb/rev_data/Course/CourseList.csv", encoding="UTF-8" + ) as course: lines = course.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) + return {"data": ret_str} - @cached(lifetime=86400) + @cached(lifetime=86400) def handle_data_csxxxx_request(self, data: Dict) -> Dict: # Removed the CSVs since the format isnt quite right extra_num = int(data["dldate"]["filetype"][-4:]) ret_str = "" - with open(fr"titles/cxb/rev_data/Course/Cs000{extra_num}.csv", encoding="shift-jis") as course: + with open( + rf"titles/cxb/rev_data/Course/Cs000{extra_num}.csv", encoding="shift-jis" + ) as course: lines = course.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) + return {"data": ret_str} - @cached(lifetime=86400) + @cached(lifetime=86400) def handle_data_mission_list_request(self, data: Dict) -> Dict: ret_str = "" - with open(r"titles/cxb/rev_data/MissionList.csv", encoding="shift-jis") as mission: + with open( + r"titles/cxb/rev_data/MissionList.csv", encoding="shift-jis" + ) as mission: lines = mission.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) - - def handle_data_mission_bonus_request(self, data: Dict) -> Dict: - return({"data": ""}) - - def handle_data_unlimited_mission_request(self, data: Dict) -> Dict: - return({"data": ""}) + return {"data": ret_str} - @cached(lifetime=86400) + def handle_data_mission_bonus_request(self, data: Dict) -> Dict: + return {"data": ""} + + def handle_data_unlimited_mission_request(self, data: Dict) -> Dict: + return {"data": ""} + + @cached(lifetime=86400) def handle_data_event_list_request(self, data: Dict) -> Dict: ret_str = "" - with open(r"titles/cxb/rev_data/Event/EventArchiveList.csv", encoding="shift-jis") as mission: + with open( + r"titles/cxb/rev_data/Event/EventArchiveList.csv", encoding="shift-jis" + ) as mission: lines = mission.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) + return {"data": ret_str} def handle_data_event_music_list_request(self, data: Dict) -> Dict: - return({"data": ""}) - - def handle_data_event_mission_list_request(self, data: Dict) -> Dict: - return({"data": ""}) - - def handle_data_event_achievement_single_high_score_list_request(self, data: Dict) -> Dict: - return({"data": ""}) - - def handle_data_event_achievement_single_accumulation_request(self, data: Dict) -> Dict: - return({"data": ""}) - - def handle_data_event_ranking_high_score_list_request(self, data: Dict) -> Dict: - return({"data": ""}) - - def handle_data_event_ranking_accumulation_list_request(self, data: Dict) -> Dict: - return({"data": ""}) - - def handle_data_event_ranking_stamp_list_request(self, data: Dict) -> Dict: - return({"data": ""}) - - def handle_data_event_ranking_store_list_request(self, data: Dict) -> Dict: - return({"data": ""}) - - def handle_data_event_ranking_area_list_request(self, data: Dict) -> Dict: - return({"data": ""}) + return {"data": ""} - @cached(lifetime=86400) + def handle_data_event_mission_list_request(self, data: Dict) -> Dict: + return {"data": ""} + + def handle_data_event_achievement_single_high_score_list_request( + self, data: Dict + ) -> Dict: + return {"data": ""} + + def handle_data_event_achievement_single_accumulation_request( + self, data: Dict + ) -> Dict: + return {"data": ""} + + def handle_data_event_ranking_high_score_list_request(self, data: Dict) -> Dict: + return {"data": ""} + + def handle_data_event_ranking_accumulation_list_request(self, data: Dict) -> Dict: + return {"data": ""} + + def handle_data_event_ranking_stamp_list_request(self, data: Dict) -> Dict: + return {"data": ""} + + def handle_data_event_ranking_store_list_request(self, data: Dict) -> Dict: + return {"data": ""} + + def handle_data_event_ranking_area_list_request(self, data: Dict) -> Dict: + return {"data": ""} + + @cached(lifetime=86400) def handle_data_event_stamp_list_request(self, data: Dict) -> Dict: ret_str = "" - with open(r"titles/cxb/rev_data/Event/EventStampList.csv", encoding="shift-jis") as event: + with open( + r"titles/cxb/rev_data/Event/EventStampList.csv", encoding="shift-jis" + ) as event: lines = event.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) - + return {"data": ret_str} + def handle_data_event_stamp_map_list_csxxxx_request(self, data: Dict) -> Dict: - return({"data": "1,2,1,1,2,3,9,5,6,7,8,9,10,\r\n"}) - + return {"data": "1,2,1,1,2,3,9,5,6,7,8,9,10,\r\n"} + def handle_data_server_state_request(self, data: Dict) -> Dict: - return({"data": True}) + return {"data": True} diff --git a/titles/cxb/rss1.py b/titles/cxb/rss1.py index e480238..ba428f7 100644 --- a/titles/cxb/rss1.py +++ b/titles/cxb/rss1.py @@ -11,128 +11,147 @@ from titles.cxb.config import CxbConfig from titles.cxb.base import CxbBase from titles.cxb.const import CxbConstants + class CxbRevSunriseS1(CxbBase): def __init__(self, cfg: CoreConfig, game_cfg: CxbConfig) -> None: super().__init__(cfg, game_cfg) self.version = CxbConstants.VER_CROSSBEATS_REV_SUNRISE_S1 - - def handle_data_path_list_request(self, data: Dict) -> Dict: - return { "data": "" } - @cached(lifetime=86400) + def handle_data_path_list_request(self, data: Dict) -> Dict: + return {"data": ""} + + @cached(lifetime=86400) def handle_data_music_list_request(self, data: Dict) -> Dict: ret_str = "" with open(r"titles/cxb/rss1_data/MusicArchiveList.csv") as music: lines = music.readlines() for line in lines: - line_split = line.split(',') + line_split = line.split(",") ret_str += f"{line_split[0]},{line_split[1]},{line_split[2]},{line_split[3]},{line_split[4]},{line_split[5]},{line_split[6]},{line_split[7]},{line_split[8]},{line_split[9]},{line_split[10]},{line_split[11]},{line_split[12]},{line_split[13]},{line_split[14]},\r\n" - - return({"data":ret_str}) - @cached(lifetime=86400) + return {"data": ret_str} + + @cached(lifetime=86400) def handle_data_item_list_detail_request(self, data: Dict) -> Dict: - #ItemListIcon load + # ItemListIcon load ret_str = "#ItemListIcon\r\n" - with open(r"titles/cxb/rss1_data/Item/ItemList_Icon.csv", encoding="shift-jis") as item: + with open( + r"titles/cxb/rss1_data/Item/ItemList_Icon.csv", encoding="shift-jis" + ) as item: lines = item.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - #ItemListTitle load + # ItemListTitle load ret_str += "\r\n#ItemListTitle\r\n" - with open(r"titles/cxb/rss1_data/Item/ItemList_Title.csv", encoding="shift-jis") as item: + with open( + r"titles/cxb/rss1_data/Item/ItemList_Title.csv", encoding="shift-jis" + ) as item: lines = item.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) + return {"data": ret_str} - @cached(lifetime=86400) + @cached(lifetime=86400) def handle_data_shop_list_detail_request(self, data: Dict) -> Dict: - #ShopListIcon load + # ShopListIcon load ret_str = "#ShopListIcon\r\n" - with open(r"titles/cxb/rss1_data/Shop/ShopList_Icon.csv", encoding="utf-8") as shop: + with open( + r"titles/cxb/rss1_data/Shop/ShopList_Icon.csv", encoding="utf-8" + ) as shop: lines = shop.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - - #ShopListMusic load - ret_str += "\r\n#ShopListMusic\r\n" - with open(r"titles/cxb/rss1_data/Shop/ShopList_Music.csv", encoding="utf-8") as shop: - lines = shop.readlines() - for line in lines: - ret_str += f"{line[:-1]}\r\n" - - #ShopListSale load - ret_str += "\r\n#ShopListSale\r\n" - with open(r"titles/cxb/rss1_data/Shop/ShopList_Sale.csv", encoding="shift-jis") as shop: - lines = shop.readlines() - for line in lines: - ret_str += f"{line[:-1]}\r\n" - - #ShopListSkinBg load - ret_str += "\r\n#ShopListSkinBg\r\n" - with open(r"titles/cxb/rss1_data/Shop/ShopList_SkinBg.csv", encoding="shift-jis") as shop: - lines = shop.readlines() - for line in lines: - ret_str += f"{line[:-1]}\r\n" - - #ShopListSkinEffect load - ret_str += "\r\n#ShopListSkinEffect\r\n" - with open(r"titles/cxb/rss1_data/Shop/ShopList_SkinEffect.csv", encoding="shift-jis") as shop: - lines = shop.readlines() - for line in lines: - ret_str += f"{line[:-1]}\r\n" - - #ShopListSkinNotes load - ret_str += "\r\n#ShopListSkinNotes\r\n" - with open(r"titles/cxb/rss1_data/Shop/ShopList_SkinNotes.csv", encoding="shift-jis") as shop: - lines = shop.readlines() - for line in lines: - ret_str += f"{line[:-1]}\r\n" - - #ShopListTitle load - ret_str += "\r\n#ShopListTitle\r\n" - with open(r"titles/cxb/rss1_data/Shop/ShopList_Title.csv", encoding="utf-8") as shop: - lines = shop.readlines() - for line in lines: - ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) - - def handle_data_extra_stage_list_request(self, data: Dict) -> Dict: - return({"data":""}) - - def handle_data_ex0001_request(self, data: Dict) -> Dict: - return({"data":""}) - - def handle_data_one_more_extra_list_request(self, data: Dict) -> Dict: - return({"data":""}) - - def handle_data_bonus_list10100_request(self, data: Dict) -> Dict: - return({"data":""}) - - def handle_data_oe0001_request(self, data: Dict) -> Dict: - return({"data":""}) - - def handle_data_free_coupon_request(self, data: Dict) -> Dict: - return({"data":""}) - @cached(lifetime=86400) + # ShopListMusic load + ret_str += "\r\n#ShopListMusic\r\n" + with open( + r"titles/cxb/rss1_data/Shop/ShopList_Music.csv", encoding="utf-8" + ) as shop: + lines = shop.readlines() + for line in lines: + ret_str += f"{line[:-1]}\r\n" + + # ShopListSale load + ret_str += "\r\n#ShopListSale\r\n" + with open( + r"titles/cxb/rss1_data/Shop/ShopList_Sale.csv", encoding="shift-jis" + ) as shop: + lines = shop.readlines() + for line in lines: + ret_str += f"{line[:-1]}\r\n" + + # ShopListSkinBg load + ret_str += "\r\n#ShopListSkinBg\r\n" + with open( + r"titles/cxb/rss1_data/Shop/ShopList_SkinBg.csv", encoding="shift-jis" + ) as shop: + lines = shop.readlines() + for line in lines: + ret_str += f"{line[:-1]}\r\n" + + # ShopListSkinEffect load + ret_str += "\r\n#ShopListSkinEffect\r\n" + with open( + r"titles/cxb/rss1_data/Shop/ShopList_SkinEffect.csv", encoding="shift-jis" + ) as shop: + lines = shop.readlines() + for line in lines: + ret_str += f"{line[:-1]}\r\n" + + # ShopListSkinNotes load + ret_str += "\r\n#ShopListSkinNotes\r\n" + with open( + r"titles/cxb/rss1_data/Shop/ShopList_SkinNotes.csv", encoding="shift-jis" + ) as shop: + lines = shop.readlines() + for line in lines: + ret_str += f"{line[:-1]}\r\n" + + # ShopListTitle load + ret_str += "\r\n#ShopListTitle\r\n" + with open( + r"titles/cxb/rss1_data/Shop/ShopList_Title.csv", encoding="utf-8" + ) as shop: + lines = shop.readlines() + for line in lines: + ret_str += f"{line[:-1]}\r\n" + return {"data": ret_str} + + def handle_data_extra_stage_list_request(self, data: Dict) -> Dict: + return {"data": ""} + + def handle_data_ex0001_request(self, data: Dict) -> Dict: + return {"data": ""} + + def handle_data_one_more_extra_list_request(self, data: Dict) -> Dict: + return {"data": ""} + + def handle_data_bonus_list10100_request(self, data: Dict) -> Dict: + return {"data": ""} + + def handle_data_oe0001_request(self, data: Dict) -> Dict: + return {"data": ""} + + def handle_data_free_coupon_request(self, data: Dict) -> Dict: + return {"data": ""} + + @cached(lifetime=86400) def handle_data_news_list_request(self, data: Dict) -> Dict: ret_str = "" with open(r"titles/cxb/rss1_data/NewsList.csv", encoding="UTF-8") as news: lines = news.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) + return {"data": ret_str} def handle_data_tips_request(self, data: Dict) -> Dict: - return({"data":""}) - + return {"data": ""} + def handle_data_release_info_list_request(self, data: Dict) -> Dict: - return({"data":""}) - + return {"data": ""} + @cached(lifetime=86400) def handle_data_random_music_list_request(self, data: Dict) -> Dict: ret_str = "" @@ -141,10 +160,12 @@ class CxbRevSunriseS1(CxbBase): count = 0 for line in lines: line_split = line.split(",") - ret_str += str(count) + "," + line_split[0] + "," + line_split[0] + ",\r\n" + ret_str += ( + str(count) + "," + line_split[0] + "," + line_split[0] + ",\r\n" + ) + + return {"data": ret_str} - return({"data":ret_str}) - @cached(lifetime=86400) def handle_data_license_request(self, data: Dict) -> Dict: ret_str = "" @@ -152,54 +173,58 @@ class CxbRevSunriseS1(CxbBase): lines = licenses.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) - + return {"data": ret_str} + @cached(lifetime=86400) def handle_data_course_list_request(self, data: Dict) -> Dict: ret_str = "" - with open(r"titles/cxb/rss1_data/Course/CourseList.csv", encoding="UTF-8") as course: + with open( + r"titles/cxb/rss1_data/Course/CourseList.csv", encoding="UTF-8" + ) as course: lines = course.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) + return {"data": ret_str} @cached(lifetime=86400) def handle_data_csxxxx_request(self, data: Dict) -> Dict: extra_num = int(data["dldate"]["filetype"][-4:]) ret_str = "" - with open(fr"titles/cxb/rss1_data/Course/Cs{extra_num}.csv", encoding="shift-jis") as course: + with open( + rf"titles/cxb/rss1_data/Course/Cs{extra_num}.csv", encoding="shift-jis" + ) as course: lines = course.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) - + return {"data": ret_str} + def handle_data_mission_list_request(self, data: Dict) -> Dict: - return({"data":""}) - + return {"data": ""} + def handle_data_mission_bonus_request(self, data: Dict) -> Dict: - return({"data":""}) - + return {"data": ""} + def handle_data_unlimited_mission_request(self, data: Dict) -> Dict: - return({"data":""}) - + return {"data": ""} + def handle_data_partner_list_request(self, data: Dict) -> Dict: ret_str = "" # Lord forgive me for the sins I am about to commit - for i in range(0,10): + for i in range(0, 10): ret_str += f"80000{i},{i},{i},0,10000,,\r\n" ret_str += f"80000{i},{i},{i},1,10500,,\r\n" ret_str += f"80000{i},{i},{i},2,10500,,\r\n" - for i in range(10,13): + for i in range(10, 13): ret_str += f"8000{i},{i},{i},0,10000,,\r\n" ret_str += f"8000{i},{i},{i},1,10500,,\r\n" ret_str += f"8000{i},{i},{i},2,10500,,\r\n" - ret_str +="\r\n---\r\n0,150,100,100,100,100,\r\n" - for i in range(1,130): - ret_str +=f"{i},100,100,100,100,100,\r\n" - + ret_str += "\r\n---\r\n0,150,100,100,100,100,\r\n" + for i in range(1, 130): + ret_str += f"{i},100,100,100,100,100,\r\n" + ret_str += "---\r\n" - return({"data": ret_str}) - + return {"data": ret_str} + @cached(lifetime=86400) def handle_data_partnerxxxx_request(self, data: Dict) -> Dict: partner_num = int(data["dldate"]["filetype"][-4:]) @@ -208,50 +233,54 @@ class CxbRevSunriseS1(CxbBase): lines = partner.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data": ret_str}) - + return {"data": ret_str} + def handle_data_server_state_request(self, data: Dict) -> Dict: - return({"data": True}) - + return {"data": True} + def handle_data_settings_request(self, data: Dict) -> Dict: - return({"data": "2,\r\n"}) + return {"data": "2,\r\n"} def handle_data_story_list_request(self, data: Dict) -> Dict: - #story id, story name, game version, start time, end time, course arc, unlock flag, song mcode for menu + # story id, story name, game version, start time, end time, course arc, unlock flag, song mcode for menu ret_str = "\r\n" - ret_str += f"st0000,RISING PURPLE,10104,1464370990,4096483201,Cs1000,-1,purple,\r\n" - ret_str += f"st0001,REBEL YELL,10104,1467999790,4096483201,Cs1000,-1,chaset,\r\n" + ret_str += ( + f"st0000,RISING PURPLE,10104,1464370990,4096483201,Cs1000,-1,purple,\r\n" + ) + ret_str += ( + f"st0001,REBEL YELL,10104,1467999790,4096483201,Cs1000,-1,chaset,\r\n" + ) ret_str += f"st0002,REMNANT,10104,1502127790,4096483201,Cs1000,-1,overcl,\r\n" - return({"data": ret_str}) - + return {"data": ret_str} + def handle_data_stxxxx_request(self, data: Dict) -> Dict: story_num = int(data["dldate"]["filetype"][-4:]) ret_str = "" - for i in range(1,11): - ret_str +=f"{i},st000{story_num}_{i-1},,,,,,,,,,,,,,,,1,,-1,1,\r\n" - return({"data": ret_str}) + for i in range(1, 11): + ret_str += f"{i},st000{story_num}_{i-1},,,,,,,,,,,,,,,,1,,-1,1,\r\n" + return {"data": ret_str} def handle_data_event_stamp_list_request(self, data: Dict) -> Dict: - return({"data":"Cs1032,1,1,1,1,1,1,1,1,1,1,\r\n"}) + return {"data": "Cs1032,1,1,1,1,1,1,1,1,1,1,\r\n"} def handle_data_premium_list_request(self, data: Dict) -> Dict: - return({"data": "1,,,,10,,,,,99,,,,,,,,,100,,\r\n"}) + return {"data": "1,,,,10,,,,,99,,,,,,,,,100,,\r\n"} def handle_data_event_list_request(self, data: Dict) -> Dict: - return({"data":""}) + return {"data": ""} def handle_data_event_detail_list_request(self, data: Dict) -> Dict: event_id = data["dldate"]["filetype"].split("/")[2] if "EventStampMapListCs1002" in event_id: - return({"data":"1,2,1,1,2,3,9,5,6,7,8,9,10,\r\n"}) + return {"data": "1,2,1,1,2,3,9,5,6,7,8,9,10,\r\n"} elif "EventStampList" in event_id: - return({"data":"Cs1002,1,1,1,1,1,1,1,1,1,1,\r\n"}) + return {"data": "Cs1002,1,1,1,1,1,1,1,1,1,1,\r\n"} else: - return({"data":""}) - + return {"data": ""} + def handle_data_event_stamp_map_list_csxxxx_request(self, data: Dict) -> Dict: event_id = data["dldate"]["filetype"].split("/")[2] if "EventStampMapListCs1002" in event_id: - return({"data":"1,2,1,1,2,3,9,5,6,7,8,9,10,\r\n"}) + return {"data": "1,2,1,1,2,3,9,5,6,7,8,9,10,\r\n"} else: - return({"data":""}) + return {"data": ""} diff --git a/titles/cxb/rss2.py b/titles/cxb/rss2.py index 5ae98f4..e32e762 100644 --- a/titles/cxb/rss2.py +++ b/titles/cxb/rss2.py @@ -11,128 +11,147 @@ from titles.cxb.config import CxbConfig from titles.cxb.base import CxbBase from titles.cxb.const import CxbConstants + class CxbRevSunriseS2(CxbBase): def __init__(self, cfg: CoreConfig, game_cfg: CxbConfig) -> None: super().__init__(cfg, game_cfg) self.version = CxbConstants.VER_CROSSBEATS_REV_SUNRISE_S2_OMNI - - def handle_data_path_list_request(self, data: Dict) -> Dict: - return { "data": "" } - @cached(lifetime=86400) + def handle_data_path_list_request(self, data: Dict) -> Dict: + return {"data": ""} + + @cached(lifetime=86400) def handle_data_music_list_request(self, data: Dict) -> Dict: ret_str = "" with open(r"titles/cxb/rss2_data/MusicArchiveList.csv") as music: lines = music.readlines() for line in lines: - line_split = line.split(',') + line_split = line.split(",") ret_str += f"{line_split[0]},{line_split[1]},{line_split[2]},{line_split[3]},{line_split[4]},{line_split[5]},{line_split[6]},{line_split[7]},{line_split[8]},{line_split[9]},{line_split[10]},{line_split[11]},{line_split[12]},{line_split[13]},{line_split[14]},\r\n" - - return({"data":ret_str}) - @cached(lifetime=86400) + return {"data": ret_str} + + @cached(lifetime=86400) def handle_data_item_list_detail_request(self, data: Dict) -> Dict: - #ItemListIcon load + # ItemListIcon load ret_str = "#ItemListIcon\r\n" - with open(r"titles/cxb/rss2_data/Item/ItemList_Icon.csv", encoding="utf-8") as item: + with open( + r"titles/cxb/rss2_data/Item/ItemList_Icon.csv", encoding="utf-8" + ) as item: lines = item.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - - #ItemListTitle load + + # ItemListTitle load ret_str += "\r\n#ItemListTitle\r\n" - with open(r"titles/cxb/rss2_data/Item/ItemList_Title.csv", encoding="utf-8") as item: + with open( + r"titles/cxb/rss2_data/Item/ItemList_Title.csv", encoding="utf-8" + ) as item: lines = item.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) + return {"data": ret_str} - @cached(lifetime=86400) + @cached(lifetime=86400) def handle_data_shop_list_detail_request(self, data: Dict) -> Dict: - #ShopListIcon load + # ShopListIcon load ret_str = "#ShopListIcon\r\n" - with open(r"titles/cxb/rss2_data/Shop/ShopList_Icon.csv", encoding="utf-8") as shop: + with open( + r"titles/cxb/rss2_data/Shop/ShopList_Icon.csv", encoding="utf-8" + ) as shop: lines = shop.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - - #ShopListMusic load - ret_str += "\r\n#ShopListMusic\r\n" - with open(r"titles/cxb/rss2_data/Shop/ShopList_Music.csv", encoding="utf-8") as shop: - lines = shop.readlines() - for line in lines: - ret_str += f"{line[:-1]}\r\n" - - #ShopListSale load - ret_str += "\r\n#ShopListSale\r\n" - with open(r"titles/cxb/rss2_data/Shop/ShopList_Sale.csv", encoding="shift-jis") as shop: - lines = shop.readlines() - for line in lines: - ret_str += f"{line[:-1]}\r\n" - - #ShopListSkinBg load - ret_str += "\r\n#ShopListSkinBg\r\n" - with open(r"titles/cxb/rss2_data/Shop/ShopList_SkinBg.csv", encoding="shift-jis") as shop: - lines = shop.readlines() - for line in lines: - ret_str += f"{line[:-1]}\r\n" - - #ShopListSkinEffect load - ret_str += "\r\n#ShopListSkinEffect\r\n" - with open(r"titles/cxb/rss2_data/Shop/ShopList_SkinEffect.csv", encoding="shift-jis") as shop: - lines = shop.readlines() - for line in lines: - ret_str += f"{line[:-1]}\r\n" - - #ShopListSkinNotes load - ret_str += "\r\n#ShopListSkinNotes\r\n" - with open(r"titles/cxb/rss2_data/Shop/ShopList_SkinNotes.csv", encoding="shift-jis") as shop: - lines = shop.readlines() - for line in lines: - ret_str += f"{line[:-1]}\r\n" - - #ShopListTitle load - ret_str += "\r\n#ShopListTitle\r\n" - with open(r"titles/cxb/rss2_data/Shop/ShopList_Title.csv", encoding="utf-8") as shop: - lines = shop.readlines() - for line in lines: - ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) - - def handle_data_extra_stage_list_request(self, data: Dict) -> Dict: - return({"data":""}) - - def handle_data_ex0001_request(self, data: Dict) -> Dict: - return({"data":""}) - - def handle_data_one_more_extra_list_request(self, data: Dict) -> Dict: - return({"data":""}) - - def handle_data_bonus_list10100_request(self, data: Dict) -> Dict: - return({"data":""}) - - def handle_data_oe0001_request(self, data: Dict) -> Dict: - return({"data":""}) - - def handle_data_free_coupon_request(self, data: Dict) -> Dict: - return({"data":""}) - @cached(lifetime=86400) + # ShopListMusic load + ret_str += "\r\n#ShopListMusic\r\n" + with open( + r"titles/cxb/rss2_data/Shop/ShopList_Music.csv", encoding="utf-8" + ) as shop: + lines = shop.readlines() + for line in lines: + ret_str += f"{line[:-1]}\r\n" + + # ShopListSale load + ret_str += "\r\n#ShopListSale\r\n" + with open( + r"titles/cxb/rss2_data/Shop/ShopList_Sale.csv", encoding="shift-jis" + ) as shop: + lines = shop.readlines() + for line in lines: + ret_str += f"{line[:-1]}\r\n" + + # ShopListSkinBg load + ret_str += "\r\n#ShopListSkinBg\r\n" + with open( + r"titles/cxb/rss2_data/Shop/ShopList_SkinBg.csv", encoding="shift-jis" + ) as shop: + lines = shop.readlines() + for line in lines: + ret_str += f"{line[:-1]}\r\n" + + # ShopListSkinEffect load + ret_str += "\r\n#ShopListSkinEffect\r\n" + with open( + r"titles/cxb/rss2_data/Shop/ShopList_SkinEffect.csv", encoding="shift-jis" + ) as shop: + lines = shop.readlines() + for line in lines: + ret_str += f"{line[:-1]}\r\n" + + # ShopListSkinNotes load + ret_str += "\r\n#ShopListSkinNotes\r\n" + with open( + r"titles/cxb/rss2_data/Shop/ShopList_SkinNotes.csv", encoding="shift-jis" + ) as shop: + lines = shop.readlines() + for line in lines: + ret_str += f"{line[:-1]}\r\n" + + # ShopListTitle load + ret_str += "\r\n#ShopListTitle\r\n" + with open( + r"titles/cxb/rss2_data/Shop/ShopList_Title.csv", encoding="utf-8" + ) as shop: + lines = shop.readlines() + for line in lines: + ret_str += f"{line[:-1]}\r\n" + return {"data": ret_str} + + def handle_data_extra_stage_list_request(self, data: Dict) -> Dict: + return {"data": ""} + + def handle_data_ex0001_request(self, data: Dict) -> Dict: + return {"data": ""} + + def handle_data_one_more_extra_list_request(self, data: Dict) -> Dict: + return {"data": ""} + + def handle_data_bonus_list10100_request(self, data: Dict) -> Dict: + return {"data": ""} + + def handle_data_oe0001_request(self, data: Dict) -> Dict: + return {"data": ""} + + def handle_data_free_coupon_request(self, data: Dict) -> Dict: + return {"data": ""} + + @cached(lifetime=86400) def handle_data_news_list_request(self, data: Dict) -> Dict: ret_str = "" with open(r"titles/cxb/rss2_data/NewsList.csv", encoding="UTF-8") as news: lines = news.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) + return {"data": ret_str} def handle_data_tips_request(self, data: Dict) -> Dict: - return({"data":""}) - + return {"data": ""} + def handle_data_release_info_list_request(self, data: Dict) -> Dict: - return({"data":""}) - + return {"data": ""} + @cached(lifetime=86400) def handle_data_random_music_list_request(self, data: Dict) -> Dict: ret_str = "" @@ -141,10 +160,12 @@ class CxbRevSunriseS2(CxbBase): count = 0 for line in lines: line_split = line.split(",") - ret_str += str(count) + "," + line_split[0] + "," + line_split[0] + ",\r\n" + ret_str += ( + str(count) + "," + line_split[0] + "," + line_split[0] + ",\r\n" + ) + + return {"data": ret_str} - return({"data":ret_str}) - @cached(lifetime=86400) def handle_data_license_request(self, data: Dict) -> Dict: ret_str = "" @@ -152,54 +173,58 @@ class CxbRevSunriseS2(CxbBase): lines = licenses.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) - + return {"data": ret_str} + @cached(lifetime=86400) def handle_data_course_list_request(self, data: Dict) -> Dict: ret_str = "" - with open(r"titles/cxb/rss2_data/Course/CourseList.csv", encoding="UTF-8") as course: + with open( + r"titles/cxb/rss2_data/Course/CourseList.csv", encoding="UTF-8" + ) as course: lines = course.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) + return {"data": ret_str} @cached(lifetime=86400) def handle_data_csxxxx_request(self, data: Dict) -> Dict: extra_num = int(data["dldate"]["filetype"][-4:]) ret_str = "" - with open(fr"titles/cxb/rss2_data/Course/Cs{extra_num}.csv", encoding="shift-jis") as course: + with open( + rf"titles/cxb/rss2_data/Course/Cs{extra_num}.csv", encoding="shift-jis" + ) as course: lines = course.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data":ret_str}) - + return {"data": ret_str} + def handle_data_mission_list_request(self, data: Dict) -> Dict: - return({"data":""}) - + return {"data": ""} + def handle_data_mission_bonus_request(self, data: Dict) -> Dict: - return({"data":""}) - + return {"data": ""} + def handle_data_unlimited_mission_request(self, data: Dict) -> Dict: - return({"data":""}) - + return {"data": ""} + def handle_data_partner_list_request(self, data: Dict) -> Dict: ret_str = "" # Lord forgive me for the sins I am about to commit - for i in range(0,10): + for i in range(0, 10): ret_str += f"80000{i},{i},{i},0,10000,,\r\n" ret_str += f"80000{i},{i},{i},1,10500,,\r\n" ret_str += f"80000{i},{i},{i},2,10500,,\r\n" - for i in range(10,13): + for i in range(10, 13): ret_str += f"8000{i},{i},{i},0,10000,,\r\n" ret_str += f"8000{i},{i},{i},1,10500,,\r\n" ret_str += f"8000{i},{i},{i},2,10500,,\r\n" - ret_str +="\r\n---\r\n0,150,100,100,100,100,\r\n" - for i in range(1,130): - ret_str +=f"{i},100,100,100,100,100,\r\n" - + ret_str += "\r\n---\r\n0,150,100,100,100,100,\r\n" + for i in range(1, 130): + ret_str += f"{i},100,100,100,100,100,\r\n" + ret_str += "---\r\n" - return({"data": ret_str}) - + return {"data": ret_str} + @cached(lifetime=86400) def handle_data_partnerxxxx_request(self, data: Dict) -> Dict: partner_num = int(data["dldate"]["filetype"][-4:]) @@ -208,55 +233,65 @@ class CxbRevSunriseS2(CxbBase): lines = partner.readlines() for line in lines: ret_str += f"{line[:-1]}\r\n" - return({"data": ret_str}) - + return {"data": ret_str} + def handle_data_server_state_request(self, data: Dict) -> Dict: - return({"data": True}) - + return {"data": True} + def handle_data_settings_request(self, data: Dict) -> Dict: - return({"data": "2,\r\n"}) + return {"data": "2,\r\n"} def handle_data_story_list_request(self, data: Dict) -> Dict: - #story id, story name, game version, start time, end time, course arc, unlock flag, song mcode for menu + # story id, story name, game version, start time, end time, course arc, unlock flag, song mcode for menu ret_str = "\r\n" - ret_str += f"st0000,RISING PURPLE,10104,1464370990,4096483201,Cs1000,-1,purple,\r\n" - ret_str += f"st0001,REBEL YELL,10104,1467999790,4096483201,Cs1000,-1,chaset,\r\n" + ret_str += ( + f"st0000,RISING PURPLE,10104,1464370990,4096483201,Cs1000,-1,purple,\r\n" + ) + ret_str += ( + f"st0001,REBEL YELL,10104,1467999790,4096483201,Cs1000,-1,chaset,\r\n" + ) ret_str += f"st0002,REMNANT,10104,1502127790,4096483201,Cs1000,-1,overcl,\r\n" - return({"data": ret_str}) - + return {"data": ret_str} + def handle_data_stxxxx_request(self, data: Dict) -> Dict: story_num = int(data["dldate"]["filetype"][-4:]) ret_str = "" # Each stories appears to have 10 pieces based on the wiki but as on how they are set.... no clue - for i in range(1,11): - ret_str +=f"{i},st000{story_num}_{i-1},,,,,,,,,,,,,,,,1,,-1,1,\r\n" - return({"data": ret_str}) + for i in range(1, 11): + ret_str += f"{i},st000{story_num}_{i-1},,,,,,,,,,,,,,,,1,,-1,1,\r\n" + return {"data": ret_str} def handle_data_event_stamp_list_request(self, data: Dict) -> Dict: - return({"data":"Cs1002,1,1,1,1,1,1,1,1,1,1,\r\n"}) + return {"data": "Cs1002,1,1,1,1,1,1,1,1,1,1,\r\n"} def handle_data_premium_list_request(self, data: Dict) -> Dict: - return({"data": "1,,,,10,,,,,99,,,,,,,,,100,,\r\n"}) + return {"data": "1,,,,10,,,,,99,,,,,,,,,100,,\r\n"} def handle_data_event_list_request(self, data: Dict) -> Dict: - return({"data":"Cs4001,0,10000,1601510400,1604188799,1,nv2006,1,\r\nCs4005,0,10000,1609459200,1615766399,1,nv2006,1,\r\n"}) + return { + "data": "Cs4001,0,10000,1601510400,1604188799,1,nv2006,1,\r\nCs4005,0,10000,1609459200,1615766399,1,nv2006,1,\r\n" + } def handle_data_event_detail_list_request(self, data: Dict) -> Dict: event_id = data["dldate"]["filetype"].split("/")[2] if "Cs4001" in event_id: - return({"data":"#EventMusicList\r\n1,zonzon2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,\r\n2,moonki,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,\r\n3,tricko,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,\r\n"}) + return { + "data": "#EventMusicList\r\n1,zonzon2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,\r\n2,moonki,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,\r\n3,tricko,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,\r\n" + } elif "Cs4005" in event_id: - return({"data":"#EventMusicList\r\n2,firstl,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,\r\n2,valent,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,\r\n2,dazzli2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,\r\n"}) + return { + "data": "#EventMusicList\r\n2,firstl,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,\r\n2,valent,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,\r\n2,dazzli2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,\r\n" + } elif "EventStampMapListCs1002" in event_id: - return({"data":"1,2,1,1,2,3,9,5,6,7,8,9,10,\r\n"}) + return {"data": "1,2,1,1,2,3,9,5,6,7,8,9,10,\r\n"} elif "EventStampList" in event_id: - return({"data":"Cs1002,1,1,1,1,1,1,1,1,1,1,\r\n"}) + return {"data": "Cs1002,1,1,1,1,1,1,1,1,1,1,\r\n"} else: - return({"data":""}) - + return {"data": ""} + def handle_data_event_stamp_map_list_csxxxx_request(self, data: Dict) -> Dict: event_id = data["dldate"]["filetype"].split("/")[2] if "EventStampMapListCs1002" in event_id: - return({"data":"1,2,1,1,2,3,9,5,6,7,8,9,10,\r\n"}) + return {"data": "1,2,1,1,2,3,9,5,6,7,8,9,10,\r\n"} else: - return({"data":""}) + return {"data": ""} diff --git a/titles/cxb/schema/item.py b/titles/cxb/schema/item.py index 80d8427..022a036 100644 --- a/titles/cxb/schema/item.py +++ b/titles/cxb/schema/item.py @@ -14,32 +14,29 @@ energy = Table( Column("user", ForeignKey("aime_user.id", ondelete="cascade"), nullable=False), Column("energy", Integer, nullable=False, server_default="0"), UniqueConstraint("user", name="cxb_rev_energy_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) -class CxbItemData(BaseData): - def put_energy(self, user_id: int, rev_energy: int) -> Optional[int]: - sql = insert(energy).values( - user = user_id, - energy = rev_energy - ) - conflict = sql.on_duplicate_key_update( - energy = rev_energy - ) +class CxbItemData(BaseData): + def put_energy(self, user_id: int, rev_energy: int) -> Optional[int]: + sql = insert(energy).values(user=user_id, energy=rev_energy) + + conflict = sql.on_duplicate_key_update(energy=rev_energy) result = self.execute(conflict) if result is None: - self.logger.error(f"{__name__} failed to insert item! user: {user_id}, energy: {rev_energy}") + self.logger.error( + f"{__name__} failed to insert item! user: {user_id}, energy: {rev_energy}" + ) return None - + return result.lastrowid - + def get_energy(self, user_id: int) -> Optional[Dict]: - sql = energy.select( - and_(energy.c.user == user_id) - ) + sql = energy.select(and_(energy.c.user == user_id)) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() diff --git a/titles/cxb/schema/profile.py b/titles/cxb/schema/profile.py index 1f731b4..5c62f76 100644 --- a/titles/cxb/schema/profile.py +++ b/titles/cxb/schema/profile.py @@ -16,57 +16,63 @@ profile = Table( Column("index", Integer, nullable=False), Column("data", JSON, nullable=False), UniqueConstraint("user", "index", name="cxb_profile_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) + class CxbProfileData(BaseData): - def put_profile(self, user_id: int, version: int, index: int, data: JSON) -> Optional[int]: + def put_profile( + self, user_id: int, version: int, index: int, data: JSON + ) -> Optional[int]: sql = insert(profile).values( - user = user_id, - version = version, - index = index, - data = data + user=user_id, version=version, index=index, data=data ) - conflict = sql.on_duplicate_key_update( - index = index, - data = data - ) + conflict = sql.on_duplicate_key_update(index=index, data=data) result = self.execute(conflict) if result is None: - self.logger.error(f"{__name__} failed to update! user: {user_id}, index: {index}, data: {data}") + self.logger.error( + f"{__name__} failed to update! user: {user_id}, index: {index}, data: {data}" + ) return None - + return result.lastrowid def get_profile(self, aime_id: int, version: int) -> Optional[List[Dict]]: """ Given a game version and either a profile or aime id, return the profile """ - sql = profile.select(and_( - profile.c.version == version, - profile.c.user == aime_id - )) - + sql = profile.select( + and_(profile.c.version == version, profile.c.user == aime_id) + ) + result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - def get_profile_index(self, index: int, aime_id: int = None, version: int = None) -> Optional[Dict]: + def get_profile_index( + self, index: int, aime_id: int = None, version: int = None + ) -> Optional[Dict]: """ Given a game version and either a profile or aime id, return the profile """ if aime_id is not None and version is not None and index is not None: - sql = profile.select(and_( + sql = profile.select( + and_( profile.c.version == version, profile.c.user == aime_id, - profile.c.index == index - )) + profile.c.index == index, + ) + ) else: - self.logger.error(f"get_profile: Bad arguments!! aime_id {aime_id} version {version}") + self.logger.error( + f"get_profile: Bad arguments!! aime_id {aime_id} version {version}" + ) return None - + result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() diff --git a/titles/cxb/schema/score.py b/titles/cxb/schema/score.py index 014e535..b6f4f16 100644 --- a/titles/cxb/schema/score.py +++ b/titles/cxb/schema/score.py @@ -18,7 +18,7 @@ score = Table( Column("song_index", Integer), Column("data", JSON), UniqueConstraint("user", "song_mcode", "song_index", name="cxb_score_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) playlog = Table( @@ -40,7 +40,7 @@ playlog = Table( Column("fail", Integer), Column("combo", Integer), Column("date_scored", TIMESTAMP, server_default=func.now()), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) ranking = Table( @@ -53,11 +53,19 @@ ranking = Table( Column("score", Integer), Column("clear", Integer), UniqueConstraint("user", "rev_id", name="cxb_ranking_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) + class CxbScoreData(BaseData): - def put_best_score(self, user_id: int, song_mcode: str, game_version: int, song_index: int, data: JSON) -> Optional[int]: + def put_best_score( + self, + user_id: int, + song_mcode: str, + game_version: int, + song_index: int, + data: JSON, + ) -> Optional[int]: """ Update the user's best score for a chart """ @@ -66,22 +74,37 @@ class CxbScoreData(BaseData): song_mcode=song_mcode, game_version=game_version, song_index=song_index, - data=data + data=data, ) - conflict = sql.on_duplicate_key_update( - data = sql.inserted.data - ) + conflict = sql.on_duplicate_key_update(data=sql.inserted.data) result = self.execute(conflict) if result is None: - self.logger.error(f"{__name__} failed to insert best score! profile: {user_id}, song: {song_mcode}, data: {data}") + self.logger.error( + f"{__name__} failed to insert best score! profile: {user_id}, song: {song_mcode}, data: {data}" + ) return None - + return result.lastrowid - - def put_playlog(self, user_id: int, song_mcode: str, chart_id: int, score: int, clear: int, flawless: int, this_super: int, - cool: int, this_fast: int, this_fast2: int, this_slow: int, this_slow2: int, fail: int, combo: int) -> Optional[int]: + + def put_playlog( + self, + user_id: int, + song_mcode: str, + chart_id: int, + score: int, + clear: int, + flawless: int, + this_super: int, + cool: int, + this_fast: int, + this_fast2: int, + this_slow: int, + this_slow2: int, + fail: int, + combo: int, + ) -> Optional[int]: """ Add an entry to the user's play log """ @@ -99,45 +122,42 @@ class CxbScoreData(BaseData): slow=this_slow, slow2=this_slow2, fail=fail, - combo=combo + combo=combo, ) result = self.execute(sql) if result is None: - self.logger.error(f"{__name__} failed to insert playlog! profile: {user_id}, song: {song_mcode}, chart: {chart_id}") + self.logger.error( + f"{__name__} failed to insert playlog! profile: {user_id}, song: {song_mcode}, chart: {chart_id}" + ) return None - + return result.lastrowid - def put_ranking(self, user_id: int, rev_id: int, song_id: int, score: int, clear: int) -> Optional[int]: + def put_ranking( + self, user_id: int, rev_id: int, song_id: int, score: int, clear: int + ) -> Optional[int]: """ Add an entry to the user's ranking logs """ if song_id == 0: sql = insert(ranking).values( - user=user_id, - rev_id=rev_id, - score=score, - clear=clear + user=user_id, rev_id=rev_id, score=score, clear=clear ) else: sql = insert(ranking).values( - user=user_id, - rev_id=rev_id, - song_id=song_id, - score=score, - clear=clear + user=user_id, rev_id=rev_id, song_id=song_id, score=score, clear=clear ) - - conflict = sql.on_duplicate_key_update( - score = score - ) + + conflict = sql.on_duplicate_key_update(score=score) result = self.execute(conflict) if result is None: - self.logger.error(f"{__name__} failed to insert ranking log! profile: {user_id}, score: {score}, clear: {clear}") + self.logger.error( + f"{__name__} failed to insert ranking log! profile: {user_id}, score: {score}, clear: {clear}" + ) return None - + return result.lastrowid def get_best_score(self, user_id: int, song_mcode: int) -> Optional[Dict]: @@ -146,21 +166,22 @@ class CxbScoreData(BaseData): ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() def get_best_scores(self, user_id: int) -> Optional[Dict]: sql = score.select(score.c.user == user_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def get_best_rankings(self, user_id: int) -> Optional[List[Dict]]: - sql = ranking.select( - ranking.c.user == user_id - ) + sql = ranking.select(ranking.c.user == user_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() diff --git a/titles/cxb/schema/static.py b/titles/cxb/schema/static.py index 6b16ac4..6459e99 100644 --- a/titles/cxb/schema/static.py +++ b/titles/cxb/schema/static.py @@ -21,54 +21,75 @@ music = Table( Column("artist", String(255)), Column("category", String(255)), Column("level", Float), - UniqueConstraint("version", "songId", "chartId", "index", name="cxb_static_music_uk"), - mysql_charset='utf8mb4' + UniqueConstraint( + "version", "songId", "chartId", "index", name="cxb_static_music_uk" + ), + mysql_charset="utf8mb4", ) + class CxbStaticData(BaseData): - def put_music(self, version: int, mcode: str, index: int, chart: int, title: str, artist: str, category: str, level: float ) -> Optional[int]: + def put_music( + self, + version: int, + mcode: str, + index: int, + chart: int, + title: str, + artist: str, + category: str, + level: float, + ) -> Optional[int]: sql = insert(music).values( - version = version, - songId = mcode, - index = index, - chartId = chart, - title = title, - artist = artist, - category = category, - level = level + version=version, + songId=mcode, + index=index, + chartId=chart, + title=title, + artist=artist, + category=category, + level=level, ) conflict = sql.on_duplicate_key_update( - title = title, - artist = artist, - category = category, - level = level + title=title, artist=artist, category=category, level=level ) result = self.execute(conflict) - if result is None: return None + if result is None: + return None return result.lastrowid - - def get_music(self, version: int, song_id: Optional[int] = None) -> Optional[List[Row]]: + + def get_music( + self, version: int, song_id: Optional[int] = None + ) -> Optional[List[Row]]: if song_id is None: sql = select(music).where(music.c.version == version) else: - sql = select(music).where(and_( - music.c.version == version, - music.c.songId == song_id, - )) + sql = select(music).where( + and_( + music.c.version == version, + music.c.songId == song_id, + ) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - - def get_music_chart(self, version: int, song_id: int, chart_id: int) -> Optional[List[Row]]: - sql = select(music).where(and_( - music.c.version == version, - music.c.songId == song_id, - music.c.chartId == chart_id - )) + + def get_music_chart( + self, version: int, song_id: int, chart_id: int + ) -> Optional[List[Row]]: + sql = select(music).where( + and_( + music.c.version == version, + music.c.songId == song_id, + music.c.chartId == chart_id, + ) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() diff --git a/titles/diva/__init__.py b/titles/diva/__init__.py index e14aee2..9d93468 100644 --- a/titles/diva/__init__.py +++ b/titles/diva/__init__.py @@ -7,4 +7,4 @@ index = DivaServlet database = DivaData reader = DivaReader game_codes = [DivaConstants.GAME_CODE] -current_schema_version = 1 \ No newline at end of file +current_schema_version = 1 diff --git a/titles/diva/base.py b/titles/diva/base.py index 2e788af..9e58269 100644 --- a/titles/diva/base.py +++ b/titles/diva/base.py @@ -1,6 +1,6 @@ import datetime from typing import Any, List, Dict -import logging +import logging import json import urllib @@ -9,34 +9,35 @@ from titles.diva.config import DivaConfig from titles.diva.const import DivaConstants from titles.diva.database import DivaData -class DivaBase(): + +class DivaBase: def __init__(self, cfg: CoreConfig, game_cfg: DivaConfig) -> None: - self.core_cfg = cfg # Config file + self.core_cfg = cfg # Config file self.game_config = game_cfg - self.data = DivaData(cfg) # Database + self.data = DivaData(cfg) # Database self.date_time_format = "%Y-%m-%d %H:%M:%S" self.logger = logging.getLogger("diva") self.game = DivaConstants.GAME_CODE self.version = DivaConstants.VER_PROJECT_DIVA_ARCADE_FUTURE_TONE dt = datetime.datetime.now() - self.time_lut=urllib.parse.quote(dt.strftime("%Y-%m-%d %H:%M:%S:16.0")) - + self.time_lut = urllib.parse.quote(dt.strftime("%Y-%m-%d %H:%M:%S:16.0")) + def handle_test_request(self, data: Dict) -> Dict: return "" def handle_game_init_request(self, data: Dict) -> Dict: - return ( f'' ) + return f"" def handle_attend_request(self, data: Dict) -> Dict: encoded = "&" params = { - 'atnd_prm1': '0,1,1,0,0,0,1,0,100,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1', - 'atnd_prm2': '30,10,100,4,1,50,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1', - 'atnd_prm3': '100,0,1,1,1,1,1,1,1,1,2,3,4,1,1,1,3,4,5,1,1,1,4,5,6,1,1,1,5,6,7,4,4,4,9,10,14,5,10,10,25,20,50,30,90,5,10,10,25,20,50,30,90,5,10,10,25,20,50,30,90,5,10,10,25,20,50,30,90,5,10,10,25,20,50,30,90,10,30,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0', - 'atnd_lut': f'{self.time_lut}', + "atnd_prm1": "0,1,1,0,0,0,1,0,100,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1", + "atnd_prm2": "30,10,100,4,1,50,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1", + "atnd_prm3": "100,0,1,1,1,1,1,1,1,1,2,3,4,1,1,1,3,4,5,1,1,1,4,5,6,1,1,1,5,6,7,4,4,4,9,10,14,5,10,10,25,20,50,30,90,5,10,10,25,20,50,30,90,5,10,10,25,20,50,30,90,5,10,10,25,20,50,30,90,5,10,10,25,20,50,30,90,10,30,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0", + "atnd_lut": f"{self.time_lut}", } - + encoded += urllib.parse.urlencode(params) encoded = encoded.replace("%2C", ",") @@ -45,42 +46,42 @@ class DivaBase(): def handle_ping_request(self, data: Dict) -> Dict: encoded = "&" params = { - 'ping_b_msg': f'Welcome to {self.core_cfg.server.name} network!', - 'ping_m_msg': 'xxx', - 'atnd_lut': f'{self.time_lut}', - 'fi_lut': f'{self.time_lut}', - 'ci_lut': f'{self.time_lut}', - 'qi_lut': f'{self.time_lut}', - 'pvl_lut': '2021-05-22 12:08:16.0', - 'shp_ctlg_lut': '2020-06-10 19:44:16.0', - 'cstmz_itm_ctlg_lut': '2019-10-08 20:23:12.0', - 'ngwl_lut': '2019-10-08 20:23:12.0', - 'rnk_nv_lut': '2020-06-10 19:51:30.0', - 'rnk_ps_lut': f'{self.time_lut}', - 'bi_lut': '2020-09-18 10:00:00.0', - 'cpi_lut': '2020-10-25 09:25:10.0', - 'bdlol_lut': '2020-09-18 10:00:00.0', - 'p_std_hc_lut': '2019-08-01 04:00:36.0', - 'p_std_i_n_lut': '2019-08-01 04:00:36.0', - 'pdcl_lut': '2019-08-01 04:00:36.0', - 'pnml_lut': '2019-08-01 04:00:36.0', - 'cinml_lut': '2019-08-01 04:00:36.0', - 'rwl_lut': '2019-08-01 04:00:36.0', - 'req_inv_cmd_num': '-1,-1,-1,-1,-1,-1,-1,-1,-1,-1', - 'req_inv_cmd_prm1': '-1,-1,-1,-1,-1,-1,-1,-1,-1,-1', - 'req_inv_cmd_prm2': '-1,-1,-1,-1,-1,-1,-1,-1,-1,-1', - 'req_inv_cmd_prm3': '-1,-1,-1,-1,-1,-1,-1,-1,-1,-1', - 'req_inv_cmd_prm4': '-1,-1,-1,-1,-1,-1,-1,-1,-1,-1', - 'pow_save_flg': 0, - 'nblss_dnt_p': 100, - 'nblss_ltt_rl_vp': 1500, - 'nblss_ex_ltt_flg': 1, - 'nblss_dnt_st_tm': "2019-07-15 12:00:00.0", - 'nblss_dnt_ed_tm': "2019-09-17 12:00:00.0", - 'nblss_ltt_st_tm': "2019-09-18 12:00:00.0", - 'nblss_ltt_ed_tm': "2019-09-22 12:00:00.0", + "ping_b_msg": f"Welcome to {self.core_cfg.server.name} network!", + "ping_m_msg": "xxx", + "atnd_lut": f"{self.time_lut}", + "fi_lut": f"{self.time_lut}", + "ci_lut": f"{self.time_lut}", + "qi_lut": f"{self.time_lut}", + "pvl_lut": "2021-05-22 12:08:16.0", + "shp_ctlg_lut": "2020-06-10 19:44:16.0", + "cstmz_itm_ctlg_lut": "2019-10-08 20:23:12.0", + "ngwl_lut": "2019-10-08 20:23:12.0", + "rnk_nv_lut": "2020-06-10 19:51:30.0", + "rnk_ps_lut": f"{self.time_lut}", + "bi_lut": "2020-09-18 10:00:00.0", + "cpi_lut": "2020-10-25 09:25:10.0", + "bdlol_lut": "2020-09-18 10:00:00.0", + "p_std_hc_lut": "2019-08-01 04:00:36.0", + "p_std_i_n_lut": "2019-08-01 04:00:36.0", + "pdcl_lut": "2019-08-01 04:00:36.0", + "pnml_lut": "2019-08-01 04:00:36.0", + "cinml_lut": "2019-08-01 04:00:36.0", + "rwl_lut": "2019-08-01 04:00:36.0", + "req_inv_cmd_num": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "req_inv_cmd_prm1": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "req_inv_cmd_prm2": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "req_inv_cmd_prm3": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "req_inv_cmd_prm4": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "pow_save_flg": 0, + "nblss_dnt_p": 100, + "nblss_ltt_rl_vp": 1500, + "nblss_ex_ltt_flg": 1, + "nblss_dnt_st_tm": "2019-07-15 12:00:00.0", + "nblss_dnt_ed_tm": "2019-09-17 12:00:00.0", + "nblss_ltt_st_tm": "2019-09-18 12:00:00.0", + "nblss_ltt_ed_tm": "2019-09-22 12:00:00.0", } - + encoded += urllib.parse.urlencode(params) encoded = encoded.replace("+", "%20") encoded = encoded.replace("%2C", ",") @@ -122,7 +123,7 @@ class DivaBase(): response += f"&pvl_lut={self.time_lut}" response += f"&pv_lst={pvlist}" - return ( response ) + return response def handle_shop_catalog_request(self, data: Dict) -> Dict: catalog = "" @@ -137,7 +138,21 @@ class DivaBase(): else: for shop in shopList: - line = str(shop["shopId"]) + "," + str(shop['unknown_0']) + "," + shop['name'] + "," + str(shop['points']) + "," + shop['start_date'] + "," + shop['end_date'] + "," + str(shop["type"]) + line = ( + str(shop["shopId"]) + + "," + + str(shop["unknown_0"]) + + "," + + shop["name"] + + "," + + str(shop["points"]) + + "," + + shop["start_date"] + + "," + + shop["end_date"] + + "," + + str(shop["type"]) + ) line = urllib.parse.quote(line) + "," catalog += f"{urllib.parse.quote(line)}" @@ -146,7 +161,7 @@ class DivaBase(): response = f"&shp_ctlg_lut={self.time_lut}" response += f"&shp_ctlg={catalog[:-3]}" - return ( response ) + return response def handle_buy_module_request(self, data: Dict) -> Dict: profile = self.data.profile.get_profile(data["pd_id"], self.version) @@ -162,10 +177,7 @@ class DivaBase(): new_vcld_pts = profile["vcld_pts"] - int(data["mdl_price"]) - self.data.profile.update_profile( - profile["user"], - vcld_pts=new_vcld_pts - ) + self.data.profile.update_profile(profile["user"], vcld_pts=new_vcld_pts) self.data.module.put_module(data["pd_id"], self.version, data["mdl_id"]) # generate the mdl_have string @@ -191,7 +203,21 @@ class DivaBase(): else: for item in itemList: - line = str(item["itemId"]) + "," + str(item['unknown_0']) + "," + item['name'] + "," + str(item['points']) + "," + item['start_date'] + "," + item['end_date'] + "," + str(item["type"]) + line = ( + str(item["itemId"]) + + "," + + str(item["unknown_0"]) + + "," + + item["name"] + + "," + + str(item["points"]) + + "," + + item["start_date"] + + "," + + item["end_date"] + + "," + + str(item["type"]) + ) line = urllib.parse.quote(line) + "," catalog += f"{urllib.parse.quote(line)}" @@ -200,11 +226,13 @@ class DivaBase(): response = f"&cstmz_itm_ctlg_lut={self.time_lut}" response += f"&cstmz_itm_ctlg={catalog[:-3]}" - return ( response ) + return response def handle_buy_cstmz_itm_request(self, data: Dict) -> Dict: profile = self.data.profile.get_profile(data["pd_id"], self.version) - item = self.data.static.get_enabled_item(self.version, int(data["cstmz_itm_id"])) + item = self.data.static.get_enabled_item( + self.version, int(data["cstmz_itm_id"]) + ) # make sure module is available to purchase if not item: @@ -217,15 +245,16 @@ class DivaBase(): new_vcld_pts = profile["vcld_pts"] - int(data["cstmz_itm_price"]) # save new Vocaloid Points balance - self.data.profile.update_profile( - profile["user"], - vcld_pts=new_vcld_pts + self.data.profile.update_profile(profile["user"], vcld_pts=new_vcld_pts) + + self.data.customize.put_customize_item( + data["pd_id"], self.version, data["cstmz_itm_id"] ) - self.data.customize.put_customize_item(data["pd_id"], self.version, data["cstmz_itm_id"]) - # generate the cstmz_itm_have string - cstmz_itm_have = self.data.customize.get_customize_items_have_string(data["pd_id"], self.version) + cstmz_itm_have = self.data.customize.get_customize_items_have_string( + data["pd_id"], self.version + ) response = "&shp_rslt=1" response += f"&cstmz_itm_id={data['cstmz_itm_id']}" @@ -237,33 +266,33 @@ class DivaBase(): def handle_festa_info_request(self, data: Dict) -> Dict: encoded = "&" params = { - 'fi_id': '1,-1', - 'fi_name': f'{self.core_cfg.server.name} Opening,xxx', - 'fi_kind': '0,0', - 'fi_difficulty': '-1,-1', - 'fi_pv_id_lst': 'ALL,ALL', - 'fi_attr': '7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF', - 'fi_add_vp': '20,0', - 'fi_mul_vp': '1,1', - 'fi_st': '2022-06-17 17:00:00.0,2014-07-08 18:10:11.0', - 'fi_et': '2029-01-01 10:00:00.0,2014-07-08 18:10:11.0', - 'fi_lut': '{self.time_lut}', + "fi_id": "1,-1", + "fi_name": f"{self.core_cfg.server.name} Opening,xxx", + "fi_kind": "0,0", + "fi_difficulty": "-1,-1", + "fi_pv_id_lst": "ALL,ALL", + "fi_attr": "7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", + "fi_add_vp": "20,0", + "fi_mul_vp": "1,1", + "fi_st": "2022-06-17 17:00:00.0,2014-07-08 18:10:11.0", + "fi_et": "2029-01-01 10:00:00.0,2014-07-08 18:10:11.0", + "fi_lut": "{self.time_lut}", } - + encoded += urllib.parse.urlencode(params) encoded = encoded.replace("+", "%20") encoded = encoded.replace("%2C", ",") return encoded - + def handle_contest_info_request(self, data: Dict) -> Dict: response = "" response += f"&ci_lut={self.time_lut}" response += "&ci_str=%2A%2A%2A,%2A%2A%2A,%2A%2A%2A,%2A%2A%2A,%2A%2A%2A,%2A%2A%2A,%2A%2A%2A,%2A%2A%2A" - - return ( response ) - + + return response + def handle_qst_inf_request(self, data: Dict) -> Dict: quest = "" @@ -279,11 +308,31 @@ class DivaBase(): response += f"&qhi_str={quest[:-1]}" else: for quests in questList: - line = str(quests["questId"]) + "," + str(quests['quest_order']) + "," + str(quests['kind']) + "," + str(quests['unknown_0']) + "," + quests['start_datetime'] + "," + quests['end_datetime'] + "," + quests["name"] + "," + str(quests["unknown_1"]) + "," + str(quests["unknown_2"]) + "," + str(quests["quest_enable"]) + line = ( + str(quests["questId"]) + + "," + + str(quests["quest_order"]) + + "," + + str(quests["kind"]) + + "," + + str(quests["unknown_0"]) + + "," + + quests["start_datetime"] + + "," + + quests["end_datetime"] + + "," + + quests["name"] + + "," + + str(quests["unknown_1"]) + + "," + + str(quests["unknown_2"]) + + "," + + str(quests["quest_enable"]) + ) quest += f"{urllib.parse.quote(line)}%0A," responseline = f"{quest[:-1]}," - for i in range(len(questList),59): + for i in range(len(questList), 59): responseline += "%2A%2A%2A%0A," response = "" @@ -292,44 +341,44 @@ class DivaBase(): response += "&qrai_str=%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1,%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1,%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1%2C%2D1" - return ( response ) - + return response + def handle_nv_ranking_request(self, data: Dict) -> Dict: - return ( f'' ) - + return f"" + def handle_ps_ranking_request(self, data: Dict) -> Dict: - return ( f'' ) - + return f"" + def handle_ng_word_request(self, data: Dict) -> Dict: - return ( f'' ) - + return f"" + def handle_rmt_wp_list_request(self, data: Dict) -> Dict: - return ( f'' ) - + return f"" + def handle_pv_def_chr_list_request(self, data: Dict) -> Dict: - return ( f'' ) - + return f"" + def handle_pv_ng_mdl_list_request(self, data: Dict) -> Dict: - return ( f'' ) - + return f"" + def handle_cstmz_itm_ng_mdl_lst_request(self, data: Dict) -> Dict: - return ( f'' ) - + return f"" + def handle_banner_info_request(self, data: Dict) -> Dict: - return ( f'' ) - + return f"" + def handle_banner_data_request(self, data: Dict) -> Dict: - return ( f'' ) - + return f"" + def handle_cm_ply_info_request(self, data: Dict) -> Dict: - return ( f'' ) - + return f"" + def handle_pstd_h_ctrl_request(self, data: Dict) -> Dict: - return ( f'' ) - + return f"" + def handle_pstd_item_ng_lst_request(self, data: Dict) -> Dict: - return ( f'' ) - + return f"" + def handle_pre_start_request(self, data: Dict) -> str: profile = self.data.profile.get_profile(data["aime_id"], self.version) profile_shop = self.data.item.get_shop(data["aime_id"], self.version) @@ -372,8 +421,10 @@ class DivaBase(): return response def handle_registration_request(self, data: Dict) -> Dict: - self.data.profile.create_profile(self.version, data["aime_id"], data["player_name"]) - return (f"&cd_adm_result=1&pd_id={data['aime_id']}") + self.data.profile.create_profile( + self.version, data["aime_id"], data["player_name"] + ) + return f"&cd_adm_result=1&pd_id={data['aime_id']}" def handle_start_request(self, data: Dict) -> Dict: profile = self.data.profile.get_profile(data["pd_id"], self.version) @@ -384,12 +435,16 @@ class DivaBase(): mdl_have = "F" * 250 # generate the mdl_have string if "unlock_all_modules" is disabled if not self.game_config.mods.unlock_all_modules: - mdl_have = self.data.module.get_modules_have_string(data["pd_id"], self.version) + mdl_have = self.data.module.get_modules_have_string( + data["pd_id"], self.version + ) cstmz_itm_have = "F" * 250 # generate the cstmz_itm_have string if "unlock_all_items" is disabled if not self.game_config.mods.unlock_all_items: - cstmz_itm_have = self.data.customize.get_customize_items_have_string(data["pd_id"], self.version) + cstmz_itm_have = self.data.customize.get_customize_items_have_string( + data["pd_id"], self.version + ) response = f"&pd_id={data['pd_id']}" response += "&start_result=1" @@ -452,15 +507,16 @@ class DivaBase(): response += f"&mdl_eqp_ary={mdl_eqp_ary}" response += f"&c_itm_eqp_ary={c_itm_eqp_ary}" response += f"&ms_itm_flg_ary={ms_itm_flg_ary}" - - return ( response ) + + return response def handle_pd_unlock_request(self, data: Dict) -> Dict: - return ( f'' ) - + return f"" + def handle_spend_credit_request(self, data: Dict) -> Dict: profile = self.data.profile.get_profile(data["pd_id"], self.version) - if profile is None: return + if profile is None: + return response = "" @@ -471,10 +527,16 @@ class DivaBase(): response += f"&lv_efct_id={profile['lv_efct_id']}" response += f"&lv_plt_id={profile['lv_plt_id']}" - return ( response ) + return response - def _get_pv_pd_result(self, song: int, pd_db_song: Dict, pd_db_ranking: Dict, - pd_db_customize: Dict, edition: int) -> str: + def _get_pv_pd_result( + self, + song: int, + pd_db_song: Dict, + pd_db_ranking: Dict, + pd_db_customize: Dict, + edition: int, + ) -> str: """ Helper function to generate the pv_result string for every song, ranking and edition """ @@ -483,7 +545,7 @@ class DivaBase(): # make sure there are enough max scores to calculate a ranking if pd_db_ranking["ranking"] != 0: global_ranking = pd_db_ranking["ranking"] - + # pv_no pv_result = f"{song}," # edition @@ -513,7 +575,7 @@ class DivaBase(): f"{pd_db_customize['chsld_se']}," f"{pd_db_customize['sldtch_se']}" ) - + pv_result += f"{module_eqp}," pv_result += f"{customize_eqp}," pv_result += f"{customize_flag}," @@ -537,21 +599,35 @@ class DivaBase(): if int(song) > 0: # the request do not send a edition so just perform a query best score and ranking for each edition. # 0=ORIGINAL, 1=EXTRA - pd_db_song_0 = self.data.score.get_best_user_score(data["pd_id"], int(song), data["difficulty"], edition=0) - pd_db_song_1 = self.data.score.get_best_user_score(data["pd_id"], int(song), data["difficulty"], edition=1) - + pd_db_song_0 = self.data.score.get_best_user_score( + data["pd_id"], int(song), data["difficulty"], edition=0 + ) + pd_db_song_1 = self.data.score.get_best_user_score( + data["pd_id"], int(song), data["difficulty"], edition=1 + ) + pd_db_ranking_0, pd_db_ranking_1 = None, None if pd_db_song_0: - pd_db_ranking_0 = self.data.score.get_global_ranking(data["pd_id"], int(song), data["difficulty"], edition=0) + pd_db_ranking_0 = self.data.score.get_global_ranking( + data["pd_id"], int(song), data["difficulty"], edition=0 + ) if pd_db_song_1: - pd_db_ranking_1 = self.data.score.get_global_ranking(data["pd_id"], int(song), data["difficulty"], edition=1) + pd_db_ranking_1 = self.data.score.get_global_ranking( + data["pd_id"], int(song), data["difficulty"], edition=1 + ) + + pd_db_customize = self.data.pv_customize.get_pv_customize( + data["pd_id"], int(song) + ) - pd_db_customize = self.data.pv_customize.get_pv_customize(data["pd_id"], int(song)) - # generate the pv_result string with the ORIGINAL edition and the EXTRA edition appended - pv_result = self._get_pv_pd_result(int(song), pd_db_song_0, pd_db_ranking_0, pd_db_customize, edition=0) - pv_result += "," + self._get_pv_pd_result(int(song), pd_db_song_1, pd_db_ranking_1, pd_db_customize, edition=1) + pv_result = self._get_pv_pd_result( + int(song), pd_db_song_0, pd_db_ranking_0, pd_db_customize, edition=0 + ) + pv_result += "," + self._get_pv_pd_result( + int(song), pd_db_song_1, pd_db_ranking_1, pd_db_customize, edition=1 + ) self.logger.debug(f"pv_result = {pv_result}") @@ -565,13 +641,12 @@ class DivaBase(): response += "&pdddt_flg=0" response += f"&pdddt_tm={self.time_lut}" - return ( response ) + return response def handle_stage_start_request(self, data: Dict) -> Dict: - return ( f'' ) + return f"" def handle_stage_result_request(self, data: Dict) -> Dict: - profile = self.data.profile.get_profile(data["pd_id"], self.version) pd_song_list = data["stg_ply_pv_id"].split(",") @@ -590,15 +665,100 @@ class DivaBase(): for index, value in enumerate(pd_song_list): if "-1" not in pd_song_list[index]: - profile_pd_db_song = self.data.score.get_best_user_score(data["pd_id"], pd_song_list[index], pd_song_difficulty[index], pd_song_edition[index]) + profile_pd_db_song = self.data.score.get_best_user_score( + data["pd_id"], + pd_song_list[index], + pd_song_difficulty[index], + pd_song_edition[index], + ) if profile_pd_db_song is None: - self.data.score.put_best_score(data["pd_id"], self.version, pd_song_list[index], pd_song_difficulty[index], pd_song_edition[index], pd_song_max_score[index], pd_song_max_atn_pnt[index], pd_song_ranking[index], pd_song_sort_kind, pd_song_cool_cnt[index], pd_song_fine_cnt[index], pd_song_safe_cnt[index], pd_song_sad_cnt[index], pd_song_worst_cnt[index], pd_song_max_combo[index]) - self.data.score.put_playlog(data["pd_id"], self.version, pd_song_list[index], pd_song_difficulty[index], pd_song_edition[index], pd_song_max_score[index], pd_song_max_atn_pnt[index], pd_song_ranking[index], pd_song_sort_kind, pd_song_cool_cnt[index], pd_song_fine_cnt[index], pd_song_safe_cnt[index], pd_song_sad_cnt[index], pd_song_worst_cnt[index], pd_song_max_combo[index]) + self.data.score.put_best_score( + data["pd_id"], + self.version, + pd_song_list[index], + pd_song_difficulty[index], + pd_song_edition[index], + pd_song_max_score[index], + pd_song_max_atn_pnt[index], + pd_song_ranking[index], + pd_song_sort_kind, + pd_song_cool_cnt[index], + pd_song_fine_cnt[index], + pd_song_safe_cnt[index], + pd_song_sad_cnt[index], + pd_song_worst_cnt[index], + pd_song_max_combo[index], + ) + self.data.score.put_playlog( + data["pd_id"], + self.version, + pd_song_list[index], + pd_song_difficulty[index], + pd_song_edition[index], + pd_song_max_score[index], + pd_song_max_atn_pnt[index], + pd_song_ranking[index], + pd_song_sort_kind, + pd_song_cool_cnt[index], + pd_song_fine_cnt[index], + pd_song_safe_cnt[index], + pd_song_sad_cnt[index], + pd_song_worst_cnt[index], + pd_song_max_combo[index], + ) elif int(pd_song_max_score[index]) >= int(profile_pd_db_song["score"]): - self.data.score.put_best_score(data["pd_id"], self.version, pd_song_list[index], pd_song_difficulty[index], pd_song_edition[index], pd_song_max_score[index], pd_song_max_atn_pnt[index], pd_song_ranking[index], pd_song_sort_kind, pd_song_cool_cnt[index], pd_song_fine_cnt[index], pd_song_safe_cnt[index], pd_song_sad_cnt[index], pd_song_worst_cnt[index], pd_song_max_combo[index]) - self.data.score.put_playlog(data["pd_id"], self.version, pd_song_list[index], pd_song_difficulty[index], pd_song_edition[index], pd_song_max_score[index], pd_song_max_atn_pnt[index], pd_song_ranking[index], pd_song_sort_kind, pd_song_cool_cnt[index], pd_song_fine_cnt[index], pd_song_safe_cnt[index], pd_song_sad_cnt[index], pd_song_worst_cnt[index], pd_song_max_combo[index]) + self.data.score.put_best_score( + data["pd_id"], + self.version, + pd_song_list[index], + pd_song_difficulty[index], + pd_song_edition[index], + pd_song_max_score[index], + pd_song_max_atn_pnt[index], + pd_song_ranking[index], + pd_song_sort_kind, + pd_song_cool_cnt[index], + pd_song_fine_cnt[index], + pd_song_safe_cnt[index], + pd_song_sad_cnt[index], + pd_song_worst_cnt[index], + pd_song_max_combo[index], + ) + self.data.score.put_playlog( + data["pd_id"], + self.version, + pd_song_list[index], + pd_song_difficulty[index], + pd_song_edition[index], + pd_song_max_score[index], + pd_song_max_atn_pnt[index], + pd_song_ranking[index], + pd_song_sort_kind, + pd_song_cool_cnt[index], + pd_song_fine_cnt[index], + pd_song_safe_cnt[index], + pd_song_sad_cnt[index], + pd_song_worst_cnt[index], + pd_song_max_combo[index], + ) elif int(pd_song_max_score[index]) != int(profile_pd_db_song["score"]): - self.data.score.put_playlog(data["pd_id"], self.version, pd_song_list[index], pd_song_difficulty[index], pd_song_edition[index], pd_song_max_score[index], pd_song_max_atn_pnt[index], pd_song_ranking[index], pd_song_sort_kind, pd_song_cool_cnt[index], pd_song_fine_cnt[index], pd_song_safe_cnt[index], pd_song_sad_cnt[index], pd_song_worst_cnt[index], pd_song_max_combo[index]) + self.data.score.put_playlog( + data["pd_id"], + self.version, + pd_song_list[index], + pd_song_difficulty[index], + pd_song_edition[index], + pd_song_max_score[index], + pd_song_max_atn_pnt[index], + pd_song_ranking[index], + pd_song_sort_kind, + pd_song_cool_cnt[index], + pd_song_fine_cnt[index], + pd_song_safe_cnt[index], + pd_song_sad_cnt[index], + pd_song_worst_cnt[index], + pd_song_max_combo[index], + ) # Profile saving based on registration list @@ -608,7 +768,7 @@ class DivaBase(): total_atn_pnt = 0 for best_score in best_scores: total_atn_pnt += best_score["atn_pnt"] - + new_level = (total_atn_pnt // 13979) + 1 new_level_pnt = round((total_atn_pnt % 13979) / 13979 * 100) @@ -630,7 +790,7 @@ class DivaBase(): nxt_dffclty=int(data["nxt_dffclty"]), nxt_edtn=int(data["nxt_edtn"]), my_qst_id=data["my_qst_id"], - my_qst_sts=data["my_qst_sts"] + my_qst_sts=data["my_qst_sts"], ) response += f"&lv_num={new_level}" @@ -663,35 +823,51 @@ class DivaBase(): response += "&my_ccd_r_hnd=-1,-1,-1,-1,-1" response += "&my_ccd_r_vp=-1,-1,-1,-1,-1" - return ( response ) + return response def handle_end_request(self, data: Dict) -> Dict: profile = self.data.profile.get_profile(data["pd_id"], self.version) self.data.profile.update_profile( - profile["user"], - my_qst_id=data["my_qst_id"], - my_qst_sts=data["my_qst_sts"] + profile["user"], my_qst_id=data["my_qst_id"], my_qst_sts=data["my_qst_sts"] ) - return (f'') + return f"" def handle_shop_exit_request(self, data: Dict) -> Dict: - self.data.item.put_shop(data["pd_id"], self.version, data["mdl_eqp_cmn_ary"], data["c_itm_eqp_cmn_ary"], data["ms_itm_flg_cmn_ary"]) + self.data.item.put_shop( + data["pd_id"], + self.version, + data["mdl_eqp_cmn_ary"], + data["c_itm_eqp_cmn_ary"], + data["ms_itm_flg_cmn_ary"], + ) if int(data["use_pv_mdl_eqp"]) == 1: - self.data.pv_customize.put_pv_customize(data["pd_id"], self.version, data["ply_pv_id"], - data["mdl_eqp_pv_ary"], data["c_itm_eqp_pv_ary"], data["ms_itm_flg_pv_ary"]) + self.data.pv_customize.put_pv_customize( + data["pd_id"], + self.version, + data["ply_pv_id"], + data["mdl_eqp_pv_ary"], + data["c_itm_eqp_pv_ary"], + data["ms_itm_flg_pv_ary"], + ) else: - self.data.pv_customize.put_pv_customize(data["pd_id"], self.version, data["ply_pv_id"], - "-1,-1,-1", "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", "1,1,1,1,1,1,1,1,1,1,1,1") + self.data.pv_customize.put_pv_customize( + data["pd_id"], + self.version, + data["ply_pv_id"], + "-1,-1,-1", + "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "1,1,1,1,1,1,1,1,1,1,1,1", + ) response = "&shp_rslt=1" - return ( response ) + return response def handle_card_procedure_request(self, data: Dict) -> str: profile = self.data.profile.get_profile(data["aime_id"], self.version) if profile is None: return "&cd_adm_result=0" - + response = "&cd_adm_result=1" response += "&chg_name_price=100" response += "&accept_idx=100" @@ -706,20 +882,18 @@ class DivaBase(): response += f"&passwd_stat={profile['passwd_stat']}" return response - + def handle_change_name_request(self, data: Dict) -> str: profile = self.data.profile.get_profile(data["pd_id"], self.version) # make sure user has enough Vocaloid Points if profile["vcld_pts"] < int(data["chg_name_price"]): return "&cd_adm_result=0" - + # update the vocaloid points and player name new_vcld_pts = profile["vcld_pts"] - int(data["chg_name_price"]) self.data.profile.update_profile( - profile["user"], - player_name=data["player_name"], - vcld_pts=new_vcld_pts + profile["user"], player_name=data["player_name"], vcld_pts=new_vcld_pts ) response = "&cd_adm_result=1" @@ -728,19 +902,17 @@ class DivaBase(): response += f"&player_name={data['player_name']}" return response - + def handle_change_passwd_request(self, data: Dict) -> str: profile = self.data.profile.get_profile(data["pd_id"], self.version) # TODO: return correct error number instead of 0 - if (data["passwd"] != profile["passwd"]): + if data["passwd"] != profile["passwd"]: return "&cd_adm_result=0" # set password to true and update the saved password self.data.profile.update_profile( - profile["user"], - passwd_stat=1, - passwd=data["new_passwd"] + profile["user"], passwd_stat=1, passwd=data["new_passwd"] ) response = "&cd_adm_result=1" diff --git a/titles/diva/config.py b/titles/diva/config.py index af4d626..efa327e 100644 --- a/titles/diva/config.py +++ b/titles/diva/config.py @@ -1,30 +1,40 @@ from core.config import CoreConfig -class DivaServerConfig(): +class DivaServerConfig: def __init__(self, parent_config: "DivaConfig") -> None: self.__config = parent_config @property def enable(self) -> bool: - return CoreConfig.get_config_field(self.__config, 'diva', 'server', 'enable', default=True) + return CoreConfig.get_config_field( + self.__config, "diva", "server", "enable", default=True + ) @property def loglevel(self) -> int: - return CoreConfig.str_to_loglevel(CoreConfig.get_config_field(self.__config, 'diva', 'server', 'loglevel', default="info")) + return CoreConfig.str_to_loglevel( + CoreConfig.get_config_field( + self.__config, "diva", "server", "loglevel", default="info" + ) + ) -class DivaModsConfig(): +class DivaModsConfig: def __init__(self, parent_config: "DivaConfig") -> None: self.__config = parent_config @property def unlock_all_modules(self) -> bool: - return CoreConfig.get_config_field(self.__config, 'diva', 'mods', 'unlock_all_modules', default=True) + return CoreConfig.get_config_field( + self.__config, "diva", "mods", "unlock_all_modules", default=True + ) @property def unlock_all_items(self) -> bool: - return CoreConfig.get_config_field(self.__config, 'diva', 'mods', 'unlock_all_items', default=True) + return CoreConfig.get_config_field( + self.__config, "diva", "mods", "unlock_all_items", default=True + ) class DivaConfig(dict): diff --git a/titles/diva/const.py b/titles/diva/const.py index 2ea7024..08597c4 100644 --- a/titles/diva/const.py +++ b/titles/diva/const.py @@ -1,4 +1,4 @@ -class DivaConstants(): +class DivaConstants: GAME_CODE = "SBZV" CONFIG_NAME = "diva.yaml" @@ -10,4 +10,4 @@ class DivaConstants(): @classmethod def game_ver_to_string(cls, ver: int): - return cls.VERSION_NAMES[ver] \ No newline at end of file + return cls.VERSION_NAMES[ver] diff --git a/titles/diva/database.py b/titles/diva/database.py index a7e4193..cf36af9 100644 --- a/titles/diva/database.py +++ b/titles/diva/database.py @@ -1,6 +1,14 @@ from core.data import Data from core.config import CoreConfig -from titles.diva.schema import DivaProfileData, DivaScoreData, DivaModuleData, DivaCustomizeItemData, DivaPvCustomizeData, DivaItemData, DivaStaticData +from titles.diva.schema import ( + DivaProfileData, + DivaScoreData, + DivaModuleData, + DivaCustomizeItemData, + DivaPvCustomizeData, + DivaItemData, + DivaStaticData, +) class DivaData(Data): diff --git a/titles/diva/index.py b/titles/diva/index.py index b049fef..609e640 100644 --- a/titles/diva/index.py +++ b/titles/diva/index.py @@ -14,85 +14,112 @@ from titles.diva.config import DivaConfig from titles.diva.const import DivaConstants from titles.diva.base import DivaBase -class DivaServlet(): + +class DivaServlet: def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None: self.core_cfg = core_cfg self.game_cfg = DivaConfig() if path.exists(f"{cfg_dir}/{DivaConstants.CONFIG_NAME}"): - self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{DivaConstants.CONFIG_NAME}"))) + self.game_cfg.update( + yaml.safe_load(open(f"{cfg_dir}/{DivaConstants.CONFIG_NAME}")) + ) self.base = DivaBase(core_cfg, self.game_cfg) self.logger = logging.getLogger("diva") log_fmt_str = "[%(asctime)s] Diva | %(levelname)s | %(message)s" log_fmt = logging.Formatter(log_fmt_str) - fileHandler = TimedRotatingFileHandler("{0}/{1}.log".format(self.core_cfg.server.log_dir, "diva"), encoding='utf8', - when="d", backupCount=10) + fileHandler = TimedRotatingFileHandler( + "{0}/{1}.log".format(self.core_cfg.server.log_dir, "diva"), + encoding="utf8", + when="d", + backupCount=10, + ) fileHandler.setFormatter(log_fmt) - + consoleHandler = logging.StreamHandler() consoleHandler.setFormatter(log_fmt) self.logger.addHandler(fileHandler) self.logger.addHandler(consoleHandler) - + self.logger.setLevel(self.game_cfg.server.loglevel) - coloredlogs.install(level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str) - + coloredlogs.install( + level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str + ) + @classmethod - def get_allnet_info(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: + def get_allnet_info( + cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str + ) -> Tuple[bool, str, str]: game_cfg = DivaConfig() if path.exists(f"{cfg_dir}/{DivaConstants.CONFIG_NAME}"): - game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{DivaConstants.CONFIG_NAME}"))) + game_cfg.update( + yaml.safe_load(open(f"{cfg_dir}/{DivaConstants.CONFIG_NAME}")) + ) if not game_cfg.server.enable: return (False, "", "") - + if core_cfg.server.is_develop: - return (True, f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/", "") - + return ( + True, + f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/", + "", + ) + return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", "") def render_POST(self, req: Request, version: int, url_path: str) -> bytes: req_raw = req.content.getvalue() url_header = req.getAllHeaders() - #Ping Dispatch - if "THIS_STRING_SEPARATES"in str(url_header): + # Ping Dispatch + if "THIS_STRING_SEPARATES" in str(url_header): binary_request = req_raw.splitlines() binary_cmd_decoded = binary_request[3].decode("utf-8") - binary_array = binary_cmd_decoded.split('&') + binary_array = binary_cmd_decoded.split("&") bin_req_data = {} for kvp in binary_array: split_bin = kvp.split("=") bin_req_data[split_bin[0]] = split_bin[1] - + self.logger.info(f"Binary {bin_req_data['cmd']} Request") self.logger.debug(bin_req_data) handler = getattr(self.base, f"handle_{bin_req_data['cmd']}_request") resp = handler(bin_req_data) - self.logger.debug(f"Response cmd={bin_req_data['cmd']}&req_id={bin_req_data['req_id']}&stat=ok{resp}") - return f"cmd={bin_req_data['cmd']}&req_id={bin_req_data['req_id']}&stat=ok{resp}".encode('utf-8') + self.logger.debug( + f"Response cmd={bin_req_data['cmd']}&req_id={bin_req_data['req_id']}&stat=ok{resp}" + ) + return f"cmd={bin_req_data['cmd']}&req_id={bin_req_data['req_id']}&stat=ok{resp}".encode( + "utf-8" + ) + + # Main Dispatch + json_string = json.dumps( + req_raw.decode("utf-8") + ) # Take the response and decode as UTF-8 and dump + b64string = json_string.replace( + r"\n", "\n" + ) # Remove all \n and separate them as new lines + gz_string = base64.b64decode(b64string) # Decompressing the base64 string - #Main Dispatch - json_string = json.dumps(req_raw.decode("utf-8")) #Take the response and decode as UTF-8 and dump - b64string = json_string.replace(r'\n', '\n') # Remove all \n and separate them as new lines - gz_string = base64.b64decode(b64string) # Decompressing the base64 string - try: - url_data = zlib.decompress( gz_string ).decode("utf-8") # Decompressing the gzip + url_data = zlib.decompress(gz_string).decode( + "utf-8" + ) # Decompressing the gzip except zlib.error as e: self.logger.error(f"Failed to defalte! {e} -> {gz_string}") return "stat=0" req_kvp = urllib.parse.unquote(url_data) req_data = {} - + # We then need to split each parts with & so we can reuse them to fill out the requests splitted_request = str.split(req_kvp, "&") for kvp in splitted_request: @@ -109,15 +136,25 @@ class DivaServlet(): handler = getattr(self.base, func_to_find) resp = handler(req_data) - except AttributeError as e: + except AttributeError as e: self.logger.warning(f"Unhandled {req_data['cmd']} request {e}") - return f"cmd={req_data['cmd']}&req_id={req_data['req_id']}&stat=ok".encode('utf-8') + return f"cmd={req_data['cmd']}&req_id={req_data['req_id']}&stat=ok".encode( + "utf-8" + ) except Exception as e: self.logger.error(f"Error handling method {func_to_find} {e}") - return f"cmd={req_data['cmd']}&req_id={req_data['req_id']}&stat=ok".encode('utf-8') + return f"cmd={req_data['cmd']}&req_id={req_data['req_id']}&stat=ok".encode( + "utf-8" + ) req.responseHeaders.addRawHeader(b"content-type", b"text/plain") - self.logger.debug(f"Response cmd={req_data['cmd']}&req_id={req_data['req_id']}&stat=ok{resp}") + self.logger.debug( + f"Response cmd={req_data['cmd']}&req_id={req_data['req_id']}&stat=ok{resp}" + ) - return f"cmd={req_data['cmd']}&req_id={req_data['req_id']}&stat=ok{resp}".encode('utf-8') + return ( + f"cmd={req_data['cmd']}&req_id={req_data['req_id']}&stat=ok{resp}".encode( + "utf-8" + ) + ) diff --git a/titles/diva/read.py b/titles/diva/read.py index c597315..9c409ef 100644 --- a/titles/diva/read.py +++ b/titles/diva/read.py @@ -7,13 +7,23 @@ from core.config import CoreConfig from titles.diva.database import DivaData from titles.diva.const import DivaConstants + class DivaReader(BaseReader): - def __init__(self, config: CoreConfig, version: int, bin_dir: Optional[str], opt_dir: Optional[str], extra: Optional[str]) -> None: + def __init__( + self, + config: CoreConfig, + version: int, + bin_dir: Optional[str], + opt_dir: Optional[str], + extra: Optional[str], + ) -> None: super().__init__(config, version, bin_dir, opt_dir, extra) self.data = DivaData(config) try: - self.logger.info(f"Start importer for {DivaConstants.game_ver_to_string(version)}") + self.logger.info( + f"Start importer for {DivaConstants.game_ver_to_string(version)}" + ) except IndexError: self.logger.error(f"Invalid project diva version {version}") exit(1) @@ -30,7 +40,7 @@ class DivaReader(BaseReader): if not path.exists(f"{self.bin_dir}/rom"): self.logger.warn(f"Couldn't find rom folder in {self.bin_dir}, skipping") pull_bin_rom = False - + if self.opt_dir is not None: opt_dirs = self.get_data_directories(self.opt_dir) else: @@ -44,18 +54,25 @@ class DivaReader(BaseReader): if pull_opt_rom: for dir in opt_dirs: self.read_rom(f"{dir}/rom") - + def read_ram(self, ram_root_dir: str) -> None: self.logger.info(f"Read RAM from {ram_root_dir}") if path.exists(f"{ram_root_dir}/databank"): for root, dirs, files in walk(f"{ram_root_dir}/databank"): for file in files: - if file.startswith("ShopCatalog_") or file.startswith("CustomizeItemCatalog_") or \ - (file.startswith("QuestInfo") and not file.startswith("QuestInfoTm")): - + if ( + file.startswith("ShopCatalog_") + or file.startswith("CustomizeItemCatalog_") + or ( + file.startswith("QuestInfo") + and not file.startswith("QuestInfoTm") + ) + ): with open(f"{root}/{file}", "r") as f: - file_data: str = urllib.parse.unquote(urllib.parse.unquote(f.read())) + file_data: str = urllib.parse.unquote( + urllib.parse.unquote(f.read()) + ) if file_data == "***": self.logger.info(f"{file} is empty, skipping") continue @@ -70,23 +87,54 @@ class DivaReader(BaseReader): if file.startswith("ShopCatalog_"): for x in range(0, len(split), 7): - self.logger.info(f"Added shop item {split[x+0]}") + self.logger.info( + f"Added shop item {split[x+0]}" + ) - self.data.static.put_shop(self.version, split[x+0], split[x+2], split[x+6], split[x+3], - split[x+1], split[x+4], split[x+5]) + self.data.static.put_shop( + self.version, + split[x + 0], + split[x + 2], + split[x + 6], + split[x + 3], + split[x + 1], + split[x + 4], + split[x + 5], + ) - elif file.startswith("CustomizeItemCatalog_") and len(split) >= 7: + elif ( + file.startswith("CustomizeItemCatalog_") + and len(split) >= 7 + ): for x in range(0, len(split), 7): self.logger.info(f"Added item {split[x+0]}") - self.data.static.put_items(self.version, split[x+0], split[x+2], split[x+6], split[x+3], - split[x+1], split[x+4], split[x+5]) + self.data.static.put_items( + self.version, + split[x + 0], + split[x + 2], + split[x + 6], + split[x + 3], + split[x + 1], + split[x + 4], + split[x + 5], + ) elif file.startswith("QuestInfo") and len(split) >= 9: self.logger.info(f"Added quest {split[0]}") - - self.data.static.put_quests(self.version, split[0], split[6], split[2], split[3], - split[7], split[8], split[1], split[4], split[5]) + + self.data.static.put_quests( + self.version, + split[0], + split[6], + split[2], + split[3], + split[7], + split[8], + split[1], + split[4], + split[5], + ) else: continue @@ -102,13 +150,13 @@ class DivaReader(BaseReader): elif path.exists(f"{rom_root_dir}/pv_db.txt"): file_path = f"{rom_root_dir}/pv_db.txt" else: - self.logger.warn(f"Cannot find pv_db.txt or mdata_pv_db.txt in {rom_root_dir}, skipping") + self.logger.warn( + f"Cannot find pv_db.txt or mdata_pv_db.txt in {rom_root_dir}, skipping" + ) return with open(file_path, "r", encoding="utf-8") as f: - for line in f.readlines(): - if line.startswith("#") or not line: continue @@ -127,14 +175,13 @@ class DivaReader(BaseReader): for x in range(1, len(key_split)): key_args.append(key_split[x]) - + try: pv_list[pv_id] = self.add_branch(pv_list[pv_id], key_args, val) except KeyError: pv_list[pv_id] = {} pv_list[pv_id] = self.add_branch(pv_list[pv_id], key_args, val) - for pv_id, pv_data in pv_list.items(): song_id = int(pv_id.split("_")[1]) if "songinfo" not in pv_data: @@ -148,46 +195,99 @@ class DivaReader(BaseReader): if "music" not in pv_data["songinfo"]: pv_data["songinfo"]["music"] = "-" - if "easy" in pv_data['difficulty'] and '0' in pv_data['difficulty']['easy']: - diff = pv_data['difficulty']['easy']['0']['level'].split('_') + if "easy" in pv_data["difficulty"] and "0" in pv_data["difficulty"]["easy"]: + diff = pv_data["difficulty"]["easy"]["0"]["level"].split("_") self.logger.info(f"Added song {song_id} chart 0") - self.data.static.put_music(self.version, song_id, 0, pv_data["song_name"], pv_data["songinfo"]["arranger"], - pv_data["songinfo"]["illustrator"], pv_data["songinfo"]["lyrics"], pv_data["songinfo"]["music"], - float(f"{diff[2]}.{diff[3]}"), pv_data["bpm"], pv_data["date"]) - - if "normal" in pv_data['difficulty'] and '0' in pv_data['difficulty']['normal']: - diff = pv_data['difficulty']['normal']['0']['level'].split('_') + self.data.static.put_music( + self.version, + song_id, + 0, + pv_data["song_name"], + pv_data["songinfo"]["arranger"], + pv_data["songinfo"]["illustrator"], + pv_data["songinfo"]["lyrics"], + pv_data["songinfo"]["music"], + float(f"{diff[2]}.{diff[3]}"), + pv_data["bpm"], + pv_data["date"], + ) + + if ( + "normal" in pv_data["difficulty"] + and "0" in pv_data["difficulty"]["normal"] + ): + diff = pv_data["difficulty"]["normal"]["0"]["level"].split("_") self.logger.info(f"Added song {song_id} chart 1") - self.data.static.put_music(self.version, song_id, 1, pv_data["song_name"], pv_data["songinfo"]["arranger"], - pv_data["songinfo"]["illustrator"], pv_data["songinfo"]["lyrics"], pv_data["songinfo"]["music"], - float(f"{diff[2]}.{diff[3]}"), pv_data["bpm"], pv_data["date"]) - - if "hard" in pv_data['difficulty'] and '0' in pv_data['difficulty']['hard']: - diff = pv_data['difficulty']['hard']['0']['level'].split('_') + self.data.static.put_music( + self.version, + song_id, + 1, + pv_data["song_name"], + pv_data["songinfo"]["arranger"], + pv_data["songinfo"]["illustrator"], + pv_data["songinfo"]["lyrics"], + pv_data["songinfo"]["music"], + float(f"{diff[2]}.{diff[3]}"), + pv_data["bpm"], + pv_data["date"], + ) + + if "hard" in pv_data["difficulty"] and "0" in pv_data["difficulty"]["hard"]: + diff = pv_data["difficulty"]["hard"]["0"]["level"].split("_") self.logger.info(f"Added song {song_id} chart 2") - self.data.static.put_music(self.version, song_id, 2, pv_data["song_name"], pv_data["songinfo"]["arranger"], - pv_data["songinfo"]["illustrator"], pv_data["songinfo"]["lyrics"], pv_data["songinfo"]["music"], - float(f"{diff[2]}.{diff[3]}"), pv_data["bpm"], pv_data["date"]) - - if "extreme" in pv_data['difficulty']: - if "0" in pv_data['difficulty']['extreme']: - diff = pv_data['difficulty']['extreme']['0']['level'].split('_') + self.data.static.put_music( + self.version, + song_id, + 2, + pv_data["song_name"], + pv_data["songinfo"]["arranger"], + pv_data["songinfo"]["illustrator"], + pv_data["songinfo"]["lyrics"], + pv_data["songinfo"]["music"], + float(f"{diff[2]}.{diff[3]}"), + pv_data["bpm"], + pv_data["date"], + ) + + if "extreme" in pv_data["difficulty"]: + if "0" in pv_data["difficulty"]["extreme"]: + diff = pv_data["difficulty"]["extreme"]["0"]["level"].split("_") self.logger.info(f"Added song {song_id} chart 3") - self.data.static.put_music(self.version, song_id, 3, pv_data["song_name"], pv_data["songinfo"]["arranger"], - pv_data["songinfo"]["illustrator"], pv_data["songinfo"]["lyrics"], pv_data["songinfo"]["music"], - float(f"{diff[2]}.{diff[3]}"), pv_data["bpm"], pv_data["date"]) + self.data.static.put_music( + self.version, + song_id, + 3, + pv_data["song_name"], + pv_data["songinfo"]["arranger"], + pv_data["songinfo"]["illustrator"], + pv_data["songinfo"]["lyrics"], + pv_data["songinfo"]["music"], + float(f"{diff[2]}.{diff[3]}"), + pv_data["bpm"], + pv_data["date"], + ) - if "1" in pv_data['difficulty']['extreme']: - diff = pv_data['difficulty']['extreme']['1']['level'].split('_') + if "1" in pv_data["difficulty"]["extreme"]: + diff = pv_data["difficulty"]["extreme"]["1"]["level"].split("_") self.logger.info(f"Added song {song_id} chart 4") - self.data.static.put_music(self.version, song_id, 4, pv_data["song_name"], pv_data["songinfo"]["arranger"], - pv_data["songinfo"]["illustrator"], pv_data["songinfo"]["lyrics"], pv_data["songinfo"]["music"], - float(f"{diff[2]}.{diff[3]}"), pv_data["bpm"], pv_data["date"]) + self.data.static.put_music( + self.version, + song_id, + 4, + pv_data["song_name"], + pv_data["songinfo"]["arranger"], + pv_data["songinfo"]["illustrator"], + pv_data["songinfo"]["lyrics"], + pv_data["songinfo"]["music"], + float(f"{diff[2]}.{diff[3]}"), + pv_data["bpm"], + pv_data["date"], + ) def add_branch(self, tree: Dict, vector: List, value: str): """ @@ -195,9 +295,9 @@ class DivaReader(BaseReader): Author: iJames on StackOverflow """ key = vector[0] - tree[key] = value \ - if len(vector) == 1 \ - else self.add_branch(tree[key] if key in tree else {}, - vector[1:], - value) - return tree \ No newline at end of file + tree[key] = ( + value + if len(vector) == 1 + else self.add_branch(tree[key] if key in tree else {}, vector[1:], value) + ) + return tree diff --git a/titles/diva/schema/__init__.py b/titles/diva/schema/__init__.py index 72cd97f..e149e6d 100644 --- a/titles/diva/schema/__init__.py +++ b/titles/diva/schema/__init__.py @@ -6,6 +6,12 @@ from titles.diva.schema.pv_customize import DivaPvCustomizeData from titles.diva.schema.item import DivaItemData from titles.diva.schema.static import DivaStaticData -__all__ = [DivaProfileData, DivaScoreData, DivaModuleData, - DivaCustomizeItemData, DivaPvCustomizeData, DivaItemData, - DivaStaticData] +__all__ = [ + DivaProfileData, + DivaScoreData, + DivaModuleData, + DivaCustomizeItemData, + DivaPvCustomizeData, + DivaItemData, + DivaStaticData, +] diff --git a/titles/diva/schema/customize.py b/titles/diva/schema/customize.py index f372349..91480f5 100644 --- a/titles/diva/schema/customize.py +++ b/titles/diva/schema/customize.py @@ -10,25 +10,29 @@ customize = Table( "diva_profile_customize_item", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("version", Integer, nullable=False), Column("item_id", Integer, nullable=False), - UniqueConstraint("user", "version", "item_id", name="diva_profile_customize_item_uk"), - mysql_charset='utf8mb4' + UniqueConstraint( + "user", "version", "item_id", name="diva_profile_customize_item_uk" + ), + mysql_charset="utf8mb4", ) class DivaCustomizeItemData(BaseData): def put_customize_item(self, aime_id: int, version: int, item_id: int) -> None: - sql = insert(customize).values( - version=version, - user=aime_id, - item_id=item_id - ) + sql = insert(customize).values(version=version, user=aime_id, item_id=item_id) result = self.execute(sql) if result is None: - self.logger.error(f"{__name__} Failed to insert diva profile customize item! aime id: {aime_id} item: {item_id}") + self.logger.error( + f"{__name__} Failed to insert diva profile customize item! aime id: {aime_id} item: {item_id}" + ) return None return result.lastrowid @@ -36,10 +40,9 @@ class DivaCustomizeItemData(BaseData): """ Given a game version and an aime id, return all the customize items, not used directly """ - sql = customize.select(and_( - customize.c.version == version, - customize.c.user == aime_id - )) + sql = customize.select( + and_(customize.c.version == version, customize.c.user == aime_id) + ) result = self.execute(sql) if result is None: diff --git a/titles/diva/schema/item.py b/titles/diva/schema/item.py index ce7d910..4d484ae 100644 --- a/titles/diva/schema/item.py +++ b/titles/diva/schema/item.py @@ -11,37 +11,48 @@ shop = Table( "diva_profile_shop", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("version", Integer, nullable=False), Column("mdl_eqp_ary", String(32)), Column("c_itm_eqp_ary", String(59)), Column("ms_itm_flg_ary", String(59)), UniqueConstraint("user", "version", name="diva_profile_shop_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) class DivaItemData(BaseData): - def put_shop(self, aime_id: int, version: int, mdl_eqp_ary: str, - c_itm_eqp_ary: str, ms_itm_flg_ary: str) -> None: - + def put_shop( + self, + aime_id: int, + version: int, + mdl_eqp_ary: str, + c_itm_eqp_ary: str, + ms_itm_flg_ary: str, + ) -> None: sql = insert(shop).values( version=version, user=aime_id, mdl_eqp_ary=mdl_eqp_ary, c_itm_eqp_ary=c_itm_eqp_ary, - ms_itm_flg_ary=ms_itm_flg_ary + ms_itm_flg_ary=ms_itm_flg_ary, ) conflict = sql.on_duplicate_key_update( mdl_eqp_ary=mdl_eqp_ary, c_itm_eqp_ary=c_itm_eqp_ary, - ms_itm_flg_ary=ms_itm_flg_ary + ms_itm_flg_ary=ms_itm_flg_ary, ) result = self.execute(conflict) if result is None: - self.logger.error(f"{__name__} Failed to insert diva profile! aime id: {aime_id} array: {mdl_eqp_ary}") + self.logger.error( + f"{__name__} Failed to insert diva profile! aime id: {aime_id} array: {mdl_eqp_ary}" + ) return None return result.lastrowid @@ -49,10 +60,7 @@ class DivaItemData(BaseData): """ Given a game version and either a profile or aime id, return the profile """ - sql = shop.select(and_( - shop.c.version == version, - shop.c.user == aime_id - )) + sql = shop.select(and_(shop.c.version == version, shop.c.user == aime_id)) result = self.execute(sql) if result is None: diff --git a/titles/diva/schema/module.py b/titles/diva/schema/module.py index f9c930c..5872d68 100644 --- a/titles/diva/schema/module.py +++ b/titles/diva/schema/module.py @@ -10,25 +10,27 @@ module = Table( "diva_profile_module", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("version", Integer, nullable=False), Column("module_id", Integer, nullable=False), UniqueConstraint("user", "version", "module_id", name="diva_profile_module_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) class DivaModuleData(BaseData): def put_module(self, aime_id: int, version: int, module_id: int) -> None: - sql = insert(module).values( - version=version, - user=aime_id, - module_id=module_id - ) + sql = insert(module).values(version=version, user=aime_id, module_id=module_id) result = self.execute(sql) if result is None: - self.logger.error(f"{__name__} Failed to insert diva profile module! aime id: {aime_id} module: {module_id}") + self.logger.error( + f"{__name__} Failed to insert diva profile module! aime id: {aime_id} module: {module_id}" + ) return None return result.lastrowid @@ -36,10 +38,7 @@ class DivaModuleData(BaseData): """ Given a game version and an aime id, return all the modules, not used directly """ - sql = module.select(and_( - module.c.version == version, - module.c.user == aime_id - )) + sql = module.select(and_(module.c.version == version, module.c.user == aime_id)) result = self.execute(sql) if result is None: diff --git a/titles/diva/schema/profile.py b/titles/diva/schema/profile.py index 993b03c..1a498e2 100644 --- a/titles/diva/schema/profile.py +++ b/titles/diva/schema/profile.py @@ -11,8 +11,11 @@ profile = Table( "diva_profile", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", - onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("version", Integer, nullable=False), Column("player_name", String(10), nullable=False), Column("lv_str", String(24), nullable=False, server_default="Dab on 'em"), @@ -29,10 +32,8 @@ profile = Table( Column("use_pv_skn_eqp", Boolean, nullable=False, server_default="0"), Column("use_pv_btn_se_eqp", Boolean, nullable=False, server_default="1"), Column("use_pv_sld_se_eqp", Boolean, nullable=False, server_default="0"), - Column("use_pv_chn_sld_se_eqp", Boolean, - nullable=False, server_default="0"), - Column("use_pv_sldr_tch_se_eqp", Boolean, - nullable=False, server_default="0"), + Column("use_pv_chn_sld_se_eqp", Boolean, nullable=False, server_default="0"), + Column("use_pv_sldr_tch_se_eqp", Boolean, nullable=False, server_default="0"), Column("nxt_pv_id", Integer, nullable=False, server_default="708"), Column("nxt_dffclty", Integer, nullable=False, server_default="2"), Column("nxt_edtn", Integer, nullable=False, server_default="0"), @@ -44,35 +45,39 @@ profile = Table( Column("lv_plt_id", Integer, nullable=False, server_default="1"), Column("passwd_stat", Integer, nullable=False, server_default="0"), Column("passwd", String(12), nullable=False, server_default="**********"), - Column("my_qst_id", String( - 128), server_default="-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"), - Column("my_qst_sts", String( - 128), server_default="-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"), + Column( + "my_qst_id", + String(128), + server_default="-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + ), + Column( + "my_qst_sts", + String(128), + server_default="-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + ), UniqueConstraint("user", "version", name="diva_profile_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) class DivaProfileData(BaseData): - def create_profile(self, version: int, aime_id: int, - player_name: str) -> Optional[int]: + def create_profile( + self, version: int, aime_id: int, player_name: str + ) -> Optional[int]: """ Given a game version, aime id, and player_name, create a profile and return it's ID """ sql = insert(profile).values( - version=version, - user=aime_id, - player_name=player_name + version=version, user=aime_id, player_name=player_name ) - conflict = sql.on_duplicate_key_update( - player_name=sql.inserted.player_name - ) + conflict = sql.on_duplicate_key_update(player_name=sql.inserted.player_name) result = self.execute(conflict) if result is None: self.logger.error( - f"{__name__} Failed to insert diva profile! aime id: {aime_id} username: {player_name}") + f"{__name__} Failed to insert diva profile! aime id: {aime_id} username: {player_name}" + ) return None return result.lastrowid @@ -86,17 +91,17 @@ class DivaProfileData(BaseData): result = self.execute(sql) if result is None: self.logger.error( - f"update_profile: failed to update profile! profile: {aime_id}") + f"update_profile: failed to update profile! profile: {aime_id}" + ) return None def get_profile(self, aime_id: int, version: int) -> Optional[List[Dict]]: """ Given a game version and either a profile or aime id, return the profile """ - sql = profile.select(and_( - profile.c.version == version, - profile.c.user == aime_id - )) + sql = profile.select( + and_(profile.c.version == version, profile.c.user == aime_id) + ) result = self.execute(sql) if result is None: diff --git a/titles/diva/schema/pv_customize.py b/titles/diva/schema/pv_customize.py index e456e06..1ca8909 100644 --- a/titles/diva/schema/pv_customize.py +++ b/titles/diva/schema/pv_customize.py @@ -10,27 +10,44 @@ pv_customize = Table( "diva_profile_pv_customize", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("version", Integer, nullable=False), Column("pv_id", Integer, nullable=False), Column("mdl_eqp_ary", String(14), server_default="-999,-999,-999"), - Column("c_itm_eqp_ary", String(59), server_default="-999,-999,-999,-999,-999,-999,-999,-999,-999,-999,-999,-999"), - Column("ms_itm_flg_ary", String(59), server_default="-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"), + Column( + "c_itm_eqp_ary", + String(59), + server_default="-999,-999,-999,-999,-999,-999,-999,-999,-999,-999,-999,-999", + ), + Column( + "ms_itm_flg_ary", + String(59), + server_default="-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + ), Column("skin", Integer, server_default="-1"), Column("btn_se", Integer, server_default="-1"), Column("sld_se", Integer, server_default="-1"), Column("chsld_se", Integer, server_default="-1"), Column("sldtch_se", Integer, server_default="-1"), UniqueConstraint("user", "version", "pv_id", name="diva_profile_pv_customize_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) class DivaPvCustomizeData(BaseData): - def put_pv_customize(self, aime_id: int, version: int, pv_id: int, - mdl_eqp_ary: str, c_itm_eqp_ary: str, - ms_itm_flg_ary: str) -> Optional[int]: - + def put_pv_customize( + self, + aime_id: int, + version: int, + pv_id: int, + mdl_eqp_ary: str, + c_itm_eqp_ary: str, + ms_itm_flg_ary: str, + ) -> Optional[int]: sql = insert(pv_customize).values( version=version, user=aime_id, @@ -49,19 +66,19 @@ class DivaPvCustomizeData(BaseData): result = self.execute(conflict) if result is None: - self.logger.error(f"{__name__} Failed to insert diva pv customize! aime id: {aime_id}") + self.logger.error( + f"{__name__} Failed to insert diva pv customize! aime id: {aime_id}" + ) return None return result.lastrowid - def get_pv_customize(self, aime_id: int, - pv_id: int) -> Optional[List[Dict]]: + def get_pv_customize(self, aime_id: int, pv_id: int) -> Optional[List[Dict]]: """ Given either a profile or aime id, return a Pv Customize row """ - sql = pv_customize.select(and_( - pv_customize.c.user == aime_id, - pv_customize.c.pv_id == pv_id - )) + sql = pv_customize.select( + and_(pv_customize.c.user == aime_id, pv_customize.c.pv_id == pv_id) + ) result = self.execute(sql) if result is None: diff --git a/titles/diva/schema/score.py b/titles/diva/schema/score.py index 638c25a..2d86925 100644 --- a/titles/diva/schema/score.py +++ b/titles/diva/schema/score.py @@ -28,7 +28,7 @@ score = Table( Column("worst", Integer), Column("max_combo", Integer), UniqueConstraint("user", "pv_id", "difficulty", "edition", name="diva_score_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) playlog = Table( @@ -51,16 +51,29 @@ playlog = Table( Column("worst", Integer), Column("max_combo", Integer), Column("date_scored", TIMESTAMP, server_default=func.now()), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) class DivaScoreData(BaseData): - def put_best_score(self, user_id: int, game_version: int, song_id: int, - difficulty: int, edition: int, song_score: int, - atn_pnt: int, clr_kind: int, sort_kind: int, - cool: int, fine: int, safe: int, sad: int, - worst: int, max_combo: int) -> Optional[int]: + def put_best_score( + self, + user_id: int, + game_version: int, + song_id: int, + difficulty: int, + edition: int, + song_score: int, + atn_pnt: int, + clr_kind: int, + sort_kind: int, + cool: int, + fine: int, + safe: int, + sad: int, + worst: int, + max_combo: int, + ) -> Optional[int]: """ Update the user's best score for a chart """ @@ -98,16 +111,30 @@ class DivaScoreData(BaseData): result = self.execute(conflict) if result is None: self.logger.error( - f"{__name__} failed to insert best score! profile: {user_id}, song: {song_id}") + f"{__name__} failed to insert best score! profile: {user_id}, song: {song_id}" + ) return None return result.lastrowid - def put_playlog(self, user_id: int, game_version: int, song_id: int, - difficulty: int, edition: int, song_score: int, - atn_pnt: int, clr_kind: int, sort_kind: int, - cool: int, fine: int, safe: int, sad: int, - worst: int, max_combo: int) -> Optional[int]: + def put_playlog( + self, + user_id: int, + game_version: int, + song_id: int, + difficulty: int, + edition: int, + song_score: int, + atn_pnt: int, + clr_kind: int, + sort_kind: int, + cool: int, + fine: int, + safe: int, + sad: int, + worst: int, + max_combo: int, + ) -> Optional[int]: """ Add an entry to the user's play log """ @@ -126,24 +153,28 @@ class DivaScoreData(BaseData): safe=safe, sad=sad, worst=worst, - max_combo=max_combo + max_combo=max_combo, ) result = self.execute(sql) if result is None: self.logger.error( - f"{__name__} failed to insert playlog! profile: {user_id}, song: {song_id}, chart: {difficulty}") + f"{__name__} failed to insert playlog! profile: {user_id}, song: {song_id}, chart: {difficulty}" + ) return None return result.lastrowid - def get_best_user_score(self, user_id: int, pv_id: int, difficulty: int, - edition: int) -> Optional[Dict]: + def get_best_user_score( + self, user_id: int, pv_id: int, difficulty: int, edition: int + ) -> Optional[Dict]: sql = score.select( - and_(score.c.user == user_id, - score.c.pv_id == pv_id, - score.c.difficulty == difficulty, - score.c.edition == edition) + and_( + score.c.user == user_id, + score.c.pv_id == pv_id, + score.c.difficulty == difficulty, + score.c.edition == edition, + ) ) result = self.execute(sql) @@ -151,36 +182,48 @@ class DivaScoreData(BaseData): return None return result.fetchone() - def get_top3_scores(self, pv_id: int, difficulty: int, - edition: int) -> Optional[List[Dict]]: - sql = score.select( - and_(score.c.pv_id == pv_id, - score.c.difficulty == difficulty, - score.c.edition == edition) - ).order_by(score.c.score.desc()).limit(3) + def get_top3_scores( + self, pv_id: int, difficulty: int, edition: int + ) -> Optional[List[Dict]]: + sql = ( + score.select( + and_( + score.c.pv_id == pv_id, + score.c.difficulty == difficulty, + score.c.edition == edition, + ) + ) + .order_by(score.c.score.desc()) + .limit(3) + ) result = self.execute(sql) if result is None: return None return result.fetchall() - def get_global_ranking(self, user_id: int, pv_id: int, difficulty: int, - edition: int) -> Optional[List]: + def get_global_ranking( + self, user_id: int, pv_id: int, difficulty: int, edition: int + ) -> Optional[List]: # get the subquery max score of a user with pv_id, difficulty and # edition - sql_sub = select([score.c.score]).filter( - score.c.user == user_id, - score.c.pv_id == pv_id, - score.c.difficulty == difficulty, - score.c.edition == edition - ).scalar_subquery() + sql_sub = ( + select([score.c.score]) + .filter( + score.c.user == user_id, + score.c.pv_id == pv_id, + score.c.difficulty == difficulty, + score.c.edition == edition, + ) + .scalar_subquery() + ) # Perform the main query, also rename the resulting column to ranking sql = select(func.count(score.c.id).label("ranking")).filter( score.c.score >= sql_sub, score.c.pv_id == pv_id, score.c.difficulty == difficulty, - score.c.edition == edition + score.c.edition == edition, ) result = self.execute(sql) diff --git a/titles/diva/schema/static.py b/titles/diva/schema/static.py index c8d83bd..02ee0ec 100644 --- a/titles/diva/schema/static.py +++ b/titles/diva/schema/static.py @@ -25,7 +25,7 @@ music = Table( Column("bpm", Integer), Column("date", String(255)), UniqueConstraint("version", "songId", "chartId", name="diva_static_music_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) quests = Table( @@ -43,9 +43,8 @@ quests = Table( Column("quest_order", Integer), Column("start_datetime", String(255)), Column("end_datetime", String(255)), - UniqueConstraint("version", "questId", name="diva_static_quests_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) shop = Table( @@ -62,7 +61,7 @@ shop = Table( Column("end_date", String(255)), Column("enabled", Boolean, server_default="1"), UniqueConstraint("version", "shopId", name="diva_static_shop_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) items = Table( @@ -79,64 +78,91 @@ items = Table( Column("end_date", String(255)), Column("enabled", Boolean, server_default="1"), UniqueConstraint("version", "itemId", name="diva_static_items_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) + class DivaStaticData(BaseData): - def put_quests(self, version: int, questId: int, name: str, kind: int, unknown_0: int, unknown_1: int, unknown_2: int, quest_order: int, start_datetime: str, end_datetime: str) -> Optional[int]: + def put_quests( + self, + version: int, + questId: int, + name: str, + kind: int, + unknown_0: int, + unknown_1: int, + unknown_2: int, + quest_order: int, + start_datetime: str, + end_datetime: str, + ) -> Optional[int]: sql = insert(quests).values( - version = version, - questId = questId, - name = name, - kind = kind, - unknown_0 = unknown_0, - unknown_1 = unknown_1, - unknown_2 = unknown_2, - quest_order = quest_order, - start_datetime = start_datetime, - end_datetime = end_datetime + version=version, + questId=questId, + name=name, + kind=kind, + unknown_0=unknown_0, + unknown_1=unknown_1, + unknown_2=unknown_2, + quest_order=quest_order, + start_datetime=start_datetime, + end_datetime=end_datetime, ) - conflict = sql.on_duplicate_key_update( - name = name - ) + conflict = sql.on_duplicate_key_update(name=name) result = self.execute(conflict) - if result is None: return None + if result is None: + return None return result.lastrowid - + def get_enabled_quests(self, version: int) -> Optional[List[Row]]: - sql = select(quests).where(and_(quests.c.version == version, quests.c.quest_enable == True)) + sql = select(quests).where( + and_(quests.c.version == version, quests.c.quest_enable == True) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - def put_shop(self, version: int, shopId: int, name: str, type: int, points: int, unknown_0: int, start_date: str, end_date: str) -> Optional[int]: + def put_shop( + self, + version: int, + shopId: int, + name: str, + type: int, + points: int, + unknown_0: int, + start_date: str, + end_date: str, + ) -> Optional[int]: sql = insert(shop).values( - version = version, - shopId = shopId, - name = name, - type = type, - points = points, - unknown_0 = unknown_0, - start_date = start_date, - end_date = end_date + version=version, + shopId=shopId, + name=name, + type=type, + points=points, + unknown_0=unknown_0, + start_date=start_date, + end_date=end_date, ) - conflict = sql.on_duplicate_key_update( - name = name - ) + conflict = sql.on_duplicate_key_update(name=name) result = self.execute(conflict) - if result is None: return None + if result is None: + return None return result.lastrowid def get_enabled_shop(self, version: int, shopId: int) -> Optional[Row]: - sql = select(shop).where(and_( - shop.c.version == version, - shop.c.shopId == shopId, - shop.c.enabled == True)) + sql = select(shop).where( + and_( + shop.c.version == version, + shop.c.shopId == shopId, + shop.c.enabled == True, + ) + ) result = self.execute(sql) if result is None: @@ -144,40 +170,52 @@ class DivaStaticData(BaseData): return result.fetchone() def get_enabled_shops(self, version: int) -> Optional[List[Row]]: - sql = select(shop).where(and_( - shop.c.version == version, - shop.c.enabled == True)) + sql = select(shop).where( + and_(shop.c.version == version, shop.c.enabled == True) + ) result = self.execute(sql) if result is None: return None return result.fetchall() - def put_items(self, version: int, itemId: int, name: str, type: int, points: int, unknown_0: int, start_date: str, end_date: str) -> Optional[int]: + def put_items( + self, + version: int, + itemId: int, + name: str, + type: int, + points: int, + unknown_0: int, + start_date: str, + end_date: str, + ) -> Optional[int]: sql = insert(items).values( - version = version, - itemId = itemId, - name = name, - type = type, - points = points, - unknown_0 = unknown_0, - start_date = start_date, - end_date = end_date + version=version, + itemId=itemId, + name=name, + type=type, + points=points, + unknown_0=unknown_0, + start_date=start_date, + end_date=end_date, ) - conflict = sql.on_duplicate_key_update( - name = name - ) + conflict = sql.on_duplicate_key_update(name=name) result = self.execute(conflict) - if result is None: return None + if result is None: + return None return result.lastrowid def get_enabled_item(self, version: int, itemId: int) -> Optional[Row]: - sql = select(items).where(and_( - items.c.version == version, - items.c.itemId == itemId, - items.c.enabled == True)) + sql = select(items).where( + and_( + items.c.version == version, + items.c.itemId == itemId, + items.c.enabled == True, + ) + ) result = self.execute(sql) if result is None: @@ -185,66 +223,89 @@ class DivaStaticData(BaseData): return result.fetchone() def get_enabled_items(self, version: int) -> Optional[List[Row]]: - sql = select(items).where(and_( - items.c.version == version, - items.c.enabled == True)) + sql = select(items).where( + and_(items.c.version == version, items.c.enabled == True) + ) result = self.execute(sql) if result is None: return None return result.fetchall() - def put_music(self, version: int, song: int, chart: int, title: str, arranger: str, illustrator: str, - lyrics: str, music_comp: str, level: float, bpm: int, date: str) -> Optional[int]: + def put_music( + self, + version: int, + song: int, + chart: int, + title: str, + arranger: str, + illustrator: str, + lyrics: str, + music_comp: str, + level: float, + bpm: int, + date: str, + ) -> Optional[int]: sql = insert(music).values( - version = version, - songId = song, - chartId = chart, - title = title, - vocaloid_arranger = arranger, - pv_illustrator = illustrator, - lyrics = lyrics, - bg_music = music_comp, - level = level, - bpm = bpm, - date = date + version=version, + songId=song, + chartId=chart, + title=title, + vocaloid_arranger=arranger, + pv_illustrator=illustrator, + lyrics=lyrics, + bg_music=music_comp, + level=level, + bpm=bpm, + date=date, ) conflict = sql.on_duplicate_key_update( - title = title, - vocaloid_arranger = arranger, - pv_illustrator = illustrator, - lyrics = lyrics, - bg_music = music_comp, - level = level, - bpm = bpm, - date = date + title=title, + vocaloid_arranger=arranger, + pv_illustrator=illustrator, + lyrics=lyrics, + bg_music=music_comp, + level=level, + bpm=bpm, + date=date, ) result = self.execute(conflict) - if result is None: return None + if result is None: + return None return result.lastrowid - - def get_music(self, version: int, song_id: Optional[int] = None) -> Optional[List[Row]]: + + def get_music( + self, version: int, song_id: Optional[int] = None + ) -> Optional[List[Row]]: if song_id is None: sql = select(music).where(music.c.version == version) else: - sql = select(music).where(and_( - music.c.version == version, - music.c.songId == song_id, - )) + sql = select(music).where( + and_( + music.c.version == version, + music.c.songId == song_id, + ) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - - def get_music_chart(self, version: int, song_id: int, chart_id: int) -> Optional[List[Row]]: - sql = select(music).where(and_( - music.c.version == version, - music.c.songId == song_id, - music.c.chartId == chart_id - )) + + def get_music_chart( + self, version: int, song_id: int, chart_id: int + ) -> Optional[List[Row]]: + sql = select(music).where( + and_( + music.c.version == version, + music.c.songId == song_id, + music.c.chartId == chart_id, + ) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() diff --git a/titles/mai2/__init__.py b/titles/mai2/__init__.py index 71dbd5e..0d9ea89 100644 --- a/titles/mai2/__init__.py +++ b/titles/mai2/__init__.py @@ -7,4 +7,4 @@ index = Mai2Servlet database = Mai2Data reader = Mai2Reader game_codes = [Mai2Constants.GAME_CODE] -current_schema_version = 2 \ No newline at end of file +current_schema_version = 2 diff --git a/titles/mai2/base.py b/titles/mai2/base.py index ea98681..8a48d8b 100644 --- a/titles/mai2/base.py +++ b/titles/mai2/base.py @@ -7,7 +7,8 @@ from titles.mai2.const import Mai2Constants from titles.mai2.config import Mai2Config from titles.mai2.database import Mai2Data -class Mai2Base(): + +class Mai2Base: def __init__(self, cfg: CoreConfig, game_cfg: Mai2Config) -> None: self.core_config = cfg self.game_config = game_cfg @@ -17,23 +18,27 @@ class Mai2Base(): self.logger = logging.getLogger("mai2") def handle_get_game_setting_api_request(self, data: Dict): - reboot_start = date.strftime(datetime.now() + timedelta(hours=3), Mai2Constants.DATE_TIME_FORMAT) - reboot_end = date.strftime(datetime.now() + timedelta(hours=4), Mai2Constants.DATE_TIME_FORMAT) + reboot_start = date.strftime( + datetime.now() + timedelta(hours=3), Mai2Constants.DATE_TIME_FORMAT + ) + reboot_end = date.strftime( + datetime.now() + timedelta(hours=4), Mai2Constants.DATE_TIME_FORMAT + ) return { - "gameSetting": { - "isMaintenance": "false", - "requestInterval": 10, - "rebootStartTime": reboot_start, - "rebootEndTime": reboot_end, - "movieUploadLimit": 10000, - "movieStatus": 0, - "movieServerUri": "", - "deliverServerUri": "", - "oldServerUri": "", - "usbDlServerUri": "", - "rebootInterval": 0 + "gameSetting": { + "isMaintenance": "false", + "requestInterval": 10, + "rebootStartTime": reboot_start, + "rebootEndTime": reboot_end, + "movieUploadLimit": 10000, + "movieStatus": 0, + "movieServerUri": "", + "deliverServerUri": "", + "oldServerUri": "", + "usbDlServerUri": "", + "rebootInterval": 0, }, - "isAouAccession": "true", + "isAouAccession": "true", } def handle_get_game_ranking_api_request(self, data: Dict) -> Dict: @@ -46,34 +51,44 @@ class Mai2Base(): def handle_get_game_event_api_request(self, data: Dict) -> Dict: events = self.data.static.get_enabled_events(self.version) events_lst = [] - if events is None: return {"type": data["type"], "length": 0, "gameEventList": []} + if events is None: + return {"type": data["type"], "length": 0, "gameEventList": []} for event in events: - events_lst.append({ - "type": event["type"], - "id": event["eventId"], - "startDate": "2017-12-05 07:00:00.0", - "endDate": "2099-12-31 00:00:00.0" - }) + events_lst.append( + { + "type": event["type"], + "id": event["eventId"], + "startDate": "2017-12-05 07:00:00.0", + "endDate": "2099-12-31 00:00:00.0", + } + ) - return {"type": data["type"], "length": len(events_lst), "gameEventList": events_lst} + return { + "type": data["type"], + "length": len(events_lst), + "gameEventList": events_lst, + } def handle_get_game_ng_music_id_api_request(self, data: Dict) -> Dict: return {"length": 0, "musicIdList": []} def handle_get_game_charge_api_request(self, data: Dict) -> Dict: game_charge_list = self.data.static.get_enabled_tickets(self.version, 1) - if game_charge_list is None: return {"length": 0, "gameChargeList": []} + if game_charge_list is None: + return {"length": 0, "gameChargeList": []} charge_list = [] for x in range(len(game_charge_list)): - charge_list.append({ - "orderId": x, - "chargeId": game_charge_list[x]["ticketId"], - "price": game_charge_list[x]["price"], - "startDate": "2017-12-05 07:00:00.0", - "endDate": "2099-12-31 00:00:00.0" - }) + charge_list.append( + { + "orderId": x, + "chargeId": game_charge_list[x]["ticketId"], + "price": game_charge_list[x]["price"], + "startDate": "2017-12-05 07:00:00.0", + "endDate": "2099-12-31 00:00:00.0", + } + ) return {"length": len(charge_list), "gameChargeList": charge_list} @@ -92,7 +107,8 @@ class Mai2Base(): def handle_get_user_preview_api_request(self, data: Dict) -> Dict: p = self.data.profile.get_profile_detail(data["userId"], self.version) o = self.data.profile.get_profile_option(data["userId"], self.version) - if p is None or o is None: return {} # Register + if p is None or o is None: + return {} # Register profile = p._asdict() option = o._asdict() @@ -106,20 +122,24 @@ class Mai2Base(): "lastLoginDate": profile["lastLoginDate"], "lastPlayDate": profile["lastPlayDate"], "playerRating": profile["playerRating"], - "nameplateId": 0, # Unused + "nameplateId": 0, # Unused "iconId": profile["iconId"], - "trophyId": 0, # Unused + "trophyId": 0, # Unused "partnerId": profile["partnerId"], "frameId": profile["frameId"], - "dispRate": option["dispRate"], # 0: all/begin, 1: disprate, 2: dispDan, 3: hide, 4: end + "dispRate": option[ + "dispRate" + ], # 0: all/begin, 1: disprate, 2: dispDan, 3: hide, 4: end "totalAwake": profile["totalAwake"], "isNetMember": profile["isNetMember"], "dailyBonusDate": profile["dailyBonusDate"], "headPhoneVolume": option["headPhoneVolume"], - "isInherit": False, # Not sure what this is or does?? - "banState": profile["banState"] if profile["banState"] is not None else 0 # New with uni+ + "isInherit": False, # Not sure what this is or does?? + "banState": profile["banState"] + if profile["banState"] is not None + else 0, # New with uni+ } - + def handle_user_login_api_request(self, data: Dict) -> Dict: profile = self.data.profile.get_profile_detail(data["userId"], self.version) @@ -137,10 +157,10 @@ class Mai2Base(): "returnCode": 1, "lastLoginDate": lastLoginDate, "loginCount": loginCt, - "consecutiveLoginCount": 0, # We don't really have a way to track this... - "loginId": loginCt # Used with the playlog! + "consecutiveLoginCount": 0, # We don't really have a way to track this... + "loginId": loginCt, # Used with the playlog! } - + def handle_upload_user_playlog_api_request(self, data: Dict) -> Dict: user_id = data["userId"] playlog = data["userPlaylog"] @@ -154,50 +174,83 @@ class Mai2Base(): if "userData" in upsert and len(upsert["userData"]) > 0: upsert["userData"][0]["isNetMember"] = 1 upsert["userData"][0].pop("accessCode") - self.data.profile.put_profile_detail(user_id, self.version, upsert["userData"][0]) - + self.data.profile.put_profile_detail( + user_id, self.version, upsert["userData"][0] + ) + if "userExtend" in upsert and len(upsert["userExtend"]) > 0: - self.data.profile.put_profile_extend(user_id, self.version, upsert["userExtend"][0]) + self.data.profile.put_profile_extend( + user_id, self.version, upsert["userExtend"][0] + ) if "userGhost" in upsert: for ghost in upsert["userGhost"]: self.data.profile.put_profile_extend(user_id, self.version, ghost) - + if "userOption" in upsert and len(upsert["userOption"]) > 0: - self.data.profile.put_profile_option(user_id, self.version, upsert["userOption"][0]) + self.data.profile.put_profile_option( + user_id, self.version, upsert["userOption"][0] + ) if "userRatingList" in upsert and len(upsert["userRatingList"]) > 0: - self.data.profile.put_profile_rating(user_id, self.version, upsert["userRatingList"][0]) + self.data.profile.put_profile_rating( + user_id, self.version, upsert["userRatingList"][0] + ) if "userActivityList" in upsert and len(upsert["userActivityList"]) > 0: - for k,v in upsert["userActivityList"][0].items(): + for k, v in upsert["userActivityList"][0].items(): for act in v: self.data.profile.put_profile_activity(user_id, act) if upsert["isNewCharacterList"] and int(upsert["isNewCharacterList"]) > 0: for char in upsert["userCharacterList"]: - self.data.item.put_character(user_id, char["characterId"], char["level"], char["awakening"], char["useCount"]) + self.data.item.put_character( + user_id, + char["characterId"], + char["level"], + char["awakening"], + char["useCount"], + ) if upsert["isNewItemList"] and int(upsert["isNewItemList"]) > 0: for item in upsert["userItemList"]: - self.data.item.put_item(user_id, int(item["itemKind"]), item["itemId"], item["stock"], item["isValid"]) + self.data.item.put_item( + user_id, + int(item["itemKind"]), + item["itemId"], + item["stock"], + item["isValid"], + ) if upsert["isNewLoginBonusList"] and int(upsert["isNewLoginBonusList"]) > 0: for login_bonus in upsert["userLoginBonusList"]: - self.data.item.put_login_bonus(user_id, login_bonus["bonusId"], login_bonus["point"], login_bonus["isCurrent"], login_bonus["isComplete"]) + self.data.item.put_login_bonus( + user_id, + login_bonus["bonusId"], + login_bonus["point"], + login_bonus["isCurrent"], + login_bonus["isComplete"], + ) if upsert["isNewMapList"] and int(upsert["isNewMapList"]) > 0: for map in upsert["userMapList"]: - self.data.item.put_map(user_id, map["mapId"], map["distance"], map["isLock"], map["isClear"], map["isComplete"]) - + self.data.item.put_map( + user_id, + map["mapId"], + map["distance"], + map["isLock"], + map["isClear"], + map["isComplete"], + ) + if upsert["isNewMusicDetailList"] and int(upsert["isNewMusicDetailList"]) > 0: for music in upsert["userMusicDetailList"]: self.data.score.put_best_score(user_id, music) - + if upsert["isNewCourseList"] and int(upsert["isNewCourseList"]) > 0: for course in upsert["userCourseList"]: self.data.score.put_course(user_id, course) - + if upsert["isNewFavoriteList"] and int(upsert["isNewFavoriteList"]) > 0: for fav in upsert["userFavoriteList"]: self.data.item.put_favorite(user_id, fav["kind"], fav["itemIdList"]) @@ -211,45 +264,39 @@ class Mai2Base(): def handle_get_user_data_api_request(self, data: Dict) -> Dict: profile = self.data.profile.get_profile_detail(data["userId"], self.version) - if profile is None: return + if profile is None: + return profile_dict = profile._asdict() profile_dict.pop("id") profile_dict.pop("user") profile_dict.pop("version") - return { - "userId": data["userId"], - "userData": profile_dict - } + return {"userId": data["userId"], "userData": profile_dict} def handle_get_user_extend_api_request(self, data: Dict) -> Dict: extend = self.data.profile.get_profile_extend(data["userId"], self.version) - if extend is None: return + if extend is None: + return extend_dict = extend._asdict() extend_dict.pop("id") extend_dict.pop("user") extend_dict.pop("version") - return { - "userId": data["userId"], - "userExtend": extend_dict - } + return {"userId": data["userId"], "userExtend": extend_dict} def handle_get_user_option_api_request(self, data: Dict) -> Dict: options = self.data.profile.get_profile_option(data["userId"], self.version) - if options is None: return + if options is None: + return options_dict = options._asdict() options_dict.pop("id") options_dict.pop("user") options_dict.pop("version") - return { - "userId": data["userId"], - "userOption": options_dict - } + return {"userId": data["userId"], "userOption": options_dict} def handle_get_user_card_api_request(self, data: Dict) -> Dict: return {"userId": data["userId"], "nextIndex": 0, "userCardList": []} @@ -266,73 +313,83 @@ class Mai2Base(): for x in range(next_idx, data["maxCount"]): try: - user_item_list.append({"item_kind": user_items[x]["item_kind"], "item_id": user_items[x]["item_id"], - "stock": user_items[x]["stock"], "isValid": user_items[x]["is_valid"]}) - except: break - + user_item_list.append( + { + "item_kind": user_items[x]["item_kind"], + "item_id": user_items[x]["item_id"], + "stock": user_items[x]["stock"], + "isValid": user_items[x]["is_valid"], + } + ) + except: + break + if len(user_item_list) == data["maxCount"]: next_idx = data["nextIndex"] + data["maxCount"] + 1 break - return {"userId": data["userId"], "nextIndex": next_idx, "itemKind": kind, "userItemList": user_item_list} + return { + "userId": data["userId"], + "nextIndex": next_idx, + "itemKind": kind, + "userItemList": user_item_list, + } def handle_get_user_character_api_request(self, data: Dict) -> Dict: characters = self.data.item.get_characters(data["userId"]) chara_list = [] for chara in characters: - chara_list.append({ - "characterId": chara["character_id"], - "level": chara["level"], - "awakening": chara["awakening"], - "useCount": chara["use_count"], - }) + chara_list.append( + { + "characterId": chara["character_id"], + "level": chara["level"], + "awakening": chara["awakening"], + "useCount": chara["use_count"], + } + ) return {"userId": data["userId"], "userCharacterList": chara_list} - + def handle_get_user_favorite_api_request(self, data: Dict) -> Dict: favorites = self.data.item.get_favorites(data["userId"], data["itemKind"]) - if favorites is None: return + if favorites is None: + return userFavs = [] for fav in favorites: - userFavs.append({ - "userId": data["userId"], - "itemKind": fav["itemKind"], - "itemIdList": fav["itemIdList"] - }) + userFavs.append( + { + "userId": data["userId"], + "itemKind": fav["itemKind"], + "itemIdList": fav["itemIdList"], + } + ) - return { - "userId": data["userId"], - "userFavoriteData": userFavs - } + return {"userId": data["userId"], "userFavoriteData": userFavs} def handle_get_user_ghost_api_request(self, data: Dict) -> Dict: ghost = self.data.profile.get_profile_ghost(data["userId"], self.version) - if ghost is None: return + if ghost is None: + return ghost_dict = ghost._asdict() ghost_dict.pop("user") ghost_dict.pop("id") ghost_dict.pop("version_int") - return { - "userId": data["userId"], - "userGhost": ghost_dict - } + return {"userId": data["userId"], "userGhost": ghost_dict} def handle_get_user_rating_api_request(self, data: Dict) -> Dict: rating = self.data.profile.get_profile_rating(data["userId"], self.version) - if rating is None: return + if rating is None: + return rating_dict = rating._asdict() rating_dict.pop("user") rating_dict.pop("id") rating_dict.pop("version") - return { - "userId": data["userId"], - "userRating": rating_dict - } + return {"userId": data["userId"], "userRating": rating_dict} def handle_get_user_activity_api_request(self, data: Dict) -> Dict: """ @@ -340,31 +397,27 @@ class Mai2Base(): """ playlist = self.data.profile.get_profile_activity(data["userId"], 1) musiclist = self.data.profile.get_profile_activity(data["userId"], 2) - if playlist is None or musiclist is None: return + if playlist is None or musiclist is None: + return plst = [] mlst = [] for play in playlist: - tmp = play._asdict() + tmp = play._asdict() tmp["id"] = tmp["activityId"] tmp.pop("activityId") tmp.pop("user") plst.append(tmp) for music in musiclist: - tmp = music._asdict() + tmp = music._asdict() tmp["id"] = tmp["activityId"] tmp.pop("activityId") tmp.pop("user") mlst.append(tmp) - return { - "userActivity": { - "playList": plst, - "musicList": mlst - } - } + return {"userActivity": {"playList": plst, "musicList": mlst}} def handle_get_user_course_api_request(self, data: Dict) -> Dict: user_courses = self.data.score.get_courses(data["userId"]) @@ -389,21 +442,30 @@ class Mai2Base(): for x in range(data["nextIndex"], data["maxCount"] + data["nextIndex"]): try: - friend_season_ranking_list.append({ - "mapId": friend_season_ranking_list[x]["map_id"], - "distance": friend_season_ranking_list[x]["distance"], - "isLock": friend_season_ranking_list[x]["is_lock"], - "isClear": friend_season_ranking_list[x]["is_clear"], - "isComplete": friend_season_ranking_list[x]["is_complete"], - }) + friend_season_ranking_list.append( + { + "mapId": friend_season_ranking_list[x]["map_id"], + "distance": friend_season_ranking_list[x]["distance"], + "isLock": friend_season_ranking_list[x]["is_lock"], + "isClear": friend_season_ranking_list[x]["is_clear"], + "isComplete": friend_season_ranking_list[x]["is_complete"], + } + ) except: break # We're capped and still have some left to go - if len(friend_season_ranking_list) == data["maxCount"] and len(friend_season_ranking) > data["maxCount"] + data["nextIndex"]: + if ( + len(friend_season_ranking_list) == data["maxCount"] + and len(friend_season_ranking) > data["maxCount"] + data["nextIndex"] + ): next_index = data["maxCount"] + data["nextIndex"] - return {"userId": data["userId"], "nextIndex": next_index, "userFriendSeasonRankingList": friend_season_ranking_list} + return { + "userId": data["userId"], + "nextIndex": next_index, + "userFriendSeasonRankingList": friend_season_ranking_list, + } def handle_get_user_map_api_request(self, data: Dict) -> Dict: maps = self.data.item.get_maps(data["userId"]) @@ -412,21 +474,30 @@ class Mai2Base(): for x in range(data["nextIndex"], data["maxCount"] + data["nextIndex"]): try: - map_list.append({ - "mapId": maps[x]["map_id"], - "distance": maps[x]["distance"], - "isLock": maps[x]["is_lock"], - "isClear": maps[x]["is_clear"], - "isComplete": maps[x]["is_complete"], - }) + map_list.append( + { + "mapId": maps[x]["map_id"], + "distance": maps[x]["distance"], + "isLock": maps[x]["is_lock"], + "isClear": maps[x]["is_clear"], + "isComplete": maps[x]["is_complete"], + } + ) except: break # We're capped and still have some left to go - if len(map_list) == data["maxCount"] and len(maps) > data["maxCount"] + data["nextIndex"]: + if ( + len(map_list) == data["maxCount"] + and len(maps) > data["maxCount"] + data["nextIndex"] + ): next_index = data["maxCount"] + data["nextIndex"] - return {"userId": data["userId"], "nextIndex": next_index, "userMapList": map_list} + return { + "userId": data["userId"], + "nextIndex": next_index, + "userMapList": map_list, + } def handle_get_user_login_bonus_api_request(self, data: Dict) -> Dict: login_bonuses = self.data.item.get_login_bonuses(data["userId"]) @@ -435,20 +506,29 @@ class Mai2Base(): for x in range(data["nextIndex"], data["maxCount"] + data["nextIndex"]): try: - login_bonus_list.append({ - "bonusId": login_bonuses[x]["bonus_id"], - "point": login_bonuses[x]["point"], - "isCurrent": login_bonuses[x]["is_current"], - "isComplete": login_bonuses[x]["is_complete"], - }) + login_bonus_list.append( + { + "bonusId": login_bonuses[x]["bonus_id"], + "point": login_bonuses[x]["point"], + "isCurrent": login_bonuses[x]["is_current"], + "isComplete": login_bonuses[x]["is_complete"], + } + ) except: break # We're capped and still have some left to go - if len(login_bonus_list) == data["maxCount"] and len(login_bonuses) > data["maxCount"] + data["nextIndex"]: + if ( + len(login_bonus_list) == data["maxCount"] + and len(login_bonuses) > data["maxCount"] + data["nextIndex"] + ): next_index = data["maxCount"] + data["nextIndex"] - return {"userId": data["userId"], "nextIndex": next_index, "userLoginBonusList": login_bonus_list} + return { + "userId": data["userId"], + "nextIndex": next_index, + "userLoginBonusList": login_bonus_list, + } def handle_get_user_region_api_request(self, data: Dict) -> Dict: return {"userId": data["userId"], "length": 0, "userRegionList": []} @@ -460,18 +540,24 @@ class Mai2Base(): if songs is not None: for song in songs: - music_detail_list.append({ - "musicId": song["song_id"], - "level": song["chart_id"], - "playCount": song["play_count"], - "achievement": song["achievement"], - "comboStatus": song["combo_status"], - "syncStatus": song["sync_status"], - "deluxscoreMax": song["dx_score"], - "scoreRank": song["score_rank"], - }) + music_detail_list.append( + { + "musicId": song["song_id"], + "level": song["chart_id"], + "playCount": song["play_count"], + "achievement": song["achievement"], + "comboStatus": song["combo_status"], + "syncStatus": song["sync_status"], + "deluxscoreMax": song["dx_score"], + "scoreRank": song["score_rank"], + } + ) if len(music_detail_list) == data["maxCount"]: next_index = data["maxCount"] + data["nextIndex"] break - return {"userId": data["userId"], "nextIndex": next_index, "userMusicList": [{"userMusicDetailList": music_detail_list}]} + return { + "userId": data["userId"], + "nextIndex": next_index, + "userMusicList": [{"userMusicDetailList": music_detail_list}], + } diff --git a/titles/mai2/config.py b/titles/mai2/config.py index 7fe9a33..3a20065 100644 --- a/titles/mai2/config.py +++ b/titles/mai2/config.py @@ -1,17 +1,25 @@ from core.config import CoreConfig -class Mai2ServerConfig(): + +class Mai2ServerConfig: def __init__(self, parent: "Mai2Config") -> None: self.__config = parent @property def enable(self) -> bool: - return CoreConfig.get_config_field(self.__config, 'mai2', 'server', 'enable', default=True) - + return CoreConfig.get_config_field( + self.__config, "mai2", "server", "enable", default=True + ) + @property def loglevel(self) -> int: - return CoreConfig.str_to_loglevel(CoreConfig.get_config_field(self.__config, 'mai2', 'server', 'loglevel', default="info")) + return CoreConfig.str_to_loglevel( + CoreConfig.get_config_field( + self.__config, "mai2", "server", "loglevel", default="info" + ) + ) + class Mai2Config(dict): def __init__(self) -> None: - self.server = Mai2ServerConfig(self) \ No newline at end of file + self.server = Mai2ServerConfig(self) diff --git a/titles/mai2/const.py b/titles/mai2/const.py index c6ae129..dd1dca0 100644 --- a/titles/mai2/const.py +++ b/titles/mai2/const.py @@ -1,4 +1,4 @@ -class Mai2Constants(): +class Mai2Constants: GRADE = { "D": 0, "C": 1, @@ -13,22 +13,10 @@ class Mai2Constants(): "SS": 10, "SS+": 11, "SSS": 12, - "SSS+": 13 - } - FC = { - "None": 0, - "FC": 1, - "FC+": 2, - "AP": 3, - "AP+": 4 - } - SYNC = { - "None": 0, - "FS": 1, - "FS+": 2, - "FDX": 3, - "FDX+": 4 + "SSS+": 13, } + FC = {"None": 0, "FC": 1, "FC+": 2, "AP": 3, "AP+": 4} + SYNC = {"None": 0, "FS": 1, "FS+": 2, "FDX": 3, "FDX+": 4} DATE_TIME_FORMAT = "%Y-%m-%d %H:%M:%S" @@ -43,9 +31,15 @@ class Mai2Constants(): VER_MAIMAI_DX_UNIVERSE = 4 VER_MAIMAI_DX_UNIVERSE_PLUS = 5 - VERSION_STRING = ("maimai Delux", "maimai Delux PLUS", "maimai Delux Splash", "maimai Delux Splash PLUS", "maimai Delux Universe", - "maimai Delux Universe PLUS") + VERSION_STRING = ( + "maimai Delux", + "maimai Delux PLUS", + "maimai Delux Splash", + "maimai Delux Splash PLUS", + "maimai Delux Universe", + "maimai Delux Universe PLUS", + ) @classmethod def game_ver_to_string(cls, ver: int): - return cls.VERSION_STRING[ver] \ No newline at end of file + return cls.VERSION_STRING[ver] diff --git a/titles/mai2/database.py b/titles/mai2/database.py index 7a19e75..be9e518 100644 --- a/titles/mai2/database.py +++ b/titles/mai2/database.py @@ -1,6 +1,12 @@ from core.data import Data from core.config import CoreConfig -from titles.mai2.schema import Mai2ItemData, Mai2ProfileData, Mai2StaticData, Mai2ScoreData +from titles.mai2.schema import ( + Mai2ItemData, + Mai2ProfileData, + Mai2StaticData, + Mai2ScoreData, +) + class Mai2Data(Data): def __init__(self, cfg: CoreConfig) -> None: @@ -9,4 +15,4 @@ class Mai2Data(Data): self.profile = Mai2ProfileData(self.config, self.session) self.item = Mai2ItemData(self.config, self.session) self.static = Mai2StaticData(self.config, self.session) - self.score = Mai2ScoreData(self.config, self.session) \ No newline at end of file + self.score = Mai2ScoreData(self.config, self.session) diff --git a/titles/mai2/index.py b/titles/mai2/index.py index 305e389..0679d1f 100644 --- a/titles/mai2/index.py +++ b/titles/mai2/index.py @@ -20,12 +20,14 @@ from titles.mai2.universe import Mai2Universe from titles.mai2.universeplus import Mai2UniversePlus -class Mai2Servlet(): +class Mai2Servlet: def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None: self.core_cfg = core_cfg self.game_cfg = Mai2Config() if path.exists(f"{cfg_dir}/{Mai2Constants.CONFIG_NAME}"): - self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{Mai2Constants.CONFIG_NAME}"))) + self.game_cfg.update( + yaml.safe_load(open(f"{cfg_dir}/{Mai2Constants.CONFIG_NAME}")) + ) self.versions = [ Mai2Base(core_cfg, self.game_cfg), @@ -39,34 +41,52 @@ class Mai2Servlet(): self.logger = logging.getLogger("mai2") log_fmt_str = "[%(asctime)s] Mai2 | %(levelname)s | %(message)s" log_fmt = logging.Formatter(log_fmt_str) - fileHandler = TimedRotatingFileHandler("{0}/{1}.log".format(self.core_cfg.server.log_dir, "mai2"), encoding='utf8', - when="d", backupCount=10) + fileHandler = TimedRotatingFileHandler( + "{0}/{1}.log".format(self.core_cfg.server.log_dir, "mai2"), + encoding="utf8", + when="d", + backupCount=10, + ) fileHandler.setFormatter(log_fmt) - + consoleHandler = logging.StreamHandler() consoleHandler.setFormatter(log_fmt) self.logger.addHandler(fileHandler) self.logger.addHandler(consoleHandler) - + self.logger.setLevel(self.game_cfg.server.loglevel) - coloredlogs.install(level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str) + coloredlogs.install( + level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str + ) @classmethod - def get_allnet_info(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: + def get_allnet_info( + cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str + ) -> Tuple[bool, str, str]: game_cfg = Mai2Config() if path.exists(f"{cfg_dir}/{Mai2Constants.CONFIG_NAME}"): - game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{Mai2Constants.CONFIG_NAME}"))) + game_cfg.update( + yaml.safe_load(open(f"{cfg_dir}/{Mai2Constants.CONFIG_NAME}")) + ) if not game_cfg.server.enable: return (False, "", "") - + if core_cfg.server.is_develop: - return (True, f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/", f"{core_cfg.title.hostname}:{core_cfg.title.port}/") - - return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", f"{core_cfg.title.hostname}/") + return ( + True, + f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/", + f"{core_cfg.title.hostname}:{core_cfg.title.port}/", + ) + + return ( + True, + f"http://{core_cfg.title.hostname}/{game_code}/$v/", + f"{core_cfg.title.hostname}/", + ) def render_POST(self, request: Request, version: int, url_path: str) -> bytes: if url_path.lower() == "/ping": @@ -78,34 +98,36 @@ class Mai2Servlet(): internal_ver = 0 endpoint = url_split[len(url_split) - 1] - if version < 105: # 1.0 + if version < 105: # 1.0 internal_ver = Mai2Constants.VER_MAIMAI_DX - elif version >= 105 and version < 110: # Plus + elif version >= 105 and version < 110: # Plus internal_ver = Mai2Constants.VER_MAIMAI_DX_PLUS - elif version >= 110 and version < 115: # Splash + elif version >= 110 and version < 115: # Splash internal_ver = Mai2Constants.VER_MAIMAI_DX_SPLASH - elif version >= 115 and version < 120: # Splash Plus + elif version >= 115 and version < 120: # Splash Plus internal_ver = Mai2Constants.VER_MAIMAI_DX_SPLASH_PLUS - elif version >= 120 and version < 125: # Universe + elif version >= 120 and version < 125: # Universe internal_ver = Mai2Constants.VER_MAIMAI_DX_UNIVERSE - elif version >= 125: # Universe Plus + elif version >= 125: # Universe Plus internal_ver = Mai2Constants.VER_MAIMAI_DX_UNIVERSE_PLUS if all(c in string.hexdigits for c in endpoint) and len(endpoint) == 32: - # If we get a 32 character long hex string, it's a hash and we're - # doing encrypted. The likelyhood of false positives is low but + # If we get a 32 character long hex string, it's a hash and we're + # doing encrypted. The likelyhood of false positives is low but # technically not 0 self.logger.error("Encryption not supported at this time") - try: + try: unzip = zlib.decompress(req_raw) - + except zlib.error as e: - self.logger.error(f"Failed to decompress v{version} {endpoint} request -> {e}") + self.logger.error( + f"Failed to decompress v{version} {endpoint} request -> {e}" + ) return zlib.compress(b'{"stat": "0"}') - + req_data = json.loads(unzip) - + self.logger.info(f"v{version} {endpoint} request - {req_data}") func_to_find = "handle_" + inflection.underscore(endpoint) + "_request" @@ -121,10 +143,10 @@ class Mai2Servlet(): except Exception as e: self.logger.error(f"Error handling v{version} method {endpoint} - {e}") return zlib.compress(b'{"stat": "0"}') - + if resp == None: - resp = {'returnCode': 1} - + resp = {"returnCode": 1} + self.logger.info(f"Response {resp}") - + return zlib.compress(json.dumps(resp, ensure_ascii=False).encode("utf-8")) diff --git a/titles/mai2/plus.py b/titles/mai2/plus.py index 2af7bf6..a3c9288 100644 --- a/titles/mai2/plus.py +++ b/titles/mai2/plus.py @@ -8,7 +8,8 @@ from titles.mai2.base import Mai2Base from titles.mai2.config import Mai2Config from titles.mai2.const import Mai2Constants + class Mai2Plus(Mai2Base): def __init__(self, cfg: CoreConfig, game_cfg: Mai2Config) -> None: super().__init__(cfg, game_cfg) - self.version = Mai2Constants.VER_MAIMAI_DX_PLUS \ No newline at end of file + self.version = Mai2Constants.VER_MAIMAI_DX_PLUS diff --git a/titles/mai2/read.py b/titles/mai2/read.py index 1652292..2c0567c 100644 --- a/titles/mai2/read.py +++ b/titles/mai2/read.py @@ -11,25 +11,35 @@ from read import BaseReader from titles.mai2.const import Mai2Constants from titles.mai2.database import Mai2Data + class Mai2Reader(BaseReader): - def __init__(self, config: CoreConfig, version: int, bin_dir: Optional[str], opt_dir: Optional[str], extra: Optional[str]) -> None: + def __init__( + self, + config: CoreConfig, + version: int, + bin_dir: Optional[str], + opt_dir: Optional[str], + extra: Optional[str], + ) -> None: super().__init__(config, version, bin_dir, opt_dir, extra) self.data = Mai2Data(config) try: - self.logger.info(f"Start importer for {Mai2Constants.game_ver_to_string(version)}") + self.logger.info( + f"Start importer for {Mai2Constants.game_ver_to_string(version)}" + ) except IndexError: self.logger.error(f"Invalid maidx version {version}") exit(1) - + def read(self) -> None: data_dirs = [] if self.bin_dir is not None: data_dirs += self.get_data_directories(self.bin_dir) - + if self.opt_dir is not None: - data_dirs += self.get_data_directories(self.opt_dir) - + data_dirs += self.get_data_directories(self.opt_dir) + for dir in data_dirs: self.logger.info(f"Read from {dir}") self.get_events(f"{dir}/event") @@ -43,47 +53,64 @@ class Mai2Reader(BaseReader): for dir in dirs: if os.path.exists(f"{root}/{dir}/Event.xml"): with open(f"{root}/{dir}/Event.xml", encoding="utf-8") as f: - troot = ET.fromstring(f.read()) - name = troot.find('name').find('str').text - id = int(troot.find('name').find('id').text) - event_type = int(troot.find('infoType').text) + name = troot.find("name").find("str").text + id = int(troot.find("name").find("id").text) + event_type = int(troot.find("infoType").text) - self.data.static.put_game_event(self.version, event_type, id, name) + self.data.static.put_game_event( + self.version, event_type, id, name + ) self.logger.info(f"Added event {id}...") - + def read_music(self, base_dir: str) -> None: self.logger.info(f"Reading music from {base_dir}...") for root, dirs, files in os.walk(base_dir): - for dir in dirs: + for dir in dirs: if os.path.exists(f"{root}/{dir}/Music.xml"): with open(f"{root}/{dir}/Music.xml", encoding="utf-8") as f: troot = ET.fromstring(f.read()) - song_id = int(troot.find('name').find('id').text) - title = troot.find('name').find('str').text - artist = troot.find('artistName').find('str').text - genre = troot.find('genreName').find('str').text - bpm = int(troot.find('bpm').text) - added_ver = troot.find('AddVersion').find('str').text + song_id = int(troot.find("name").find("id").text) + title = troot.find("name").find("str").text + artist = troot.find("artistName").find("str").text + genre = troot.find("genreName").find("str").text + bpm = int(troot.find("bpm").text) + added_ver = troot.find("AddVersion").find("str").text - note_data = troot.find('notesData').findall('Notes') + note_data = troot.find("notesData").findall("Notes") for dif in note_data: - path = dif.find('file').find('path').text + path = dif.find("file").find("path").text if path is not None: if os.path.exists(f"{root}/{dir}/{path}"): - chart_id = int(path.split(".")[0].split('_')[1]) - diff_num = float(f"{dif.find('level').text}.{dif.find('levelDecimal').text}") - note_designer = dif.find('notesDesigner').find('str').text + chart_id = int(path.split(".")[0].split("_")[1]) + diff_num = float( + f"{dif.find('level').text}.{dif.find('levelDecimal').text}" + ) + note_designer = ( + dif.find("notesDesigner").find("str").text + ) + + self.data.static.put_game_music( + self.version, + song_id, + chart_id, + title, + artist, + genre, + bpm, + added_ver, + diff_num, + note_designer, + ) + + self.logger.info( + f"Added music id {song_id} chart {chart_id}" + ) - self.data.static.put_game_music(self.version, song_id, chart_id, title, artist, - genre, bpm, added_ver, diff_num, note_designer) - - self.logger.info(f"Added music id {song_id} chart {chart_id}") - def read_tickets(self, base_dir: str) -> None: self.logger.info(f"Reading tickets from {base_dir}...") @@ -91,13 +118,14 @@ class Mai2Reader(BaseReader): for dir in dirs: if os.path.exists(f"{root}/{dir}/Ticket.xml"): with open(f"{root}/{dir}/Ticket.xml", encoding="utf-8") as f: - troot = ET.fromstring(f.read()) - name = troot.find('name').find('str').text - id = int(troot.find('name').find('id').text) - ticket_type = int(troot.find('ticketKind').find('id').text) - price = int(troot.find('creditNum').text) + name = troot.find("name").find("str").text + id = int(troot.find("name").find("id").text) + ticket_type = int(troot.find("ticketKind").find("id").text) + price = int(troot.find("creditNum").text) - self.data.static.put_game_ticket(self.version, id, ticket_type, price, name) + self.data.static.put_game_ticket( + self.version, id, ticket_type, price, name + ) self.logger.info(f"Added ticket {id}...") diff --git a/titles/mai2/schema/__init__.py b/titles/mai2/schema/__init__.py index c2be969..7a8c060 100644 --- a/titles/mai2/schema/__init__.py +++ b/titles/mai2/schema/__init__.py @@ -3,4 +3,4 @@ from titles.mai2.schema.item import Mai2ItemData from titles.mai2.schema.static import Mai2StaticData from titles.mai2.schema.score import Mai2ScoreData -__all__ = [Mai2ProfileData, Mai2ItemData, Mai2StaticData, Mai2ScoreData] \ No newline at end of file +__all__ = [Mai2ProfileData, Mai2ItemData, Mai2StaticData, Mai2ScoreData] diff --git a/titles/mai2/schema/item.py b/titles/mai2/schema/item.py index 4f283d3..072eb3e 100644 --- a/titles/mai2/schema/item.py +++ b/titles/mai2/schema/item.py @@ -12,20 +12,28 @@ character = Table( "mai2_item_character", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("character_id", Integer, nullable=False), Column("level", Integer, nullable=False, server_default="1"), Column("awakening", Integer, nullable=False, server_default="0"), Column("use_count", Integer, nullable=False, server_default="0"), UniqueConstraint("user", "character_id", name="mai2_item_character_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) card = Table( "mai2_item_card", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("card_kind", Integer, nullable=False), Column("card_id", Integer, nullable=False), Column("chara_id", Integer, nullable=False), @@ -33,54 +41,70 @@ card = Table( Column("start_date", String(255), nullable=False), Column("end_date", String(255), nullable=False), UniqueConstraint("user", "card_kind", "card_id", name="mai2_item_card_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) item = Table( "mai2_item_item", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("item_kind", Integer, nullable=False), Column("item_id", Integer, nullable=False), Column("stock", Integer, nullable=False, server_default="1"), Column("is_valid", Boolean, nullable=False, server_default="1"), UniqueConstraint("user", "item_kind", "item_id", name="mai2_item_item_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) map = Table( "mai2_item_map", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("map_id", Integer, nullable=False), Column("distance", Integer, nullable=False), Column("is_lock", Boolean, nullable=False, server_default="0"), Column("is_clear", Boolean, nullable=False, server_default="0"), Column("is_complete", Boolean, nullable=False, server_default="0"), UniqueConstraint("user", "map_id", name="mai2_item_map_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) login_bonus = Table( "mai2_item_login_bonus", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("bonus_id", Integer, nullable=False), Column("point", Integer, nullable=False), Column("is_current", Boolean, nullable=False, server_default="0"), Column("is_complete", Boolean, nullable=False, server_default="0"), UniqueConstraint("user", "bonus_id", name="mai2_item_login_bonus_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) friend_season_ranking = Table( "mai2_item_friend_season_ranking", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("season_id", Integer, nullable=False), Column("point", Integer, nullable=False), Column("rank", Integer, nullable=False), @@ -88,35 +112,46 @@ friend_season_ranking = Table( Column("user_name", String(8), nullable=False), Column("record_date", String(255), nullable=False), UniqueConstraint("user", "season_id", "user_name", name="mai2_item_login_bonus_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) favorite = Table( "mai2_item_favorite", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("itemKind", Integer, nullable=False), Column("itemIdList", JSON), UniqueConstraint("user", "itemKind", name="mai2_item_favorite_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) charge = Table( "mai2_item_charge", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("charge_id", Integer, nullable=False), Column("stock", Integer, nullable=False), Column("purchase_date", String(255), nullable=False), Column("valid_date", String(255), nullable=False), UniqueConstraint("user", "charge_id", name="mai2_item_charge_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) + class Mai2ItemData(BaseData): - def put_item(self, user_id: int, item_kind: int, item_id: int, stock: int, is_valid: bool) -> None: + def put_item( + self, user_id: int, item_kind: int, item_id: int, stock: int, is_valid: bool + ) -> None: sql = insert(item).values( user=user_id, item_kind=item_kind, @@ -132,28 +167,47 @@ class Mai2ItemData(BaseData): result = self.execute(conflict) if result is None: - self.logger.warn(f"put_item: failed to insert item! user_id: {user_id}, item_kind: {item_kind}, item_id: {item_id}") + self.logger.warn( + f"put_item: failed to insert item! user_id: {user_id}, item_kind: {item_kind}, item_id: {item_id}" + ) return None return result.lastrowid - + def get_items(self, user_id: int, item_kind: int = None) -> Optional[List[Row]]: if item_kind is None: sql = item.select(item.c.user == user_id) else: - sql = item.select(and_(item.c.user == user_id, item.c.item_kind == item_kind)) + sql = item.select( + and_(item.c.user == user_id, item.c.item_kind == item_kind) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - + def get_item(self, user_id: int, item_kind: int, item_id: int) -> Optional[Row]: - sql = item.select(and_(item.c.user == user_id, item.c.item_kind == item_kind, item.c.item_id == item_id)) + sql = item.select( + and_( + item.c.user == user_id, + item.c.item_kind == item_kind, + item.c.item_id == item_id, + ) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() - - def put_login_bonus(self, user_id: int, bonus_id: int, point: int, is_current: bool, is_complete: bool) -> None: + + def put_login_bonus( + self, + user_id: int, + bonus_id: int, + point: int, + is_current: bool, + is_complete: bool, + ) -> None: sql = insert(login_bonus).values( user=user_id, bonus_id=bonus_id, @@ -170,25 +224,39 @@ class Mai2ItemData(BaseData): result = self.execute(conflict) if result is None: - self.logger.warn(f"put_login_bonus: failed to insert item! user_id: {user_id}, bonus_id: {bonus_id}, point: {point}") + self.logger.warn( + f"put_login_bonus: failed to insert item! user_id: {user_id}, bonus_id: {bonus_id}, point: {point}" + ) return None return result.lastrowid - + def get_login_bonuses(self, user_id: int) -> Optional[List[Row]]: sql = login_bonus.select(login_bonus.c.user == user_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - + def get_login_bonus(self, user_id: int, bonus_id: int) -> Optional[Row]: - sql = login_bonus.select(and_(login_bonus.c.user == user_id, login_bonus.c.bonus_id == bonus_id)) + sql = login_bonus.select( + and_(login_bonus.c.user == user_id, login_bonus.c.bonus_id == bonus_id) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() - def put_map(self, user_id: int, map_id: int, distance: int, is_lock: bool, is_clear: bool, is_complete: bool) -> None: + def put_map( + self, + user_id: int, + map_id: int, + distance: int, + is_lock: bool, + is_clear: bool, + is_complete: bool, + ) -> None: sql = insert(map).values( user=user_id, map_id=map_id, @@ -207,25 +275,36 @@ class Mai2ItemData(BaseData): result = self.execute(conflict) if result is None: - self.logger.warn(f"put_map: failed to insert item! user_id: {user_id}, map_id: {map_id}, distance: {distance}") + self.logger.warn( + f"put_map: failed to insert item! user_id: {user_id}, map_id: {map_id}, distance: {distance}" + ) return None return result.lastrowid - + def get_maps(self, user_id: int) -> Optional[List[Row]]: sql = map.select(map.c.user == user_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - + def get_map(self, user_id: int, map_id: int) -> Optional[Row]: sql = map.select(and_(map.c.user == user_id, map.c.map_id == map_id)) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() - def put_character(self, user_id: int, character_id: int, level: int, awakening: int, use_count: int) -> None: + def put_character( + self, + user_id: int, + character_id: int, + level: int, + awakening: int, + use_count: int, + ) -> None: sql = insert(character).values( user=user_id, character_id=character_id, @@ -242,57 +321,64 @@ class Mai2ItemData(BaseData): result = self.execute(conflict) if result is None: - self.logger.warn(f"put_character: failed to insert item! user_id: {user_id}, character_id: {character_id}, level: {level}") + self.logger.warn( + f"put_character: failed to insert item! user_id: {user_id}, character_id: {character_id}, level: {level}" + ) return None return result.lastrowid - + def get_characters(self, user_id: int) -> Optional[List[Row]]: sql = character.select(character.c.user == user_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - + def get_character(self, user_id: int, character_id: int) -> Optional[Row]: - sql = character.select(and_(character.c.user == user_id, character.c.character_id == character_id)) + sql = character.select( + and_(character.c.user == user_id, character.c.character_id == character_id) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() - + def get_friend_season_ranking(self, user_id: int) -> Optional[Row]: sql = friend_season_ranking.select(friend_season_ranking.c.user == user_id) result = self.execute(sql) - if result is None:return None + if result is None: + return None return result.fetchone() - - def put_favorite(self, user_id: int, kind: int, item_id_list: List[int]) -> Optional[int]: + + def put_favorite( + self, user_id: int, kind: int, item_id_list: List[int] + ) -> Optional[int]: sql = insert(favorite).values( - user=user_id, - kind=kind, - item_id_list=item_id_list + user=user_id, kind=kind, item_id_list=item_id_list ) - conflict = sql.on_duplicate_key_update( - item_id_list=item_id_list - ) + conflict = sql.on_duplicate_key_update(item_id_list=item_id_list) result = self.execute(conflict) if result is None: - self.logger.warn(f"put_favorite: failed to insert item! user_id: {user_id}, kind: {kind}") + self.logger.warn( + f"put_favorite: failed to insert item! user_id: {user_id}, kind: {kind}" + ) return None return result.lastrowid - + def get_favorites(self, user_id: int, kind: int = None) -> Optional[Row]: if kind is None: sql = favorite.select(favorite.c.user == user_id) else: - sql = favorite.select(and_( - favorite.c.user == user_id, - favorite.c.itemKind == kind - )) + sql = favorite.select( + and_(favorite.c.user == user_id, favorite.c.itemKind == kind) + ) result = self.execute(sql) - if result is None:return None - return result.fetchall() \ No newline at end of file + if result is None: + return None + return result.fetchall() diff --git a/titles/mai2/schema/profile.py b/titles/mai2/schema/profile.py index 346645c..335a731 100644 --- a/titles/mai2/schema/profile.py +++ b/titles/mai2/schema/profile.py @@ -14,7 +14,11 @@ detail = Table( "mai2_profile_detail", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("version", Integer, nullable=False), Column("userName", String(25)), Column("isNetMember", Integer), @@ -41,9 +45,9 @@ detail = Table( Column("lastRomVersion", String(25)), Column("lastDataVersion", String(25)), Column("lastLoginDate", String(25)), - Column("lastPairLoginDate", String(25)), # new with uni+ + Column("lastPairLoginDate", String(25)), # new with uni+ Column("lastPlayDate", String(25)), - Column("lastTrialPlayDate", String(25)), # new with uni+ + Column("lastTrialPlayDate", String(25)), # new with uni+ Column("lastPlayCredit", Integer), Column("lastPlayMode", Integer), Column("lastPlaceId", Integer), @@ -90,16 +94,20 @@ detail = Table( Column("playerOldRating", BigInteger), Column("playerNewRating", BigInteger), Column("dateTime", BigInteger), - Column("banState", Integer), # new with uni+ + Column("banState", Integer), # new with uni+ UniqueConstraint("user", "version", name="mai2_profile_detail_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) ghost = Table( "mai2_profile_ghost", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("version_int", Integer, nullable=False), Column("name", String(25)), Column("iconId", Integer), @@ -120,15 +128,21 @@ ghost = Table( Column("resultBitList", JSON), Column("resultNum", Integer), Column("achievement", Integer), - UniqueConstraint("user", "version", "musicId", "difficulty", name="mai2_profile_ghost_uk"), - mysql_charset='utf8mb4' + UniqueConstraint( + "user", "version", "musicId", "difficulty", name="mai2_profile_ghost_uk" + ), + mysql_charset="utf8mb4", ) extend = Table( "mai2_profile_extend", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("version", Integer, nullable=False), Column("selectMusicId", Integer), Column("selectDifficultyId", Integer), @@ -145,14 +159,18 @@ extend = Table( Column("selectedCardList", JSON), Column("encountMapNpcList", JSON), UniqueConstraint("user", "version", name="mai2_profile_extend_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) option = Table( "mai2_profile_option", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("version", Integer, nullable=False), Column("selectMusicId", Integer), Column("optionKind", Integer), @@ -200,14 +218,18 @@ option = Table( Column("sortTab", Integer), Column("sortMusic", Integer), UniqueConstraint("user", "version", name="mai2_profile_option_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) rating = Table( "mai2_profile_rating", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("version", Integer, nullable=False), Column("rating", Integer), Column("ratingList", JSON), @@ -216,26 +238,34 @@ rating = Table( Column("nextNewRatingList", JSON), Column("udemae", JSON), UniqueConstraint("user", "version", name="mai2_profile_rating_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) region = Table( "mai2_profile_region", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("regionId", Integer), Column("playCount", Integer, server_default="1"), Column("created", String(25)), UniqueConstraint("user", "regionId", name="mai2_profile_region_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) activity = Table( "mai2_profile_activity", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("kind", Integer, nullable=False), Column("activityId", Integer, nullable=False), Column("param1", Integer, nullable=False), @@ -244,11 +274,14 @@ activity = Table( Column("param4", Integer, nullable=False), Column("sortNumber", Integer, nullable=False), UniqueConstraint("user", "kind", "activityId", name="mai2_profile_activity_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) + class Mai2ProfileData(BaseData): - def put_profile_detail(self, user_id: int, version: int, detail_data: Dict) -> Optional[Row]: + def put_profile_detail( + self, user_id: int, version: int, detail_data: Dict + ) -> Optional[Row]: detail_data["user"] = user_id detail_data["version"] = version sql = insert(detail).values(**detail_data) @@ -257,18 +290,25 @@ class Mai2ProfileData(BaseData): result = self.execute(conflict) if result is None: - self.logger.warn(f"put_profile: Failed to create profile! user_id {user_id}") + self.logger.warn( + f"put_profile: Failed to create profile! user_id {user_id}" + ) return None return result.lastrowid def get_profile_detail(self, user_id: int, version: int) -> Optional[Row]: - sql = select(detail).where(and_(detail.c.user == user_id, detail.c.version == version)) + sql = select(detail).where( + and_(detail.c.user == user_id, detail.c.version == version) + ) result = self.execute(sql) - if result is None:return None + if result is None: + return None return result.fetchone() - def put_profile_ghost(self, user_id: int, version: int, ghost_data: Dict) -> Optional[int]: + def put_profile_ghost( + self, user_id: int, version: int, ghost_data: Dict + ) -> Optional[int]: ghost_data["user"] = user_id ghost_data["version_int"] = version @@ -282,13 +322,18 @@ class Mai2ProfileData(BaseData): return result.lastrowid def get_profile_ghost(self, user_id: int, version: int) -> Optional[Row]: - sql = select(ghost).where(and_(ghost.c.user == user_id, ghost.c.version_int == version)) + sql = select(ghost).where( + and_(ghost.c.user == user_id, ghost.c.version_int == version) + ) result = self.execute(sql) - if result is None:return None + if result is None: + return None return result.fetchone() - def put_profile_extend(self, user_id: int, version: int, extend_data: Dict) -> Optional[int]: + def put_profile_extend( + self, user_id: int, version: int, extend_data: Dict + ) -> Optional[int]: extend_data["user"] = user_id extend_data["version"] = version @@ -302,13 +347,18 @@ class Mai2ProfileData(BaseData): return result.lastrowid def get_profile_extend(self, user_id: int, version: int) -> Optional[Row]: - sql = select(extend).where(and_(extend.c.user == user_id, extend.c.version == version)) + sql = select(extend).where( + and_(extend.c.user == user_id, extend.c.version == version) + ) result = self.execute(sql) - if result is None:return None + if result is None: + return None return result.fetchone() - def put_profile_option(self, user_id: int, version: int, option_data: Dict) -> Optional[int]: + def put_profile_option( + self, user_id: int, version: int, option_data: Dict + ) -> Optional[int]: option_data["user"] = user_id option_data["version"] = version @@ -322,13 +372,18 @@ class Mai2ProfileData(BaseData): return result.lastrowid def get_profile_option(self, user_id: int, version: int) -> Optional[Row]: - sql = select(option).where(and_(option.c.user == user_id, option.c.version == version)) + sql = select(option).where( + and_(option.c.user == user_id, option.c.version == version) + ) result = self.execute(sql) - if result is None:return None + if result is None: + return None return result.fetchone() - - def put_profile_rating(self, user_id: int, version: int, rating_data: Dict) -> Optional[int]: + + def put_profile_rating( + self, user_id: int, version: int, rating_data: Dict + ) -> Optional[int]: rating_data["user"] = user_id rating_data["version"] = version @@ -342,23 +397,24 @@ class Mai2ProfileData(BaseData): return result.lastrowid def get_profile_rating(self, user_id: int, version: int) -> Optional[Row]: - sql = select(rating).where(and_(rating.c.user == user_id, rating.c.version == version)) + sql = select(rating).where( + and_(rating.c.user == user_id, rating.c.version == version) + ) result = self.execute(sql) - if result is None:return None + if result is None: + return None return result.fetchone() def put_profile_region(self, user_id: int, region_id: int) -> Optional[int]: sql = insert(region).values( - user = user_id, - regionId = region_id, - created = datetime.strftime(datetime.now(), Mai2Constants.DATE_TIME_FORMAT) - ) - - conflict = sql.on_duplicate_key_update( - playCount = region.c.playCount + 1 + user=user_id, + regionId=region_id, + created=datetime.strftime(datetime.now(), Mai2Constants.DATE_TIME_FORMAT), ) + conflict = sql.on_duplicate_key_update(playCount=region.c.playCount + 1) + result = self.execute(conflict) if result is None: self.logger.warn(f"put_region: failed to update! {user_id}") @@ -369,34 +425,38 @@ class Mai2ProfileData(BaseData): sql = select(region).where(region.c.user == user_id) result = self.execute(sql) - if result is None:return None + if result is None: + return None return result.fetchall() - + def put_profile_activity(self, user_id: int, activity_data: Dict) -> Optional[int]: if "id" in activity_data: activity_data["activityId"] = activity_data["id"] activity_data.pop("id") - + activity_data["user"] = user_id - + sql = insert(activity).values(**activity_data) conflict = sql.on_duplicate_key_update(**activity_data) result = self.execute(conflict) if result is None: - self.logger.warn(f"put_profile_activity: failed to update! user_id: {user_id}") + self.logger.warn( + f"put_profile_activity: failed to update! user_id: {user_id}" + ) return None return result.lastrowid def get_profile_activity(self, user_id: int, kind: int = None) -> Optional[Row]: sql = activity.select( and_( - activity.c.user == user_id, + activity.c.user == user_id, (activity.c.kind == kind) if kind is not None else True, ) ) result = self.execute(sql) - if result is None:return None + if result is None: + return None return result.fetchone() diff --git a/titles/mai2/schema/score.py b/titles/mai2/schema/score.py index 59a600c..15bf519 100644 --- a/titles/mai2/schema/score.py +++ b/titles/mai2/schema/score.py @@ -12,7 +12,11 @@ best_score = Table( "mai2_score_best", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("musicId", Integer), Column("level", Integer), Column("playCount", Integer), @@ -22,14 +26,18 @@ best_score = Table( Column("deluxscoreMax", Integer), Column("scoreRank", Integer), UniqueConstraint("user", "musicId", "level", name="mai2_score_best_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) playlog = Table( "mai2_playlog", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("userId", BigInteger), Column("orderId", Integer), Column("playlogId", BigInteger), @@ -136,14 +144,18 @@ playlog = Table( Column("extNum1", Integer), Column("extNum2", Integer), Column("trialPlayAchievement", Integer), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) course = Table( "mai2_score_course", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("courseId", Integer), Column("isLastClear", Boolean), Column("totalRestlife", Integer), @@ -157,9 +169,10 @@ course = Table( Column("bestDeluxscore", Integer), Column("bestDeluxscoreDate", String(25)), UniqueConstraint("user", "courseId", name="mai2_score_best_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) + class Mai2ScoreData(BaseData): def put_best_score(self, user_id: int, score_data: Dict) -> Optional[int]: score_data["user"] = user_id @@ -169,33 +182,39 @@ class Mai2ScoreData(BaseData): result = self.execute(conflict) if result is None: - self.logger.error(f"put_best_score: Failed to insert best score! user_id {user_id}") + self.logger.error( + f"put_best_score: Failed to insert best score! user_id {user_id}" + ) return None return result.lastrowid def get_best_scores(self, user_id: int, song_id: int = None) -> Optional[List[Row]]: sql = best_score.select( and_( - best_score.c.user == user_id, - (best_score.c.song_id == song_id) if song_id is not None else True - ) + best_score.c.user == user_id, + (best_score.c.song_id == song_id) if song_id is not None else True, ) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - - def get_best_score(self, user_id: int, song_id: int, chart_id: int) -> Optional[Row]: + + def get_best_score( + self, user_id: int, song_id: int, chart_id: int + ) -> Optional[Row]: sql = best_score.select( and_( - best_score.c.user == user_id, - best_score.c.song_id == song_id, - best_score.c.chart_id == chart_id - ) + best_score.c.user == user_id, + best_score.c.song_id == song_id, + best_score.c.chart_id == chart_id, ) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() def put_playlog(self, user_id: int, playlog_data: Dict) -> Optional[int]: @@ -209,7 +228,7 @@ class Mai2ScoreData(BaseData): self.logger.error(f"put_playlog: Failed to insert! user_id {user_id}") return None return result.lastrowid - + def put_course(self, user_id: int, course_data: Dict) -> Optional[int]: course_data["user"] = user_id sql = insert(course).values(**course_data) @@ -221,10 +240,11 @@ class Mai2ScoreData(BaseData): self.logger.error(f"put_course: Failed to insert! user_id {user_id}") return None return result.lastrowid - + def get_courses(self, user_id: int) -> Optional[List[Row]]: sql = course.select(best_score.c.user == user_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() diff --git a/titles/mai2/schema/static.py b/titles/mai2/schema/static.py index 733e2ef..2908a47 100644 --- a/titles/mai2/schema/static.py +++ b/titles/mai2/schema/static.py @@ -12,20 +12,20 @@ event = Table( "mai2_static_event", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("version", Integer,nullable=False), + Column("version", Integer, nullable=False), Column("eventId", Integer), Column("type", Integer), Column("name", String(255)), Column("enabled", Boolean, server_default="1"), UniqueConstraint("version", "eventId", "type", name="mai2_static_event_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) music = Table( "mai2_static_music", metadata, - Column("id", Integer, primary_key=True, nullable=False), - Column("version", Integer,nullable=False), + Column("id", Integer, primary_key=True, nullable=False), + Column("version", Integer, nullable=False), Column("songId", Integer), Column("chartId", Integer), Column("title", String(255)), @@ -36,39 +36,42 @@ music = Table( Column("difficulty", Float), Column("noteDesigner", String(255)), UniqueConstraint("songId", "chartId", "version", name="mai2_static_music_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) ticket = Table( "mai2_static_ticket", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("version", Integer,nullable=False), + Column("version", Integer, nullable=False), Column("ticketId", Integer), Column("kind", Integer), Column("name", String(255)), Column("price", Integer, server_default="1"), Column("enabled", Boolean, server_default="1"), - UniqueConstraint("version","ticketId", name="mai2_static_ticket_uk"), - mysql_charset='utf8mb4' + UniqueConstraint("version", "ticketId", name="mai2_static_ticket_uk"), + mysql_charset="utf8mb4", ) + class Mai2StaticData(BaseData): - def put_game_event(self, version: int, type: int, event_id: int, name: str) -> Optional[int]: + def put_game_event( + self, version: int, type: int, event_id: int, name: str + ) -> Optional[int]: sql = insert(event).values( - version = version, - type = type, - eventId = event_id, - name = name, + version=version, + type=type, + eventId=event_id, + name=name, ) - conflict = sql.on_duplicate_key_update( - eventId = event_id - ) + conflict = sql.on_duplicate_key_update(eventId=event_id) result = self.execute(conflict) if result is None: - self.logger.warning(f"put_game_event: Failed to insert event! event_id {event_id} type {type} name {name}") + self.logger.warning( + f"put_game_event: Failed to insert event! event_id {event_id} type {type} name {name}" + ) return result.lastrowid def get_game_events(self, version: int) -> Optional[List[Row]]: @@ -78,50 +81,65 @@ class Mai2StaticData(BaseData): if result is None: return None return result.fetchall() - + def get_enabled_events(self, version: int) -> Optional[List[Row]]: - sql = select(event).where(and_( - event.c.version == version, - event.c.enabled == True - )) - - result = self.execute(sql) - if result is None: return None - return result.fetchall() - - def toggle_game_events(self, version: int, event_id: int, toggle: bool) -> Optional[List]: - sql = event.update(and_(event.c.version == version, event.c.event_id == event_id)).values( - enabled = int(toggle) + sql = select(event).where( + and_(event.c.version == version, event.c.enabled == True) ) result = self.execute(sql) if result is None: - self.logger.warning(f"toggle_game_events: Failed to update event! event_id {event_id} toggle {toggle}") + return None + return result.fetchall() + + def toggle_game_events( + self, version: int, event_id: int, toggle: bool + ) -> Optional[List]: + sql = event.update( + and_(event.c.version == version, event.c.event_id == event_id) + ).values(enabled=int(toggle)) + + result = self.execute(sql) + if result is None: + self.logger.warning( + f"toggle_game_events: Failed to update event! event_id {event_id} toggle {toggle}" + ) return result.last_updated_params() - - def put_game_music(self, version: int, song_id: int, chart_id: int, title: str, artist: str, - genre: str, bpm: str, added_version: str, difficulty: float, note_designer: str) -> None: + + def put_game_music( + self, + version: int, + song_id: int, + chart_id: int, + title: str, + artist: str, + genre: str, + bpm: str, + added_version: str, + difficulty: float, + note_designer: str, + ) -> None: sql = insert(music).values( - version = version, - songId = song_id, - chartId = chart_id, - title = title, - artist = artist, - genre = genre, - bpm = bpm, - addedVersion = added_version, - difficulty = difficulty, - noteDesigner = note_designer, + version=version, + songId=song_id, + chartId=chart_id, + title=title, + artist=artist, + genre=genre, + bpm=bpm, + addedVersion=added_version, + difficulty=difficulty, + noteDesigner=note_designer, ) conflict = sql.on_duplicate_key_update( - title = title, - artist = artist, - genre = genre, - bpm = bpm, - addedVersion = added_version, - difficulty = difficulty, - noteDesigner = note_designer, + title=title, + artist=artist, + genre=genre, + bpm=bpm, + addedVersion=added_version, + difficulty=difficulty, + noteDesigner=note_designer, ) result = self.execute(conflict) @@ -129,50 +147,64 @@ class Mai2StaticData(BaseData): self.logger.warn(f"Failed to insert song {song_id} chart {chart_id}") return None return result.lastrowid - - def put_game_ticket(self, version: int, ticket_id: int, ticket_type: int, ticket_price: int, name: str) -> Optional[int]: + + def put_game_ticket( + self, + version: int, + ticket_id: int, + ticket_type: int, + ticket_price: int, + name: str, + ) -> Optional[int]: sql = insert(ticket).values( - version = version, - ticketId = ticket_id, - kind = ticket_type, - price = ticket_price, - name = name + version=version, + ticketId=ticket_id, + kind=ticket_type, + price=ticket_price, + name=name, ) - - conflict = sql.on_duplicate_key_update( - price = ticket_price - ) + + conflict = sql.on_duplicate_key_update(price=ticket_price) result = self.execute(conflict) if result is None: self.logger.warn(f"Failed to insert charge {ticket_id} type {ticket_type}") return None return result.lastrowid - - def get_enabled_tickets(self, version: int, kind: int = None) -> Optional[List[Row]]: + + def get_enabled_tickets( + self, version: int, kind: int = None + ) -> Optional[List[Row]]: if kind is not None: - sql = select(ticket).where(and_( - ticket.c.version == version, - ticket.c.enabled == True, - ticket.c.kind == kind - )) + sql = select(ticket).where( + and_( + ticket.c.version == version, + ticket.c.enabled == True, + ticket.c.kind == kind, + ) + ) else: - sql = select(ticket).where(and_( - ticket.c.version == version, - ticket.c.enabled == True - )) + sql = select(ticket).where( + and_(ticket.c.version == version, ticket.c.enabled == True) + ) result = self.execute(sql) - if result is None:return None + if result is None: + return None return result.fetchall() - def get_music_chart(self, version: int, song_id: int, chart_id: int) -> Optional[List[Row]]: - sql = select(music).where(and_( - music.c.version == version, - music.c.songId == song_id, - music.c.chartId == chart_id - )) + def get_music_chart( + self, version: int, song_id: int, chart_id: int + ) -> Optional[List[Row]]: + sql = select(music).where( + and_( + music.c.version == version, + music.c.songId == song_id, + music.c.chartId == chart_id, + ) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() diff --git a/titles/mai2/splash.py b/titles/mai2/splash.py index 690645b..ad31695 100644 --- a/titles/mai2/splash.py +++ b/titles/mai2/splash.py @@ -8,7 +8,8 @@ from titles.mai2.base import Mai2Base from titles.mai2.config import Mai2Config from titles.mai2.const import Mai2Constants + class Mai2Splash(Mai2Base): def __init__(self, cfg: CoreConfig, game_cfg: Mai2Config) -> None: super().__init__(cfg, game_cfg) - self.version = Mai2Constants.VER_MAIMAI_DX_SPLASH \ No newline at end of file + self.version = Mai2Constants.VER_MAIMAI_DX_SPLASH diff --git a/titles/mai2/splashplus.py b/titles/mai2/splashplus.py index eb6f940..54431c9 100644 --- a/titles/mai2/splashplus.py +++ b/titles/mai2/splashplus.py @@ -8,7 +8,8 @@ from titles.mai2.base import Mai2Base from titles.mai2.config import Mai2Config from titles.mai2.const import Mai2Constants + class Mai2SplashPlus(Mai2Base): def __init__(self, cfg: CoreConfig, game_cfg: Mai2Config) -> None: super().__init__(cfg, game_cfg) - self.version = Mai2Constants.VER_MAIMAI_DX_SPLASH_PLUS \ No newline at end of file + self.version = Mai2Constants.VER_MAIMAI_DX_SPLASH_PLUS diff --git a/titles/mai2/universe.py b/titles/mai2/universe.py index be6472c..56c2d3f 100644 --- a/titles/mai2/universe.py +++ b/titles/mai2/universe.py @@ -8,7 +8,8 @@ from titles.mai2.base import Mai2Base from titles.mai2.const import Mai2Constants from titles.mai2.config import Mai2Config + class Mai2Universe(Mai2Base): def __init__(self, cfg: CoreConfig, game_cfg: Mai2Config) -> None: super().__init__(cfg, game_cfg) - self.version = Mai2Constants.VER_MAIMAI_DX_UNIVERSE \ No newline at end of file + self.version = Mai2Constants.VER_MAIMAI_DX_UNIVERSE diff --git a/titles/mai2/universeplus.py b/titles/mai2/universeplus.py index 795206e..977fce9 100644 --- a/titles/mai2/universeplus.py +++ b/titles/mai2/universeplus.py @@ -8,7 +8,8 @@ from titles.mai2.base import Mai2Base from titles.mai2.const import Mai2Constants from titles.mai2.config import Mai2Config + class Mai2UniversePlus(Mai2Base): def __init__(self, cfg: CoreConfig, game_cfg: Mai2Config) -> None: super().__init__(cfg, game_cfg) - self.version = Mai2Constants.VER_MAIMAI_DX_UNIVERSE_PLUS \ No newline at end of file + self.version = Mai2Constants.VER_MAIMAI_DX_UNIVERSE_PLUS diff --git a/titles/ongeki/__init__.py b/titles/ongeki/__init__.py index 7f03a8f..ddde049 100644 --- a/titles/ongeki/__init__.py +++ b/titles/ongeki/__init__.py @@ -7,4 +7,4 @@ index = OngekiServlet database = OngekiData reader = OngekiReader game_codes = [OngekiConstants.GAME_CODE] -current_schema_version = 2 \ No newline at end of file +current_schema_version = 2 diff --git a/titles/ongeki/base.py b/titles/ongeki/base.py index 3f6dc7a..4f7619c 100644 --- a/titles/ongeki/base.py +++ b/titles/ongeki/base.py @@ -11,6 +11,7 @@ from titles.ongeki.config import OngekiConfig from titles.ongeki.database import OngekiData from titles.ongeki.config import OngekiConfig + class OngekiBattleGrade(Enum): FAILED = 0 DRAW = 1 @@ -21,6 +22,7 @@ class OngekiBattleGrade(Enum): UNBELIEVABLE_GOLD = 6 UNBELIEVABLE_RAINBOW = 7 + class OngekiBattlePointGrade(Enum): FRESHMAN = 0 KYU10 = 1 @@ -45,20 +47,22 @@ class OngekiBattlePointGrade(Enum): DAN10 = 20 SODEN = 21 + class OngekiTechnicalGrade(Enum): - D = 0 - C = 1 - B = 2 - BB = 3 - BBB = 4 - A = 5 - AA = 6 - AAA = 7 - S = 8 - SS = 9 - SSS = 10 + D = 0 + C = 1 + B = 2 + BB = 3 + BBB = 4 + A = 5 + AA = 6 + AAA = 7 + S = 8 + SS = 9 + SSS = 10 SSSp = 11 + class OngekiDifficulty(Enum): BASIC = 0 ADVANCED = 1 @@ -66,6 +70,7 @@ class OngekiDifficulty(Enum): MASTER = 3 LUNATIC = 10 + class OngekiGPLogKind(Enum): NONE = 0 BUY1_START = 1 @@ -82,22 +87,28 @@ class OngekiGPLogKind(Enum): PAY_MAS_UNLOCK = 13 PAY_MONEY = 14 -class OngekiBase(): +class OngekiBase: def __init__(self, core_cfg: CoreConfig, game_cfg: OngekiConfig) -> None: self.core_cfg = core_cfg self.game_cfg = game_cfg self.data = OngekiData(core_cfg) self.date_time_format = "%Y-%m-%d %H:%M:%S" - self.date_time_format_ext = "%Y-%m-%d %H:%M:%S.%f" # needs to be lopped off at [:-5] + self.date_time_format_ext = ( + "%Y-%m-%d %H:%M:%S.%f" # needs to be lopped off at [:-5] + ) self.date_time_format_short = "%Y-%m-%d" self.logger = logging.getLogger("ongeki") self.game = OngekiConstants.GAME_CODE self.version = OngekiConstants.VER_ONGEKI def handle_get_game_setting_api_request(self, data: Dict) -> Dict: - reboot_start = date.strftime(datetime.now() + timedelta(hours=3), self.date_time_format) - reboot_end = date.strftime(datetime.now() + timedelta(hours=4), self.date_time_format) + reboot_start = date.strftime( + datetime.now() + timedelta(hours=3), self.date_time_format + ) + reboot_end = date.strftime( + datetime.now() + timedelta(hours=4), self.date_time_format + ) return { "gameSetting": { "dataVersion": "1.00.00", @@ -128,20 +139,53 @@ class OngekiBase(): def handle_get_game_ranking_api_request(self, data: Dict) -> Dict: return {"length": 0, "gameRankingList": []} - + def handle_get_game_point_api_request(self, data: Dict) -> Dict: """ Sets the GP ammount for A and B sets for 1 - 3 crdits """ - return {"length":6,"gamePointList":[ - {"type":0,"cost":100,"startDate":"2000-01-01 05:00:00.0","endDate":"2099-01-01 05:00:00.0"}, - {"type":1,"cost":200,"startDate":"2000-01-01 05:00:00.0","endDate":"2099-01-01 05:00:00.0"}, - {"type":2,"cost":300,"startDate":"2000-01-01 05:00:00.0","endDate":"2099-01-01 05:00:00.0"}, - {"type":3,"cost":120,"startDate":"2000-01-01 05:00:00.0","endDate":"2099-01-01 05:00:00.0"}, - {"type":4,"cost":240,"startDate":"2000-01-01 05:00:00.0","endDate":"2099-01-01 05:00:00.0"}, - {"type":5,"cost":360,"startDate":"2000-01-01 05:00:00.0","endDate":"2099-01-01 05:00:00.0"} - ]} - + return { + "length": 6, + "gamePointList": [ + { + "type": 0, + "cost": 100, + "startDate": "2000-01-01 05:00:00.0", + "endDate": "2099-01-01 05:00:00.0", + }, + { + "type": 1, + "cost": 200, + "startDate": "2000-01-01 05:00:00.0", + "endDate": "2099-01-01 05:00:00.0", + }, + { + "type": 2, + "cost": 300, + "startDate": "2000-01-01 05:00:00.0", + "endDate": "2099-01-01 05:00:00.0", + }, + { + "type": 3, + "cost": 120, + "startDate": "2000-01-01 05:00:00.0", + "endDate": "2099-01-01 05:00:00.0", + }, + { + "type": 4, + "cost": 240, + "startDate": "2000-01-01 05:00:00.0", + "endDate": "2099-01-01 05:00:00.0", + }, + { + "type": 5, + "cost": 360, + "startDate": "2000-01-01 05:00:00.0", + "endDate": "2099-01-01 05:00:00.0", + }, + ], + } + def handle_game_login_api_request(self, data: Dict) -> Dict: return {"returnCode": 1, "apiName": "gameLogin"} @@ -184,11 +228,19 @@ class OngekiBase(): def handle_upsert_user_gplog_api_request(self, data: Dict) -> Dict: user = data["userId"] - if user >= 200000000000000: # Account for guest play + if user >= 200000000000000: # Account for guest play user = None - self.data.log.put_gp_log(user, data["usedCredit"], data["placeName"], data["userGplog"]["trxnDate"], - data["userGplog"]["placeId"], data["userGplog"]["kind"], data["userGplog"]["pattern"], data["userGplog"]["currentGP"]) + self.data.log.put_gp_log( + user, + data["usedCredit"], + data["placeName"], + data["userGplog"]["trxnDate"], + data["userGplog"]["placeId"], + data["userGplog"]["kind"], + data["userGplog"]["pattern"], + data["userGplog"]["currentGP"], + ) return {"returnCode": 1, "apiName": "UpsertUserGplogApi"} @@ -197,39 +249,53 @@ class OngekiBase(): def handle_get_game_event_api_request(self, data: Dict) -> Dict: evts = self.data.static.get_enabled_events(self.version) - + evt_list = [] for event in evts: - evt_list.append({ - "type": event["type"], - "id": event["eventId"], - "startDate": "2017-12-05 07:00:00.0", - "endDate": "2099-12-31 00:00:00.0" - }) - - return {"type": data["type"], "length": len(evt_list), "gameEventList": evt_list} + evt_list.append( + { + "type": event["type"], + "id": event["eventId"], + "startDate": "2017-12-05 07:00:00.0", + "endDate": "2099-12-31 00:00:00.0", + } + ) + + return { + "type": data["type"], + "length": len(evt_list), + "gameEventList": evt_list, + } def handle_get_game_id_list_api_request(self, data: Dict) -> Dict: - game_idlist: list[str, Any] = [] #1 to 230 & 8000 to 8050 - + game_idlist: list[str, Any] = [] # 1 to 230 & 8000 to 8050 + if data["type"] == 1: - for i in range(1,231): + for i in range(1, 231): game_idlist.append({"type": 1, "id": i}) - return {"type": data["type"], "length": len(game_idlist), "gameIdlistList": game_idlist} + return { + "type": data["type"], + "length": len(game_idlist), + "gameIdlistList": game_idlist, + } elif data["type"] == 2: - for i in range(8000,8051): + for i in range(8000, 8051): game_idlist.append({"type": 2, "id": i}) - return {"type": data["type"], "length": len(game_idlist), "gameIdlistList": game_idlist} + return { + "type": data["type"], + "length": len(game_idlist), + "gameIdlistList": game_idlist, + } def handle_get_user_region_api_request(self, data: Dict) -> Dict: return {"userId": data["userId"], "length": 0, "userRegionList": []} def handle_get_user_preview_api_request(self, data: Dict) -> Dict: profile = self.data.profile.get_profile_preview(data["userId"], self.version) - - if profile is None: + + if profile is None: return { - "userId": data["userId"], + "userId": data["userId"], "isLogin": False, "lastLoginDate": "0000-00-00 00:00:00", "userName": "", @@ -240,12 +306,12 @@ class OngekiBase(): "lastGameId": "", "lastRomVersion": "", "lastDataVersion": "", - "lastPlayDate": "", + "lastPlayDate": "", "nameplateId": 0, - "trophyId": 0, - "cardId": 0, - "dispPlayerLv": 0, - "dispRating": 0, + "trophyId": 0, + "cardId": 0, + "dispPlayerLv": 0, + "dispRating": 0, "dispBP": 0, "headphone": 0, "banStatus": 0, @@ -253,7 +319,7 @@ class OngekiBase(): } return { - "userId": data["userId"], + "userId": data["userId"], "isLogin": False, "lastLoginDate": profile["lastPlayDate"], "userName": profile["userName"], @@ -264,12 +330,12 @@ class OngekiBase(): "lastGameId": profile["lastGameId"], "lastRomVersion": profile["lastRomVersion"], "lastDataVersion": profile["lastDataVersion"], - "lastPlayDate": profile["lastPlayDate"], + "lastPlayDate": profile["lastPlayDate"], "nameplateId": profile["nameplateId"], - "trophyId": profile["trophyId"], - "cardId": profile["cardId"], - "dispPlayerLv": profile["dispPlayerLv"], - "dispRating": profile["dispRating"], + "trophyId": profile["trophyId"], + "cardId": profile["cardId"], + "dispPlayerLv": profile["dispPlayerLv"], + "dispRating": profile["dispRating"], "dispBP": profile["dispBP"], "headphone": profile["headphone"], "banStatus": profile["banStatus"], @@ -297,7 +363,8 @@ class OngekiBase(): def handle_get_user_tech_event_api_request(self, data: Dict) -> Dict: user_tech_event_list = self.data.item.get_tech_event(data["userId"]) - if user_tech_event_list is None: return {} + if user_tech_event_list is None: + return {} tech_evt = [] for evt in user_tech_event_list: @@ -313,11 +380,11 @@ class OngekiBase(): } def handle_get_user_tech_event_ranking_api_request(self, data: Dict) -> Dict: - #user_event_ranking_list = self.data.item.get_tech_event_ranking(data["userId"]) - #if user_event_ranking_list is None: return {} + # user_event_ranking_list = self.data.item.get_tech_event_ranking(data["userId"]) + # if user_event_ranking_list is None: return {} evt_ranking = [] - #for evt in user_event_ranking_list: + # for evt in user_event_ranking_list: # tmp = evt._asdict() # tmp.pop("id") # tmp.pop("user") @@ -331,7 +398,8 @@ class OngekiBase(): def handle_get_user_kop_api_request(self, data: Dict) -> Dict: kop_list = self.data.profile.get_kop(data["userId"]) - if kop_list is None: return {} + if kop_list is None: + return {} for kop in kop_list: kop.pop("user") @@ -349,10 +417,10 @@ class OngekiBase(): next_idx = data["nextIndex"] start_idx = next_idx end_idx = max_ct + start_idx - + if len(song_list[start_idx:]) > max_ct: next_idx += max_ct - + else: next_idx = -1 @@ -360,15 +428,20 @@ class OngekiBase(): "userId": data["userId"], "length": len(song_list[start_idx:end_idx]), "nextIndex": next_idx, - "userMusicList": song_list[start_idx:end_idx] + "userMusicList": song_list[start_idx:end_idx], } def handle_get_user_item_api_request(self, data: Dict) -> Dict: kind = data["nextIndex"] / 10000000000 p = self.data.item.get_items(data["userId"], kind) - if p is None: - return {"userId": data["userId"], "nextIndex": -1, "itemKind": kind, "userItemList": []} + if p is None: + return { + "userId": data["userId"], + "nextIndex": -1, + "itemKind": kind, + "userItemList": [], + } items: list[Dict[str, Any]] = [] for i in range(data["nextIndex"] % 10000000000, len(p)): @@ -381,14 +454,23 @@ class OngekiBase(): xout = kind * 10000000000 + (data["nextIndex"] % 10000000000) + len(items) - if len(items) < data["maxCount"] or data["maxCount"] == 0: nextIndex = 0 - else: nextIndex = xout + if len(items) < data["maxCount"] or data["maxCount"] == 0: + nextIndex = 0 + else: + nextIndex = xout - return {"userId": data["userId"], "nextIndex": int(nextIndex), "itemKind": int(kind), "length": len(items), "userItemList": items} + return { + "userId": data["userId"], + "nextIndex": int(nextIndex), + "itemKind": int(kind), + "length": len(items), + "userItemList": items, + } def handle_get_user_option_api_request(self, data: Dict) -> Dict: o = self.data.profile.get_profile_options(data["userId"]) - if o is None: return {} + if o is None: + return {} # get the dict representation of the row so we can modify values user_opts = o._asdict() @@ -401,14 +483,17 @@ class OngekiBase(): def handle_get_user_data_api_request(self, data: Dict) -> Dict: p = self.data.profile.get_profile_data(data["userId"], self.version) - if p is None: return {} + if p is None: + return {} cards = self.data.card.get_user_cards(data["userId"]) if cards is None or len(cards) == 0: # This should never happen - self.logger.error(f"handle_get_user_data_api_request: Internal error - No cards found for user id {data['userId']}") + self.logger.error( + f"handle_get_user_data_api_request: Internal error - No cards found for user id {data['userId']}" + ) return {} - + # get the dict representation of the row so we can modify values user_data = p._asdict() @@ -422,14 +507,14 @@ class OngekiBase(): # add access code that we don't store user_data["accessCode"] = cards[0]["access_code"] - return {"userId": data["userId"], "userData":user_data} + return {"userId": data["userId"], "userData": user_data} def handle_get_user_event_ranking_api_request(self, data: Dict) -> Dict: - #user_event_ranking_list = self.data.item.get_event_ranking(data["userId"]) - #if user_event_ranking_list is None: return {} + # user_event_ranking_list = self.data.item.get_event_ranking(data["userId"]) + # if user_event_ranking_list is None: return {} evt_ranking = [] - #for evt in user_event_ranking_list: + # for evt in user_event_ranking_list: # tmp = evt._asdict() # tmp.pop("id") # tmp.pop("user") @@ -443,7 +528,8 @@ class OngekiBase(): def handle_get_user_login_bonus_api_request(self, data: Dict) -> Dict: user_login_bonus_list = self.data.item.get_login_bonuses(data["userId"]) - if user_login_bonus_list is None: return {} + if user_login_bonus_list is None: + return {} login_bonuses = [] for scenerio in user_login_bonus_list: @@ -451,16 +537,19 @@ class OngekiBase(): tmp.pop("id") tmp.pop("user") login_bonuses.append(tmp) - + return { - "userId": data["userId"], - "length": len(login_bonuses), - "userLoginBonusList": login_bonuses + "userId": data["userId"], + "length": len(login_bonuses), + "userLoginBonusList": login_bonuses, } def handle_get_user_bp_base_request(self, data: Dict) -> Dict: - p = self.data.profile.get_profile(self.game, self.version, user_id = data["userId"]) - if p is None: return {} + p = self.data.profile.get_profile( + self.game, self.version, user_id=data["userId"] + ) + if p is None: + return {} profile = json.loads(p["data"]) return { "userId": data["userId"], @@ -470,7 +559,8 @@ class OngekiBase(): def handle_get_user_recent_rating_api_request(self, data: Dict) -> Dict: recent_rating = self.data.profile.get_profile_recent_rating(data["userId"]) - if recent_rating is None: return {} + if recent_rating is None: + return {} userRecentRatingList = recent_rating["recentRating"] @@ -482,31 +572,35 @@ class OngekiBase(): def handle_get_user_activity_api_request(self, data: Dict) -> Dict: activity = self.data.profile.get_profile_activity(data["userId"], data["kind"]) - if activity is None: return {} - + if activity is None: + return {} + user_activity = [] - + for act in activity: - user_activity.append({ - "kind": act["kind"], - "id": act["activityId"], - "sortNumber": act["sortNumber"], - "param1": act["param1"], - "param2": act["param2"], - "param3": act["param3"], - "param4": act["param4"], - }) + user_activity.append( + { + "kind": act["kind"], + "id": act["activityId"], + "sortNumber": act["sortNumber"], + "param1": act["param1"], + "param2": act["param2"], + "param3": act["param3"], + "param4": act["param4"], + } + ) return { - "userId": data["userId"], + "userId": data["userId"], "length": len(user_activity), "kind": data["kind"], - "userActivityList": user_activity + "userActivityList": user_activity, } def handle_get_user_story_api_request(self, data: Dict) -> Dict: user_stories = self.data.item.get_stories(data["userId"]) - if user_stories is None: return {} + if user_stories is None: + return {} story_list = [] for story in user_stories: @@ -516,14 +610,15 @@ class OngekiBase(): story_list.append(tmp) return { - "userId": data["userId"], - "length": len(story_list), - "userStoryList": story_list + "userId": data["userId"], + "length": len(story_list), + "userStoryList": story_list, } def handle_get_user_chapter_api_request(self, data: Dict) -> Dict: user_chapters = self.data.item.get_chapters(data["userId"]) - if user_chapters is None: return {} + if user_chapters is None: + return {} chapter_list = [] for chapter in user_chapters: @@ -531,11 +626,11 @@ class OngekiBase(): tmp.pop("id") tmp.pop("user") chapter_list.append(tmp) - + return { - "userId": data["userId"], - "length": len(chapter_list), - "userChapterList": chapter_list + "userId": data["userId"], + "length": len(chapter_list), + "userChapterList": chapter_list, } def handle_get_user_training_room_by_key_api_request(self, data: Dict) -> Dict: @@ -547,7 +642,8 @@ class OngekiBase(): def handle_get_user_character_api_request(self, data: Dict) -> Dict: user_characters = self.data.item.get_characters(data["userId"]) - if user_characters is None: return {} + if user_characters is None: + return {} character_list = [] for character in user_characters: @@ -555,16 +651,17 @@ class OngekiBase(): tmp.pop("id") tmp.pop("user") character_list.append(tmp) - + return { - "userId": data["userId"], - "length": len(character_list), - "userCharacterList": character_list + "userId": data["userId"], + "length": len(character_list), + "userCharacterList": character_list, } def handle_get_user_card_api_request(self, data: Dict) -> Dict: user_cards = self.data.item.get_cards(data["userId"]) - if user_cards is None: return {} + if user_cards is None: + return {} card_list = [] for card in user_cards: @@ -572,17 +669,18 @@ class OngekiBase(): tmp.pop("id") tmp.pop("user") card_list.append(tmp) - + return { - "userId": data["userId"], - "length": len(card_list), - "userCardList": card_list + "userId": data["userId"], + "length": len(card_list), + "userCardList": card_list, } def handle_get_user_deck_by_key_api_request(self, data: Dict) -> Dict: # Auth key doesn't matter, it just wants all the decks decks = self.data.item.get_decks(data["userId"]) - if decks is None: return {} + if decks is None: + return {} deck_list = [] for deck in decks: @@ -599,7 +697,8 @@ class OngekiBase(): def handle_get_user_trade_item_api_request(self, data: Dict) -> Dict: user_trade_items = self.data.item.get_trade_items(data["userId"]) - if user_trade_items is None: return {} + if user_trade_items is None: + return {} trade_item_list = [] for trade_item in user_trade_items: @@ -616,7 +715,8 @@ class OngekiBase(): def handle_get_user_scenario_api_request(self, data: Dict) -> Dict: user_scenerio = self.data.item.get_scenerios(data["userId"]) - if user_scenerio is None: return {} + if user_scenerio is None: + return {} scenerio_list = [] for scenerio in user_scenerio: @@ -624,7 +724,7 @@ class OngekiBase(): tmp.pop("id") tmp.pop("user") scenerio_list.append(tmp) - + return { "userId": data["userId"], "length": len(scenerio_list), @@ -633,7 +733,8 @@ class OngekiBase(): def handle_get_user_ratinglog_api_request(self, data: Dict) -> Dict: rating_log = self.data.profile.get_profile_rating_log(data["userId"]) - if rating_log is None: return {} + if rating_log is None: + return {} userRatinglogList = [] for rating in rating_log: @@ -650,7 +751,8 @@ class OngekiBase(): def handle_get_user_mission_point_api_request(self, data: Dict) -> Dict: user_mission_point_list = self.data.item.get_mission_points(data["userId"]) - if user_mission_point_list is None: return {} + if user_mission_point_list is None: + return {} mission_point_list = [] for evt_music in user_mission_point_list: @@ -667,7 +769,8 @@ class OngekiBase(): def handle_get_user_event_point_api_request(self, data: Dict) -> Dict: user_event_point_list = self.data.item.get_event_points(data["userId"]) - if user_event_point_list is None: return {} + if user_event_point_list is None: + return {} event_point_list = [] for evt_music in user_event_point_list: @@ -684,7 +787,8 @@ class OngekiBase(): def handle_get_user_music_item_api_request(self, data: Dict) -> Dict: user_music_item_list = self.data.item.get_music_items(data["userId"]) - if user_music_item_list is None: return {} + if user_music_item_list is None: + return {} music_item_list = [] for evt_music in user_music_item_list: @@ -701,7 +805,8 @@ class OngekiBase(): def handle_get_user_event_music_api_request(self, data: Dict) -> Dict: user_evt_music_list = self.data.item.get_event_music(data["userId"]) - if user_evt_music_list is None: return {} + if user_evt_music_list is None: + return {} evt_music_list = [] for evt_music in user_evt_music_list: @@ -718,7 +823,8 @@ class OngekiBase(): def handle_get_user_boss_api_request(self, data: Dict) -> Dict: p = self.data.item.get_bosses(data["userId"]) - if p is None: return {} + if p is None: + return {} boss_list = [] for boss in p: @@ -740,7 +846,9 @@ class OngekiBase(): # The isNew fields are new as of Red and up. We just won't use them for now. if "userData" in upsert and len(upsert["userData"]) > 0: - self.data.profile.put_profile_data(user_id, self.version, upsert["userData"][0]) + self.data.profile.put_profile_data( + user_id, self.version, upsert["userData"][0] + ) if "userOption" in upsert and len(upsert["userOption"]) > 0: self.data.profile.put_profile_options(user_id, upsert["userOption"][0]) @@ -751,27 +859,37 @@ class OngekiBase(): if "userActivityList" in upsert: for act in upsert["userActivityList"]: - self.data.profile.put_profile_activity(user_id, act["kind"], act["id"], act["sortNumber"], act["param1"], - act["param2"], act["param3"], act["param4"]) - + self.data.profile.put_profile_activity( + user_id, + act["kind"], + act["id"], + act["sortNumber"], + act["param1"], + act["param2"], + act["param3"], + act["param4"], + ) + if "userRecentRatingList" in upsert: - self.data.profile.put_profile_recent_rating(user_id, upsert["userRecentRatingList"]) - + self.data.profile.put_profile_recent_rating( + user_id, upsert["userRecentRatingList"] + ) + if "userBpBaseList" in upsert: self.data.profile.put_profile_bp_list(user_id, upsert["userBpBaseList"]) - + if "userMusicDetailList" in upsert: for x in upsert["userMusicDetailList"]: self.data.score.put_best_score(user_id, x) - + if "userCharacterList" in upsert: for x in upsert["userCharacterList"]: self.data.item.put_character(user_id, x) - + if "userCardList" in upsert: for x in upsert["userCardList"]: self.data.item.put_card(user_id, x) - + if "userDeckList" in upsert: for x in upsert["userDeckList"]: self.data.item.put_deck(user_id, x) @@ -779,43 +897,45 @@ class OngekiBase(): if "userTrainingRoomList" in upsert: for x in upsert["userTrainingRoomList"]: self.data.profile.put_training_room(user_id, x) - + if "userStoryList" in upsert: for x in upsert["userStoryList"]: self.data.item.put_story(user_id, x) - + if "userChapterList" in upsert: for x in upsert["userChapterList"]: self.data.item.put_chapter(user_id, x) - + if "userMemoryChapterList" in upsert: for x in upsert["userMemoryChapterList"]: self.data.item.put_memorychapter(user_id, x) - + if "userItemList" in upsert: for x in upsert["userItemList"]: self.data.item.put_item(user_id, x) - + if "userMusicItemList" in upsert: for x in upsert["userMusicItemList"]: self.data.item.put_music_item(user_id, x) - + if "userLoginBonusList" in upsert: for x in upsert["userLoginBonusList"]: self.data.item.put_login_bonus(user_id, x) - + if "userEventPointList" in upsert: for x in upsert["userEventPointList"]: self.data.item.put_event_point(user_id, x) - + if "userMissionPointList" in upsert: for x in upsert["userMissionPointList"]: self.data.item.put_mission_point(user_id, x) - + if "userRatinglogList" in upsert: for x in upsert["userRatinglogList"]: - self.data.profile.put_profile_rating_log(user_id, x["dataVersion"], x["highestRating"]) - + self.data.profile.put_profile_rating_log( + user_id, x["dataVersion"], x["highestRating"] + ) + if "userBossList" in upsert: for x in upsert["userBossList"]: self.data.item.put_boss(user_id, x) @@ -844,7 +964,7 @@ class OngekiBase(): for x in upsert["userKopList"]: self.data.profile.put_kop(user_id, x) - return {'returnCode': 1, 'apiName': 'upsertUserAll'} + return {"returnCode": 1, "apiName": "upsertUserAll"} def handle_get_user_rival_api_request(self, data: Dict) -> Dict: """ @@ -857,29 +977,28 @@ class OngekiBase(): "length": 0, "userRivalList": [], } - + return { "userId": data["userId"], "length": len(rival_list), "userRivalList": rival_list._asdict(), } - def handle_get_user_rival_data_api_reqiest(self, data:Dict) -> Dict: + def handle_get_user_rival_data_api_reqiest(self, data: Dict) -> Dict: """ Added in Bright """ rivals = [] for rival in data["userRivalList"]: - name = self.data.profile.get_profile_name(rival["rivalUserId"], self.version) + name = self.data.profile.get_profile_name( + rival["rivalUserId"], self.version + ) if name is None: continue - rivals.append({ - "rivalUserId": rival["rival"], - "rivalUserName": name - }) - + rivals.append({"rivalUserId": rival["rival"], "rivalUserName": name}) + return { "userId": data["userId"], "length": len(rivals), @@ -893,11 +1012,9 @@ class OngekiBase(): rival_id = data["rivalUserId"] next_idx = data["nextIndex"] max_ct = data["maxCount"] - music = self.handle_get_user_music_api_request({ - "userId": rival_id, - "nextIndex": next_idx, - "maxCount": max_ct - }) + music = self.handle_get_user_music_api_request( + {"userId": rival_id, "nextIndex": next_idx, "maxCount": max_ct} + ) for song in music["userMusicList"]: song["userRivalMusicDetailList"] = song["userMusicDetailList"] @@ -921,18 +1038,15 @@ class OngekiBase(): tmp = md._asdict() tmp.pop("user") tmp.pop("id") - + for song in song_list: if song["userMusicDetailList"][0]["musicId"] == tmp["musicId"]: found = True song["userMusicDetailList"].append(tmp) song["length"] = len(song["userMusicDetailList"]) break - + if not found: - song_list.append({ - "length": 1, - "userMusicDetailList": [tmp] - }) - + song_list.append({"length": 1, "userMusicDetailList": [tmp]}) + return song_list diff --git a/titles/ongeki/bright.py b/titles/ongeki/bright.py index 8f66f93..4b2a06f 100644 --- a/titles/ongeki/bright.py +++ b/titles/ongeki/bright.py @@ -31,7 +31,8 @@ class OngekiBright(OngekiBase): if cards is None or len(cards) == 0: # This should never happen self.logger.error( - f"handle_get_user_data_api_request: Internal error - No cards found for user id {data['userId']}") + f"handle_get_user_data_api_request: Internal error - No cards found for user id {data['userId']}" + ) return {} # get the dict representation of the row so we can modify values @@ -86,7 +87,7 @@ class OngekiBright(OngekiBase): "userId": data["userId"], "length": len(card_list[start_idx:end_idx]), "nextIndex": next_idx, - "userCardList": card_list[start_idx:end_idx] + "userCardList": card_list[start_idx:end_idx], } def handle_cm_get_user_character_api_request(self, data: Dict) -> Dict: @@ -115,31 +116,26 @@ class OngekiBright(OngekiBase): "userId": data["userId"], "length": len(character_list[start_idx:end_idx]), "nextIndex": next_idx, - "userCharacterList": character_list[start_idx:end_idx] + "userCharacterList": character_list[start_idx:end_idx], } def handle_get_user_gacha_api_request(self, data: Dict) -> Dict: user_gachas = self.data.item.get_user_gachas(data["userId"]) if user_gachas is None: - return { - "userId": data["userId"], - "length": 0, - "userGachaList": [] - } + return {"userId": data["userId"], "length": 0, "userGachaList": []} user_gacha_list = [] for gacha in user_gachas: tmp = gacha._asdict() tmp.pop("id") tmp.pop("user") - tmp["dailyGachaDate"] = datetime.strftime( - tmp["dailyGachaDate"], "%Y-%m-%d") + tmp["dailyGachaDate"] = datetime.strftime(tmp["dailyGachaDate"], "%Y-%m-%d") user_gacha_list.append(tmp) return { "userId": data["userId"], "length": len(user_gacha_list), - "userGachaList": user_gacha_list + "userGachaList": user_gacha_list, } def handle_cm_get_user_item_api_request(self, data: Dict) -> Dict: @@ -147,21 +143,16 @@ class OngekiBright(OngekiBase): def handle_cm_get_user_gacha_supply_api_request(self, data: Dict) -> Dict: # not used for now? not sure what it even does - user_gacha_supplies = self.data.item.get_user_gacha_supplies( - data["userId"]) + user_gacha_supplies = self.data.item.get_user_gacha_supplies(data["userId"]) if user_gacha_supplies is None: - return { - "supplyId": 1, - "length": 0, - "supplyCardList": [] - } + return {"supplyId": 1, "length": 0, "supplyCardList": []} supply_list = [gacha["cardId"] for gacha in user_gacha_supplies] return { "supplyId": 1, "length": len(supply_list), - "supplyCardList": supply_list + "supplyCardList": supply_list, } def handle_get_game_gacha_api_request(self, data: Dict) -> Dict: @@ -182,29 +173,33 @@ class OngekiBright(OngekiBase): tmp = gacha._asdict() tmp.pop("id") tmp.pop("version") - tmp["startDate"] = datetime.strftime( - tmp["startDate"], "%Y-%m-%d %H:%M:%S") - tmp["endDate"] = datetime.strftime( - tmp["endDate"], "%Y-%m-%d %H:%M:%S") + tmp["startDate"] = datetime.strftime(tmp["startDate"], "%Y-%m-%d %H:%M:%S") + tmp["endDate"] = datetime.strftime(tmp["endDate"], "%Y-%m-%d %H:%M:%S") tmp["noticeStartDate"] = datetime.strftime( - tmp["noticeStartDate"], "%Y-%m-%d %H:%M:%S") + tmp["noticeStartDate"], "%Y-%m-%d %H:%M:%S" + ) tmp["noticeEndDate"] = datetime.strftime( - tmp["noticeEndDate"], "%Y-%m-%d %H:%M:%S") + tmp["noticeEndDate"], "%Y-%m-%d %H:%M:%S" + ) tmp["convertEndDate"] = datetime.strftime( - tmp["convertEndDate"], "%Y-%m-%d %H:%M:%S") + tmp["convertEndDate"], "%Y-%m-%d %H:%M:%S" + ) # make sure to only show gachas for the current version # so only up to bright, 1140 is the first bright memory gacha if self.version == OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY: game_gacha_list.append(tmp) - elif self.version == OngekiConstants.VER_ONGEKI_BRIGHT and tmp["gachaId"] < 1140: + elif ( + self.version == OngekiConstants.VER_ONGEKI_BRIGHT + and tmp["gachaId"] < 1140 + ): game_gacha_list.append(tmp) return { "length": len(game_gacha_list), "gameGachaList": game_gacha_list, # no clue - "registIdList": [] + "registIdList": [], } def handle_roll_gacha_api_request(self, data: Dict) -> Dict: @@ -251,7 +246,7 @@ class OngekiBright(OngekiBase): assert len(rarity) == 100 # uniform distribution to get the rarity of the card - rolls = [rarity[randint(0, len(rarity)-1)] for _ in range(num_rolls)] + rolls = [rarity[randint(0, len(rarity) - 1)] for _ in range(num_rolls)] # if SSR book used, make sure you always get one SSR if book_used == 1: @@ -273,15 +268,9 @@ class OngekiBright(OngekiBase): gacha_cards = self.data.static.get_gacha_cards(gacha_id) for card in gacha_cards: if card["rarity"] == 3: - cards_sr.append({ - "cardId": card["cardId"], - "rarity": 2 - }) + cards_sr.append({"cardId": card["cardId"], "rarity": 2}) elif card["rarity"] == 4: - cards_ssr.append({ - "cardId": card["cardId"], - "rarity": 3 - }) + cards_ssr.append({"cardId": card["cardId"], "rarity": 3}) else: cards_sr = self.data.static.get_cards_by_rarity(self.version, 2) cards_ssr = self.data.static.get_cards_by_rarity(self.version, 3) @@ -294,46 +283,39 @@ class OngekiBright(OngekiBase): for card in gacha_cards: # make sure to add the cards to the corresponding rarity if card["rarity"] == 2: - cards_r += [{ - "cardId": card["cardId"], - "rarity": 1 - }] * chances + cards_r += [{"cardId": card["cardId"], "rarity": 1}] * chances if card["rarity"] == 3: - cards_sr += [{ - "cardId": card["cardId"], - "rarity": 2 - }] * chances + cards_sr += [{"cardId": card["cardId"], "rarity": 2}] * chances elif card["rarity"] == 4: - cards_ssr += [{ - "cardId": card["cardId"], - "rarity": 3 - }] * chances + cards_ssr += [{"cardId": card["cardId"], "rarity": 3}] * chances # get the card id for each roll rolled_cards = [] for i in range(len(rolls)): if rolls[i] == 1: - rolled_cards.append(cards_r[randint(0, len(cards_r)-1)]) + rolled_cards.append(cards_r[randint(0, len(cards_r) - 1)]) elif rolls[i] == 2: - rolled_cards.append(cards_sr[randint(0, len(cards_sr)-1)]) + rolled_cards.append(cards_sr[randint(0, len(cards_sr) - 1)]) elif rolls[i] == 3: - rolled_cards.append(cards_ssr[randint(0, len(cards_ssr)-1)]) + rolled_cards.append(cards_ssr[randint(0, len(cards_ssr) - 1)]) game_gacha_card_list = [] for card in rolled_cards: - game_gacha_card_list.append({ - "gachaId": data["gachaId"], - "cardId": card["cardId"], - # +1 because Card Maker is weird - "rarity": card["rarity"] + 1, - "weight": 1, - "isPickup": False, - "isSelect": False - }) + game_gacha_card_list.append( + { + "gachaId": data["gachaId"], + "cardId": card["cardId"], + # +1 because Card Maker is weird + "rarity": card["rarity"] + 1, + "weight": 1, + "isPickup": False, + "isSelect": False, + } + ) return { "length": len(game_gacha_card_list), - "gameGachaCardList": game_gacha_card_list + "gameGachaCardList": game_gacha_card_list, } def handle_cm_upsert_user_gacha_api_request(self, data: Dict): @@ -342,12 +324,12 @@ class OngekiBright(OngekiBase): gacha_id = data["gachaId"] gacha_count = data["gachaCnt"] - play_date = datetime.strptime(data["playDate"][:10], '%Y-%m-%d') + play_date = datetime.strptime(data["playDate"][:10], "%Y-%m-%d") select_point = data["selectPoint"] total_gacha_count, ceiling_gacha_count = 0, 0 daily_gacha_cnt, five_gacha_cnt, eleven_gacha_cnt = 0, 0, 0 - daily_gacha_date = datetime.strptime('2000-01-01', '%Y-%m-%d') + daily_gacha_date = datetime.strptime("2000-01-01", "%Y-%m-%d") # check if the user previously rolled the exact same gacha user_gacha = self.data.item.get_user_gacha(user_id, gacha_id) @@ -374,9 +356,11 @@ class OngekiBright(OngekiBase): selectPoint=select_point, useSelectPoint=0, dailyGachaCnt=daily_gacha_cnt + gacha_count, - fiveGachaCnt=five_gacha_cnt+1 if gacha_count == 5 else five_gacha_cnt, - elevenGachaCnt=eleven_gacha_cnt+1 if gacha_count == 11 else eleven_gacha_cnt, - dailyGachaDate=daily_gacha_date + fiveGachaCnt=five_gacha_cnt + 1 if gacha_count == 5 else five_gacha_cnt, + elevenGachaCnt=eleven_gacha_cnt + 1 + if gacha_count == 11 + else eleven_gacha_cnt, + dailyGachaDate=daily_gacha_date, ) if "userData" in upsert and len(upsert["userData"]) > 0: @@ -385,11 +369,13 @@ class OngekiBright(OngekiBase): if p is not None: # save the bright memory profile self.data.profile.put_profile_data( - user_id, self.version, upsert["userData"][0]) + user_id, self.version, upsert["userData"][0] + ) else: # save the bright profile self.data.profile.put_profile_data( - user_id, self.version, upsert["userData"][0]) + user_id, self.version, upsert["userData"][0] + ) if "userCharacterList" in upsert: for x in upsert["userCharacterList"]: @@ -407,7 +393,7 @@ class OngekiBright(OngekiBase): # if "gameGachaCardList" in upsert: # for x in upsert["gameGachaCardList"]: - return {'returnCode': 1, 'apiName': 'CMUpsertUserGachaApi'} + return {"returnCode": 1, "apiName": "CMUpsertUserGachaApi"} def handle_cm_upsert_user_select_gacha_api_request(self, data: Dict) -> Dict: upsert = data["cmUpsertUserSelectGacha"] @@ -419,11 +405,13 @@ class OngekiBright(OngekiBase): if p is not None: # save the bright memory profile self.data.profile.put_profile_data( - user_id, self.version, upsert["userData"][0]) + user_id, self.version, upsert["userData"][0] + ) else: # save the bright profile self.data.profile.put_profile_data( - user_id, self.version, upsert["userData"][0]) + user_id, self.version, upsert["userData"][0] + ) if "userCharacterList" in upsert: for x in upsert["userCharacterList"]: @@ -439,10 +427,10 @@ class OngekiBright(OngekiBase): user_id, x["gachaId"], selectPoint=0, - useSelectPoint=x["useSelectPoint"] + useSelectPoint=x["useSelectPoint"], ) - return {'returnCode': 1, 'apiName': 'cmUpsertUserSelectGacha'} + return {"returnCode": 1, "apiName": "cmUpsertUserSelectGacha"} def handle_get_game_gacha_card_by_id_api_request(self, data: Dict) -> Dict: game_gacha_cards = self.data.static.get_gacha_cards(data["gachaId"]) @@ -459,7 +447,7 @@ class OngekiBright(OngekiBase): "rarity": 4, "weight": 1, "isPickup": False, - "isSelect": True + "isSelect": True, }, { "gachaId": data["gachaId"], @@ -467,7 +455,7 @@ class OngekiBright(OngekiBase): "rarity": 3, "weight": 2, "isPickup": False, - "isSelect": True + "isSelect": True, }, { "gachaId": data["gachaId"], @@ -475,7 +463,7 @@ class OngekiBright(OngekiBase): "rarity": 3, "weight": 2, "isPickup": False, - "isSelect": True + "isSelect": True, }, { "gachaId": data["gachaId"], @@ -483,7 +471,7 @@ class OngekiBright(OngekiBase): "rarity": 2, "weight": 3, "isPickup": False, - "isSelect": True + "isSelect": True, }, { "gachaId": data["gachaId"], @@ -491,7 +479,7 @@ class OngekiBright(OngekiBase): "rarity": 2, "weight": 3, "isPickup": False, - "isSelect": True + "isSelect": True, }, { "gachaId": data["gachaId"], @@ -499,12 +487,12 @@ class OngekiBright(OngekiBase): "rarity": 2, "weight": 3, "isPickup": False, - "isSelect": True - } + "isSelect": True, + }, ], "emissionList": [], "afterCalcList": [], - "ssrBookCalcList": [] + "ssrBookCalcList": [], } game_gacha_card_list = [] @@ -521,7 +509,7 @@ class OngekiBright(OngekiBase): # again no clue "emissionList": [], "afterCalcList": [], - "ssrBookCalcList": [] + "ssrBookCalcList": [], } def handle_get_game_theater_api_request(self, data: Dict) -> Dict: @@ -548,18 +536,14 @@ class OngekiBright(OngekiBase): } """ - return { - "length": 0, - "gameTheaterList": [], - "registIdList": [] - } + return {"length": 0, "gameTheaterList": [], "registIdList": []} def handle_cm_upsert_user_print_playlog_api_request(self, data: Dict) -> Dict: return { "returnCode": 1, "orderId": 0, "serialId": "11111111111111111111", - "apiName": "CMUpsertUserPrintPlaylogApi" + "apiName": "CMUpsertUserPrintPlaylogApi", } def handle_cm_upsert_user_printlog_api_request(self, data: Dict) -> Dict: @@ -567,34 +551,32 @@ class OngekiBright(OngekiBase): "returnCode": 1, "orderId": 0, "serialId": "11111111111111111111", - "apiName": "CMUpsertUserPrintlogApi" + "apiName": "CMUpsertUserPrintlogApi", } def handle_cm_upsert_user_print_api_request(self, data: Dict) -> Dict: user_print_detail = data["userPrintDetail"] # generate random serial id - serial_id = ''.join([str(randint(0, 9)) for _ in range(20)]) + serial_id = "".join([str(randint(0, 9)) for _ in range(20)]) # not needed because are either zero or unset user_print_detail.pop("orderId") user_print_detail.pop("printNumber") user_print_detail.pop("serialId") user_print_detail["printDate"] = datetime.strptime( - user_print_detail["printDate"], '%Y-%m-%d' + user_print_detail["printDate"], "%Y-%m-%d" ) # add the entry to the user print table with the random serialId self.data.item.put_user_print_detail( - data["userId"], - serial_id, - user_print_detail + data["userId"], serial_id, user_print_detail ) return { "returnCode": 1, "serialId": serial_id, - "apiName": "CMUpsertUserPrintApi" + "apiName": "CMUpsertUserPrintApi", } def handle_cm_upsert_user_all_api_request(self, data: Dict) -> Dict: @@ -607,17 +589,26 @@ class OngekiBright(OngekiBase): if p is not None: # save the bright memory profile self.data.profile.put_profile_data( - user_id, self.version, upsert["userData"][0]) + user_id, self.version, upsert["userData"][0] + ) else: # save the bright profile self.data.profile.put_profile_data( - user_id, self.version, upsert["userData"][0]) + user_id, self.version, upsert["userData"][0] + ) if "userActivityList" in upsert: for act in upsert["userActivityList"]: self.data.profile.put_profile_activity( - user_id, act["kind"], act["id"], act["sortNumber"], - act["param1"], act["param2"], act["param3"], act["param4"]) + user_id, + act["kind"], + act["id"], + act["sortNumber"], + act["param1"], + act["param2"], + act["param3"], + act["param4"], + ) if "userItemList" in upsert: for x in upsert["userItemList"]: @@ -627,4 +618,4 @@ class OngekiBright(OngekiBase): for x in upsert["userCardList"]: self.data.item.put_card(user_id, x) - return {'returnCode': 1, 'apiName': 'cmUpsertUserAll'} + return {"returnCode": 1, "apiName": "cmUpsertUserAll"} diff --git a/titles/ongeki/brightmemory.py b/titles/ongeki/brightmemory.py index c3e4ef1..954d0e5 100644 --- a/titles/ongeki/brightmemory.py +++ b/titles/ongeki/brightmemory.py @@ -30,14 +30,96 @@ class OngekiBrightMemory(OngekiBright): def handle_get_user_memory_chapter_api_request(self, data: Dict) -> Dict: memories = self.data.item.get_memorychapters(data["userId"]) if not memories: - return {"userId": data["userId"], "length":6, "userMemoryChapterList":[ - {"gaugeId":0, "isClear": False, "gaugeNum": 0, "chapterId": 70001, "jewelCount": 0, "isBossWatched": False, "isStoryWatched": False, "isDialogWatched": False, "isEndingWatched": False, "lastPlayMusicId": 0, "lastPlayMusicLevel": 0, "lastPlayMusicCategory": 0}, - {"gaugeId":0, "isClear": False, "gaugeNum": 0, "chapterId": 70002, "jewelCount": 0, "isBossWatched": False, "isStoryWatched": False, "isDialogWatched": False, "isEndingWatched": False, "lastPlayMusicId": 0, "lastPlayMusicLevel": 0, "lastPlayMusicCategory": 0}, - {"gaugeId":0, "isClear": False, "gaugeNum": 0, "chapterId": 70003, "jewelCount": 0, "isBossWatched": False, "isStoryWatched": False, "isDialogWatched": False, "isEndingWatched": False, "lastPlayMusicId": 0, "lastPlayMusicLevel": 0, "lastPlayMusicCategory": 0}, - {"gaugeId":0, "isClear": False, "gaugeNum": 0, "chapterId": 70004, "jewelCount": 0, "isBossWatched": False, "isStoryWatched": False, "isDialogWatched": False, "isEndingWatched": False, "lastPlayMusicId": 0, "lastPlayMusicLevel": 0, "lastPlayMusicCategory": 0}, - {"gaugeId":0, "isClear": False, "gaugeNum": 0, "chapterId": 70005, "jewelCount": 0, "isBossWatched": False, "isStoryWatched": False, "isDialogWatched": False, "isEndingWatched": False, "lastPlayMusicId": 0, "lastPlayMusicLevel": 0, "lastPlayMusicCategory": 0}, - {"gaugeId":0, "isClear": False, "gaugeNum": 0, "chapterId": 70099, "jewelCount": 0, "isBossWatched": False, "isStoryWatched": False, "isDialogWatched": False, "isEndingWatched": False, "lastPlayMusicId": 0, "lastPlayMusicLevel": 0, "lastPlayMusicCategory": 0} - ]} + return { + "userId": data["userId"], + "length": 6, + "userMemoryChapterList": [ + { + "gaugeId": 0, + "isClear": False, + "gaugeNum": 0, + "chapterId": 70001, + "jewelCount": 0, + "isBossWatched": False, + "isStoryWatched": False, + "isDialogWatched": False, + "isEndingWatched": False, + "lastPlayMusicId": 0, + "lastPlayMusicLevel": 0, + "lastPlayMusicCategory": 0, + }, + { + "gaugeId": 0, + "isClear": False, + "gaugeNum": 0, + "chapterId": 70002, + "jewelCount": 0, + "isBossWatched": False, + "isStoryWatched": False, + "isDialogWatched": False, + "isEndingWatched": False, + "lastPlayMusicId": 0, + "lastPlayMusicLevel": 0, + "lastPlayMusicCategory": 0, + }, + { + "gaugeId": 0, + "isClear": False, + "gaugeNum": 0, + "chapterId": 70003, + "jewelCount": 0, + "isBossWatched": False, + "isStoryWatched": False, + "isDialogWatched": False, + "isEndingWatched": False, + "lastPlayMusicId": 0, + "lastPlayMusicLevel": 0, + "lastPlayMusicCategory": 0, + }, + { + "gaugeId": 0, + "isClear": False, + "gaugeNum": 0, + "chapterId": 70004, + "jewelCount": 0, + "isBossWatched": False, + "isStoryWatched": False, + "isDialogWatched": False, + "isEndingWatched": False, + "lastPlayMusicId": 0, + "lastPlayMusicLevel": 0, + "lastPlayMusicCategory": 0, + }, + { + "gaugeId": 0, + "isClear": False, + "gaugeNum": 0, + "chapterId": 70005, + "jewelCount": 0, + "isBossWatched": False, + "isStoryWatched": False, + "isDialogWatched": False, + "isEndingWatched": False, + "lastPlayMusicId": 0, + "lastPlayMusicLevel": 0, + "lastPlayMusicCategory": 0, + }, + { + "gaugeId": 0, + "isClear": False, + "gaugeNum": 0, + "chapterId": 70099, + "jewelCount": 0, + "isBossWatched": False, + "isStoryWatched": False, + "isDialogWatched": False, + "isEndingWatched": False, + "lastPlayMusicId": 0, + "lastPlayMusicLevel": 0, + "lastPlayMusicCategory": 0, + }, + ], + } memory_chp = [] for chp in memories: @@ -49,14 +131,11 @@ class OngekiBrightMemory(OngekiBright): return { "userId": data["userId"], "length": len(memory_chp), - "userMemoryChapterList": memory_chp + "userMemoryChapterList": memory_chp, } def handle_get_game_music_release_state_api_request(self, data: Dict) -> Dict: - return { - "techScore": 0, - "cardNum": 0 - } + return {"techScore": 0, "cardNum": 0} def handle_cm_get_user_data_api_request(self, data: Dict) -> Dict: # check for a bright memory profile diff --git a/titles/ongeki/config.py b/titles/ongeki/config.py index 3a89f29..1117b39 100644 --- a/titles/ongeki/config.py +++ b/titles/ongeki/config.py @@ -3,26 +3,34 @@ from typing import List from core.config import CoreConfig -class OngekiServerConfig(): +class OngekiServerConfig: def __init__(self, parent_config: "OngekiConfig") -> None: self.__config = parent_config @property def enable(self) -> bool: - return CoreConfig.get_config_field(self.__config, 'ongeki', 'server', 'enable', default=True) + return CoreConfig.get_config_field( + self.__config, "ongeki", "server", "enable", default=True + ) @property def loglevel(self) -> int: - return CoreConfig.str_to_loglevel(CoreConfig.get_config_field(self.__config, 'ongeki', 'server', 'loglevel', default="info")) + return CoreConfig.str_to_loglevel( + CoreConfig.get_config_field( + self.__config, "ongeki", "server", "loglevel", default="info" + ) + ) -class OngekiGachaConfig(): +class OngekiGachaConfig: def __init__(self, parent_config: "OngekiConfig") -> None: self.__config = parent_config @property def enabled_gachas(self) -> List[int]: - return CoreConfig.get_config_field(self.__config, 'ongeki', 'gachas', 'enabled_gachas', default=[]) + return CoreConfig.get_config_field( + self.__config, "ongeki", "gachas", "enabled_gachas", default=[] + ) class OngekiConfig(dict): diff --git a/titles/ongeki/const.py b/titles/ongeki/const.py index 08abcf8..ceef317 100644 --- a/titles/ongeki/const.py +++ b/titles/ongeki/const.py @@ -2,7 +2,7 @@ from typing import Final, Dict from enum import Enum -class OngekiConstants(): +class OngekiConstants: GAME_CODE = "SDDT" CONFIG_NAME = "ongeki.yaml" @@ -16,28 +16,31 @@ class OngekiConstants(): VER_ONGEKI_BRIGHT = 6 VER_ONGEKI_BRIGHT_MEMORY = 7 - EVT_TYPES: Enum = Enum('EVT_TYPES', [ - 'None', - 'Announcement', - 'Movie', - 'AddMyList', - 'UnlockChapter', - 'JewelEvent', - 'RankingEvent', - 'AcceptRankingEvent', - 'UnlockMusic', - 'UnlockCard', - 'UnlockTrophy', - 'UnlockNamePlate', - 'UnlockLimitBreakItem', - 'MissionEvent', - 'DailyBonus', - 'UnlockBossLockEarly', - 'UnlockPurchaseItem', - 'TechChallengeEvent', - 'AcceptTechChallengeEvent', - 'SilverJewelEvent', - ]) + EVT_TYPES: Enum = Enum( + "EVT_TYPES", + [ + "None", + "Announcement", + "Movie", + "AddMyList", + "UnlockChapter", + "JewelEvent", + "RankingEvent", + "AcceptRankingEvent", + "UnlockMusic", + "UnlockCard", + "UnlockTrophy", + "UnlockNamePlate", + "UnlockLimitBreakItem", + "MissionEvent", + "DailyBonus", + "UnlockBossLockEarly", + "UnlockPurchaseItem", + "TechChallengeEvent", + "AcceptTechChallengeEvent", + "SilverJewelEvent", + ], + ) class CM_GACHA_KINDS(Enum): Normal = 0 @@ -61,8 +64,16 @@ class OngekiConstants(): Master = 3 Lunatic = 10 - VERSION_NAMES = ("ONGEKI", "ONGEKI+", "ONGEKI Summer", "ONGEKI Summer+", "ONGEKI Red", "ONGEKI Red+", - "ONGEKI Bright", "ONGEKI Bright Memory") + VERSION_NAMES = ( + "ONGEKI", + "ONGEKI+", + "ONGEKI Summer", + "ONGEKI Summer+", + "ONGEKI Red", + "ONGEKI Red+", + "ONGEKI Bright", + "ONGEKI Bright Memory", + ) @classmethod def game_ver_to_string(cls, ver: int): diff --git a/titles/ongeki/database.py b/titles/ongeki/database.py index a2168e4..89255c0 100644 --- a/titles/ongeki/database.py +++ b/titles/ongeki/database.py @@ -3,6 +3,7 @@ from core.config import CoreConfig from titles.ongeki.schema import OngekiItemData, OngekiProfileData, OngekiScoreData from titles.ongeki.schema import OngekiStaticData, OngekiLogData + class OngekiData(Data): def __init__(self, cfg: CoreConfig) -> None: super().__init__(cfg) @@ -11,4 +12,4 @@ class OngekiData(Data): self.profile = OngekiProfileData(cfg, self.session) self.score = OngekiScoreData(cfg, self.session) self.static = OngekiStaticData(cfg, self.session) - self.log = OngekiLogData(cfg, self.session) \ No newline at end of file + self.log = OngekiLogData(cfg, self.session) diff --git a/titles/ongeki/index.py b/titles/ongeki/index.py index 09ab18c..07c8ff2 100644 --- a/titles/ongeki/index.py +++ b/titles/ongeki/index.py @@ -21,12 +21,15 @@ from titles.ongeki.redplus import OngekiRedPlus from titles.ongeki.bright import OngekiBright from titles.ongeki.brightmemory import OngekiBrightMemory -class OngekiServlet(): + +class OngekiServlet: def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None: self.core_cfg = core_cfg self.game_cfg = OngekiConfig() if path.exists(f"{cfg_dir}/{OngekiConstants.CONFIG_NAME}"): - self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{OngekiConstants.CONFIG_NAME}"))) + self.game_cfg.update( + yaml.safe_load(open(f"{cfg_dir}/{OngekiConstants.CONFIG_NAME}")) + ) self.versions = [ OngekiBase(core_cfg, self.game_cfg), @@ -42,34 +45,52 @@ class OngekiServlet(): self.logger = logging.getLogger("ongeki") log_fmt_str = "[%(asctime)s] Ongeki | %(levelname)s | %(message)s" log_fmt = logging.Formatter(log_fmt_str) - fileHandler = TimedRotatingFileHandler("{0}/{1}.log".format(self.core_cfg.server.log_dir, "ongeki"), encoding='utf8', - when="d", backupCount=10) + fileHandler = TimedRotatingFileHandler( + "{0}/{1}.log".format(self.core_cfg.server.log_dir, "ongeki"), + encoding="utf8", + when="d", + backupCount=10, + ) fileHandler.setFormatter(log_fmt) - + consoleHandler = logging.StreamHandler() consoleHandler.setFormatter(log_fmt) self.logger.addHandler(fileHandler) self.logger.addHandler(consoleHandler) - + self.logger.setLevel(self.game_cfg.server.loglevel) - coloredlogs.install(level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str) - + coloredlogs.install( + level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str + ) + @classmethod - def get_allnet_info(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: + def get_allnet_info( + cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str + ) -> Tuple[bool, str, str]: game_cfg = OngekiConfig() if path.exists(f"{cfg_dir}/{OngekiConstants.CONFIG_NAME}"): - game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{OngekiConstants.CONFIG_NAME}"))) + game_cfg.update( + yaml.safe_load(open(f"{cfg_dir}/{OngekiConstants.CONFIG_NAME}")) + ) if not game_cfg.server.enable: return (False, "", "") - + if core_cfg.server.is_develop: - return (True, f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/", f"{core_cfg.title.hostname}:{core_cfg.title.port}/") - - return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", f"{core_cfg.title.hostname}/") + return ( + True, + f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v/", + f"{core_cfg.title.hostname}:{core_cfg.title.port}/", + ) + + return ( + True, + f"http://{core_cfg.title.hostname}/{game_code}/$v/", + f"{core_cfg.title.hostname}/", + ) def render_POST(self, request: Request, version: int, url_path: str) -> bytes: if url_path.lower() == "/ping": @@ -80,39 +101,41 @@ class OngekiServlet(): internal_ver = 0 endpoint = url_split[len(url_split) - 1] - if version < 105: # 1.0 + if version < 105: # 1.0 internal_ver = OngekiConstants.VER_ONGEKI - elif version >= 105 and version < 110: # Plus + elif version >= 105 and version < 110: # Plus internal_ver = OngekiConstants.VER_ONGEKI_PLUS - elif version >= 110 and version < 115: # Summer + elif version >= 110 and version < 115: # Summer internal_ver = OngekiConstants.VER_ONGEKI_SUMMER - elif version >= 115 and version < 120: # Summer Plus + elif version >= 115 and version < 120: # Summer Plus internal_ver = OngekiConstants.VER_ONGEKI_SUMMER_PLUS - elif version >= 120 and version < 125: # Red + elif version >= 120 and version < 125: # Red internal_ver = OngekiConstants.VER_ONGEKI_RED - elif version >= 125 and version < 130: # Red Plus + elif version >= 125 and version < 130: # Red Plus internal_ver = OngekiConstants.VER_ONGEKI_RED_PLUS - elif version >= 130 and version < 135: # Bright + elif version >= 130 and version < 135: # Bright internal_ver = OngekiConstants.VER_ONGEKI_BRIGHT - elif version >= 135 and version < 140: # Bright Memory + elif version >= 135 and version < 140: # Bright Memory internal_ver = OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY if all(c in string.hexdigits for c in endpoint) and len(endpoint) == 32: - # If we get a 32 character long hex string, it's a hash and we're - # doing encrypted. The likelyhood of false positives is low but + # If we get a 32 character long hex string, it's a hash and we're + # doing encrypted. The likelyhood of false positives is low but # technically not 0 self.logger.error("Encryption not supported at this time") return b"" - try: + try: unzip = zlib.decompress(req_raw) - + except zlib.error as e: - self.logger.error(f"Failed to decompress v{version} {endpoint} request -> {e}") + self.logger.error( + f"Failed to decompress v{version} {endpoint} request -> {e}" + ) return zlib.compress(b'{"stat": "0"}') - + req_data = json.loads(unzip) - + self.logger.info(f"v{version} {endpoint} request - {req_data}") func_to_find = "handle_" + inflection.underscore(endpoint) + "_request" @@ -128,13 +151,10 @@ class OngekiServlet(): except Exception as e: self.logger.error(f"Error handling v{version} method {endpoint} - {e}") return zlib.compress(b'{"stat": "0"}') - + if resp == None: - resp = {'returnCode': 1} - + resp = {"returnCode": 1} + self.logger.info(f"Response {resp}") - + return zlib.compress(json.dumps(resp, ensure_ascii=False).encode("utf-8")) - - - \ No newline at end of file diff --git a/titles/ongeki/plus.py b/titles/ongeki/plus.py index 8875503..9168576 100644 --- a/titles/ongeki/plus.py +++ b/titles/ongeki/plus.py @@ -5,11 +5,12 @@ from titles.ongeki.base import OngekiBase from titles.ongeki.const import OngekiConstants from titles.ongeki.config import OngekiConfig + class OngekiPlus(OngekiBase): def __init__(self, core_cfg: CoreConfig, game_cfg: OngekiConfig) -> None: super().__init__(core_cfg, game_cfg) self.version = OngekiConstants.VER_ONGEKI_PLUS - + def handle_get_game_setting_api_request(self, data: Dict) -> Dict: ret = super().handle_get_game_setting_api_request(data) ret["gameSetting"]["dataVersion"] = "1.05.00" diff --git a/titles/ongeki/read.py b/titles/ongeki/read.py index 397fa8c..b64194f 100644 --- a/titles/ongeki/read.py +++ b/titles/ongeki/read.py @@ -13,14 +13,21 @@ from titles.ongeki.config import OngekiConfig class OngekiReader(BaseReader): - def __init__(self, config: CoreConfig, version: int, bin_dir: Optional[str], - opt_dir: Optional[str], extra: Optional[str]) -> None: + def __init__( + self, + config: CoreConfig, + version: int, + bin_dir: Optional[str], + opt_dir: Optional[str], + extra: Optional[str], + ) -> None: super().__init__(config, version, bin_dir, opt_dir, extra) self.data = OngekiData(config) try: self.logger.info( - f"Start importer for {OngekiConstants.game_ver_to_string(version)}") + f"Start importer for {OngekiConstants.game_ver_to_string(version)}" + ) except IndexError: self.logger.error(f"Invalid ongeki version {version}") exit(1) @@ -42,14 +49,14 @@ class OngekiReader(BaseReader): self.logger.info(f"Reading cards from {base_dir}...") version_ids = { - '1000': OngekiConstants.VER_ONGEKI, - '1005': OngekiConstants.VER_ONGEKI_PLUS, - '1010': OngekiConstants.VER_ONGEKI_SUMMER, - '1015': OngekiConstants.VER_ONGEKI_SUMMER_PLUS, - '1020': OngekiConstants.VER_ONGEKI_RED, - '1025': OngekiConstants.VER_ONGEKI_RED_PLUS, - '1030': OngekiConstants.VER_ONGEKI_BRIGHT, - '1035': OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY + "1000": OngekiConstants.VER_ONGEKI, + "1005": OngekiConstants.VER_ONGEKI_PLUS, + "1010": OngekiConstants.VER_ONGEKI_SUMMER, + "1015": OngekiConstants.VER_ONGEKI_SUMMER_PLUS, + "1020": OngekiConstants.VER_ONGEKI_RED, + "1025": OngekiConstants.VER_ONGEKI_RED_PLUS, + "1030": OngekiConstants.VER_ONGEKI_BRIGHT, + "1035": OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY, } for root, dirs, files in os.walk(base_dir): @@ -58,34 +65,39 @@ class OngekiReader(BaseReader): with open(f"{root}/{dir}/Card.xml", "r", encoding="utf-8") as f: troot = ET.fromstring(f.read()) - card_id = int(troot.find('Name').find('id').text) + card_id = int(troot.find("Name").find("id").text) # skip already existing cards - if self.data.static.get_card( - OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY, card_id) is not None: - + if ( + self.data.static.get_card( + OngekiConstants.VER_ONGEKI_BRIGHT_MEMORY, card_id + ) + is not None + ): self.logger.info(f"Card {card_id} already added, skipping") continue - name = troot.find('Name').find('str').text - chara_id = int(troot.find('CharaID').find('id').text) - nick_name = troot.find('NickName').text - school = troot.find('School').find('str').text - attribute = troot.find('Attribute').text - gakunen = troot.find('Gakunen').find('str').text + name = troot.find("Name").find("str").text + chara_id = int(troot.find("CharaID").find("id").text) + nick_name = troot.find("NickName").text + school = troot.find("School").find("str").text + attribute = troot.find("Attribute").text + gakunen = troot.find("Gakunen").find("str").text rarity = OngekiConstants.RARITY_TYPES[ - troot.find('Rarity').text].value + troot.find("Rarity").text + ].value level_param = [] - for lvl in troot.find('LevelParam').findall('int'): + for lvl in troot.find("LevelParam").findall("int"): level_param.append(lvl.text) - skill_id = int(troot.find('SkillID').find('id').text) - cho_kai_ka_skill_id = int(troot.find('ChoKaikaSkillID').find('id').text) + skill_id = int(troot.find("SkillID").find("id").text) + cho_kai_ka_skill_id = int( + troot.find("ChoKaikaSkillID").find("id").text + ) - version = version_ids[ - troot.find('VersionID').find('id').text] - card_number = troot.find('CardNumberString').text + version = version_ids[troot.find("VersionID").find("id").text] + card_number = troot.find("CardNumberString").text self.data.static.put_card( version, @@ -97,10 +109,10 @@ class OngekiReader(BaseReader): attribute=attribute, gakunen=gakunen, rarity=rarity, - levelParam=','.join(level_param), + levelParam=",".join(level_param), skillId=skill_id, choKaikaSkillId=cho_kai_ka_skill_id, - cardNumber=card_number + cardNumber=card_number, ) self.logger.info(f"Added card {card_id}") @@ -113,13 +125,13 @@ class OngekiReader(BaseReader): with open(f"{root}/{dir}/Event.xml", "r", encoding="utf-8") as f: troot = ET.fromstring(f.read()) - name = troot.find('Name').find('str').text - id = int(troot.find('Name').find('id').text) - event_type = OngekiConstants.EVT_TYPES[troot.find( - 'EventType').text].value + name = troot.find("Name").find("str").text + id = int(troot.find("Name").find("id").text) + event_type = OngekiConstants.EVT_TYPES[ + troot.find("EventType").text + ].value - self.data.static.put_event( - self.version, id, event_type, name) + self.data.static.put_event(self.version, id, event_type, name) self.logger.info(f"Added event {id}") def read_music(self, base_dir: str) -> None: @@ -138,15 +150,15 @@ class OngekiReader(BaseReader): if root is None: continue - name = troot.find('Name') - song_id = name.find('id').text - title = name.find('str').text - artist = troot.find('ArtistName').find('str').text - genre = troot.find('Genre').find('str').text + name = troot.find("Name") + song_id = name.find("id").text + title = name.find("str").text + artist = troot.find("ArtistName").find("str").text + genre = troot.find("Genre").find("str").text fumens = troot.find("FumenData") - for fumens_data in fumens.findall('FumenData'): - path = fumens_data.find('FumenFile').find('path').text + for fumens_data in fumens.findall("FumenData"): + path = fumens_data.find("FumenFile").find("path").text if path is None or not os.path.exists(f"{root}/{dir}/{path}"): continue @@ -156,6 +168,6 @@ class OngekiReader(BaseReader): ) self.data.static.put_chart( - self.version, song_id, chart_id, title, artist, genre, level) - self.logger.info( - f"Added song {song_id} chart {chart_id}") + self.version, song_id, chart_id, title, artist, genre, level + ) + self.logger.info(f"Added song {song_id} chart {chart_id}") diff --git a/titles/ongeki/red.py b/titles/ongeki/red.py index 047286e..52b9d59 100644 --- a/titles/ongeki/red.py +++ b/titles/ongeki/red.py @@ -5,11 +5,12 @@ from titles.ongeki.base import OngekiBase from titles.ongeki.const import OngekiConstants from titles.ongeki.config import OngekiConfig + class OngekiRed(OngekiBase): def __init__(self, core_cfg: CoreConfig, game_cfg: OngekiConfig) -> None: super().__init__(core_cfg, game_cfg) self.version = OngekiConstants.VER_ONGEKI_RED - + def handle_get_game_setting_api_request(self, data: Dict) -> Dict: ret = super().handle_get_game_setting_api_request(data) ret["gameSetting"]["dataVersion"] = "1.20.00" diff --git a/titles/ongeki/redplus.py b/titles/ongeki/redplus.py index a4df205..1f69690 100644 --- a/titles/ongeki/redplus.py +++ b/titles/ongeki/redplus.py @@ -5,11 +5,12 @@ from titles.ongeki.base import OngekiBase from titles.ongeki.const import OngekiConstants from titles.ongeki.config import OngekiConfig + class OngekiRedPlus(OngekiBase): def __init__(self, core_cfg: CoreConfig, game_cfg: OngekiConfig) -> None: super().__init__(core_cfg, game_cfg) self.version = OngekiConstants.VER_ONGEKI_RED_PLUS - + def handle_get_game_setting_api_request(self, data: Dict) -> Dict: ret = super().handle_get_game_setting_api_request(data) ret["gameSetting"]["dataVersion"] = "1.25.00" diff --git a/titles/ongeki/schema/__init__.py b/titles/ongeki/schema/__init__.py index 9b1e1da..b93a16c 100644 --- a/titles/ongeki/schema/__init__.py +++ b/titles/ongeki/schema/__init__.py @@ -4,4 +4,10 @@ from titles.ongeki.schema.static import OngekiStaticData from titles.ongeki.schema.score import OngekiScoreData from titles.ongeki.schema.log import OngekiLogData -__all__ = [OngekiProfileData, OngekiItemData, OngekiStaticData, OngekiScoreData, OngekiLogData] \ No newline at end of file +__all__ = [ + OngekiProfileData, + OngekiItemData, + OngekiStaticData, + OngekiScoreData, + OngekiLogData, +] diff --git a/titles/ongeki/schema/item.py b/titles/ongeki/schema/item.py index 001388a..d406597 100644 --- a/titles/ongeki/schema/item.py +++ b/titles/ongeki/schema/item.py @@ -28,7 +28,7 @@ card = Table( Column("isAcquired", Boolean), Column("created", String(25)), UniqueConstraint("user", "cardId", name="ongeki_user_card_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) deck = Table( @@ -41,7 +41,7 @@ deck = Table( Column("cardId2", Integer), Column("cardId3", Integer), UniqueConstraint("user", "deckId", name="ongeki_user_deck_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) character = Table( @@ -59,10 +59,10 @@ character = Table( Column("intimateCountDate", String(25)), Column("isNew", Boolean), UniqueConstraint("user", "characterId", name="ongeki_user_character_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) -boss = Table ( +boss = Table( "ongeki_user_boss", metadata, Column("id", Integer, primary_key=True, nullable=False), @@ -72,10 +72,10 @@ boss = Table ( Column("isClear", Boolean), Column("eventId", Integer), UniqueConstraint("user", "musicId", "eventId", name="ongeki_user_boss_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) -story = Table ( +story = Table( "ongeki_user_story", metadata, Column("id", Integer, primary_key=True, nullable=False), @@ -87,7 +87,7 @@ story = Table ( Column("lastPlayMusicCategory", Integer), Column("lastPlayMusicLevel", Integer), UniqueConstraint("user", "storyId", name="ongeki_user_story_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) chapter = Table( @@ -105,7 +105,7 @@ chapter = Table( Column("skipTiming1", Integer), Column("skipTiming2", Integer), UniqueConstraint("user", "chapterId", name="ongeki_user_chapter_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) memorychapter = Table( @@ -126,7 +126,7 @@ memorychapter = Table( Column("lastPlayMusicLevel", Integer), Column("lastPlayMusicCategory", Integer), UniqueConstraint("user", "chapterId", name="ongeki_user_memorychapter_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) item = Table( @@ -139,7 +139,7 @@ item = Table( Column("stock", Integer), Column("isValid", Boolean), UniqueConstraint("user", "itemKind", "itemId", name="ongeki_user_item_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) music_item = Table( @@ -150,7 +150,7 @@ music_item = Table( Column("musicId", Integer), Column("status", Integer), UniqueConstraint("user", "musicId", name="ongeki_user_music_item_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) login_bonus = Table( @@ -162,7 +162,7 @@ login_bonus = Table( Column("bonusCount", Integer), Column("lastUpdateDate", String(25)), UniqueConstraint("user", "bonusId", name="ongeki_user_login_bonus_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) event_point = Table( @@ -174,7 +174,7 @@ event_point = Table( Column("point", Integer), Column("isRankingRewarded", Boolean), UniqueConstraint("user", "eventId", name="ongeki_user_event_point_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) mission_point = Table( @@ -185,7 +185,7 @@ mission_point = Table( Column("eventId", Integer), Column("point", Integer), UniqueConstraint("user", "eventId", name="ongeki_user_mission_point_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) scenerio = Table( @@ -196,7 +196,7 @@ scenerio = Table( Column("scenarioId", Integer), Column("playCount", Integer), UniqueConstraint("user", "scenarioId", name="ongeki_user_scenerio_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) trade_item = Table( @@ -207,8 +207,10 @@ trade_item = Table( Column("chapterId", Integer), Column("tradeItemId", Integer), Column("tradeCount", Integer), - UniqueConstraint("user", "chapterId", "tradeItemId", name="ongeki_user_trade_item_uk"), - mysql_charset='utf8mb4' + UniqueConstraint( + "user", "chapterId", "tradeItemId", name="ongeki_user_trade_item_uk" + ), + mysql_charset="utf8mb4", ) event_music = Table( @@ -224,8 +226,10 @@ event_music = Table( Column("platinumScoreMax", Integer), Column("techRecordDate", String(25)), Column("isTechNewRecord", Boolean), - UniqueConstraint("user", "eventId", "type", "musicId", "level", name="ongeki_user_event_music"), - mysql_charset='utf8mb4' + UniqueConstraint( + "user", "eventId", "type", "musicId", "level", name="ongeki_user_event_music" + ), + mysql_charset="utf8mb4", ) tech_event = Table( @@ -240,14 +244,18 @@ tech_event = Table( Column("isRankingRewarded", Boolean), Column("isTotalTechNewRecord", Boolean), UniqueConstraint("user", "eventId", name="ongeki_user_tech_event_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) gacha = Table( "ongeki_user_gacha", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("gachaId", Integer, nullable=False), Column("totalGachaCnt", Integer, server_default="0"), Column("ceilingGachaCnt", Integer, server_default="0"), @@ -258,17 +266,21 @@ gacha = Table( Column("elevenGachaCnt", Integer, server_default="0"), Column("dailyGachaDate", TIMESTAMP, nullable=False, server_default=func.now()), UniqueConstraint("user", "gachaId", name="ongeki_user_gacha_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) gacha_supply = Table( "ongeki_user_gacha_supply", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("cardId", Integer, nullable=False), UniqueConstraint("user", "cardId", name="ongeki_user_gacha_supply_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) @@ -276,7 +288,11 @@ print_detail = Table( "ongeki_user_print_detail", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("cardId", Integer, nullable=False), Column("cardType", Integer, server_default="0"), Column("printDate", TIMESTAMP, nullable=False), @@ -297,11 +313,11 @@ print_detail = Table( Column("printOption9", Boolean, server_default="1"), Column("printOption10", Boolean, server_default="0"), UniqueConstraint("serialId", name="ongeki_user_print_detail_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) -class OngekiItemData(BaseData): +class OngekiItemData(BaseData): def put_card(self, aime_id: int, card_data: Dict) -> Optional[int]: card_data["user"] = aime_id @@ -318,7 +334,8 @@ class OngekiItemData(BaseData): sql = select(card).where(card.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def put_character(self, aime_id: int, character_data: Dict) -> Optional[int]: @@ -332,12 +349,13 @@ class OngekiItemData(BaseData): self.logger.warn(f"put_character: Failed to update! aime_id: {aime_id}") return None return result.lastrowid - + def get_characters(self, aime_id: int) -> Optional[List[Dict]]: sql = select(character).where(character.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def put_deck(self, aime_id: int, deck_data: Dict) -> Optional[int]: @@ -351,19 +369,21 @@ class OngekiItemData(BaseData): self.logger.warn(f"put_deck: Failed to update! aime_id: {aime_id}") return None return result.lastrowid - + def get_deck(self, aime_id: int, deck_id: int) -> Optional[Dict]: sql = select(deck).where(and_(deck.c.user == aime_id, deck.c.deckId == deck_id)) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() - + def get_decks(self, aime_id: int) -> Optional[List[Dict]]: sql = select(deck).where(deck.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def put_boss(self, aime_id: int, boss_data: Dict) -> Optional[int]: @@ -377,7 +397,7 @@ class OngekiItemData(BaseData): self.logger.warn(f"put_boss: Failed to update! aime_id: {aime_id}") return None return result.lastrowid - + def put_story(self, aime_id: int, story_data: Dict) -> Optional[int]: story_data["user"] = aime_id @@ -389,12 +409,13 @@ class OngekiItemData(BaseData): self.logger.warn(f"put_story: Failed to update! aime_id: {aime_id}") return None return result.lastrowid - + def get_stories(self, aime_id: int) -> Optional[List[Dict]]: sql = select(story).where(story.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def put_chapter(self, aime_id: int, chapter_data: Dict) -> Optional[int]: @@ -408,12 +429,13 @@ class OngekiItemData(BaseData): self.logger.warn(f"put_chapter: Failed to update! aime_id: {aime_id}") return None return result.lastrowid - + def get_chapters(self, aime_id: int) -> Optional[List[Dict]]: sql = select(chapter).where(chapter.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def put_item(self, aime_id: int, item_data: Dict) -> Optional[int]: @@ -427,22 +449,26 @@ class OngekiItemData(BaseData): self.logger.warn(f"put_item: Failed to update! aime_id: {aime_id}") return None return result.lastrowid - + def get_item(self, aime_id: int, item_id: int, item_kind: int) -> Optional[Dict]: sql = select(item).where(and_(item.c.user == aime_id, item.c.itemId == item_id)) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() def get_items(self, aime_id: int, item_kind: int = None) -> Optional[List[Dict]]: if item_kind is None: sql = select(item).where(item.c.user == aime_id) else: - sql = select(item).where(and_(item.c.user == aime_id, item.c.itemKind == item_kind)) + sql = select(item).where( + and_(item.c.user == aime_id, item.c.itemKind == item_kind) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def put_music_item(self, aime_id: int, music_item_data: Dict) -> Optional[int]: @@ -456,12 +482,13 @@ class OngekiItemData(BaseData): self.logger.warn(f"put_music_item: Failed to update! aime_id: {aime_id}") return None return result.lastrowid - + def get_music_items(self, aime_id: int) -> Optional[List[Dict]]: sql = select(music_item).where(music_item.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def put_login_bonus(self, aime_id: int, login_bonus_data: Dict) -> Optional[int]: @@ -475,15 +502,18 @@ class OngekiItemData(BaseData): self.logger.warn(f"put_login_bonus: Failed to update! aime_id: {aime_id}") return None return result.lastrowid - + def get_login_bonuses(self, aime_id: int) -> Optional[List[Dict]]: sql = select(login_bonus).where(login_bonus.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - def put_mission_point(self, aime_id: int, mission_point_data: Dict) -> Optional[int]: + def put_mission_point( + self, aime_id: int, mission_point_data: Dict + ) -> Optional[int]: mission_point_data["user"] = aime_id sql = insert(mission_point).values(**mission_point_data) @@ -494,14 +524,15 @@ class OngekiItemData(BaseData): self.logger.warn(f"put_mission_point: Failed to update! aime_id: {aime_id}") return None return result.lastrowid - + def get_mission_points(self, aime_id: int) -> Optional[List[Dict]]: sql = select(mission_point).where(mission_point.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - + def put_event_point(self, aime_id: int, event_point_data: Dict) -> Optional[int]: event_point_data["user"] = aime_id @@ -513,12 +544,13 @@ class OngekiItemData(BaseData): self.logger.warn(f"put_event_point: Failed to update! aime_id: {aime_id}") return None return result.lastrowid - + def get_event_points(self, aime_id: int) -> Optional[List[Dict]]: sql = select(event_point).where(event_point.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def put_scenerio(self, aime_id: int, scenerio_data: Dict) -> Optional[int]: @@ -532,12 +564,13 @@ class OngekiItemData(BaseData): self.logger.warn(f"put_scenerio: Failed to update! aime_id: {aime_id}") return None return result.lastrowid - + def get_scenerios(self, aime_id: int) -> Optional[List[Dict]]: sql = select(scenerio).where(scenerio.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def put_trade_item(self, aime_id: int, trade_item_data: Dict) -> Optional[int]: @@ -551,14 +584,15 @@ class OngekiItemData(BaseData): self.logger.warn(f"put_trade_item: Failed to update! aime_id: {aime_id}") return None return result.lastrowid - + def get_trade_items(self, aime_id: int) -> Optional[List[Dict]]: sql = select(trade_item).where(trade_item.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - + def put_event_music(self, aime_id: int, event_music_data: Dict) -> Optional[int]: event_music_data["user"] = aime_id @@ -570,12 +604,13 @@ class OngekiItemData(BaseData): self.logger.warn(f"put_event_music: Failed to update! aime_id: {aime_id}") return None return result.lastrowid - + def get_event_music(self, aime_id: int) -> Optional[List[Dict]]: sql = select(event_music).where(event_music.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def put_tech_event(self, aime_id: int, tech_event_data: Dict) -> Optional[int]: @@ -589,22 +624,26 @@ class OngekiItemData(BaseData): self.logger.warn(f"put_tech_event: Failed to update! aime_id: {aime_id}") return None return result.lastrowid - + def get_tech_event(self, aime_id: int) -> Optional[List[Dict]]: sql = select(tech_event).where(tech_event.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def get_bosses(self, aime_id: int) -> Optional[List[Dict]]: sql = select(boss).where(boss.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - def put_memorychapter(self, aime_id: int, memorychapter_data: Dict) -> Optional[int]: + def put_memorychapter( + self, aime_id: int, memorychapter_data: Dict + ) -> Optional[int]: memorychapter_data["user"] = aime_id sql = insert(memorychapter).values(**memorychapter_data) @@ -625,10 +664,7 @@ class OngekiItemData(BaseData): return result.fetchall() def get_user_gacha(self, aime_id: int, gacha_id: int) -> Optional[Row]: - sql = gacha.select(and_( - gacha.c.user == aime_id, - gacha.c.gachaId == gacha_id - )) + sql = gacha.select(and_(gacha.c.user == aime_id, gacha.c.gachaId == gacha_id)) result = self.execute(sql) if result is None: @@ -652,15 +688,9 @@ class OngekiItemData(BaseData): return result.fetchall() def put_user_gacha(self, aime_id: int, gacha_id: int, **data) -> Optional[int]: - sql = insert(gacha).values( - user=aime_id, - gachaId=gacha_id, - **data) + sql = insert(gacha).values(user=aime_id, gachaId=gacha_id, **data) - conflict = sql.on_duplicate_key_update( - user=aime_id, - gachaId=gacha_id, - **data) + conflict = sql.on_duplicate_key_update(user=aime_id, gachaId=gacha_id, **data) result = self.execute(conflict) if result is None: @@ -668,20 +698,21 @@ class OngekiItemData(BaseData): return None return result.lastrowid - def put_user_print_detail(self, aime_id: int, serial_id: str, - user_print_data: Dict) -> Optional[int]: + def put_user_print_detail( + self, aime_id: int, serial_id: str, user_print_data: Dict + ) -> Optional[int]: sql = insert(print_detail).values( - user=aime_id, - serialId=serial_id, - **user_print_data) + user=aime_id, serialId=serial_id, **user_print_data + ) conflict = sql.on_duplicate_key_update( - user=aime_id, - serialId=serial_id, - **user_print_data) + user=aime_id, serialId=serial_id, **user_print_data + ) result = self.execute(conflict) if result is None: - self.logger.warn(f"put_user_print_detail: Failed to insert! aime_id: {aime_id}") + self.logger.warn( + f"put_user_print_detail: Failed to insert! aime_id: {aime_id}" + ) return None return result.lastrowid diff --git a/titles/ongeki/schema/log.py b/titles/ongeki/schema/log.py index 67ed778..701e8e0 100644 --- a/titles/ongeki/schema/log.py +++ b/titles/ongeki/schema/log.py @@ -15,11 +15,13 @@ gp_log = Table( Column("usedCredit", Integer), Column("placeName", String(255)), Column("trxnDate", String(255)), - Column("placeId", Integer), # Making this an FK would mess with people playing with default KC - Column("kind", Integer), - Column("pattern", Integer), + Column( + "placeId", Integer + ), # Making this an FK would mess with people playing with default KC + Column("kind", Integer), + Column("pattern", Integer), Column("currentGP", Integer), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) session_log = Table( @@ -32,12 +34,22 @@ session_log = Table( Column("playDate", String(10)), Column("userPlayDate", String(25)), Column("isPaid", Boolean), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) + class OngekiLogData(BaseData): - def put_gp_log(self, aime_id: Optional[int], used_credit: int, place_name: str, tx_date: str, place_id: int, - kind: int, pattern: int, current_gp: int) -> Optional[int]: + def put_gp_log( + self, + aime_id: Optional[int], + used_credit: int, + place_name: str, + tx_date: str, + place_id: int, + kind: int, + pattern: int, + current_gp: int, + ) -> Optional[int]: sql = insert(gp_log).values( user=aime_id, usedCredit=used_credit, @@ -51,5 +63,7 @@ class OngekiLogData(BaseData): result = self.execute(sql) if result is None: - self.logger.warn(f"put_gp_log: Failed to insert GP log! aime_id: {aime_id} kind {kind} pattern {pattern} current_gp {current_gp}") - return result.lastrowid \ No newline at end of file + self.logger.warn( + f"put_gp_log: Failed to insert GP log! aime_id: {aime_id} kind {kind} pattern {pattern} current_gp {current_gp}" + ) + return result.lastrowid diff --git a/titles/ongeki/schema/profile.py b/titles/ongeki/schema/profile.py index ce07490..a112bf2 100644 --- a/titles/ongeki/schema/profile.py +++ b/titles/ongeki/schema/profile.py @@ -16,7 +16,11 @@ profile = Table( "ongeki_profile_data", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("version", Integer, nullable=False), Column("userName", String(8)), Column("level", Integer), @@ -81,7 +85,7 @@ profile = Table( Column("lastEmoneyCredit", Integer, server_default="0"), Column("isDialogWatchedSuggestMemory", Boolean, server_default="0"), UniqueConstraint("user", "version", name="ongeki_profile_profile_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) # No point setting defaults since the game sends everything on profile creation anyway @@ -89,7 +93,11 @@ option = Table( "ongeki_profile_option", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("optionSet", Integer), Column("speed", Integer), Column("mirror", Integer), @@ -128,14 +136,18 @@ option = Table( Column("stealthField", Integer), Column("colorWallBright", Integer), UniqueConstraint("user", name="ongeki_profile_option_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) activity = Table( "ongeki_profile_activity", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("kind", Integer), Column("activityId", Integer), Column("sortNumber", Integer), @@ -144,40 +156,52 @@ activity = Table( Column("param3", Integer), Column("param4", Integer), UniqueConstraint("user", "kind", "activityId", name="ongeki_profile_activity_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) recent_rating = Table( "ongeki_profile_recent_rating", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("recentRating", JSON), UniqueConstraint("user", name="ongeki_profile_recent_rating_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) rating_log = Table( "ongeki_profile_rating_log", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("highestRating", Integer), Column("dataVersion", String(10)), UniqueConstraint("user", "dataVersion", name="ongeki_profile_rating_log_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) region = Table( "ongeki_profile_region", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("regionId", Integer), Column("playCount", Integer), Column("created", String(25)), UniqueConstraint("user", "regionId", name="ongeki_profile_region_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) training_room = Table( @@ -185,12 +209,12 @@ training_room = Table( metadata, Column("id", Integer, primary_key=True, nullable=False), Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade")), - Column("roomId", Integer), + Column("roomId", Integer), Column("authKey", Integer), Column("cardId", Integer), Column("valueDate", String(25)), UniqueConstraint("user", "roomId", name="ongeki_profile_training_room_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) kop = Table( @@ -199,14 +223,14 @@ kop = Table( Column("id", Integer, primary_key=True, nullable=False), Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade")), Column("authKey", Integer), - Column("kopId", Integer), + Column("kopId", Integer), Column("areaId", Integer), Column("totalTechScore", Integer), Column("totalPlatinumScore", Integer), Column("techRecordDate", String(25)), Column("isTotalTechNewRecord", Boolean), UniqueConstraint("user", "kopId", name="ongeki_profile_kop_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) rival = Table( @@ -214,86 +238,112 @@ rival = Table( metadata, Column("id", Integer, primary_key=True, nullable=False), Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade")), - Column("rivalUserId", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade")), + Column( + "rivalUserId", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + ), UniqueConstraint("user", "rivalUserId", name="ongeki_profile_rival_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) class OngekiProfileData(BaseData): def __init__(self, cfg: CoreConfig, conn: Connection) -> None: super().__init__(cfg, conn) - self.date_time_format_ext = "%Y-%m-%d %H:%M:%S.%f" # needs to be lopped off at [:-5] + self.date_time_format_ext = ( + "%Y-%m-%d %H:%M:%S.%f" # needs to be lopped off at [:-5] + ) self.date_time_format_short = "%Y-%m-%d" def get_profile_name(self, aime_id: int, version: int) -> Optional[str]: - sql = select(profile.c.userName).where(and_(profile.c.user == aime_id, profile.c.version == version)) - - result = self.execute(sql) - if result is None: return None - - row = result.fetchone() - if row is None: return None - - return row["userName"] - - def get_profile_preview(self, aime_id: int, version: int) -> Optional[Row]: - sql = select([profile, option]).join(option, profile.c.user == option.c.user).filter( + sql = select(profile.c.userName).where( and_(profile.c.user == aime_id, profile.c.version == version) ) result = self.execute(sql) - if result is None: return None + if result is None: + return None + + row = result.fetchone() + if row is None: + return None + + return row["userName"] + + def get_profile_preview(self, aime_id: int, version: int) -> Optional[Row]: + sql = ( + select([profile, option]) + .join(option, profile.c.user == option.c.user) + .filter(and_(profile.c.user == aime_id, profile.c.version == version)) + ) + + result = self.execute(sql) + if result is None: + return None return result.fetchone() def get_profile_data(self, aime_id: int, version: int) -> Optional[Row]: - sql = select(profile).where(and_( - profile.c.user == aime_id, - profile.c.version == version, - )) + sql = select(profile).where( + and_( + profile.c.user == aime_id, + profile.c.version == version, + ) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() def get_profile_options(self, aime_id: int) -> Optional[Row]: - sql = select(option).where(and_( - option.c.user == aime_id, - )) + sql = select(option).where( + and_( + option.c.user == aime_id, + ) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() def get_profile_recent_rating(self, aime_id: int) -> Optional[List[Row]]: sql = select(recent_rating).where(recent_rating.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() def get_profile_rating_log(self, aime_id: int) -> Optional[List[Row]]: sql = select(rating_log).where(recent_rating.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - def get_profile_activity(self, aime_id: int, kind: int = None) -> Optional[List[Row]]: - sql = select(activity).where(and_( - activity.c.user == aime_id, - (activity.c.kind == kind) if kind is not None else True - )) + def get_profile_activity( + self, aime_id: int, kind: int = None + ) -> Optional[List[Row]]: + sql = select(activity).where( + and_( + activity.c.user == aime_id, + (activity.c.kind == kind) if kind is not None else True, + ) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def get_kop(self, aime_id: int) -> Optional[List[Row]]: sql = select(kop).where(kop.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def get_rivals(self, aime_id: int) -> Optional[List[Row]]: @@ -326,48 +376,62 @@ class OngekiProfileData(BaseData): result = self.execute(conflict) if result is None: - self.logger.warn(f"put_profile_options: Failed to update! aime_id: {aime_id}") + self.logger.warn( + f"put_profile_options: Failed to update! aime_id: {aime_id}" + ) return None return result.lastrowid - def put_profile_recent_rating(self, aime_id: int, recent_rating_data: List[Dict]) -> Optional[int]: + def put_profile_recent_rating( + self, aime_id: int, recent_rating_data: List[Dict] + ) -> Optional[int]: sql = insert(recent_rating).values( - user=aime_id, - recentRating=recent_rating_data + user=aime_id, recentRating=recent_rating_data ) - conflict = sql.on_duplicate_key_update( - recentRating=recent_rating_data - ) + conflict = sql.on_duplicate_key_update(recentRating=recent_rating_data) result = self.execute(conflict) if result is None: - self.logger.warn(f"put_profile_recent_rating: failed to update recent rating! aime_id {aime_id}") + self.logger.warn( + f"put_profile_recent_rating: failed to update recent rating! aime_id {aime_id}" + ) return None return result.lastrowid - def put_profile_bp_list(self, aime_id: int, bp_base_list: List[Dict]) -> Optional[int]: + def put_profile_bp_list( + self, aime_id: int, bp_base_list: List[Dict] + ) -> Optional[int]: pass - - def put_profile_rating_log(self, aime_id: int, data_version: str, highest_rating: int) -> Optional[int]: + + def put_profile_rating_log( + self, aime_id: int, data_version: str, highest_rating: int + ) -> Optional[int]: sql = insert(rating_log).values( - user=aime_id, - dataVersion=data_version, - highestRating=highest_rating + user=aime_id, dataVersion=data_version, highestRating=highest_rating ) - conflict = sql.on_duplicate_key_update( - highestRating=highest_rating - ) + conflict = sql.on_duplicate_key_update(highestRating=highest_rating) result = self.execute(conflict) if result is None: - self.logger.warn(f"put_profile_rating_log: failed to update rating log! aime_id {aime_id} data_version {data_version} highest_rating {highest_rating}") + self.logger.warn( + f"put_profile_rating_log: failed to update rating log! aime_id {aime_id} data_version {data_version} highest_rating {highest_rating}" + ) return None return result.lastrowid - def put_profile_activity(self, aime_id: int, kind: int, activity_id: int, sort_num: int, - p1: int, p2: int, p3: int, p4: int) -> Optional[int]: + def put_profile_activity( + self, + aime_id: int, + kind: int, + activity_id: int, + sort_num: int, + p1: int, + p2: int, + p3: int, + p4: int, + ) -> Optional[int]: sql = insert(activity).values( user=aime_id, kind=kind, @@ -376,29 +440,24 @@ class OngekiProfileData(BaseData): param1=p1, param2=p2, param3=p3, - param4=p4 + param4=p4, ) conflict = sql.on_duplicate_key_update( - sortNumber=sort_num, - param1=p1, - param2=p2, - param3=p3, - param4=p4 + sortNumber=sort_num, param1=p1, param2=p2, param3=p3, param4=p4 ) result = self.execute(conflict) if result is None: - self.logger.warn(f"put_profile_activity: failed to put activity! aime_id {aime_id} kind {kind} activity_id {activity_id}") + self.logger.warn( + f"put_profile_activity: failed to put activity! aime_id {aime_id} kind {kind} activity_id {activity_id}" + ) return None return result.lastrowid - + def put_profile_region(self, aime_id: int, region: int, date: str) -> Optional[int]: sql = insert(activity).values( - user=aime_id, - region=region, - playCount=1, - created=date + user=aime_id, region=region, playCount=1, created=date ) conflict = sql.on_duplicate_key_update( @@ -407,10 +466,12 @@ class OngekiProfileData(BaseData): result = self.execute(conflict) if result is None: - self.logger.warn(f"put_profile_region: failed to update! aime_id {aime_id} region {region}") + self.logger.warn( + f"put_profile_region: failed to update! aime_id {aime_id} region {region}" + ) return None return result.lastrowid - + def put_training_room(self, aime_id: int, room_detail: Dict) -> Optional[int]: room_detail["user"] = aime_id @@ -422,7 +483,7 @@ class OngekiProfileData(BaseData): self.logger.warn(f"put_best_score: Failed to add score! aime_id: {aime_id}") return None return result.lastrowid - + def put_kop(self, aime_id: int, kop_data: Dict) -> Optional[int]: kop_data["user"] = aime_id @@ -434,17 +495,16 @@ class OngekiProfileData(BaseData): self.logger.warn(f"put_kop: Failed to add score! aime_id: {aime_id}") return None return result.lastrowid - - def put_rival(self, aime_id: int, rival_id: int) -> Optional[int]: - sql = insert(rival).values( - user = aime_id, - rivalUserId = rival_id - ) - conflict = sql.on_duplicate_key_update(rival = rival_id) + def put_rival(self, aime_id: int, rival_id: int) -> Optional[int]: + sql = insert(rival).values(user=aime_id, rivalUserId=rival_id) + + conflict = sql.on_duplicate_key_update(rival=rival_id) result = self.execute(conflict) if result is None: - self.logger.warn(f"put_rival: failed to update! aime_id: {aime_id}, rival_id: {rival_id}") + self.logger.warn( + f"put_rival: failed to update! aime_id: {aime_id}, rival_id: {rival_id}" + ) return None return result.lastrowid diff --git a/titles/ongeki/schema/score.py b/titles/ongeki/schema/score.py index e526005..8bb9fc9 100644 --- a/titles/ongeki/schema/score.py +++ b/titles/ongeki/schema/score.py @@ -11,14 +11,18 @@ score_best = Table( "ongeki_score_best", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("musicId", Integer, nullable=False), Column("level", Integer, nullable=False), - Column("playCount", Integer, nullable=False), + Column("playCount", Integer, nullable=False), Column("techScoreMax", Integer, nullable=False), Column("techScoreRank", Integer, nullable=False), Column("battleScoreMax", Integer, nullable=False), - Column("battleScoreRank", Integer, nullable=False), + Column("battleScoreRank", Integer, nullable=False), Column("maxComboCount", Integer, nullable=False), Column("maxOverKill", Float, nullable=False), Column("maxTeamOverKill", Float, nullable=False), @@ -30,14 +34,18 @@ score_best = Table( Column("isStoryWatched", Boolean, nullable=False), Column("platinumScoreMax", Integer), UniqueConstraint("user", "musicId", "level", name="ongeki_best_score_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) playlog = Table( "ongeki_score_playlog", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("sortNumber", Integer), Column("placeId", Integer), Column("placeName", String(255)), @@ -99,25 +107,30 @@ playlog = Table( Column("battlePoint", Integer), Column("platinumScore", Integer), Column("platinumScoreMax", Integer), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) tech_count = Table( "ongeki_score_tech_count", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("levelId", Integer, nullable=False), Column("allBreakCount", Integer), Column("allBreakPlusCount", Integer), UniqueConstraint("user", "levelId", name="ongeki_tech_count_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) + class OngekiScoreData(BaseData): def get_tech_count(self, aime_id: int) -> Optional[List[Dict]]: return [] - + def put_tech_count(self, aime_id: int, tech_count_data: Dict) -> Optional[int]: tech_count_data["user"] = aime_id @@ -129,17 +142,20 @@ class OngekiScoreData(BaseData): self.logger.warn(f"put_tech_count: Failed to update! aime_id: {aime_id}") return None return result.lastrowid - + def get_best_scores(self, aime_id: int) -> Optional[List[Dict]]: sql = select(score_best).where(score_best.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - def get_best_score(self, aime_id: int, song_id: int, chart_id: int = None) -> Optional[List[Dict]]: + def get_best_score( + self, aime_id: int, song_id: int, chart_id: int = None + ) -> Optional[List[Dict]]: return [] - + def put_best_score(self, aime_id: int, music_detail: Dict) -> Optional[int]: music_detail["user"] = aime_id @@ -161,4 +177,4 @@ class OngekiScoreData(BaseData): if result is None: self.logger.warn(f"put_playlog: Failed to add playlog! aime_id: {aime_id}") return None - return result.lastrowid \ No newline at end of file + return result.lastrowid diff --git a/titles/ongeki/schema/static.py b/titles/ongeki/schema/static.py index 7c5ed68..ed81ebf 100644 --- a/titles/ongeki/schema/static.py +++ b/titles/ongeki/schema/static.py @@ -18,7 +18,7 @@ events = Table( Column("name", String(255)), Column("enabled", Boolean, server_default="1"), UniqueConstraint("version", "eventId", "type", name="ongeki_static_events_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) @@ -34,7 +34,7 @@ music = Table( Column("genre", String(255)), Column("level", Float), UniqueConstraint("version", "songId", "chartId", name="ongeki_static_music_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) gachas = Table( @@ -57,7 +57,7 @@ gachas = Table( Column("noticeEndDate", TIMESTAMP, server_default="2038-01-01 00:00:00.0"), Column("convertEndDate", TIMESTAMP, server_default="2038-01-01 00:00:00.0"), UniqueConstraint("version", "gachaId", "gachaName", name="ongeki_static_gachas_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) gacha_cards = Table( @@ -71,7 +71,7 @@ gacha_cards = Table( Column("isPickup", Boolean, server_default="0"), Column("isSelect", Boolean, server_default="0"), UniqueConstraint("gachaId", "cardId", name="ongeki_static_gacha_cards_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) cards = Table( @@ -92,16 +92,13 @@ cards = Table( Column("choKaikaSkillId", Integer, nullable=False), Column("cardNumber", String(255)), UniqueConstraint("version", "cardId", name="ongeki_static_cards_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) class OngekiStaticData(BaseData): def put_card(self, version: int, card_id: int, **card_data) -> Optional[int]: - sql = insert(cards).values( - version=version, - cardId=card_id, - **card_data) + sql = insert(cards).values(version=version, cardId=card_id, **card_data) conflict = sql.on_duplicate_key_update(**card_data) @@ -112,10 +109,7 @@ class OngekiStaticData(BaseData): return result.lastrowid def get_card(self, version: int, card_id: int) -> Optional[Dict]: - sql = cards.select(and_( - cards.c.version <= version, - cards.c.cardId == card_id - )) + sql = cards.select(and_(cards.c.version <= version, cards.c.cardId == card_id)) result = self.execute(sql) if result is None: @@ -126,10 +120,9 @@ class OngekiStaticData(BaseData): if not card_number.startswith("[O.N.G.E.K.I.]"): card_number = f"[O.N.G.E.K.I.]{card_number}" - sql = cards.select(and_( - cards.c.version <= version, - cards.c.cardNumber == card_number - )) + sql = cards.select( + and_(cards.c.version <= version, cards.c.cardNumber == card_number) + ) result = self.execute(sql) if result is None: @@ -137,10 +130,7 @@ class OngekiStaticData(BaseData): return result.fetchone() def get_card_by_name(self, version: int, name: str) -> Optional[Dict]: - sql = cards.select(and_( - cards.c.version <= version, - cards.c.name == name - )) + sql = cards.select(and_(cards.c.version <= version, cards.c.name == name)) result = self.execute(sql) if result is None: @@ -156,24 +146,27 @@ class OngekiStaticData(BaseData): return result.fetchall() def get_cards_by_rarity(self, version: int, rarity: int) -> Optional[List[Dict]]: - sql = cards.select(and_( - cards.c.version <= version, - cards.c.rarity == rarity - )) + sql = cards.select(and_(cards.c.version <= version, cards.c.rarity == rarity)) result = self.execute(sql) if result is None: return None return result.fetchall() - def put_gacha(self, version: int, gacha_id: int, gacha_name: int, - gacha_kind: int, **gacha_data) -> Optional[int]: + def put_gacha( + self, + version: int, + gacha_id: int, + gacha_name: int, + gacha_kind: int, + **gacha_data, + ) -> Optional[int]: sql = insert(gachas).values( version=version, gachaId=gacha_id, gachaName=gacha_name, kind=gacha_kind, - **gacha_data + **gacha_data, ) conflict = sql.on_duplicate_key_update( @@ -181,7 +174,7 @@ class OngekiStaticData(BaseData): gachaId=gacha_id, gachaName=gacha_name, kind=gacha_kind, - **gacha_data + **gacha_data, ) result = self.execute(conflict) @@ -191,10 +184,9 @@ class OngekiStaticData(BaseData): return result.lastrowid def get_gacha(self, version: int, gacha_id: int) -> Optional[Dict]: - sql = gachas.select(and_( - gachas.c.version <= version, - gachas.c.gachaId == gacha_id - )) + sql = gachas.select( + and_(gachas.c.version <= version, gachas.c.gachaId == gacha_id) + ) result = self.execute(sql) if result is None: @@ -202,8 +194,7 @@ class OngekiStaticData(BaseData): return result.fetchone() def get_gachas(self, version: int) -> Optional[List[Dict]]: - sql = gachas.select( - gachas.c.version == version).order_by( + sql = gachas.select(gachas.c.version == version).order_by( gachas.c.gachaId.asc() ) @@ -212,17 +203,13 @@ class OngekiStaticData(BaseData): return None return result.fetchall() - def put_gacha_card(self, gacha_id: int, card_id: int, **gacha_card) -> Optional[int]: - sql = insert(gacha_cards).values( - gachaId=gacha_id, - cardId=card_id, - **gacha_card - ) + def put_gacha_card( + self, gacha_id: int, card_id: int, **gacha_card + ) -> Optional[int]: + sql = insert(gacha_cards).values(gachaId=gacha_id, cardId=card_id, **gacha_card) conflict = sql.on_duplicate_key_update( - gachaId=gacha_id, - cardId=card_id, - **gacha_card + gachaId=gacha_id, cardId=card_id, **gacha_card ) result = self.execute(conflict) @@ -232,25 +219,25 @@ class OngekiStaticData(BaseData): return result.lastrowid def get_gacha_cards(self, gacha_id: int) -> Optional[List[Dict]]: - sql = gacha_cards.select( - gacha_cards.c.gachaId == gacha_id - ) + sql = gacha_cards.select(gacha_cards.c.gachaId == gacha_id) result = self.execute(sql) if result is None: return None return result.fetchall() - def put_event(self, version: int, event_id: int, event_type: int, event_name: str) -> Optional[int]: + def put_event( + self, version: int, event_id: int, event_type: int, event_name: str + ) -> Optional[int]: sql = insert(events).values( - version = version, - eventId = event_id, - type = event_type, - name = event_name, + version=version, + eventId=event_id, + type=event_type, + name=event_name, ) conflict = sql.on_duplicate_key_update( - name = event_name, + name=event_name, ) result = self.execute(conflict) @@ -260,63 +247,88 @@ class OngekiStaticData(BaseData): return result.lastrowid def get_event(self, version: int, event_id: int) -> Optional[List[Dict]]: - sql = select(events).where(and_(events.c.version == version, events.c.eventId == event_id)) - + sql = select(events).where( + and_(events.c.version == version, events.c.eventId == event_id) + ) + result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def get_events(self, version: int) -> Optional[List[Dict]]: sql = select(events).where(events.c.version == version) - + result = self.execute(sql) - if result is None: return None - return result.fetchall() - - def get_enabled_events(self, version: int) -> Optional[List[Dict]]: - sql = select(events).where(and_(events.c.version == version, events.c.enabled == True)) - - result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - def put_chart(self, version: int, song_id: int, chart_id: int, title: str, artist: str, genre: str, level: float) -> Optional[int]: + def get_enabled_events(self, version: int) -> Optional[List[Dict]]: + sql = select(events).where( + and_(events.c.version == version, events.c.enabled == True) + ) + + result = self.execute(sql) + if result is None: + return None + return result.fetchall() + + def put_chart( + self, + version: int, + song_id: int, + chart_id: int, + title: str, + artist: str, + genre: str, + level: float, + ) -> Optional[int]: sql = insert(music).values( - version = version, - songId = song_id, - chartId = chart_id, - title = title, - artist = artist, - genre = genre, - level = level, + version=version, + songId=song_id, + chartId=chart_id, + title=title, + artist=artist, + genre=genre, + level=level, ) conflict = sql.on_duplicate_key_update( - title = title, - artist = artist, - genre = genre, - level = level, + title=title, + artist=artist, + genre=genre, + level=level, ) result = self.execute(conflict) if result is None: - self.logger.warn(f"Failed to insert chart! song_id: {song_id}, chart_id: {chart_id}") + self.logger.warn( + f"Failed to insert chart! song_id: {song_id}, chart_id: {chart_id}" + ) return None return result.lastrowid - def get_chart(self, version: int, song_id: int, chart_id: int = None) -> Optional[List[Dict]]: + def get_chart( + self, version: int, song_id: int, chart_id: int = None + ) -> Optional[List[Dict]]: pass def get_music(self, version: int) -> Optional[List[Dict]]: pass - def get_music_chart(self, version: int, song_id: int, chart_id: int) -> Optional[List[Row]]: - sql = select(music).where(and_( - music.c.version == version, - music.c.songId == song_id, - music.c.chartId == chart_id - )) + def get_music_chart( + self, version: int, song_id: int, chart_id: int + ) -> Optional[List[Row]]: + sql = select(music).where( + and_( + music.c.version == version, + music.c.songId == song_id, + music.c.chartId == chart_id, + ) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() diff --git a/titles/ongeki/summer.py b/titles/ongeki/summer.py index 24ed290..adc8c0f 100644 --- a/titles/ongeki/summer.py +++ b/titles/ongeki/summer.py @@ -5,11 +5,12 @@ from titles.ongeki.base import OngekiBase from titles.ongeki.const import OngekiConstants from titles.ongeki.config import OngekiConfig + class OngekiSummer(OngekiBase): def __init__(self, core_cfg: CoreConfig, game_cfg: OngekiConfig) -> None: super().__init__(core_cfg, game_cfg) self.version = OngekiConstants.VER_ONGEKI_SUMMER - + def handle_get_game_setting_api_request(self, data: Dict) -> Dict: ret = super().handle_get_game_setting_api_request(data) ret["gameSetting"]["dataVersion"] = "1.10.00" diff --git a/titles/ongeki/summerplus.py b/titles/ongeki/summerplus.py index 188e618..8b2cd03 100644 --- a/titles/ongeki/summerplus.py +++ b/titles/ongeki/summerplus.py @@ -5,11 +5,12 @@ from titles.ongeki.base import OngekiBase from titles.ongeki.const import OngekiConstants from titles.ongeki.config import OngekiConfig + class OngekiSummerPlus(OngekiBase): def __init__(self, core_cfg: CoreConfig, game_cfg: OngekiConfig) -> None: super().__init__(core_cfg, game_cfg) self.version = OngekiConstants.VER_ONGEKI_SUMMER_PLUS - + def handle_get_game_setting_api_request(self, data: Dict) -> Dict: ret = super().handle_get_game_setting_api_request(data) ret["gameSetting"]["dataVersion"] = "1.15.00" diff --git a/titles/pokken/__init__.py b/titles/pokken/__init__.py index 6340de8..ed2ee23 100644 --- a/titles/pokken/__init__.py +++ b/titles/pokken/__init__.py @@ -5,4 +5,4 @@ from titles.pokken.database import PokkenData index = PokkenServlet database = PokkenData game_codes = [PokkenConstants.GAME_CODE] -current_schema_version = 1 \ No newline at end of file +current_schema_version = 1 diff --git a/titles/pokken/base.py b/titles/pokken/base.py index 33232e4..f1f9eb3 100644 --- a/titles/pokken/base.py +++ b/titles/pokken/base.py @@ -6,12 +6,13 @@ from core.config import CoreConfig from titles.pokken.config import PokkenConfig from titles.pokken.proto import jackal_pb2 -class PokkenBase(): + +class PokkenBase: def __init__(self, core_cfg: CoreConfig, game_cfg: PokkenConfig) -> None: self.core_cfg = core_cfg self.game_cfg = game_cfg self.version = 0 - + def handle_noop(self, request: Any) -> bytes: res = jackal_pb2.Response() res.result = 1 @@ -25,7 +26,7 @@ class PokkenBase(): res.type = jackal_pb2.MessageType.PING return res.SerializeToString() - + def handle_register_pcb(self, request: jackal_pb2.RegisterPcbRequestData) -> bytes: res = jackal_pb2.Response() res.result = 1 @@ -37,20 +38,20 @@ class PokkenBase(): "MatchingServer": { "host": f"https://{self.game_cfg.server.hostname}", "port": self.game_cfg.server.port_matching, - "url": "/matching" + "url": "/matching", }, "StunServer": { "addr": self.game_cfg.server.hostname, - "port": self.game_cfg.server.port_stun + "port": self.game_cfg.server.port_stun, }, "TurnServer": { "addr": self.game_cfg.server.hostname, - "port": self.game_cfg.server.port_turn + "port": self.game_cfg.server.port_turn, }, "AdmissionUrl": f"ws://{self.game_cfg.server.hostname}:{self.game_cfg.server.port_admission}", "locationId": 123, "logfilename": "JackalMatchingLibrary.log", - "biwalogfilename": "./biwa.log" + "biwalogfilename": "./biwa.log", } regist_pcb.bnp_baseuri = f"{self.core_cfg.title.hostname}/bna" regist_pcb.biwa_setting = json.dumps(biwa_setting) @@ -66,21 +67,27 @@ class PokkenBase(): return res.SerializeToString() - def handle_save_client_log(self, request: jackal_pb2.SaveClientLogRequestData) -> bytes: + def handle_save_client_log( + self, request: jackal_pb2.SaveClientLogRequestData + ) -> bytes: res = jackal_pb2.Response() res.result = 1 res.type = jackal_pb2.MessageType.SAVE_CLIENT_LOG return res.SerializeToString() - def handle_check_diagnosis(self, request: jackal_pb2.CheckDiagnosisRequestData) -> bytes: + def handle_check_diagnosis( + self, request: jackal_pb2.CheckDiagnosisRequestData + ) -> bytes: res = jackal_pb2.Response() res.result = 1 res.type = jackal_pb2.MessageType.CHECK_DIAGNOSIS return res.SerializeToString() - def handle_load_client_settings(self, request: jackal_pb2.CheckDiagnosisRequestData) -> bytes: + def handle_load_client_settings( + self, request: jackal_pb2.CheckDiagnosisRequestData + ) -> bytes: res = jackal_pb2.Response() res.result = 1 res.type = jackal_pb2.MessageType.LOAD_CLIENT_SETTINGS diff --git a/titles/pokken/config.py b/titles/pokken/config.py index 9b2ae0f..3907838 100644 --- a/titles/pokken/config.py +++ b/titles/pokken/config.py @@ -1,48 +1,72 @@ from core.config import CoreConfig -class PokkenServerConfig(): + +class PokkenServerConfig: def __init__(self, parent_config: "PokkenConfig"): self.__config = parent_config - + @property def hostname(self) -> str: - return CoreConfig.get_config_field(self.__config, 'pokken', 'server', 'hostname', default="localhost") - + return CoreConfig.get_config_field( + self.__config, "pokken", "server", "hostname", default="localhost" + ) + @property def enable(self) -> bool: - return CoreConfig.get_config_field(self.__config, 'pokken', 'server', 'enable', default=True) + return CoreConfig.get_config_field( + self.__config, "pokken", "server", "enable", default=True + ) @property def loglevel(self) -> int: - return CoreConfig.str_to_loglevel(CoreConfig.get_config_field(self.__config, 'pokken', 'server', 'loglevel', default="info")) + return CoreConfig.str_to_loglevel( + CoreConfig.get_config_field( + self.__config, "pokken", "server", "loglevel", default="info" + ) + ) @property def port(self) -> int: - return CoreConfig.get_config_field(self.__config, 'pokken', 'server', 'port', default=9000) + return CoreConfig.get_config_field( + self.__config, "pokken", "server", "port", default=9000 + ) @property def port_matching(self) -> int: - return CoreConfig.get_config_field(self.__config, 'pokken', 'server', 'port_matching', default=9001) + return CoreConfig.get_config_field( + self.__config, "pokken", "server", "port_matching", default=9001 + ) @property def port_stun(self) -> int: - return CoreConfig.get_config_field(self.__config, 'pokken', 'server', 'port_stun', default=9002) + return CoreConfig.get_config_field( + self.__config, "pokken", "server", "port_stun", default=9002 + ) @property def port_turn(self) -> int: - return CoreConfig.get_config_field(self.__config, 'pokken', 'server', 'port_turn', default=9003) + return CoreConfig.get_config_field( + self.__config, "pokken", "server", "port_turn", default=9003 + ) @property def port_admission(self) -> int: - return CoreConfig.get_config_field(self.__config, 'pokken', 'server', 'port_admission', default=9004) - + return CoreConfig.get_config_field( + self.__config, "pokken", "server", "port_admission", default=9004 + ) + @property def ssl_cert(self) -> str: - return CoreConfig.get_config_field(self.__config, 'pokken', 'server', 'ssl_cert', default="cert/pokken.crt") + return CoreConfig.get_config_field( + self.__config, "pokken", "server", "ssl_cert", default="cert/pokken.crt" + ) @property def ssl_key(self) -> str: - return CoreConfig.get_config_field(self.__config, 'pokken', 'server', 'ssl_key', default="cert/pokken.key") + return CoreConfig.get_config_field( + self.__config, "pokken", "server", "ssl_key", default="cert/pokken.key" + ) + class PokkenConfig(dict): def __init__(self) -> None: diff --git a/titles/pokken/const.py b/titles/pokken/const.py index 203925c..802a7b9 100644 --- a/titles/pokken/const.py +++ b/titles/pokken/const.py @@ -1,12 +1,12 @@ -class PokkenConstants(): +class PokkenConstants: GAME_CODE = "SDAK" CONFIG_NAME = "pokken.yaml" VER_POKKEN = 0 - VERSION_NAMES = ("Pokken Tournament") + VERSION_NAMES = "Pokken Tournament" @classmethod def game_ver_to_string(cls, ver: int): - return cls.VERSION_NAMES[ver] \ No newline at end of file + return cls.VERSION_NAMES[ver] diff --git a/titles/pokken/database.py b/titles/pokken/database.py index eff928b..f77f172 100644 --- a/titles/pokken/database.py +++ b/titles/pokken/database.py @@ -1,6 +1,7 @@ from core.data import Data from core.config import CoreConfig + class PokkenData(Data): def __init__(self, cfg: CoreConfig) -> None: - super().__init__(cfg) \ No newline at end of file + super().__init__(cfg) diff --git a/titles/pokken/index.py b/titles/pokken/index.py index ccf21de..bbf1204 100644 --- a/titles/pokken/index.py +++ b/titles/pokken/index.py @@ -14,6 +14,7 @@ from titles.pokken.config import PokkenConfig from titles.pokken.base import PokkenBase from titles.pokken.const import PokkenConstants + class PokkenServlet(resource.Resource): def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None: self.isLeaf = True @@ -27,79 +28,109 @@ class PokkenServlet(resource.Resource): if not hasattr(self.logger, "inited"): log_fmt_str = "[%(asctime)s] Pokken | %(levelname)s | %(message)s" log_fmt = logging.Formatter(log_fmt_str) - fileHandler = TimedRotatingFileHandler("{0}/{1}.log".format(self.core_cfg.server.log_dir, "pokken"), encoding='utf8', - when="d", backupCount=10) + fileHandler = TimedRotatingFileHandler( + "{0}/{1}.log".format(self.core_cfg.server.log_dir, "pokken"), + encoding="utf8", + when="d", + backupCount=10, + ) fileHandler.setFormatter(log_fmt) - + consoleHandler = logging.StreamHandler() consoleHandler.setFormatter(log_fmt) self.logger.addHandler(fileHandler) self.logger.addHandler(consoleHandler) - + self.logger.setLevel(self.game_cfg.server.loglevel) - coloredlogs.install(level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str) + coloredlogs.install( + level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str + ) self.logger.inited = True self.base = PokkenBase(core_cfg, self.game_cfg) @classmethod - def get_allnet_info(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: + def get_allnet_info( + cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str + ) -> Tuple[bool, str, str]: game_cfg = PokkenConfig() - + if path.exists(f"{cfg_dir}/{PokkenConstants.CONFIG_NAME}"): - game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{PokkenConstants.CONFIG_NAME}"))) + game_cfg.update( + yaml.safe_load(open(f"{cfg_dir}/{PokkenConstants.CONFIG_NAME}")) + ) if not game_cfg.server.enable: return (False, "", "") - + if core_cfg.server.is_develop: - return (True, f"https://{game_cfg.server.hostname}:{game_cfg.server.port}/{game_code}/$v/", f"{game_cfg.server.hostname}:{game_cfg.server.port}/") - - return (True, f"https://{game_cfg.server.hostname}/{game_code}/$v/", f"{game_cfg.server.hostname}/") + return ( + True, + f"https://{game_cfg.server.hostname}:{game_cfg.server.port}/{game_code}/$v/", + f"{game_cfg.server.hostname}:{game_cfg.server.port}/", + ) + + return ( + True, + f"https://{game_cfg.server.hostname}/{game_code}/$v/", + f"{game_cfg.server.hostname}/", + ) @classmethod - def get_mucha_info(cls, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: + def get_mucha_info( + cls, core_cfg: CoreConfig, cfg_dir: str + ) -> Tuple[bool, str, str]: game_cfg = PokkenConfig() - + if path.exists(f"{cfg_dir}/{PokkenConstants.CONFIG_NAME}"): - game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{PokkenConstants.CONFIG_NAME}"))) + game_cfg.update( + yaml.safe_load(open(f"{cfg_dir}/{PokkenConstants.CONFIG_NAME}")) + ) if not game_cfg.server.enable: return (False, "", "") - + return (True, "PKFN") - + def setup(self): """ There's currently no point in having this server on because Twisted - won't play ball with both the fact that it's TLSv1.1, and because the + won't play ball with both the fact that it's TLSv1.1, and because the types of certs that pokken will accept are too flimsy for Twisted so it will throw a fit. Currently leaving this here in case a bypass is discovered in the future, but it's unlikly. For now, just use NGINX. """ - if self.game_cfg.server.enable and self.core_cfg.server.is_develop: + if self.game_cfg.server.enable and self.core_cfg.server.is_develop: key_exists = path.exists(self.game_cfg.server.ssl_key) cert_exists = path.exists(self.game_cfg.server.ssl_cert) - + if key_exists and cert_exists: - endpoints.serverFromString(reactor, f"ssl:{self.game_cfg.server.port}"\ - f":interface={self.core_cfg.server.listen_address}:privateKey={self.game_cfg.server.ssl_key}:"\ - f"certKey={self.game_cfg.server.ssl_cert}")\ - .listen(server.Site(self)) - - self.logger.info(f"Pokken title server ready on port {self.game_cfg.server.port}") + endpoints.serverFromString( + reactor, + f"ssl:{self.game_cfg.server.port}" + f":interface={self.core_cfg.server.listen_address}:privateKey={self.game_cfg.server.ssl_key}:" + f"certKey={self.game_cfg.server.ssl_cert}", + ).listen(server.Site(self)) + + self.logger.info( + f"Pokken title server ready on port {self.game_cfg.server.port}" + ) else: - self.logger.error(f"Could not find cert at {self.game_cfg.server.ssl_key} or key at {self.game_cfg.server.ssl_cert}, Pokken not running.") + self.logger.error( + f"Could not find cert at {self.game_cfg.server.ssl_key} or key at {self.game_cfg.server.ssl_cert}, Pokken not running." + ) - def render_POST(self, request: Request, version: int = 0, endpoints: str = "") -> bytes: + def render_POST( + self, request: Request, version: int = 0, endpoints: str = "" + ) -> bytes: if endpoints == "": endpoints = request.uri.decode() if endpoints.startswith("/matching"): self.logger.info("Matching request") - + content = request.content.getvalue() if content == b"": self.logger.info("Empty request") @@ -113,7 +144,7 @@ class PokkenServlet(resource.Resource): return b"" endpoint = jackal_pb2.MessageType(pokken_request.type).name.lower() - + self.logger.info(f"{endpoint} request") handler = getattr(self.base, f"handle_{endpoint}", None) diff --git a/titles/pokken/proto/jackal_pb2.py b/titles/pokken/proto/jackal_pb2.py index 782403d..9a2e30e 100644 --- a/titles/pokken/proto/jackal_pb2.py +++ b/titles/pokken/proto/jackal_pb2.py @@ -6,134 +6,134 @@ from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database + # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() - - -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cjackal.proto\x12\x0fjackal.protobuf\"\xae\x0b\n\x07Request\x12*\n\x04type\x18\x01 \x02(\x0e\x32\x1c.jackal.protobuf.MessageType\x12.\n\x04noop\x18\x02 \x01(\x0b\x32 .jackal.protobuf.NoopRequestData\x12.\n\x04ping\x18\x03 \x01(\x0b\x32 .jackal.protobuf.PingRequestData\x12=\n\x0cregister_pcb\x18\x04 \x01(\x0b\x32\'.jackal.protobuf.RegisterPcbRequestData\x12\x35\n\x08save_ads\x18\x05 \x01(\x0b\x32#.jackal.protobuf.SaveAdsRequestData\x12\x46\n\x11\x63heck_access_code\x18\x06 \x01(\x0b\x32+.jackal.protobuf.CheckAccessCodeRequestData\x12\x46\n\x11set_bnpassid_lock\x18\x07 \x01(\x0b\x32+.jackal.protobuf.SetBnpassIdLockRequestData\x12\x37\n\tload_user\x18\x08 \x01(\x0b\x32$.jackal.protobuf.LoadUserRequestData\x12\x37\n\tsave_user\x18\n \x01(\x0b\x32$.jackal.protobuf.SaveUserRequestData\x12\x43\n\x0f\x63heck_diagnosis\x18\x0b \x01(\x0b\x32*.jackal.protobuf.CheckDiagnosisRequestData\x12\x42\n\x0fsave_client_log\x18\x0c \x01(\x0b\x32).jackal.protobuf.SaveClientLogRequestData\x12L\n\x14pre_load_information\x18\r \x01(\x0b\x32..jackal.protobuf.PreLoadInformationRequestData\x12\x45\n\x10load_information\x18\x0e \x01(\x0b\x32+.jackal.protobuf.LoadInformationRequestData\x12\x42\n\x0fpre_save_replay\x18\x0f \x01(\x0b\x32).jackal.protobuf.PreSaveReplayRequestData\x12;\n\x0bsave_replay\x18\x10 \x01(\x0b\x32&.jackal.protobuf.SaveReplayRequestData\x12;\n\x0bsave_charge\x18\x11 \x01(\x0b\x32&.jackal.protobuf.SaveChargeRequestData\x12?\n\rcheck_ranking\x18\x12 \x01(\x0b\x32(.jackal.protobuf.CheckRankingRequestData\x12=\n\x0cload_ranking\x18\x13 \x01(\x0b\x32\'.jackal.protobuf.LoadRankingRequestData\x12\x42\n\x0fsave_ingame_log\x18\x14 \x01(\x0b\x32).jackal.protobuf.SaveInGameLogRequestData\x12[\n\x1cpre_load_information_attract\x18\x15 \x01(\x0b\x32\x35.jackal.protobuf.PreLoadInformationAttractRequestData\x12T\n\x18load_information_attract\x18\x16 \x01(\x0b\x32\x32.jackal.protobuf.LoadInformationAttractRequestData\x12L\n\x14load_client_settings\x18\x17 \x01(\x0b\x32..jackal.protobuf.LoadClientSettingsRequestData\"\xd4\x0b\n\x08Response\x12*\n\x04type\x18\x01 \x02(\x0e\x32\x1c.jackal.protobuf.MessageType\x12\x0e\n\x06result\x18\x02 \x02(\r\x12/\n\x04noop\x18\x03 \x01(\x0b\x32!.jackal.protobuf.NoopResponseData\x12/\n\x04ping\x18\x04 \x01(\x0b\x32!.jackal.protobuf.PingResponseData\x12>\n\x0cregister_pcb\x18\x05 \x01(\x0b\x32(.jackal.protobuf.RegisterPcbResponseData\x12\x36\n\x08save_ads\x18\x06 \x01(\x0b\x32$.jackal.protobuf.SaveAdsResponseData\x12G\n\x11\x63heck_access_code\x18\x07 \x01(\x0b\x32,.jackal.protobuf.CheckAccessCodeResponseData\x12G\n\x11set_bnpassid_lock\x18\x08 \x01(\x0b\x32,.jackal.protobuf.SetBnpassIdLockResponseData\x12\x38\n\tload_user\x18\t \x01(\x0b\x32%.jackal.protobuf.LoadUserResponseData\x12\x38\n\tsave_user\x18\x0b \x01(\x0b\x32%.jackal.protobuf.SaveUserResponseData\x12\x44\n\x0f\x63heck_diagnosis\x18\x0c \x01(\x0b\x32+.jackal.protobuf.CheckDiagnosisResponseData\x12\x43\n\x0fsave_client_log\x18\r \x01(\x0b\x32*.jackal.protobuf.SaveClientLogResponseData\x12M\n\x14pre_load_information\x18\x0e \x01(\x0b\x32/.jackal.protobuf.PreLoadInformationResponseData\x12\x46\n\x10load_information\x18\x0f \x01(\x0b\x32,.jackal.protobuf.LoadInformationResponseData\x12\x43\n\x0fpre_save_replay\x18\x10 \x01(\x0b\x32*.jackal.protobuf.PreSaveReplayResponseData\x12<\n\x0bsave_replay\x18\x11 \x01(\x0b\x32\'.jackal.protobuf.SaveReplayResponseData\x12<\n\x0bsave_charge\x18\x12 \x01(\x0b\x32\'.jackal.protobuf.SaveChargeResponseData\x12@\n\rcheck_ranking\x18\x13 \x01(\x0b\x32).jackal.protobuf.CheckRankingResponseData\x12>\n\x0cload_ranking\x18\x14 \x01(\x0b\x32(.jackal.protobuf.LoadRankingResponseData\x12\x43\n\x0fsave_ingame_log\x18\x15 \x01(\x0b\x32*.jackal.protobuf.SaveInGameLogResponseData\x12\\\n\x1cpre_load_information_attract\x18\x16 \x01(\x0b\x32\x36.jackal.protobuf.PreLoadInformationAttractResponseData\x12U\n\x18load_information_attract\x18\x17 \x01(\x0b\x32\x33.jackal.protobuf.LoadInformationAttractResponseData\x12M\n\x14load_client_settings\x18\x18 \x01(\x0b\x32/.jackal.protobuf.LoadClientSettingsResponseData\"1\n\x0fNoopRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\"\x12\n\x10NoopResponseData\"1\n\x0fPingRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\"\x12\n\x10PingResponseData\"\xce\x02\n\x16RegisterPcbRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x10\n\x08pcb_type\x18\x02 \x02(\r\x12\x15\n\rlocation_name\x18\x03 \x02(\t\x12\x19\n\x11location_nickname\x18\x04 \x02(\t\x12\x11\n\tpref_code\x18\x05 \x01(\r\x12\r\n\x05\x61\x64\x64r0\x18\x06 \x01(\t\x12\r\n\x05\x61\x64\x64r1\x18\x07 \x01(\t\x12\r\n\x05\x61\x64\x64r2\x18\x08 \x01(\t\x12\r\n\x05\x61\x64\x64r3\x18\t \x01(\t\x12\x0e\n\x06loc_id\x18\n \x02(\t\x12\x14\n\x0c\x63ountry_code\x18\x0b \x02(\t\x12\x13\n\x0bregion_code\x18\x0c \x02(\r\x12\r\n\x05karma\x18\r \x02(\x05\x12\x0f\n\x07game_id\x18\x0e \x02(\t\x12\x10\n\x08game_ver\x18\x0f \x02(\t\x12\x10\n\x08\x64isk_ver\x18\x10 \x02(\t\x12\x12\n\nutc_offset\x18\x11 \x02(\x05\"\x85\x01\n\x17RegisterPcbResponseData\x12\x13\n\x0bserver_time\x18\x01 \x02(\r\x12\x15\n\roperate_start\x18\x02 \x01(\t\x12\x13\n\x0boperate_end\x18\x03 \x01(\t\x12\x13\n\x0b\x62np_baseuri\x18\x04 \x01(\t\x12\x14\n\x0c\x62iwa_setting\x18\x05 \x02(\t\"\xd7\x02\n\x12SaveAdsRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x17\n\x0f\x61\x64s_start_count\x18\x03 \x02(\r\x12\x16\n\x0e\x61\x64s_coin_count\x18\x04 \x02(\r\x12\x19\n\x11\x61\x64s_service_count\x18\x05 \x02(\r\x12\x1a\n\x12\x61\x64s_freeplay_count\x18\x06 \x02(\r\x12\x1a\n\x12\x61\x64s_operation_days\x18\x07 \x02(\r\x12\x1a\n\x12\x61\x64s_power_on_count\x18\x08 \x02(\r\x12\x46\n\rads_play_time\x18\t \x03(\x0b\x32/.jackal.protobuf.SaveAdsRequestData.AdsPlayTime\x1a\x39\n\x0b\x41\x64sPlayTime\x12\x12\n\npokemon_id\x18\x65 \x02(\r\x12\x16\n\x0e\x63harplay_count\x18\x66 \x02(\r\"\x15\n\x13SaveAdsResponseData\"M\n\x1a\x43heckAccessCodeRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x0f\n\x07\x63hip_id\x18\x03 \x02(\t\"M\n\x1b\x43heckAccessCodeResponseData\x12\x19\n\x11\x63ommidserv_result\x18\x01 \x02(\r\x12\x13\n\x0b\x61\x63\x63\x65ss_code\x18\x02 \x02(\t\"\xa4\x01\n\x1aSetBnpassIdLockRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x13\n\x0b\x62\x61napass_id\x18\x03 \x02(\r\x12\x13\n\x0b\x64\x65vice_type\x18\x04 \x02(\r\x12\x0f\n\x07\x63hip_id\x18\x05 \x02(\t\x12\x13\n\x0b\x61\x63\x63\x65ss_code\x18\x06 \x01(\t\x12\x16\n\x0e\x63\x61rd_lock_time\x18\x07 \x02(\r\"\x1d\n\x1bSetBnpassIdLockResponseData\"\x85\x01\n\x13LoadUserRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x13\n\x0b\x64\x65vice_type\x18\x03 \x02(\r\x12\x0f\n\x07\x63hip_id\x18\x04 \x02(\t\x12\x13\n\x0b\x61\x63\x63\x65ss_code\x18\x05 \x01(\t\x12\x13\n\x0b\x63\x61rd_status\x18\x06 \x02(\x08\"\xfc\x12\n\x14LoadUserResponseData\x12\x19\n\x11\x63ommidserv_result\x18\x01 \x02(\r\x12\x11\n\tload_hash\x18\x02 \x02(\r\x12\x17\n\x0f\x63\x61rdlock_status\x18\x03 \x02(\x08\x12\x13\n\x0b\x62\x61napass_id\x18\x04 \x02(\r\x12\x13\n\x0b\x61\x63\x63\x65ss_code\x18\x05 \x01(\t\x12\x15\n\rnew_card_flag\x18\x06 \x02(\x08\x12\x1e\n\x16precedent_release_flag\x18\x07 \x02(\r\x12\x18\n\x10navi_newbie_flag\x18\x08 \x02(\x08\x12\x18\n\x10navi_enable_flag\x18\t \x02(\x08\x12\x18\n\x10pad_vibrate_flag\x18\n \x02(\x08\x12\x18\n\x10home_region_code\x18\x0b \x02(\r\x12\x15\n\rhome_loc_name\x18\x0c \x02(\t\x12\x11\n\tpref_code\x18\r \x02(\r\x12\x14\n\x0ctrainer_name\x18\x0e \x01(\t\x12\x1a\n\x12trainer_rank_point\x18\x0f \x02(\r\x12\x0e\n\x06wallet\x18\x10 \x02(\r\x12\x13\n\x0b\x66ight_money\x18\x11 \x02(\r\x12\x13\n\x0bscore_point\x18\x12 \x02(\r\x12\x15\n\rgrade_max_num\x18\x13 \x02(\r\x12\x15\n\rextra_counter\x18\x14 \x01(\r\x12\x1e\n\x16tutorial_progress_flag\x18\x15 \x03(\r\x12\x17\n\x0ftotal_play_days\x18\x16 \x02(\r\x12\x16\n\x0eplay_date_time\x18\x17 \x02(\r\x12\x1a\n\x12lucky_box_fail_num\x18\x18 \x02(\r\x12\x1d\n\x15\x65vent_reward_get_flag\x18\x19 \x02(\r\x12\x14\n\x0crank_pvp_all\x18\x1a \x02(\r\x12\x14\n\x0crank_pvp_loc\x18\x1b \x02(\r\x12\x14\n\x0crank_cpu_all\x18\x1c \x02(\r\x12\x14\n\x0crank_cpu_loc\x18\x1d \x02(\r\x12\x12\n\nrank_event\x18\x1e \x02(\r\x12\x11\n\tawake_num\x18\x1f \x02(\r\x12\x17\n\x0fuse_support_num\x18 \x02(\r\x12\x16\n\x0erankmatch_flag\x18! \x02(\r\x12\x1a\n\x12rankmatch_progress\x18\" \x03(\r\x12\x15\n\rrankmatch_max\x18# \x01(\r\x12\x19\n\x11rankmatch_success\x18$ \x01(\r\x12\x10\n\x08\x62\x65\x61t_num\x18% \x01(\x05\x12\x15\n\rtitle_text_id\x18& \x02(\r\x12\x16\n\x0etitle_plate_id\x18\' \x02(\r\x12\x1b\n\x13title_decoration_id\x18( \x02(\r\x12\x1c\n\x14support_pokemon_list\x18) \x03(\r\x12\x15\n\rsupport_set_1\x18* \x03(\r\x12\x15\n\rsupport_set_2\x18+ \x03(\r\x12\x15\n\rsupport_set_3\x18, \x03(\r\x12\x14\n\x0cnavi_trainer\x18- \x02(\r\x12\x17\n\x0fnavi_version_id\x18. \x02(\r\x12\x16\n\x0e\x61id_skill_list\x18/ \x03(\r\x12\x11\n\taid_skill\x18\x30 \x02(\r\x12\x17\n\x0f\x63omment_text_id\x18\x31 \x02(\r\x12\x17\n\x0f\x63omment_word_id\x18\x32 \x02(\r\x12\x1a\n\x12latest_use_pokemon\x18\x33 \x02(\r\x12\x11\n\tex_ko_num\x18\x34 \x02(\r\x12\x0f\n\x07wko_num\x18\x35 \x02(\r\x12\x16\n\x0etimeup_win_num\x18\x36 \x02(\r\x12\x13\n\x0b\x63ool_ko_num\x18\x37 \x02(\r\x12\x16\n\x0eperfect_ko_num\x18\x38 \x02(\r\x12\x13\n\x0brecord_flag\x18\x39 \x02(\r\x12\x1c\n\x14site_register_status\x18: \x02(\r\x12\x14\n\x0c\x63ontinue_num\x18; \x02(\r\x12\x18\n\x10\x61\x63hievement_flag\x18< \x03(\r\x12\x13\n\x0b\x61vatar_body\x18= \x01(\r\x12\x15\n\ravatar_gender\x18> \x01(\r\x12\x19\n\x11\x61vatar_background\x18? \x01(\r\x12\x13\n\x0b\x61vatar_head\x18@ \x01(\r\x12\x1a\n\x12\x61vatar_battleglass\x18\x41 \x01(\r\x12\x14\n\x0c\x61vatar_face0\x18\x42 \x01(\r\x12\x14\n\x0c\x61vatar_face1\x18\x43 \x01(\r\x12\x14\n\x0c\x61vatar_face2\x18\x44 \x01(\r\x12\x16\n\x0e\x61vatar_bodyall\x18\x45 \x01(\r\x12\x13\n\x0b\x61vatar_wear\x18\x46 \x01(\r\x12\x18\n\x10\x61vatar_accessory\x18G \x01(\r\x12\x14\n\x0c\x61vatar_stamp\x18H \x01(\r\x12G\n\x0cpokemon_data\x18I \x03(\x0b\x32\x31.jackal.protobuf.LoadUserResponseData.PokemonData\x12\x13\n\x0b\x65vent_state\x18J \x02(\r\x12\x10\n\x08\x65vent_id\x18K \x02(\r\x12\x1e\n\x16sp_bonus_category_id_1\x18L \x02(\r\x12\x1c\n\x14sp_bonus_key_value_1\x18M \x02(\r\x12\x1e\n\x16sp_bonus_category_id_2\x18N \x02(\r\x12\x1c\n\x14sp_bonus_key_value_2\x18O \x02(\r\x12\x1a\n\x12last_play_event_id\x18P \x01(\r\x12\x1e\n\x16\x65vent_achievement_flag\x18Q \x03(\r\x12\x1f\n\x17\x65vent_achievement_param\x18R \x03(\r\x1a\xf0\x02\n\x0bPokemonData\x12\x0f\n\x07\x63har_id\x18\x65 \x02(\r\x12\x1c\n\x14illustration_book_no\x18\x66 \x02(\r\x12\x13\n\x0bpokemon_exp\x18g \x02(\r\x12\x19\n\x11\x62\x61ttle_num_vs_wan\x18h \x02(\r\x12\x12\n\nwin_vs_wan\x18i \x02(\r\x12\x19\n\x11\x62\x61ttle_num_vs_lan\x18j \x02(\r\x12\x12\n\nwin_vs_lan\x18k \x02(\r\x12\x19\n\x11\x62\x61ttle_num_vs_cpu\x18l \x02(\r\x12\x0f\n\x07win_cpu\x18m \x02(\r\x12\x1f\n\x17\x62\x61ttle_all_num_tutorial\x18n \x02(\r\x12\x1b\n\x13\x62\x61ttle_num_tutorial\x18o \x02(\r\x12\x14\n\x0c\x62p_point_atk\x18p \x02(\r\x12\x14\n\x0c\x62p_point_res\x18q \x02(\r\x12\x14\n\x0c\x62p_point_def\x18r \x02(\r\x12\x13\n\x0b\x62p_point_sp\x18s \x02(\r\"\x98\x0c\n\x13SaveUserRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x13\n\x0b\x62\x61napass_id\x18\x03 \x02(\r\x12\x1e\n\x16get_trainer_rank_point\x18\x04 \x01(\x05\x12\x11\n\tget_money\x18\x05 \x02(\r\x12\x17\n\x0fget_score_point\x18\x06 \x01(\r\x12\x15\n\rgrade_max_num\x18\x07 \x01(\r\x12\x15\n\rextra_counter\x18\x08 \x01(\r\x12\x1e\n\x16tutorial_progress_flag\x18\t \x03(\r\x12\x1d\n\x15\x65vent_reward_get_flag\x18\n \x01(\r\x12\x14\n\x0c\x63ontinue_num\x18\x0b \x02(\r\x12\x17\n\x0ftotal_play_days\x18\x0c \x02(\r\x12\x18\n\x10\x61\x63hievement_flag\x18\r \x03(\r\x12\x11\n\tawake_num\x18\x0e \x02(\r\x12\x17\n\x0fuse_support_num\x18\x0f \x02(\r\x12\x16\n\x0erankmatch_flag\x18\x10 \x02(\r\x12\x1a\n\x12rank_match_process\x18\x11 \x03(\r\x12\x16\n\x0erank_match_max\x18\x12 \x01(\r\x12\x1a\n\x12rank_match_success\x18\x13 \x01(\r\x12\x10\n\x08\x62\x65\x61t_num\x18\x14 \x01(\x05\x12\x15\n\rsupport_set_1\x18\x15 \x03(\r\x12\x15\n\rsupport_set_2\x18\x16 \x03(\r\x12\x15\n\rsupport_set_3\x18\x17 \x03(\r\x12\x44\n\x0b\x62\x61ttle_data\x18\x18 \x02(\x0b\x32/.jackal.protobuf.SaveUserRequestData.BattleData\x12\x46\n\x0cpokemon_data\x18\x19 \x02(\x0b\x32\x30.jackal.protobuf.SaveUserRequestData.PokemonData\x12\x1c\n\x14trainer_name_pending\x18\x1a \x01(\t\x12\x15\n\ravatar_gender\x18\x1b \x01(\r\x12\x15\n\rcontinue_flag\x18\x1c \x02(\x08\x12\x14\n\x0creq_sendtime\x18\x1d \x02(\r\x12\x15\n\rplay_all_time\x18\x1e \x02(\r\x12\x11\n\tload_hash\x18\x1f \x02(\r\x12\x44\n\x0breward_data\x18 \x03(\x0b\x32/.jackal.protobuf.SaveUserRequestData.RewardData\x12\x13\n\x0b\x65vent_state\x18! \x01(\r\x12\x11\n\taid_skill\x18\" \x01(\r\x12\x1a\n\x12last_play_event_id\x18# \x01(\r\x12\x1e\n\x16\x65vent_achievement_flag\x18$ \x03(\r\x12\x1f\n\x17\x65vent_achievement_param\x18% \x03(\r\x1a\xec\x01\n\nBattleData\x12\x11\n\tplay_mode\x18\x65 \x03(\r\x12\x0e\n\x06result\x18\x66 \x03(\r\x12\x11\n\tex_ko_num\x18g \x02(\r\x12\x0f\n\x07wko_num\x18h \x02(\r\x12\x16\n\x0etimeup_win_num\x18i \x02(\r\x12\x13\n\x0b\x63ool_ko_num\x18j \x02(\r\x12\x16\n\x0eperfect_ko_num\x18k \x02(\r\x12\x10\n\x08use_navi\x18l \x02(\r\x12\x16\n\x0euse_navi_cloth\x18m \x02(\r\x12\x15\n\ruse_aid_skill\x18n \x02(\r\x12\x11\n\tplay_date\x18o \x02(\r\x1a\xb3\x01\n\x0bPokemonData\x12\x10\n\x07\x63har_id\x18\xc9\x01 \x02(\r\x12\x1d\n\x14illustration_book_no\x18\xca\x01 \x02(\r\x12\x18\n\x0fget_pokemon_exp\x18\xcb\x01 \x02(\r\x12\x15\n\x0c\x62p_point_atk\x18\xcc\x01 \x02(\r\x12\x15\n\x0c\x62p_point_res\x18\xcd\x01 \x02(\r\x12\x15\n\x0c\x62p_point_def\x18\xce\x01 \x02(\r\x12\x14\n\x0b\x62p_point_sp\x18\xcf\x01 \x02(\r\x1aU\n\nRewardData\x12\x18\n\x0fget_category_id\x18\xad\x02 \x02(\r\x12\x17\n\x0eget_content_id\x18\xae\x02 \x02(\r\x12\x14\n\x0bget_type_id\x18\xaf\x02 \x02(\r\"\x16\n\x14SaveUserResponseData\";\n\x19\x43heckDiagnosisRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\"\x95\x02\n\x1a\x43heckDiagnosisResponseData\x12Q\n\x0e\x64iagnosis_data\x18\x01 \x03(\x0b\x32\x39.jackal.protobuf.CheckDiagnosisResponseData.DiagnosisData\x1a\xa3\x01\n\rDiagnosisData\x12\x14\n\x0crequest_type\x18\x65 \x02(\r\x12\x17\n\x0f\x63onnect_timeout\x18\x66 \x02(\r\x12\x14\n\x0csend_timeout\x18g \x02(\r\x12\x17\n\x0freceive_timeout\x18h \x02(\r\x12\x1c\n\x14retry_time_of_number\x18i \x02(\r\x12\x16\n\x0eretry_interval\x18j \x02(\r\"\xf4\x01\n\x18SaveClientLogRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x11\n\tserial_id\x18\x03 \x02(\r\x12\x14\n\x0creq_sendtime\x18\x04 \x02(\r\x12\r\n\x05karma\x18\x05 \x02(\x05\x12\x14\n\x0crequest_type\x18\x06 \x02(\r\x12\x1f\n\x17request_number_of_times\x18\x07 \x02(\r\x12\x1f\n\x17timeout_number_of_times\x18\x08 \x02(\r\x12\x11\n\tretry_max\x18\t \x02(\r\x12\x15\n\rresponse_time\x18\n \x02(\r\"\x1b\n\x19SaveClientLogResponseData\"V\n\x1dPreLoadInformationRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x15\n\rinfo_small_id\x18\x03 \x02(\r\"\xc9\x01\n\x1ePreLoadInformationResponseData\x12\x15\n\rinfo_small_id\x18\x01 \x02(\r\x12\x13\n\x0bregion_code\x18\x02 \x02(\r\x12\x12\n\nsession_id\x18\x03 \x02(\r\x12\x13\n\x0b\x62lock_total\x18\x04 \x02(\r\x12\x12\n\nblock_size\x18\x05 \x02(\r\x12\x10\n\x08interval\x18\x06 \x02(\r\x12\x16\n\x0einfo_data_size\x18\x07 \x02(\r\x12\x14\n\x0cinfo_data_id\x18\x08 \x02(\r\"v\n\x1aLoadInformationRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x15\n\rinfo_small_id\x18\x03 \x02(\r\x12\x12\n\nsession_id\x18\x04 \x02(\r\x12\r\n\x05\x62lock\x18\x05 \x02(\r\"\x96\x01\n\x1bLoadInformationResponseData\x12\x15\n\rinfo_small_id\x18\x01 \x02(\r\x12\x12\n\nstart_date\x18\x02 \x02(\r\x12\x10\n\x08\x65nd_date\x18\x03 \x02(\r\x12\r\n\x05\x62lock\x18\x04 \x02(\r\x12\x13\n\x0b\x62lock_total\x18\x05 \x02(\r\x12\x16\n\x0einfo_data_body\x18\x06 \x02(\x0c\"\x80\x01\n\x18PreSaveReplayRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x13\n\x0bregion_code\x18\x03 \x02(\r\x12\x15\n\rcategory_code\x18\x04 \x02(\r\x12\x18\n\x10replay_data_size\x18\x05 \x02(\r\"j\n\x19PreSaveReplayResponseData\x12\x12\n\nsession_id\x18\x01 \x02(\r\x12\x13\n\x0b\x62lock_total\x18\x02 \x02(\r\x12\x12\n\nblock_size\x18\x03 \x02(\r\x12\x10\n\x08interval\x18\x04 \x02(\r\"\x82\x02\n\x15SaveReplayRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x13\n\x0b\x62\x61napass_id\x18\x03 \x02(\r\x12\x12\n\npokemon_id\x18\x04 \x02(\r\x12\x17\n\x0ftrainer_rank_id\x18\x05 \x02(\r\x12\x13\n\x0bregion_code\x18\x06 \x02(\r\x12\x12\n\nsession_id\x18\x07 \x02(\r\x12\r\n\x05\x62lock\x18\x08 \x02(\r\x12\x1b\n\x13transfer_completion\x18\t \x02(\r\x12\x18\n\x10replay_data_size\x18\n \x02(\r\x12\x18\n\x10replay_data_body\x18\x0b \x02(\x0c\"\x18\n\x16SaveReplayResponseData\"\x8d\x01\n\x15SaveChargeRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x0f\n\x07game_id\x18\x03 \x02(\t\x12\x19\n\x11\x63harge_data_index\x18\x04 \x02(\t\x12\x13\n\x0b\x63harge_type\x18\x05 \x02(\r\x12\x13\n\x0b\x63harge_time\x18\x06 \x02(\r\"N\n\x16SaveChargeResponseData\x12\x19\n\x11\x63harge_error_code\x18\x01 \x02(\r\x12\x19\n\x11\x63harge_data_index\x18\x02 \x02(\t\"u\n\x17\x43heckRankingRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x13\n\x0bregion_code\x18\x03 \x02(\r\x12\x12\n\nranking_id\x18\x04 \x02(\r\x12\x11\n\ttimestamp\x18\x05 \x02(\r\".\n\x18\x43heckRankingResponseData\x12\x12\n\nranking_id\x18\x01 \x02(\r\"a\n\x16LoadRankingRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x13\n\x0bregion_code\x18\x03 \x02(\r\x12\x12\n\nranking_id\x18\x04 \x02(\r\"\xbd\x08\n\x17LoadRankingResponseData\x12\x12\n\nranking_id\x18\x01 \x02(\r\x12\x15\n\rranking_start\x18\x02 \x02(\r\x12\x13\n\x0branking_end\x18\x03 \x02(\r\x12\x11\n\tevent_end\x18\x04 \x02(\x08\x12J\n\x0ctrainer_data\x18\x05 \x03(\x0b\x32\x34.jackal.protobuf.LoadRankingResponseData.TrainerData\x12\x13\n\x0bmodify_date\x18\x06 \x02(\r\x12\x13\n\x0b\x65vent_state\x18\x07 \x01(\r\x1a\xd8\x06\n\x0bTrainerData\x12\x14\n\x0ctrainer_name\x18\x65 \x02(\t\x12\x1a\n\x12trainer_rank_point\x18\x66 \x02(\r\x12\r\n\x05point\x18g \x02(\r\x12\x13\n\x0brecord_flag\x18h \x02(\r\x12\x18\n\x10\x66\x61vorite_pokemon\x18i \x02(\r\x12\x12\n\nwin_vs_wan\x18j \x02(\r\x12\x19\n\x11\x62\x61ttle_num_vs_wan\x18k \x02(\r\x12\x12\n\nwin_vs_cpu\x18l \x02(\r\x12\x19\n\x11\x62\x61ttle_num_vs_cpu\x18m \x02(\r\x12\x15\n\rtitle_text_id\x18n \x02(\r\x12\x16\n\x0etitle_plate_id\x18o \x02(\r\x12\x1b\n\x13title_decoration_id\x18p \x02(\r\x12\x17\n\x0f\x63omment_text_id\x18q \x02(\r\x12\x17\n\x0f\x63omment_word_id\x18r \x02(\r\x12\x10\n\x08loc_name\x18s \x02(\t\x12\x11\n\tpref_code\x18t \x02(\r\x12\x10\n\x08rank_num\x18u \x02(\r\x12\x15\n\rlast_rank_num\x18v \x02(\r\x12\x0e\n\x06updown\x18w \x02(\r\x12\x12\n\npokemon_id\x18x \x02(\r\x12\x13\n\x0bpokemon_exp\x18y \x02(\r\x12\x14\n\x0c\x62p_point_atk\x18z \x02(\r\x12\x14\n\x0c\x62p_point_res\x18{ \x02(\r\x12\x14\n\x0c\x62p_point_def\x18| \x02(\r\x12\x13\n\x0b\x62p_point_sp\x18} \x02(\r\x12\x13\n\x0b\x61vatar_body\x18~ \x02(\r\x12\x15\n\ravatar_gender\x18\x7f \x02(\r\x12\x1a\n\x11\x61vatar_background\x18\x80\x01 \x02(\r\x12\x14\n\x0b\x61vatar_head\x18\x81\x01 \x02(\r\x12\x1b\n\x12\x61vatar_battleglass\x18\x82\x01 \x02(\r\x12\x15\n\x0c\x61vatar_face0\x18\x83\x01 \x02(\r\x12\x15\n\x0c\x61vatar_face1\x18\x84\x01 \x02(\r\x12\x15\n\x0c\x61vatar_face2\x18\x85\x01 \x02(\r\x12\x17\n\x0e\x61vatar_bodyall\x18\x86\x01 \x02(\r\x12\x14\n\x0b\x61vatar_wear\x18\x87\x01 \x02(\r\x12\x19\n\x10\x61vatar_accessory\x18\x88\x01 \x02(\r\x12\x15\n\x0c\x61vatar_stamp\x18\x89\x01 \x02(\r\"h\n\x18SaveInGameLogRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x13\n\x0bin_game_log\x18\x03 \x02(\x0c\x12\x17\n\x0flog_change_time\x18\x04 \x02(\r\"\x1b\n\x19SaveInGameLogResponseData\"]\n$PreLoadInformationAttractRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x15\n\rinfo_large_id\x18\x03 \x02(\r\"\xd0\x01\n%PreLoadInformationAttractResponseData\x12\x15\n\rinfo_large_id\x18\x01 \x02(\r\x12\x13\n\x0bregion_code\x18\x02 \x02(\r\x12\x12\n\nsession_id\x18\x03 \x02(\r\x12\x13\n\x0b\x62lock_total\x18\x04 \x02(\r\x12\x12\n\nblock_size\x18\x05 \x02(\r\x12\x10\n\x08interval\x18\x06 \x02(\r\x12\x16\n\x0einfo_data_size\x18\x07 \x02(\r\x12\x14\n\x0cinfo_data_id\x18\x08 \x02(\r\"}\n!LoadInformationAttractRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x15\n\rinfo_large_id\x18\x03 \x02(\r\x12\x12\n\nsession_id\x18\x04 \x02(\r\x12\r\n\x05\x62lock\x18\x05 \x02(\r\"\x9d\x01\n\"LoadInformationAttractResponseData\x12\x15\n\rinfo_large_id\x18\x01 \x02(\r\x12\x12\n\nstart_date\x18\x02 \x02(\r\x12\x10\n\x08\x65nd_date\x18\x03 \x02(\r\x12\r\n\x05\x62lock\x18\x04 \x02(\r\x12\x13\n\x0b\x62lock_total\x18\x05 \x02(\r\x12\x16\n\x0einfo_data_body\x18\x06 \x02(\x0c\"?\n\x1dLoadClientSettingsRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\"\x8d\x10\n\x1eLoadClientSettingsResponseData\x12\x1b\n\x13money_magnification\x18\x01 \x02(\r\x12!\n\x19\x64m2_probability_single100\x18\x02 \x03(\r\x12\x1a\n\x12\x63ontinue_bonus_exp\x18\x03 \x02(\r\x12\x1c\n\x14\x63ontinue_fight_money\x18\x04 \x02(\r\x12\x17\n\x0f\x65vent_bonus_exp\x18\x05 \x02(\r\x12\x11\n\tlevel_cap\x18\x06 \x02(\r\x12\x15\n\rop_movie_flag\x18\x07 \x02(\r\x12M\n\nevent_info\x18\x08 \x03(\x0b\x32\x39.jackal.protobuf.LoadClientSettingsResponseData.EventInfo\x12O\n\x0b\x62\x61nner_info\x18\t \x03(\x0b\x32:.jackal.protobuf.LoadClientSettingsResponseData.BannerInfo\x12Q\n\x0c\x61ttract_info\x18\n \x03(\x0b\x32;.jackal.protobuf.LoadClientSettingsResponseData.AttractInfo\x12O\n\x0binfo_window\x18\x0b \x03(\x0b\x32:.jackal.protobuf.LoadClientSettingsResponseData.InfoWindow\x12\x18\n\x10lucky_bonus_rate\x18\x0c \x02(\r\x12\x18\n\x10\x66\x61il_support_num\x18\r \x02(\r\x12O\n\x0blucky_bonus\x18\x0e \x03(\x0b\x32:.jackal.protobuf.LoadClientSettingsResponseData.LuckyBonus\x12S\n\rspecial_bonus\x18\x0f \x03(\x0b\x32<.jackal.protobuf.LoadClientSettingsResponseData.SpecialBonus\x12\x17\n\x0f\x63hara_open_flag\x18\x10 \x02(\r\x12\x17\n\x0f\x63hara_open_date\x18\x11 \x02(\r\x12\x1b\n\x13\x63hara_pre_open_date\x18\x12 \x02(\r\x12\x11\n\tsearch_id\x18\x13 \x02(\r\x12\x16\n\x0e\x63lient_version\x18\x14 \x01(\t\x12!\n\x19\x63lient_version_start_date\x18\x15 \x01(\r\x1a\xe0\x01\n\tEventInfo\x12\x13\n\x0b\x65vent_state\x18\x65 \x02(\r\x12\x10\n\x08\x65vent_id\x18\x66 \x02(\r\x12\x1e\n\x16sp_bonus_category_id_1\x18g \x02(\r\x12\x1c\n\x14sp_bonus_key_value_1\x18h \x02(\r\x12\x1e\n\x16sp_bonus_category_id_2\x18i \x02(\r\x12\x1c\n\x14sp_bonus_key_value_2\x18j \x02(\r\x12\x18\n\x10\x65vent_start_date\x18k \x02(\r\x12\x16\n\x0e\x65vent_end_date\x18l \x02(\r\x1a\xa2\x01\n\nBannerInfo\x12\x1a\n\x11\x62\x61nner_start_date\x18\xc9\x01 \x02(\r\x12\x18\n\x0f\x62\x61nner_end_date\x18\xca\x01 \x02(\r\x12\x12\n\tbanner_id\x18\xcb\x01 \x02(\r\x12\x15\n\x0c\x62\x61nner_title\x18\xcc\x01 \x02(\t\x12\x18\n\x0f\x62\x61nner_sub_info\x18\xcd\x01 \x02(\t\x12\x19\n\x10\x62\x61nner_term_info\x18\xce\x01 \x02(\t\x1a\x84\x02\n\x0b\x41ttractInfo\x12 \n\x17\x61ttract_info_start_date\x18\xad\x02 \x02(\r\x12\x1e\n\x15\x61ttract_info_end_date\x18\xae\x02 \x02(\r\x12\x18\n\x0f\x61ttract_info_id\x18\xaf\x02 \x02(\r\x12\x1b\n\x12\x61ttract_info_title\x18\xb0\x02 \x02(\t\x12\x1e\n\x15\x61ttract_info_sub_info\x18\xb1\x02 \x02(\t\x12 \n\x17\x61ttract_info_start_info\x18\xb2\x02 \x02(\t\x12\x1e\n\x15\x61ttract_info_end_info\x18\xb3\x02 \x02(\t\x12\x1a\n\x11\x61ttract_info_text\x18\xb4\x02 \x02(\t\x1a\xfb\x01\n\nInfoWindow\x12\x1f\n\x16info_window_start_date\x18\x91\x03 \x02(\r\x12\x1d\n\x14info_window_end_date\x18\x92\x03 \x02(\r\x12\x17\n\x0einfo_window_id\x18\x93\x03 \x02(\r\x12\x1a\n\x11info_window_title\x18\x94\x03 \x02(\t\x12\x1d\n\x14info_window_sub_info\x18\x95\x03 \x02(\t\x12\x1f\n\x16info_window_start_info\x18\x96\x03 \x02(\t\x12\x1d\n\x14info_window_end_info\x18\x97\x03 \x02(\t\x12\x19\n\x10info_window_text\x18\x98\x03 \x02(\t\x1an\n\nLuckyBonus\x12 \n\x17lucky_bonus_category_id\x18\xf5\x03 \x02(\r\x12\x1c\n\x13lucky_bonus_data_id\x18\xf6\x03 \x02(\r\x12 \n\x17lucky_bonus_probability\x18\xf7\x03 \x02(\r\x1av\n\x0cSpecialBonus\x12\"\n\x19special_bonus_category_id\x18\xd9\x04 \x02(\r\x12\x1e\n\x15special_bonus_data_id\x18\xda\x04 \x02(\r\x12\"\n\x19special_bonus_probability\x18\xdb\x04 \x02(\r*\xb2\x03\n\x0bMessageType\x12\x08\n\x04NOOP\x10\x00\x12\x08\n\x04PING\x10\x01\x12\x10\n\x0cREGISTER_PCB\x10\x02\x12\x0c\n\x08SAVE_ADS\x10\x03\x12\x15\n\x11\x43HECK_ACCESS_CODE\x10\x04\x12\x15\n\x11SET_BNPASSID_LOCK\x10\x05\x12\r\n\tLOAD_USER\x10\x06\x12\r\n\tSAVE_USER\x10\t\x12\x13\n\x0f\x43HECK_DIAGNOSIS\x10\n\x12\x13\n\x0fSAVE_CLIENT_LOG\x10\x0b\x12\x18\n\x14PRE_LOAD_INFORMATION\x10\x0c\x12\x14\n\x10LOAD_INFORMATION\x10\r\x12\x13\n\x0fPRE_SAVE_REPLAY\x10\x0e\x12\x0f\n\x0bSAVE_REPLAY\x10\x0f\x12\x0f\n\x0bSAVE_CHARGE\x10\x10\x12\x11\n\rCHECK_RANKING\x10\x11\x12\x10\n\x0cLOAD_RANKING\x10\x12\x12\x13\n\x0fSAVE_INGAME_LOG\x10\x13\x12 \n\x1cPRE_LOAD_INFORMATION_ATTRACT\x10\x14\x12\x1c\n\x18LOAD_INFORMATION_ATTRACT\x10\x15\x12\x18\n\x14LOAD_CLIENT_SETTINGS\x10\x16') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile( + b'\n\x0cjackal.proto\x12\x0fjackal.protobuf"\xae\x0b\n\x07Request\x12*\n\x04type\x18\x01 \x02(\x0e\x32\x1c.jackal.protobuf.MessageType\x12.\n\x04noop\x18\x02 \x01(\x0b\x32 .jackal.protobuf.NoopRequestData\x12.\n\x04ping\x18\x03 \x01(\x0b\x32 .jackal.protobuf.PingRequestData\x12=\n\x0cregister_pcb\x18\x04 \x01(\x0b\x32\'.jackal.protobuf.RegisterPcbRequestData\x12\x35\n\x08save_ads\x18\x05 \x01(\x0b\x32#.jackal.protobuf.SaveAdsRequestData\x12\x46\n\x11\x63heck_access_code\x18\x06 \x01(\x0b\x32+.jackal.protobuf.CheckAccessCodeRequestData\x12\x46\n\x11set_bnpassid_lock\x18\x07 \x01(\x0b\x32+.jackal.protobuf.SetBnpassIdLockRequestData\x12\x37\n\tload_user\x18\x08 \x01(\x0b\x32$.jackal.protobuf.LoadUserRequestData\x12\x37\n\tsave_user\x18\n \x01(\x0b\x32$.jackal.protobuf.SaveUserRequestData\x12\x43\n\x0f\x63heck_diagnosis\x18\x0b \x01(\x0b\x32*.jackal.protobuf.CheckDiagnosisRequestData\x12\x42\n\x0fsave_client_log\x18\x0c \x01(\x0b\x32).jackal.protobuf.SaveClientLogRequestData\x12L\n\x14pre_load_information\x18\r \x01(\x0b\x32..jackal.protobuf.PreLoadInformationRequestData\x12\x45\n\x10load_information\x18\x0e \x01(\x0b\x32+.jackal.protobuf.LoadInformationRequestData\x12\x42\n\x0fpre_save_replay\x18\x0f \x01(\x0b\x32).jackal.protobuf.PreSaveReplayRequestData\x12;\n\x0bsave_replay\x18\x10 \x01(\x0b\x32&.jackal.protobuf.SaveReplayRequestData\x12;\n\x0bsave_charge\x18\x11 \x01(\x0b\x32&.jackal.protobuf.SaveChargeRequestData\x12?\n\rcheck_ranking\x18\x12 \x01(\x0b\x32(.jackal.protobuf.CheckRankingRequestData\x12=\n\x0cload_ranking\x18\x13 \x01(\x0b\x32\'.jackal.protobuf.LoadRankingRequestData\x12\x42\n\x0fsave_ingame_log\x18\x14 \x01(\x0b\x32).jackal.protobuf.SaveInGameLogRequestData\x12[\n\x1cpre_load_information_attract\x18\x15 \x01(\x0b\x32\x35.jackal.protobuf.PreLoadInformationAttractRequestData\x12T\n\x18load_information_attract\x18\x16 \x01(\x0b\x32\x32.jackal.protobuf.LoadInformationAttractRequestData\x12L\n\x14load_client_settings\x18\x17 \x01(\x0b\x32..jackal.protobuf.LoadClientSettingsRequestData"\xd4\x0b\n\x08Response\x12*\n\x04type\x18\x01 \x02(\x0e\x32\x1c.jackal.protobuf.MessageType\x12\x0e\n\x06result\x18\x02 \x02(\r\x12/\n\x04noop\x18\x03 \x01(\x0b\x32!.jackal.protobuf.NoopResponseData\x12/\n\x04ping\x18\x04 \x01(\x0b\x32!.jackal.protobuf.PingResponseData\x12>\n\x0cregister_pcb\x18\x05 \x01(\x0b\x32(.jackal.protobuf.RegisterPcbResponseData\x12\x36\n\x08save_ads\x18\x06 \x01(\x0b\x32$.jackal.protobuf.SaveAdsResponseData\x12G\n\x11\x63heck_access_code\x18\x07 \x01(\x0b\x32,.jackal.protobuf.CheckAccessCodeResponseData\x12G\n\x11set_bnpassid_lock\x18\x08 \x01(\x0b\x32,.jackal.protobuf.SetBnpassIdLockResponseData\x12\x38\n\tload_user\x18\t \x01(\x0b\x32%.jackal.protobuf.LoadUserResponseData\x12\x38\n\tsave_user\x18\x0b \x01(\x0b\x32%.jackal.protobuf.SaveUserResponseData\x12\x44\n\x0f\x63heck_diagnosis\x18\x0c \x01(\x0b\x32+.jackal.protobuf.CheckDiagnosisResponseData\x12\x43\n\x0fsave_client_log\x18\r \x01(\x0b\x32*.jackal.protobuf.SaveClientLogResponseData\x12M\n\x14pre_load_information\x18\x0e \x01(\x0b\x32/.jackal.protobuf.PreLoadInformationResponseData\x12\x46\n\x10load_information\x18\x0f \x01(\x0b\x32,.jackal.protobuf.LoadInformationResponseData\x12\x43\n\x0fpre_save_replay\x18\x10 \x01(\x0b\x32*.jackal.protobuf.PreSaveReplayResponseData\x12<\n\x0bsave_replay\x18\x11 \x01(\x0b\x32\'.jackal.protobuf.SaveReplayResponseData\x12<\n\x0bsave_charge\x18\x12 \x01(\x0b\x32\'.jackal.protobuf.SaveChargeResponseData\x12@\n\rcheck_ranking\x18\x13 \x01(\x0b\x32).jackal.protobuf.CheckRankingResponseData\x12>\n\x0cload_ranking\x18\x14 \x01(\x0b\x32(.jackal.protobuf.LoadRankingResponseData\x12\x43\n\x0fsave_ingame_log\x18\x15 \x01(\x0b\x32*.jackal.protobuf.SaveInGameLogResponseData\x12\\\n\x1cpre_load_information_attract\x18\x16 \x01(\x0b\x32\x36.jackal.protobuf.PreLoadInformationAttractResponseData\x12U\n\x18load_information_attract\x18\x17 \x01(\x0b\x32\x33.jackal.protobuf.LoadInformationAttractResponseData\x12M\n\x14load_client_settings\x18\x18 \x01(\x0b\x32/.jackal.protobuf.LoadClientSettingsResponseData"1\n\x0fNoopRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t"\x12\n\x10NoopResponseData"1\n\x0fPingRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t"\x12\n\x10PingResponseData"\xce\x02\n\x16RegisterPcbRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x10\n\x08pcb_type\x18\x02 \x02(\r\x12\x15\n\rlocation_name\x18\x03 \x02(\t\x12\x19\n\x11location_nickname\x18\x04 \x02(\t\x12\x11\n\tpref_code\x18\x05 \x01(\r\x12\r\n\x05\x61\x64\x64r0\x18\x06 \x01(\t\x12\r\n\x05\x61\x64\x64r1\x18\x07 \x01(\t\x12\r\n\x05\x61\x64\x64r2\x18\x08 \x01(\t\x12\r\n\x05\x61\x64\x64r3\x18\t \x01(\t\x12\x0e\n\x06loc_id\x18\n \x02(\t\x12\x14\n\x0c\x63ountry_code\x18\x0b \x02(\t\x12\x13\n\x0bregion_code\x18\x0c \x02(\r\x12\r\n\x05karma\x18\r \x02(\x05\x12\x0f\n\x07game_id\x18\x0e \x02(\t\x12\x10\n\x08game_ver\x18\x0f \x02(\t\x12\x10\n\x08\x64isk_ver\x18\x10 \x02(\t\x12\x12\n\nutc_offset\x18\x11 \x02(\x05"\x85\x01\n\x17RegisterPcbResponseData\x12\x13\n\x0bserver_time\x18\x01 \x02(\r\x12\x15\n\roperate_start\x18\x02 \x01(\t\x12\x13\n\x0boperate_end\x18\x03 \x01(\t\x12\x13\n\x0b\x62np_baseuri\x18\x04 \x01(\t\x12\x14\n\x0c\x62iwa_setting\x18\x05 \x02(\t"\xd7\x02\n\x12SaveAdsRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x17\n\x0f\x61\x64s_start_count\x18\x03 \x02(\r\x12\x16\n\x0e\x61\x64s_coin_count\x18\x04 \x02(\r\x12\x19\n\x11\x61\x64s_service_count\x18\x05 \x02(\r\x12\x1a\n\x12\x61\x64s_freeplay_count\x18\x06 \x02(\r\x12\x1a\n\x12\x61\x64s_operation_days\x18\x07 \x02(\r\x12\x1a\n\x12\x61\x64s_power_on_count\x18\x08 \x02(\r\x12\x46\n\rads_play_time\x18\t \x03(\x0b\x32/.jackal.protobuf.SaveAdsRequestData.AdsPlayTime\x1a\x39\n\x0b\x41\x64sPlayTime\x12\x12\n\npokemon_id\x18\x65 \x02(\r\x12\x16\n\x0e\x63harplay_count\x18\x66 \x02(\r"\x15\n\x13SaveAdsResponseData"M\n\x1a\x43heckAccessCodeRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x0f\n\x07\x63hip_id\x18\x03 \x02(\t"M\n\x1b\x43heckAccessCodeResponseData\x12\x19\n\x11\x63ommidserv_result\x18\x01 \x02(\r\x12\x13\n\x0b\x61\x63\x63\x65ss_code\x18\x02 \x02(\t"\xa4\x01\n\x1aSetBnpassIdLockRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x13\n\x0b\x62\x61napass_id\x18\x03 \x02(\r\x12\x13\n\x0b\x64\x65vice_type\x18\x04 \x02(\r\x12\x0f\n\x07\x63hip_id\x18\x05 \x02(\t\x12\x13\n\x0b\x61\x63\x63\x65ss_code\x18\x06 \x01(\t\x12\x16\n\x0e\x63\x61rd_lock_time\x18\x07 \x02(\r"\x1d\n\x1bSetBnpassIdLockResponseData"\x85\x01\n\x13LoadUserRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x13\n\x0b\x64\x65vice_type\x18\x03 \x02(\r\x12\x0f\n\x07\x63hip_id\x18\x04 \x02(\t\x12\x13\n\x0b\x61\x63\x63\x65ss_code\x18\x05 \x01(\t\x12\x13\n\x0b\x63\x61rd_status\x18\x06 \x02(\x08"\xfc\x12\n\x14LoadUserResponseData\x12\x19\n\x11\x63ommidserv_result\x18\x01 \x02(\r\x12\x11\n\tload_hash\x18\x02 \x02(\r\x12\x17\n\x0f\x63\x61rdlock_status\x18\x03 \x02(\x08\x12\x13\n\x0b\x62\x61napass_id\x18\x04 \x02(\r\x12\x13\n\x0b\x61\x63\x63\x65ss_code\x18\x05 \x01(\t\x12\x15\n\rnew_card_flag\x18\x06 \x02(\x08\x12\x1e\n\x16precedent_release_flag\x18\x07 \x02(\r\x12\x18\n\x10navi_newbie_flag\x18\x08 \x02(\x08\x12\x18\n\x10navi_enable_flag\x18\t \x02(\x08\x12\x18\n\x10pad_vibrate_flag\x18\n \x02(\x08\x12\x18\n\x10home_region_code\x18\x0b \x02(\r\x12\x15\n\rhome_loc_name\x18\x0c \x02(\t\x12\x11\n\tpref_code\x18\r \x02(\r\x12\x14\n\x0ctrainer_name\x18\x0e \x01(\t\x12\x1a\n\x12trainer_rank_point\x18\x0f \x02(\r\x12\x0e\n\x06wallet\x18\x10 \x02(\r\x12\x13\n\x0b\x66ight_money\x18\x11 \x02(\r\x12\x13\n\x0bscore_point\x18\x12 \x02(\r\x12\x15\n\rgrade_max_num\x18\x13 \x02(\r\x12\x15\n\rextra_counter\x18\x14 \x01(\r\x12\x1e\n\x16tutorial_progress_flag\x18\x15 \x03(\r\x12\x17\n\x0ftotal_play_days\x18\x16 \x02(\r\x12\x16\n\x0eplay_date_time\x18\x17 \x02(\r\x12\x1a\n\x12lucky_box_fail_num\x18\x18 \x02(\r\x12\x1d\n\x15\x65vent_reward_get_flag\x18\x19 \x02(\r\x12\x14\n\x0crank_pvp_all\x18\x1a \x02(\r\x12\x14\n\x0crank_pvp_loc\x18\x1b \x02(\r\x12\x14\n\x0crank_cpu_all\x18\x1c \x02(\r\x12\x14\n\x0crank_cpu_loc\x18\x1d \x02(\r\x12\x12\n\nrank_event\x18\x1e \x02(\r\x12\x11\n\tawake_num\x18\x1f \x02(\r\x12\x17\n\x0fuse_support_num\x18 \x02(\r\x12\x16\n\x0erankmatch_flag\x18! \x02(\r\x12\x1a\n\x12rankmatch_progress\x18" \x03(\r\x12\x15\n\rrankmatch_max\x18# \x01(\r\x12\x19\n\x11rankmatch_success\x18$ \x01(\r\x12\x10\n\x08\x62\x65\x61t_num\x18% \x01(\x05\x12\x15\n\rtitle_text_id\x18& \x02(\r\x12\x16\n\x0etitle_plate_id\x18\' \x02(\r\x12\x1b\n\x13title_decoration_id\x18( \x02(\r\x12\x1c\n\x14support_pokemon_list\x18) \x03(\r\x12\x15\n\rsupport_set_1\x18* \x03(\r\x12\x15\n\rsupport_set_2\x18+ \x03(\r\x12\x15\n\rsupport_set_3\x18, \x03(\r\x12\x14\n\x0cnavi_trainer\x18- \x02(\r\x12\x17\n\x0fnavi_version_id\x18. \x02(\r\x12\x16\n\x0e\x61id_skill_list\x18/ \x03(\r\x12\x11\n\taid_skill\x18\x30 \x02(\r\x12\x17\n\x0f\x63omment_text_id\x18\x31 \x02(\r\x12\x17\n\x0f\x63omment_word_id\x18\x32 \x02(\r\x12\x1a\n\x12latest_use_pokemon\x18\x33 \x02(\r\x12\x11\n\tex_ko_num\x18\x34 \x02(\r\x12\x0f\n\x07wko_num\x18\x35 \x02(\r\x12\x16\n\x0etimeup_win_num\x18\x36 \x02(\r\x12\x13\n\x0b\x63ool_ko_num\x18\x37 \x02(\r\x12\x16\n\x0eperfect_ko_num\x18\x38 \x02(\r\x12\x13\n\x0brecord_flag\x18\x39 \x02(\r\x12\x1c\n\x14site_register_status\x18: \x02(\r\x12\x14\n\x0c\x63ontinue_num\x18; \x02(\r\x12\x18\n\x10\x61\x63hievement_flag\x18< \x03(\r\x12\x13\n\x0b\x61vatar_body\x18= \x01(\r\x12\x15\n\ravatar_gender\x18> \x01(\r\x12\x19\n\x11\x61vatar_background\x18? \x01(\r\x12\x13\n\x0b\x61vatar_head\x18@ \x01(\r\x12\x1a\n\x12\x61vatar_battleglass\x18\x41 \x01(\r\x12\x14\n\x0c\x61vatar_face0\x18\x42 \x01(\r\x12\x14\n\x0c\x61vatar_face1\x18\x43 \x01(\r\x12\x14\n\x0c\x61vatar_face2\x18\x44 \x01(\r\x12\x16\n\x0e\x61vatar_bodyall\x18\x45 \x01(\r\x12\x13\n\x0b\x61vatar_wear\x18\x46 \x01(\r\x12\x18\n\x10\x61vatar_accessory\x18G \x01(\r\x12\x14\n\x0c\x61vatar_stamp\x18H \x01(\r\x12G\n\x0cpokemon_data\x18I \x03(\x0b\x32\x31.jackal.protobuf.LoadUserResponseData.PokemonData\x12\x13\n\x0b\x65vent_state\x18J \x02(\r\x12\x10\n\x08\x65vent_id\x18K \x02(\r\x12\x1e\n\x16sp_bonus_category_id_1\x18L \x02(\r\x12\x1c\n\x14sp_bonus_key_value_1\x18M \x02(\r\x12\x1e\n\x16sp_bonus_category_id_2\x18N \x02(\r\x12\x1c\n\x14sp_bonus_key_value_2\x18O \x02(\r\x12\x1a\n\x12last_play_event_id\x18P \x01(\r\x12\x1e\n\x16\x65vent_achievement_flag\x18Q \x03(\r\x12\x1f\n\x17\x65vent_achievement_param\x18R \x03(\r\x1a\xf0\x02\n\x0bPokemonData\x12\x0f\n\x07\x63har_id\x18\x65 \x02(\r\x12\x1c\n\x14illustration_book_no\x18\x66 \x02(\r\x12\x13\n\x0bpokemon_exp\x18g \x02(\r\x12\x19\n\x11\x62\x61ttle_num_vs_wan\x18h \x02(\r\x12\x12\n\nwin_vs_wan\x18i \x02(\r\x12\x19\n\x11\x62\x61ttle_num_vs_lan\x18j \x02(\r\x12\x12\n\nwin_vs_lan\x18k \x02(\r\x12\x19\n\x11\x62\x61ttle_num_vs_cpu\x18l \x02(\r\x12\x0f\n\x07win_cpu\x18m \x02(\r\x12\x1f\n\x17\x62\x61ttle_all_num_tutorial\x18n \x02(\r\x12\x1b\n\x13\x62\x61ttle_num_tutorial\x18o \x02(\r\x12\x14\n\x0c\x62p_point_atk\x18p \x02(\r\x12\x14\n\x0c\x62p_point_res\x18q \x02(\r\x12\x14\n\x0c\x62p_point_def\x18r \x02(\r\x12\x13\n\x0b\x62p_point_sp\x18s \x02(\r"\x98\x0c\n\x13SaveUserRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x13\n\x0b\x62\x61napass_id\x18\x03 \x02(\r\x12\x1e\n\x16get_trainer_rank_point\x18\x04 \x01(\x05\x12\x11\n\tget_money\x18\x05 \x02(\r\x12\x17\n\x0fget_score_point\x18\x06 \x01(\r\x12\x15\n\rgrade_max_num\x18\x07 \x01(\r\x12\x15\n\rextra_counter\x18\x08 \x01(\r\x12\x1e\n\x16tutorial_progress_flag\x18\t \x03(\r\x12\x1d\n\x15\x65vent_reward_get_flag\x18\n \x01(\r\x12\x14\n\x0c\x63ontinue_num\x18\x0b \x02(\r\x12\x17\n\x0ftotal_play_days\x18\x0c \x02(\r\x12\x18\n\x10\x61\x63hievement_flag\x18\r \x03(\r\x12\x11\n\tawake_num\x18\x0e \x02(\r\x12\x17\n\x0fuse_support_num\x18\x0f \x02(\r\x12\x16\n\x0erankmatch_flag\x18\x10 \x02(\r\x12\x1a\n\x12rank_match_process\x18\x11 \x03(\r\x12\x16\n\x0erank_match_max\x18\x12 \x01(\r\x12\x1a\n\x12rank_match_success\x18\x13 \x01(\r\x12\x10\n\x08\x62\x65\x61t_num\x18\x14 \x01(\x05\x12\x15\n\rsupport_set_1\x18\x15 \x03(\r\x12\x15\n\rsupport_set_2\x18\x16 \x03(\r\x12\x15\n\rsupport_set_3\x18\x17 \x03(\r\x12\x44\n\x0b\x62\x61ttle_data\x18\x18 \x02(\x0b\x32/.jackal.protobuf.SaveUserRequestData.BattleData\x12\x46\n\x0cpokemon_data\x18\x19 \x02(\x0b\x32\x30.jackal.protobuf.SaveUserRequestData.PokemonData\x12\x1c\n\x14trainer_name_pending\x18\x1a \x01(\t\x12\x15\n\ravatar_gender\x18\x1b \x01(\r\x12\x15\n\rcontinue_flag\x18\x1c \x02(\x08\x12\x14\n\x0creq_sendtime\x18\x1d \x02(\r\x12\x15\n\rplay_all_time\x18\x1e \x02(\r\x12\x11\n\tload_hash\x18\x1f \x02(\r\x12\x44\n\x0breward_data\x18 \x03(\x0b\x32/.jackal.protobuf.SaveUserRequestData.RewardData\x12\x13\n\x0b\x65vent_state\x18! \x01(\r\x12\x11\n\taid_skill\x18" \x01(\r\x12\x1a\n\x12last_play_event_id\x18# \x01(\r\x12\x1e\n\x16\x65vent_achievement_flag\x18$ \x03(\r\x12\x1f\n\x17\x65vent_achievement_param\x18% \x03(\r\x1a\xec\x01\n\nBattleData\x12\x11\n\tplay_mode\x18\x65 \x03(\r\x12\x0e\n\x06result\x18\x66 \x03(\r\x12\x11\n\tex_ko_num\x18g \x02(\r\x12\x0f\n\x07wko_num\x18h \x02(\r\x12\x16\n\x0etimeup_win_num\x18i \x02(\r\x12\x13\n\x0b\x63ool_ko_num\x18j \x02(\r\x12\x16\n\x0eperfect_ko_num\x18k \x02(\r\x12\x10\n\x08use_navi\x18l \x02(\r\x12\x16\n\x0euse_navi_cloth\x18m \x02(\r\x12\x15\n\ruse_aid_skill\x18n \x02(\r\x12\x11\n\tplay_date\x18o \x02(\r\x1a\xb3\x01\n\x0bPokemonData\x12\x10\n\x07\x63har_id\x18\xc9\x01 \x02(\r\x12\x1d\n\x14illustration_book_no\x18\xca\x01 \x02(\r\x12\x18\n\x0fget_pokemon_exp\x18\xcb\x01 \x02(\r\x12\x15\n\x0c\x62p_point_atk\x18\xcc\x01 \x02(\r\x12\x15\n\x0c\x62p_point_res\x18\xcd\x01 \x02(\r\x12\x15\n\x0c\x62p_point_def\x18\xce\x01 \x02(\r\x12\x14\n\x0b\x62p_point_sp\x18\xcf\x01 \x02(\r\x1aU\n\nRewardData\x12\x18\n\x0fget_category_id\x18\xad\x02 \x02(\r\x12\x17\n\x0eget_content_id\x18\xae\x02 \x02(\r\x12\x14\n\x0bget_type_id\x18\xaf\x02 \x02(\r"\x16\n\x14SaveUserResponseData";\n\x19\x43heckDiagnosisRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t"\x95\x02\n\x1a\x43heckDiagnosisResponseData\x12Q\n\x0e\x64iagnosis_data\x18\x01 \x03(\x0b\x32\x39.jackal.protobuf.CheckDiagnosisResponseData.DiagnosisData\x1a\xa3\x01\n\rDiagnosisData\x12\x14\n\x0crequest_type\x18\x65 \x02(\r\x12\x17\n\x0f\x63onnect_timeout\x18\x66 \x02(\r\x12\x14\n\x0csend_timeout\x18g \x02(\r\x12\x17\n\x0freceive_timeout\x18h \x02(\r\x12\x1c\n\x14retry_time_of_number\x18i \x02(\r\x12\x16\n\x0eretry_interval\x18j \x02(\r"\xf4\x01\n\x18SaveClientLogRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x11\n\tserial_id\x18\x03 \x02(\r\x12\x14\n\x0creq_sendtime\x18\x04 \x02(\r\x12\r\n\x05karma\x18\x05 \x02(\x05\x12\x14\n\x0crequest_type\x18\x06 \x02(\r\x12\x1f\n\x17request_number_of_times\x18\x07 \x02(\r\x12\x1f\n\x17timeout_number_of_times\x18\x08 \x02(\r\x12\x11\n\tretry_max\x18\t \x02(\r\x12\x15\n\rresponse_time\x18\n \x02(\r"\x1b\n\x19SaveClientLogResponseData"V\n\x1dPreLoadInformationRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x15\n\rinfo_small_id\x18\x03 \x02(\r"\xc9\x01\n\x1ePreLoadInformationResponseData\x12\x15\n\rinfo_small_id\x18\x01 \x02(\r\x12\x13\n\x0bregion_code\x18\x02 \x02(\r\x12\x12\n\nsession_id\x18\x03 \x02(\r\x12\x13\n\x0b\x62lock_total\x18\x04 \x02(\r\x12\x12\n\nblock_size\x18\x05 \x02(\r\x12\x10\n\x08interval\x18\x06 \x02(\r\x12\x16\n\x0einfo_data_size\x18\x07 \x02(\r\x12\x14\n\x0cinfo_data_id\x18\x08 \x02(\r"v\n\x1aLoadInformationRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x15\n\rinfo_small_id\x18\x03 \x02(\r\x12\x12\n\nsession_id\x18\x04 \x02(\r\x12\r\n\x05\x62lock\x18\x05 \x02(\r"\x96\x01\n\x1bLoadInformationResponseData\x12\x15\n\rinfo_small_id\x18\x01 \x02(\r\x12\x12\n\nstart_date\x18\x02 \x02(\r\x12\x10\n\x08\x65nd_date\x18\x03 \x02(\r\x12\r\n\x05\x62lock\x18\x04 \x02(\r\x12\x13\n\x0b\x62lock_total\x18\x05 \x02(\r\x12\x16\n\x0einfo_data_body\x18\x06 \x02(\x0c"\x80\x01\n\x18PreSaveReplayRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x13\n\x0bregion_code\x18\x03 \x02(\r\x12\x15\n\rcategory_code\x18\x04 \x02(\r\x12\x18\n\x10replay_data_size\x18\x05 \x02(\r"j\n\x19PreSaveReplayResponseData\x12\x12\n\nsession_id\x18\x01 \x02(\r\x12\x13\n\x0b\x62lock_total\x18\x02 \x02(\r\x12\x12\n\nblock_size\x18\x03 \x02(\r\x12\x10\n\x08interval\x18\x04 \x02(\r"\x82\x02\n\x15SaveReplayRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x13\n\x0b\x62\x61napass_id\x18\x03 \x02(\r\x12\x12\n\npokemon_id\x18\x04 \x02(\r\x12\x17\n\x0ftrainer_rank_id\x18\x05 \x02(\r\x12\x13\n\x0bregion_code\x18\x06 \x02(\r\x12\x12\n\nsession_id\x18\x07 \x02(\r\x12\r\n\x05\x62lock\x18\x08 \x02(\r\x12\x1b\n\x13transfer_completion\x18\t \x02(\r\x12\x18\n\x10replay_data_size\x18\n \x02(\r\x12\x18\n\x10replay_data_body\x18\x0b \x02(\x0c"\x18\n\x16SaveReplayResponseData"\x8d\x01\n\x15SaveChargeRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x0f\n\x07game_id\x18\x03 \x02(\t\x12\x19\n\x11\x63harge_data_index\x18\x04 \x02(\t\x12\x13\n\x0b\x63harge_type\x18\x05 \x02(\r\x12\x13\n\x0b\x63harge_time\x18\x06 \x02(\r"N\n\x16SaveChargeResponseData\x12\x19\n\x11\x63harge_error_code\x18\x01 \x02(\r\x12\x19\n\x11\x63harge_data_index\x18\x02 \x02(\t"u\n\x17\x43heckRankingRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x13\n\x0bregion_code\x18\x03 \x02(\r\x12\x12\n\nranking_id\x18\x04 \x02(\r\x12\x11\n\ttimestamp\x18\x05 \x02(\r".\n\x18\x43heckRankingResponseData\x12\x12\n\nranking_id\x18\x01 \x02(\r"a\n\x16LoadRankingRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x13\n\x0bregion_code\x18\x03 \x02(\r\x12\x12\n\nranking_id\x18\x04 \x02(\r"\xbd\x08\n\x17LoadRankingResponseData\x12\x12\n\nranking_id\x18\x01 \x02(\r\x12\x15\n\rranking_start\x18\x02 \x02(\r\x12\x13\n\x0branking_end\x18\x03 \x02(\r\x12\x11\n\tevent_end\x18\x04 \x02(\x08\x12J\n\x0ctrainer_data\x18\x05 \x03(\x0b\x32\x34.jackal.protobuf.LoadRankingResponseData.TrainerData\x12\x13\n\x0bmodify_date\x18\x06 \x02(\r\x12\x13\n\x0b\x65vent_state\x18\x07 \x01(\r\x1a\xd8\x06\n\x0bTrainerData\x12\x14\n\x0ctrainer_name\x18\x65 \x02(\t\x12\x1a\n\x12trainer_rank_point\x18\x66 \x02(\r\x12\r\n\x05point\x18g \x02(\r\x12\x13\n\x0brecord_flag\x18h \x02(\r\x12\x18\n\x10\x66\x61vorite_pokemon\x18i \x02(\r\x12\x12\n\nwin_vs_wan\x18j \x02(\r\x12\x19\n\x11\x62\x61ttle_num_vs_wan\x18k \x02(\r\x12\x12\n\nwin_vs_cpu\x18l \x02(\r\x12\x19\n\x11\x62\x61ttle_num_vs_cpu\x18m \x02(\r\x12\x15\n\rtitle_text_id\x18n \x02(\r\x12\x16\n\x0etitle_plate_id\x18o \x02(\r\x12\x1b\n\x13title_decoration_id\x18p \x02(\r\x12\x17\n\x0f\x63omment_text_id\x18q \x02(\r\x12\x17\n\x0f\x63omment_word_id\x18r \x02(\r\x12\x10\n\x08loc_name\x18s \x02(\t\x12\x11\n\tpref_code\x18t \x02(\r\x12\x10\n\x08rank_num\x18u \x02(\r\x12\x15\n\rlast_rank_num\x18v \x02(\r\x12\x0e\n\x06updown\x18w \x02(\r\x12\x12\n\npokemon_id\x18x \x02(\r\x12\x13\n\x0bpokemon_exp\x18y \x02(\r\x12\x14\n\x0c\x62p_point_atk\x18z \x02(\r\x12\x14\n\x0c\x62p_point_res\x18{ \x02(\r\x12\x14\n\x0c\x62p_point_def\x18| \x02(\r\x12\x13\n\x0b\x62p_point_sp\x18} \x02(\r\x12\x13\n\x0b\x61vatar_body\x18~ \x02(\r\x12\x15\n\ravatar_gender\x18\x7f \x02(\r\x12\x1a\n\x11\x61vatar_background\x18\x80\x01 \x02(\r\x12\x14\n\x0b\x61vatar_head\x18\x81\x01 \x02(\r\x12\x1b\n\x12\x61vatar_battleglass\x18\x82\x01 \x02(\r\x12\x15\n\x0c\x61vatar_face0\x18\x83\x01 \x02(\r\x12\x15\n\x0c\x61vatar_face1\x18\x84\x01 \x02(\r\x12\x15\n\x0c\x61vatar_face2\x18\x85\x01 \x02(\r\x12\x17\n\x0e\x61vatar_bodyall\x18\x86\x01 \x02(\r\x12\x14\n\x0b\x61vatar_wear\x18\x87\x01 \x02(\r\x12\x19\n\x10\x61vatar_accessory\x18\x88\x01 \x02(\r\x12\x15\n\x0c\x61vatar_stamp\x18\x89\x01 \x02(\r"h\n\x18SaveInGameLogRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x13\n\x0bin_game_log\x18\x03 \x02(\x0c\x12\x17\n\x0flog_change_time\x18\x04 \x02(\r"\x1b\n\x19SaveInGameLogResponseData"]\n$PreLoadInformationAttractRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x15\n\rinfo_large_id\x18\x03 \x02(\r"\xd0\x01\n%PreLoadInformationAttractResponseData\x12\x15\n\rinfo_large_id\x18\x01 \x02(\r\x12\x13\n\x0bregion_code\x18\x02 \x02(\r\x12\x12\n\nsession_id\x18\x03 \x02(\r\x12\x13\n\x0b\x62lock_total\x18\x04 \x02(\r\x12\x12\n\nblock_size\x18\x05 \x02(\r\x12\x10\n\x08interval\x18\x06 \x02(\r\x12\x16\n\x0einfo_data_size\x18\x07 \x02(\r\x12\x14\n\x0cinfo_data_id\x18\x08 \x02(\r"}\n!LoadInformationAttractRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t\x12\x15\n\rinfo_large_id\x18\x03 \x02(\r\x12\x12\n\nsession_id\x18\x04 \x02(\r\x12\r\n\x05\x62lock\x18\x05 \x02(\r"\x9d\x01\n"LoadInformationAttractResponseData\x12\x15\n\rinfo_large_id\x18\x01 \x02(\r\x12\x12\n\nstart_date\x18\x02 \x02(\r\x12\x10\n\x08\x65nd_date\x18\x03 \x02(\r\x12\r\n\x05\x62lock\x18\x04 \x02(\r\x12\x13\n\x0b\x62lock_total\x18\x05 \x02(\r\x12\x16\n\x0einfo_data_body\x18\x06 \x02(\x0c"?\n\x1dLoadClientSettingsRequestData\x12\x0e\n\x06pcb_id\x18\x01 \x02(\t\x12\x0e\n\x06loc_id\x18\x02 \x02(\t"\x8d\x10\n\x1eLoadClientSettingsResponseData\x12\x1b\n\x13money_magnification\x18\x01 \x02(\r\x12!\n\x19\x64m2_probability_single100\x18\x02 \x03(\r\x12\x1a\n\x12\x63ontinue_bonus_exp\x18\x03 \x02(\r\x12\x1c\n\x14\x63ontinue_fight_money\x18\x04 \x02(\r\x12\x17\n\x0f\x65vent_bonus_exp\x18\x05 \x02(\r\x12\x11\n\tlevel_cap\x18\x06 \x02(\r\x12\x15\n\rop_movie_flag\x18\x07 \x02(\r\x12M\n\nevent_info\x18\x08 \x03(\x0b\x32\x39.jackal.protobuf.LoadClientSettingsResponseData.EventInfo\x12O\n\x0b\x62\x61nner_info\x18\t \x03(\x0b\x32:.jackal.protobuf.LoadClientSettingsResponseData.BannerInfo\x12Q\n\x0c\x61ttract_info\x18\n \x03(\x0b\x32;.jackal.protobuf.LoadClientSettingsResponseData.AttractInfo\x12O\n\x0binfo_window\x18\x0b \x03(\x0b\x32:.jackal.protobuf.LoadClientSettingsResponseData.InfoWindow\x12\x18\n\x10lucky_bonus_rate\x18\x0c \x02(\r\x12\x18\n\x10\x66\x61il_support_num\x18\r \x02(\r\x12O\n\x0blucky_bonus\x18\x0e \x03(\x0b\x32:.jackal.protobuf.LoadClientSettingsResponseData.LuckyBonus\x12S\n\rspecial_bonus\x18\x0f \x03(\x0b\x32<.jackal.protobuf.LoadClientSettingsResponseData.SpecialBonus\x12\x17\n\x0f\x63hara_open_flag\x18\x10 \x02(\r\x12\x17\n\x0f\x63hara_open_date\x18\x11 \x02(\r\x12\x1b\n\x13\x63hara_pre_open_date\x18\x12 \x02(\r\x12\x11\n\tsearch_id\x18\x13 \x02(\r\x12\x16\n\x0e\x63lient_version\x18\x14 \x01(\t\x12!\n\x19\x63lient_version_start_date\x18\x15 \x01(\r\x1a\xe0\x01\n\tEventInfo\x12\x13\n\x0b\x65vent_state\x18\x65 \x02(\r\x12\x10\n\x08\x65vent_id\x18\x66 \x02(\r\x12\x1e\n\x16sp_bonus_category_id_1\x18g \x02(\r\x12\x1c\n\x14sp_bonus_key_value_1\x18h \x02(\r\x12\x1e\n\x16sp_bonus_category_id_2\x18i \x02(\r\x12\x1c\n\x14sp_bonus_key_value_2\x18j \x02(\r\x12\x18\n\x10\x65vent_start_date\x18k \x02(\r\x12\x16\n\x0e\x65vent_end_date\x18l \x02(\r\x1a\xa2\x01\n\nBannerInfo\x12\x1a\n\x11\x62\x61nner_start_date\x18\xc9\x01 \x02(\r\x12\x18\n\x0f\x62\x61nner_end_date\x18\xca\x01 \x02(\r\x12\x12\n\tbanner_id\x18\xcb\x01 \x02(\r\x12\x15\n\x0c\x62\x61nner_title\x18\xcc\x01 \x02(\t\x12\x18\n\x0f\x62\x61nner_sub_info\x18\xcd\x01 \x02(\t\x12\x19\n\x10\x62\x61nner_term_info\x18\xce\x01 \x02(\t\x1a\x84\x02\n\x0b\x41ttractInfo\x12 \n\x17\x61ttract_info_start_date\x18\xad\x02 \x02(\r\x12\x1e\n\x15\x61ttract_info_end_date\x18\xae\x02 \x02(\r\x12\x18\n\x0f\x61ttract_info_id\x18\xaf\x02 \x02(\r\x12\x1b\n\x12\x61ttract_info_title\x18\xb0\x02 \x02(\t\x12\x1e\n\x15\x61ttract_info_sub_info\x18\xb1\x02 \x02(\t\x12 \n\x17\x61ttract_info_start_info\x18\xb2\x02 \x02(\t\x12\x1e\n\x15\x61ttract_info_end_info\x18\xb3\x02 \x02(\t\x12\x1a\n\x11\x61ttract_info_text\x18\xb4\x02 \x02(\t\x1a\xfb\x01\n\nInfoWindow\x12\x1f\n\x16info_window_start_date\x18\x91\x03 \x02(\r\x12\x1d\n\x14info_window_end_date\x18\x92\x03 \x02(\r\x12\x17\n\x0einfo_window_id\x18\x93\x03 \x02(\r\x12\x1a\n\x11info_window_title\x18\x94\x03 \x02(\t\x12\x1d\n\x14info_window_sub_info\x18\x95\x03 \x02(\t\x12\x1f\n\x16info_window_start_info\x18\x96\x03 \x02(\t\x12\x1d\n\x14info_window_end_info\x18\x97\x03 \x02(\t\x12\x19\n\x10info_window_text\x18\x98\x03 \x02(\t\x1an\n\nLuckyBonus\x12 \n\x17lucky_bonus_category_id\x18\xf5\x03 \x02(\r\x12\x1c\n\x13lucky_bonus_data_id\x18\xf6\x03 \x02(\r\x12 \n\x17lucky_bonus_probability\x18\xf7\x03 \x02(\r\x1av\n\x0cSpecialBonus\x12"\n\x19special_bonus_category_id\x18\xd9\x04 \x02(\r\x12\x1e\n\x15special_bonus_data_id\x18\xda\x04 \x02(\r\x12"\n\x19special_bonus_probability\x18\xdb\x04 \x02(\r*\xb2\x03\n\x0bMessageType\x12\x08\n\x04NOOP\x10\x00\x12\x08\n\x04PING\x10\x01\x12\x10\n\x0cREGISTER_PCB\x10\x02\x12\x0c\n\x08SAVE_ADS\x10\x03\x12\x15\n\x11\x43HECK_ACCESS_CODE\x10\x04\x12\x15\n\x11SET_BNPASSID_LOCK\x10\x05\x12\r\n\tLOAD_USER\x10\x06\x12\r\n\tSAVE_USER\x10\t\x12\x13\n\x0f\x43HECK_DIAGNOSIS\x10\n\x12\x13\n\x0fSAVE_CLIENT_LOG\x10\x0b\x12\x18\n\x14PRE_LOAD_INFORMATION\x10\x0c\x12\x14\n\x10LOAD_INFORMATION\x10\r\x12\x13\n\x0fPRE_SAVE_REPLAY\x10\x0e\x12\x0f\n\x0bSAVE_REPLAY\x10\x0f\x12\x0f\n\x0bSAVE_CHARGE\x10\x10\x12\x11\n\rCHECK_RANKING\x10\x11\x12\x10\n\x0cLOAD_RANKING\x10\x12\x12\x13\n\x0fSAVE_INGAME_LOG\x10\x13\x12 \n\x1cPRE_LOAD_INFORMATION_ATTRACT\x10\x14\x12\x1c\n\x18LOAD_INFORMATION_ATTRACT\x10\x15\x12\x18\n\x14LOAD_CLIENT_SETTINGS\x10\x16' +) _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) -_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'jackal_pb2', globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "jackal_pb2", globals()) if _descriptor._USE_C_DESCRIPTORS == False: - - DESCRIPTOR._options = None - _MESSAGETYPE._serialized_start=14623 - _MESSAGETYPE._serialized_end=15057 - _REQUEST._serialized_start=34 - _REQUEST._serialized_end=1488 - _RESPONSE._serialized_start=1491 - _RESPONSE._serialized_end=2983 - _NOOPREQUESTDATA._serialized_start=2985 - _NOOPREQUESTDATA._serialized_end=3034 - _NOOPRESPONSEDATA._serialized_start=3036 - _NOOPRESPONSEDATA._serialized_end=3054 - _PINGREQUESTDATA._serialized_start=3056 - _PINGREQUESTDATA._serialized_end=3105 - _PINGRESPONSEDATA._serialized_start=3107 - _PINGRESPONSEDATA._serialized_end=3125 - _REGISTERPCBREQUESTDATA._serialized_start=3128 - _REGISTERPCBREQUESTDATA._serialized_end=3462 - _REGISTERPCBRESPONSEDATA._serialized_start=3465 - _REGISTERPCBRESPONSEDATA._serialized_end=3598 - _SAVEADSREQUESTDATA._serialized_start=3601 - _SAVEADSREQUESTDATA._serialized_end=3944 - _SAVEADSREQUESTDATA_ADSPLAYTIME._serialized_start=3887 - _SAVEADSREQUESTDATA_ADSPLAYTIME._serialized_end=3944 - _SAVEADSRESPONSEDATA._serialized_start=3946 - _SAVEADSRESPONSEDATA._serialized_end=3967 - _CHECKACCESSCODEREQUESTDATA._serialized_start=3969 - _CHECKACCESSCODEREQUESTDATA._serialized_end=4046 - _CHECKACCESSCODERESPONSEDATA._serialized_start=4048 - _CHECKACCESSCODERESPONSEDATA._serialized_end=4125 - _SETBNPASSIDLOCKREQUESTDATA._serialized_start=4128 - _SETBNPASSIDLOCKREQUESTDATA._serialized_end=4292 - _SETBNPASSIDLOCKRESPONSEDATA._serialized_start=4294 - _SETBNPASSIDLOCKRESPONSEDATA._serialized_end=4323 - _LOADUSERREQUESTDATA._serialized_start=4326 - _LOADUSERREQUESTDATA._serialized_end=4459 - _LOADUSERRESPONSEDATA._serialized_start=4462 - _LOADUSERRESPONSEDATA._serialized_end=6890 - _LOADUSERRESPONSEDATA_POKEMONDATA._serialized_start=6522 - _LOADUSERRESPONSEDATA_POKEMONDATA._serialized_end=6890 - _SAVEUSERREQUESTDATA._serialized_start=6893 - _SAVEUSERREQUESTDATA._serialized_end=8453 - _SAVEUSERREQUESTDATA_BATTLEDATA._serialized_start=7948 - _SAVEUSERREQUESTDATA_BATTLEDATA._serialized_end=8184 - _SAVEUSERREQUESTDATA_POKEMONDATA._serialized_start=8187 - _SAVEUSERREQUESTDATA_POKEMONDATA._serialized_end=8366 - _SAVEUSERREQUESTDATA_REWARDDATA._serialized_start=8368 - _SAVEUSERREQUESTDATA_REWARDDATA._serialized_end=8453 - _SAVEUSERRESPONSEDATA._serialized_start=8455 - _SAVEUSERRESPONSEDATA._serialized_end=8477 - _CHECKDIAGNOSISREQUESTDATA._serialized_start=8479 - _CHECKDIAGNOSISREQUESTDATA._serialized_end=8538 - _CHECKDIAGNOSISRESPONSEDATA._serialized_start=8541 - _CHECKDIAGNOSISRESPONSEDATA._serialized_end=8818 - _CHECKDIAGNOSISRESPONSEDATA_DIAGNOSISDATA._serialized_start=8655 - _CHECKDIAGNOSISRESPONSEDATA_DIAGNOSISDATA._serialized_end=8818 - _SAVECLIENTLOGREQUESTDATA._serialized_start=8821 - _SAVECLIENTLOGREQUESTDATA._serialized_end=9065 - _SAVECLIENTLOGRESPONSEDATA._serialized_start=9067 - _SAVECLIENTLOGRESPONSEDATA._serialized_end=9094 - _PRELOADINFORMATIONREQUESTDATA._serialized_start=9096 - _PRELOADINFORMATIONREQUESTDATA._serialized_end=9182 - _PRELOADINFORMATIONRESPONSEDATA._serialized_start=9185 - _PRELOADINFORMATIONRESPONSEDATA._serialized_end=9386 - _LOADINFORMATIONREQUESTDATA._serialized_start=9388 - _LOADINFORMATIONREQUESTDATA._serialized_end=9506 - _LOADINFORMATIONRESPONSEDATA._serialized_start=9509 - _LOADINFORMATIONRESPONSEDATA._serialized_end=9659 - _PRESAVEREPLAYREQUESTDATA._serialized_start=9662 - _PRESAVEREPLAYREQUESTDATA._serialized_end=9790 - _PRESAVEREPLAYRESPONSEDATA._serialized_start=9792 - _PRESAVEREPLAYRESPONSEDATA._serialized_end=9898 - _SAVEREPLAYREQUESTDATA._serialized_start=9901 - _SAVEREPLAYREQUESTDATA._serialized_end=10159 - _SAVEREPLAYRESPONSEDATA._serialized_start=10161 - _SAVEREPLAYRESPONSEDATA._serialized_end=10185 - _SAVECHARGEREQUESTDATA._serialized_start=10188 - _SAVECHARGEREQUESTDATA._serialized_end=10329 - _SAVECHARGERESPONSEDATA._serialized_start=10331 - _SAVECHARGERESPONSEDATA._serialized_end=10409 - _CHECKRANKINGREQUESTDATA._serialized_start=10411 - _CHECKRANKINGREQUESTDATA._serialized_end=10528 - _CHECKRANKINGRESPONSEDATA._serialized_start=10530 - _CHECKRANKINGRESPONSEDATA._serialized_end=10576 - _LOADRANKINGREQUESTDATA._serialized_start=10578 - _LOADRANKINGREQUESTDATA._serialized_end=10675 - _LOADRANKINGRESPONSEDATA._serialized_start=10678 - _LOADRANKINGRESPONSEDATA._serialized_end=11763 - _LOADRANKINGRESPONSEDATA_TRAINERDATA._serialized_start=10907 - _LOADRANKINGRESPONSEDATA_TRAINERDATA._serialized_end=11763 - _SAVEINGAMELOGREQUESTDATA._serialized_start=11765 - _SAVEINGAMELOGREQUESTDATA._serialized_end=11869 - _SAVEINGAMELOGRESPONSEDATA._serialized_start=11871 - _SAVEINGAMELOGRESPONSEDATA._serialized_end=11898 - _PRELOADINFORMATIONATTRACTREQUESTDATA._serialized_start=11900 - _PRELOADINFORMATIONATTRACTREQUESTDATA._serialized_end=11993 - _PRELOADINFORMATIONATTRACTRESPONSEDATA._serialized_start=11996 - _PRELOADINFORMATIONATTRACTRESPONSEDATA._serialized_end=12204 - _LOADINFORMATIONATTRACTREQUESTDATA._serialized_start=12206 - _LOADINFORMATIONATTRACTREQUESTDATA._serialized_end=12331 - _LOADINFORMATIONATTRACTRESPONSEDATA._serialized_start=12334 - _LOADINFORMATIONATTRACTRESPONSEDATA._serialized_end=12491 - _LOADCLIENTSETTINGSREQUESTDATA._serialized_start=12493 - _LOADCLIENTSETTINGSREQUESTDATA._serialized_end=12556 - _LOADCLIENTSETTINGSRESPONSEDATA._serialized_start=12559 - _LOADCLIENTSETTINGSRESPONSEDATA._serialized_end=14620 - _LOADCLIENTSETTINGSRESPONSEDATA_EVENTINFO._serialized_start=13482 - _LOADCLIENTSETTINGSRESPONSEDATA_EVENTINFO._serialized_end=13706 - _LOADCLIENTSETTINGSRESPONSEDATA_BANNERINFO._serialized_start=13709 - _LOADCLIENTSETTINGSRESPONSEDATA_BANNERINFO._serialized_end=13871 - _LOADCLIENTSETTINGSRESPONSEDATA_ATTRACTINFO._serialized_start=13874 - _LOADCLIENTSETTINGSRESPONSEDATA_ATTRACTINFO._serialized_end=14134 - _LOADCLIENTSETTINGSRESPONSEDATA_INFOWINDOW._serialized_start=14137 - _LOADCLIENTSETTINGSRESPONSEDATA_INFOWINDOW._serialized_end=14388 - _LOADCLIENTSETTINGSRESPONSEDATA_LUCKYBONUS._serialized_start=14390 - _LOADCLIENTSETTINGSRESPONSEDATA_LUCKYBONUS._serialized_end=14500 - _LOADCLIENTSETTINGSRESPONSEDATA_SPECIALBONUS._serialized_start=14502 - _LOADCLIENTSETTINGSRESPONSEDATA_SPECIALBONUS._serialized_end=14620 + DESCRIPTOR._options = None + _MESSAGETYPE._serialized_start = 14623 + _MESSAGETYPE._serialized_end = 15057 + _REQUEST._serialized_start = 34 + _REQUEST._serialized_end = 1488 + _RESPONSE._serialized_start = 1491 + _RESPONSE._serialized_end = 2983 + _NOOPREQUESTDATA._serialized_start = 2985 + _NOOPREQUESTDATA._serialized_end = 3034 + _NOOPRESPONSEDATA._serialized_start = 3036 + _NOOPRESPONSEDATA._serialized_end = 3054 + _PINGREQUESTDATA._serialized_start = 3056 + _PINGREQUESTDATA._serialized_end = 3105 + _PINGRESPONSEDATA._serialized_start = 3107 + _PINGRESPONSEDATA._serialized_end = 3125 + _REGISTERPCBREQUESTDATA._serialized_start = 3128 + _REGISTERPCBREQUESTDATA._serialized_end = 3462 + _REGISTERPCBRESPONSEDATA._serialized_start = 3465 + _REGISTERPCBRESPONSEDATA._serialized_end = 3598 + _SAVEADSREQUESTDATA._serialized_start = 3601 + _SAVEADSREQUESTDATA._serialized_end = 3944 + _SAVEADSREQUESTDATA_ADSPLAYTIME._serialized_start = 3887 + _SAVEADSREQUESTDATA_ADSPLAYTIME._serialized_end = 3944 + _SAVEADSRESPONSEDATA._serialized_start = 3946 + _SAVEADSRESPONSEDATA._serialized_end = 3967 + _CHECKACCESSCODEREQUESTDATA._serialized_start = 3969 + _CHECKACCESSCODEREQUESTDATA._serialized_end = 4046 + _CHECKACCESSCODERESPONSEDATA._serialized_start = 4048 + _CHECKACCESSCODERESPONSEDATA._serialized_end = 4125 + _SETBNPASSIDLOCKREQUESTDATA._serialized_start = 4128 + _SETBNPASSIDLOCKREQUESTDATA._serialized_end = 4292 + _SETBNPASSIDLOCKRESPONSEDATA._serialized_start = 4294 + _SETBNPASSIDLOCKRESPONSEDATA._serialized_end = 4323 + _LOADUSERREQUESTDATA._serialized_start = 4326 + _LOADUSERREQUESTDATA._serialized_end = 4459 + _LOADUSERRESPONSEDATA._serialized_start = 4462 + _LOADUSERRESPONSEDATA._serialized_end = 6890 + _LOADUSERRESPONSEDATA_POKEMONDATA._serialized_start = 6522 + _LOADUSERRESPONSEDATA_POKEMONDATA._serialized_end = 6890 + _SAVEUSERREQUESTDATA._serialized_start = 6893 + _SAVEUSERREQUESTDATA._serialized_end = 8453 + _SAVEUSERREQUESTDATA_BATTLEDATA._serialized_start = 7948 + _SAVEUSERREQUESTDATA_BATTLEDATA._serialized_end = 8184 + _SAVEUSERREQUESTDATA_POKEMONDATA._serialized_start = 8187 + _SAVEUSERREQUESTDATA_POKEMONDATA._serialized_end = 8366 + _SAVEUSERREQUESTDATA_REWARDDATA._serialized_start = 8368 + _SAVEUSERREQUESTDATA_REWARDDATA._serialized_end = 8453 + _SAVEUSERRESPONSEDATA._serialized_start = 8455 + _SAVEUSERRESPONSEDATA._serialized_end = 8477 + _CHECKDIAGNOSISREQUESTDATA._serialized_start = 8479 + _CHECKDIAGNOSISREQUESTDATA._serialized_end = 8538 + _CHECKDIAGNOSISRESPONSEDATA._serialized_start = 8541 + _CHECKDIAGNOSISRESPONSEDATA._serialized_end = 8818 + _CHECKDIAGNOSISRESPONSEDATA_DIAGNOSISDATA._serialized_start = 8655 + _CHECKDIAGNOSISRESPONSEDATA_DIAGNOSISDATA._serialized_end = 8818 + _SAVECLIENTLOGREQUESTDATA._serialized_start = 8821 + _SAVECLIENTLOGREQUESTDATA._serialized_end = 9065 + _SAVECLIENTLOGRESPONSEDATA._serialized_start = 9067 + _SAVECLIENTLOGRESPONSEDATA._serialized_end = 9094 + _PRELOADINFORMATIONREQUESTDATA._serialized_start = 9096 + _PRELOADINFORMATIONREQUESTDATA._serialized_end = 9182 + _PRELOADINFORMATIONRESPONSEDATA._serialized_start = 9185 + _PRELOADINFORMATIONRESPONSEDATA._serialized_end = 9386 + _LOADINFORMATIONREQUESTDATA._serialized_start = 9388 + _LOADINFORMATIONREQUESTDATA._serialized_end = 9506 + _LOADINFORMATIONRESPONSEDATA._serialized_start = 9509 + _LOADINFORMATIONRESPONSEDATA._serialized_end = 9659 + _PRESAVEREPLAYREQUESTDATA._serialized_start = 9662 + _PRESAVEREPLAYREQUESTDATA._serialized_end = 9790 + _PRESAVEREPLAYRESPONSEDATA._serialized_start = 9792 + _PRESAVEREPLAYRESPONSEDATA._serialized_end = 9898 + _SAVEREPLAYREQUESTDATA._serialized_start = 9901 + _SAVEREPLAYREQUESTDATA._serialized_end = 10159 + _SAVEREPLAYRESPONSEDATA._serialized_start = 10161 + _SAVEREPLAYRESPONSEDATA._serialized_end = 10185 + _SAVECHARGEREQUESTDATA._serialized_start = 10188 + _SAVECHARGEREQUESTDATA._serialized_end = 10329 + _SAVECHARGERESPONSEDATA._serialized_start = 10331 + _SAVECHARGERESPONSEDATA._serialized_end = 10409 + _CHECKRANKINGREQUESTDATA._serialized_start = 10411 + _CHECKRANKINGREQUESTDATA._serialized_end = 10528 + _CHECKRANKINGRESPONSEDATA._serialized_start = 10530 + _CHECKRANKINGRESPONSEDATA._serialized_end = 10576 + _LOADRANKINGREQUESTDATA._serialized_start = 10578 + _LOADRANKINGREQUESTDATA._serialized_end = 10675 + _LOADRANKINGRESPONSEDATA._serialized_start = 10678 + _LOADRANKINGRESPONSEDATA._serialized_end = 11763 + _LOADRANKINGRESPONSEDATA_TRAINERDATA._serialized_start = 10907 + _LOADRANKINGRESPONSEDATA_TRAINERDATA._serialized_end = 11763 + _SAVEINGAMELOGREQUESTDATA._serialized_start = 11765 + _SAVEINGAMELOGREQUESTDATA._serialized_end = 11869 + _SAVEINGAMELOGRESPONSEDATA._serialized_start = 11871 + _SAVEINGAMELOGRESPONSEDATA._serialized_end = 11898 + _PRELOADINFORMATIONATTRACTREQUESTDATA._serialized_start = 11900 + _PRELOADINFORMATIONATTRACTREQUESTDATA._serialized_end = 11993 + _PRELOADINFORMATIONATTRACTRESPONSEDATA._serialized_start = 11996 + _PRELOADINFORMATIONATTRACTRESPONSEDATA._serialized_end = 12204 + _LOADINFORMATIONATTRACTREQUESTDATA._serialized_start = 12206 + _LOADINFORMATIONATTRACTREQUESTDATA._serialized_end = 12331 + _LOADINFORMATIONATTRACTRESPONSEDATA._serialized_start = 12334 + _LOADINFORMATIONATTRACTRESPONSEDATA._serialized_end = 12491 + _LOADCLIENTSETTINGSREQUESTDATA._serialized_start = 12493 + _LOADCLIENTSETTINGSREQUESTDATA._serialized_end = 12556 + _LOADCLIENTSETTINGSRESPONSEDATA._serialized_start = 12559 + _LOADCLIENTSETTINGSRESPONSEDATA._serialized_end = 14620 + _LOADCLIENTSETTINGSRESPONSEDATA_EVENTINFO._serialized_start = 13482 + _LOADCLIENTSETTINGSRESPONSEDATA_EVENTINFO._serialized_end = 13706 + _LOADCLIENTSETTINGSRESPONSEDATA_BANNERINFO._serialized_start = 13709 + _LOADCLIENTSETTINGSRESPONSEDATA_BANNERINFO._serialized_end = 13871 + _LOADCLIENTSETTINGSRESPONSEDATA_ATTRACTINFO._serialized_start = 13874 + _LOADCLIENTSETTINGSRESPONSEDATA_ATTRACTINFO._serialized_end = 14134 + _LOADCLIENTSETTINGSRESPONSEDATA_INFOWINDOW._serialized_start = 14137 + _LOADCLIENTSETTINGSRESPONSEDATA_INFOWINDOW._serialized_end = 14388 + _LOADCLIENTSETTINGSRESPONSEDATA_LUCKYBONUS._serialized_start = 14390 + _LOADCLIENTSETTINGSRESPONSEDATA_LUCKYBONUS._serialized_end = 14500 + _LOADCLIENTSETTINGSRESPONSEDATA_SPECIALBONUS._serialized_start = 14502 + _LOADCLIENTSETTINGSRESPONSEDATA_SPECIALBONUS._serialized_end = 14620 # @@protoc_insertion_point(module_scope) diff --git a/titles/wacca/__init__.py b/titles/wacca/__init__.py index 55205ed..b6e06f8 100644 --- a/titles/wacca/__init__.py +++ b/titles/wacca/__init__.py @@ -9,4 +9,4 @@ database = WaccaData reader = WaccaReader frontend = WaccaFrontend game_codes = [WaccaConstants.GAME_CODE] -current_schema_version = 3 \ No newline at end of file +current_schema_version = 3 diff --git a/titles/wacca/base.py b/titles/wacca/base.py index 2e5001f..bc0c09a 100644 --- a/titles/wacca/base.py +++ b/titles/wacca/base.py @@ -11,13 +11,14 @@ from titles.wacca.database import WaccaData from titles.wacca.handlers import * from core.const import AllnetCountryCode -class WaccaBase(): + +class WaccaBase: def __init__(self, cfg: CoreConfig, game_cfg: WaccaConfig) -> None: - self.config = cfg # Config file - self.game_config = game_cfg # Game Config file - self.game = WaccaConstants.GAME_CODE # Game code - self.version = WaccaConstants.VER_WACCA # Game version - self.data = WaccaData(cfg) # Database + self.config = cfg # Config file + self.game_config = game_cfg # Game Config file + self.game = WaccaConstants.GAME_CODE # Game code + self.version = WaccaConstants.VER_WACCA # Game version + self.data = WaccaData(cfg) # Database self.logger = logging.getLogger("wacca") self.srvtime = datetime.now() self.season = 1 @@ -29,7 +30,6 @@ class WaccaBase(): "note_color": 203001, "bgm_volume": 10, "bg_video": 0, - "mirror": 0, "judge_display_pos": 0, "judge_detail_display": 0, @@ -57,35 +57,39 @@ class WaccaBase(): "bonus_note_vol": 8, "gate_skip": 0, "key_beam_display": 1, - "left_slide_note_color": 4, "right_slide_note_color": 3, "forward_slide_note_color": 1, "back_slide_note_color": 2, - "master_vol": 3, "set_title_id": 104001, "set_icon_id": 102001, "set_nav_id": 210001, - "set_plate_id": 211001 + "set_plate_id": 211001, } self.allowed_stages = [] - prefecture_name = inflection.underscore(game_cfg.server.prefecture_name).replace(' ', '_').upper() + prefecture_name = ( + inflection.underscore(game_cfg.server.prefecture_name) + .replace(" ", "_") + .upper() + ) if prefecture_name not in [region.name for region in WaccaConstants.Region]: - self.logger.warning(f"Invalid prefecture name {game_cfg.server.prefecture_name} in config file") + self.logger.warning( + f"Invalid prefecture name {game_cfg.server.prefecture_name} in config file" + ) self.region_id = WaccaConstants.Region.HOKKAIDO - + else: self.region_id = WaccaConstants.Region[prefecture_name] - + def handle_housing_get_request(self, data: Dict) -> Dict: req = BaseRequest(data) housing_id = 1337 self.logger.info(f"{req.chipId} -> {housing_id}") resp = HousingGetResponse(housing_id) return resp.make() - + def handle_advertise_GetRanking_request(self, data: Dict) -> Dict: req = AdvertiseGetRankingRequest(data) return AdvertiseGetRankingResponse().make() @@ -100,25 +104,27 @@ class WaccaBase(): if req.appVersion.country == AllnetCountryCode.JAPAN.value: if allnet_region_id is not None: - region = WaccaConstants.allnet_region_id_to_wacca_region(allnet_region_id) - + region = WaccaConstants.allnet_region_id_to_wacca_region( + allnet_region_id + ) + if region is None: region_id = self.region_id else: region_id = region - + else: region_id = self.region_id - + elif req.appVersion.country in WaccaConstants.VALID_COUNTRIES: region_id = WaccaConstants.Region[req.appVersion.country] - + else: region_id = WaccaConstants.Region.NONE resp = HousingStartResponseV1(region_id) return resp.make() - + def handle_advertise_GetNews_request(self, data: Dict) -> Dict: resp = GetNewsResponseV1() return resp.make() @@ -128,7 +134,7 @@ class WaccaBase(): self.logger.info(f"Log out user {req.userId} from {req.chipId}") return BaseResponse().make() - def handle_user_status_get_request(self, data: Dict)-> Dict: + def handle_user_status_get_request(self, data: Dict) -> Dict: req = UserStatusGetRequest(data) resp = UserStatusGetV1Response() @@ -137,13 +143,13 @@ class WaccaBase(): self.logger.info(f"No user exists for aime id {req.aimeId}") resp.profileStatus = ProfileStatus.ProfileRegister return resp.make() - + self.logger.info(f"User preview for {req.aimeId} from {req.chipId}") if profile["last_game_ver"] is None: resp.lastGameVersion = ShortVersion(str(req.appVersion)) else: resp.lastGameVersion = ShortVersion(profile["last_game_ver"]) - + resp.userStatus.userId = profile["id"] resp.userStatus.username = profile["username"] resp.userStatus.xp = profile["xp"] @@ -152,25 +158,29 @@ class WaccaBase(): resp.userStatus.wp = profile["wp"] resp.userStatus.useCount = profile["login_count"] - set_title_id = self.data.profile.get_options(WaccaConstants.OPTIONS["set_title_id"], profile["user"]) + set_title_id = self.data.profile.get_options( + WaccaConstants.OPTIONS["set_title_id"], profile["user"] + ) if set_title_id is None: set_title_id = self.OPTIONS_DEFAULTS["set_title_id"] resp.setTitleId = set_title_id - set_icon_id = self.data.profile.get_options(WaccaConstants.OPTIONS["set_title_id"], profile["user"]) + set_icon_id = self.data.profile.get_options( + WaccaConstants.OPTIONS["set_title_id"], profile["user"] + ) if set_icon_id is None: set_icon_id = self.OPTIONS_DEFAULTS["set_icon_id"] - resp.setIconId = set_icon_id - + resp.setIconId = set_icon_id + if req.appVersion > resp.lastGameVersion: resp.versionStatus = PlayVersionStatus.VersionUpgrade - + elif req.appVersion < resp.lastGameVersion: resp.versionStatus = PlayVersionStatus.VersionTooNew - + return resp.make() - def handle_user_status_login_request(self, data: Dict)-> Dict: + def handle_user_status_login_request(self, data: Dict) -> Dict: req = UserStatusLoginRequest(data) resp = UserStatusLoginResponseV1() is_new_day = False @@ -180,66 +190,98 @@ class WaccaBase(): if req.userId == 0: self.logger.info(f"Guest login on {req.chipId}") resp.lastLoginDate = 0 - + else: profile = self.data.profile.get_profile(req.userId) if profile is None: - self.logger.warn(f"Unknown user id {req.userId} attempted login from {req.chipId}") + self.logger.warn( + f"Unknown user id {req.userId} attempted login from {req.chipId}" + ) return resp.make() self.logger.info(f"User {req.userId} login on {req.chipId}") last_login_time = int(profile["last_login_date"].timestamp()) resp.lastLoginDate = last_login_time - - # If somebodies login timestamp < midnight of current day, then they are logging in for the first time today - if last_login_time < int(datetime.now().replace(hour=0,minute=0,second=0,microsecond=0).timestamp()): + + # If somebodies login timestamp < midnight of current day, then they are logging in for the first time today + if last_login_time < int( + datetime.now() + .replace(hour=0, minute=0, second=0, microsecond=0) + .timestamp() + ): is_new_day = True is_consec_day = True # If somebodies login timestamp > midnight of current day + 1 day, then they broke their daily login streak - elif last_login_time > int((datetime.now().replace(hour=0,minute=0,second=0,microsecond=0) + timedelta(days=1)).timestamp()): + elif last_login_time > int( + ( + datetime.now().replace(hour=0, minute=0, second=0, microsecond=0) + + timedelta(days=1) + ).timestamp() + ): is_consec_day = False # else, they are simply logging in again on the same day, and we don't need to do anything for that - + self.data.profile.session_login(req.userId, is_new_day, is_consec_day) resp.firstLoginDaily = int(is_new_day) - + return resp.make() - - def handle_user_status_create_request(self, data: Dict)-> Dict: + + def handle_user_status_create_request(self, data: Dict) -> Dict: req = UserStatusCreateRequest(data) - profileId = self.data.profile.create_profile(req.aimeId, req.username, self.version) + profileId = self.data.profile.create_profile( + req.aimeId, req.username, self.version + ) - if profileId is None: return BaseResponse().make() + if profileId is None: + return BaseResponse().make() # Insert starting items self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["title"], 104001) self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["title"], 104002) self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["title"], 104003) self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["title"], 104005) - + self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["icon"], 102001) self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["icon"], 102002) - - self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["note_color"], 103001) - self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["note_color"], 203001) - - self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["note_sound"], 105001) - self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["note_sound"], 205005) # Added lily - - self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210001) - self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["user_plate"], 211001) # Added lily + self.data.item.put_item( + req.aimeId, WaccaConstants.ITEM_TYPES["note_color"], 103001 + ) + self.data.item.put_item( + req.aimeId, WaccaConstants.ITEM_TYPES["note_color"], 203001 + ) + + self.data.item.put_item( + req.aimeId, WaccaConstants.ITEM_TYPES["note_sound"], 105001 + ) + self.data.item.put_item( + req.aimeId, WaccaConstants.ITEM_TYPES["note_sound"], 205005 + ) # Added lily + + self.data.item.put_item( + req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210001 + ) + + self.data.item.put_item( + req.aimeId, WaccaConstants.ITEM_TYPES["user_plate"], 211001 + ) # Added lily + + self.data.item.put_item( + req.aimeId, WaccaConstants.ITEM_TYPES["touch_effect"], 312000 + ) # Added reverse + self.data.item.put_item( + req.aimeId, WaccaConstants.ITEM_TYPES["touch_effect"], 312001 + ) # Added reverse + self.data.item.put_item( + req.aimeId, WaccaConstants.ITEM_TYPES["touch_effect"], 312002 + ) # Added reverse - self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["touch_effect"], 312000) # Added reverse - self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["touch_effect"], 312001) # Added reverse - self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["touch_effect"], 312002) # Added reverse - return UserStatusCreateResponseV2(profileId, req.username).make() - def handle_user_status_getDetail_request(self, data: Dict)-> Dict: + def handle_user_status_getDetail_request(self, data: Dict) -> Dict: req = UserStatusGetDetailRequest(data) resp = UserStatusGetDetailResponseV1() @@ -256,7 +298,7 @@ class WaccaBase(): profile_song_unlocks = self.data.item.get_song_unlocks(user_id) profile_options = self.data.profile.get_options(user_id) profile_trophies = self.data.item.get_trophies(user_id) - profile_tickets = self.data.item.get_tickets(user_id) + profile_tickets = self.data.item.get_tickets(user_id) resp.songUpdateTime = int(profile["last_login_date"].timestamp()) resp.songPlayStatus = [profile["last_song_id"], 1] @@ -271,29 +313,41 @@ class WaccaBase(): if self.game_config.mods.infinite_wp: resp.userStatus.wp = 999999 - + if profile["friend_view_1"] is not None: pass if profile["friend_view_2"] is not None: pass if profile["friend_view_3"] is not None: pass - - resp.seasonalPlayModeCounts.append(PlayModeCounts(self.season, 1, profile["playcount_single"])) - resp.seasonalPlayModeCounts.append(PlayModeCounts(self.season, 2, profile["playcount_multi_vs"])) - resp.seasonalPlayModeCounts.append(PlayModeCounts(self.season, 3, profile["playcount_multi_coop"])) - resp.seasonalPlayModeCounts.append(PlayModeCounts(self.season, 4, profile["playcount_stageup"])) - + + resp.seasonalPlayModeCounts.append( + PlayModeCounts(self.season, 1, profile["playcount_single"]) + ) + resp.seasonalPlayModeCounts.append( + PlayModeCounts(self.season, 2, profile["playcount_multi_vs"]) + ) + resp.seasonalPlayModeCounts.append( + PlayModeCounts(self.season, 3, profile["playcount_multi_coop"]) + ) + resp.seasonalPlayModeCounts.append( + PlayModeCounts(self.season, 4, profile["playcount_stageup"]) + ) + for opt in profile_options: resp.options.append(UserOption(opt["opt_id"], opt["value"])) - + for unlock in profile_song_unlocks: for x in range(1, unlock["highest_difficulty"] + 1): - resp.userItems.songUnlocks.append(SongUnlock(unlock["song_id"], x, 0, int(unlock["acquire_date"].timestamp()))) - + resp.userItems.songUnlocks.append( + SongUnlock( + unlock["song_id"], x, 0, int(unlock["acquire_date"].timestamp()) + ) + ) + for song in profile_scores: resp.seasonInfo.cumulativeScore += song["score"] - + clear_cts = SongDetailClearCounts( song["play_ct"], song["clear_ct"], @@ -303,13 +357,20 @@ class WaccaBase(): ) grade_cts = SongDetailGradeCountsV1( - song["grade_d_ct"], song["grade_c_ct"], song["grade_b_ct"], song["grade_a_ct"], song["grade_aa_ct"], - song["grade_aaa_ct"], song["grade_s_ct"], song["grade_ss_ct"], song["grade_sss_ct"], - song["grade_master_ct"] + song["grade_d_ct"], + song["grade_c_ct"], + song["grade_b_ct"], + song["grade_a_ct"], + song["grade_aa_ct"], + song["grade_aaa_ct"], + song["grade_s_ct"], + song["grade_ss_ct"], + song["grade_sss_ct"], + song["grade_master_ct"], ) deets = BestScoreDetailV1(song["song_id"], song["chart_id"]) - deets.clearCounts = clear_cts + deets.clearCounts = clear_cts deets.clearCountsSeason = clear_cts deets.gradeCounts = grade_cts deets.score = song["score"] @@ -318,9 +379,16 @@ class WaccaBase(): deets.rating = song["rating"] resp.scores.append(deets) - + for trophy in profile_trophies: - resp.userItems.trophies.append(TrophyItem(trophy["trophy_id"], trophy["season"], trophy["progress"], trophy["badge_type"])) + resp.userItems.trophies.append( + TrophyItem( + trophy["trophy_id"], + trophy["season"], + trophy["progress"], + trophy["badge_type"], + ) + ) if self.game_config.mods.infinite_tickets: for x in range(5): @@ -332,21 +400,31 @@ class WaccaBase(): else: expire = int(ticket["expire_date"].timestamp()) - resp.userItems.tickets.append(TicketItem(ticket["id"], ticket["ticket_id"], expire)) + resp.userItems.tickets.append( + TicketItem(ticket["id"], ticket["ticket_id"], expire) + ) if profile_items: for item in profile_items: try: - if item["type"] == WaccaConstants.ITEM_TYPES["icon"]: - resp.userItems.icons.append(IconItem(item["item_id"], 1, item["use_count"], int(item["acquire_date"].timestamp()))) + resp.userItems.icons.append( + IconItem( + item["item_id"], + 1, + item["use_count"], + int(item["acquire_date"].timestamp()), + ) + ) else: - itm_send = GenericItemSend(item["item_id"], 1, int(item["acquire_date"].timestamp())) + itm_send = GenericItemSend( + item["item_id"], 1, int(item["acquire_date"].timestamp()) + ) if item["type"] == WaccaConstants.ITEM_TYPES["title"]: resp.userItems.titles.append(itm_send) - + elif item["type"] == WaccaConstants.ITEM_TYPES["note_color"]: resp.userItems.noteColors.append(itm_send) @@ -354,7 +432,9 @@ class WaccaBase(): resp.userItems.noteSounds.append(itm_send) except: - self.logger.error(f"{__name__} Failed to load item {item['item_id']} for user {profile['user']}") + self.logger.error( + f"{__name__} Failed to load item {item['item_id']} for user {profile['user']}" + ) resp.seasonInfo.level = profile["xp"] resp.seasonInfo.wpObtained = profile["wp_total"] @@ -365,26 +445,28 @@ class WaccaBase(): resp.seasonInfo.noteSoundsObtained = len(resp.userItems.noteSounds) return resp.make() - - def handle_user_trial_get_request(self, data: Dict)-> Dict: + + def handle_user_trial_get_request(self, data: Dict) -> Dict: req = UserTrialGetRequest(data) resp = UserTrialGetResponse() - + user_id = self.data.profile.profile_to_aime_user(req.profileId) if user_id is None: - self.logger.error(f"handle_user_trial_get_request: No profile with id {req.profileId}") + self.logger.error( + f"handle_user_trial_get_request: No profile with id {req.profileId}" + ) return resp.make() self.logger.info(f"Get trial info for user {req.profileId}") stages = self.data.score.get_stageup(user_id, self.version) if stages is None: stages = [] - + tmp: List[StageInfo] = [] for d in self.allowed_stages: stage_info = StageInfo(d[0], d[1]) - + for score in stages: if score["stage_id"] == stage_info.danId: stage_info.clearStatus = score["clear_status"] @@ -393,38 +475,55 @@ class WaccaBase(): stage_info.song2BestScore = score["song2_score"] stage_info.song3BestScore = score["song3_score"] break - + tmp.append(stage_info) for x in range(len(tmp)): - if tmp[x].danLevel >= 10 and (tmp[x + 1].clearStatus >= 1 or tmp[x].clearStatus >= 1): + if tmp[x].danLevel >= 10 and ( + tmp[x + 1].clearStatus >= 1 or tmp[x].clearStatus >= 1 + ): resp.stageList.append(tmp[x]) elif tmp[x].danLevel < 10: resp.stageList.append(tmp[x]) return resp.make() - def handle_user_trial_update_request(self, data: Dict)-> Dict: + def handle_user_trial_update_request(self, data: Dict) -> Dict: req = UserTrialUpdateRequest(data) total_score = 0 for score in req.songScores: total_score += score - + while len(req.songScores) < 3: req.songScores.append(0) profile = self.data.profile.get_profile(req.profileId) - - user_id = profile["user"] - old_stage = self.data.score.get_stageup_stage(user_id, self.version, req.stageId) - if old_stage is None: - self.data.score.put_stageup(user_id, self.version, req.stageId, req.clearType.value, req.numSongsCleared, req.songScores[0], req.songScores[1], req.songScores[2]) - + user_id = profile["user"] + old_stage = self.data.score.get_stageup_stage( + user_id, self.version, req.stageId + ) + + if old_stage is None: + self.data.score.put_stageup( + user_id, + self.version, + req.stageId, + req.clearType.value, + req.numSongsCleared, + req.songScores[0], + req.songScores[1], + req.songScores[2], + ) + else: # We only care about total score for best of, even if one score happens to be lower (I think) - if total_score > (old_stage["song1_score"] + old_stage["song2_score"] + old_stage["song3_score"]): + if total_score > ( + old_stage["song1_score"] + + old_stage["song2_score"] + + old_stage["song3_score"] + ): best_score1 = req.songScores[0] best_score2 = req.songScores[1] best_score3 = req.songScores[2] @@ -433,18 +532,37 @@ class WaccaBase(): best_score2 = old_stage["song2_score"] best_score3 = old_stage["song3_score"] - self.data.score.put_stageup(user_id, self.version, req.stageId, req.clearType.value, req.numSongsCleared, - best_score1, best_score2, best_score3) - - if req.stageLevel > 0 and req.stageLevel <= 14 and req.clearType.value > 0: # For some reason, special stages send dan level 1001... - if req.stageLevel > profile["dan_level"] or (req.stageLevel == profile["dan_level"] and req.clearType.value > profile["dan_type"]): - self.data.profile.update_profile_dan(req.profileId, req.stageLevel, req.clearType.value) + self.data.score.put_stageup( + user_id, + self.version, + req.stageId, + req.clearType.value, + req.numSongsCleared, + best_score1, + best_score2, + best_score3, + ) + + if ( + req.stageLevel > 0 and req.stageLevel <= 14 and req.clearType.value > 0 + ): # For some reason, special stages send dan level 1001... + if req.stageLevel > profile["dan_level"] or ( + req.stageLevel == profile["dan_level"] + and req.clearType.value > profile["dan_type"] + ): + self.data.profile.update_profile_dan( + req.profileId, req.stageLevel, req.clearType.value + ) self.util_put_items(req.profileId, user_id, req.itemsObtained) # user/status/update isn't called after stageup so we have to do some things now - current_icon = self.data.profile.get_options(user_id, WaccaConstants.OPTIONS["set_icon_id"]) - current_nav = self.data.profile.get_options(user_id, WaccaConstants.OPTIONS["set_nav_id"]) + current_icon = self.data.profile.get_options( + user_id, WaccaConstants.OPTIONS["set_icon_id"] + ) + current_nav = self.data.profile.get_options( + user_id, WaccaConstants.OPTIONS["set_nav_id"] + ) if current_icon is None: current_icon = self.OPTIONS_DEFAULTS["set_icon_id"] @@ -455,56 +573,74 @@ class WaccaBase(): else: current_nav = current_nav["value"] - self.data.item.put_item(user_id, WaccaConstants.ITEM_TYPES["icon"], current_icon) - self.data.item.put_item(user_id, WaccaConstants.ITEM_TYPES["navigator"], current_nav) - self.data.profile.update_profile_playtype(req.profileId, 4, data["appVersion"][:7]) + self.data.item.put_item( + user_id, WaccaConstants.ITEM_TYPES["icon"], current_icon + ) + self.data.item.put_item( + user_id, WaccaConstants.ITEM_TYPES["navigator"], current_nav + ) + self.data.profile.update_profile_playtype( + req.profileId, 4, data["appVersion"][:7] + ) return BaseResponse().make() - - def handle_user_sugoroku_update_request(self, data: Dict)-> Dict: + + def handle_user_sugoroku_update_request(self, data: Dict) -> Dict: ver_split = data["appVersion"].split(".") resp = BaseResponse() if int(ver_split[0]) <= 2 and int(ver_split[1]) < 53: req = UserSugarokuUpdateRequestV1(data) mission_flg = 0 - + else: req = UserSugarokuUpdateRequestV2(data) mission_flg = req.mission_flag user_id = self.data.profile.profile_to_aime_user(req.profileId) - if user_id is None: - self.logger.info(f"handle_user_sugoroku_update_request unknwon profile ID {req.profileId}") + if user_id is None: + self.logger.info( + f"handle_user_sugoroku_update_request unknwon profile ID {req.profileId}" + ) return resp.make() self.util_put_items(req.profileId, user_id, req.itemsObtainted) - self.data.profile.update_gate(user_id, req.gateId, req.page, req.progress, req.loops, mission_flg, req.totalPts) + self.data.profile.update_gate( + user_id, + req.gateId, + req.page, + req.progress, + req.loops, + mission_flg, + req.totalPts, + ) return resp.make() - - def handle_user_info_getMyroom_request(self, data: Dict)-> Dict: + + def handle_user_info_getMyroom_request(self, data: Dict) -> Dict: return UserInfogetMyroomResponseV1().make() - - def handle_user_music_unlock_request(self, data: Dict)-> Dict: + + def handle_user_music_unlock_request(self, data: Dict) -> Dict: req = UserMusicUnlockRequest(data) profile = self.data.profile.get_profile(req.profileId) - if profile is None: return BaseResponse().make() + if profile is None: + return BaseResponse().make() user_id = profile["user"] current_wp = profile["wp"] tickets = self.data.item.get_tickets(user_id) new_tickets = [] - + for ticket in tickets: new_tickets.append([ticket["id"], ticket["ticket_id"], 9999999999]) - + for item in req.itemsUsed: if item.itemType == WaccaConstants.ITEM_TYPES["wp"]: if current_wp >= item.quantity: current_wp -= item.quantity self.data.profile.spend_wp(req.profileId, item.quantity) - else: return BaseResponse().make() + else: + return BaseResponse().make() elif item.itemType == WaccaConstants.ITEM_TYPES["ticket"]: for x in range(len(new_tickets)): @@ -515,12 +651,22 @@ class WaccaBase(): # wp, ticket info if req.difficulty > WaccaConstants.Difficulty.HARD.value: - old_score = self.data.score.get_best_score(user_id, req.songId, req.difficulty) + old_score = self.data.score.get_best_score( + user_id, req.songId, req.difficulty + ) if not old_score: - self.data.score.put_best_score(user_id, req.songId, req.difficulty, 0, [0] * 5, [0] * 13, 0, 0) - - self.data.item.unlock_song(user_id, req.songId, req.difficulty if req.difficulty > WaccaConstants.Difficulty.HARD.value else WaccaConstants.Difficulty.HARD.value) - + self.data.score.put_best_score( + user_id, req.songId, req.difficulty, 0, [0] * 5, [0] * 13, 0, 0 + ) + + self.data.item.unlock_song( + user_id, + req.songId, + req.difficulty + if req.difficulty > WaccaConstants.Difficulty.HARD.value + else WaccaConstants.Difficulty.HARD.value, + ) + if self.game_config.mods.infinite_tickets: new_tickets = [ [0, 106002, 0], @@ -529,18 +675,18 @@ class WaccaBase(): [3, 106002, 0], [4, 106002, 0], ] - + if self.game_config.mods.infinite_wp: current_wp = 999999 return UserMusicUnlockResponse(current_wp, new_tickets).make() - - def handle_user_info_getRanking_request(self, data: Dict)-> Dict: + + def handle_user_info_getRanking_request(self, data: Dict) -> Dict: # total score, high score by song, cumulative socre, stage up score, other score, WP ranking # This likely requies calculating standings at regular intervals and caching the results return UserInfogetRankingResponse().make() - - def handle_user_music_update_request(self, data: Dict)-> Dict: + + def handle_user_music_update_request(self, data: Dict) -> Dict: ver_split = data["appVersion"].split(".") if int(ver_split[0]) >= 3: resp = UserMusicUpdateResponseV3() @@ -556,27 +702,49 @@ class WaccaBase(): resp.songDetail.difficulty = req.songDetail.difficulty if req.profileId == 0: - self.logger.info(f"Guest score for song {req.songDetail.songId} difficulty {req.songDetail.difficulty}") + self.logger.info( + f"Guest score for song {req.songDetail.songId} difficulty {req.songDetail.difficulty}" + ) return resp.make() - + profile = self.data.profile.get_profile(req.profileId) - + if profile is None: - self.logger.warn(f"handle_user_music_update_request: No profile for game_id {req.profileId}") + self.logger.warn( + f"handle_user_music_update_request: No profile for game_id {req.profileId}" + ) return resp.make() - + user_id = profile["user"] self.util_put_items(req.profileId, user_id, req.itemsObtained) - playlog_clear_status = req.songDetail.flagCleared + req.songDetail.flagMissless + req.songDetail.flagFullcombo + \ - req.songDetail.flagAllMarvelous - - self.data.score.put_playlog(user_id, req.songDetail.songId, req.songDetail.difficulty, req.songDetail.score, - playlog_clear_status, req.songDetail.grade.value, req.songDetail.maxCombo, req.songDetail.judgements.marvCt, - req.songDetail.judgements.greatCt, req.songDetail.judgements.goodCt, req.songDetail.judgements.missCt, - req.songDetail.fastCt, req.songDetail.slowCt, self.season) + playlog_clear_status = ( + req.songDetail.flagCleared + + req.songDetail.flagMissless + + req.songDetail.flagFullcombo + + req.songDetail.flagAllMarvelous + ) - old_score = self.data.score.get_best_score(user_id, req.songDetail.songId, req.songDetail.difficulty) + self.data.score.put_playlog( + user_id, + req.songDetail.songId, + req.songDetail.difficulty, + req.songDetail.score, + playlog_clear_status, + req.songDetail.grade.value, + req.songDetail.maxCombo, + req.songDetail.judgements.marvCt, + req.songDetail.judgements.greatCt, + req.songDetail.judgements.goodCt, + req.songDetail.judgements.missCt, + req.songDetail.fastCt, + req.songDetail.slowCt, + self.season, + ) + + old_score = self.data.score.get_best_score( + user_id, req.songDetail.songId, req.songDetail.difficulty + ) if not old_score: grades = [0] * 13 @@ -590,9 +758,17 @@ class WaccaBase(): grades[req.songDetail.grade.value - 1] = 1 - self.data.score.put_best_score(user_id, req.songDetail.songId, req.songDetail.difficulty, req.songDetail.score, - clears, grades, req.songDetail.maxCombo, req.songDetail.judgements.missCt) - + self.data.score.put_best_score( + user_id, + req.songDetail.songId, + req.songDetail.difficulty, + req.songDetail.score, + clears, + grades, + req.songDetail.maxCombo, + req.songDetail.judgements.missCt, + ) + resp.songDetail.score = req.songDetail.score resp.songDetail.lowestMissCount = req.songDetail.judgements.missCt @@ -630,60 +806,76 @@ class WaccaBase(): best_score = max(req.songDetail.score, old_score["score"]) best_max_combo = max(req.songDetail.maxCombo, old_score["best_combo"]) - lowest_miss_ct = min(req.songDetail.judgements.missCt, old_score["lowest_miss_ct"]) - best_rating = max(self.util_calc_song_rating(req.songDetail.score, req.songDetail.level), old_score["rating"]) - - self.data.score.put_best_score(user_id, req.songDetail.songId, req.songDetail.difficulty, best_score, clears, - grades, best_max_combo, lowest_miss_ct) - + lowest_miss_ct = min( + req.songDetail.judgements.missCt, old_score["lowest_miss_ct"] + ) + best_rating = max( + self.util_calc_song_rating(req.songDetail.score, req.songDetail.level), + old_score["rating"], + ) + + self.data.score.put_best_score( + user_id, + req.songDetail.songId, + req.songDetail.difficulty, + best_score, + clears, + grades, + best_max_combo, + lowest_miss_ct, + ) + resp.songDetail.score = best_score resp.songDetail.lowestMissCount = lowest_miss_ct resp.songDetail.rating = best_rating resp.songDetail.clearCounts = SongDetailClearCounts(counts=clears) resp.songDetail.clearCountsSeason = SongDetailClearCounts(counts=clears) - + if int(ver_split[0]) >= 3: resp.songDetail.grades = SongDetailGradeCountsV2(counts=grades) else: resp.songDetail.grades = SongDetailGradeCountsV1(counts=grades) return resp.make() - - #TODO: Coop and vs data - def handle_user_music_updateCoop_request(self, data: Dict)-> Dict: + + # TODO: Coop and vs data + def handle_user_music_updateCoop_request(self, data: Dict) -> Dict: coop_info = data["params"][4] return self.handle_user_music_update_request(data) - def handle_user_music_updateVersus_request(self, data: Dict)-> Dict: + def handle_user_music_updateVersus_request(self, data: Dict) -> Dict: vs_info = data["params"][4] return self.handle_user_music_update_request(data) - - def handle_user_music_updateTrial_request(self, data: Dict)-> Dict: + + def handle_user_music_updateTrial_request(self, data: Dict) -> Dict: return self.handle_user_music_update_request(data) - def handle_user_mission_update_request(self, data: Dict)-> Dict: + def handle_user_mission_update_request(self, data: Dict) -> Dict: req = UserMissionUpdateRequest(data) page_status = req.params[1][1] profile = self.data.profile.get_profile(req.profileId) if profile is None: return BaseResponse().make() - + if len(req.itemsObtained) > 0: self.util_put_items(req.profileId, profile["user"], req.itemsObtained) - - self.data.profile.update_bingo(profile["user"], req.bingoDetail.pageNumber, page_status) + + self.data.profile.update_bingo( + profile["user"], req.bingoDetail.pageNumber, page_status + ) self.data.profile.update_tutorial_flags(req.profileId, req.params[3]) return BaseResponse().make() - def handle_user_goods_purchase_request(self, data: Dict)-> Dict: + def handle_user_goods_purchase_request(self, data: Dict) -> Dict: req = UserGoodsPurchaseRequest(data) resp = UserGoodsPurchaseResponse() profile = self.data.profile.get_profile(req.profileId) - if profile is None: return BaseResponse().make() + if profile is None: + return BaseResponse().make() user_id = profile["user"] resp.currentWp = profile["wp"] @@ -691,61 +883,81 @@ class WaccaBase(): if req.purchaseType == PurchaseType.PurchaseTypeWP: resp.currentWp -= req.cost self.data.profile.spend_wp(req.profileId, req.cost) - - elif req.purchaseType == PurchaseType.PurchaseTypeCredit: - self.logger.info(f"User {req.profileId} Purchased item {req.itemObtained.itemType} id {req.itemObtained.itemId} for {req.cost} credits on machine {req.chipId}") - self.util_put_items(req.profileId ,user_id, [req.itemObtained]) + elif req.purchaseType == PurchaseType.PurchaseTypeCredit: + self.logger.info( + f"User {req.profileId} Purchased item {req.itemObtained.itemType} id {req.itemObtained.itemId} for {req.cost} credits on machine {req.chipId}" + ) + + self.util_put_items(req.profileId, user_id, [req.itemObtained]) if self.game_config.mods.infinite_tickets: for x in range(5): resp.tickets.append(TicketItem(x, 106002, 0)) else: tickets = self.data.item.get_tickets(user_id) - + for ticket in tickets: - resp.tickets.append(TicketItem(ticket["id"], ticket["ticket_id"], int((self.srvtime + timedelta(days=30)).timestamp()))) - + resp.tickets.append( + TicketItem( + ticket["id"], + ticket["ticket_id"], + int((self.srvtime + timedelta(days=30)).timestamp()), + ) + ) + if self.game_config.mods.infinite_wp: resp.currentWp = 999999 return resp.make() - def handle_competition_status_login_request(self, data: Dict)-> Dict: + def handle_competition_status_login_request(self, data: Dict) -> Dict: return BaseResponse().make() - def handle_competition_status_update_request(self, data: Dict)-> Dict: + def handle_competition_status_update_request(self, data: Dict) -> Dict: return BaseResponse().make() - def handle_user_rating_update_request(self, data: Dict)-> Dict: + def handle_user_rating_update_request(self, data: Dict) -> Dict: req = UserRatingUpdateRequest(data) user_id = self.data.profile.profile_to_aime_user(req.profileId) if user_id is None: - self.logger.error(f"handle_user_rating_update_request: No profild with ID {req.profileId}") + self.logger.error( + f"handle_user_rating_update_request: No profild with ID {req.profileId}" + ) return BaseResponse().make() for song in req.songs: - self.data.score.update_song_rating(user_id, song.songId, song.difficulty, song.rating) - + self.data.score.update_song_rating( + user_id, song.songId, song.difficulty, song.rating + ) + self.data.profile.update_user_rating(req.profileId, req.totalRating) return BaseResponse().make() - - def handle_user_status_update_request(self, data: Dict)-> Dict: + + def handle_user_status_update_request(self, data: Dict) -> Dict: req = UserStatusUpdateRequestV1(data) user_id = self.data.profile.profile_to_aime_user(req.profileId) if user_id is None: - self.logger.info(f"handle_user_status_update_request: No profile with ID {req.profileId}") + self.logger.info( + f"handle_user_status_update_request: No profile with ID {req.profileId}" + ) return BaseResponse().make() - + self.util_put_items(req.profileId, user_id, req.itemsRecieved) - self.data.profile.update_profile_playtype(req.profileId, req.playType.value, data["appVersion"][:7]) - - current_icon = self.data.profile.get_options(user_id, WaccaConstants.OPTIONS["set_icon_id"]) - current_nav = self.data.profile.get_options(user_id, WaccaConstants.OPTIONS["set_nav_id"]) + self.data.profile.update_profile_playtype( + req.profileId, req.playType.value, data["appVersion"][:7] + ) + + current_icon = self.data.profile.get_options( + user_id, WaccaConstants.OPTIONS["set_icon_id"] + ) + current_nav = self.data.profile.get_options( + user_id, WaccaConstants.OPTIONS["set_nav_id"] + ) if current_icon is None: current_icon = self.OPTIONS_DEFAULTS["set_icon_id"] @@ -755,12 +967,16 @@ class WaccaBase(): current_nav = self.OPTIONS_DEFAULTS["set_nav_id"] else: current_nav = current_nav["value"] - - self.data.item.put_item(user_id, WaccaConstants.ITEM_TYPES["icon"], current_icon) - self.data.item.put_item(user_id, WaccaConstants.ITEM_TYPES["navigator"], current_nav) + + self.data.item.put_item( + user_id, WaccaConstants.ITEM_TYPES["icon"], current_icon + ) + self.data.item.put_item( + user_id, WaccaConstants.ITEM_TYPES["navigator"], current_nav + ) return BaseResponse().make() - def handle_user_info_update_request(self, data: Dict)-> Dict: + def handle_user_info_update_request(self, data: Dict) -> Dict: req = UserInfoUpdateRequest(data) user_id = self.data.profile.profile_to_aime_user(req.profileId) @@ -769,7 +985,7 @@ class WaccaBase(): self.data.profile.update_option(user_id, opt.opt_id, opt.opt_val) for update in req.datesUpdated: - pass + pass for fav in req.favoritesAdded: self.data.profile.add_favorite_song(user_id, fav) @@ -778,64 +994,96 @@ class WaccaBase(): self.data.profile.remove_favorite_song(user_id, unfav) return BaseResponse().make() - - def handle_user_vip_get_request(self, data: Dict)-> Dict: + + def handle_user_vip_get_request(self, data: Dict) -> Dict: req = UserVipGetRequest(data) resp = UserVipGetResponse() profile = self.data.profile.get_profile(req.profileId) if profile is None: - self.logger.warn(f"handle_user_vip_get_request no profile with ID {req.profileId}") + self.logger.warn( + f"handle_user_vip_get_request no profile with ID {req.profileId}" + ) return BaseResponse().make() - - if "vip_expire_time" in profile and profile["vip_expire_time"] is not None and profile["vip_expire_time"].timestamp() > int(self.srvtime.timestamp()): - resp.vipDays = int((profile["vip_expire_time"].timestamp() - int(self.srvtime.timestamp())) / 86400) - + + if ( + "vip_expire_time" in profile + and profile["vip_expire_time"] is not None + and profile["vip_expire_time"].timestamp() > int(self.srvtime.timestamp()) + ): + resp.vipDays = int( + (profile["vip_expire_time"].timestamp() - int(self.srvtime.timestamp())) + / 86400 + ) + resp.vipDays += 30 - - resp.presents.append(VipLoginBonus(1,0,16,211025,1)) - resp.presents.append(VipLoginBonus(2,0,6,202086,1)) - resp.presents.append(VipLoginBonus(3,0,11,205008,1)) - resp.presents.append(VipLoginBonus(4,0,10,203009,1)) - resp.presents.append(VipLoginBonus(5,0,16,211026,1)) - resp.presents.append(VipLoginBonus(6,0,9,206001,1)) - + + resp.presents.append(VipLoginBonus(1, 0, 16, 211025, 1)) + resp.presents.append(VipLoginBonus(2, 0, 6, 202086, 1)) + resp.presents.append(VipLoginBonus(3, 0, 11, 205008, 1)) + resp.presents.append(VipLoginBonus(4, 0, 10, 203009, 1)) + resp.presents.append(VipLoginBonus(5, 0, 16, 211026, 1)) + resp.presents.append(VipLoginBonus(6, 0, 9, 206001, 1)) + return resp.make() - - def handle_user_vip_start_request(self, data: Dict)-> Dict: + + def handle_user_vip_start_request(self, data: Dict) -> Dict: req = UserVipStartRequest(data) profile = self.data.profile.get_profile(req.profileId) - if profile is None: return BaseResponse().make() + if profile is None: + return BaseResponse().make() # This should never happen because wacca stops you from buying VIP # if you have more then 10 days remaining, but this IS wacca we're dealing with... - if "always_vip" in profile and profile["always_vip"] or self.game_config.mods.always_vip: - return UserVipStartResponse(int((self.srvtime + timedelta(days=req.days)).timestamp())).make() + if ( + "always_vip" in profile + and profile["always_vip"] + or self.game_config.mods.always_vip + ): + return UserVipStartResponse( + int((self.srvtime + timedelta(days=req.days)).timestamp()) + ).make() - vip_exp_time = (self.srvtime + timedelta(days=req.days)) + vip_exp_time = self.srvtime + timedelta(days=req.days) self.data.profile.update_vip_time(req.profileId, vip_exp_time) return UserVipStartResponse(int(vip_exp_time.timestamp())).make() - def util_put_items(self, profile_id: int, user_id: int, items_obtained: List[GenericItemRecv]) -> None: + def util_put_items( + self, profile_id: int, user_id: int, items_obtained: List[GenericItemRecv] + ) -> None: if user_id is None or profile_id <= 0: return None if items_obtained: for item in items_obtained: - if item.itemType == WaccaConstants.ITEM_TYPES["xp"]: self.data.profile.add_xp(profile_id, item.quantity) elif item.itemType == WaccaConstants.ITEM_TYPES["wp"]: self.data.profile.add_wp(profile_id, item.quantity) - - elif item.itemType == WaccaConstants.ITEM_TYPES["music_difficulty_unlock"] or item.itemType == WaccaConstants.ITEM_TYPES["music_unlock"]: + + elif ( + item.itemType + == WaccaConstants.ITEM_TYPES["music_difficulty_unlock"] + or item.itemType == WaccaConstants.ITEM_TYPES["music_unlock"] + ): if item.quantity > WaccaConstants.Difficulty.HARD.value: - old_score = self.data.score.get_best_score(user_id, item.itemId, item.quantity) + old_score = self.data.score.get_best_score( + user_id, item.itemId, item.quantity + ) if not old_score: - self.data.score.put_best_score(user_id, item.itemId, item.quantity, 0, [0] * 5, [0] * 13, 0, 0) - + self.data.score.put_best_score( + user_id, + item.itemId, + item.quantity, + 0, + [0] * 5, + [0] * 13, + 0, + 0, + ) + if item.quantity == 0: item.quantity = WaccaConstants.Difficulty.HARD.value self.data.item.unlock_song(user_id, item.itemId, item.quantity) @@ -844,7 +1092,9 @@ class WaccaBase(): self.data.item.add_ticket(user_id, item.itemId) elif item.itemType == WaccaConstants.ITEM_TYPES["trophy"]: - self.data.item.update_trophy(user_id, item.itemId, self.season, item.quantity, 0) + self.data.item.update_trophy( + user_id, item.itemId, self.season, item.quantity, 0 + ) else: self.data.item.put_item(user_id, item.itemType, item.itemId) @@ -870,6 +1120,7 @@ class WaccaBase(): const = 2.00 elif score >= 900000 and score < 910000: const = 1.00 - else: const = 0.00 + else: + const = 0.00 return floor((difficulty * const) * 10) diff --git a/titles/wacca/config.py b/titles/wacca/config.py index fc03dd8..e96c3f4 100644 --- a/titles/wacca/config.py +++ b/titles/wacca/config.py @@ -1,45 +1,65 @@ from typing import Dict, List from core.config import CoreConfig -class WaccaServerConfig(): + +class WaccaServerConfig: def __init__(self, parent_config: "WaccaConfig") -> None: self.__config = parent_config - + @property def enable(self) -> bool: - return CoreConfig.get_config_field(self.__config, 'wacca', 'server', 'enable', default=True) - + return CoreConfig.get_config_field( + self.__config, "wacca", "server", "enable", default=True + ) + @property def loglevel(self) -> int: - return CoreConfig.str_to_loglevel(CoreConfig.get_config_field(self.__config, 'wacca', 'server', 'loglevel', default="info")) + return CoreConfig.str_to_loglevel( + CoreConfig.get_config_field( + self.__config, "wacca", "server", "loglevel", default="info" + ) + ) @property def prefecture_name(self) -> str: - return CoreConfig.get_config_field(self.__config, 'wacca', 'server', 'prefecture_name', default="Hokkaido") + return CoreConfig.get_config_field( + self.__config, "wacca", "server", "prefecture_name", default="Hokkaido" + ) -class WaccaModsConfig(): + +class WaccaModsConfig: def __init__(self, parent_config: "WaccaConfig") -> None: self.__config = parent_config - + @property def always_vip(self) -> bool: - return CoreConfig.get_config_field(self.__config, 'wacca', 'mods', 'always_vip', default=True) - + return CoreConfig.get_config_field( + self.__config, "wacca", "mods", "always_vip", default=True + ) + @property def infinite_tickets(self) -> bool: - return CoreConfig.get_config_field(self.__config, 'wacca', 'mods', 'infinite_tickets', default=True) + return CoreConfig.get_config_field( + self.__config, "wacca", "mods", "infinite_tickets", default=True + ) @property def infinite_wp(self) -> bool: - return CoreConfig.get_config_field(self.__config, 'wacca', 'mods', 'infinite_wp', default=True) + return CoreConfig.get_config_field( + self.__config, "wacca", "mods", "infinite_wp", default=True + ) -class WaccaGateConfig(): + +class WaccaGateConfig: def __init__(self, parent_config: "WaccaConfig") -> None: self.__config = parent_config @property def enabled_gates(self) -> List[int]: - return CoreConfig.get_config_field(self.__config, 'wacca', 'gates', 'enabled_gates', default=[]) + return CoreConfig.get_config_field( + self.__config, "wacca", "gates", "enabled_gates", default=[] + ) + class WaccaConfig(dict): def __init__(self) -> None: diff --git a/titles/wacca/const.py b/titles/wacca/const.py index f072143..284d236 100644 --- a/titles/wacca/const.py +++ b/titles/wacca/const.py @@ -3,7 +3,8 @@ from typing import Optional from core.const import AllnetJapanRegionId -class WaccaConstants(): + +class WaccaConstants: CONFIG_NAME = "wacca.yaml" GAME_CODE = "SDFE" @@ -51,51 +52,48 @@ class WaccaConstants(): } OPTIONS = { - "note_speed": 1, # 1.0 - 6.0 - "field_mask": 2, # 0-4 - "note_sound": 3, # ID - "note_color": 4, # ID - "bgm_volume": 5, # 0-100 incremements of 10 - "bg_video": 7, # ask, on, or off - - "mirror": 101, # none or left+right swap - "judge_display_pos": 102, # center, under, over, top or off - "judge_detail_display": 103, # on or off - "measure_guidelines": 105, # on or off - "guideline_mask": 106, # 0 - 5 - "judge_line_timing_adjust": 108, # -10 - 10 - "note_design": 110, # 1 - 5 - "bonus_effect": 114, # on or off - "chara_voice": 115, # "usually" or none - "score_display_method": 116, # add or subtract - "give_up": 117, # off, no touch, can't achieve s, ss, sss, pb - "guideline_spacing": 118, # none, or a-g type - "center_display": 119, # none, combo, score add, score sub, s ss sss pb boarder - "ranking_display": 120, # on or off - "stage_up_icon_display": 121, # on or off - "rating_display": 122, # on or off - "player_level_display": 123, # on or off - "touch_effect": 124, # on or off - "guide_sound_vol": 125, # 0-100 incremements of 10 - "touch_note_vol": 126, # 0-100 incremements of 10 - "hold_note_vol": 127, # 0-100 incremements of 10 - "slide_note_vol": 128, # 0-100 incremements of 10 - "snap_note_vol": 129, # 0-100 incremements of 10 - "chain_note_vol": 130, # 0-100 incremements of 10 - "bonus_note_vol": 131, # 0-100 incremements of 10 - "gate_skip": 132, # on or off - "key_beam_display": 133, # on or off - - "left_slide_note_color": 201, # red blue green or orange - "right_slide_note_color": 202, # red blue green or orange - "forward_slide_note_color": 203, # red blue green or orange - "back_slide_note_color": 204, # red blue green or orange - - "master_vol": 1001, # 0-100 incremements of 10 - "set_title_id": 1002, # ID - "set_icon_id": 1003, # ID - "set_nav_id": 1004, # ID - "set_plate_id": 1005, # ID + "note_speed": 1, # 1.0 - 6.0 + "field_mask": 2, # 0-4 + "note_sound": 3, # ID + "note_color": 4, # ID + "bgm_volume": 5, # 0-100 incremements of 10 + "bg_video": 7, # ask, on, or off + "mirror": 101, # none or left+right swap + "judge_display_pos": 102, # center, under, over, top or off + "judge_detail_display": 103, # on or off + "measure_guidelines": 105, # on or off + "guideline_mask": 106, # 0 - 5 + "judge_line_timing_adjust": 108, # -10 - 10 + "note_design": 110, # 1 - 5 + "bonus_effect": 114, # on or off + "chara_voice": 115, # "usually" or none + "score_display_method": 116, # add or subtract + "give_up": 117, # off, no touch, can't achieve s, ss, sss, pb + "guideline_spacing": 118, # none, or a-g type + "center_display": 119, # none, combo, score add, score sub, s ss sss pb boarder + "ranking_display": 120, # on or off + "stage_up_icon_display": 121, # on or off + "rating_display": 122, # on or off + "player_level_display": 123, # on or off + "touch_effect": 124, # on or off + "guide_sound_vol": 125, # 0-100 incremements of 10 + "touch_note_vol": 126, # 0-100 incremements of 10 + "hold_note_vol": 127, # 0-100 incremements of 10 + "slide_note_vol": 128, # 0-100 incremements of 10 + "snap_note_vol": 129, # 0-100 incremements of 10 + "chain_note_vol": 130, # 0-100 incremements of 10 + "bonus_note_vol": 131, # 0-100 incremements of 10 + "gate_skip": 132, # on or off + "key_beam_display": 133, # on or off + "left_slide_note_color": 201, # red blue green or orange + "right_slide_note_color": 202, # red blue green or orange + "forward_slide_note_color": 203, # red blue green or orange + "back_slide_note_color": 204, # red blue green or orange + "master_vol": 1001, # 0-100 incremements of 10 + "set_title_id": 1002, # ID + "set_icon_id": 1003, # ID + "set_nav_id": 1004, # ID + "set_plate_id": 1005, # ID } class Difficulty(Enum): @@ -103,7 +101,7 @@ class WaccaConstants(): HARD = 2 EXPERT = 3 INFERNO = 4 - + class Region(Enum): NONE = 0 HOKKAIDO = 1 @@ -163,7 +161,7 @@ class WaccaConstants(): SGP = 51 KOREA = 52 KOR = 52 - + VALID_COUNTRIES = set(["JPN", "USA", "KOR", "HKG", "SGP"]) @classmethod @@ -174,16 +172,54 @@ class WaccaConstants(): def allnet_region_id_to_wacca_region(cls, region: int) -> Optional[Region]: try: return [ - cls.Region.NONE, cls.Region.AICHI, cls.Region.AOMORI, cls.Region.AKITA, cls.Region.ISHIKAWA, - cls.Region.IBARAKI, cls.Region.IWATE, cls.Region.EHIME, cls.Region.OITA, cls.Region.OSAKA, - cls.Region.OKAYAMA, cls.Region.OKINAWA, cls.Region.KAGAWA, cls.Region.KAGOSHIMA, cls.Region.KANAGAWA, - cls.Region.GIFU, cls.Region.KYOTO, cls.Region.KUMAMOTO, cls.Region.GUNMA, cls.Region.KOCHI, - cls.Region.SAITAMA, cls.Region.SAGA, cls.Region.SHIGA, cls.Region.SHIZUOKA, cls.Region.SHIMANE, - cls.Region.CHIBA, cls.Region.TOKYO, cls.Region.TOKUSHIMA, cls.Region.TOCHIGI, cls.Region.TOTTORI, - cls.Region.TOYAMA, cls.Region.NAGASAKI, cls.Region.NAGANO, cls.Region.NARA, cls.Region.NIIGATA, - cls.Region.HYOGO, cls.Region.HIROSHIMA, cls.Region.FUKUI, cls.Region.FUKUOKA, cls.Region.FUKUSHIMA, - cls.Region.HOKKAIDO, cls.Region.MIE, cls.Region.MIYAGI, cls.Region.MIYAZAKI, cls.Region.YAMAGATA, - cls.Region.YAMAGUCHI, cls.Region.YAMANASHI, cls.Region.WAKAYAMA, + cls.Region.NONE, + cls.Region.AICHI, + cls.Region.AOMORI, + cls.Region.AKITA, + cls.Region.ISHIKAWA, + cls.Region.IBARAKI, + cls.Region.IWATE, + cls.Region.EHIME, + cls.Region.OITA, + cls.Region.OSAKA, + cls.Region.OKAYAMA, + cls.Region.OKINAWA, + cls.Region.KAGAWA, + cls.Region.KAGOSHIMA, + cls.Region.KANAGAWA, + cls.Region.GIFU, + cls.Region.KYOTO, + cls.Region.KUMAMOTO, + cls.Region.GUNMA, + cls.Region.KOCHI, + cls.Region.SAITAMA, + cls.Region.SAGA, + cls.Region.SHIGA, + cls.Region.SHIZUOKA, + cls.Region.SHIMANE, + cls.Region.CHIBA, + cls.Region.TOKYO, + cls.Region.TOKUSHIMA, + cls.Region.TOCHIGI, + cls.Region.TOTTORI, + cls.Region.TOYAMA, + cls.Region.NAGASAKI, + cls.Region.NAGANO, + cls.Region.NARA, + cls.Region.NIIGATA, + cls.Region.HYOGO, + cls.Region.HIROSHIMA, + cls.Region.FUKUI, + cls.Region.FUKUOKA, + cls.Region.FUKUSHIMA, + cls.Region.HOKKAIDO, + cls.Region.MIE, + cls.Region.MIYAGI, + cls.Region.MIYAZAKI, + cls.Region.YAMAGATA, + cls.Region.YAMAGUCHI, + cls.Region.YAMANASHI, + cls.Region.WAKAYAMA, ][region] - except: return None - + except: + return None diff --git a/titles/wacca/database.py b/titles/wacca/database.py index 8d4c8a5..133e22f 100644 --- a/titles/wacca/database.py +++ b/titles/wacca/database.py @@ -2,6 +2,7 @@ from core.data import Data from core.config import CoreConfig from titles.wacca.schema import * + class WaccaData(Data): def __init__(self, cfg: CoreConfig) -> None: super().__init__(cfg) @@ -9,4 +10,4 @@ class WaccaData(Data): self.profile = WaccaProfileData(self.config, self.session) self.score = WaccaScoreData(self.config, self.session) self.item = WaccaItemData(self.config, self.session) - self.static = WaccaStaticData(self.config, self.session) \ No newline at end of file + self.static = WaccaStaticData(self.config, self.session) diff --git a/titles/wacca/frontend.py b/titles/wacca/frontend.py index b7232b8..e4f2be0 100644 --- a/titles/wacca/frontend.py +++ b/titles/wacca/frontend.py @@ -8,17 +8,22 @@ from titles.wacca.database import WaccaData from titles.wacca.config import WaccaConfig from titles.wacca.const import WaccaConstants + class WaccaFrontend(FE_Base): - def __init__(self, cfg: CoreConfig, environment: jinja2.Environment, cfg_dir: str) -> None: + def __init__( + self, cfg: CoreConfig, environment: jinja2.Environment, cfg_dir: str + ) -> None: super().__init__(cfg, environment) self.data = WaccaData(cfg) self.game_cfg = WaccaConfig() self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/wacca.yaml"))) self.nav_name = "Wacca" - + def render_GET(self, request: Request) -> bytes: - template = self.environment.get_template("titles/wacca/frontend/wacca_index.jinja") + template = self.environment.get_template( + "titles/wacca/frontend/wacca_index.jinja" + ) return template.render( title=f"{self.core_config.server.name} | {self.nav_name}", - game_list=self.environment.globals["game_list"] + game_list=self.environment.globals["game_list"], ).encode("utf-16") diff --git a/titles/wacca/handlers/__init__.py b/titles/wacca/handlers/__init__.py index a59c7c1..f084682 100644 --- a/titles/wacca/handlers/__init__.py +++ b/titles/wacca/handlers/__init__.py @@ -6,4 +6,4 @@ from titles.wacca.handlers.user_misc import * from titles.wacca.handlers.user_music import * from titles.wacca.handlers.user_status import * from titles.wacca.handlers.user_trial import * -from titles.wacca.handlers.user_vip import * \ No newline at end of file +from titles.wacca.handlers.user_vip import * diff --git a/titles/wacca/handlers/advertise.py b/titles/wacca/handlers/advertise.py index a0d8d90..56186eb 100644 --- a/titles/wacca/handlers/advertise.py +++ b/titles/wacca/handlers/advertise.py @@ -3,6 +3,7 @@ from typing import List, Dict from titles.wacca.handlers.base import BaseResponse, BaseRequest from titles.wacca.handlers.helpers import Notice + # ---advertise/GetNews--- class GetNewsResponseV1(BaseResponse): def __init__(self) -> None: @@ -19,27 +20,29 @@ class GetNewsResponseV1(BaseResponse): for notice in self.notices: note.append(notice.make()) - - self.params = [ - note, - self.copywrightListings, - self.stoppedSongs, - self.stoppedJackets, - self.stoppedMovies, - self.stoppedIcons + + self.params = [ + note, + self.copywrightListings, + self.stoppedSongs, + self.stoppedJackets, + self.stoppedMovies, + self.stoppedIcons, ] return super().make() -class GetNewsResponseV2(GetNewsResponseV1): + +class GetNewsResponseV2(GetNewsResponseV1): stoppedProducts: list[int] = [] def make(self) -> Dict: super().make() self.params.append(self.stoppedProducts) - + return super(GetNewsResponseV1, self).make() + class GetNewsResponseV3(GetNewsResponseV2): stoppedNavs: list[int] = [] stoppedNavVoices: list[int] = [] @@ -48,18 +51,20 @@ class GetNewsResponseV3(GetNewsResponseV2): super().make() self.params.append(self.stoppedNavs) self.params.append(self.stoppedNavVoices) - + return super(GetNewsResponseV1, self).make() + # ---advertise/GetRanking--- class AdvertiseGetRankingRequest(BaseRequest): def __init__(self, data: Dict) -> None: super().__init__(data) self.resourceVer: int = self.params[0] + class AdvertiseGetRankingResponse(BaseResponse): def __init__(self) -> None: super().__init__() - + def make(self) -> Dict: - return super().make() \ No newline at end of file + return super().make() diff --git a/titles/wacca/handlers/base.py b/titles/wacca/handlers/base.py index d7a2fb2..abfed5f 100644 --- a/titles/wacca/handlers/base.py +++ b/titles/wacca/handlers/base.py @@ -2,7 +2,8 @@ from typing import Dict, List from titles.wacca.handlers.helpers import Version from datetime import datetime -class BaseRequest(): + +class BaseRequest: def __init__(self, data: Dict) -> None: self.requestNo: int = data["requestNo"] self.appVersion: Version = Version(data["appVersion"]) @@ -10,7 +11,8 @@ class BaseRequest(): self.chipId: str = data["chipId"] self.params: List = data["params"] -class BaseResponse(): + +class BaseResponse: def __init__(self) -> None: self.status: int = 0 self.message: str = "" @@ -28,5 +30,5 @@ class BaseResponse(): "maintNoticeTime": self.maintNoticeTime, "maintNotPlayableTime": self.maintNotPlayableTime, "maintStartTime": self.maintStartTime, - "params": self.params + "params": self.params, } diff --git a/titles/wacca/handlers/helpers.py b/titles/wacca/handlers/helpers.py index b96b3dd..9e9847a 100644 --- a/titles/wacca/handlers/helpers.py +++ b/titles/wacca/handlers/helpers.py @@ -3,28 +3,33 @@ from enum import Enum from titles.wacca.const import WaccaConstants + class ShortVersion: - def __init__(self, version: str = "", major = 1, minor = 0, patch = 0) -> None: + def __init__(self, version: str = "", major=1, minor=0, patch=0) -> None: split = version.split(".") if len(split) >= 3: self.major = int(split[0]) self.minor = int(split[1]) self.patch = int(split[2]) - - else: + + else: self.major = major self.minor = minor self.patch = patch - + def __str__(self) -> str: return f"{self.major}.{self.minor}.{self.patch}" - + def __int__(self) -> int: return (self.major * 10000) + (self.minor * 100) + self.patch - + def __eq__(self, other: "ShortVersion"): - return self.major == other.major and self.minor == other.minor and self.patch == other.patch - + return ( + self.major == other.major + and self.minor == other.minor + and self.patch == other.patch + ) + def __gt__(self, other: "ShortVersion"): if self.major > other.major: return True @@ -34,9 +39,9 @@ class ShortVersion: elif self.minor == other.minor: if self.patch > other.patch: return True - + return False - + def __ge__(self, other: "ShortVersion"): if self.major > other.major: return True @@ -46,9 +51,9 @@ class ShortVersion: elif self.minor == other.minor: if self.patch > other.patch or self.patch == other.patch: return True - + return False - + def __lt__(self, other: "ShortVersion"): if self.major < other.major: return True @@ -58,9 +63,9 @@ class ShortVersion: elif self.minor == other.minor: if self.patch < other.patch: return True - + return False - + def __le__(self, other: "ShortVersion"): if self.major < other.major: return True @@ -70,39 +75,45 @@ class ShortVersion: elif self.minor == other.minor: if self.patch < other.patch or self.patch == other.patch: return True - + return False + class Version(ShortVersion): - def __init__(self, version = "", major = 1, minor = 0, patch = 0, country = "JPN", build = 0, role = "C") -> None: + def __init__( + self, version="", major=1, minor=0, patch=0, country="JPN", build=0, role="C" + ) -> None: super().__init__(version, major, minor, patch) split = version.split(".") if len(split) >= 6: - self.country: str = split[3] + self.country: str = split[3] self.build = int(split[4]) self.role: str = split[5] - + else: self.country = country self.build = build self.role = role - + def __str__(self) -> str: return f"{self.major}.{self.minor}.{self.patch}.{self.country}.{self.role}.{self.build}" + class HousingInfo: """ 1 is lan install role, 2 is country """ + id: int = 0 val: str = "" def __init__(self, id: int = 0, val: str = "") -> None: self.id = id self.val = val - + def make(self) -> List: - return [ self.id, self.val ] + return [self.id, self.val] + class Notice: name: str = "" @@ -116,25 +127,44 @@ class Notice: endTime: int = 0 voiceline: int = 0 - def __init__(self, name: str = "", title: str = "", message: str = "", start: int = 0, end: int = 0) -> None: + def __init__( + self, + name: str = "", + title: str = "", + message: str = "", + start: int = 0, + end: int = 0, + ) -> None: self.name = name self.title = title self.message = message self.startTime = start self.endTime = end - + def make(self) -> List: - return [ self.name, self.title, self.message, self.unknown3, self.unknown4, int(self.showTitleScreen), - int(self.showWelcomeScreen), self.startTime, self.endTime, self.voiceline] + return [ + self.name, + self.title, + self.message, + self.unknown3, + self.unknown4, + int(self.showTitleScreen), + int(self.showWelcomeScreen), + self.startTime, + self.endTime, + self.voiceline, + ] + class UserOption: def __init__(self, opt_id: int = 0, opt_val: Any = 0) -> None: self.opt_id = opt_id self.opt_val = opt_val - + def make(self) -> List: return [self.opt_id, self.opt_val] + class UserStatusV1: def __init__(self) -> None: self.userId: int = 0 @@ -160,19 +190,20 @@ class UserStatusV1: self.useCount, ] + class UserStatusV2(UserStatusV1): def __init__(self) -> None: - super().__init__() + super().__init__() self.loginDays: int = 0 self.loginConsecutive: int = 0 self.loginConsecutiveDays: int = 0 self.loginsToday: int = 0 - self.rating: int = 0 + self.rating: int = 0 self.vipExpireTime: int = 0 def make(self) -> List: ret = super().make() - + ret.append(self.loginDays) ret.append(self.loginConsecutive) ret.append(self.loginConsecutiveDays) @@ -182,17 +213,20 @@ class UserStatusV2(UserStatusV1): return ret + class ProfileStatus(Enum): ProfileGood = 0 ProfileRegister = 1 ProfileInUse = 2 ProfileWrongRegion = 3 + class PlayVersionStatus(Enum): VersionGood = 0 VersionTooNew = 1 VersionUpgrade = 2 + class PlayModeCounts: seasonId: int = 0 modeId: int = 0 @@ -202,13 +236,10 @@ class PlayModeCounts: self.seasonId = seasonId self.modeId = modeId self.playNum = playNum - + def make(self) -> List: - return [ - self.seasonId, - self.modeId, - self.playNum - ] + return [self.seasonId, self.modeId, self.playNum] + class SongUnlock: songId: int = 0 @@ -216,76 +247,72 @@ class SongUnlock: whenAppeared: int = 0 whenUnlocked: int = 0 - def __init__(self, song_id: int = 0, difficulty: int = 1, whenAppered: int = 0, whenUnlocked: int = 0) -> None: + def __init__( + self, + song_id: int = 0, + difficulty: int = 1, + whenAppered: int = 0, + whenUnlocked: int = 0, + ) -> None: self.songId = song_id self.difficulty = difficulty self.whenAppeared = whenAppered self.whenUnlocked = whenUnlocked def make(self) -> List: - return [ - self.songId, - self.difficulty, - self.whenAppeared, - self.whenUnlocked - ] + return [self.songId, self.difficulty, self.whenAppeared, self.whenUnlocked] + class GenericItemRecv: def __init__(self, item_type: int = 1, item_id: int = 1, quantity: int = 1) -> None: self.itemId = item_id self.itemType = item_type self.quantity = quantity - + def make(self) -> List: - return [ self.itemType, self.itemId, self.quantity ] + return [self.itemType, self.itemId, self.quantity] + class GenericItemSend: def __init__(self, itemId: int, itemType: int, whenAcquired: int) -> None: self.itemId = itemId self.itemType = itemType self.whenAcquired = whenAcquired - + def make(self) -> List: - return [ - self.itemId, - self.itemType, - self.whenAcquired - ] + return [self.itemId, self.itemType, self.whenAcquired] + class IconItem(GenericItemSend): uses: int = 0 - def __init__(self, itemId: int, itemType: int, uses: int, whenAcquired: int) -> None: + def __init__( + self, itemId: int, itemType: int, uses: int, whenAcquired: int + ) -> None: super().__init__(itemId, itemType, whenAcquired) self.uses = uses - + def make(self) -> List: - return [ - self.itemId, - self.itemType, - self.uses, - self.whenAcquired - ] + return [self.itemId, self.itemType, self.uses, self.whenAcquired] + class TrophyItem: - trophyId: int = 0 + trophyId: int = 0 season: int = 1 progress: int = 0 badgeType: int = 0 - def __init__(self, trophyId: int, season: int, progress: int, badgeType: int) -> None: + def __init__( + self, trophyId: int, season: int, progress: int, badgeType: int + ) -> None: self.trophyId = trophyId - self.season = season + self.season = season self.progress = progress self.badgeType = badgeType - + def make(self) -> List: - return [ - self.trophyId, - self.season, - self.progress, - self.badgeType - ] + return [self.trophyId, self.season, self.progress, self.badgeType] + class TicketItem: userTicketId: int = 0 @@ -296,18 +323,17 @@ class TicketItem: self.userTicketId = userTicketId self.ticketId = ticketId self.whenExpires = whenExpires - + def make(self) -> List: - return [ - self.userTicketId, - self.ticketId, - self.whenExpires - ] + return [self.userTicketId, self.ticketId, self.whenExpires] + class NavigatorItem(IconItem): usesToday: int = 0 - def __init__(self, itemId: int, itemType: int, whenAcquired: int, uses: int, usesToday: int) -> None: + def __init__( + self, itemId: int, itemType: int, whenAcquired: int, uses: int, usesToday: int + ) -> None: super().__init__(itemId, itemType, uses, whenAcquired) self.usesToday = usesToday @@ -317,9 +343,10 @@ class NavigatorItem(IconItem): self.itemType, self.whenAcquired, self.uses, - self.usesToday + self.usesToday, ] + class SkillItem: skill_type: int level: int @@ -327,12 +354,8 @@ class SkillItem: badge: int def make(self) -> List: - return [ - self.skill_type, - self.level, - self.flag, - self.badge - ] + return [self.skill_type, self.level, self.flag, self.badge] + class UserItemInfoV1: def __init__(self) -> None: @@ -383,6 +406,7 @@ class UserItemInfoV1: sounds, ] + class UserItemInfoV2(UserItemInfoV1): def __init__(self) -> None: super().__init__() @@ -391,18 +415,19 @@ class UserItemInfoV2(UserItemInfoV1): def make(self) -> List: ret = super().make() - plates = [] + plates = [] navs = [] - + for x in self.navigators: navs.append(x.make()) for x in self.plates: plates.append(x.make()) - + ret.append(navs) ret.append(plates) return ret + class UserItemInfoV3(UserItemInfoV2): def __init__(self) -> None: super().__init__() @@ -414,29 +439,44 @@ class UserItemInfoV3(UserItemInfoV2): for x in self.touchEffect: effect.append(x.make()) - + ret.append(effect) return ret -class SongDetailClearCounts: - def __init__(self, play_ct: int = 0, clear_ct: int = 0, ml_ct: int = 0, fc_ct: int = 0, - am_ct: int = 0, counts: Optional[List[int]] = None) -> None: + +class SongDetailClearCounts: + def __init__( + self, + play_ct: int = 0, + clear_ct: int = 0, + ml_ct: int = 0, + fc_ct: int = 0, + am_ct: int = 0, + counts: Optional[List[int]] = None, + ) -> None: if counts is None: self.playCt = play_ct self.clearCt = clear_ct self.misslessCt = ml_ct self.fullComboCt = fc_ct self.allMarvelousCt = am_ct - + else: self.playCt = counts[0] self.clearCt = counts[1] self.misslessCt = counts[2] self.fullComboCt = counts[3] self.allMarvelousCt = counts[4] - + def make(self) -> List: - return [self.playCt, self.clearCt, self.misslessCt, self.fullComboCt, self.allMarvelousCt] + return [ + self.playCt, + self.clearCt, + self.misslessCt, + self.fullComboCt, + self.allMarvelousCt, + ] + class SongDetailGradeCountsV1: dCt: int @@ -450,8 +490,20 @@ class SongDetailGradeCountsV1: sssCt: int masterCt: int - def __init__(self, d: int = 0, c: int = 0, b: int = 0, a: int = 0, aa: int = 0, aaa: int = 0, s: int = 0, - ss: int = 0, sss: int = 0, master: int = 0, counts: Optional[List[int]] = None) -> None: + def __init__( + self, + d: int = 0, + c: int = 0, + b: int = 0, + a: int = 0, + aa: int = 0, + aaa: int = 0, + s: int = 0, + ss: int = 0, + sss: int = 0, + master: int = 0, + counts: Optional[List[int]] = None, + ) -> None: if counts is None: self.dCt = d self.cCt = c @@ -463,7 +515,7 @@ class SongDetailGradeCountsV1: self.ssCt = ss self.sssCt = sss self.masterCt = master - + else: self.dCt = counts[0] self.cCt = counts[1] @@ -474,24 +526,51 @@ class SongDetailGradeCountsV1: self.sCt = counts[6] self.ssCt = counts[7] self.sssCt = counts[8] - self.masterCt =counts[9] + self.masterCt = counts[9] def make(self) -> List: - return [self.dCt, self.cCt, self.bCt, self.aCt, self.aaCt, self.aaaCt, self.sCt, self.ssCt, self.sssCt, self.masterCt] + return [ + self.dCt, + self.cCt, + self.bCt, + self.aCt, + self.aaCt, + self.aaaCt, + self.sCt, + self.ssCt, + self.sssCt, + self.masterCt, + ] + class SongDetailGradeCountsV2(SongDetailGradeCountsV1): spCt: int sspCt: int ssspCt: int - def __init__(self, d: int = 0, c: int = 0, b: int = 0, a: int = 0, aa: int = 0, aaa: int = 0, s: int = 0, - ss: int = 0, sss: int = 0, master: int = 0, sp: int = 0, ssp: int = 0, sssp: int = 0, counts: Optional[List[int]] = None) -> None: + def __init__( + self, + d: int = 0, + c: int = 0, + b: int = 0, + a: int = 0, + aa: int = 0, + aaa: int = 0, + s: int = 0, + ss: int = 0, + sss: int = 0, + master: int = 0, + sp: int = 0, + ssp: int = 0, + sssp: int = 0, + counts: Optional[List[int]] = None, + ) -> None: super().__init__(d, c, b, a, aa, aaa, s, ss, sss, master, counts) if counts is None: self.spCt = sp self.sspCt = ssp self.ssspCt = sssp - + else: self.spCt = counts[10] self.sspCt = counts[11] @@ -500,6 +579,7 @@ class SongDetailGradeCountsV2(SongDetailGradeCountsV1): def make(self) -> List: return super().make() + [self.spCt, self.sspCt, self.ssspCt] + class BestScoreDetailV1: songId: int = 0 difficulty: int = 1 @@ -527,49 +607,59 @@ class BestScoreDetailV1: self.bestCombo, self.lowestMissCtMaybe, self.isUnlock, - self.rating + self.rating, ] + class BestScoreDetailV2(BestScoreDetailV1): gradeCounts: SongDetailGradeCountsV2 = SongDetailGradeCountsV2() + class SongUpdateJudgementCounts: marvCt: int greatCt: int goodCt: int missCt: int - def __init__(self, marvs: int = 0, greats: int = 0, goods: int = 0, misses: int = 0) -> None: + def __init__( + self, marvs: int = 0, greats: int = 0, goods: int = 0, misses: int = 0 + ) -> None: self.marvCt = marvs self.greatCt = greats self.goodCt = goods self.missCt = misses - + def make(self) -> List: return [self.marvCt, self.greatCt, self.goodCt, self.missCt] + class SongUpdateDetailV1: - def __init__(self, data: List) -> None: + def __init__(self, data: List) -> None: if data is not None: self.songId = data[0] self.difficulty = data[1] self.level = data[2] self.score = data[3] - - self.judgements = SongUpdateJudgementCounts(data[4][0], data[4][1], data[4][2], data[4][3]) + + self.judgements = SongUpdateJudgementCounts( + data[4][0], data[4][1], data[4][2], data[4][3] + ) self.maxCombo = data[5] - self.grade = WaccaConstants.GRADES(data[6]) # .value to get number, .name to get letter + self.grade = WaccaConstants.GRADES( + data[6] + ) # .value to get number, .name to get letter self.flagCleared = False if data[7] == 0 else True self.flagMissless = False if data[8] == 0 else True self.flagFullcombo = False if data[9] == 0 else True self.flagAllMarvelous = False if data[10] == 0 else True self.flagGiveUp = False if data[11] == 0 else True - self.skillPt = data[12] + self.skillPt = data[12] self.fastCt = 0 self.slowCt = 0 self.flagNewRecord = False + class SongUpdateDetailV2(SongUpdateDetailV1): def __init__(self, data: List) -> None: super().__init__(data) @@ -578,6 +668,7 @@ class SongUpdateDetailV2(SongUpdateDetailV1): self.slowCt = data[14] self.flagNewRecord = False if data[15] == 0 else True + class SeasonalInfoV1: def __init__(self) -> None: self.level: int = 0 @@ -586,7 +677,7 @@ class SeasonalInfoV1: self.cumulativeScore: int = 0 self.titlesObtained: int = 0 self.iconsObtained: int = 0 - self.skillPts: int = 0 + self.skillPts: int = 0 self.noteColorsObtained: int = 0 self.noteSoundsObtained: int = 0 @@ -600,9 +691,10 @@ class SeasonalInfoV1: self.iconsObtained, self.skillPts, self.noteColorsObtained, - self.noteSoundsObtained + self.noteSoundsObtained, ] + class SeasonalInfoV2(SeasonalInfoV1): def __init__(self) -> None: super().__init__() @@ -612,6 +704,7 @@ class SeasonalInfoV2(SeasonalInfoV1): def make(self) -> List: return super().make() + [self.platesObtained, self.cumulativeGatePts] + class BingoPageStatus: id = 0 location = 1 @@ -625,23 +718,30 @@ class BingoPageStatus: def make(self) -> List: return [self.id, self.location, self.progress] + class BingoDetail: def __init__(self, pageNumber: int) -> None: self.pageNumber = pageNumber self.pageStatus: List[BingoPageStatus] = [] - + def make(self) -> List: status = [] for x in self.pageStatus: status.append(x.make()) - return [ - self.pageNumber, - status - ] + return [self.pageNumber, status] + class GateDetailV1: - def __init__(self, gate_id: int = 1, page: int = 1, progress: int = 0, loops: int = 0, last_used: int = 0, mission_flg = 0) -> None: + def __init__( + self, + gate_id: int = 1, + page: int = 1, + progress: int = 0, + loops: int = 0, + last_used: int = 0, + mission_flg=0, + ) -> None: self.id = gate_id self.page = page self.progress = progress @@ -652,14 +752,17 @@ class GateDetailV1: def make(self) -> List: return [self.id, 1, self.page, self.progress, self.loops, self.lastUsed] + class GateDetailV2(GateDetailV1): def make(self) -> List: return super().make() + [self.missionFlg] + class GachaInfo: def make(self) -> List: return [] + class LastSongDetail: lastSongId = 90 lastSongDiff = 1 @@ -667,8 +770,14 @@ class LastSongDetail: lastFolderId = 1 lastSongOrd = 1 - def __init__(self, last_song: int = 90, last_diff: int = 1, last_folder_ord: int = 1, - last_folder_id: int = 1, last_song_ord: int = 1) -> None: + def __init__( + self, + last_song: int = 90, + last_diff: int = 1, + last_folder_ord: int = 1, + last_folder_id: int = 1, + last_song_ord: int = 1, + ) -> None: self.lastSongId = last_song self.lastSongDiff = last_diff self.lastFolderOrd = last_folder_ord @@ -676,13 +785,20 @@ class LastSongDetail: self.lastSongOrd = last_song_ord def make(self) -> List: - return [self.lastSongId, self.lastSongDiff, self.lastFolderOrd, self.lastFolderId, - self.lastSongOrd] + return [ + self.lastSongId, + self.lastSongDiff, + self.lastFolderOrd, + self.lastFolderId, + self.lastSongOrd, + ] + class FriendDetail: def make(self) -> List: return [] + class LoginBonusInfo: def __init__(self) -> None: self.tickets: List[TicketItem] = [] @@ -695,27 +811,38 @@ class LoginBonusInfo: for ticket in self.tickets: tks.append(ticket.make()) - + for item in self.items: itms.append(item.make()) - - return [ tks, itms, self.message ] + + return [tks, itms, self.message] + class VipLoginBonus: id = 1 unknown = 0 item: GenericItemRecv - def __init__(self, id: int = 1, unk: int = 0, item_type: int = 1, item_id: int = 1, item_qt: int = 1) -> None: + def __init__( + self, + id: int = 1, + unk: int = 0, + item_type: int = 1, + item_id: int = 1, + item_qt: int = 1, + ) -> None: self.id = id self.unknown = unk self.item = GenericItemRecv(item_type, item_id, item_qt) def make(self) -> List: - return [ self.id, self.unknown, self.item.make() ] + return [self.id, self.unknown, self.item.make()] + class VipInfo: - def __init__(self, year: int = 2019, month: int = 1, day: int = 1, num_item: int = 1) -> None: + def __init__( + self, year: int = 2019, month: int = 1, day: int = 1, num_item: int = 1 + ) -> None: self.pageYear = year self.pageMonth = month self.pageDay = day @@ -729,22 +856,32 @@ class VipInfo: for present in self.presentInfo: pres.append(present.make()) - + for b in self.vipLoginBonus: vipBonus.append(b.make()) - return [ self.pageYear, self.pageMonth, self.pageDay, self.numItem, pres, vipBonus ] + return [ + self.pageYear, + self.pageMonth, + self.pageDay, + self.numItem, + pres, + vipBonus, + ] + class PurchaseType(Enum): PurchaseTypeCredit = 1 PurchaseTypeWP = 2 + class PlayType(Enum): PlayTypeSingle = 1 PlayTypeVs = 2 PlayTypeCoop = 3 PlayTypeStageup = 4 + class StageInfo: danId: int = 0 danLevel: int = 0 @@ -770,15 +907,17 @@ class StageInfo: self.song2BestScore, self.song3BestScore, ], - self.unk5 + self.unk5, ] + class StageupClearType(Enum): FAIL = 0 CLEAR_BLUE = 1 CLEAR_SILVER = 2 CLEAR_GOLD = 3 + class MusicUpdateDetailV1: def __init__(self) -> None: self.songId = 0 @@ -790,7 +929,7 @@ class MusicUpdateDetailV1: self.lowestMissCount = 0 self.maxSkillPts = 0 self.locked = 0 - + def make(self) -> List: return [ self.songId, @@ -804,25 +943,30 @@ class MusicUpdateDetailV1: self.locked, ] + class MusicUpdateDetailV2(MusicUpdateDetailV1): def __init__(self) -> None: super().__init__() self.rating = 0 - + def make(self) -> List: return super().make() + [self.rating] + class MusicUpdateDetailV3(MusicUpdateDetailV2): def __init__(self) -> None: super().__init__() self.grades = SongDetailGradeCountsV2() + class SongRatingUpdate: - def __init__(self, song_id: int = 0, difficulty: int = 1, new_rating: int = 0) -> None: + def __init__( + self, song_id: int = 0, difficulty: int = 1, new_rating: int = 0 + ) -> None: self.songId = song_id self.difficulty = difficulty self.rating = new_rating - + def make(self) -> List: return [ self.songId, @@ -830,21 +974,20 @@ class SongRatingUpdate: self.rating, ] + class GateTutorialFlag: def __init__(self, tutorial_id: int = 1, flg_watched: bool = False) -> None: self.tutorialId = tutorial_id self.flagWatched = flg_watched - + def make(self) -> List: - return [ - self.tutorialId, - int(self.flagWatched) - ] + return [self.tutorialId, int(self.flagWatched)] + class DateUpdate: def __init__(self, date_id: int = 0, timestamp: int = 0) -> None: self.id = date_id self.timestamp = timestamp - + def make(self) -> List: return [self.id, self.timestamp] diff --git a/titles/wacca/handlers/housing.py b/titles/wacca/handlers/housing.py index 1669cac..8ffa910 100644 --- a/titles/wacca/handlers/housing.py +++ b/titles/wacca/handlers/housing.py @@ -4,6 +4,7 @@ from titles.wacca.handlers.base import BaseRequest, BaseResponse from titles.wacca.handlers.helpers import HousingInfo from titles.wacca.const import WaccaConstants + # ---housing/get---- class HousingGetResponse(BaseResponse): def __init__(self, housingId: int) -> None: @@ -15,6 +16,7 @@ class HousingGetResponse(BaseResponse): self.params = [self.housingId, self.regionId] return super().make() + # ---housing/start---- class HousingStartRequestV1(BaseRequest): def __init__(self, data: Dict) -> None: @@ -26,6 +28,7 @@ class HousingStartRequestV1(BaseRequest): for info in self.params[2]: self.info.append(HousingInfo(info[0], info[1])) + class HousingStartRequestV2(HousingStartRequestV1): def __init__(self, data: Dict) -> None: super(HousingStartRequestV1, self).__init__(data) @@ -37,20 +40,84 @@ class HousingStartRequestV2(HousingStartRequestV1): for info in self.params[3]: self.info.append(HousingInfo(info[0], info[1])) + class HousingStartResponseV1(BaseResponse): - def __init__(self, regionId: WaccaConstants.Region = WaccaConstants.Region.HOKKAIDO, songList: List[int] = []) -> None: + def __init__( + self, + regionId: WaccaConstants.Region = WaccaConstants.Region.HOKKAIDO, + songList: List[int] = [], + ) -> None: super().__init__() self.regionId = regionId - self.songList = songList # Recomended songs + self.songList = songList # Recomended songs if not self.songList: - self.songList = [ - 1269,1007,1270,1002,1020,1003,1008,1211,1018,1092,1056,32, - 1260,1230,1258,1251,2212,1264,1125,1037,2001,1272,1126,1119, - 1104,1070,1047,1044,1027,1004,1001,24,2068,2062,2021,1275, - 1249,1207,1203,1107,1021,1009,9,4,3,23,22,2014,13,1276,1247, - 1240,1237,1128,1114,1110,1109,1102,1045,1043,1036,1035,1030, - 1023,1015 + self.songList = [ + 1269, + 1007, + 1270, + 1002, + 1020, + 1003, + 1008, + 1211, + 1018, + 1092, + 1056, + 32, + 1260, + 1230, + 1258, + 1251, + 2212, + 1264, + 1125, + 1037, + 2001, + 1272, + 1126, + 1119, + 1104, + 1070, + 1047, + 1044, + 1027, + 1004, + 1001, + 24, + 2068, + 2062, + 2021, + 1275, + 1249, + 1207, + 1203, + 1107, + 1021, + 1009, + 9, + 4, + 3, + 23, + 22, + 2014, + 13, + 1276, + 1247, + 1240, + 1237, + 1128, + 1114, + 1110, + 1109, + 1102, + 1045, + 1043, + 1036, + 1035, + 1030, + 1023, + 1015, ] def make(self) -> Dict: diff --git a/titles/wacca/handlers/user_info.py b/titles/wacca/handlers/user_info.py index d30da39..8c67db9 100644 --- a/titles/wacca/handlers/user_info.py +++ b/titles/wacca/handlers/user_info.py @@ -3,6 +3,7 @@ from typing import List, Dict from titles.wacca.handlers.base import BaseRequest, BaseResponse from titles.wacca.handlers.helpers import UserOption, DateUpdate + # ---user/info/update--- class UserInfoUpdateRequest(BaseRequest): def __init__(self, data: Dict) -> None: @@ -16,17 +17,20 @@ class UserInfoUpdateRequest(BaseRequest): for x in self.params[1]: self.optsUpdated.append(UserOption(x[0], x[1])) - + for x in self.params[3]: self.datesUpdated.append(DateUpdate(x[0], x[1])) + # ---user/info/getMyroom--- TODO: Understand this better class UserInfogetMyroomRequest(BaseRequest): game_id = 0 + def __init__(self, data: Dict) -> None: super().__init__(data) self.game_id = int(self.params[0]) + class UserInfogetMyroomResponseV1(BaseResponse): def __init__(self) -> None: super().__init__() @@ -49,6 +53,7 @@ class UserInfogetMyroomResponseV1(BaseResponse): return super().make() + class UserInfogetMyroomResponseV2(UserInfogetMyroomResponseV1): def __init__(self) -> None: super().__init__() @@ -58,13 +63,16 @@ class UserInfogetMyroomResponseV2(UserInfogetMyroomResponseV1): self.params += [0, 0, 0] return super(UserInfogetMyroomResponseV1, self).make() + # ---user/info/getRanking--- class UserInfogetRankingRequest(BaseRequest): game_id = 0 + def __init__(self, data: Dict) -> None: super().__init__(data) self.game_id = int(self.params[0]) - + + class UserInfogetRankingResponse(BaseResponse): def __init__(self) -> None: super().__init__() @@ -85,4 +93,4 @@ class UserInfogetRankingResponse(BaseResponse): self.wacca_points_ranking, ] - return super().make() \ No newline at end of file + return super().make() diff --git a/titles/wacca/handlers/user_misc.py b/titles/wacca/handlers/user_misc.py index 4dea019..eb03802 100644 --- a/titles/wacca/handlers/user_misc.py +++ b/titles/wacca/handlers/user_misc.py @@ -5,6 +5,7 @@ from titles.wacca.handlers.helpers import PurchaseType, GenericItemRecv from titles.wacca.handlers.helpers import TicketItem, SongRatingUpdate, BingoDetail from titles.wacca.handlers.helpers import BingoPageStatus, GateTutorialFlag + # ---user/goods/purchase--- class UserGoodsPurchaseRequest(BaseRequest): def __init__(self, data: Dict) -> None: @@ -14,14 +15,17 @@ class UserGoodsPurchaseRequest(BaseRequest): self.purchaseCount = int(self.params[2]) self.purchaseType = PurchaseType(self.params[3]) self.cost = int(self.params[4]) - self.itemObtained: GenericItemRecv = GenericItemRecv(self.params[5][0], self.params[5][1], self.params[5][2]) + self.itemObtained: GenericItemRecv = GenericItemRecv( + self.params[5][0], self.params[5][1], self.params[5][2] + ) + class UserGoodsPurchaseResponse(BaseResponse): def __init__(self, wp: int = 0, tickets: List = []) -> None: super().__init__() self.currentWp = wp self.tickets: List[TicketItem] = [] - + for ticket in tickets: self.tickets.append(TicketItem(ticket[0], ticket[1], ticket[2])) @@ -34,6 +38,7 @@ class UserGoodsPurchaseResponse(BaseResponse): return super().make() + # ---user/sugaroku/update--- class UserSugarokuUpdateRequestV1(BaseRequest): def __init__(self, data: Dict) -> None: @@ -44,17 +49,19 @@ class UserSugarokuUpdateRequestV1(BaseRequest): self.progress = int(self.params[3]) self.loops = int(self.params[4]) self.boostsUsed = self.params[5] - self.totalPts = int(self.params[7]) + self.totalPts = int(self.params[7]) self.itemsObtainted: List[GenericItemRecv] = [] for item in self.params[6]: self.itemsObtainted.append(GenericItemRecv(item[0], item[1], item[2])) + class UserSugarokuUpdateRequestV2(UserSugarokuUpdateRequestV1): def __init__(self, data: Dict) -> None: super().__init__(data) self.mission_flag = int(self.params[8]) + # ---user/rating/update--- class UserRatingUpdateRequest(BaseRequest): def __init__(self, data: Dict) -> None: @@ -66,8 +73,9 @@ class UserRatingUpdateRequest(BaseRequest): for x in self.params[2]: self.songs.append(SongRatingUpdate(x[0], x[1], x[2])) + # ---user/mission/update--- -class UserMissionUpdateRequest(BaseRequest): +class UserMissionUpdateRequest(BaseRequest): def __init__(self, data: Dict) -> None: super().__init__(data) self.profileId = self.params[0] diff --git a/titles/wacca/handlers/user_music.py b/titles/wacca/handlers/user_music.py index deeda3d..a8c80bf 100644 --- a/titles/wacca/handlers/user_music.py +++ b/titles/wacca/handlers/user_music.py @@ -1,11 +1,20 @@ from typing import List, Dict from titles.wacca.handlers.base import BaseRequest, BaseResponse -from titles.wacca.handlers.helpers import GenericItemRecv, SongUpdateDetailV2, TicketItem +from titles.wacca.handlers.helpers import ( + GenericItemRecv, + SongUpdateDetailV2, + TicketItem, +) from titles.wacca.handlers.helpers import MusicUpdateDetailV2, MusicUpdateDetailV3 -from titles.wacca.handlers.helpers import SeasonalInfoV2, SeasonalInfoV1, SongUpdateDetailV1 +from titles.wacca.handlers.helpers import ( + SeasonalInfoV2, + SeasonalInfoV1, + SongUpdateDetailV1, +) from titles.wacca.handlers.helpers import MusicUpdateDetailV1 + # ---user/music/update--- class UserMusicUpdateRequestV1(BaseRequest): def __init__(self, data: Dict) -> None: @@ -18,82 +27,86 @@ class UserMusicUpdateRequestV1(BaseRequest): for itm in data["params"][3]: self.itemsObtained.append(GenericItemRecv(itm[0], itm[1], itm[2])) + class UserMusicUpdateRequestV2(UserMusicUpdateRequestV1): def __init__(self, data: Dict) -> None: super().__init__(data) self.songDetail = SongUpdateDetailV2(self.params[2]) + class UserMusicUpdateResponseV1(BaseResponse): def __init__(self) -> None: super().__init__() self.songDetail = MusicUpdateDetailV1() self.seasonInfo = SeasonalInfoV1() self.rankingInfo: List[List[int]] = [] - + def make(self) -> Dict: self.params = [ self.songDetail.make(), [self.songDetail.songId, self.songDetail.clearCounts.playCt], self.seasonInfo.make(), - self.rankingInfo + self.rankingInfo, ] return super().make() + class UserMusicUpdateResponseV2(UserMusicUpdateResponseV1): def __init__(self) -> None: super().__init__() self.songDetail = MusicUpdateDetailV2() self.seasonInfo = SeasonalInfoV2() + class UserMusicUpdateResponseV3(UserMusicUpdateResponseV2): def __init__(self) -> None: super().__init__() self.songDetail = MusicUpdateDetailV3() + # ---user/music/updateCoop--- class UserMusicUpdateCoopRequest(UserMusicUpdateRequestV2): def __init__(self, data: Dict) -> None: super().__init__(data) self.coopData = self.params[4] + # ---user/music/updateVs--- class UserMusicUpdateVsRequest(UserMusicUpdateRequestV2): def __init__(self, data: Dict) -> None: super().__init__(data) self.vsData = self.params[4] + # ---user/music/unlock--- class UserMusicUnlockRequest(BaseRequest): def __init__(self, data: Dict) -> None: super().__init__(data) self.profileId = self.params[0] self.songId = self.params[1] - self.difficulty = self.params[2] + self.difficulty = self.params[2] self.itemsUsed: List[GenericItemRecv] = [] for itm in self.params[3]: self.itemsUsed.append(GenericItemRecv(itm[0], itm[1], itm[2])) + class UserMusicUnlockResponse(BaseResponse): def __init__(self, current_wp: int = 0, tickets_remaining: List = []) -> None: super().__init__() - self.wp = current_wp + self.wp = current_wp self.tickets: List[TicketItem] = [] for ticket in tickets_remaining: self.tickets.append(TicketItem(ticket[0], ticket[1], ticket[2])) - - def make(self)-> Dict: + + def make(self) -> Dict: tickets = [] for ticket in self.tickets: tickets.append(ticket.make()) - self.params = [ - self.wp, - tickets - ] + self.params = [self.wp, tickets] return super().make() - diff --git a/titles/wacca/handlers/user_status.py b/titles/wacca/handlers/user_status.py index 5874fec..0e3819d 100644 --- a/titles/wacca/handlers/user_status.py +++ b/titles/wacca/handlers/user_status.py @@ -3,6 +3,7 @@ from typing import List, Dict, Optional from titles.wacca.handlers.base import BaseRequest, BaseResponse from titles.wacca.handlers.helpers import * + # ---user/status/get---- class UserStatusGetRequest(BaseRequest): aimeId: int = 0 @@ -11,6 +12,7 @@ class UserStatusGetRequest(BaseRequest): super().__init__(data) self.aimeId = int(data["params"][0]) + class UserStatusGetV1Response(BaseResponse): def __init__(self) -> None: super().__init__() @@ -27,14 +29,12 @@ class UserStatusGetV1Response(BaseResponse): self.setTitleId, self.setIconId, self.profileStatus.value, - [ - self.versionStatus.value, - str(self.lastGameVersion) - ] + [self.versionStatus.value, str(self.lastGameVersion)], ] - + return super().make() + class UserStatusGetV2Response(UserStatusGetV1Response): def __init__(self) -> None: super().__init__() @@ -48,6 +48,7 @@ class UserStatusGetV2Response(UserStatusGetV1Response): return super(UserStatusGetV1Response, self).make() + # ---user/status/getDetail---- class UserStatusGetDetailRequest(BaseRequest): userId: int = 0 @@ -56,6 +57,7 @@ class UserStatusGetDetailRequest(BaseRequest): super().__init__(data) self.userId = data["params"][0] + class UserStatusGetDetailResponseV1(BaseResponse): def __init__(self) -> None: super().__init__() @@ -64,22 +66,32 @@ class UserStatusGetDetailResponseV1(BaseResponse): self.seasonalPlayModeCounts: List[PlayModeCounts] = [] self.userItems: UserItemInfoV1 = UserItemInfoV1() self.scores: List[BestScoreDetailV1] = [] - self.songPlayStatus: List[int] = [0,0] + self.songPlayStatus: List[int] = [0, 0] self.seasonInfo: SeasonalInfoV1 = SeasonalInfoV1() - self.playAreaList: List = [ [0],[0,0,0,0,0,0],[0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0],[0,0,0,0,0],[0,0,0,0],[0,0,0,0,0,0,0],[0] ] + self.playAreaList: List = [ + [0], + [0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0, 0], + [0, 0, 0, 0, 0], + [0, 0, 0, 0], + [0, 0, 0, 0, 0, 0, 0], + [0], + ] self.songUpdateTime: int = 0 - def make(self)-> Dict: + def make(self) -> Dict: opts = [] play_modes = [] scores = [] for x in self.seasonalPlayModeCounts: play_modes.append(x.make()) - + for x in self.scores: scores.append(x.make()) - + for x in self.options: opts.append(x.make()) @@ -92,21 +104,31 @@ class UserStatusGetDetailResponseV1(BaseResponse): self.songPlayStatus, self.seasonInfo.make(), self.playAreaList, - self.songUpdateTime + self.songUpdateTime, ] return super().make() - - def find_score_idx(self, song_id: int, difficulty: int = 1, start_idx: int = 0, stop_idx: Optional[int] = None) -> Optional[int]: + + def find_score_idx( + self, + song_id: int, + difficulty: int = 1, + start_idx: int = 0, + stop_idx: Optional[int] = None, + ) -> Optional[int]: if stop_idx is None or stop_idx > len(self.scores): stop_idx = len(self.scores) for x in range(start_idx, stop_idx): - if self.scores[x].songId == song_id and self.scores[x].difficulty == difficulty: + if ( + self.scores[x].songId == song_id + and self.scores[x].difficulty == difficulty + ): return x - + return None + class UserStatusGetDetailResponseV2(UserStatusGetDetailResponseV1): def __init__(self) -> None: super().__init__() @@ -122,7 +144,7 @@ class UserStatusGetDetailResponseV2(UserStatusGetDetailResponseV1): self.gatchaInfo: List[GachaInfo] = [] self.friendList: List[FriendDetail] = [] - def make(self)-> Dict: + def make(self) -> Dict: super().make() gates = [] friends = [] @@ -130,13 +152,13 @@ class UserStatusGetDetailResponseV2(UserStatusGetDetailResponseV1): for x in self.gateInfo: gates.append(x.make()) - + for x in self.friendList: friends.append(x.make()) - + for x in self.gateTutorialFlags: tut_flg.append(x.make()) - + while len(tut_flg) < 5: flag_id = len(tut_flg) + 1 tut_flg.append([flag_id, 0]) @@ -152,11 +174,13 @@ class UserStatusGetDetailResponseV2(UserStatusGetDetailResponseV1): return super(UserStatusGetDetailResponseV1, self).make() + class UserStatusGetDetailResponseV3(UserStatusGetDetailResponseV2): def __init__(self) -> None: super().__init__() self.gateInfo: List[GateDetailV2] = [] + class UserStatusGetDetailResponseV4(UserStatusGetDetailResponseV3): def __init__(self) -> None: super().__init__() @@ -164,12 +188,13 @@ class UserStatusGetDetailResponseV4(UserStatusGetDetailResponseV3): self.bingoStatus: BingoDetail = BingoDetail(0) self.scores: List[BestScoreDetailV2] = [] - def make(self)-> Dict: + def make(self) -> Dict: super().make() self.params.append(self.bingoStatus.make()) return super(UserStatusGetDetailResponseV1, self).make() + # ---user/status/login---- class UserStatusLoginRequest(BaseRequest): userId: int = 0 @@ -178,16 +203,19 @@ class UserStatusLoginRequest(BaseRequest): super().__init__(data) self.userId = data["params"][0] + class UserStatusLoginResponseV1(BaseResponse): - def __init__(self, is_first_login_daily: bool = False, last_login_date: int = 0) -> None: + def __init__( + self, is_first_login_daily: bool = False, last_login_date: int = 0 + ) -> None: super().__init__() self.dailyBonus: List[LoginBonusInfo] = [] self.consecBonus: List[LoginBonusInfo] = [] - self.otherBonus: List[LoginBonusInfo] = [] + self.otherBonus: List[LoginBonusInfo] = [] self.firstLoginDaily = is_first_login_daily self.lastLoginDate = last_login_date - def make(self)-> Dict: + def make(self) -> Dict: super().make() daily = [] consec = [] @@ -202,32 +230,39 @@ class UserStatusLoginResponseV1(BaseResponse): for bonus in self.otherBonus: other.append(bonus.make()) - self.params = [ daily, consec, other, int(self.firstLoginDaily)] + self.params = [daily, consec, other, int(self.firstLoginDaily)] return super().make() + class UserStatusLoginResponseV2(UserStatusLoginResponseV1): - def __init__(self, is_first_login_daily: bool = False, last_login_date: int = 0) -> None: + def __init__( + self, is_first_login_daily: bool = False, last_login_date: int = 0 + ) -> None: super().__init__(is_first_login_daily) self.lastLoginDate = last_login_date self.vipInfo = VipInfo() - - def make(self)-> Dict: + + def make(self) -> Dict: super().make() self.params.append(self.vipInfo.make()) self.params.append(self.lastLoginDate) return super(UserStatusLoginResponseV1, self).make() + class UserStatusLoginResponseV3(UserStatusLoginResponseV2): - def __init__(self, is_first_login_daily: bool = False, last_login_date: int = 0) -> None: + def __init__( + self, is_first_login_daily: bool = False, last_login_date: int = 0 + ) -> None: super().__init__(is_first_login_daily, last_login_date) self.unk: List = [] - def make(self)-> Dict: + def make(self) -> Dict: super().make() self.params.append(self.unk) return super(UserStatusLoginResponseV1, self).make() + # ---user/status/create--- class UserStatusCreateRequest(BaseRequest): def __init__(self, data: Dict) -> None: @@ -235,26 +270,27 @@ class UserStatusCreateRequest(BaseRequest): self.aimeId = data["params"][0] self.username = data["params"][1] + class UserStatusCreateResponseV1(BaseResponse): def __init__(self, userId: int, username: str) -> None: super().__init__() self.userStatus = UserStatusV1() self.userStatus.userId = userId self.userStatus.username = username - - def make(self)-> Dict: - self.params = [ - self.userStatus.make() - ] + + def make(self) -> Dict: + self.params = [self.userStatus.make()] return super().make() + class UserStatusCreateResponseV2(UserStatusCreateResponseV1): def __init__(self, userId: int, username: str) -> None: super().__init__(userId, username) - self.userStatus: UserStatusV2 = UserStatusV2() + self.userStatus: UserStatusV2 = UserStatusV2() self.userStatus.userId = userId self.userStatus.username = username + # ---user/status/logout--- class UserStatusLogoutRequest(BaseRequest): userId: int @@ -263,6 +299,7 @@ class UserStatusLogoutRequest(BaseRequest): super().__init__(data) self.userId = data["params"][0] + # ---user/status/update--- class UserStatusUpdateRequestV1(BaseRequest): def __init__(self, data: Dict) -> None: @@ -274,11 +311,17 @@ class UserStatusUpdateRequestV1(BaseRequest): for itm in data["params"][2]: self.itemsRecieved.append(GenericItemRecv(itm[0], itm[1], itm[2])) + class UserStatusUpdateRequestV2(UserStatusUpdateRequestV1): def __init__(self, data: Dict) -> None: super().__init__(data) self.isContinue = bool(data["params"][3]) self.isFirstPlayFree = bool(data["params"][4]) self.itemsUsed = data["params"][5] - self.lastSongInfo = LastSongDetail(data["params"][6][0], data["params"][6][1], - data["params"][6][2], data["params"][6][3], data["params"][6][4]) + self.lastSongInfo = LastSongDetail( + data["params"][6][0], + data["params"][6][1], + data["params"][6][2], + data["params"][6][3], + data["params"][6][4], + ) diff --git a/titles/wacca/handlers/user_trial.py b/titles/wacca/handlers/user_trial.py index 6fb75a8..ba6ea50 100644 --- a/titles/wacca/handlers/user_trial.py +++ b/titles/wacca/handlers/user_trial.py @@ -2,6 +2,7 @@ from typing import Dict, List from titles.wacca.handlers.base import BaseRequest, BaseResponse from titles.wacca.handlers.helpers import StageInfo, StageupClearType, GenericItemRecv + # --user/trial/get-- class UserTrialGetRequest(BaseRequest): profileId: int = 0 @@ -10,20 +11,22 @@ class UserTrialGetRequest(BaseRequest): super().__init__(data) self.profileId = self.params[0] + class UserTrialGetResponse(BaseResponse): def __init__(self) -> None: super().__init__() - + self.stageList: List[StageInfo] = [] def make(self) -> Dict: dans = [] for x in self.stageList: dans.append(x.make()) - + self.params = [dans] return super().make() + # --user/trial/update-- class UserTrialUpdateRequest(BaseRequest): def __init__(self, data: Dict) -> None: @@ -43,9 +46,10 @@ class UserTrialUpdateRequest(BaseRequest): if len(self.params) == 8: self.unk7 = self.params[7] + class UserTrialUpdateResponse(BaseResponse): def __init__(self) -> None: super().__init__() - + def make(self) -> Dict: - return super().make() \ No newline at end of file + return super().make() diff --git a/titles/wacca/handlers/user_vip.py b/titles/wacca/handlers/user_vip.py index c48c9fa..bc418b5 100644 --- a/titles/wacca/handlers/user_vip.py +++ b/titles/wacca/handlers/user_vip.py @@ -2,12 +2,14 @@ from typing import Dict, List from titles.wacca.handlers.base import BaseRequest, BaseResponse from titles.wacca.handlers.helpers import VipLoginBonus + # --user/vip/get-- class UserVipGetRequest(BaseRequest): def __init__(self, data: Dict) -> None: super().__init__(data) self.profileId = self.params[0] + class UserVipGetResponse(BaseResponse): def __init__(self) -> None: super().__init__() @@ -15,22 +17,16 @@ class UserVipGetResponse(BaseResponse): self.unknown1: int = 1 self.unknown2: int = 1 self.presents: List[VipLoginBonus] = [] - + def make(self) -> Dict: pres = [] for x in self.presents: pres.append(x.make()) - self.params = [ - self.vipDays, - [ - self.unknown1, - self.unknown2, - pres - ] - ] + self.params = [self.vipDays, [self.unknown1, self.unknown2, pres]] return super().make() + # --user/vip/start-- class UserVipStartRequest(BaseRequest): def __init__(self, data: Dict) -> None: @@ -39,6 +35,7 @@ class UserVipStartRequest(BaseRequest): self.cost = self.params[1] self.days = self.params[2] + class UserVipStartResponse(BaseResponse): def __init__(self, expires: int = 0) -> None: super().__init__() @@ -46,9 +43,6 @@ class UserVipStartResponse(BaseResponse): self.presents = [] def make(self) -> Dict: - self.params = [ - self.whenExpires, - self.presents - ] + self.params = [self.whenExpires, self.presents] - return super().make() \ No newline at end of file + return super().make() diff --git a/titles/wacca/index.py b/titles/wacca/index.py index b4a4aea..2a4a0cf 100644 --- a/titles/wacca/index.py +++ b/titles/wacca/index.py @@ -20,12 +20,15 @@ from titles.wacca.base import WaccaBase from titles.wacca.handlers.base import BaseResponse from titles.wacca.handlers.helpers import Version -class WaccaServlet(): + +class WaccaServlet: def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None: self.core_cfg = core_cfg self.game_cfg = WaccaConfig() if path.exists(f"{cfg_dir}/{WaccaConstants.CONFIG_NAME}"): - self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{WaccaConstants.CONFIG_NAME}"))) + self.game_cfg.update( + yaml.safe_load(open(f"{cfg_dir}/{WaccaConstants.CONFIG_NAME}")) + ) self.versions = [ WaccaBase(core_cfg, self.game_cfg), @@ -38,32 +41,46 @@ class WaccaServlet(): self.logger = logging.getLogger("wacca") log_fmt_str = "[%(asctime)s] Wacca | %(levelname)s | %(message)s" log_fmt = logging.Formatter(log_fmt_str) - fileHandler = TimedRotatingFileHandler("{0}/{1}.log".format(self.core_cfg.server.log_dir, "wacca"), encoding='utf8', - when="d", backupCount=10) + fileHandler = TimedRotatingFileHandler( + "{0}/{1}.log".format(self.core_cfg.server.log_dir, "wacca"), + encoding="utf8", + when="d", + backupCount=10, + ) fileHandler.setFormatter(log_fmt) - + consoleHandler = logging.StreamHandler() consoleHandler.setFormatter(log_fmt) self.logger.addHandler(fileHandler) self.logger.addHandler(consoleHandler) - + self.logger.setLevel(self.game_cfg.server.loglevel) - coloredlogs.install(level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str) - + coloredlogs.install( + level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str + ) + @classmethod - def get_allnet_info(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> Tuple[bool, str, str]: + def get_allnet_info( + cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str + ) -> Tuple[bool, str, str]: game_cfg = WaccaConfig() if path.exists(f"{cfg_dir}/{WaccaConstants.CONFIG_NAME}"): - game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/{WaccaConstants.CONFIG_NAME}"))) + game_cfg.update( + yaml.safe_load(open(f"{cfg_dir}/{WaccaConstants.CONFIG_NAME}")) + ) if not game_cfg.server.enable: return (False, "", "") - + if core_cfg.server.is_develop: - return (True, f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v", "") - + return ( + True, + f"http://{core_cfg.title.hostname}:{core_cfg.title.port}/{game_code}/$v", + "", + ) + return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v", "") def render_POST(self, request: Request, version: int, url_path: str) -> bytes: @@ -71,12 +88,14 @@ class WaccaServlet(): hash = md5(json.dumps(resp, ensure_ascii=False).encode()).digest() request.responseHeaders.addRawHeader(b"X-Wacca-Hash", hash.hex().encode()) return json.dumps(resp).encode() - + try: req_json = json.loads(request.content.getvalue()) version_full = Version(req_json["appVersion"]) except: - self.logger.error(f"Failed to parse request toi {request.uri} -> {request.content.getvalue()}") + self.logger.error( + f"Failed to parse request toi {request.uri} -> {request.content.getvalue()}" + ) resp = BaseResponse() resp.status = 1 resp.message = "不正なリクエスト エラーです" @@ -94,7 +113,7 @@ class WaccaServlet(): if ver_search < 15000: internal_ver = WaccaConstants.VER_WACCA - + elif ver_search >= 15000 and ver_search < 20000: internal_ver = WaccaConstants.VER_WACCA_S @@ -103,37 +122,45 @@ class WaccaServlet(): elif ver_search >= 25000 and ver_search < 30000: internal_ver = WaccaConstants.VER_WACCA_LILY_R - + elif ver_search >= 30000: internal_ver = WaccaConstants.VER_WACCA_REVERSE else: - self.logger.warning(f"Unsupported version ({req_json['appVersion']}) request {url_path} - {req_json}") + self.logger.warning( + f"Unsupported version ({req_json['appVersion']}) request {url_path} - {req_json}" + ) resp = BaseResponse() resp.status = 1 resp.message = "不正なアプリバージョンエラーです" return end(resp.make()) - - self.logger.info(f"v{req_json['appVersion']} {url_path} request from {request.getClientAddress().host} with chipId {req_json['chipId']}") + + self.logger.info( + f"v{req_json['appVersion']} {url_path} request from {request.getClientAddress().host} with chipId {req_json['chipId']}" + ) self.logger.debug(req_json) if not hasattr(self.versions[internal_ver], func_to_find): - self.logger.warn(f"{req_json['appVersion']} has no handler for {func_to_find}") + self.logger.warn( + f"{req_json['appVersion']} has no handler for {func_to_find}" + ) resp = BaseResponse().make() return end(resp) try: handler = getattr(self.versions[internal_ver], func_to_find) resp = handler(req_json) - + self.logger.debug(f"{req_json['appVersion']} response {resp}") return end(resp) except Exception as e: - self.logger.error(f"{req_json['appVersion']} Error handling method {url_path} -> {e}") + self.logger.error( + f"{req_json['appVersion']} Error handling method {url_path} -> {e}" + ) if self.core_cfg.server.is_develop: raise - + resp = BaseResponse() resp.status = 1 resp.message = "A server error occoured." diff --git a/titles/wacca/lily.py b/titles/wacca/lily.py index e67b25c..c3b6eb4 100644 --- a/titles/wacca/lily.py +++ b/titles/wacca/lily.py @@ -9,6 +9,7 @@ from titles.wacca.const import WaccaConstants from titles.wacca.handlers import * + class WaccaLily(WaccaS): def __init__(self, cfg: CoreConfig, game_cfg: WaccaConfig) -> None: super().__init__(cfg, game_cfg) @@ -35,31 +36,35 @@ class WaccaLily(WaccaS): (210002, 0), (210003, 0), ] - - def handle_advertise_GetNews_request(self, data: Dict)-> Dict: + + def handle_advertise_GetNews_request(self, data: Dict) -> Dict: resp = GetNewsResponseV3() return resp.make() def handle_housing_start_request(self, data: Dict) -> Dict: req = HousingStartRequestV2(data) - - if req.appVersion.country != "JPN" and req.appVersion.country in [region.name for region in WaccaConstants.Region]: + + if req.appVersion.country != "JPN" and req.appVersion.country in [ + region.name for region in WaccaConstants.Region + ]: region_id = WaccaConstants.Region[req.appVersion.country] else: region_id = self.region_id resp = HousingStartResponseV1(region_id) return resp.make() - - def handle_user_status_create_request(self, data: Dict)-> Dict: + + def handle_user_status_create_request(self, data: Dict) -> Dict: req = UserStatusCreateRequest(data) resp = super().handle_user_status_create_request(data) - self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210002) # Lily, Added Lily + self.data.item.put_item( + req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210002 + ) # Lily, Added Lily return resp - def handle_user_status_get_request(self, data: Dict)-> Dict: + def handle_user_status_get_request(self, data: Dict) -> Dict: req = UserStatusGetRequest(data) resp = UserStatusGetV2Response() @@ -74,7 +79,7 @@ class WaccaLily(WaccaS): resp.lastGameVersion = ShortVersion(str(req.appVersion)) else: resp.lastGameVersion = ShortVersion(profile["last_game_ver"]) - + resp.userStatus.userId = profile["id"] resp.userStatus.username = profile["username"] resp.userStatus.xp = profile["xp"] @@ -87,40 +92,55 @@ class WaccaLily(WaccaS): resp.userStatus.loginsToday = profile["login_count_today"] resp.userStatus.rating = profile["rating"] - set_title_id = self.data.profile.get_options(WaccaConstants.OPTIONS["set_title_id"], profile["user"]) + set_title_id = self.data.profile.get_options( + WaccaConstants.OPTIONS["set_title_id"], profile["user"] + ) if set_title_id is None: set_title_id = self.OPTIONS_DEFAULTS["set_title_id"] resp.setTitleId = set_title_id - set_icon_id = self.data.profile.get_options(WaccaConstants.OPTIONS["set_title_id"], profile["user"]) + set_icon_id = self.data.profile.get_options( + WaccaConstants.OPTIONS["set_title_id"], profile["user"] + ) if set_icon_id is None: set_icon_id = self.OPTIONS_DEFAULTS["set_icon_id"] resp.setIconId = set_icon_id - if profile["last_login_date"].timestamp() < int(datetime.now().replace(hour=0,minute=0,second=0,microsecond=0).timestamp()): + if profile["last_login_date"].timestamp() < int( + datetime.now() + .replace(hour=0, minute=0, second=0, microsecond=0) + .timestamp() + ): resp.userStatus.loginsToday = 0 - if profile["last_login_date"].timestamp() < int((datetime.now().replace(hour=0,minute=0,second=0,microsecond=0) - timedelta(days=1)).timestamp()): + if profile["last_login_date"].timestamp() < int( + ( + datetime.now().replace(hour=0, minute=0, second=0, microsecond=0) + - timedelta(days=1) + ).timestamp() + ): resp.userStatus.loginConsecutiveDays = 0 if req.appVersion > resp.lastGameVersion: resp.versionStatus = PlayVersionStatus.VersionUpgrade - + elif req.appVersion < resp.lastGameVersion: resp.versionStatus = PlayVersionStatus.VersionTooNew - + if profile["vip_expire_time"] is not None: resp.userStatus.vipExpireTime = int(profile["vip_expire_time"].timestamp()) - + if profile["always_vip"] or self.game_config.mods.always_vip: - resp.userStatus.vipExpireTime = int((datetime.now() + timedelta(days=30)).timestamp()) - + resp.userStatus.vipExpireTime = int( + (datetime.now() + timedelta(days=30)).timestamp() + ) + if self.game_config.mods.infinite_wp: resp.userStatus.wp = 999999 - + return resp.make() - def handle_user_status_login_request(self, data: Dict)-> Dict: + def handle_user_status_login_request(self, data: Dict) -> Dict: req = UserStatusLoginRequest(data) resp = UserStatusLoginResponseV2() is_new_day = False @@ -130,27 +150,38 @@ class WaccaLily(WaccaS): if req.userId == 0: self.logger.info(f"Guest login on {req.chipId}") resp.lastLoginDate = 0 - + else: profile = self.data.profile.get_profile(req.userId) if profile is None: - self.logger.warn(f"Unknown user id {req.userId} attempted login from {req.chipId}") + self.logger.warn( + f"Unknown user id {req.userId} attempted login from {req.chipId}" + ) return resp.make() self.logger.info(f"User {req.userId} login on {req.chipId}") last_login_time = int(profile["last_login_date"].timestamp()) resp.lastLoginDate = last_login_time - - # If somebodies login timestamp < midnight of current day, then they are logging in for the first time today - if last_login_time < int(datetime.now().replace(hour=0,minute=0,second=0,microsecond=0).timestamp()): + + # If somebodies login timestamp < midnight of current day, then they are logging in for the first time today + if last_login_time < int( + datetime.now() + .replace(hour=0, minute=0, second=0, microsecond=0) + .timestamp() + ): is_new_day = True is_consec_day = True # If somebodies login timestamp > midnight of current day + 1 day, then they broke their daily login streak - elif last_login_time > int((datetime.now().replace(hour=0,minute=0,second=0,microsecond=0) + timedelta(days=1)).timestamp()): + elif last_login_time > int( + ( + datetime.now().replace(hour=0, minute=0, second=0, microsecond=0) + + timedelta(days=1) + ).timestamp() + ): is_consec_day = False # else, they are simply logging in again on the same day, and we don't need to do anything for that - + self.data.profile.session_login(req.userId, is_new_day, is_consec_day) resp.vipInfo.pageYear = datetime.now().year resp.vipInfo.pageMonth = datetime.now().month @@ -158,10 +189,10 @@ class WaccaLily(WaccaS): resp.vipInfo.numItem = 1 resp.firstLoginDaily = int(is_new_day) - + return resp.make() - - def handle_user_status_getDetail_request(self, data: Dict)-> Dict: + + def handle_user_status_getDetail_request(self, data: Dict) -> Dict: req = UserStatusGetDetailRequest(data) if req.appVersion.minor >= 53: resp = UserStatusGetDetailResponseV3() @@ -187,15 +218,23 @@ class WaccaLily(WaccaS): if profile["vip_expire_time"] is None: resp.userStatus.vipExpireTime = 0 - + else: - resp.userStatus.vipExpireTime = int(profile["vip_expire_time"].timestamp()) - + resp.userStatus.vipExpireTime = int(profile["vip_expire_time"].timestamp()) + if profile["always_vip"] or self.game_config.mods.always_vip: - resp.userStatus.vipExpireTime = int((self.srvtime + timedelta(days=31)).timestamp()) + resp.userStatus.vipExpireTime = int( + (self.srvtime + timedelta(days=31)).timestamp() + ) resp.songUpdateTime = int(profile["last_login_date"].timestamp()) - resp.lastSongInfo = LastSongDetail(profile["last_song_id"],profile["last_song_difficulty"],profile["last_folder_order"],profile["last_folder_id"],profile["last_song_order"]) + resp.lastSongInfo = LastSongDetail( + profile["last_song_id"], + profile["last_song_difficulty"], + profile["last_folder_order"], + profile["last_folder_id"], + profile["last_song_order"], + ) resp.songPlayStatus = [resp.lastSongInfo.lastSongId, 1] resp.userStatus.userId = profile["id"] @@ -208,41 +247,65 @@ class WaccaLily(WaccaS): resp.userStatus.loginDays = profile["login_count_days"] resp.userStatus.loginConsecutiveDays = profile["login_count_days_consec"] resp.userStatus.loginsToday = profile["login_count_today"] - resp.userStatus.rating = profile['rating'] + resp.userStatus.rating = profile["rating"] if self.game_config.mods.infinite_wp: resp.userStatus.wp = 999999 for fav in profile_favorites: resp.favorites.append(fav["song_id"]) - + if profile["friend_view_1"] is not None: pass if profile["friend_view_2"] is not None: pass if profile["friend_view_3"] is not None: pass - - resp.seasonalPlayModeCounts.append(PlayModeCounts(self.season, 1, profile["playcount_single"])) - resp.seasonalPlayModeCounts.append(PlayModeCounts(self.season, 2, profile["playcount_multi_vs"])) - resp.seasonalPlayModeCounts.append(PlayModeCounts(self.season, 3, profile["playcount_multi_coop"])) - resp.seasonalPlayModeCounts.append(PlayModeCounts(self.season, 4, profile["playcount_stageup"])) - + + resp.seasonalPlayModeCounts.append( + PlayModeCounts(self.season, 1, profile["playcount_single"]) + ) + resp.seasonalPlayModeCounts.append( + PlayModeCounts(self.season, 2, profile["playcount_multi_vs"]) + ) + resp.seasonalPlayModeCounts.append( + PlayModeCounts(self.season, 3, profile["playcount_multi_coop"]) + ) + resp.seasonalPlayModeCounts.append( + PlayModeCounts(self.season, 4, profile["playcount_stageup"]) + ) + for opt in profile_options: resp.options.append(UserOption(opt["opt_id"], opt["value"])) - + for gate in self.game_config.gates.enabled_gates: added_gate = False for user_gate in profile_gates: if user_gate["gate_id"] == gate: if req.appVersion.minor >= 53: - resp.gateInfo.append(GateDetailV2(user_gate["gate_id"],user_gate["page"],user_gate["progress"], - user_gate["loops"],int(user_gate["last_used"].timestamp()),user_gate["mission_flag"])) - + resp.gateInfo.append( + GateDetailV2( + user_gate["gate_id"], + user_gate["page"], + user_gate["progress"], + user_gate["loops"], + int(user_gate["last_used"].timestamp()), + user_gate["mission_flag"], + ) + ) + else: - resp.gateInfo.append(GateDetailV1(user_gate["gate_id"],user_gate["page"],user_gate["progress"], - user_gate["loops"],int(user_gate["last_used"].timestamp()),user_gate["mission_flag"])) + resp.gateInfo.append( + GateDetailV1( + user_gate["gate_id"], + user_gate["page"], + user_gate["progress"], + user_gate["loops"], + int(user_gate["last_used"].timestamp()), + user_gate["mission_flag"], + ) + ) resp.seasonInfo.cumulativeGatePts += user_gate["total_points"] @@ -252,17 +315,21 @@ class WaccaLily(WaccaS): if not added_gate: if req.appVersion.minor >= 53: resp.gateInfo.append(GateDetailV2(gate)) - + else: resp.gateInfo.append(GateDetailV1(gate)) - + for unlock in profile_song_unlocks: for x in range(1, unlock["highest_difficulty"] + 1): - resp.userItems.songUnlocks.append(SongUnlock(unlock["song_id"], x, 0, int(unlock["acquire_date"].timestamp()))) - + resp.userItems.songUnlocks.append( + SongUnlock( + unlock["song_id"], x, 0, int(unlock["acquire_date"].timestamp()) + ) + ) + for song in profile_scores: resp.seasonInfo.cumulativeScore += song["score"] - + clear_cts = SongDetailClearCounts( song["play_ct"], song["clear_ct"], @@ -272,13 +339,20 @@ class WaccaLily(WaccaS): ) grade_cts = SongDetailGradeCountsV1( - song["grade_d_ct"], song["grade_c_ct"], song["grade_b_ct"], song["grade_a_ct"], song["grade_aa_ct"], - song["grade_aaa_ct"], song["grade_s_ct"], song["grade_ss_ct"], song["grade_sss_ct"], - song["grade_master_ct"] + song["grade_d_ct"], + song["grade_c_ct"], + song["grade_b_ct"], + song["grade_a_ct"], + song["grade_aa_ct"], + song["grade_aaa_ct"], + song["grade_s_ct"], + song["grade_ss_ct"], + song["grade_sss_ct"], + song["grade_master_ct"], ) deets = BestScoreDetailV1(song["song_id"], song["chart_id"]) - deets.clearCounts = clear_cts + deets.clearCounts = clear_cts deets.clearCountsSeason = clear_cts deets.gradeCounts = grade_cts deets.score = song["score"] @@ -287,9 +361,16 @@ class WaccaLily(WaccaS): deets.rating = song["rating"] resp.scores.append(deets) - + for trophy in profile_trophies: - resp.userItems.trophies.append(TrophyItem(trophy["trophy_id"], trophy["season"], trophy["progress"], trophy["badge_type"])) + resp.userItems.trophies.append( + TrophyItem( + trophy["trophy_id"], + trophy["season"], + trophy["progress"], + trophy["badge_type"], + ) + ) if self.game_config.mods.infinite_tickets: for x in range(5): @@ -301,27 +382,45 @@ class WaccaLily(WaccaS): else: expire = int(ticket["expire_date"].timestamp()) - resp.userItems.tickets.append(TicketItem(ticket["id"], ticket["ticket_id"], expire)) + resp.userItems.tickets.append( + TicketItem(ticket["id"], ticket["ticket_id"], expire) + ) if profile_items: for item in profile_items: try: - if item["type"] == WaccaConstants.ITEM_TYPES["icon"]: - resp.userItems.icons.append(IconItem(item["item_id"], 1, item["use_count"], int(item["acquire_date"].timestamp()))) + resp.userItems.icons.append( + IconItem( + item["item_id"], + 1, + item["use_count"], + int(item["acquire_date"].timestamp()), + ) + ) elif item["type"] == WaccaConstants.ITEM_TYPES["navigator"]: - resp.userItems.navigators.append(NavigatorItem(item["item_id"], 1, int(item["acquire_date"].timestamp()), item["use_count"], item["use_count"])) + resp.userItems.navigators.append( + NavigatorItem( + item["item_id"], + 1, + int(item["acquire_date"].timestamp()), + item["use_count"], + item["use_count"], + ) + ) else: - itm_send = GenericItemSend(item["item_id"], 1, int(item["acquire_date"].timestamp())) + itm_send = GenericItemSend( + item["item_id"], 1, int(item["acquire_date"].timestamp()) + ) if item["type"] == WaccaConstants.ITEM_TYPES["title"]: resp.userItems.titles.append(itm_send) - + elif item["type"] == WaccaConstants.ITEM_TYPES["user_plate"]: resp.userItems.plates.append(itm_send) - + elif item["type"] == WaccaConstants.ITEM_TYPES["note_color"]: resp.userItems.noteColors.append(itm_send) @@ -329,7 +428,9 @@ class WaccaLily(WaccaS): resp.userItems.noteSounds.append(itm_send) except: - self.logger.error(f"{__name__} Failed to load item {item['item_id']} for user {profile['user']}") + self.logger.error( + f"{__name__} Failed to load item {item['item_id']} for user {profile['user']}" + ) resp.seasonInfo.level = profile["xp"] resp.seasonInfo.wpObtained = profile["wp_total"] @@ -342,12 +443,18 @@ class WaccaLily(WaccaS): return resp.make() - def handle_user_info_getMyroom_request(self, data: Dict)-> Dict: + def handle_user_info_getMyroom_request(self, data: Dict) -> Dict: return UserInfogetMyroomResponseV2().make() - def handle_user_status_update_request(self, data: Dict)-> Dict: + def handle_user_status_update_request(self, data: Dict) -> Dict: super().handle_user_status_update_request(data) - req = UserStatusUpdateRequestV2(data) - self.data.profile.update_profile_lastplayed(req.profileId, req.lastSongInfo.lastSongId, req.lastSongInfo.lastSongDiff, - req.lastSongInfo.lastFolderOrd, req.lastSongInfo.lastFolderId, req.lastSongInfo.lastSongOrd) - return BaseResponse().make() \ No newline at end of file + req = UserStatusUpdateRequestV2(data) + self.data.profile.update_profile_lastplayed( + req.profileId, + req.lastSongInfo.lastSongId, + req.lastSongInfo.lastSongDiff, + req.lastSongInfo.lastFolderOrd, + req.lastSongInfo.lastFolderId, + req.lastSongInfo.lastSongOrd, + ) + return BaseResponse().make() diff --git a/titles/wacca/lilyr.py b/titles/wacca/lilyr.py index 893a8f3..0bb12ed 100644 --- a/titles/wacca/lilyr.py +++ b/titles/wacca/lilyr.py @@ -8,6 +8,7 @@ from titles.wacca.config import WaccaConfig from titles.wacca.const import WaccaConstants from titles.wacca.handlers import * + class WaccaLilyR(WaccaLily): def __init__(self, cfg: CoreConfig, game_cfg: WaccaConfig) -> None: super().__init__(cfg, game_cfg) @@ -35,20 +36,36 @@ class WaccaLilyR(WaccaLily): (210003, 0), ] - def handle_user_status_create_request(self, data: Dict)-> Dict: + def handle_user_status_create_request(self, data: Dict) -> Dict: req = UserStatusCreateRequest(data) resp = super().handle_user_status_create_request(data) - self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210054) # Added lily r - self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210055) # Added lily r - self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210056) # Added lily r - self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210057) # Added lily r - self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210058) # Added lily r - self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210059) # Added lily r - self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210060) # Added lily r - self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210061) # Added lily r - + self.data.item.put_item( + req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210054 + ) # Added lily r + self.data.item.put_item( + req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210055 + ) # Added lily r + self.data.item.put_item( + req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210056 + ) # Added lily r + self.data.item.put_item( + req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210057 + ) # Added lily r + self.data.item.put_item( + req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210058 + ) # Added lily r + self.data.item.put_item( + req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210059 + ) # Added lily r + self.data.item.put_item( + req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210060 + ) # Added lily r + self.data.item.put_item( + req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210061 + ) # Added lily r + return resp - def handle_user_status_logout_request(self, data: Dict)-> Dict: + def handle_user_status_logout_request(self, data: Dict) -> Dict: return BaseResponse().make() diff --git a/titles/wacca/read.py b/titles/wacca/read.py index 1c8e7f8..109d7ff 100644 --- a/titles/wacca/read.py +++ b/titles/wacca/read.py @@ -8,42 +8,57 @@ from core.config import CoreConfig from titles.wacca.database import WaccaData from titles.wacca.const import WaccaConstants + class WaccaReader(BaseReader): - def __init__(self, config: CoreConfig, version: int, bin_dir: Optional[str], opt_dir: Optional[str], extra: Optional[str]) -> None: + def __init__( + self, + config: CoreConfig, + version: int, + bin_dir: Optional[str], + opt_dir: Optional[str], + extra: Optional[str], + ) -> None: super().__init__(config, version, bin_dir, opt_dir, extra) self.data = WaccaData(config) try: - self.logger.info(f"Start importer for {WaccaConstants.game_ver_to_string(version)}") + self.logger.info( + f"Start importer for {WaccaConstants.game_ver_to_string(version)}" + ) except IndexError: self.logger.error(f"Invalid wacca version {version}") exit(1) - + def read(self) -> None: - if not (path.exists(f"{self.bin_dir}/Table") and path.exists(f"{self.bin_dir}/Message")): + if not ( + path.exists(f"{self.bin_dir}/Table") + and path.exists(f"{self.bin_dir}/Message") + ): self.logger.error("Could not find Table or Message folder, nothing to read") return - + self.read_music(f"{self.bin_dir}/Table", "MusicParameterTable") - + def read_music(self, base_dir: str, table: str) -> None: if not self.check_valid_pair(base_dir, table): - self.logger.warn(f"Cannot find {table} uasset/uexp pair at {base_dir}, music will not be read") + self.logger.warn( + f"Cannot find {table} uasset/uexp pair at {base_dir}, music will not be read" + ) return - - uasset=open(f"{base_dir}/{table}.uasset", "rb") - uexp=open(f"{base_dir}/{table}.uexp", "rb") - package = wacky.jsonify(uasset,uexp) + uasset = open(f"{base_dir}/{table}.uasset", "rb") + uexp = open(f"{base_dir}/{table}.uexp", "rb") + + package = wacky.jsonify(uasset, uexp) package_json = json.dumps(package, indent=4, sort_keys=True) - data=json.loads(package_json) + data = json.loads(package_json) first_elem = data[0] - wacca_data = first_elem['rows'] + wacca_data = first_elem["rows"] for i, key in enumerate(wacca_data): song_id = int(key) - title = wacca_data[str(key)]["MusicMessage"] + title = wacca_data[str(key)]["MusicMessage"] artist = wacca_data[str(key)]["ArtistMessage"] bpm = wacca_data[str(key)]["Bpm"] jacket_asset_name = wacca_data[str(key)]["JacketAssetName"] @@ -52,29 +67,69 @@ class WaccaReader(BaseReader): designer = wacca_data[str(key)]["NotesDesignerNormal"] if diff > 0: - self.data.static.put_music(self.version, song_id, 1, title, artist, bpm, diff, designer, jacket_asset_name) + self.data.static.put_music( + self.version, + song_id, + 1, + title, + artist, + bpm, + diff, + designer, + jacket_asset_name, + ) self.logger.info(f"Read song {song_id} chart 1") diff = float(wacca_data[str(key)]["DifficultyHardLv"]) designer = wacca_data[str(key)]["NotesDesignerHard"] - + if diff > 0: - self.data.static.put_music(self.version, song_id, 2, title, artist, bpm, diff, designer, jacket_asset_name) + self.data.static.put_music( + self.version, + song_id, + 2, + title, + artist, + bpm, + diff, + designer, + jacket_asset_name, + ) self.logger.info(f"Read song {song_id} chart 2") diff = float(wacca_data[str(key)]["DifficultyExtremeLv"]) designer = wacca_data[str(key)]["NotesDesignerExpert"] if diff > 0: - self.data.static.put_music(self.version, song_id, 3, title, artist, bpm, diff, designer, jacket_asset_name) + self.data.static.put_music( + self.version, + song_id, + 3, + title, + artist, + bpm, + diff, + designer, + jacket_asset_name, + ) self.logger.info(f"Read song {song_id} chart 3") diff = float(wacca_data[str(key)]["DifficultyInfernoLv"]) designer = wacca_data[str(key)]["NotesDesignerInferno"] if diff > 0: - self.data.static.put_music(self.version, song_id, 4, title, artist, bpm, diff, designer, jacket_asset_name) + self.data.static.put_music( + self.version, + song_id, + 4, + title, + artist, + bpm, + diff, + designer, + jacket_asset_name, + ) self.logger.info(f"Read song {song_id} chart 4") - + def check_valid_pair(self, dir: str, file: str) -> bool: - return path.exists(f"{dir}/{file}.uasset") and path.exists(f"{dir}/{file}.uexp") \ No newline at end of file + return path.exists(f"{dir}/{file}.uasset") and path.exists(f"{dir}/{file}.uexp") diff --git a/titles/wacca/reverse.py b/titles/wacca/reverse.py index 100ffb1..f32b0c4 100644 --- a/titles/wacca/reverse.py +++ b/titles/wacca/reverse.py @@ -9,6 +9,7 @@ from titles.wacca.const import WaccaConstants from titles.wacca.handlers import * + class WaccaReverse(WaccaLilyR): def __init__(self, cfg: CoreConfig, game_cfg: WaccaConfig) -> None: super().__init__(cfg, game_cfg) @@ -46,12 +47,12 @@ class WaccaReverse(WaccaLilyR): (310006, 0), ] - def handle_user_status_login_request(self, data: Dict)-> Dict: + def handle_user_status_login_request(self, data: Dict) -> Dict: resp = super().handle_user_status_login_request(data) resp["params"].append([]) return resp - def handle_user_status_getDetail_request(self, data: Dict)-> Dict: + def handle_user_status_getDetail_request(self, data: Dict) -> Dict: req = UserStatusGetDetailRequest(data) resp = UserStatusGetDetailResponseV4() @@ -79,15 +80,23 @@ class WaccaReverse(WaccaLilyR): if profile["vip_expire_time"] is None: resp.userStatus.vipExpireTime = 0 - + else: - resp.userStatus.vipExpireTime = int(profile["vip_expire_time"].timestamp()) - + resp.userStatus.vipExpireTime = int(profile["vip_expire_time"].timestamp()) + if profile["always_vip"] or self.game_config.mods.always_vip: - resp.userStatus.vipExpireTime = int((self.srvtime + timedelta(days=31)).timestamp()) + resp.userStatus.vipExpireTime = int( + (self.srvtime + timedelta(days=31)).timestamp() + ) resp.songUpdateTime = int(profile["last_login_date"].timestamp()) - resp.lastSongInfo = LastSongDetail(profile["last_song_id"],profile["last_song_difficulty"],profile["last_folder_order"],profile["last_folder_id"],profile["last_song_order"]) + resp.lastSongInfo = LastSongDetail( + profile["last_song_id"], + profile["last_song_difficulty"], + profile["last_folder_order"], + profile["last_folder_id"], + profile["last_song_order"], + ) resp.songPlayStatus = [resp.lastSongInfo.lastSongId, 1] resp.userStatus.userId = profile["id"] @@ -100,42 +109,57 @@ class WaccaReverse(WaccaLilyR): resp.userStatus.loginDays = profile["login_count_days"] resp.userStatus.loginConsecutiveDays = profile["login_count_days_consec"] resp.userStatus.loginsToday = profile["login_count_today"] - resp.userStatus.rating = profile['rating'] + resp.userStatus.rating = profile["rating"] if self.game_config.mods.infinite_wp: resp.userStatus.wp = 999999 for fav in profile_favorites: resp.favorites.append(fav["song_id"]) - + if profile["friend_view_1"] is not None: pass if profile["friend_view_2"] is not None: pass if profile["friend_view_3"] is not None: pass - - resp.seasonalPlayModeCounts.append(PlayModeCounts(self.season, 1, profile["playcount_single"])) - resp.seasonalPlayModeCounts.append(PlayModeCounts(self.season, 2, profile["playcount_multi_vs"])) - resp.seasonalPlayModeCounts.append(PlayModeCounts(self.season, 3, profile["playcount_multi_coop"])) - resp.seasonalPlayModeCounts.append(PlayModeCounts(self.season, 4, profile["playcount_stageup"])) - + + resp.seasonalPlayModeCounts.append( + PlayModeCounts(self.season, 1, profile["playcount_single"]) + ) + resp.seasonalPlayModeCounts.append( + PlayModeCounts(self.season, 2, profile["playcount_multi_vs"]) + ) + resp.seasonalPlayModeCounts.append( + PlayModeCounts(self.season, 3, profile["playcount_multi_coop"]) + ) + resp.seasonalPlayModeCounts.append( + PlayModeCounts(self.season, 4, profile["playcount_stageup"]) + ) + for opt in profile_options: resp.options.append(UserOption(opt["opt_id"], opt["value"])) - + if profile_bingo is not None: resp.bingoStatus = BingoDetail(profile_bingo["page_number"]) for x in profile_bingo["page_progress"]: resp.bingoStatus.pageStatus.append(BingoPageStatus(x[0], x[1], x[2])) - + for gate in self.game_config.gates.enabled_gates: added_gate = False for user_gate in profile_gates: if user_gate["gate_id"] == gate: - - resp.gateInfo.append(GateDetailV2(user_gate["gate_id"],user_gate["page"],user_gate["progress"], - user_gate["loops"],int(user_gate["last_used"].timestamp()),user_gate["mission_flag"])) + resp.gateInfo.append( + GateDetailV2( + user_gate["gate_id"], + user_gate["page"], + user_gate["progress"], + user_gate["loops"], + int(user_gate["last_used"].timestamp()), + user_gate["mission_flag"], + ) + ) resp.seasonInfo.cumulativeGatePts += user_gate["total_points"] @@ -144,14 +168,18 @@ class WaccaReverse(WaccaLilyR): if not added_gate: resp.gateInfo.append(GateDetailV2(gate)) - + for unlock in profile_song_unlocks: for x in range(1, unlock["highest_difficulty"] + 1): - resp.userItems.songUnlocks.append(SongUnlock(unlock["song_id"], x, 0, int(unlock["acquire_date"].timestamp()))) - + resp.userItems.songUnlocks.append( + SongUnlock( + unlock["song_id"], x, 0, int(unlock["acquire_date"].timestamp()) + ) + ) + for song in profile_scores: resp.seasonInfo.cumulativeScore += song["score"] - + clear_cts = SongDetailClearCounts( song["play_ct"], song["clear_ct"], @@ -161,13 +189,23 @@ class WaccaReverse(WaccaLilyR): ) grade_cts = SongDetailGradeCountsV2( - song["grade_d_ct"], song["grade_c_ct"], song["grade_b_ct"], song["grade_a_ct"], song["grade_aa_ct"], - song["grade_aaa_ct"], song["grade_s_ct"], song["grade_ss_ct"], song["grade_sss_ct"], - song["grade_master_ct"], song["grade_sp_ct"], song["grade_ssp_ct"], song["grade_sssp_ct"] + song["grade_d_ct"], + song["grade_c_ct"], + song["grade_b_ct"], + song["grade_a_ct"], + song["grade_aa_ct"], + song["grade_aaa_ct"], + song["grade_s_ct"], + song["grade_ss_ct"], + song["grade_sss_ct"], + song["grade_master_ct"], + song["grade_sp_ct"], + song["grade_ssp_ct"], + song["grade_sssp_ct"], ) deets = BestScoreDetailV2(song["song_id"], song["chart_id"]) - deets.clearCounts = clear_cts + deets.clearCounts = clear_cts deets.clearCountsSeason = clear_cts deets.gradeCounts = grade_cts deets.score = song["score"] @@ -176,9 +214,16 @@ class WaccaReverse(WaccaLilyR): deets.rating = song["rating"] resp.scores.append(deets) - + for trophy in profile_trophies: - resp.userItems.trophies.append(TrophyItem(trophy["trophy_id"], trophy["season"], trophy["progress"], trophy["badge_type"])) + resp.userItems.trophies.append( + TrophyItem( + trophy["trophy_id"], + trophy["season"], + trophy["progress"], + trophy["badge_type"], + ) + ) if self.game_config.mods.infinite_tickets: for x in range(5): @@ -190,30 +235,48 @@ class WaccaReverse(WaccaLilyR): else: expire = int(ticket["expire_date"].timestamp()) - resp.userItems.tickets.append(TicketItem(ticket["id"], ticket["ticket_id"], expire)) + resp.userItems.tickets.append( + TicketItem(ticket["id"], ticket["ticket_id"], expire) + ) if profile_items: for item in profile_items: try: - if item["type"] == WaccaConstants.ITEM_TYPES["icon"]: - resp.userItems.icons.append(IconItem(item["item_id"], 1, item["use_count"], int(item["acquire_date"].timestamp()))) + resp.userItems.icons.append( + IconItem( + item["item_id"], + 1, + item["use_count"], + int(item["acquire_date"].timestamp()), + ) + ) elif item["type"] == WaccaConstants.ITEM_TYPES["navigator"]: - resp.userItems.navigators.append(NavigatorItem(item["item_id"], 1, int(item["acquire_date"].timestamp()), item["use_count"], item["use_count"])) + resp.userItems.navigators.append( + NavigatorItem( + item["item_id"], + 1, + int(item["acquire_date"].timestamp()), + item["use_count"], + item["use_count"], + ) + ) else: - itm_send = GenericItemSend(item["item_id"], 1, int(item["acquire_date"].timestamp())) + itm_send = GenericItemSend( + item["item_id"], 1, int(item["acquire_date"].timestamp()) + ) if item["type"] == WaccaConstants.ITEM_TYPES["title"]: resp.userItems.titles.append(itm_send) - + elif item["type"] == WaccaConstants.ITEM_TYPES["user_plate"]: resp.userItems.plates.append(itm_send) elif item["type"] == WaccaConstants.ITEM_TYPES["touch_effect"]: resp.userItems.touchEffect.append(itm_send) - + elif item["type"] == WaccaConstants.ITEM_TYPES["note_color"]: resp.userItems.noteColors.append(itm_send) @@ -221,7 +284,9 @@ class WaccaReverse(WaccaLilyR): resp.userItems.noteSounds.append(itm_send) except: - self.logger.error(f"{__name__} Failed to load item {item['item_id']} for user {profile['user']}") + self.logger.error( + f"{__name__} Failed to load item {item['item_id']} for user {profile['user']}" + ) resp.seasonInfo.level = profile["xp"] resp.seasonInfo.wpObtained = profile["wp_total"] @@ -234,12 +299,15 @@ class WaccaReverse(WaccaLilyR): return resp.make() - def handle_user_status_create_request(self, data: Dict)-> Dict: + def handle_user_status_create_request(self, data: Dict) -> Dict: req = UserStatusCreateRequest(data) resp = super().handle_user_status_create_request(data) - - self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 310001) # Added reverse - self.data.item.put_item(req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 310002) # Added reverse - - return resp + self.data.item.put_item( + req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 310001 + ) # Added reverse + self.data.item.put_item( + req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 310002 + ) # Added reverse + + return resp diff --git a/titles/wacca/s.py b/titles/wacca/s.py index d4c2881..4b1e997 100644 --- a/titles/wacca/s.py +++ b/titles/wacca/s.py @@ -9,6 +9,7 @@ from titles.wacca.const import WaccaConstants from titles.wacca.handlers import * + class WaccaS(WaccaBase): allowed_stages = [ (1513, 13), @@ -25,11 +26,11 @@ class WaccaS(WaccaBase): (1512, 2), (1511, 1), ] - + def __init__(self, cfg: CoreConfig, game_cfg: WaccaConfig) -> None: super().__init__(cfg, game_cfg) self.version = WaccaConstants.VER_WACCA_S - + def handle_advertise_GetNews_request(self, data: Dict) -> Dict: resp = GetNewsResponseV2() return resp.make() diff --git a/titles/wacca/schema/__init__.py b/titles/wacca/schema/__init__.py index 1addd87..2ccb661 100644 --- a/titles/wacca/schema/__init__.py +++ b/titles/wacca/schema/__init__.py @@ -3,4 +3,4 @@ from titles.wacca.schema.score import WaccaScoreData from titles.wacca.schema.item import WaccaItemData from titles.wacca.schema.static import WaccaStaticData -__all__ = ["WaccaProfileData", "WaccaScoreData", "WaccaItemData", "WaccaStaticData"] \ No newline at end of file +__all__ = ["WaccaProfileData", "WaccaScoreData", "WaccaItemData", "WaccaStaticData"] diff --git a/titles/wacca/schema/item.py b/titles/wacca/schema/item.py index 76e901f..2341afa 100644 --- a/titles/wacca/schema/item.py +++ b/titles/wacca/schema/item.py @@ -12,132 +12,158 @@ item = Table( "wacca_item", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("item_id", Integer, nullable=False), - Column("type", Integer, nullable=False), + Column("type", Integer, nullable=False), Column("acquire_date", TIMESTAMP, nullable=False, server_default=func.now()), Column("use_count", Integer, server_default="0"), UniqueConstraint("user", "item_id", "type", name="wacca_item_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) ticket = Table( "wacca_ticket", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("ticket_id", Integer, nullable=False), Column("acquire_date", TIMESTAMP, nullable=False, server_default=func.now()), Column("expire_date", TIMESTAMP), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) song_unlock = Table( "wacca_song_unlock", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("song_id", Integer, nullable=False), - Column("highest_difficulty", Integer, nullable=False), + Column("highest_difficulty", Integer, nullable=False), Column("acquire_date", TIMESTAMP, nullable=False, server_default=func.now()), UniqueConstraint("user", "song_id", name="wacca_song_unlock_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) trophy = Table( "wacca_trophy", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("trophy_id", Integer, nullable=False), Column("season", Integer, nullable=False), Column("progress", Integer, nullable=False, server_default="0"), Column("badge_type", Integer, nullable=False, server_default="0"), UniqueConstraint("user", "trophy_id", "season", name="wacca_trophy_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) -class WaccaItemData(BaseData): + +class WaccaItemData(BaseData): def get_song_unlocks(self, user_id: int) -> Optional[List[Row]]: sql = song_unlock.select(song_unlock.c.user == user_id) result = self.execute(sql) - if result is None: return None - + if result is None: + return None + return result.fetchall() def unlock_song(self, user_id: int, song_id: int, difficulty: int) -> Optional[int]: sql = insert(song_unlock).values( - user=user_id, - song_id=song_id, - highest_difficulty=difficulty + user=user_id, song_id=song_id, highest_difficulty=difficulty ) conflict = sql.on_duplicate_key_update( highest_difficulty=case( - (song_unlock.c.highest_difficulty >= difficulty, song_unlock.c.highest_difficulty), + ( + song_unlock.c.highest_difficulty >= difficulty, + song_unlock.c.highest_difficulty, + ), (song_unlock.c.highest_difficulty < difficulty, difficulty), ) ) result = self.execute(conflict) if result is None: - self.logger.error(f"{__name__} failed to unlock song! user: {user_id}, song_id: {song_id}, difficulty: {difficulty}") + self.logger.error( + f"{__name__} failed to unlock song! user: {user_id}, song_id: {song_id}, difficulty: {difficulty}" + ) return None - + return result.lastrowid def put_item(self, user_id: int, item_type: int, item_id: int) -> Optional[int]: sql = insert(item).values( - user = user_id, - item_id = item_id, - type = item_type, + user=user_id, + item_id=item_id, + type=item_type, ) - conflict = sql.on_duplicate_key_update( - use_count = item.c.use_count + 1 - ) + conflict = sql.on_duplicate_key_update(use_count=item.c.use_count + 1) result = self.execute(conflict) if result is None: - self.logger.error(f"{__name__} failed to insert item! user: {user_id}, item_id: {item_id}, item_type: {item_type}") + self.logger.error( + f"{__name__} failed to insert item! user: {user_id}, item_id: {item_id}, item_type: {item_type}" + ) return None - + return result.lastrowid - - def get_items(self, user_id: int, item_type: int = None, item_id: int = None) -> Optional[List[Row]]: + + def get_items( + self, user_id: int, item_type: int = None, item_id: int = None + ) -> Optional[List[Row]]: """ A catch-all item lookup given a profile and option item type and ID specifiers """ sql = item.select( - and_(item.c.user == user_id, - item.c.type == item_type if item_type is not None else True, - item.c.item_id == item_id if item_id is not None else True) - ) - - result = self.execute(sql) - if result is None: return None - return result.fetchall() - - def get_tickets(self, user_id: int) -> Optional[List[Row]]: - sql = select(ticket).where(ticket.c.user == user_id) - - result = self.execute(sql) - if result is None: return None - return result.fetchall() - - def add_ticket(self, user_id: int, ticket_id: int) -> None: - sql = insert(ticket).values( - user = user_id, - ticket_id = ticket_id + and_( + item.c.user == user_id, + item.c.type == item_type if item_type is not None else True, + item.c.item_id == item_id if item_id is not None else True, + ) ) result = self.execute(sql) if result is None: - self.logger.error(f"add_ticket: Failed to insert wacca ticket! user_id: {user_id} ticket_id {ticket_id}") + return None + return result.fetchall() + + def get_tickets(self, user_id: int) -> Optional[List[Row]]: + sql = select(ticket).where(ticket.c.user == user_id) + + result = self.execute(sql) + if result is None: + return None + return result.fetchall() + + def add_ticket(self, user_id: int, ticket_id: int) -> None: + sql = insert(ticket).values(user=user_id, ticket_id=ticket_id) + + result = self.execute(sql) + if result is None: + self.logger.error( + f"add_ticket: Failed to insert wacca ticket! user_id: {user_id} ticket_id {ticket_id}" + ) return None return result.lastrowid - + def spend_ticket(self, id: int) -> None: sql = delete(ticket).where(ticket.c.id == id) @@ -146,32 +172,36 @@ class WaccaItemData(BaseData): self.logger.warn(f"Failed to delete ticket id {id}") return None - def get_trophies(self, user_id: int, season: int = None) -> Optional[List[Row]]: + def get_trophies(self, user_id: int, season: int = None) -> Optional[List[Row]]: if season is None: sql = select(trophy).where(trophy.c.user == user_id) else: - sql = select(trophy).where(and_(trophy.c.user == user_id, trophy.c.season == season)) - + sql = select(trophy).where( + and_(trophy.c.user == user_id, trophy.c.season == season) + ) + result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - - def update_trophy(self, user_id: int, trophy_id: int, season: int, progress: int, badge_type: int) -> Optional[int]: + + def update_trophy( + self, user_id: int, trophy_id: int, season: int, progress: int, badge_type: int + ) -> Optional[int]: sql = insert(trophy).values( - user = user_id, - trophy_id = trophy_id, - season = season, - progress = progress, - badge_type = badge_type + user=user_id, + trophy_id=trophy_id, + season=season, + progress=progress, + badge_type=badge_type, ) - conflict = sql.on_duplicate_key_update( - progress = progress - ) + conflict = sql.on_duplicate_key_update(progress=progress) result = self.execute(conflict) if result is None: - self.logger.error(f"update_trophy: Failed to insert wacca trophy! user_id: {user_id} trophy_id: {trophy_id} progress {progress}") + self.logger.error( + f"update_trophy: Failed to insert wacca trophy! user_id: {user_id} trophy_id: {trophy_id} progress {progress}" + ) return None return result.lastrowid - diff --git a/titles/wacca/schema/profile.py b/titles/wacca/schema/profile.py index c2a15f6..27111be 100644 --- a/titles/wacca/schema/profile.py +++ b/titles/wacca/schema/profile.py @@ -12,7 +12,11 @@ profile = Table( "wacca_profile", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("version", Integer), Column("username", String(8), nullable=False), Column("xp", Integer, server_default="0"), @@ -20,7 +24,7 @@ profile = Table( Column("wp_total", Integer, server_default="0"), Column("wp_spent", Integer, server_default="0"), Column("dan_type", Integer, server_default="0"), - Column("dan_level", Integer, server_default="0"), + Column("dan_level", Integer, server_default="0"), Column("title_0", Integer, server_default="0"), Column("title_1", Integer, server_default="0"), Column("title_2", Integer, server_default="0"), @@ -48,14 +52,18 @@ profile = Table( Column("last_login_date", TIMESTAMP, server_default=func.now()), Column("gate_tutorial_flags", JSON), UniqueConstraint("user", "version", name="wacca_profile_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) option = Table( "wacca_option", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("opt_id", Integer, nullable=False), Column("value", Integer, nullable=False), UniqueConstraint("user", "opt_id", name="wacca_option_uk"), @@ -64,38 +72,59 @@ option = Table( bingo = Table( "wacca_bingo", metadata, - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), primary_key=True, nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + primary_key=True, + nullable=False, + ), Column("page_number", Integer, nullable=False), Column("page_progress", JSON, nullable=False), UniqueConstraint("user", "page_number", name="wacca_bingo_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) friend = Table( "wacca_friend", metadata, - Column("profile_sender", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), - Column("profile_reciever", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "profile_sender", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), + Column( + "profile_reciever", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("is_accepted", Boolean, server_default="0"), - PrimaryKeyConstraint('profile_sender', 'profile_reciever', name='arcade_owner_pk'), - mysql_charset='utf8mb4' + PrimaryKeyConstraint("profile_sender", "profile_reciever", name="arcade_owner_pk"), + mysql_charset="utf8mb4", ) favorite = Table( "wacca_favorite_song", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("song_id", Integer, nullable=False), UniqueConstraint("user", "song_id", name="wacca_favorite_song_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) gate = Table( "wacca_gate", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("gate_id", Integer, nullable=False), Column("page", Integer, nullable=False, server_default="0"), Column("progress", Integer, nullable=False, server_default="0"), @@ -106,68 +135,87 @@ gate = Table( UniqueConstraint("user", "gate_id", name="wacca_gate_uk"), ) + class WaccaProfileData(BaseData): - def create_profile(self, aime_id: int, username: str, version: int) -> Optional[int]: + def create_profile( + self, aime_id: int, username: str, version: int + ) -> Optional[int]: """ Given a game version, aime id, and username, create a profile and return it's ID """ - sql = insert(profile).values( - user=aime_id, - username=username, - version=version - ) + sql = insert(profile).values(user=aime_id, username=username, version=version) - conflict = sql.on_duplicate_key_update( - username = sql.inserted.username - ) + conflict = sql.on_duplicate_key_update(username=sql.inserted.username) result = self.execute(conflict) if result is None: - self.logger.error(f"{__name__} Failed to insert wacca profile! aime id: {aime_id} username: {username}") + self.logger.error( + f"{__name__} Failed to insert wacca profile! aime id: {aime_id} username: {username}" + ) return None return result.lastrowid - - def update_profile_playtype(self, profile_id: int, play_type: int, game_version: str) -> None: + + def update_profile_playtype( + self, profile_id: int, play_type: int, game_version: str + ) -> None: sql = profile.update(profile.c.id == profile_id).values( - playcount_single = profile.c.playcount_single + 1 if play_type == 1 else profile.c.playcount_single, - - playcount_multi_vs = profile.c.playcount_multi_vs + 1 if play_type == 2 else profile.c.playcount_multi_vs, - - playcount_multi_coop = profile.c.playcount_multi_coop + 1 if play_type == 3 else profile.c.playcount_multi_coop, - - playcount_stageup = profile.c.playcount_stageup + 1 if play_type == 4 else profile.c.playcount_stageup, - - last_game_ver = game_version, - ) - - result = self.execute(sql) - if result is None: - self.logger.error(f"update_profile: failed to update profile! profile: {profile_id}") - return None - - def update_profile_lastplayed(self, profile_id: int, last_song_id: int, last_song_difficulty: int, last_folder_order: int, - last_folder_id: int, last_song_order: int) -> None: - sql = profile.update(profile.c.id == profile_id).values( - last_song_id = last_song_id, - last_song_difficulty = last_song_difficulty, - last_folder_order = last_folder_order, - last_folder_id = last_folder_id, - last_song_order = last_song_order - ) - result = self.execute(sql) - if result is None: - self.logger.error(f"update_profile_lastplayed: failed to update profile! profile: {profile_id}") - return None - - def update_profile_dan(self, profile_id: int, dan_level: int, dan_type: int) -> Optional[int]: - sql = profile.update(profile.c.id == profile_id).values( - dan_level = dan_level, - dan_type = dan_type + playcount_single=profile.c.playcount_single + 1 + if play_type == 1 + else profile.c.playcount_single, + playcount_multi_vs=profile.c.playcount_multi_vs + 1 + if play_type == 2 + else profile.c.playcount_multi_vs, + playcount_multi_coop=profile.c.playcount_multi_coop + 1 + if play_type == 3 + else profile.c.playcount_multi_coop, + playcount_stageup=profile.c.playcount_stageup + 1 + if play_type == 4 + else profile.c.playcount_stageup, + last_game_ver=game_version, ) result = self.execute(sql) if result is None: - self.logger.warn(f"update_profile_dan: Failed to update! profile {profile_id}") + self.logger.error( + f"update_profile: failed to update profile! profile: {profile_id}" + ) + return None + + def update_profile_lastplayed( + self, + profile_id: int, + last_song_id: int, + last_song_difficulty: int, + last_folder_order: int, + last_folder_id: int, + last_song_order: int, + ) -> None: + sql = profile.update(profile.c.id == profile_id).values( + last_song_id=last_song_id, + last_song_difficulty=last_song_difficulty, + last_folder_order=last_folder_order, + last_folder_id=last_folder_id, + last_song_order=last_song_order, + ) + result = self.execute(sql) + if result is None: + self.logger.error( + f"update_profile_lastplayed: failed to update profile! profile: {profile_id}" + ) + return None + + def update_profile_dan( + self, profile_id: int, dan_level: int, dan_type: int + ) -> Optional[int]: + sql = profile.update(profile.c.id == profile_id).values( + dan_level=dan_level, dan_type=dan_type + ) + + result = self.execute(sql) + if result is None: + self.logger.warn( + f"update_profile_dan: Failed to update! profile {profile_id}" + ) return None return result.lastrowid @@ -180,11 +228,14 @@ class WaccaProfileData(BaseData): elif profile_id > 0: sql = profile.select(profile.c.id == profile_id) else: - self.logger.error(f"get_profile: Bad arguments!! profile_id {profile_id} aime_id {aime_id}") + self.logger.error( + f"get_profile: Bad arguments!! profile_id {profile_id} aime_id {aime_id}" + ) return None - + result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() def get_options(self, user_id: int, option_id: int = None) -> Optional[List[Row]]: @@ -192,71 +243,83 @@ class WaccaProfileData(BaseData): Get a specific user option for a profile, or all of them if none specified """ sql = option.select( - and_(option.c.user == user_id, - option.c.opt_id == option_id if option_id is not None else True) + and_( + option.c.user == user_id, + option.c.opt_id == option_id if option_id is not None else True, + ) ) - + result = self.execute(sql) - if result is None: return None + if result is None: + return None if option_id is not None: return result.fetchone() else: return result.fetchall() - - def update_option(self, user_id: int, option_id: int, value: int) -> Optional[int]: - sql = insert(option).values( - user = user_id, - opt_id = option_id, - value = value - ) - conflict = sql.on_duplicate_key_update( - value = value - ) + def update_option(self, user_id: int, option_id: int, value: int) -> Optional[int]: + sql = insert(option).values(user=user_id, opt_id=option_id, value=value) + + conflict = sql.on_duplicate_key_update(value=value) result = self.execute(conflict) if result is None: - self.logger.error(f"{__name__} failed to insert option! profile: {user_id}, option: {option_id}, value: {value}") + self.logger.error( + f"{__name__} failed to insert option! profile: {user_id}, option: {option_id}, value: {value}" + ) return None - + return result.lastrowid - + def add_favorite_song(self, user_id: int, song_id: int) -> Optional[int]: - sql = favorite.insert().values( - user=user_id, - song_id=song_id - ) + sql = favorite.insert().values(user=user_id, song_id=song_id) result = self.execute(sql) - if result is None: - self.logger.error(f"{__name__} failed to insert favorite! profile: {user_id}, song_id: {song_id}") + if result is None: + self.logger.error( + f"{__name__} failed to insert favorite! profile: {user_id}, song_id: {song_id}" + ) return None return result.lastrowid def remove_favorite_song(self, user_id: int, song_id: int) -> None: - sql = favorite.delete(and_(favorite.c.user == user_id, favorite.c.song_id == song_id)) + sql = favorite.delete( + and_(favorite.c.user == user_id, favorite.c.song_id == song_id) + ) result = self.execute(sql) - if result is None: - self.logger.error(f"{__name__} failed to remove favorite! profile: {user_id}, song_id: {song_id}") + if result is None: + self.logger.error( + f"{__name__} failed to remove favorite! profile: {user_id}, song_id: {song_id}" + ) return None def get_favorite_songs(self, user_id: int) -> Optional[List[Row]]: sql = favorite.select(favorite.c.user == user_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - + def get_gates(self, user_id: int) -> Optional[List[Row]]: sql = select(gate).where(gate.c.user == user_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - - def update_gate(self, user_id: int, gate_id: int, page: int, progress: int, loop: int, mission_flag: int, - total_points: int) -> Optional[int]: + + def update_gate( + self, + user_id: int, + gate_id: int, + page: int, + progress: int, + loop: int, + mission_flag: int, + total_points: int, + ) -> Optional[int]: sql = insert(gate).values( user=user_id, gate_id=gate_id, @@ -264,7 +327,7 @@ class WaccaProfileData(BaseData): progress=progress, loops=loop, mission_flag=mission_flag, - total_points=total_points + total_points=total_points, ) conflict = sql.on_duplicate_key_update( @@ -276,16 +339,19 @@ class WaccaProfileData(BaseData): ) result = self.execute(conflict) - if result is None: - self.logger.error(f"{__name__} failed to update gate! user: {user_id}, gate_id: {gate_id}") + if result is None: + self.logger.error( + f"{__name__} failed to update gate! user: {user_id}, gate_id: {gate_id}" + ) return None return result.lastrowid - + def get_friends(self, user_id: int) -> Optional[List[Row]]: sql = friend.select(friend.c.profile_sender == user_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() def profile_to_aime_user(self, profile_id: int) -> Optional[int]: @@ -293,136 +359,159 @@ class WaccaProfileData(BaseData): result = self.execute(sql) if result is None: - self.logger.info(f"profile_to_aime_user: No user found for profile {profile_id}") + self.logger.info( + f"profile_to_aime_user: No user found for profile {profile_id}" + ) return None this_profile = result.fetchone() if this_profile is None: - self.logger.info(f"profile_to_aime_user: No user found for profile {profile_id}") + self.logger.info( + f"profile_to_aime_user: No user found for profile {profile_id}" + ) return None - return this_profile['user'] - - def session_login(self, profile_id: int, is_new_day: bool, is_consec_day: bool) -> None: + return this_profile["user"] + + def session_login( + self, profile_id: int, is_new_day: bool, is_consec_day: bool + ) -> None: # TODO: Reset consec days counter sql = profile.update(profile.c.id == profile_id).values( - login_count = profile.c.login_count + 1, - login_count_consec = profile.c.login_count_consec + 1, - login_count_days = profile.c.login_count_days + 1 if is_new_day else profile.c.login_count_days, - login_count_days_consec = profile.c.login_count_days_consec + 1 if is_new_day and is_consec_day else profile.c.login_count_days_consec, - login_count_today = 1 if is_new_day else profile.c.login_count_today + 1, - last_login_date = func.now() - ) - - result = self.execute(sql) - if result is None: - self.logger.error(f"session_login: failed to update profile! profile: {profile_id}") - return None - - def session_logout(self, profile_id: int) -> None: - sql = profile.update(profile.c.id == id).values( - login_count_consec = 0 - ) - - result = self.execute(sql) - if result is None: - self.logger.error(f"{__name__} failed to update profile! profile: {profile_id}") - return None - - def add_xp(self, profile_id: int, xp: int) -> None: - sql = profile.update(profile.c.id == profile_id).values( - xp = profile.c.xp + xp + login_count=profile.c.login_count + 1, + login_count_consec=profile.c.login_count_consec + 1, + login_count_days=profile.c.login_count_days + 1 + if is_new_day + else profile.c.login_count_days, + login_count_days_consec=profile.c.login_count_days_consec + 1 + if is_new_day and is_consec_day + else profile.c.login_count_days_consec, + login_count_today=1 if is_new_day else profile.c.login_count_today + 1, + last_login_date=func.now(), ) result = self.execute(sql) if result is None: - self.logger.error(f"add_xp: Failed to update profile! profile_id {profile_id} xp {xp}") + self.logger.error( + f"session_login: failed to update profile! profile: {profile_id}" + ) + return None + + def session_logout(self, profile_id: int) -> None: + sql = profile.update(profile.c.id == id).values(login_count_consec=0) + + result = self.execute(sql) + if result is None: + self.logger.error( + f"{__name__} failed to update profile! profile: {profile_id}" + ) + return None + + def add_xp(self, profile_id: int, xp: int) -> None: + sql = profile.update(profile.c.id == profile_id).values(xp=profile.c.xp + xp) + + result = self.execute(sql) + if result is None: + self.logger.error( + f"add_xp: Failed to update profile! profile_id {profile_id} xp {xp}" + ) return None def add_wp(self, profile_id: int, wp: int) -> None: sql = profile.update(profile.c.id == profile_id).values( - wp = profile.c.wp + wp, - wp_total = profile.c.wp_total + wp, + wp=profile.c.wp + wp, + wp_total=profile.c.wp_total + wp, ) result = self.execute(sql) if result is None: - self.logger.error(f"add_wp: Failed to update profile! profile_id {profile_id} wp {wp}") + self.logger.error( + f"add_wp: Failed to update profile! profile_id {profile_id} wp {wp}" + ) return None def spend_wp(self, profile_id: int, wp: int) -> None: sql = profile.update(profile.c.id == profile_id).values( - wp = profile.c.wp - wp, - wp_spent = profile.c.wp_spent + wp, + wp=profile.c.wp - wp, + wp_spent=profile.c.wp_spent + wp, ) result = self.execute(sql) if result is None: - self.logger.error(f"spend_wp: Failed to update profile! profile_id {profile_id} wp {wp}") + self.logger.error( + f"spend_wp: Failed to update profile! profile_id {profile_id} wp {wp}" + ) return None - + def activate_vip(self, profile_id: int, expire_time) -> None: sql = profile.update(profile.c.id == profile_id).values( - vip_expire_time = expire_time + vip_expire_time=expire_time ) result = self.execute(sql) if result is None: - self.logger.error(f"activate_vip: Failed to update profile! profile_id {profile_id} expire_time {expire_time}") + self.logger.error( + f"activate_vip: Failed to update profile! profile_id {profile_id} expire_time {expire_time}" + ) return None def update_user_rating(self, profile_id: int, new_rating: int) -> None: - sql = profile.update(profile.c.id == profile_id).values( - rating = new_rating - ) + sql = profile.update(profile.c.id == profile_id).values(rating=new_rating) result = self.execute(sql) if result is None: - self.logger.error(f"update_user_rating: Failed to update profile! profile_id {profile_id} new_rating {new_rating}") + self.logger.error( + f"update_user_rating: Failed to update profile! profile_id {profile_id} new_rating {new_rating}" + ) return None def update_bingo(self, aime_id: int, page: int, progress: int) -> Optional[int]: sql = insert(bingo).values( - user=aime_id, - page_number=page, - page_progress=progress - ) - - conflict = sql.on_duplicate_key_update( - page_number=page, - page_progress=progress + user=aime_id, page_number=page, page_progress=progress ) + conflict = sql.on_duplicate_key_update(page_number=page, page_progress=progress) + result = self.execute(conflict) - if result is None: + if result is None: self.logger.error(f"put_bingo: failed to update! aime_id: {aime_id}") return None return result.lastrowid - + def get_bingo(self, aime_id: int) -> Optional[List[Row]]: - sql = select(bingo).where(bingo.c.user==aime_id) + sql = select(bingo).where(bingo.c.user == aime_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() - + def get_bingo_page(self, aime_id: int, page: Dict) -> Optional[List[Row]]: - sql = select(bingo).where(and_(bingo.c.user==aime_id, bingo.c.page_number==page)) + sql = select(bingo).where( + and_(bingo.c.user == aime_id, bingo.c.page_number == page) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() def update_vip_time(self, profile_id: int, time_left) -> None: - sql = profile.update(profile.c.id == profile_id).values(vip_expire_time = time_left) + sql = profile.update(profile.c.id == profile_id).values( + vip_expire_time=time_left + ) result = self.execute(sql) if result is None: self.logger.error(f"Failed to update VIP time for profile {profile_id}") - + def update_tutorial_flags(self, profile_id: int, flags: Dict) -> None: - sql = profile.update(profile.c.id == profile_id).values(gate_tutorial_flags = flags) - + sql = profile.update(profile.c.id == profile_id).values( + gate_tutorial_flags=flags + ) + result = self.execute(sql) if result is None: - self.logger.error(f"Failed to update tutorial flags for profile {profile_id}") \ No newline at end of file + self.logger.error( + f"Failed to update tutorial flags for profile {profile_id}" + ) diff --git a/titles/wacca/schema/score.py b/titles/wacca/schema/score.py index 4b0c26c..250740f 100644 --- a/titles/wacca/schema/score.py +++ b/titles/wacca/schema/score.py @@ -13,9 +13,13 @@ best_score = Table( "wacca_score_best", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("song_id", Integer), - Column("chart_id", Integer), + Column("chart_id", Integer), Column("score", Integer), Column("play_ct", Integer), Column("clear_ct", Integer), @@ -39,14 +43,18 @@ best_score = Table( Column("lowest_miss_ct", Integer), Column("rating", Integer), UniqueConstraint("user", "song_id", "chart_id", name="wacca_score_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) playlog = Table( "wacca_score_playlog", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("song_id", Integer), Column("chart_id", Integer), Column("score", Integer), @@ -61,14 +69,18 @@ playlog = Table( Column("late_ct", Integer), Column("season", Integer), Column("date_scored", TIMESTAMP, server_default=func.now()), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) stageup = Table( "wacca_score_stageup", metadata, Column("id", Integer, primary_key=True, nullable=False), - Column("user", ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), Column("version", Integer), Column("stage_id", Integer), Column("clear_status", Integer), @@ -77,19 +89,29 @@ stageup = Table( Column("song2_score", Integer), Column("song3_score", Integer), Column("play_ct", Integer, server_default="1"), - UniqueConstraint("user", "stage_id", name="wacca_score_stageup_uk"), - mysql_charset='utf8mb4' + UniqueConstraint("user", "stage_id", name="wacca_score_stageup_uk"), + mysql_charset="utf8mb4", ) + class WaccaScoreData(BaseData): - def put_best_score(self, user_id: int, song_id: int, chart_id: int, score: int, clear: List[int], - grade: List[int], best_combo: int, lowest_miss_ct: int) -> Optional[int]: + def put_best_score( + self, + user_id: int, + song_id: int, + chart_id: int, + score: int, + clear: List[int], + grade: List[int], + best_combo: int, + lowest_miss_ct: int, + ) -> Optional[int]: """ Update the user's best score for a chart """ while len(grade) < 13: grade.append(0) - + sql = insert(best_score).values( user=user_id, song_id=song_id, @@ -115,7 +137,7 @@ class WaccaScoreData(BaseData): grade_sssp_ct=grade[12], best_combo=best_combo, lowest_miss_ct=lowest_miss_ct, - rating=0 + rating=0, ) conflict = sql.on_duplicate_key_update( @@ -144,13 +166,30 @@ class WaccaScoreData(BaseData): result = self.execute(conflict) if result is None: - self.logger.error(f"{__name__}: failed to insert best score! profile: {user_id}, song: {song_id}, chart: {chart_id}") + self.logger.error( + f"{__name__}: failed to insert best score! profile: {user_id}, song: {song_id}, chart: {chart_id}" + ) return None - + return result.lastrowid - - def put_playlog(self, user_id: int, song_id: int, chart_id: int, this_score: int, clear: int, grade: int, max_combo: int, - marv_ct: int, great_ct: int, good_ct: int, miss_ct: int, fast_ct: int, late_ct: int, season: int) -> Optional[int]: + + def put_playlog( + self, + user_id: int, + song_id: int, + chart_id: int, + this_score: int, + clear: int, + grade: int, + max_combo: int, + marv_ct: int, + great_ct: int, + good_ct: int, + miss_ct: int, + fast_ct: int, + late_ct: int, + season: int, + ) -> Optional[int]: """ Add an entry to the user's play log """ @@ -168,85 +207,112 @@ class WaccaScoreData(BaseData): miss_ct=miss_ct, fast_ct=fast_ct, late_ct=late_ct, - season=season + season=season, ) result = self.execute(sql) if result is None: - self.logger.error(f"{__name__} failed to insert playlog! profile: {user_id}, song: {song_id}, chart: {chart_id}") + self.logger.error( + f"{__name__} failed to insert playlog! profile: {user_id}, song: {song_id}, chart: {chart_id}" + ) return None - + return result.lastrowid - def get_best_score(self, user_id: int, song_id: int, chart_id: int) -> Optional[Row]: + def get_best_score( + self, user_id: int, song_id: int, chart_id: int + ) -> Optional[Row]: sql = best_score.select( - and_(best_score.c.user == user_id, best_score.c.song_id == song_id, best_score.c.chart_id == chart_id) + and_( + best_score.c.user == user_id, + best_score.c.song_id == song_id, + best_score.c.chart_id == chart_id, + ) ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() def get_best_scores(self, user_id: int) -> Optional[List[Row]]: - sql = best_score.select( - best_score.c.user == user_id - ) + sql = best_score.select(best_score.c.user == user_id) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - def update_song_rating(self, user_id: int, song_id: int, chart_id: int, new_rating: int) -> None: + def update_song_rating( + self, user_id: int, song_id: int, chart_id: int, new_rating: int + ) -> None: sql = best_score.update( and_( - best_score.c.user == user_id, - best_score.c.song_id == song_id, - best_score.c.chart_id == chart_id - )).values( - rating = new_rating + best_score.c.user == user_id, + best_score.c.song_id == song_id, + best_score.c.chart_id == chart_id, ) + ).values(rating=new_rating) result = self.execute(sql) - if result is None: - self.logger.error(f"update_song_rating: failed to update rating! user_id: {user_id} song_id: {song_id} chart_id {chart_id} new_rating {new_rating}") + if result is None: + self.logger.error( + f"update_song_rating: failed to update rating! user_id: {user_id} song_id: {song_id} chart_id {chart_id} new_rating {new_rating}" + ) return None - def put_stageup(self, user_id: int, version: int, stage_id: int, clear_status: int, clear_song_ct: int, score1: int, - score2: int, score3: int) -> Optional[int]: + def put_stageup( + self, + user_id: int, + version: int, + stage_id: int, + clear_status: int, + clear_song_ct: int, + score1: int, + score2: int, + score3: int, + ) -> Optional[int]: sql = insert(stageup).values( - user = user_id, - version = version, - stage_id = stage_id, - clear_status = clear_status, - clear_song_ct = clear_song_ct, - song1_score = score1, - song2_score = score2, - song3_score = score3, + user=user_id, + version=version, + stage_id=stage_id, + clear_status=clear_status, + clear_song_ct=clear_song_ct, + song1_score=score1, + song2_score=score2, + song3_score=score3, ) conflict = sql.on_duplicate_key_update( - clear_status = clear_status, - clear_song_ct = clear_song_ct, - song1_score = score1, - song2_score = score2, - song3_score = score3, - play_ct = stageup.c.play_ct + 1 + clear_status=clear_status, + clear_song_ct=clear_song_ct, + song1_score=score1, + song2_score=score2, + song3_score=score3, + play_ct=stageup.c.play_ct + 1, ) result = self.execute(conflict) if result is None: - self.logger.warn(f"put_stageup: failed to update! user_id: {user_id} version: {version} stage_id: {stage_id}") + self.logger.warn( + f"put_stageup: failed to update! user_id: {user_id} version: {version} stage_id: {stage_id}" + ) return None return result.lastrowid def get_stageup(self, user_id: int, version: int) -> Optional[List[Row]]: - sql = select(stageup).where(and_(stageup.c.user==user_id, stageup.c.version==version)) + sql = select(stageup).where( + and_(stageup.c.user == user_id, stageup.c.version == version) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchall() - - def get_stageup_stage(self, user_id: int, version: int, stage_id: int) -> Optional[Row]: + + def get_stageup_stage( + self, user_id: int, version: int, stage_id: int + ) -> Optional[Row]: sql = select(stageup).where( and_( stageup.c.user == user_id, @@ -256,5 +322,6 @@ class WaccaScoreData(BaseData): ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() diff --git a/titles/wacca/schema/static.py b/titles/wacca/schema/static.py index a5e8b41..d09a440 100644 --- a/titles/wacca/schema/static.py +++ b/titles/wacca/schema/static.py @@ -23,46 +23,62 @@ music = Table( Column("chartDesigner", String(255)), Column("jacketFile", String(255)), UniqueConstraint("version", "songId", "chartId", name="wacca_static_music_uk"), - mysql_charset='utf8mb4' + mysql_charset="utf8mb4", ) + class WaccaStaticData(BaseData): - def put_music(self, version: int, song_id: int, chart_id: int, title: str, artist: str, bpm: str, - difficulty: float, chart_designer: str, jacket: str) -> Optional[int]: + def put_music( + self, + version: int, + song_id: int, + chart_id: int, + title: str, + artist: str, + bpm: str, + difficulty: float, + chart_designer: str, + jacket: str, + ) -> Optional[int]: sql = insert(music).values( - version = version, - songId = song_id, - chartId = chart_id, - title = title, - artist = artist, - bpm = bpm, - difficulty = difficulty, - chartDesigner = chart_designer, - jacketFile = jacket + version=version, + songId=song_id, + chartId=chart_id, + title=title, + artist=artist, + bpm=bpm, + difficulty=difficulty, + chartDesigner=chart_designer, + jacketFile=jacket, ) conflict = sql.on_duplicate_key_update( - title = title, - artist = artist, - bpm = bpm, - difficulty = difficulty, - chartDesigner = chart_designer, - jacketFile = jacket + title=title, + artist=artist, + bpm=bpm, + difficulty=difficulty, + chartDesigner=chart_designer, + jacketFile=jacket, ) result = self.execute(conflict) - if result is None: + if result is None: self.logger.warn(f"Failed to insert music {song_id} chart {chart_id}") return None return result.lastrowid - def get_music_chart(self, version: int, song_id: int, chart_id: int) -> Optional[List[Row]]: - sql = select(music).where(and_( - music.c.version == version, - music.c.songId == song_id, - music.c.chartId == chart_id - )) + def get_music_chart( + self, version: int, song_id: int, chart_id: int + ) -> Optional[List[Row]]: + sql = select(music).where( + and_( + music.c.version == version, + music.c.songId == song_id, + music.c.chartId == chart_id, + ) + ) result = self.execute(sql) - if result is None: return None + if result is None: + return None return result.fetchone() From dafc0300507a7a1780225eacba95f11a463902ad Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Thu, 9 Mar 2023 12:02:02 -0500 Subject: [PATCH 29/63] wacca: add .partition() --- titles/wacca/index.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/titles/wacca/index.py b/titles/wacca/index.py index 2a4a0cf..c922fab 100644 --- a/titles/wacca/index.py +++ b/titles/wacca/index.py @@ -94,20 +94,24 @@ class WaccaServlet: version_full = Version(req_json["appVersion"]) except: self.logger.error( - f"Failed to parse request toi {request.uri} -> {request.content.getvalue()}" + f"Failed to parse request to {url_path} -> {request.content.getvalue()}" ) resp = BaseResponse() resp.status = 1 resp.message = "不正なリクエスト エラーです" return end(resp.make()) - url_split = url_path.split("/") - start_req_idx = url_split.index("api") + 1 + if "/api/" in url_path: + func_to_find = ( + "handle_" + url_path.partition("api/")[2].replace("/", "_") + "_request" + ) - func_to_find = "handle_" - for x in range(len(url_split) - start_req_idx): - func_to_find += f"{url_split[x + start_req_idx]}_" - func_to_find += "request" + else: + self.logger.error(f"Malformed url {url_path}") + resp = BaseResponse() + resp.status = 1 + resp.message = "Bad URL" + return end(resp.make()) ver_search = int(version_full) From e9ffd954354a6ce4dce80592f1a8cec898c2f038 Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Thu, 9 Mar 2023 12:17:10 -0500 Subject: [PATCH 30/63] implement dict.get() --- core/allnet.py | 32 ++++++++++++++------------------ core/mucha.py | 45 +++++++++++++++++++-------------------------- titles/diva/read.py | 2 +- 3 files changed, 34 insertions(+), 45 deletions(-) diff --git a/core/allnet.py b/core/allnet.py index 4c0c542..c11fe67 100644 --- a/core/allnet.py +++ b/core/allnet.py @@ -346,20 +346,16 @@ class AllnetPowerOnRequest: def __init__(self, req: Dict) -> None: if req is None: raise AllnetRequestException("Request processing failed") - self.game_id: str = req["game_id"] if "game_id" in req else "" - self.ver: str = req["ver"] if "ver" in req else "" - self.serial: str = req["serial"] if "serial" in req else "" - self.ip: str = req["ip"] if "ip" in req else "" - self.firm_ver: str = req["firm_ver"] if "firm_ver" in req else "" - self.boot_ver: str = req["boot_ver"] if "boot_ver" in req else "" - self.encode: str = req["encode"] if "encode" in req else "" - - try: - self.hops = int(req["hops"]) if "hops" in req else 0 - self.format_ver = int(req["format_ver"]) if "format_ver" in req else 2 - self.token = int(req["token"]) if "token" in req else 0 - except ValueError as e: - raise AllnetRequestException(f"Failed to parse int: {e}") + self.game_id: str = req.get("game_id", "") + self.ver: str = req.get("ver", "") + self.serial: str = req.get("serial", "") + self.ip: str = req.get("ip", "") + self.firm_ver: str = req.get("firm_ver", "") + self.boot_ver: str = req.get("boot_ver", "") + self.encode: str = req.get("encode", "") + self.hops = int(req.get("hops", "0")) + self.format_ver = int(req.get("hops", "2")) + self.token = int(req.get("hops", "0")) class AllnetPowerOnResponse3: @@ -413,10 +409,10 @@ class AllnetPowerOnResponse2: class AllnetDownloadOrderRequest: def __init__(self, req: Dict) -> None: - self.game_id = req["game_id"] if "game_id" in req else "" - self.ver = req["ver"] if "ver" in req else "" - self.serial = req["serial"] if "serial" in req else "" - self.encode = req["encode"] if "encode" in req else "" + self.game_id = req.get("game_id", "") + self.ver = req.get("ver", "") + self.serial = req.get("serial", "") + self.encode = req.get("encode", "") class AllnetDownloadOrderResponse: diff --git a/core/mucha.py b/core/mucha.py index 1b73b84..e058b12 100644 --- a/core/mucha.py +++ b/core/mucha.py @@ -132,24 +132,19 @@ class MuchaServlet: class MuchaAuthRequest: def __init__(self, request: Dict) -> None: - self.gameVer = ( - "" if "gameVer" not in request else request["gameVer"] - ) # gameCd + boardType + countryCd + version - self.sendDate = ( - "" if "sendDate" not in request else request["sendDate"] - ) # %Y%m%d - self.serialNum = "" if "serialNum" not in request else request["serialNum"] - self.gameCd = "" if "gameCd" not in request else request["gameCd"] - self.boardType = "" if "boardType" not in request else request["boardType"] - self.boardId = "" if "boardId" not in request else request["boardId"] - self.mac = "" if "mac" not in request else request["mac"] - self.placeId = "" if "placeId" not in request else request["placeId"] - self.storeRouterIp = ( - "" if "storeRouterIp" not in request else request["storeRouterIp"] - ) - self.countryCd = "" if "countryCd" not in request else request["countryCd"] - self.useToken = "" if "useToken" not in request else request["useToken"] - self.allToken = "" if "allToken" not in request else request["allToken"] + # gameCd + boardType + countryCd + version + self.gameVer = request.get("gameVer", "") + self.sendDate = request.get("sendDate", "") # %Y%m%d + self.serialNum = request.get("serialNum", "") + self.gameCd = request.get("gameCd", "") + self.boardType = request.get("boardType", "") + self.boardId = request.get("boardId", "") + self.mac = request.get("mac", "") + self.placeId = request.get("placeId", "") + self.storeRouterIp = request.get("storeRouterIp", "") + self.countryCd = request.get("countryCd", "") + self.useToken = request.get("useToken", "") + self.allToken = request.get("allToken", "") class MuchaAuthResponse: @@ -199,14 +194,12 @@ class MuchaAuthResponse: class MuchaUpdateRequest: def __init__(self, request: Dict) -> None: - self.gameVer = "" if "gameVer" not in request else request["gameVer"] - self.gameCd = "" if "gameCd" not in request else request["gameCd"] - self.serialNum = "" if "serialNum" not in request else request["serialNum"] - self.countryCd = "" if "countryCd" not in request else request["countryCd"] - self.placeId = "" if "placeId" not in request else request["placeId"] - self.storeRouterIp = ( - "" if "storeRouterIp" not in request else request["storeRouterIp"] - ) + self.gameVer = request.get("gameVer", "") + self.gameCd = request.get("gameCd", "") + self.serialNum = request.get("serialNum", "") + self.countryCd = request.get("countryCd", "") + self.placeId = request.get("placeId", "") + self.storeRouterIp = request.get("storeRouterIp", "") class MuchaUpdateResponse: diff --git a/titles/diva/read.py b/titles/diva/read.py index 9c409ef..2eeacdc 100644 --- a/titles/diva/read.py +++ b/titles/diva/read.py @@ -298,6 +298,6 @@ class DivaReader(BaseReader): tree[key] = ( value if len(vector) == 1 - else self.add_branch(tree[key] if key in tree else {}, vector[1:], value) + else self.add_branch(tree.get(key, {}), vector[1:], value) ) return tree From 2033bc897f43c4dd37f225fb3a124df59afdf91e Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Thu, 9 Mar 2023 13:46:28 -0500 Subject: [PATCH 31/63] pokken: fix a crash that happens when the game is disabled --- titles/pokken/index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/titles/pokken/index.py b/titles/pokken/index.py index bbf1204..047989b 100644 --- a/titles/pokken/index.py +++ b/titles/pokken/index.py @@ -90,7 +90,7 @@ class PokkenServlet(resource.Resource): ) if not game_cfg.server.enable: - return (False, "", "") + return (False, "") return (True, "PKFN") From b076a9a9df2dd37c0add5e2d6b4c4da5ae294235 Mon Sep 17 00:00:00 2001 From: Raymonf Date: Wed, 8 Mar 2023 16:27:25 -0500 Subject: [PATCH 32/63] chuni: Add 'handle_remove_token_api_request' for event mode Not sure if `handle_delete_token_api_request` is used in other versions, so it's duplicated to be safe. --- titles/chuni/new.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/titles/chuni/new.py b/titles/chuni/new.py index 03ad305..0d74ba6 100644 --- a/titles/chuni/new.py +++ b/titles/chuni/new.py @@ -60,6 +60,9 @@ class ChuniNew(ChuniBase): "isAou": "false", } + def handle_remove_token_api_request(self, data: Dict) -> Dict: + return { "returnCode": "1" } + def handle_delete_token_api_request(self, data: Dict) -> Dict: return {"returnCode": "1"} From a088dd82dec2b44e86989665663bf1c54d86b1af Mon Sep 17 00:00:00 2001 From: Midorica Date: Thu, 9 Mar 2023 16:59:50 -0500 Subject: [PATCH 33/63] fixing allnet power on response --- core/allnet.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/allnet.py b/core/allnet.py index c11fe67..0a63e89 100644 --- a/core/allnet.py +++ b/core/allnet.py @@ -354,8 +354,8 @@ class AllnetPowerOnRequest: self.boot_ver: str = req.get("boot_ver", "") self.encode: str = req.get("encode", "") self.hops = int(req.get("hops", "0")) - self.format_ver = int(req.get("hops", "2")) - self.token = int(req.get("hops", "0")) + self.format_ver = int(req.get("format_ver", "2")) + self.token = int(req.get("token", "0")) class AllnetPowerOnResponse3: From 57ecff641a7b7cb1ffee31281b069bc34a5b5b7e Mon Sep 17 00:00:00 2001 From: Midorica Date: Thu, 9 Mar 2023 17:09:37 -0500 Subject: [PATCH 34/63] fixing Card Maker get_game_connect_api response --- titles/cm/cm136.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/titles/cm/cm136.py b/titles/cm/cm136.py index 5feeca4..fb5b6b5 100644 --- a/titles/cm/cm136.py +++ b/titles/cm/cm136.py @@ -26,6 +26,8 @@ class CardMaker136(CardMakerBase): ret["gameConnectList"][0]["titleUri"] = f"{uri}/SDHD/205/" ret["gameConnectList"][1]["titleUri"] = f"{uri}/SDEZ/125/" ret["gameConnectList"][2]["titleUri"] = f"{uri}/SDDT/135/" + + return ret def handle_get_game_setting_api_request(self, data: Dict) -> Dict: ret = super().handle_get_game_setting_api_request(data) From f283dd10a9143af125594439af40c8c7f4c717ac Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Thu, 9 Mar 2023 19:03:30 -0500 Subject: [PATCH 35/63] index.py: Fix log directory creation --- index.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.py b/index.py index d30d51f..fba6d11 100644 --- a/index.py +++ b/index.py @@ -163,6 +163,9 @@ if __name__ == "__main__": if path.exists(f"{args.config}/core.yaml"): cfg.update(yaml.safe_load(open(f"{args.config}/core.yaml"))) + if not path.exists(cfg.server.log_dir): + mkdir(cfg.server.log_dir) + logger = logging.getLogger("core") log_fmt_str = "[%(asctime)s] Core | %(levelname)s | %(message)s" log_fmt = logging.Formatter(log_fmt_str) @@ -182,9 +185,6 @@ if __name__ == "__main__": logger.setLevel(log_lv) coloredlogs.install(level=log_lv, logger=logger, fmt=log_fmt_str) - if not path.exists(cfg.server.log_dir): - mkdir(cfg.server.log_dir) - if not access(cfg.server.log_dir, W_OK): logger.error( f"Log directory {cfg.server.log_dir} NOT writable, please check permissions" From 2dd84bbe3e0da8db5f6f606b8a4d868153441180 Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Fri, 10 Mar 2023 20:31:29 -0500 Subject: [PATCH 36/63] pokken: fix mucha and allnet info, fix allnet 2.00 format requests --- core/allnet.py | 12 +++--------- core/mucha.py | 2 +- index.py | 2 +- titles/pokken/index.py | 22 ++++++++++++---------- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/core/allnet.py b/core/allnet.py index 0a63e89..1b561b8 100644 --- a/core/allnet.py +++ b/core/allnet.py @@ -78,13 +78,7 @@ class AllnetServlet: req = AllnetPowerOnRequest(req_dict[0]) # Validate the request. Currently we only validate the fields we plan on using - if ( - not req.game_id - or not req.ver - or not req.token - or not req.serial - or not req.ip - ): + if not req.game_id or not req.ver or not req.serial or not req.ip: raise AllnetRequestException( f"Bad auth request params from {request_ip} - {vars(req)}" ) @@ -94,7 +88,7 @@ class AllnetServlet: self.logger.error(e) return b"" - if req.format_ver == 3: + if req.format_ver == "3": resp = AllnetPowerOnResponse3(req.token) else: resp = AllnetPowerOnResponse2() @@ -354,7 +348,7 @@ class AllnetPowerOnRequest: self.boot_ver: str = req.get("boot_ver", "") self.encode: str = req.get("encode", "") self.hops = int(req.get("hops", "0")) - self.format_ver = int(req.get("format_ver", "2")) + self.format_ver = req.get("format_ver", "2") self.token = int(req.get("token", "0")) diff --git a/core/mucha.py b/core/mucha.py index e058b12..9505282 100644 --- a/core/mucha.py +++ b/core/mucha.py @@ -71,7 +71,7 @@ class MuchaServlet: # TODO: Decrypt S/N resp = MuchaAuthResponse( - f"{self.config.mucha.hostname}{':' + self.config.mucha.port if self.config.server.is_develop else ''}" + f"{self.config.mucha.hostname}{':' + str(self.config.mucha.port) if self.config.server.is_develop else ''}" ) self.logger.debug(f"Mucha response {vars(resp)}") diff --git a/index.py b/index.py index fba6d11..5b8d92b 100644 --- a/index.py +++ b/index.py @@ -73,7 +73,7 @@ class HttpDispatcher(resource.Resource): "mucha_updatacheck", "/mucha/updatacheck.do", controller="mucha", - action="handle_updatacheck", + action="handle_updatecheck", conditions=dict(method=["POST"]), ) diff --git a/titles/pokken/index.py b/titles/pokken/index.py index 047989b..6efbf90 100644 --- a/titles/pokken/index.py +++ b/titles/pokken/index.py @@ -65,17 +65,17 @@ class PokkenServlet(resource.Resource): if not game_cfg.server.enable: return (False, "", "") - if core_cfg.server.is_develop: - return ( - True, - f"https://{game_cfg.server.hostname}:{game_cfg.server.port}/{game_code}/$v/", - f"{game_cfg.server.hostname}:{game_cfg.server.port}/", - ) + # if core_cfg.server.is_develop: + # return ( + # True, + # f"https://{game_cfg.server.hostname}:{game_cfg.server.port}/{game_code}/$v/", + # f"{game_cfg.server.hostname}:{game_cfg.server.port}/", + # ) return ( True, - f"https://{game_cfg.server.hostname}/{game_code}/$v/", - f"{game_cfg.server.hostname}/", + f"https://{game_cfg.server.hostname}:443/{game_code}/$v/", + f"{game_cfg.server.hostname}/SDAK/$v/", ) @classmethod @@ -92,7 +92,7 @@ class PokkenServlet(resource.Resource): if not game_cfg.server.enable: return (False, "") - return (True, "PKFN") + return (True, "PKF2") def setup(self): """ @@ -143,7 +143,9 @@ class PokkenServlet(resource.Resource): self.logger.warn(f"{e} {content}") return b"" - endpoint = jackal_pb2.MessageType(pokken_request.type).name.lower() + endpoint = jackal_pb2.MessageType.DESCRIPTOR.values_by_number[ + pokken_request.type + ].name.lower() self.logger.info(f"{endpoint} request") From edb9ec1971b8becb59e70c78996a9e86ac500a00 Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Sat, 11 Mar 2023 20:02:58 -0500 Subject: [PATCH 37/63] pokken: add responnse debug logging --- titles/pokken/index.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/titles/pokken/index.py b/titles/pokken/index.py index 6efbf90..d03d619 100644 --- a/titles/pokken/index.py +++ b/titles/pokken/index.py @@ -153,4 +153,7 @@ class PokkenServlet(resource.Resource): if handler is None: self.logger.warn(f"No handler found for message type {endpoint}") return self.base.handle_noop(pokken_request) - return handler(pokken_request) + + ret = handler(pokken_request) + self.logger.debug(f"Response: {ret}") + return ret From a9f49e8d5dd0a304be4ab276a85b50d84a6214bd Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Sat, 11 Mar 2023 20:17:05 -0500 Subject: [PATCH 38/63] pokken: remove setup(), ssl config options, change matching uri --- titles/pokken/base.py | 2 +- titles/pokken/config.py | 13 ------------- titles/pokken/index.py | 43 +++++------------------------------------ 3 files changed, 6 insertions(+), 52 deletions(-) diff --git a/titles/pokken/base.py b/titles/pokken/base.py index f1f9eb3..ca4f0b1 100644 --- a/titles/pokken/base.py +++ b/titles/pokken/base.py @@ -38,7 +38,7 @@ class PokkenBase: "MatchingServer": { "host": f"https://{self.game_cfg.server.hostname}", "port": self.game_cfg.server.port_matching, - "url": "/matching", + "url": "SDAK/100/matching", }, "StunServer": { "addr": self.game_cfg.server.hostname, diff --git a/titles/pokken/config.py b/titles/pokken/config.py index 3907838..608bbd7 100644 --- a/titles/pokken/config.py +++ b/titles/pokken/config.py @@ -55,19 +55,6 @@ class PokkenServerConfig: self.__config, "pokken", "server", "port_admission", default=9004 ) - @property - def ssl_cert(self) -> str: - return CoreConfig.get_config_field( - self.__config, "pokken", "server", "ssl_cert", default="cert/pokken.crt" - ) - - @property - def ssl_key(self) -> str: - return CoreConfig.get_config_field( - self.__config, "pokken", "server", "ssl_key", default="cert/pokken.key" - ) - - class PokkenConfig(dict): def __init__(self) -> None: self.server = PokkenServerConfig(self) diff --git a/titles/pokken/index.py b/titles/pokken/index.py index d03d619..8d8ef4c 100644 --- a/titles/pokken/index.py +++ b/titles/pokken/index.py @@ -65,16 +65,9 @@ class PokkenServlet(resource.Resource): if not game_cfg.server.enable: return (False, "", "") - # if core_cfg.server.is_develop: - # return ( - # True, - # f"https://{game_cfg.server.hostname}:{game_cfg.server.port}/{game_code}/$v/", - # f"{game_cfg.server.hostname}:{game_cfg.server.port}/", - # ) - return ( True, - f"https://{game_cfg.server.hostname}:443/{game_code}/$v/", + f"https://{game_cfg.server.hostname}:{game_cfg.server.port}/{game_code}/$v/", f"{game_cfg.server.hostname}/SDAK/$v/", ) @@ -94,42 +87,16 @@ class PokkenServlet(resource.Resource): return (True, "PKF2") - def setup(self): - """ - There's currently no point in having this server on because Twisted - won't play ball with both the fact that it's TLSv1.1, and because the - types of certs that pokken will accept are too flimsy for Twisted - so it will throw a fit. Currently leaving this here in case a bypass - is discovered in the future, but it's unlikly. For now, just use NGINX. - """ - if self.game_cfg.server.enable and self.core_cfg.server.is_develop: - key_exists = path.exists(self.game_cfg.server.ssl_key) - cert_exists = path.exists(self.game_cfg.server.ssl_cert) - - if key_exists and cert_exists: - endpoints.serverFromString( - reactor, - f"ssl:{self.game_cfg.server.port}" - f":interface={self.core_cfg.server.listen_address}:privateKey={self.game_cfg.server.ssl_key}:" - f"certKey={self.game_cfg.server.ssl_cert}", - ).listen(server.Site(self)) - - self.logger.info( - f"Pokken title server ready on port {self.game_cfg.server.port}" - ) - - else: - self.logger.error( - f"Could not find cert at {self.game_cfg.server.ssl_key} or key at {self.game_cfg.server.ssl_cert}, Pokken not running." - ) + def setup(self) -> None: + # TODO: Setup matching, stun, turn and admission servers + pass def render_POST( self, request: Request, version: int = 0, endpoints: str = "" ) -> bytes: - if endpoints == "": - endpoints = request.uri.decode() if endpoints.startswith("/matching"): self.logger.info("Matching request") + self.logger.debug(request.content) content = request.content.getvalue() if content == b"": From eb51fc315c37178063d9f8d23df13f6836ef5d38 Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Sat, 11 Mar 2023 20:22:56 -0500 Subject: [PATCH 39/63] pokken: update example config --- example_config/pokken.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/example_config/pokken.yaml b/example_config/pokken.yaml index e465ceb..48db520 100644 --- a/example_config/pokken.yaml +++ b/example_config/pokken.yaml @@ -6,6 +6,4 @@ server: port_matching: 9001 port_stun: 9002 port_turn: 9003 - port_admission: 9004 - ssl_cert: cert/pokken.crt - ssl_key: cert/pokken.key \ No newline at end of file + port_admission: 9004 \ No newline at end of file From e4b7809e34f6db12120cc976672e46c138875339 Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Sat, 11 Mar 2023 23:42:12 -0500 Subject: [PATCH 40/63] pokken: add matching server skeleton --- example_config/pokken.yaml | 7 +++--- titles/pokken/base.py | 39 +++++++++++++++++++++++++++--- titles/pokken/config.py | 12 +++------- titles/pokken/index.py | 49 +++++++++++++++++++++++++++++++------- 4 files changed, 83 insertions(+), 24 deletions(-) diff --git a/example_config/pokken.yaml b/example_config/pokken.yaml index 48db520..7400060 100644 --- a/example_config/pokken.yaml +++ b/example_config/pokken.yaml @@ -3,7 +3,6 @@ server: enable: True loglevel: "info" port: 9000 - port_matching: 9001 - port_stun: 9002 - port_turn: 9003 - port_admission: 9004 \ No newline at end of file + port_stun: 9001 + port_turn: 9002 + port_admission: 9003 \ No newline at end of file diff --git a/titles/pokken/base.py b/titles/pokken/base.py index ca4f0b1..1fccab8 100644 --- a/titles/pokken/base.py +++ b/titles/pokken/base.py @@ -1,6 +1,6 @@ from datetime import datetime, timedelta import json -from typing import Any +from typing import Any, Dict from core.config import CoreConfig from titles.pokken.config import PokkenConfig @@ -37,8 +37,8 @@ class PokkenBase: biwa_setting = { "MatchingServer": { "host": f"https://{self.game_cfg.server.hostname}", - "port": self.game_cfg.server.port_matching, - "url": "SDAK/100/matching", + "port": self.game_cfg.server.port, + "url": "/SDAK/100/matching", }, "StunServer": { "addr": self.game_cfg.server.hostname, @@ -108,3 +108,36 @@ class PokkenBase: res.load_client_settings.CopyFrom(settings) return res.SerializeToString() + + def handle_load_ranking(self, request: jackal_pb2.CheckDiagnosisRequestData) -> bytes: + res = jackal_pb2.Response() + res.result = 1 + res.type = jackal_pb2.MessageType.LOAD_RANKING + ranking = jackal_pb2.LoadRankingResponseData() + + ranking.ranking_id = 1 + ranking.ranking_start = 0 + ranking.ranking_end = 1 + ranking.event_end = True + ranking.modify_date = int(datetime.now().timestamp() / 1000) + res.load_ranking.CopyFrom(ranking) + + def handle_matching_noop(self, data: Dict = {}, client_ip: str = "127.0.0.1") -> Dict: + return {} + + def handle_matching_start_matching(self, data: Dict = {}, client_ip: str = "127.0.0.1") -> Dict: + return {} + + def handle_matching_is_matching(self, data: Dict = {}, client_ip: str = "127.0.0.1") -> Dict: + """ + "sessionId":"12345678", + "A":{ + "pcb_id": data["data"]["must"]["pcb_id"], + "gip": client_ip + }, + "list":[] + """ + return {} + + def handle_matching_stop_matching(self, data: Dict = {}, client_ip: str = "127.0.0.1") -> Dict: + return {} \ No newline at end of file diff --git a/titles/pokken/config.py b/titles/pokken/config.py index 608bbd7..b53fc86 100644 --- a/titles/pokken/config.py +++ b/titles/pokken/config.py @@ -31,28 +31,22 @@ class PokkenServerConfig: self.__config, "pokken", "server", "port", default=9000 ) - @property - def port_matching(self) -> int: - return CoreConfig.get_config_field( - self.__config, "pokken", "server", "port_matching", default=9001 - ) - @property def port_stun(self) -> int: return CoreConfig.get_config_field( - self.__config, "pokken", "server", "port_stun", default=9002 + self.__config, "pokken", "server", "port_stun", default=9001 ) @property def port_turn(self) -> int: return CoreConfig.get_config_field( - self.__config, "pokken", "server", "port_turn", default=9003 + self.__config, "pokken", "server", "port_turn", default=9002 ) @property def port_admission(self) -> int: return CoreConfig.get_config_field( - self.__config, "pokken", "server", "port_admission", default=9004 + self.__config, "pokken", "server", "port_admission", default=9003 ) class PokkenConfig(dict): diff --git a/titles/pokken/index.py b/titles/pokken/index.py index 8d8ef4c..9bcd90b 100644 --- a/titles/pokken/index.py +++ b/titles/pokken/index.py @@ -1,11 +1,12 @@ from typing import Tuple from twisted.web.http import Request -from twisted.web import resource, server -from twisted.internet import reactor, endpoints +from twisted.web import resource +import json, ast +from datetime import datetime import yaml import logging, coloredlogs from logging.handlers import TimedRotatingFileHandler -from titles.pokken.proto import jackal_pb2 +import inflection from os import path from google.protobuf.message import DecodeError @@ -13,6 +14,7 @@ from core.config import CoreConfig from titles.pokken.config import PokkenConfig from titles.pokken.base import PokkenBase from titles.pokken.const import PokkenConstants +from titles.pokken.proto import jackal_pb2 class PokkenServlet(resource.Resource): @@ -88,15 +90,14 @@ class PokkenServlet(resource.Resource): return (True, "PKF2") def setup(self) -> None: - # TODO: Setup matching, stun, turn and admission servers + # TODO: Setup stun, turn (UDP) and admission (WSS) servers pass def render_POST( self, request: Request, version: int = 0, endpoints: str = "" ) -> bytes: - if endpoints.startswith("/matching"): - self.logger.info("Matching request") - self.logger.debug(request.content) + if endpoints == "matching": + return self.handle_matching(request) content = request.content.getvalue() if content == b"": @@ -122,5 +123,37 @@ class PokkenServlet(resource.Resource): return self.base.handle_noop(pokken_request) ret = handler(pokken_request) - self.logger.debug(f"Response: {ret}") + #self.logger.debug(f"Response: {ret}") return ret + + def handle_matching(self, request: Request) -> bytes: + content = request.content.getvalue() + client_ip = request.getClientAddress().host + + if content is None or content == b"": + self.logger.info("Empty matching request") + return json.dumps(self.base.handle_matching_noop()).encode() + + json_content = ast.literal_eval(content.decode().replace('null', 'None').replace('true', 'True').replace('false', 'False')) + self.logger.info(f"Matching {json_content['call']} request") + self.logger.debug(json_content) + + handler = getattr(self.base, f"handle_matching_{inflection.underscore(json_content['call'])}", None) + if handler is None: + self.logger.warn(f"No handler found for message type {json_content['call']}") + return json.dumps(self.base.handle_matching_noop()).encode() + + ret = handler(json_content, client_ip) + + if ret is None: + ret = {} + if "result" not in ret: + ret["result"] = "true" + if "data" not in ret: + ret["data"] = {} + if "timestamp" not in ret: + ret["timestamp"] = int(datetime.now().timestamp() * 1000) + + self.logger.debug(f"Response {ret}") + + return json.dumps(ret).encode() From ea14f105d597b0150146bc12445a89a8a969fa4b Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Sun, 12 Mar 2023 00:26:48 -0500 Subject: [PATCH 41/63] database: skip games that lack a database member --- core/data/database.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/data/database.py b/core/data/database.py index 1af5c08..715bac6 100644 --- a/core/data/database.py +++ b/core/data/database.py @@ -71,7 +71,8 @@ class Data: games = Utils.get_all_titles() for game_dir, game_mod in games.items(): try: - title_db = game_mod.database(self.config) + if hasattr(game_mod, "database"): + game_mod.database(self.config) metadata.create_all(self.__engine.connect()) self.base.set_schema_ver( @@ -109,7 +110,8 @@ class Data: mod = importlib.import_module(f"titles.{dir}") try: - title_db = mod.database(self.config) + if hasattr(mod, "database"): + mod.database(self.config) metadata.drop_all(self.__engine.connect()) except Exception as e: From 18a95f52137d34c2f93aceb5ffdcfca1e59e0ddd Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Sun, 12 Mar 2023 01:00:51 -0500 Subject: [PATCH 42/63] add get_ip_addr util function for servers behind proxies --- core/allnet.py | 8 ++++---- core/frontend.py | 5 ++--- core/mucha.py | 10 +++++++--- core/utils.py | 5 +++++ index.py | 8 ++++++-- read.py | 3 +-- titles/chuni/index.py | 5 +++-- titles/pokken/index.py | 4 ++-- titles/wacca/index.py | 5 +++-- 9 files changed, 33 insertions(+), 20 deletions(-) diff --git a/core/allnet.py b/core/allnet.py index 1b561b8..36ea633 100644 --- a/core/allnet.py +++ b/core/allnet.py @@ -12,8 +12,8 @@ from Crypto.Signature import PKCS1_v1_5 from time import strptime from core.config import CoreConfig -from core.data import Data from core.utils import Utils +from core.data import Data from core.const import * @@ -69,7 +69,7 @@ class AllnetServlet: ) def handle_poweron(self, request: Request, _: Dict): - request_ip = request.getClientAddress().host + request_ip = Utils.get_ip_addr(request) try: req_dict = self.allnet_req_to_dict(request.content.getvalue()) if req_dict is None: @@ -162,7 +162,7 @@ class AllnetServlet: return self.dict_to_http_form_string([vars(resp)]).encode("utf-8") def handle_dlorder(self, request: Request, _: Dict): - request_ip = request.getClientAddress().host + request_ip = Utils.get_ip_addr(request) try: req_dict = self.allnet_req_to_dict(request.content.getvalue()) if req_dict is None: @@ -255,7 +255,7 @@ class AllnetServlet: return resp_str.encode("utf-8") def handle_naomitest(self, request: Request, _: Dict) -> bytes: - self.logger.info(f"Ping from {request.getClientAddress().host}") + self.logger.info(f"Ping from {Utils.get_ip_addr(request)}") return b"naomi ok" def kvp_to_dict(self, kvp: List[str]) -> List[Dict[str, Any]]: diff --git a/core/frontend.py b/core/frontend.py index 2fdefae..e230681 100644 --- a/core/frontend.py +++ b/core/frontend.py @@ -10,9 +10,8 @@ from twisted.python.components import registerAdapter import jinja2 import bcrypt -from core.config import CoreConfig +from core import CoreConfig, Utils from core.data import Data -from core.utils import Utils class IUserSession(Interface): @@ -143,7 +142,7 @@ class FE_Gate(FE_Base): def render_POST(self, request: Request): uri = request.uri.decode() - ip = request.getClientAddress().host + ip = Utils.get_ip_addr(request) if uri == "/gate/gate.login": access_code: str = request.args[b"access_code"][0].decode() diff --git a/core/mucha.py b/core/mucha.py index 9505282..4d2388b 100644 --- a/core/mucha.py +++ b/core/mucha.py @@ -6,7 +6,7 @@ from twisted.web.http import Request from datetime import datetime import pytz -from core.config import CoreConfig +from core import CoreConfig from core.utils import Utils @@ -52,6 +52,8 @@ class MuchaServlet: def handle_boardauth(self, request: Request, _: Dict) -> bytes: req_dict = self.mucha_preprocess(request.content.getvalue()) + client_ip = Utils.get_ip_addr(request) + if req_dict is None: self.logger.error( f"Error processing mucha request {request.content.getvalue()}" @@ -61,7 +63,7 @@ class MuchaServlet: req = MuchaAuthRequest(req_dict) self.logger.debug(f"Mucha request {vars(req)}") self.logger.info( - f"Boardauth request from {request.getClientAddress().host} for {req.gameVer}" + f"Boardauth request from {client_ip} for {req.gameVer}" ) if req.gameCd not in self.mucha_registry: @@ -80,6 +82,8 @@ class MuchaServlet: def handle_updatecheck(self, request: Request, _: Dict) -> bytes: req_dict = self.mucha_preprocess(request.content.getvalue()) + client_ip = Utils.get_ip_addr(request) + if req_dict is None: self.logger.error( f"Error processing mucha request {request.content.getvalue()}" @@ -89,7 +93,7 @@ class MuchaServlet: req = MuchaUpdateRequest(req_dict) self.logger.debug(f"Mucha request {vars(req)}") self.logger.info( - f"Updatecheck request from {request.getClientAddress().host} for {req.gameVer}" + f"Updatecheck request from {client_ip} for {req.gameVer}" ) if req.gameCd not in self.mucha_registry: diff --git a/core/utils.py b/core/utils.py index 24417bb..d18289e 100644 --- a/core/utils.py +++ b/core/utils.py @@ -1,5 +1,6 @@ from typing import Dict, Any from types import ModuleType +from twisted.web.http import Request import logging import importlib from os import walk @@ -21,3 +22,7 @@ class Utils: logging.getLogger("core").error(f"get_all_titles: {dir} - {e}") raise return ret + + @classmethod + def get_ip_addr(cls, req: Request) -> str: + return req.getAllHeaders()[b"x-forwarded-for"].decode() if b"x-forwarded-for" in req.getAllHeaders() else req.getClientAddress().host diff --git a/index.py b/index.py index 5b8d92b..0852d06 100644 --- a/index.py +++ b/index.py @@ -96,9 +96,11 @@ class HttpDispatcher(resource.Resource): def render_GET(self, request: Request) -> bytes: test = self.map_get.match(request.uri.decode()) + client_ip = Utils.get_ip_addr(request) + if test is None: self.logger.debug( - f"Unknown GET endpoint {request.uri.decode()} from {request.getClientAddress().host} to port {request.getHost().port}" + f"Unknown GET endpoint {request.uri.decode()} from {client_ip} to port {request.getHost().port}" ) request.setResponseCode(404) return b"Endpoint not found." @@ -107,9 +109,11 @@ class HttpDispatcher(resource.Resource): def render_POST(self, request: Request) -> bytes: test = self.map_post.match(request.uri.decode()) + client_ip = Utils.get_ip_addr(request) + if test is None: self.logger.debug( - f"Unknown POST endpoint {request.uri.decode()} from {request.getClientAddress().host} to port {request.getHost().port}" + f"Unknown POST endpoint {request.uri.decode()} from {client_ip} to port {request.getHost().port}" ) request.setResponseCode(404) return b"Endpoint not found." diff --git a/read.py b/read.py index 538198a..341c502 100644 --- a/read.py +++ b/read.py @@ -9,8 +9,7 @@ import logging, coloredlogs from logging.handlers import TimedRotatingFileHandler from typing import List, Optional -from core import CoreConfig -from core.utils import Utils +from core import CoreConfig, Utils class BaseReader: diff --git a/titles/chuni/index.py b/titles/chuni/index.py index a8b581e..de01346 100644 --- a/titles/chuni/index.py +++ b/titles/chuni/index.py @@ -11,7 +11,7 @@ from Crypto.Util.Padding import pad from os import path from typing import Tuple -from core import CoreConfig +from core import CoreConfig, Utils from titles.chuni.config import ChuniConfig from titles.chuni.const import ChuniConstants from titles.chuni.base import ChuniBase @@ -111,6 +111,7 @@ class ChuniServlet: encrtped = False internal_ver = 0 endpoint = url_split[len(url_split) - 1] + client_ip = Utils.get_ip_addr(request) if version < 105: # 1.0 internal_ver = ChuniConstants.VER_CHUNITHM @@ -179,7 +180,7 @@ class ChuniServlet: req_data = json.loads(unzip) self.logger.info( - f"v{version} {endpoint} request from {request.getClientAddress().host}" + f"v{version} {endpoint} request from {client_ip}" ) self.logger.debug(req_data) diff --git a/titles/pokken/index.py b/titles/pokken/index.py index 9bcd90b..b172cc2 100644 --- a/titles/pokken/index.py +++ b/titles/pokken/index.py @@ -10,7 +10,7 @@ import inflection from os import path from google.protobuf.message import DecodeError -from core.config import CoreConfig +from core import CoreConfig, Utils from titles.pokken.config import PokkenConfig from titles.pokken.base import PokkenBase from titles.pokken.const import PokkenConstants @@ -128,7 +128,7 @@ class PokkenServlet(resource.Resource): def handle_matching(self, request: Request) -> bytes: content = request.content.getvalue() - client_ip = request.getClientAddress().host + client_ip = Utils.get_ip_addr(request) if content is None or content == b"": self.logger.info("Empty matching request") diff --git a/titles/wacca/index.py b/titles/wacca/index.py index c922fab..0b51849 100644 --- a/titles/wacca/index.py +++ b/titles/wacca/index.py @@ -8,7 +8,7 @@ from twisted.web.http import Request from typing import Dict, Tuple from os import path -from core.config import CoreConfig +from core import CoreConfig, Utils from titles.wacca.config import WaccaConfig from titles.wacca.config import WaccaConfig from titles.wacca.const import WaccaConstants @@ -89,6 +89,7 @@ class WaccaServlet: request.responseHeaders.addRawHeader(b"X-Wacca-Hash", hash.hex().encode()) return json.dumps(resp).encode() + client_ip = Utils.get_ip_addr(request) try: req_json = json.loads(request.content.getvalue()) version_full = Version(req_json["appVersion"]) @@ -140,7 +141,7 @@ class WaccaServlet: return end(resp.make()) self.logger.info( - f"v{req_json['appVersion']} {url_path} request from {request.getClientAddress().host} with chipId {req_json['chipId']}" + f"v{req_json['appVersion']} {url_path} request from {client_ip} with chipId {req_json['chipId']}" ) self.logger.debug(req_json) From a97509bb435477268ae7b2575431f27f59da3788 Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Sun, 12 Mar 2023 01:47:59 -0500 Subject: [PATCH 43/63] add X-Forwarded-For to nginx config --- example_config/nginx_example.conf | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/example_config/nginx_example.conf b/example_config/nginx_example.conf index fe6f7a7..6ffcd9c 100644 --- a/example_config/nginx_example.conf +++ b/example_config/nginx_example.conf @@ -4,6 +4,8 @@ server { server_name naominet.jp; location / { + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass_request_headers on; proxy_pass http://localhost:8000/; } } @@ -14,6 +16,8 @@ server { server_name your.hostname.here; location / { + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass_request_headers on; proxy_pass http://localhost:8080/; } } @@ -75,6 +79,8 @@ server { 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/; } } @@ -95,6 +101,8 @@ server { 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/; } } @@ -131,6 +139,8 @@ server { add_header Strict-Transport-Security "max-age=63072000" always; location / { + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass_request_headers on; proxy_pass http://localhost:8090/; } } \ No newline at end of file From 6fa0175baafc98fc8c4d92b2d0c8cbd9373999f9 Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Sun, 12 Mar 2023 01:59:12 -0500 Subject: [PATCH 44/63] print cleanup, remove unused mucha options --- core/allnet.py | 2 +- core/config.py | 18 ------------------ core/mucha.py | 4 ++-- core/title.py | 2 +- example_config/core.yaml | 3 --- titles/cxb/index.py | 4 ++-- 6 files changed, 6 insertions(+), 27 deletions(-) diff --git a/core/allnet.py b/core/allnet.py index 36ea633..2738c8e 100644 --- a/core/allnet.py +++ b/core/allnet.py @@ -65,7 +65,7 @@ class AllnetServlet: self.uri_registry[code] = (uri, host) self.logger.info( - f"Allnet serving {len(self.uri_registry)} games on 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): diff --git a/core/config.py b/core/config.py index 383f053..9e152c0 100644 --- a/core/config.py +++ b/core/config.py @@ -267,24 +267,6 @@ class MuchaConfig: self.__config, "core", "mucha", "hostname", default="localhost" ) - @property - def port(self) -> int: - return CoreConfig.get_config_field( - self.__config, "core", "mucha", "port", default=8444 - ) - - @property - def ssl_cert(self) -> str: - return CoreConfig.get_config_field( - self.__config, "core", "mucha", "ssl_cert", default="cert/server.pem" - ) - - @property - def signing_key(self) -> str: - return CoreConfig.get_config_field( - self.__config, "core", "mucha", "signing_key", default="cert/billing.key" - ) - class CoreConfig(dict): def __init__(self) -> None: diff --git a/core/mucha.py b/core/mucha.py index 4d2388b..9dfef03 100644 --- a/core/mucha.py +++ b/core/mucha.py @@ -47,7 +47,7 @@ class MuchaServlet: self.mucha_registry.append(game_cd) self.logger.info( - f"Serving {len(self.mucha_registry)} games on port {self.config.mucha.port}" + f"Serving {len(self.mucha_registry)} games" ) def handle_boardauth(self, request: Request, _: Dict) -> bytes: @@ -73,7 +73,7 @@ class MuchaServlet: # TODO: Decrypt S/N resp = MuchaAuthResponse( - f"{self.config.mucha.hostname}{':' + str(self.config.mucha.port) if self.config.server.is_develop else ''}" + f"{self.config.mucha.hostname}{':' + str(self.config.allnet.port) if self.config.server.is_develop else ''}" ) self.logger.debug(f"Mucha response {vars(resp)}") diff --git a/core/title.py b/core/title.py index c9580d2..7a0a99b 100644 --- a/core/title.py +++ b/core/title.py @@ -68,7 +68,7 @@ class TitleServlet: 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 {core_cfg.title.port}" + 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: diff --git a/example_config/core.yaml b/example_config/core.yaml index 94e89ba..561293c 100644 --- a/example_config/core.yaml +++ b/example_config/core.yaml @@ -48,6 +48,3 @@ mucha: enable: False hostname: "localhost" loglevel: "info" - port: 8444 - ssl_key: "cert/server.key" - ssl_cert: "cert/server.pem" diff --git a/titles/cxb/index.py b/titles/cxb/index.py index d6ab74b..36c762e 100644 --- a/titles/cxb/index.py +++ b/titles/cxb/index.py @@ -98,11 +98,11 @@ class CxbServlet(resource.Resource): ).listen(server.Site(CxbServlet(self.core_cfg, self.cfg_dir))) self.logger.info( - f"Crossbeats title server ready on port {self.game_cfg.server.port} & {self.game_cfg.server.port_secure}" + f"Ready on ports {self.game_cfg.server.port} & {self.game_cfg.server.port_secure}" ) else: self.logger.info( - f"Crossbeats title server ready on port {self.game_cfg.server.port}" + f"Ready on port {self.game_cfg.server.port}" ) def render_POST(self, request: Request): From 65e9ecd58c286cde744075d077c59abf808ecbda Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Sun, 12 Mar 2023 14:03:00 -0400 Subject: [PATCH 45/63] wacca: fix crash when enabling frontend with no wacca.yaml file --- titles/wacca/frontend.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/titles/wacca/frontend.py b/titles/wacca/frontend.py index e4f2be0..69ab1ee 100644 --- a/titles/wacca/frontend.py +++ b/titles/wacca/frontend.py @@ -1,6 +1,7 @@ import yaml import jinja2 from twisted.web.http import Request +from os import path from core.frontend import FE_Base from core.config import CoreConfig @@ -16,7 +17,10 @@ class WaccaFrontend(FE_Base): super().__init__(cfg, environment) self.data = WaccaData(cfg) self.game_cfg = WaccaConfig() - self.game_cfg.update(yaml.safe_load(open(f"{cfg_dir}/wacca.yaml"))) + if path.exists(f"{cfg_dir}/{WaccaConstants.CONFIG_NAME}"): + self.game_cfg.update( + yaml.safe_load(open(f"{cfg_dir}/{WaccaConstants.CONFIG_NAME}")) + ) self.nav_name = "Wacca" def render_GET(self, request: Request) -> bytes: From fddf2e448a30d206fc42f0fabb4c47150a42fc0c Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Sun, 12 Mar 2023 16:30:57 -0400 Subject: [PATCH 46/63] pokken: rearrange logging, fix types --- titles/pokken/base.py | 21 ++++++++++++--------- titles/pokken/index.py | 7 ++++--- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/titles/pokken/base.py b/titles/pokken/base.py index 1fccab8..e64ea40 100644 --- a/titles/pokken/base.py +++ b/titles/pokken/base.py @@ -1,5 +1,5 @@ from datetime import datetime, timedelta -import json +import json, logging from typing import Any, Dict from core.config import CoreConfig @@ -12,6 +12,7 @@ class PokkenBase: self.core_cfg = core_cfg self.game_cfg = game_cfg self.version = 0 + self.logger = logging.getLogger("pokken") def handle_noop(self, request: Any) -> bytes: res = jackal_pb2.Response() @@ -20,20 +21,22 @@ class PokkenBase: return res.SerializeToString() - def handle_ping(self, request: jackal_pb2.PingRequestData) -> bytes: + def handle_ping(self, request: jackal_pb2.Request) -> bytes: res = jackal_pb2.Response() res.result = 1 res.type = jackal_pb2.MessageType.PING + self.logger.debug(res) return res.SerializeToString() - def handle_register_pcb(self, request: jackal_pb2.RegisterPcbRequestData) -> bytes: + def handle_register_pcb(self, request: jackal_pb2.Request) -> bytes: res = jackal_pb2.Response() res.result = 1 res.type = jackal_pb2.MessageType.REGISTER_PCB + self.logger.info(f"Register PCB {request.register_pcb.pcb_id}") regist_pcb = jackal_pb2.RegisterPcbResponseData() - regist_pcb.server_time = int(datetime.now().timestamp() / 1000) + regist_pcb.server_time = int(datetime.now().timestamp()) biwa_setting = { "MatchingServer": { "host": f"https://{self.game_cfg.server.hostname}", @@ -60,7 +63,7 @@ class PokkenBase: return res.SerializeToString() - def handle_save_ads(self, request: jackal_pb2.SaveAdsRequestData) -> bytes: + def handle_save_ads(self, request: jackal_pb2.Request) -> bytes: res = jackal_pb2.Response() res.result = 1 res.type = jackal_pb2.MessageType.SAVE_ADS @@ -68,7 +71,7 @@ class PokkenBase: return res.SerializeToString() def handle_save_client_log( - self, request: jackal_pb2.SaveClientLogRequestData + self, request: jackal_pb2.Request ) -> bytes: res = jackal_pb2.Response() res.result = 1 @@ -77,7 +80,7 @@ class PokkenBase: return res.SerializeToString() def handle_check_diagnosis( - self, request: jackal_pb2.CheckDiagnosisRequestData + self, request: jackal_pb2.Request ) -> bytes: res = jackal_pb2.Response() res.result = 1 @@ -86,7 +89,7 @@ class PokkenBase: return res.SerializeToString() def handle_load_client_settings( - self, request: jackal_pb2.CheckDiagnosisRequestData + self, request: jackal_pb2.Request ) -> bytes: res = jackal_pb2.Response() res.result = 1 @@ -109,7 +112,7 @@ class PokkenBase: return res.SerializeToString() - def handle_load_ranking(self, request: jackal_pb2.CheckDiagnosisRequestData) -> bytes: + def handle_load_ranking(self, request: jackal_pb2.Request) -> bytes: res = jackal_pb2.Response() res.result = 1 res.type = jackal_pb2.MessageType.LOAD_RANKING diff --git a/titles/pokken/index.py b/titles/pokken/index.py index b172cc2..42a5a0e 100644 --- a/titles/pokken/index.py +++ b/titles/pokken/index.py @@ -115,15 +115,16 @@ class PokkenServlet(resource.Resource): pokken_request.type ].name.lower() - self.logger.info(f"{endpoint} request") - handler = getattr(self.base, f"handle_{endpoint}", None) if handler is None: self.logger.warn(f"No handler found for message type {endpoint}") return self.base.handle_noop(pokken_request) + self.logger.info(f"{endpoint} request from {Utils.get_ip_addr(request)}") + self.logger.debug(pokken_request) + ret = handler(pokken_request) - #self.logger.debug(f"Response: {ret}") + self.logger.debug(f"Response: {ret}") return ret def handle_matching(self, request: Request) -> bytes: From 346e8989839eeba7f9a4750d7be9b7dcb687886e Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Sun, 12 Mar 2023 16:34:20 -0400 Subject: [PATCH 47/63] pokken: remove hanging debug log --- titles/pokken/base.py | 1 - 1 file changed, 1 deletion(-) diff --git a/titles/pokken/base.py b/titles/pokken/base.py index e64ea40..6c2bf26 100644 --- a/titles/pokken/base.py +++ b/titles/pokken/base.py @@ -26,7 +26,6 @@ class PokkenBase: res.result = 1 res.type = jackal_pb2.MessageType.PING - self.logger.debug(res) return res.SerializeToString() def handle_register_pcb(self, request: jackal_pb2.Request) -> bytes: From a791142f95f0cb2e7fa724852955777447ea017b Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Sun, 12 Mar 2023 22:37:44 -0400 Subject: [PATCH 48/63] database: add check for current_schema_version --- core/data/database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/data/database.py b/core/data/database.py index 715bac6..0ce039e 100644 --- a/core/data/database.py +++ b/core/data/database.py @@ -71,7 +71,7 @@ class Data: games = Utils.get_all_titles() for game_dir, game_mod in games.items(): try: - if hasattr(game_mod, "database"): + if hasattr(game_mod, "database") and hasattr(game_mod, "current_schema_version"): game_mod.database(self.config) metadata.create_all(self.__engine.connect()) From 2af7751504819d96bf8b6c5e04ac2faee2e0c936 Mon Sep 17 00:00:00 2001 From: Dniel97 Date: Wed, 15 Mar 2023 20:03:22 +0000 Subject: [PATCH 49/63] Added support for maimai and Chunithm in Card Maker 1.34/1.35 (#14) Co-authored-by: Dniel97 Reviewed-on: https://gitea.tendokyu.moe/Hay1tsme/artemis/pulls/14 Co-authored-by: Dniel97 Co-committed-by: Dniel97 --- core/data/schema/versions/SDED_1_upgrade.sql | 99 ------ core/data/schema/versions/SDEZ_3_upgrade.sql | 21 ++ docs/game_specific_info.md | 351 ++++++++++++++++++ read.py | 6 +- readme.md | 5 +- titles/chuni/base.py | 8 + titles/chuni/index.py | 2 +- titles/chuni/new.py | 354 ++++++++++++++++++- titles/chuni/newplus.py | 7 + titles/chuni/schema/item.py | 156 ++++++++ titles/chuni/schema/static.py | 163 +++++++++ titles/cm/__init__.py | 2 + titles/cm/{cm136.py => cm135.py} | 8 +- titles/cm/const.py | 4 +- titles/cm/database.py | 8 + titles/cm/index.py | 8 +- titles/cm/read.py | 182 +++++++++- titles/cm/schema/__init__.py | 1 + titles/mai2/__init__.py | 2 +- titles/mai2/base.py | 140 ++++++-- titles/mai2/index.py | 2 +- titles/mai2/schema/item.py | 174 +++++++-- titles/mai2/schema/profile.py | 6 +- titles/mai2/schema/score.py | 2 +- titles/mai2/schema/static.py | 39 ++ titles/mai2/universe.py | 174 +++++++++ titles/mai2/universeplus.py | 11 +- titles/ongeki/base.py | 6 +- titles/ongeki/bright.py | 11 +- titles/ongeki/brightmemory.py | 6 +- titles/ongeki/index.py | 5 +- titles/ongeki/schema/item.py | 2 +- 32 files changed, 1763 insertions(+), 202 deletions(-) delete mode 100644 core/data/schema/versions/SDED_1_upgrade.sql create mode 100644 core/data/schema/versions/SDEZ_3_upgrade.sql create mode 100644 docs/game_specific_info.md rename titles/cm/{cm136.py => cm135.py} (89%) create mode 100644 titles/cm/database.py create mode 100644 titles/cm/schema/__init__.py diff --git a/core/data/schema/versions/SDED_1_upgrade.sql b/core/data/schema/versions/SDED_1_upgrade.sql deleted file mode 100644 index a4d666e..0000000 --- a/core/data/schema/versions/SDED_1_upgrade.sql +++ /dev/null @@ -1,99 +0,0 @@ -CREATE TABLE ongeki_user_gacha ( - id INT PRIMARY KEY NOT NULL AUTO_INCREMENT, - user INT NOT NULL, - gachaId INT NOT NULL, - totalGachaCnt INT DEFAULT 0, - ceilingGachaCnt INT DEFAULT 0, - selectPoint INT DEFAULT 0, - useSelectPoint INT DEFAULT 0, - dailyGachaCnt INT DEFAULT 0, - fiveGachaCnt INT DEFAULT 0, - elevenGachaCnt INT DEFAULT 0, - dailyGachaDate TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - CONSTRAINT ongeki_user_gacha_uk UNIQUE (user, gachaId), - CONSTRAINT ongeki_user_gacha_ibfk_1 FOREIGN KEY (user) REFERENCES aime_user (id) ON DELETE CASCADE ON UPDATE CASCADE -); - -CREATE TABLE ongeki_user_gacha_supply ( - id INT PRIMARY KEY NOT NULL AUTO_INCREMENT, - user INT NOT NULL, - cardId INT NOT NULL, - CONSTRAINT ongeki_user_gacha_supply_uk UNIQUE (user, cardId), - CONSTRAINT ongeki_user_gacha_supply_ibfk_1 FOREIGN KEY (user) REFERENCES aime_user (id) ON DELETE CASCADE ON UPDATE CASCADE -); - -CREATE TABLE ongeki_static_gachas ( - id INT PRIMARY KEY NOT NULL AUTO_INCREMENT, - version INT NOT NULL, - gachaId INT NOT NULL, - gachaName VARCHAR(255) NOT NULL, - kind INT NOT NULL, - type INT DEFAULT 0, - isCeiling BOOLEAN DEFAULT 0, - maxSelectPoint INT DEFAULT 0, - ceilingCnt INT DEFAULT 10, - changeRateCnt1 INT DEFAULT 0, - changeRateCnt2 INT DEFAULT 0, - startDate TIMESTAMP DEFAULT '2018-01-01 00:00:00.0', - endDate TIMESTAMP DEFAULT '2038-01-01 00:00:00.0', - noticeStartDate TIMESTAMP DEFAULT '2018-01-01 00:00:00.0', - noticeEndDate TIMESTAMP DEFAULT '2038-01-01 00:00:00.0', - convertEndDate TIMESTAMP DEFAULT '2038-01-01 00:00:00.0', - CONSTRAINT ongeki_static_gachas_uk UNIQUE (version, gachaId, gachaName) -); - -CREATE TABLE ongeki_static_gacha_cards ( - id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - gachaId INT NOT NULL, - cardId INT NOT NULL, - rarity INT NOT NULL, - weight INT DEFAULT 1, - isPickup BOOLEAN DEFAULT 0, - isSelect BOOLEAN DEFAULT 1, - CONSTRAINT ongeki_static_gacha_cards_uk UNIQUE (gachaId, cardId) -); - - -CREATE TABLE ongeki_static_cards ( - id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - version INT NOT NULL, - cardId INT NOT NULL, - name VARCHAR(255) NOT NULL, - charaId INT NOT NULL, - nickName VARCHAR(255), - school VARCHAR(255) NOT NULL, - attribute VARCHAR(5) NOT NULL, - gakunen VARCHAR(255) NOT NULL, - rarity INT NOT NULL, - levelParam VARCHAR(255) NOT NULL, - skillId INT NOT NULL, - choKaikaSkillId INT NOT NULL, - cardNumber VARCHAR(255), - CONSTRAINT ongeki_static_cards_uk UNIQUE (version, cardId) -) CHARACTER SET utf8mb4; - -CREATE TABLE ongeki_user_print_detail ( - id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - user INT NOT NULL, - cardId INT NOT NULL, - cardType INT DEFAULT 0, - printDate TIMESTAMP NOT NULL, - serialId VARCHAR(20) NOT NULL, - placeId INT NOT NULL, - clientId VARCHAR(11) NOT NULL, - printerSerialId VARCHAR(20) NOT NULL, - isHolograph BOOLEAN DEFAULT 0, - isAutographed BOOLEAN DEFAULT 0, - printOption1 BOOLEAN DEFAULT 1, - printOption2 BOOLEAN DEFAULT 1, - printOption3 BOOLEAN DEFAULT 1, - printOption4 BOOLEAN DEFAULT 1, - printOption5 BOOLEAN DEFAULT 1, - printOption6 BOOLEAN DEFAULT 1, - printOption7 BOOLEAN DEFAULT 1, - printOption8 BOOLEAN DEFAULT 1, - printOption9 BOOLEAN DEFAULT 1, - printOption10 BOOLEAN DEFAULT 0, - FOREIGN KEY (user) REFERENCES aime_user(id) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT ongeki_user_print_detail_uk UNIQUE (serialId) -) CHARACTER SET utf8mb4; \ No newline at end of file diff --git a/core/data/schema/versions/SDEZ_3_upgrade.sql b/core/data/schema/versions/SDEZ_3_upgrade.sql new file mode 100644 index 0000000..c13e1fe --- /dev/null +++ b/core/data/schema/versions/SDEZ_3_upgrade.sql @@ -0,0 +1,21 @@ +ALTER TABLE mai2_item_card +CHANGE COLUMN card_id cardId INT NOT NULL AFTER user, +CHANGE COLUMN card_kind cardTypeId INT NOT NULL, +CHANGE COLUMN chara_id charaId INT NOT NULL, +CHANGE COLUMN map_id mapId INT NOT NULL, +CHANGE COLUMN startDate startDate TIMESTAMP NULL DEFAULT '2018-01-01 00:00:00', +CHANGE COLUMN endDate endDate TIMESTAMP NULL DEFAULT '2038-01-01 00:00:00'; + +ALTER TABLE mai2_item_item +CHANGE COLUMN item_id itemId INT NOT NULL AFTER user, +CHANGE COLUMN item_kind itemKind INT NOT NULL, +CHANGE COLUMN is_valid isValid TINYINT(1) NOT NULL DEFAULT '1'; + +ALTER TABLE mai2_item_character +CHANGE COLUMN character_id characterId INT NOT NULL, +CHANGE COLUMN use_count useCount INT NOT NULL DEFAULT '0'; + +ALTER TABLE mai2_item_charge +CHANGE COLUMN charge_id chargeId INT NOT NULL, +CHANGE COLUMN purchase_date purchaseDate TIMESTAMP NOT NULL, +CHANGE COLUMN valid_date validDate TIMESTAMP NOT NULL; diff --git a/docs/game_specific_info.md b/docs/game_specific_info.md new file mode 100644 index 0000000..8af5541 --- /dev/null +++ b/docs/game_specific_info.md @@ -0,0 +1,351 @@ +# ARTEMiS Games Documentation + +Below are all supported games with supported version ids in order to use +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!** + +# Table of content + +- [Supported Games](#Supported-Games) + - [Chunithm](#Chunithm) + - [crossbeats REV.](#crossbeats-REV) + - [maimai DX](#maimai-DX) + - [O.N.G.E.K.I.](#ONGEKI) + - [Card Maker](#Card-Maker) + - [WACCA](#WACCA) + + +# Supported Games + +Games listed below have been tested and confirmed working. + +## Chunithm + +### SDBT + +| Version ID | Version Name | +|------------|--------------------| +| 0 | Chunithm | +| 1 | Chunithm+ | +| 2 | Chunithm Air | +| 3 | Chunithm Air + | +| 4 | Chunithm Star | +| 5 | Chunithm Star + | +| 6 | Chunithm Amazon | +| 7 | Chunithm Amazon + | +| 8 | Chunithm Crystal | +| 9 | Chunithm Crystal + | +| 10 | Chunithm Paradise | + +### SDHD/SDBT + +| Version ID | Version Name | +|------------|-----------------| +| 11 | Chunithm New!! | +| 12 | Chunithm New!!+ | + + +### Importer + +In order to use the importer locate your game installation folder and execute: + +```shell +python read.py --series SDBT --version --binfolder /path/to/game/folder --optfolder /path/to/game/option/folder +``` + +The importer for Chunithm will import: Events, Music, Charge Items and Avatar Accesories. + +### Database upgrade + +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_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 SDBT --version 2 upgrade +python dbutils.py --game SDBT --version 3 upgrade +``` + +## crossbeats REV. + +### SDCA + +| Version ID | Version Name | +|------------|------------------------------------| +| 0 | crossbeats REV. | +| 1 | crossbeats REV. SUNRISE | +| 2 | crossbeats REV. SUNRISE S2 | +| 3 | crossbeats REV. SUNRISE S2 Omnimix | + +### Importer + +In order to use the importer you need to use the provided `Export.csv` file: + +```shell +python read.py --series SDCA --version --binfolder titles/cxb/data +``` + +The importer for crossbeats REV. will import Music. + +### Config + +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 + +### SDEZ + +| Version ID | Version Name | +|------------|-------------------------| +| 0 | maimai DX | +| 1 | maimai DX PLUS | +| 2 | maimai DX Splash | +| 3 | maimai DX Splash PLUS | +| 4 | maimai DX Universe | +| 5 | maimai DX Universe PLUS | + +### Importer + +In order to use the importer locate your game installation folder and execute: + +```shell +python read.py --series SDEZ --version --binfolder /path/to/game/folder --optfolder /path/to/game/option/folder +``` + +The importer for maimai DX will import Events, Music and Tickets. + +**NOTE: It is required to use the importer because the game will +crash without it!** + +### Database upgrade + +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 --version 2 upgrade +``` + +## Hatsune Miku Project Diva + +### SBZV + +| Version ID | Version Name | +|------------|---------------------------------| +| 0 | Project Diva Arcade | +| 1 | Project Diva Arcade Future Tone | + + +### Importer + +In order to use the importer locate your game installation folder and execute: + +```shell +python read.py --series SBZV --version --binfolder /path/to/game/data/diva --optfolder /path/to/game/data/diva/mdata +``` + +The importer for Project Diva Arcade will all required data in order to use +the Shop, Modules and Customizations. + +### Config + +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 | + + +### Database upgrade + +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 --version 2 upgrade +python dbutils.py --game SBZV --version 3 upgrade +python dbutils.py --game SBZV --version 4 upgrade +``` + +## O.N.G.E.K.I. + +### 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 | +| 3 | O.N.G.E.K.I. Summer + | +| 4 | O.N.G.E.K.I. Red | +| 5 | O.N.G.E.K.I. Red + | +| 6 | O.N.G.E.K.I. Bright | +| 7 | O.N.G.E.K.I. Bright Memory | + + +### Importer + +In order to use the importer locate your game installation folder and execute: + +```shell +python read.py --series SDDT --version --binfolder /path/to/game/folder --optfolder /path/to/game/option/folder +``` + +The importer for O.N.G.E.K.I. will all all Cards, Music and Events. + +**NOTE: The Importer is required for Card Maker.** + +### Config + +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 | + +Note: 1149 and higher are only for Card Maker 1.35 and higher and will be ignored on lower versions. + +### Database upgrade + +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 --version 2 upgrade +python dbutils.py --game SDDT --version 3 upgrade +python dbutils.py --game SDDT --version 4 upgrade +``` + +## Card Maker + +### SDED + +| Version ID | Version Name | +|------------|-----------------| +| 0 | Card Maker 1.34 | +| 1 | Card Maker 1.35 | + + +### Support status + +* Card Maker 1.34: + * Chunithm New!!: Yes + * maimai DX Universe: Yes + * O.N.G.E.K.I. Bright: Yes + +* Card Maker 1.35: + * Chunithm New!!+: Yes + * maimai DX Universe PLUS: Yes + * O.N.G.E.K.I. Bright Memory: Yes + + +### Importer + +In order to use the importer you need to use the provided `.csv` files (which are required for O.N.G.E.K.I.) and the +option folders: + +```shell +python read.py --series SDED --version --binfolder titles/cm/cm_data --optfolder /path/to/cardmaker/option/folder +``` + +**If you haven't already executed the O.N.G.E.K.I. importer, make sure you import all cards!** + +```shell +python read.py --series SDDT --version --binfolder /path/to/game/folder --optfolder /path/to/game/option/folder +``` + +Also make sure to import all maimai and Chunithm data as well: + +```shell +python read.py --series SDED --version --binfolder /path/to/cardmaker/CardMaker_Data +``` + +The importer for Card Maker will import all required Gachas (Banners) and cards (for maimai/Chunithm) and the hardcoded +Cards for each Gacha (O.N.G.E.K.I. only). + +**NOTE: Without executing the importer Card Maker WILL NOT work!** + + +### O.N.G.E.K.I. Gachas + +Gacha "無料ガチャ" can only pull from the free cards with the following probabilities: 94%: R, 5% SR and 1% chance of +getting an SSR card + +Gacha "無料ガチャ（SR確定）" can only pull from free SR cards with prob: 92% SR and 8% chance of getting an SSR card + +Gacha "レギュラーガチャ" can pull from every card added to ongeki_static_cards with the following prob: 77% R, 20% SR +and 3% chance of getting an SSR card + +All other (limited) gachas can pull from every card added to ongeki_static_cards but with the promoted cards +(click on the green button under the banner) having a 10 times higher chance to get pulled + +### Chunithm Gachas + +All cards in Chunithm (basically just the characters) have the same rarity to it just pulls randomly from all cards +from a given gacha but made sure you cannot pull the same card twice in the same 5 times gacha roll. + +### Notes + +Card Maker 1.34 will only load an O.N.G.E.K.I. Bright profile (1.30). Card Maker 1.35 will only load an O.N.G.E.K.I. +Bright Memory profile (1.35). +The gachas inside the `ongeki.yaml` will make sure only the right gacha ids for the right CM version will be loaded. +Gacha IDs up to 1140 will be loaded for CM 1.34 and all gachas will be loaded for CM 1.35. + +**NOTE: There is currently no way to load/use the (printed) maimai DX cards!** + +## WACCA + +### SDFE + +| Version ID | Version Name | +|------------|---------------| +| 0 | WACCA | +| 1 | WACCA S | +| 2 | WACCA Lily | +| 3 | WACCA Lily R | +| 4 | WACCA Reverse | + + +### Importer + +In order to use the importer locate your game installation folder and execute: + +```shell +python read.py --series SDFE --version --binfolder /path/to/game/WindowsNoEditor/Mercury/Content +``` + +The importer for WACCA will import all Music data. + +### Config + +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` | +| `enabled_gates` | Enter all gate IDs which should be enabled in game | + + +### Database upgrade + +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 --version 2 upgrade +python dbutils.py --game SDFE --version 3 upgrade +``` diff --git a/read.py b/read.py index 341c502..a1bd0ab 100644 --- a/read.py +++ b/read.py @@ -4,7 +4,8 @@ import re import os import yaml from os import path -import logging, coloredlogs +import logging +import coloredlogs from logging.handlers import TimedRotatingFileHandler from typing import List, Optional @@ -134,7 +135,8 @@ if __name__ == "__main__": for dir, mod in titles.items(): if args.series in mod.game_codes: - handler = mod.reader(config, args.version, bin_arg, opt_arg, args.extra) + handler = mod.reader(config, args.version, + bin_arg, opt_arg, args.extra) handler.read() logger.info("Done") diff --git a/readme.md b/readme.md index d64cede..4afc225 100644 --- a/readme.md +++ b/readme.md @@ -17,7 +17,7 @@ Games listed below have been tested and confirmed working. Only game versions ol + Card Maker + 1.34.xx - + 1.36.xx + + 1.35.xx + Ongeki + All versions up to Bright Memory @@ -36,5 +36,8 @@ Games listed below have been tested and confirmed working. Only game versions ol ## Setup guides 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. + ## Production guide See the [production guide](docs/prod.md) for running a production server. diff --git a/titles/chuni/base.py b/titles/chuni/base.py index f66eac8..13f423b 100644 --- a/titles/chuni/base.py +++ b/titles/chuni/base.py @@ -588,3 +588,11 @@ class ChuniBase: def handle_upsert_client_testmode_api_request(self, data: Dict) -> Dict: return {"returnCode": "1"} + + def handle_get_user_net_battle_data_api_request(self, data: Dict) -> Dict: + return { + "userId": data["userId"], + "userNetBattleData": { + "recentNBSelectMusicList": [] + } + } \ No newline at end of file diff --git a/titles/chuni/index.py b/titles/chuni/index.py index de01346..b5648fb 100644 --- a/titles/chuni/index.py +++ b/titles/chuni/index.py @@ -103,7 +103,7 @@ class ChuniServlet: return (True, f"http://{core_cfg.title.hostname}/{game_code}/$v/", "") def render_POST(self, request: Request, version: int, url_path: str) -> bytes: - if url_path.lower() == "/ping": + if url_path.lower() == "ping": return zlib.compress(b'{"returnCode": "1"}') req_raw = request.content.getvalue() diff --git a/titles/chuni/new.py b/titles/chuni/new.py index 0d74ba6..611c6d2 100644 --- a/titles/chuni/new.py +++ b/titles/chuni/new.py @@ -1,6 +1,6 @@ import logging from datetime import datetime, timedelta - +from random import randint from typing import Dict from core.config import CoreConfig @@ -61,8 +61,8 @@ class ChuniNew(ChuniBase): } def handle_remove_token_api_request(self, data: Dict) -> Dict: - return { "returnCode": "1" } - + return {"returnCode": "1"} + def handle_delete_token_api_request(self, data: Dict) -> Dict: return {"returnCode": "1"} @@ -122,11 +122,355 @@ class ChuniNew(ChuniBase): "playerLevel": profile["playerLevel"], "rating": profile["rating"], "headphone": profile["headphone"], - "chargeState": 0, - "userNameEx": "0", + # Enables favorites and teams + "chargeState": 1, + "userNameEx": "", "banState": 0, "classEmblemMedal": profile["classEmblemMedal"], "classEmblemBase": profile["classEmblemBase"], "battleRankId": profile["battleRankId"], } return data1 + + def handle_cm_get_user_preview_api_request(self, data: Dict) -> Dict: + p = self.data.profile.get_profile_data(data["userId"], self.version) + if p is None: + return {} + + return { + "userName": p["userName"], + "level": p["level"], + "medal": p["medal"], + "lastDataVersion": "2.00.00", + "isLogin": False, + } + + def handle_printer_login_api_request(self, data: Dict) -> Dict: + return {"returnCode": 1} + + def handle_printer_logout_api_request(self, data: Dict) -> Dict: + return {"returnCode": 1} + + def handle_get_game_gacha_api_request(self, data: Dict) -> Dict: + """ + returns all current active banners (gachas) + """ + game_gachas = self.data.static.get_gachas(self.version) + + # clean the database rows + game_gacha_list = [] + for gacha in game_gachas: + tmp = gacha._asdict() + tmp.pop("id") + tmp.pop("version") + tmp["startDate"] = datetime.strftime(tmp["startDate"], "%Y-%m-%d %H:%M:%S") + tmp["endDate"] = datetime.strftime(tmp["endDate"], "%Y-%m-%d %H:%M:%S") + tmp["noticeStartDate"] = datetime.strftime( + tmp["noticeStartDate"], "%Y-%m-%d %H:%M:%S" + ) + tmp["noticeEndDate"] = datetime.strftime( + tmp["noticeEndDate"], "%Y-%m-%d %H:%M:%S" + ) + + game_gacha_list.append(tmp) + + return { + "length": len(game_gacha_list), + "gameGachaList": game_gacha_list, + # no clue + "registIdList": [], + } + + def handle_get_game_gacha_card_by_id_api_request(self, data: Dict) -> Dict: + """ + returns all valid cards for a given gachaId + """ + game_gacha_cards = self.data.static.get_gacha_cards(data["gachaId"]) + + game_gacha_card_list = [] + for gacha_card in game_gacha_cards: + tmp = gacha_card._asdict() + tmp.pop("id") + game_gacha_card_list.append(tmp) + + return { + "gachaId": data["gachaId"], + "length": len(game_gacha_card_list), + # check isPickup from the chuni_static_gachas? + "isPickup": False, + "gameGachaCardList": game_gacha_card_list, + # again no clue + "emissionList": [], + "afterCalcList": [], + "ssrBookCalcList": [], + } + + def handle_cm_get_user_data_api_request(self, data: Dict) -> Dict: + p = self.data.profile.get_profile_data(data["userId"], self.version) + if p is None: + return {} + + profile = p._asdict() + profile.pop("id") + profile.pop("user") + profile.pop("version") + + return { + "userId": data["userId"], + "userData": profile, + "userEmoney": [ + { + "type": 0, + "emoneyCredit": 100, + "emoneyBrand": 1, + "ext1": 0, + "ext2": 0, + "ext3": 0, + } + ], + } + + def handle_get_user_gacha_api_request(self, data: Dict) -> Dict: + user_gachas = self.data.item.get_user_gachas(data["userId"]) + if user_gachas is None: + return {"userId": data["userId"], "length": 0, "userGachaList": []} + + user_gacha_list = [] + for gacha in user_gachas: + tmp = gacha._asdict() + tmp.pop("id") + tmp.pop("user") + tmp["dailyGachaDate"] = datetime.strftime(tmp["dailyGachaDate"], "%Y-%m-%d") + user_gacha_list.append(tmp) + + return { + "userId": data["userId"], + "length": len(user_gacha_list), + "userGachaList": user_gacha_list, + } + + def handle_get_user_printed_card_api_request(self, data: Dict) -> Dict: + user_print_list = self.data.item.get_user_print_states( + data["userId"], has_completed=True + ) + if user_print_list is None: + return { + "userId": data["userId"], + "length": 0, + "nextIndex": -1, + "userPrintedCardList": [], + } + + print_list = [] + next_idx = int(data["nextIndex"]) + max_ct = int(data["maxCount"]) + + for x in range(next_idx, len(user_print_list)): + tmp = user_print_list[x]._asdict() + print_list.append(tmp["cardId"]) + + if len(user_print_list) >= max_ct: + break + + if len(user_print_list) >= max_ct: + next_idx = next_idx + max_ct + else: + next_idx = -1 + + return { + "userId": data["userId"], + "length": len(print_list), + "nextIndex": next_idx, + "userPrintedCardList": print_list, + } + + def handle_get_user_card_print_error_api_request(self, data: Dict) -> Dict: + user_id = data["userId"] + + user_print_states = self.data.item.get_user_print_states( + user_id, has_completed=False + ) + + card_print_state_list = [] + for card in user_print_states: + tmp = card._asdict() + tmp["orderId"] = tmp["id"] + tmp.pop("user") + tmp["limitDate"] = datetime.strftime(tmp["limitDate"], "%Y-%m-%d") + + card_print_state_list.append(tmp) + + return { + "userId": user_id, + "length": len(card_print_state_list), + "userCardPrintStateList": card_print_state_list, + } + + def handle_cm_get_user_character_api_request(self, data: Dict) -> Dict: + return super().handle_get_user_character_api_request(data) + + def handle_cm_get_user_item_api_request(self, data: Dict) -> Dict: + return super().handle_get_user_item_api_request(data) + + def handle_roll_gacha_api_request(self, data: Dict) -> Dict: + """ + Handle a gacha roll API request, with: + gachaId: the gachaId where the cards should be pulled from + times: the number of gacha rolls + characterId: the character which the user wants + """ + gacha_id = data["gachaId"] + num_rolls = data["times"] + chara_id = data["characterId"] + + rolled_cards = [] + + # characterId is set after 10 rolls, where the user can select a card + # from all gameGachaCards, therefore the correct cardId for a given + # characterId should be returned + if chara_id != -1: + # get the + card = self.data.static.get_gacha_card_by_character(gacha_id, chara_id) + + tmp = card._asdict() + tmp.pop("id") + + rolled_cards.append(tmp) + else: + gacha_cards = self.data.static.get_gacha_cards(gacha_id) + + # get the card id for each roll + for _ in range(num_rolls): + # get the index from all possible cards + card_idx = randint(0, len(gacha_cards) - 1) + # remove the index from the cards so it wont get pulled again + card = gacha_cards.pop(card_idx) + + # remove the "id" fronm the card + tmp = card._asdict() + tmp.pop("id") + + rolled_cards.append(tmp) + + return {"length": len(rolled_cards), "gameGachaCardList": rolled_cards} + + def handle_cm_upsert_user_gacha_api_request(self, data: Dict) -> Dict: + upsert = data["cmUpsertUserGacha"] + user_id = data["userId"] + place_id = data["placeId"] + + # save the user data + user_data = upsert["userData"] + user_data.pop("rankUpChallengeResults") + user_data.pop("userEmoney") + + self.data.profile.put_profile_data(user_id, self.version, user_data) + + # save the user gacha + user_gacha = upsert["userGacha"] + gacha_id = user_gacha["gachaId"] + user_gacha.pop("gachaId") + user_gacha.pop("dailyGachaDate") + + self.data.item.put_user_gacha(user_id, gacha_id, user_gacha) + + # save all user items + if "userItemList" in upsert: + for item in upsert["userItemList"]: + self.data.item.put_item(user_id, item) + + # add every gamegachaCard to database + for card in upsert["gameGachaCardList"]: + self.data.item.put_user_print_state( + user_id, + hasCompleted=False, + placeId=place_id, + cardId=card["cardId"], + gachaId=card["gachaId"], + ) + + # retrieve every game gacha card which has been added in order to get + # the orderId for the next request + user_print_states = self.data.item.get_user_print_states_by_gacha( + user_id, gacha_id, has_completed=False + ) + card_print_state_list = [] + for card in user_print_states: + tmp = card._asdict() + tmp["orderId"] = tmp["id"] + tmp.pop("user") + tmp["limitDate"] = datetime.strftime(tmp["limitDate"], "%Y-%m-%d") + + card_print_state_list.append(tmp) + + return { + "returnCode": "1", + "apiName": "CMUpsertUserGachaApi", + "userCardPrintStateList": card_print_state_list, + } + + def handle_cm_upsert_user_printlog_api_request(self, data: Dict) -> Dict: + return { + "returnCode": 1, + "orderId": 0, + "serialId": "11111111111111111111", + "apiName": "CMUpsertUserPrintlogApi", + } + + def handle_cm_upsert_user_print_api_request(self, data: Dict) -> Dict: + user_print_detail = data["userPrintDetail"] + user_id = data["userId"] + + # generate random serial id + serial_id = "".join([str(randint(0, 9)) for _ in range(20)]) + + # not needed because are either zero or unset + user_print_detail.pop("orderId") + user_print_detail.pop("printNumber") + user_print_detail.pop("serialId") + user_print_detail["printDate"] = datetime.strptime( + user_print_detail["printDate"], "%Y-%m-%d" + ) + + # add the entry to the user print table with the random serialId + self.data.item.put_user_print_detail(user_id, serial_id, user_print_detail) + + return { + "returnCode": 1, + "orderId": 0, + "serialId": serial_id, + "apiName": "CMUpsertUserPrintApi", + } + + def handle_cm_upsert_user_print_subtract_api_request(self, data: Dict) -> Dict: + upsert = data["userCardPrintState"] + user_id = data["userId"] + place_id = data["placeId"] + + # save all user items + if "userItemList" in data: + for item in data["userItemList"]: + self.data.item.put_item(user_id, item) + + # set the card print state to success and use the orderId as the key + self.data.item.put_user_print_state( + user_id, + id=upsert["orderId"], + hasCompleted=True + ) + + return {"returnCode": "1", "apiName": "CMUpsertUserPrintSubtractApi"} + + def handle_cm_upsert_user_print_cancel_api_request(self, data: Dict) -> Dict: + order_ids = data["orderIdList"] + user_id = data["userId"] + + # set the card print state to success and use the orderId as the key + for order_id in order_ids: + self.data.item.put_user_print_state( + user_id, + id=order_id, + hasCompleted=True + ) + + return {"returnCode": "1", "apiName": "CMUpsertUserPrintCancelApi"} diff --git a/titles/chuni/newplus.py b/titles/chuni/newplus.py index 7e15985..9dec9aa 100644 --- a/titles/chuni/newplus.py +++ b/titles/chuni/newplus.py @@ -30,3 +30,10 @@ class ChuniNewPlus(ChuniNew): "reflectorUri" ] = f"http://{self.core_cfg.title.hostname}:{self.core_cfg.title.port}/SDHD/205/ChuniServlet/" return ret + + def handle_cm_get_user_preview_api_request(self, data: Dict) -> Dict: + user_data = super().handle_cm_get_user_preview_api_request(data) + + # hardcode lastDataVersion for CardMaker 1.35 + user_data["lastDataVersion"] = "2.05.00" + return user_data diff --git a/titles/chuni/schema/item.py b/titles/chuni/schema/item.py index cc519fa..124d7df 100644 --- a/titles/chuni/schema/item.py +++ b/titles/chuni/schema/item.py @@ -114,6 +114,76 @@ map_area = Table( mysql_charset="utf8mb4", ) +gacha = Table( + "chuni_item_gacha", + metadata, + Column("id", Integer, primary_key=True, nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), + Column("gachaId", Integer, nullable=False), + Column("totalGachaCnt", Integer, server_default="0"), + Column("ceilingGachaCnt", Integer, server_default="0"), + Column("dailyGachaCnt", Integer, server_default="0"), + Column("fiveGachaCnt", Integer, server_default="0"), + Column("elevenGachaCnt", Integer, server_default="0"), + Column("dailyGachaDate", TIMESTAMP, nullable=False, server_default=func.now()), + UniqueConstraint("user", "gachaId", name="chuni_item_gacha_uk"), + mysql_charset="utf8mb4", +) + +print_state = Table( + "chuni_item_print_state", + metadata, + Column("id", Integer, primary_key=True, nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), + Column("hasCompleted", Boolean, nullable=False, server_default="0"), + Column( + "limitDate", TIMESTAMP, nullable=False, server_default="2038-01-01 00:00:00.0" + ), + Column("placeId", Integer), + Column("cardId", Integer), + Column("gachaId", Integer), + UniqueConstraint("id", "user", name="chuni_item_print_state_uk"), + mysql_charset="utf8mb4", +) + +print_detail = Table( + "chuni_item_print_detail", + metadata, + Column("id", Integer, primary_key=True, nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), + Column("cardId", Integer, nullable=False), + Column("printDate", TIMESTAMP, nullable=False), + Column("serialId", String(20), nullable=False), + Column("placeId", Integer, nullable=False), + Column("clientId", String(11), nullable=False), + Column("printerSerialId", String(20), nullable=False), + Column("printOption1", Boolean, server_default="0"), + Column("printOption2", Boolean, server_default="0"), + Column("printOption3", Boolean, server_default="0"), + Column("printOption4", Boolean, server_default="0"), + Column("printOption5", Boolean, server_default="0"), + Column("printOption6", Boolean, server_default="0"), + Column("printOption7", Boolean, server_default="0"), + Column("printOption8", Boolean, server_default="0"), + Column("printOption9", Boolean, server_default="0"), + Column("printOption10", Boolean, server_default="0"), + Column("created", String(255), server_default=""), + UniqueConstraint("serialId", name="chuni_item_print_detail_uk"), + mysql_charset="utf8mb4", +) + class ChuniItemData(BaseData): def put_character(self, user_id: int, character_data: Dict) -> Optional[int]: @@ -235,3 +305,89 @@ class ChuniItemData(BaseData): if result is None: return None return result.fetchall() + + def get_user_gachas(self, aime_id: int) -> Optional[List[Row]]: + sql = gacha.select(gacha.c.user == aime_id) + + result = self.execute(sql) + if result is None: + return None + return result.fetchall() + + def put_user_gacha( + self, aime_id: int, gacha_id: int, gacha_data: Dict + ) -> Optional[int]: + sql = insert(gacha).values(user=aime_id, gachaId=gacha_id, **gacha_data) + + conflict = sql.on_duplicate_key_update( + user=aime_id, gachaId=gacha_id, **gacha_data + ) + result = self.execute(conflict) + + if result is None: + self.logger.warn(f"put_user_gacha: Failed to insert! aime_id: {aime_id}") + return None + return result.lastrowid + + def get_user_print_states( + self, aime_id: int, has_completed: bool = False + ) -> Optional[List[Row]]: + sql = print_state.select( + and_( + print_state.c.user == aime_id, + print_state.c.hasCompleted == has_completed + ) + ) + + result = self.execute(sql) + if result is None: + return None + return result.fetchall() + + def get_user_print_states_by_gacha( + self, aime_id: int, gacha_id: int, has_completed: bool = False + ) -> Optional[List[Row]]: + sql = print_state.select( + and_( + print_state.c.user == aime_id, + print_state.c.gachaId == gacha_id, + print_state.c.hasCompleted == has_completed + ) + ) + + result = self.execute(sql) + if result is None: + return None + return result.fetchall() + + def put_user_print_state(self, aime_id: int, **print_data) -> Optional[int]: + sql = insert(print_state).values(user=aime_id, **print_data) + + conflict = sql.on_duplicate_key_update(user=aime_id, **print_data) + result = self.execute(conflict) + + if result is None: + self.logger.warn( + f"put_user_print_state: Failed to insert! aime_id: {aime_id}" + ) + return None + return result.lastrowid + + def put_user_print_detail( + self, aime_id: int, serial_id: str, user_print_data: Dict + ) -> Optional[int]: + sql = insert(print_detail).values( + user=aime_id, serialId=serial_id, **user_print_data + ) + + conflict = sql.on_duplicate_key_update( + user=aime_id, **user_print_data + ) + result = self.execute(conflict) + + if result is None: + self.logger.warn( + f"put_user_print_detail: Failed to insert! aime_id: {aime_id}" + ) + return None + return result.lastrowid \ No newline at end of file diff --git a/titles/chuni/schema/static.py b/titles/chuni/schema/static.py index 0d58c45..0784872 100644 --- a/titles/chuni/schema/static.py +++ b/titles/chuni/schema/static.py @@ -68,6 +68,60 @@ avatar = Table( mysql_charset="utf8mb4", ) +gachas = Table( + "chuni_static_gachas", + metadata, + Column("id", Integer, primary_key=True, nullable=False), + Column("version", Integer, nullable=False), + Column("gachaId", Integer, nullable=False), + Column("gachaName", String(255), nullable=False), + Column("type", Integer, nullable=False, server_default="0"), + Column("kind", Integer, nullable=False, server_default="0"), + Column("isCeiling", Boolean, server_default="0"), + Column("ceilingCnt", Integer, server_default="10"), + Column("changeRateCnt1", Integer, server_default="0"), + Column("changeRateCnt2", Integer, server_default="0"), + Column("startDate", TIMESTAMP, server_default="2018-01-01 00:00:00.0"), + Column("endDate", TIMESTAMP, server_default="2038-01-01 00:00:00.0"), + Column("noticeStartDate", TIMESTAMP, server_default="2018-01-01 00:00:00.0"), + Column("noticeEndDate", TIMESTAMP, server_default="2038-01-01 00:00:00.0"), + UniqueConstraint("version", "gachaId", "gachaName", name="chuni_static_gachas_uk"), + mysql_charset="utf8mb4", +) + +cards = Table( + "chuni_static_cards", + metadata, + Column("id", Integer, primary_key=True, nullable=False), + Column("version", Integer, nullable=False), + Column("cardId", Integer, nullable=False), + Column("charaName", String(255), nullable=False), + Column("charaId", Integer, nullable=False), + Column("presentName", String(255), nullable=False), + Column("rarity", Integer, server_default="2"), + Column("labelType", Integer, nullable=False), + Column("difType", Integer, nullable=False), + Column("miss", Integer, nullable=False), + Column("combo", Integer, nullable=False), + Column("chain", Integer, nullable=False), + Column("skillName", String(255), nullable=False), + UniqueConstraint("version", "cardId", name="chuni_static_cards_uk"), + mysql_charset="utf8mb4", +) + +gacha_cards = Table( + "chuni_static_gacha_cards", + metadata, + Column("id", Integer, primary_key=True, nullable=False), + Column("gachaId", Integer, nullable=False), + Column("cardId", Integer, nullable=False), + Column("rarity", Integer, nullable=False), + Column("weight", Integer, server_default="1"), + Column("isPickup", Boolean, server_default="0"), + UniqueConstraint("gachaId", "cardId", name="chuni_static_gacha_cards_uk"), + mysql_charset="utf8mb4", +) + class ChuniStaticData(BaseData): def put_event( @@ -265,3 +319,112 @@ class ChuniStaticData(BaseData): if result is None: return None return result.lastrowid + + def put_gacha( + self, + version: int, + gacha_id: int, + gacha_name: int, + **gacha_data, + ) -> Optional[int]: + sql = insert(gachas).values( + version=version, + gachaId=gacha_id, + gachaName=gacha_name, + **gacha_data, + ) + + conflict = sql.on_duplicate_key_update( + version=version, + gachaId=gacha_id, + gachaName=gacha_name, + **gacha_data, + ) + + result = self.execute(conflict) + if result is None: + self.logger.warn(f"Failed to insert gacha! gacha_id {gacha_id}") + return None + return result.lastrowid + + def get_gachas(self, version: int) -> Optional[List[Dict]]: + sql = gachas.select(gachas.c.version <= version).order_by( + gachas.c.gachaId.asc() + ) + + result = self.execute(sql) + if result is None: + return None + return result.fetchall() + + def get_gacha(self, version: int, gacha_id: int) -> Optional[Dict]: + sql = gachas.select( + and_(gachas.c.version <= version, gachas.c.gachaId == gacha_id) + ) + + result = self.execute(sql) + if result is None: + return None + return result.fetchone() + + def put_gacha_card( + self, gacha_id: int, card_id: int, **gacha_card + ) -> Optional[int]: + sql = insert(gacha_cards).values(gachaId=gacha_id, cardId=card_id, **gacha_card) + + conflict = sql.on_duplicate_key_update( + gachaId=gacha_id, cardId=card_id, **gacha_card + ) + + result = self.execute(conflict) + if result is None: + self.logger.warn(f"Failed to insert gacha card! gacha_id {gacha_id}") + return None + return result.lastrowid + + def get_gacha_cards(self, gacha_id: int) -> Optional[List[Dict]]: + sql = gacha_cards.select(gacha_cards.c.gachaId == gacha_id) + + result = self.execute(sql) + if result is None: + return None + return result.fetchall() + + def get_gacha_card_by_character(self, gacha_id: int, chara_id: int) -> Optional[Dict]: + sql_sub = ( + select(cards.c.cardId) + .filter( + cards.c.charaId == chara_id + ) + .scalar_subquery() + ) + + # Perform the main query, also rename the resulting column to ranking + sql = gacha_cards.select(and_( + gacha_cards.c.gachaId == gacha_id, + gacha_cards.c.cardId == sql_sub + )) + + result = self.execute(sql) + if result is None: + return None + return result.fetchone() + + def put_card(self, version: int, card_id: int, **card_data) -> Optional[int]: + sql = insert(cards).values(version=version, cardId=card_id, **card_data) + + conflict = sql.on_duplicate_key_update(**card_data) + + result = self.execute(conflict) + if result is None: + self.logger.warn(f"Failed to insert card! card_id {card_id}") + return None + return result.lastrowid + + def get_card(self, version: int, card_id: int) -> Optional[Dict]: + sql = cards.select(and_(cards.c.version <= version, cards.c.cardId == card_id)) + + result = self.execute(sql) + if result is None: + return None + return result.fetchone() diff --git a/titles/cm/__init__.py b/titles/cm/__init__.py index ae4e9f0..1115f96 100644 --- a/titles/cm/__init__.py +++ b/titles/cm/__init__.py @@ -1,9 +1,11 @@ from titles.cm.index import CardMakerServlet from titles.cm.const import CardMakerConstants from titles.cm.read import CardMakerReader +from titles.cm.database import CardMakerData index = CardMakerServlet reader = CardMakerReader +database = CardMakerData game_codes = [CardMakerConstants.GAME_CODE] diff --git a/titles/cm/cm136.py b/titles/cm/cm135.py similarity index 89% rename from titles/cm/cm136.py rename to titles/cm/cm135.py index fb5b6b5..782f07a 100644 --- a/titles/cm/cm136.py +++ b/titles/cm/cm135.py @@ -11,10 +11,10 @@ from titles.cm.const import CardMakerConstants from titles.cm.config import CardMakerConfig -class CardMaker136(CardMakerBase): +class CardMaker135(CardMakerBase): def __init__(self, core_cfg: CoreConfig, game_cfg: CardMakerConfig) -> None: super().__init__(core_cfg, game_cfg) - self.version = CardMakerConstants.VER_CARD_MAKER_136 + self.version = CardMakerConstants.VER_CARD_MAKER_135 def handle_get_game_connect_api_request(self, data: Dict) -> Dict: ret = super().handle_get_game_connect_api_request(data) @@ -26,13 +26,13 @@ class CardMaker136(CardMakerBase): ret["gameConnectList"][0]["titleUri"] = f"{uri}/SDHD/205/" ret["gameConnectList"][1]["titleUri"] = f"{uri}/SDEZ/125/" ret["gameConnectList"][2]["titleUri"] = f"{uri}/SDDT/135/" - + return ret def handle_get_game_setting_api_request(self, data: Dict) -> Dict: ret = super().handle_get_game_setting_api_request(data) ret["gameSetting"]["dataVersion"] = "1.35.00" - ret["gameSetting"]["ongekiCmVersion"] = "1.35.04" + ret["gameSetting"]["ongekiCmVersion"] = "1.35.03" ret["gameSetting"]["chuniCmVersion"] = "2.05.00" ret["gameSetting"]["maimaiCmVersion"] = "1.25.00" return ret diff --git a/titles/cm/const.py b/titles/cm/const.py index c5627ee..09f289e 100644 --- a/titles/cm/const.py +++ b/titles/cm/const.py @@ -4,9 +4,9 @@ class CardMakerConstants: CONFIG_NAME = "cardmaker.yaml" VER_CARD_MAKER = 0 - VER_CARD_MAKER_136 = 1 + VER_CARD_MAKER_135 = 1 - VERSION_NAMES = ("Card Maker 1.34", "Card Maker 1.36") + VERSION_NAMES = ("Card Maker 1.34", "Card Maker 1.35") @classmethod def game_ver_to_string(cls, ver: int): diff --git a/titles/cm/database.py b/titles/cm/database.py new file mode 100644 index 0000000..1d32109 --- /dev/null +++ b/titles/cm/database.py @@ -0,0 +1,8 @@ +from core.data import Data +from core.config import CoreConfig + + +class CardMakerData(Data): + def __init__(self, cfg: CoreConfig) -> None: + super().__init__(cfg) + # empty Card Maker database diff --git a/titles/cm/index.py b/titles/cm/index.py index d082aad..d544e59 100644 --- a/titles/cm/index.py +++ b/titles/cm/index.py @@ -15,7 +15,7 @@ from core.config import CoreConfig from titles.cm.config import CardMakerConfig from titles.cm.const import CardMakerConstants from titles.cm.base import CardMakerBase -from titles.cm.cm136 import CardMaker136 +from titles.cm.cm135 import CardMaker135 class CardMakerServlet: @@ -29,7 +29,7 @@ class CardMakerServlet: self.versions = [ CardMakerBase(core_cfg, self.game_cfg), - CardMaker136(core_cfg, self.game_cfg), + CardMaker135(core_cfg, self.game_cfg), ] self.logger = logging.getLogger("cardmaker") @@ -87,8 +87,8 @@ class CardMakerServlet: if version >= 130 and version < 135: # Card Maker internal_ver = CardMakerConstants.VER_CARD_MAKER - elif version >= 135 and version < 140: # Card Maker - internal_ver = CardMakerConstants.VER_CARD_MAKER_136 + elif version >= 135 and version < 136: # Card Maker 1.35 + internal_ver = CardMakerConstants.VER_CARD_MAKER_135 if all(c in string.hexdigits for c in endpoint) and len(endpoint) == 32: # If we get a 32 character long hex string, it's a hash and we're diff --git a/titles/cm/read.py b/titles/cm/read.py index 3a4635f..f27b40b 100644 --- a/titles/cm/read.py +++ b/titles/cm/read.py @@ -12,6 +12,10 @@ from titles.ongeki.database import OngekiData from titles.cm.const import CardMakerConstants from titles.ongeki.const import OngekiConstants from titles.ongeki.config import OngekiConfig +from titles.mai2.database import Mai2Data +from titles.mai2.const import Mai2Constants +from titles.chuni.database import ChuniData +from titles.chuni.const import ChuniConstants class CardMakerReader(BaseReader): @@ -25,6 +29,8 @@ class CardMakerReader(BaseReader): ) -> None: super().__init__(config, version, bin_dir, opt_dir, extra) self.ongeki_data = OngekiData(config) + self.mai2_data = Mai2Data(config) + self.chuni_data = ChuniData(config) try: self.logger.info( @@ -34,15 +40,29 @@ class CardMakerReader(BaseReader): self.logger.error(f"Invalid Card Maker version {version}") exit(1) + def _get_card_maker_directory(self, directory: str) -> str: + for root, dirs, files in os.walk(directory): + for dir in dirs: + if ( + os.path.exists(f"{root}/{dir}/MU3") + and os.path.exists(f"{root}/{dir}/MAI") + and os.path.exists(f"{root}/{dir}/CHU") + ): + return f"{root}/{dir}" + def read(self) -> None: static_datas = { "static_gachas.csv": "read_ongeki_gacha_csv", "static_gacha_cards.csv": "read_ongeki_gacha_card_csv", } - data_dirs = [] - if self.bin_dir is not None: + data_dir = self._get_card_maker_directory(self.bin_dir) + + self.read_chuni_card(f"{data_dir}/CHU/Data/A000/card") + self.read_chuni_gacha(f"{data_dir}/CHU/Data/A000/gacha") + + self.read_mai2_card(f"{data_dir}/MAI/Data/A000/card") for file, func in static_datas.items(): if os.path.exists(f"{self.bin_dir}/MU3/{file}"): read_csv = getattr(CardMakerReader, func) @@ -53,13 +73,163 @@ class CardMakerReader(BaseReader): ) if self.opt_dir is not None: - data_dirs += self.get_data_directories(self.opt_dir) + data_dirs = self.get_data_directories(self.opt_dir) # ONGEKI (MU3) cnnot easily access the bin data(A000.pac) # so only opt_dir will work for now for dir in data_dirs: + self.read_chuni_card(f"{dir}/CHU/card") + self.read_chuni_gacha(f"{dir}/CHU/gacha") + self.read_ongeki_gacha(f"{dir}/MU3/gacha") + def read_chuni_card(self, base_dir: str) -> None: + self.logger.info(f"Reading cards from {base_dir}...") + + version_ids = { + "v2_00": ChuniConstants.VER_CHUNITHM_NEW, + "v2_05": ChuniConstants.VER_CHUNITHM_NEW_PLUS, + # Chunithm SUN, ignore for now + "v2_10": ChuniConstants.VER_CHUNITHM_NEW_PLUS + 1 + } + + for root, dirs, files in os.walk(base_dir): + for dir in dirs: + if os.path.exists(f"{root}/{dir}/Card.xml"): + with open(f"{root}/{dir}/Card.xml", "r", encoding="utf-8") as f: + troot = ET.fromstring(f.read()) + + card_id = int(troot.find("name").find("id").text) + + chara_name = troot.find("chuniCharaName").find("str").text + chara_id = troot.find("chuniCharaName").find("id").text + version = version_ids[ + troot.find("netOpenName").find("str").text[:5] + ] + present_name = troot.find("chuniPresentName").find("str").text + rarity = int(troot.find("rareType").text) + label = int(troot.find("labelType").text) + dif = int(troot.find("difType").text) + miss = int(troot.find("miss").text) + combo = int(troot.find("combo").text) + chain = int(troot.find("chain").text) + skill_name = troot.find("skillName").text + + self.chuni_data.static.put_card( + version, + card_id, + charaName=chara_name, + charaId=chara_id, + presentName=present_name, + rarity=rarity, + labelType=label, + difType=dif, + miss=miss, + combo=combo, + chain=chain, + skillName=skill_name, + ) + + self.logger.info(f"Added chuni card {card_id}") + + def read_chuni_gacha(self, base_dir: str) -> None: + self.logger.info(f"Reading gachas from {base_dir}...") + + version_ids = { + "v2_00": ChuniConstants.VER_CHUNITHM_NEW, + "v2_05": ChuniConstants.VER_CHUNITHM_NEW_PLUS, + # Chunithm SUN, ignore for now + "v2_10": ChuniConstants.VER_CHUNITHM_NEW_PLUS + 1, + } + + for root, dirs, files in os.walk(base_dir): + for dir in dirs: + if os.path.exists(f"{root}/{dir}/Gacha.xml"): + with open(f"{root}/{dir}/Gacha.xml", "r", encoding="utf-8") as f: + troot = ET.fromstring(f.read()) + + name = troot.find("gachaName").text + gacha_id = int(troot.find("name").find("id").text) + + version = version_ids[ + troot.find("netOpenName").find("str").text[:5] + ] + ceiling_cnt = int(troot.find("ceilingNum").text) + gacha_type = int(troot.find("gachaType").text) + is_ceiling = ( + True if troot.find("ceilingType").text == "1" else False + ) + + self.chuni_data.static.put_gacha( + version, + gacha_id, + name, + type=gacha_type, + isCeiling=is_ceiling, + ceilingCnt=ceiling_cnt, + ) + + self.logger.info(f"Added chuni gacha {gacha_id}") + + for gacha_card in troot.find("infos").iter("GachaCardDataInfo"): + # get the card ID from the id element + card_id = gacha_card.find("cardName").find("id").text + + # get the weight from the weight element + weight = int(gacha_card.find("weight").text) + + # get the pickup flag from the pickup element + is_pickup = ( + True if gacha_card.find("pickup").text == "1" else False + ) + + self.chuni_data.static.put_gacha_card( + gacha_id, + card_id, + weight=weight, + rarity=2, + isPickup=is_pickup, + ) + + self.logger.info( + f"Added chuni card {card_id} to gacha {gacha_id}" + ) + + def read_mai2_card(self, base_dir: str) -> None: + self.logger.info(f"Reading cards from {base_dir}...") + + version_ids = { + "1.00": Mai2Constants.VER_MAIMAI_DX, + "1.05": Mai2Constants.VER_MAIMAI_DX_PLUS, + "1.09": Mai2Constants.VER_MAIMAI_DX_PLUS, + "1.10": Mai2Constants.VER_MAIMAI_DX_SPLASH, + "1.15": Mai2Constants.VER_MAIMAI_DX_SPLASH_PLUS, + "1.20": Mai2Constants.VER_MAIMAI_DX_UNIVERSE, + "1.25": Mai2Constants.VER_MAIMAI_DX_UNIVERSE_PLUS, + } + + for root, dirs, files in os.walk(base_dir): + for dir in dirs: + if os.path.exists(f"{root}/{dir}/Card.xml"): + with open(f"{root}/{dir}/Card.xml", "r", encoding="utf-8") as f: + troot = ET.fromstring(f.read()) + + name = troot.find("name").find("str").text + card_id = int(troot.find("name").find("id").text) + + version = version_ids[ + troot.find("enableVersion").find("str").text + ] + + enabled = ( + True if troot.find("disable").text == "false" else False + ) + + self.mai2_data.static.put_card( + version, card_id, name, enabled=enabled + ) + self.logger.info(f"Added mai2 card {card_id}") + def read_ongeki_gacha_csv(self, file_path: str) -> None: self.logger.info(f"Reading gachas from {file_path}...") @@ -76,7 +246,7 @@ class CardMakerReader(BaseReader): maxSelectPoint=row["maxSelectPoint"], ) - self.logger.info(f"Added gacha {row['gachaId']}") + self.logger.info(f"Added ongeki gacha {row['gachaId']}") def read_ongeki_gacha_card_csv(self, file_path: str) -> None: self.logger.info(f"Reading gacha cards from {file_path}...") @@ -93,7 +263,7 @@ class CardMakerReader(BaseReader): isSelect=True if row["isSelect"] == "1" else False, ) - self.logger.info(f"Added card {row['cardId']} to gacha") + self.logger.info(f"Added ongeki card {row['cardId']} to gacha") def read_ongeki_gacha(self, base_dir: str) -> None: self.logger.info(f"Reading gachas from {base_dir}...") @@ -152,4 +322,4 @@ class CardMakerReader(BaseReader): isCeiling=is_ceiling, maxSelectPoint=max_select_point, ) - self.logger.info(f"Added gacha {gacha_id}") + self.logger.info(f"Added ongeki gacha {gacha_id}") diff --git a/titles/cm/schema/__init__.py b/titles/cm/schema/__init__.py new file mode 100644 index 0000000..a9a2c5b --- /dev/null +++ b/titles/cm/schema/__init__.py @@ -0,0 +1 @@ +__all__ = [] diff --git a/titles/mai2/__init__.py b/titles/mai2/__init__.py index 0d9ea89..27fba3a 100644 --- a/titles/mai2/__init__.py +++ b/titles/mai2/__init__.py @@ -7,4 +7,4 @@ index = Mai2Servlet database = Mai2Data reader = Mai2Reader game_codes = [Mai2Constants.GAME_CODE] -current_schema_version = 2 +current_schema_version = 3 diff --git a/titles/mai2/base.py b/titles/mai2/base.py index 8a48d8b..741ccb6 100644 --- a/titles/mai2/base.py +++ b/titles/mai2/base.py @@ -202,6 +202,16 @@ class Mai2Base: for act in v: self.data.profile.put_profile_activity(user_id, act) + if "userChargeList" in upsert and len(upsert["userChargeList"]) > 0: + for charge in upsert["userChargeList"]: + self.data.item.put_charge( + user_id, + charge["chargeId"], + charge["stock"], + datetime.strptime(charge["purchaseDate"], "%Y-%m-%d %H:%M:%S"), + datetime.strptime(charge["validDate"], "%Y-%m-%d %H:%M:%S") + ) + if upsert["isNewCharacterList"] and int(upsert["isNewCharacterList"]) > 0: for char in upsert["userCharacterList"]: self.data.item.put_character( @@ -299,10 +309,67 @@ class Mai2Base: return {"userId": data["userId"], "userOption": options_dict} def handle_get_user_card_api_request(self, data: Dict) -> Dict: - return {"userId": data["userId"], "nextIndex": 0, "userCardList": []} + user_cards = self.data.item.get_cards(data["userId"]) + if user_cards is None: + return { + "userId": data["userId"], + "nextIndex": 0, + "userCardList": [] + } + + max_ct = data["maxCount"] + next_idx = data["nextIndex"] + start_idx = next_idx + end_idx = max_ct + start_idx + + if len(user_cards[start_idx:]) > max_ct: + next_idx += max_ct + else: + next_idx = 0 + + card_list = [] + for card in user_cards: + tmp = card._asdict() + tmp.pop("id") + tmp.pop("user") + tmp["startDate"] = datetime.strftime( + tmp["startDate"], "%Y-%m-%d %H:%M:%S") + tmp["endDate"] = datetime.strftime( + tmp["endDate"], "%Y-%m-%d %H:%M:%S") + card_list.append(tmp) + + return { + "userId": data["userId"], + "nextIndex": next_idx, + "userCardList": card_list[start_idx:end_idx] + } def handle_get_user_charge_api_request(self, data: Dict) -> Dict: - return {"userId": data["userId"], "length": 0, "userChargeList": []} + user_charges = self.data.item.get_charges(data["userId"]) + if user_charges is None: + return { + "userId": data["userId"], + "length": 0, + "userChargeList": [] + } + + user_charge_list = [] + for charge in user_charges: + tmp = charge._asdict() + tmp.pop("id") + tmp.pop("user") + tmp["purchaseDate"] = datetime.strftime( + tmp["purchaseDate"], "%Y-%m-%d %H:%M:%S") + tmp["validDate"] = datetime.strftime( + tmp["validDate"], "%Y-%m-%d %H:%M:%S") + + user_charge_list.append(tmp) + + return { + "userId": data["userId"], + "length": len(user_charge_list), + "userChargeList": user_charge_list + } def handle_get_user_item_api_request(self, data: Dict) -> Dict: kind = int(data["nextIndex"] / 10000000000) @@ -313,15 +380,13 @@ class Mai2Base: for x in range(next_idx, data["maxCount"]): try: - user_item_list.append( - { - "item_kind": user_items[x]["item_kind"], - "item_id": user_items[x]["item_id"], - "stock": user_items[x]["stock"], - "isValid": user_items[x]["is_valid"], - } - ) - except: + user_item_list.append({ + "itemKind": user_items[x]["itemKind"], + "itemId": user_items[x]["itemId"], + "stock": user_items[x]["stock"], + "isValid": user_items[x]["isValid"] + }) + except IndexError: break if len(user_item_list) == data["maxCount"]: @@ -332,21 +397,18 @@ class Mai2Base: "userId": data["userId"], "nextIndex": next_idx, "itemKind": kind, - "userItemList": user_item_list, + "userItemList": user_item_list } def handle_get_user_character_api_request(self, data: Dict) -> Dict: characters = self.data.item.get_characters(data["userId"]) + chara_list = [] for chara in characters: - chara_list.append( - { - "characterId": chara["character_id"], - "level": chara["level"], - "awakening": chara["awakening"], - "useCount": chara["use_count"], - } - ) + tmp = chara._asdict() + tmp.pop("id") + tmp.pop("user") + chara_list.append(tmp) return {"userId": data["userId"], "userCharacterList": chara_list} @@ -417,10 +479,21 @@ class Mai2Base: tmp.pop("user") mlst.append(tmp) - return {"userActivity": {"playList": plst, "musicList": mlst}} + return { + "userActivity": { + "playList": plst, + "musicList": mlst + } + } def handle_get_user_course_api_request(self, data: Dict) -> Dict: user_courses = self.data.score.get_courses(data["userId"]) + if user_courses is None: + return { + "userId": data["userId"], + "nextIndex": 0, + "userCourseList": [] + } course_list = [] for course in user_courses: @@ -429,7 +502,11 @@ class Mai2Base: tmp.pop("id") course_list.append(tmp) - return {"userId": data["userId"], "nextIndex": 0, "userCourseList": course_list} + return { + "userId": data["userId"], + "nextIndex": 0, + "userCourseList": course_list + } def handle_get_user_portrait_api_request(self, data: Dict) -> Dict: # No support for custom pfps @@ -540,18 +617,11 @@ class Mai2Base: if songs is not None: for song in songs: - music_detail_list.append( - { - "musicId": song["song_id"], - "level": song["chart_id"], - "playCount": song["play_count"], - "achievement": song["achievement"], - "comboStatus": song["combo_status"], - "syncStatus": song["sync_status"], - "deluxscoreMax": song["dx_score"], - "scoreRank": song["score_rank"], - } - ) + tmp = song._asdict() + tmp.pop("id") + tmp.pop("user") + music_detail_list.append(tmp) + if len(music_detail_list) == data["maxCount"]: next_index = data["maxCount"] + data["nextIndex"] break @@ -559,5 +629,5 @@ class Mai2Base: return { "userId": data["userId"], "nextIndex": next_index, - "userMusicList": [{"userMusicDetailList": music_detail_list}], + "userMusicList": [{"userMusicDetailList": music_detail_list}] } diff --git a/titles/mai2/index.py b/titles/mai2/index.py index 0679d1f..3cd1629 100644 --- a/titles/mai2/index.py +++ b/titles/mai2/index.py @@ -89,7 +89,7 @@ class Mai2Servlet: ) def render_POST(self, request: Request, version: int, url_path: str) -> bytes: - if url_path.lower() == "/ping": + if url_path.lower() == "ping": return zlib.compress(b'{"returnCode": "1"}') req_raw = request.content.getvalue() diff --git a/titles/mai2/schema/item.py b/titles/mai2/schema/item.py index 072eb3e..d64d954 100644 --- a/titles/mai2/schema/item.py +++ b/titles/mai2/schema/item.py @@ -1,5 +1,6 @@ from core.data.schema import BaseData, metadata +from datetime import datetime from typing import Optional, Dict, List from sqlalchemy import Table, Column, UniqueConstraint, PrimaryKeyConstraint, and_ from sqlalchemy.types import Integer, String, TIMESTAMP, Boolean, JSON @@ -17,11 +18,11 @@ character = Table( ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False, ), - Column("character_id", Integer, nullable=False), + Column("characterId", Integer, nullable=False), Column("level", Integer, nullable=False, server_default="1"), Column("awakening", Integer, nullable=False, server_default="0"), - Column("use_count", Integer, nullable=False, server_default="0"), - UniqueConstraint("user", "character_id", name="mai2_item_character_uk"), + Column("useCount", Integer, nullable=False, server_default="0"), + UniqueConstraint("user", "characterId", name="mai2_item_character_uk"), mysql_charset="utf8mb4", ) @@ -34,13 +35,13 @@ card = Table( ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False, ), - Column("card_kind", Integer, nullable=False), - Column("card_id", Integer, nullable=False), - Column("chara_id", Integer, nullable=False), - Column("map_id", Integer, nullable=False), - Column("start_date", String(255), nullable=False), - Column("end_date", String(255), nullable=False), - UniqueConstraint("user", "card_kind", "card_id", name="mai2_item_card_uk"), + Column("cardId", Integer, nullable=False), + Column("cardTypeId", Integer, nullable=False), + Column("charaId", Integer, nullable=False), + Column("mapId", Integer, nullable=False), + Column("startDate", TIMESTAMP, server_default="2018-01-01 00:00:00.0"), + Column("endDate", TIMESTAMP, server_default="2038-01-01 00:00:00.0"), + UniqueConstraint("user", "cardId", "cardTypeId", name="mai2_item_card_uk"), mysql_charset="utf8mb4", ) @@ -53,11 +54,11 @@ item = Table( ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False, ), - Column("item_kind", Integer, nullable=False), - Column("item_id", Integer, nullable=False), + Column("itemId", Integer, nullable=False), + Column("itemKind", Integer, nullable=False), Column("stock", Integer, nullable=False, server_default="1"), - Column("is_valid", Boolean, nullable=False, server_default="1"), - UniqueConstraint("user", "item_kind", "item_id", name="mai2_item_item_uk"), + Column("isValid", Boolean, nullable=False, server_default="1"), + UniqueConstraint("user", "itemId", "itemKind", name="mai2_item_item_uk"), mysql_charset="utf8mb4", ) @@ -139,11 +140,44 @@ charge = Table( ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), nullable=False, ), - Column("charge_id", Integer, nullable=False), + Column("chargeId", Integer, nullable=False), Column("stock", Integer, nullable=False), - Column("purchase_date", String(255), nullable=False), - Column("valid_date", String(255), nullable=False), - UniqueConstraint("user", "charge_id", name="mai2_item_charge_uk"), + Column("purchaseDate", String(255), nullable=False), + Column("validDate", String(255), nullable=False), + UniqueConstraint("user", "chargeId", name="mai2_item_charge_uk"), + mysql_charset="utf8mb4", +) + +print_detail = Table( + "mai2_item_print_detail", + metadata, + Column("id", Integer, primary_key=True, nullable=False), + Column( + "user", + ForeignKey("aime_user.id", ondelete="cascade", onupdate="cascade"), + nullable=False, + ), + Column("orderId", Integer), + Column("printNumber", Integer), + Column("printDate", TIMESTAMP, nullable=False, server_default=func.now()), + Column("serialId", String(20), nullable=False), + Column("placeId", Integer, nullable=False), + Column("clientId", String(11), nullable=False), + Column("printerSerialId", String(20), nullable=False), + Column("cardRomVersion", Integer), + Column("isHolograph", Boolean, server_default="1"), + Column("printOption1", Boolean, server_default="0"), + Column("printOption2", Boolean, server_default="0"), + Column("printOption3", Boolean, server_default="0"), + Column("printOption4", Boolean, server_default="0"), + Column("printOption5", Boolean, server_default="0"), + Column("printOption6", Boolean, server_default="0"), + Column("printOption7", Boolean, server_default="0"), + Column("printOption8", Boolean, server_default="0"), + Column("printOption9", Boolean, server_default="0"), + Column("printOption10", Boolean, server_default="0"), + Column("created", String(255), server_default=""), + UniqueConstraint("user", "serialId", name="mai2_item_print_detail_uk"), mysql_charset="utf8mb4", ) @@ -154,15 +188,15 @@ class Mai2ItemData(BaseData): ) -> None: sql = insert(item).values( user=user_id, - item_kind=item_kind, - item_id=item_id, + itemKind=item_kind, + itemId=item_id, stock=stock, - is_valid=is_valid, + isValid=is_valid, ) conflict = sql.on_duplicate_key_update( stock=stock, - is_valid=is_valid, + isValid=is_valid, ) result = self.execute(conflict) @@ -178,7 +212,7 @@ class Mai2ItemData(BaseData): sql = item.select(item.c.user == user_id) else: sql = item.select( - and_(item.c.user == user_id, item.c.item_kind == item_kind) + and_(item.c.user == user_id, item.c.itemKind == item_kind) ) result = self.execute(sql) @@ -190,8 +224,8 @@ class Mai2ItemData(BaseData): sql = item.select( and_( item.c.user == user_id, - item.c.item_kind == item_kind, - item.c.item_id == item_id, + item.c.itemKind == item_kind, + item.c.itemId == item_id, ) ) @@ -382,3 +416,93 @@ class Mai2ItemData(BaseData): if result is None: return None return result.fetchall() + + def put_card( + self, + user_id: int, + card_type_id: int, + card_kind: int, + chara_id: int, + map_id: int, + ) -> Optional[Row]: + sql = insert(card).values( + user=user_id, + cardId=card_type_id, + cardTypeId=card_kind, + charaId=chara_id, + mapId=map_id, + ) + + conflict = sql.on_duplicate_key_update(charaId=chara_id, mapId=map_id) + + result = self.execute(conflict) + if result is None: + self.logger.warn( + f"put_card: failed to insert card! user_id: {user_id}, kind: {kind}" + ) + return None + return result.lastrowid + + def get_cards(self, user_id: int, kind: int = None) -> Optional[Row]: + if kind is None: + sql = card.select(card.c.user == user_id) + else: + sql = card.select(and_(card.c.user == user_id, card.c.cardKind == kind)) + + result = self.execute(sql) + if result is None: + return None + return result.fetchall() + + def put_charge( + self, + user_id: int, + charge_id: int, + stock: int, + purchase_date: datetime, + valid_date: datetime, + ) -> Optional[Row]: + sql = insert(charge).values( + user=user_id, + chargeId=charge_id, + stock=stock, + purchaseDate=purchase_date, + validDate=valid_date, + ) + + conflict = sql.on_duplicate_key_update( + stock=stock, purchaseDate=purchase_date, validDate=valid_date + ) + + result = self.execute(conflict) + if result is None: + self.logger.warn( + f"put_card: failed to insert charge! user_id: {user_id}, chargeId: {charge_id}" + ) + return None + return result.lastrowid + + def get_charges(self, user_id: int) -> Optional[Row]: + sql = charge.select(charge.c.user == user_id) + + result = self.execute(sql) + if result is None: + return None + return result.fetchall() + + def put_user_print_detail( + self, aime_id: int, serial_id: str, user_print_data: Dict + ) -> Optional[int]: + sql = insert(print_detail).values( + user=aime_id, serialId=serial_id, **user_print_data + ) + + conflict = sql.on_duplicate_key_update(**user_print_data) + result = self.execute(conflict) + + if result is None: + self.logger.warn( + f"put_user_print_detail: Failed to insert! aime_id: {aime_id}" + ) + return None + return result.lastrowid diff --git a/titles/mai2/schema/profile.py b/titles/mai2/schema/profile.py index 335a731..1ce8046 100644 --- a/titles/mai2/schema/profile.py +++ b/titles/mai2/schema/profile.py @@ -448,7 +448,9 @@ class Mai2ProfileData(BaseData): return None return result.lastrowid - def get_profile_activity(self, user_id: int, kind: int = None) -> Optional[Row]: + def get_profile_activity( + self, user_id: int, kind: int = None + ) -> Optional[List[Row]]: sql = activity.select( and_( activity.c.user == user_id, @@ -459,4 +461,4 @@ class Mai2ProfileData(BaseData): result = self.execute(sql) if result is None: return None - return result.fetchone() + return result.fetchall() diff --git a/titles/mai2/schema/score.py b/titles/mai2/schema/score.py index 15bf519..4d3291d 100644 --- a/titles/mai2/schema/score.py +++ b/titles/mai2/schema/score.py @@ -242,7 +242,7 @@ class Mai2ScoreData(BaseData): return result.lastrowid def get_courses(self, user_id: int) -> Optional[List[Row]]: - sql = course.select(best_score.c.user == user_id) + sql = course.select(course.c.user == user_id) result = self.execute(sql) if result is None: diff --git a/titles/mai2/schema/static.py b/titles/mai2/schema/static.py index 2908a47..e40e37f 100644 --- a/titles/mai2/schema/static.py +++ b/titles/mai2/schema/static.py @@ -53,6 +53,22 @@ ticket = Table( mysql_charset="utf8mb4", ) +cards = Table( + "mai2_static_cards", + metadata, + Column("id", Integer, primary_key=True, nullable=False), + Column("version", Integer, nullable=False), + Column("cardId", Integer, nullable=False), + Column("cardName", String(255), nullable=False), + Column("startDate", TIMESTAMP, server_default="2018-01-01 00:00:00.0"), + Column("endDate", TIMESTAMP, server_default="2038-01-01 00:00:00.0"), + Column("noticeStartDate", TIMESTAMP, server_default="2018-01-01 00:00:00.0"), + Column("noticeEndDate", TIMESTAMP, server_default="2038-01-01 00:00:00.0"), + Column("enabled", Boolean, server_default="1"), + UniqueConstraint("version", "cardId", "cardName", name="mai2_static_cards_uk"), + mysql_charset="utf8mb4", +) + class Mai2StaticData(BaseData): def put_game_event( @@ -166,6 +182,8 @@ class Mai2StaticData(BaseData): conflict = sql.on_duplicate_key_update(price=ticket_price) + conflict = sql.on_duplicate_key_update(price=ticket_price) + result = self.execute(conflict) if result is None: self.logger.warn(f"Failed to insert charge {ticket_id} type {ticket_type}") @@ -208,3 +226,24 @@ class Mai2StaticData(BaseData): if result is None: return None return result.fetchone() + + def put_card(self, version: int, card_id: int, card_name: str, **card_data) -> int: + sql = insert(cards).values( + version=version, cardId=card_id, cardName=card_name, **card_data + ) + + conflict = sql.on_duplicate_key_update(**card_data) + + result = self.execute(conflict) + if result is None: + self.logger.warn(f"Failed to insert card {card_id}") + return None + return result.lastrowid + + def get_enabled_cards(self, version: int) -> Optional[List[Row]]: + sql = cards.select(and_(cards.c.version == version, cards.c.enabled == True)) + + result = self.execute(sql) + if result is None: + return None + return result.fetchall() diff --git a/titles/mai2/universe.py b/titles/mai2/universe.py index 56c2d3f..56b3e8f 100644 --- a/titles/mai2/universe.py +++ b/titles/mai2/universe.py @@ -1,4 +1,5 @@ from typing import Any, List, Dict +from random import randint from datetime import datetime, timedelta import pytz import json @@ -13,3 +14,176 @@ class Mai2Universe(Mai2Base): def __init__(self, cfg: CoreConfig, game_cfg: Mai2Config) -> None: super().__init__(cfg, game_cfg) self.version = Mai2Constants.VER_MAIMAI_DX_UNIVERSE + + def handle_cm_get_user_preview_api_request(self, data: Dict) -> Dict: + p = self.data.profile.get_profile_detail(data["userId"], self.version) + if p is None: + return {} + + return { + "userName": p["userName"], + "rating": p["playerRating"], + # hardcode lastDataVersion for CardMaker 1.34 + "lastDataVersion": "1.20.00", + "isLogin": False, + "isExistSellingCard": False, + } + + def handle_cm_get_user_data_api_request(self, data: Dict) -> Dict: + # user already exists, because the preview checks that already + p = self.data.profile.get_profile_detail(data["userId"], self.version) + + cards = self.data.card.get_user_cards(data["userId"]) + if cards is None or len(cards) == 0: + # This should never happen + self.logger.error( + f"handle_get_user_data_api_request: Internal error - No cards found for user id {data['userId']}" + ) + return {} + + # get the dict representation of the row so we can modify values + user_data = p._asdict() + + # remove the values the game doesn't want + user_data.pop("id") + user_data.pop("user") + user_data.pop("version") + + return {"userId": data["userId"], "userData": user_data} + + def handle_cm_login_api_request(self, data: Dict) -> Dict: + return {"returnCode": 1} + + def handle_cm_logout_api_request(self, data: Dict) -> Dict: + return {"returnCode": 1} + + def handle_cm_get_selling_card_api_request(self, data: Dict) -> Dict: + selling_cards = self.data.static.get_enabled_cards(self.version) + if selling_cards is None: + return {"length": 0, "sellingCardList": []} + + selling_card_list = [] + for card in selling_cards: + tmp = card._asdict() + tmp.pop("id") + tmp.pop("version") + tmp.pop("cardName") + tmp.pop("enabled") + + tmp["startDate"] = datetime.strftime(tmp["startDate"], "%Y-%m-%d %H:%M:%S") + tmp["endDate"] = datetime.strftime(tmp["endDate"], "%Y-%m-%d %H:%M:%S") + tmp["noticeStartDate"] = datetime.strftime( + tmp["noticeStartDate"], "%Y-%m-%d %H:%M:%S" + ) + tmp["noticeEndDate"] = datetime.strftime( + tmp["noticeEndDate"], "%Y-%m-%d %H:%M:%S" + ) + + selling_card_list.append(tmp) + + return {"length": len(selling_card_list), "sellingCardList": selling_card_list} + + def handle_cm_get_user_card_api_request(self, data: Dict) -> Dict: + user_cards = self.data.item.get_cards(data["userId"]) + if user_cards is None: + return {"returnCode": 1, "length": 0, "nextIndex": 0, "userCardList": []} + + max_ct = data["maxCount"] + next_idx = data["nextIndex"] + start_idx = next_idx + end_idx = max_ct + start_idx + + if len(user_cards[start_idx:]) > max_ct: + next_idx += max_ct + else: + next_idx = 0 + + card_list = [] + for card in user_cards: + tmp = card._asdict() + tmp.pop("id") + tmp.pop("user") + + tmp["startDate"] = datetime.strftime(tmp["startDate"], "%Y-%m-%d %H:%M:%S") + tmp["endDate"] = datetime.strftime(tmp["endDate"], "%Y-%m-%d %H:%M:%S") + card_list.append(tmp) + + return { + "returnCode": 1, + "length": len(card_list[start_idx:end_idx]), + "nextIndex": next_idx, + "userCardList": card_list[start_idx:end_idx], + } + + def handle_cm_get_user_item_api_request(self, data: Dict) -> Dict: + super().handle_get_user_item_api_request(data) + + def handle_cm_get_user_character_api_request(self, data: Dict) -> Dict: + characters = self.data.item.get_characters(data["userId"]) + + chara_list = [] + for chara in characters: + chara_list.append( + { + "characterId": chara["characterId"], + # no clue why those values are even needed + "point": 0, + "count": 0, + "level": chara["level"], + "nextAwake": 0, + "nextAwakePercent": 0, + "favorite": False, + "awakening": chara["awakening"], + "useCount": chara["useCount"], + } + ) + + return { + "returnCode": 1, + "length": len(chara_list), + "userCharacterList": chara_list, + } + + def handle_cm_get_user_card_print_error_api_request(self, data: Dict) -> Dict: + return {"length": 0, "userPrintDetailList": []} + + def handle_cm_upsert_user_print_api_request(self, data: Dict) -> Dict: + user_id = data["userId"] + upsert = data["userPrintDetail"] + + # set a random card serial number + serial_id = "".join([str(randint(0, 9)) for _ in range(20)]) + + user_card = upsert["userCard"] + self.data.item.put_card( + user_id, + user_card["cardId"], + user_card["cardTypeId"], + user_card["charaId"], + user_card["mapId"], + ) + + # properly format userPrintDetail for the database + upsert.pop("userCard") + upsert.pop("serialId") + upsert["printDate"] = datetime.strptime(upsert["printDate"], "%Y-%m-%d") + + self.data.item.put_user_print_detail(user_id, serial_id, upsert) + + return { + "returnCode": 1, + "orderId": 0, + "serialId": serial_id, + "startDate": "2018-01-01 00:00:00", + "endDate": "2038-01-01 00:00:00", + } + + def handle_cm_upsert_user_printlog_api_request(self, data: Dict) -> Dict: + return { + "returnCode": 1, + "orderId": 0, + "serialId": data["userPrintlog"]["serialId"], + } + + def handle_cm_upsert_buy_card_api_request(self, data: Dict) -> Dict: + return {"returnCode": 1} diff --git a/titles/mai2/universeplus.py b/titles/mai2/universeplus.py index 977fce9..54fe896 100644 --- a/titles/mai2/universeplus.py +++ b/titles/mai2/universeplus.py @@ -4,12 +4,19 @@ import pytz import json from core.config import CoreConfig -from titles.mai2.base import Mai2Base +from titles.mai2.universe import Mai2Universe from titles.mai2.const import Mai2Constants from titles.mai2.config import Mai2Config -class Mai2UniversePlus(Mai2Base): +class Mai2UniversePlus(Mai2Universe): def __init__(self, cfg: CoreConfig, game_cfg: Mai2Config) -> None: super().__init__(cfg, game_cfg) self.version = Mai2Constants.VER_MAIMAI_DX_UNIVERSE_PLUS + + def handle_cm_get_user_preview_api_request(self, data: Dict) -> Dict: + user_data = super().handle_cm_get_user_preview_api_request(data) + + # hardcode lastDataVersion for CardMaker 1.35 + user_data["lastDataVersion"] = "1.25.00" + return user_data diff --git a/titles/ongeki/base.py b/titles/ongeki/base.py index 4f7619c..10bb1a8 100644 --- a/titles/ongeki/base.py +++ b/titles/ongeki/base.py @@ -452,7 +452,8 @@ class OngekiBase: tmp.pop("id") items.append(tmp) - xout = kind * 10000000000 + (data["nextIndex"] % 10000000000) + len(items) + xout = kind * 10000000000 + \ + (data["nextIndex"] % 10000000000) + len(items) if len(items) < data["maxCount"] or data["maxCount"] == 0: nextIndex = 0 @@ -851,7 +852,8 @@ class OngekiBase: ) if "userOption" in upsert and len(upsert["userOption"]) > 0: - self.data.profile.put_profile_options(user_id, upsert["userOption"][0]) + self.data.profile.put_profile_options( + user_id, upsert["userOption"][0]) if "userPlaylogList" in upsert: for playlog in upsert["userPlaylogList"]: diff --git a/titles/ongeki/bright.py b/titles/ongeki/bright.py index 4b2a06f..23eeb6c 100644 --- a/titles/ongeki/bright.py +++ b/titles/ongeki/bright.py @@ -93,7 +93,12 @@ class OngekiBright(OngekiBase): def handle_cm_get_user_character_api_request(self, data: Dict) -> Dict: user_characters = self.data.item.get_characters(data["userId"]) if user_characters is None: - return {} + return { + "userId": data["userId"], + "length": 0, + "nextIndex": 0, + "userCharacterList": [] + } max_ct = data["maxCount"] next_idx = data["nextIndex"] @@ -543,7 +548,7 @@ class OngekiBright(OngekiBase): "returnCode": 1, "orderId": 0, "serialId": "11111111111111111111", - "apiName": "CMUpsertUserPrintPlaylogApi", + "apiName": "CMUpsertUserPrintPlaylogApi" } def handle_cm_upsert_user_printlog_api_request(self, data: Dict) -> Dict: @@ -551,7 +556,7 @@ class OngekiBright(OngekiBase): "returnCode": 1, "orderId": 0, "serialId": "11111111111111111111", - "apiName": "CMUpsertUserPrintlogApi", + "apiName": "CMUpsertUserPrintlogApi" } def handle_cm_upsert_user_print_api_request(self, data: Dict) -> Dict: diff --git a/titles/ongeki/brightmemory.py b/titles/ongeki/brightmemory.py index 954d0e5..6e2548b 100644 --- a/titles/ongeki/brightmemory.py +++ b/titles/ongeki/brightmemory.py @@ -142,8 +142,8 @@ class OngekiBrightMemory(OngekiBright): user_data = super().handle_cm_get_user_data_api_request(data) # hardcode Card Maker version for now - # Card Maker 1.34.00 = 1.30.01 - # Card Maker 1.36.00 = 1.35.04 - user_data["userData"]["compatibleCmVersion"] = "1.35.04" + # Card Maker 1.34 = 1.30.01 + # Card Maker 1.35 = 1.35.03 + user_data["userData"]["compatibleCmVersion"] = "1.35.03" return user_data diff --git a/titles/ongeki/index.py b/titles/ongeki/index.py index 07c8ff2..7927d84 100644 --- a/titles/ongeki/index.py +++ b/titles/ongeki/index.py @@ -3,7 +3,8 @@ import json import inflection import yaml import string -import logging, coloredlogs +import logging +import coloredlogs import zlib from logging.handlers import TimedRotatingFileHandler from os import path @@ -93,7 +94,7 @@ class OngekiServlet: ) def render_POST(self, request: Request, version: int, url_path: str) -> bytes: - if url_path.lower() == "/ping": + if url_path.lower() == "ping": return zlib.compress(b'{"returnCode": 1}') req_raw = request.content.getvalue() diff --git a/titles/ongeki/schema/item.py b/titles/ongeki/schema/item.py index d406597..d826fba 100644 --- a/titles/ongeki/schema/item.py +++ b/titles/ongeki/schema/item.py @@ -706,7 +706,7 @@ class OngekiItemData(BaseData): ) conflict = sql.on_duplicate_key_update( - user=aime_id, serialId=serial_id, **user_print_data + user=aime_id, **user_print_data ) result = self.execute(conflict) From 8b718c601f752ace2826a7b16d4e0497d7c62bb7 Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Thu, 16 Mar 2023 21:27:03 -0400 Subject: [PATCH 50/63] chuni: add method hashing support --- titles/chuni/index.py | 76 ++++++++++++++++++++++++++++++------------- 1 file changed, 54 insertions(+), 22 deletions(-) diff --git a/titles/chuni/index.py b/titles/chuni/index.py index b5648fb..dccdd66 100644 --- a/titles/chuni/index.py +++ b/titles/chuni/index.py @@ -8,8 +8,10 @@ import inflection import string from Crypto.Cipher import AES from Crypto.Util.Padding import pad +from Crypto.Protocol.KDF import PBKDF2 +from Crypto.Hash import SHA1 from os import path -from typing import Tuple +from typing import Tuple, Dict from core import CoreConfig, Utils from titles.chuni.config import ChuniConfig @@ -33,27 +35,43 @@ class ChuniServlet: def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None: self.core_cfg = core_cfg self.game_cfg = ChuniConfig() + self.hash_table: Dict[Dict[str, str]] = {} if path.exists(f"{cfg_dir}/{ChuniConstants.CONFIG_NAME}"): self.game_cfg.update( yaml.safe_load(open(f"{cfg_dir}/{ChuniConstants.CONFIG_NAME}")) ) self.versions = [ - ChuniBase(core_cfg, self.game_cfg), - ChuniPlus(core_cfg, self.game_cfg), - ChuniAir(core_cfg, self.game_cfg), - ChuniAirPlus(core_cfg, self.game_cfg), - ChuniStar(core_cfg, self.game_cfg), - ChuniStarPlus(core_cfg, self.game_cfg), - ChuniAmazon(core_cfg, self.game_cfg), - ChuniAmazonPlus(core_cfg, self.game_cfg), - ChuniCrystal(core_cfg, self.game_cfg), - ChuniCrystalPlus(core_cfg, self.game_cfg), - ChuniParadise(core_cfg, self.game_cfg), - ChuniNew(core_cfg, self.game_cfg), - ChuniNewPlus(core_cfg, self.game_cfg), + ChuniBase, + ChuniPlus, + ChuniAir, + ChuniAirPlus, + ChuniStar, + ChuniStarPlus, + ChuniAmazon, + ChuniAmazonPlus, + ChuniCrystal, + ChuniCrystalPlus, + ChuniParadise, + ChuniNew, + ChuniNewPlus, ] + for version, keys in self.game_cfg.crypto.keys.items(): + if len(keys) < 3: + continue + + self.hash_table[version] = {} + + method_list = [method for method in dir(self.versions[version]) if not method.startswith('__')] + for method in method_list: + method_fixed = inflection.camelize(method) + hash = PBKDF2(method_fixed, bytes.fromhex(keys[2]), 128, count=44, hmac_hash_module=SHA1) + + self.hash_table[version][hash.hex()] = method_fixed + + self.logger.debug(f"Hashed v{version} method {method_fixed} with {bytes.fromhex(keys[2])} to get {hash.hex()}") + self.logger = logging.getLogger("chuni") if not hasattr(self.logger, "inited"): @@ -144,25 +162,38 @@ class ChuniServlet: # If we get a 32 character long hex string, it's a hash and we're # doing encrypted. The likelyhood of false positives is low but # technically not 0 - endpoint = request.getHeader("User-Agent").split("#")[0] + if internal_ver < ChuniConstants.VER_CHUNITHM_NEW: + endpoint = request.getHeader("User-Agent").split("#")[0] + + else: + if internal_ver not in self.hash_table: + self.logger.error(f"v{version} does not support encryption or no keys entered") + return zlib.compress(b'{"stat": "0"}') + + elif endpoint.lower() not in self.hash_table[internal_ver]: + self.logger.error(f"No hash found for v{version} endpoint {endpoint}") + return zlib.compress(b'{"stat": "0"}') + + endpoint = self.hash_table[internal_ver][endpoint.lower()] + try: crypt = AES.new( - bytes.fromhex(self.game_cfg.crypto.keys[str(internal_ver)][0]), + bytes.fromhex(self.game_cfg.crypto.keys[internal_ver][0]), AES.MODE_CBC, - bytes.fromhex(self.game_cfg.crypto.keys[str(internal_ver)][1]), + bytes.fromhex(self.game_cfg.crypto.keys[internal_ver][1]), ) req_raw = crypt.decrypt(req_raw) - except: + except Exception as e: self.logger.error( - f"Failed to decrypt v{version} request to {endpoint} -> {req_raw}" + f"Failed to decrypt v{version} request to {endpoint} -> {e}" ) return zlib.compress(b'{"stat": "0"}') encrtped = True - if not encrtped and self.game_cfg.crypto.encrypted_only: + if not encrtped and self.game_cfg.crypto.encrypted_only and internal_ver >= ChuniConstants.VER_CHUNITHM_CRYSTAL_PLUS: self.logger.error( f"Unencrypted v{version} {endpoint} request, but config is set to encrypted only: {req_raw}" ) @@ -185,14 +216,15 @@ class ChuniServlet: self.logger.debug(req_data) func_to_find = "handle_" + inflection.underscore(endpoint) + "_request" + handler_cls = self.versions[internal_ver](self.core_cfg, self.game_cfg) - if not hasattr(self.versions[internal_ver], func_to_find): + if not hasattr(handler_cls, func_to_find): self.logger.warning(f"Unhandled v{version} request {endpoint}") resp = {"returnCode": 1} else: try: - handler = getattr(self.versions[internal_ver], func_to_find) + handler = getattr(handler_cls, func_to_find) resp = handler(req_data) except Exception as e: From 71eec6e34d1e3554e5f04cd9b1193da66de78d2e Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Thu, 16 Mar 2023 21:36:42 -0400 Subject: [PATCH 51/63] fix error if log folder not created or not writeable --- dbutils.py | 13 ++++++++++++- index.py | 12 ++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dbutils.py b/dbutils.py index ea9555a..65b1f8e 100644 --- a/dbutils.py +++ b/dbutils.py @@ -2,7 +2,7 @@ import yaml import argparse from core.config import CoreConfig from core.data import Data -from os import path +from os import path, mkdir, access, W_OK if __name__ == "__main__": parser = argparse.ArgumentParser(description="Database utilities") @@ -33,7 +33,18 @@ if __name__ == "__main__": cfg = CoreConfig() if path.exists(f"{args.config}/core.yaml"): cfg.update(yaml.safe_load(open(f"{args.config}/core.yaml"))) + + if not path.exists(cfg.server.log_dir): + mkdir(cfg.server.log_dir) + + if not access(cfg.server.log_dir, W_OK): + print( + f"Log directory {cfg.server.log_dir} NOT writable, please check permissions" + ) + exit(1) + data = Data(cfg) + if args.action == "create": data.create_database() diff --git a/index.py b/index.py index 0852d06..13d826d 100644 --- a/index.py +++ b/index.py @@ -170,6 +170,12 @@ if __name__ == "__main__": if not path.exists(cfg.server.log_dir): mkdir(cfg.server.log_dir) + if not access(cfg.server.log_dir, W_OK): + print( + f"Log directory {cfg.server.log_dir} NOT writable, please check permissions" + ) + exit(1) + logger = logging.getLogger("core") log_fmt_str = "[%(asctime)s] Core | %(levelname)s | %(message)s" log_fmt = logging.Formatter(log_fmt_str) @@ -189,12 +195,6 @@ if __name__ == "__main__": logger.setLevel(log_lv) coloredlogs.install(level=log_lv, logger=logger, fmt=log_fmt_str) - if not access(cfg.server.log_dir, W_OK): - logger.error( - f"Log directory {cfg.server.log_dir} NOT writable, please check permissions" - ) - exit(1) - if not cfg.aimedb.key: logger.error("!!AIMEDB KEY BLANK, SET KEY IN CORE.YAML!!") exit(1) From a6e9e80bc7a52340578f7472302a368902a0a979 Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Thu, 16 Mar 2023 21:42:43 -0400 Subject: [PATCH 52/63] chuni: fix encryption --- titles/chuni/index.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/titles/chuni/index.py b/titles/chuni/index.py index dccdd66..a47ceda 100644 --- a/titles/chuni/index.py +++ b/titles/chuni/index.py @@ -244,9 +244,9 @@ class ChuniServlet: padded = pad(zipped, 16) crypt = AES.new( - bytes.fromhex(self.game_cfg.crypto.keys[str(internal_ver)][0]), + bytes.fromhex(self.game_cfg.crypto.keys[internal_ver][0]), AES.MODE_CBC, - bytes.fromhex(self.game_cfg.crypto.keys[str(internal_ver)][1]), + bytes.fromhex(self.game_cfg.crypto.keys[internal_ver][1]), ) return crypt.encrypt(padded) From a7db5eed770c4d37af9dd98c3c609f02dd88618f Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Thu, 16 Mar 2023 21:56:36 -0400 Subject: [PATCH 53/63] chuni: fix encryption --- titles/chuni/index.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/titles/chuni/index.py b/titles/chuni/index.py index a47ceda..53db19f 100644 --- a/titles/chuni/index.py +++ b/titles/chuni/index.py @@ -57,21 +57,6 @@ class ChuniServlet: ChuniNewPlus, ] - for version, keys in self.game_cfg.crypto.keys.items(): - if len(keys) < 3: - continue - - self.hash_table[version] = {} - - method_list = [method for method in dir(self.versions[version]) if not method.startswith('__')] - for method in method_list: - method_fixed = inflection.camelize(method) - hash = PBKDF2(method_fixed, bytes.fromhex(keys[2]), 128, count=44, hmac_hash_module=SHA1) - - self.hash_table[version][hash.hex()] = method_fixed - - self.logger.debug(f"Hashed v{version} method {method_fixed} with {bytes.fromhex(keys[2])} to get {hash.hex()}") - self.logger = logging.getLogger("chuni") if not hasattr(self.logger, "inited"): @@ -97,6 +82,21 @@ class ChuniServlet: level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str ) self.logger.inited = True + + for version, keys in self.game_cfg.crypto.keys.items(): + if len(keys) < 3: + continue + + self.hash_table[version] = {} + + method_list = [method for method in dir(self.versions[version]) if not method.startswith('__')] + for method in method_list: + method_fixed = inflection.camelize(method)[6:-7] + hash = PBKDF2(method_fixed, bytes.fromhex(keys[2]), 128, count=44, hmac_hash_module=SHA1) + + self.hash_table[version][hash.hex()] = method_fixed + + self.logger.debug(f"Hashed v{version} method {method_fixed} with {bytes.fromhex(keys[2])} to get {hash.hex()}") @classmethod def get_allnet_info( From 8c5c7f31b68ca3f3b26f2b6cefcad80f8fda85ab Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Thu, 16 Mar 2023 22:31:41 -0400 Subject: [PATCH 54/63] allnet: fix setting=1 --- core/allnet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/allnet.py b/core/allnet.py index 2738c8e..67b47b3 100644 --- a/core/allnet.py +++ b/core/allnet.py @@ -371,7 +371,7 @@ class AllnetPowerOnResponse3: self.utc_time = datetime.now(tz=pytz.timezone("UTC")).strftime( "%Y-%m-%dT%H:%M:%SZ" ) - self.setting = "" + self.setting = "1" self.res_ver = "3" self.token = str(token) From 4bd1dea6bfb9d75fb2f71a437a41a6c2e361d3fe Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Fri, 17 Mar 2023 02:06:15 -0400 Subject: [PATCH 55/63] allnet: add info log to downloadorder --- core/allnet.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/allnet.py b/core/allnet.py index 67b47b3..c028a57 100644 --- a/core/allnet.py +++ b/core/allnet.py @@ -181,7 +181,9 @@ class AllnetServlet: self.logger.error(e) return b"" + self.logger.info(f"DownloadOrder from {request_ip} -> {req.game_id} v{req.ver} serial {req.serial}") resp = AllnetDownloadOrderResponse() + if not self.config.allnet.allow_online_updates: return self.dict_to_http_form_string([vars(resp)]) From 7ca4e6adb93e4fd3ef2e5ffa6665d3d8cd6aba4c Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Fri, 17 Mar 2023 02:11:49 -0400 Subject: [PATCH 56/63] fix IP address logging --- core/allnet.py | 4 ++-- core/frontend.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/allnet.py b/core/allnet.py index c028a57..2afb8cf 100644 --- a/core/allnet.py +++ b/core/allnet.py @@ -192,7 +192,7 @@ class AllnetServlet: def handle_billing_request(self, request: Request, _: Dict): req_dict = self.billing_req_to_dict(request.content.getvalue()) - request_ip = request.getClientAddress() + request_ip = Utils.get_ip_addr(request) if req_dict is None: self.logger.error(f"Failed to parse request {request.content.getvalue()}") return b"" @@ -225,7 +225,7 @@ class AllnetServlet: return self.dict_to_http_form_string([vars(resp)]) msg = ( - f"Billing checkin from {request.getClientIP()}: game {kc_game} keychip {kc_serial} playcount " + f"Billing checkin from {request_ip}: game {kc_game} keychip {kc_serial} playcount " f"{kc_playcount} billing_type {kc_billigtype} nearfull {kc_nearfull} playlimit {kc_playlimit}" ) self.logger.info(msg) diff --git a/core/frontend.py b/core/frontend.py index e230681..127b174 100644 --- a/core/frontend.py +++ b/core/frontend.py @@ -30,7 +30,7 @@ class UserSession(object): class FrontendServlet(resource.Resource): def getChild(self, name: bytes, request: Request): - self.logger.debug(f"{request.getClientIP()} -> {name.decode()}") + self.logger.debug(f"{Utils.get_ip_addr(request)} -> {name.decode()}") if name == b"": return self return resource.Resource.getChild(self, name, request) @@ -84,7 +84,7 @@ class FrontendServlet(resource.Resource): ) def render_GET(self, request): - self.logger.debug(f"{request.getClientIP()} -> {request.uri.decode()}") + self.logger.debug(f"{Utils.get_ip_addr(request)} -> {request.uri.decode()}") template = self.environment.get_template("core/frontend/index.jinja") return template.render( server_name=self.config.server.name, @@ -113,7 +113,7 @@ class FE_Base(resource.Resource): class FE_Gate(FE_Base): def render_GET(self, request: Request): - self.logger.debug(f"{request.getClientIP()} -> {request.uri.decode()}") + self.logger.debug(f"{Utils.get_ip_addr(request)} -> {request.uri.decode()}") uri: str = request.uri.decode() sesh = request.getSession() From 6965132e5b40b5e1ff30121596c0e69c40a8aa53 Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Fri, 17 Mar 2023 02:16:49 -0400 Subject: [PATCH 57/63] chuni: fix hard error caused by not having the db set up --- titles/chuni/base.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/titles/chuni/base.py b/titles/chuni/base.py index 13f423b..3668b29 100644 --- a/titles/chuni/base.py +++ b/titles/chuni/base.py @@ -32,6 +32,9 @@ class ChuniBase: def handle_get_game_charge_api_request(self, data: Dict) -> Dict: game_charge_list = self.data.static.get_enabled_charges(self.version) + + if game_charge_list is None or len(game_charge_list) == 0: + return {"length": 0, "gameChargeList": []} charges = [] for x in range(len(game_charge_list)): @@ -52,6 +55,14 @@ class ChuniBase: def handle_get_game_event_api_request(self, data: Dict) -> Dict: game_events = self.data.static.get_enabled_events(self.version) + if game_events is None or len(game_events) == 0: + self.logger.warn("No enabled events, did you run the reader?") + return { + "type": data["type"], + "length": 0, + "gameEventList": [], + } + event_list = [] for evt_row in game_events: tmp = {} From 5a388e2a24d680ee4d445c12417990ae619b0aa2 Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Fri, 17 Mar 2023 19:53:00 -0400 Subject: [PATCH 58/63] docs: fix casing in game_specific_info.md --- docs/game_specific_info.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/game_specific_info.md b/docs/game_specific_info.md index 8af5541..f028c6c 100644 --- a/docs/game_specific_info.md +++ b/docs/game_specific_info.md @@ -8,13 +8,13 @@ using the megaime database. Clean installations always create the latest databas # Table of content -- [Supported Games](#Supported-Games) - - [Chunithm](#Chunithm) - - [crossbeats REV.](#crossbeats-REV) - - [maimai DX](#maimai-DX) - - [O.N.G.E.K.I.](#ONGEKI) - - [Card Maker](#Card-Maker) - - [WACCA](#WACCA) +- [Supported Games](#supported-games) + - [Chunithm](#chunithm) + - [crossbeats REV.](#crossbeats-rev) + - [maimai DX](#maimai-dx) + - [O.N.G.E.K.I.](#ongeki) + - [Card Maker](#card-maker) + - [WACCA](#wacca) # Supported Games From 401623f20bcea9e48d14023b2170394ad51c664e Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Fri, 17 Mar 2023 20:03:07 -0400 Subject: [PATCH 59/63] docs: fix ongeki anchor in game_specific_info.md --- docs/game_specific_info.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/game_specific_info.md b/docs/game_specific_info.md index f028c6c..b09d61e 100644 --- a/docs/game_specific_info.md +++ b/docs/game_specific_info.md @@ -12,7 +12,7 @@ using the megaime database. Clean installations always create the latest databas - [Chunithm](#chunithm) - [crossbeats REV.](#crossbeats-rev) - [maimai DX](#maimai-dx) - - [O.N.G.E.K.I.](#ongeki) + - [O.N.G.E.K.I.](#o-n-g-e-k-i) - [Card Maker](#card-maker) - [WACCA](#wacca) From 6ff8c4d931a7450126427f4780bfaf3c4fc9b65a Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Sat, 18 Mar 2023 02:12:33 -0400 Subject: [PATCH 60/63] fix mai2 and diva db scripts --- core/data/schema/versions/SBZV_1_rollback.sql | 6 +++--- core/data/schema/versions/SDEZ_2_rollback.sql | 21 +++++++++++++++++++ core/data/schema/versions/SDEZ_3_upgrade.sql | 4 ++-- 3 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 core/data/schema/versions/SDEZ_2_rollback.sql diff --git a/core/data/schema/versions/SBZV_1_rollback.sql b/core/data/schema/versions/SBZV_1_rollback.sql index a7bccce..6389157 100644 --- a/core/data/schema/versions/SBZV_1_rollback.sql +++ b/core/data/schema/versions/SBZV_1_rollback.sql @@ -1,9 +1,9 @@ SET FOREIGN_KEY_CHECKS=0; -ALTER TABLE diva_score DROP COLUMN edition; -ALTER TABLE diva_playlog DROP COLUMN edition; - ALTER TABLE diva_score DROP FOREIGN KEY diva_score_ibfk_1; ALTER TABLE diva_score DROP CONSTRAINT diva_score_uk; ALTER TABLE diva_score ADD CONSTRAINT diva_score_uk UNIQUE (user, pv_id, difficulty); ALTER TABLE diva_score ADD CONSTRAINT diva_score_ibfk_1 FOREIGN KEY (user) REFERENCES aime_user(id) ON DELETE CASCADE; + +ALTER TABLE diva_score DROP COLUMN edition; +ALTER TABLE diva_playlog DROP COLUMN edition; SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file diff --git a/core/data/schema/versions/SDEZ_2_rollback.sql b/core/data/schema/versions/SDEZ_2_rollback.sql new file mode 100644 index 0000000..b631711 --- /dev/null +++ b/core/data/schema/versions/SDEZ_2_rollback.sql @@ -0,0 +1,21 @@ +ALTER TABLE mai2_item_card +CHANGE COLUMN cardId card_id INT NOT NULL AFTER user, +CHANGE COLUMN cardTypeId card_kind INT NOT NULL, +CHANGE COLUMN charaId chara_id INT NOT NULL, +CHANGE COLUMN mapId map_id INT NOT NULL, +CHANGE COLUMN startDate start_date TIMESTAMP NULL DEFAULT '2018-01-01 00:00:00', +CHANGE COLUMN endDate end_date TIMESTAMP NULL DEFAULT '2038-01-01 00:00:00'; + +ALTER TABLE mai2_item_item +CHANGE COLUMN itemId item_id INT NOT NULL AFTER user, +CHANGE COLUMN itemKind item_kind INT NOT NULL, +CHANGE COLUMN isValid is_valid TINYINT(1) NOT NULL DEFAULT '1'; + +ALTER TABLE mai2_item_character +CHANGE COLUMN characterId character_id INT NOT NULL, +CHANGE COLUMN useCount use_count INT NOT NULL DEFAULT '0'; + +ALTER TABLE mai2_item_charge +CHANGE COLUMN chargeId charge_id INT NOT NULL, +CHANGE COLUMN purchaseDate purchase_date TIMESTAMP NOT NULL, +CHANGE COLUMN validDate valid_date TIMESTAMP NOT NULL; \ No newline at end of file diff --git a/core/data/schema/versions/SDEZ_3_upgrade.sql b/core/data/schema/versions/SDEZ_3_upgrade.sql index c13e1fe..bdb5906 100644 --- a/core/data/schema/versions/SDEZ_3_upgrade.sql +++ b/core/data/schema/versions/SDEZ_3_upgrade.sql @@ -3,8 +3,8 @@ CHANGE COLUMN card_id cardId INT NOT NULL AFTER user, CHANGE COLUMN card_kind cardTypeId INT NOT NULL, CHANGE COLUMN chara_id charaId INT NOT NULL, CHANGE COLUMN map_id mapId INT NOT NULL, -CHANGE COLUMN startDate startDate TIMESTAMP NULL DEFAULT '2018-01-01 00:00:00', -CHANGE COLUMN endDate endDate TIMESTAMP NULL DEFAULT '2038-01-01 00:00:00'; +CHANGE COLUMN start_date startDate TIMESTAMP NULL DEFAULT '2018-01-01 00:00:00', +CHANGE COLUMN end_date endDate TIMESTAMP NULL DEFAULT '2038-01-01 00:00:00'; ALTER TABLE mai2_item_item CHANGE COLUMN item_id itemId INT NOT NULL AFTER user, From 188be2dfc16c11efb3b60595b8e260f1c36c7a32 Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Sat, 18 Mar 2023 02:12:58 -0400 Subject: [PATCH 61/63] database: add autoupgrade command --- core/data/database.py | 74 +++++++++++++++++++++++++++++++--------- core/data/schema/base.py | 9 +++++ dbutils.py | 3 ++ 3 files changed, 69 insertions(+), 17 deletions(-) diff --git a/core/data/database.py b/core/data/database.py index 0ce039e..07fe79e 100644 --- a/core/data/database.py +++ b/core/data/database.py @@ -145,25 +145,49 @@ class Data: ) return - if not os.path.exists( - f"core/data/schema/versions/{game.upper()}_{version}_{action}.sql" - ): - self.logger.error( - f"Could not find {action} script {game.upper()}_{version}_{action}.sql in core/data/schema/versions folder" - ) - return + if action == "upgrade": + for x in range(old_ver, version): + if not os.path.exists( + f"core/data/schema/versions/{game.upper()}_{x + 1}_{action}.sql" + ): + self.logger.error( + f"Could not find {action} script {game.upper()}_{x + 1}_{action}.sql in core/data/schema/versions folder" + ) + return - with open( - f"core/data/schema/versions/{game.upper()}_{version}_{action}.sql", - "r", - encoding="utf-8", - ) as f: - sql = f.read() + with open( + f"core/data/schema/versions/{game.upper()}_{x + 1}_{action}.sql", + "r", + encoding="utf-8", + ) as f: + sql = f.read() - result = self.base.execute(sql) - if result is None: - self.logger.error("Error execuing sql script!") - return None + result = self.base.execute(sql) + if result is None: + self.logger.error("Error execuing sql script!") + return None + + else: + for x in range(old_ver, version, -1): + if not os.path.exists( + f"core/data/schema/versions/{game.upper()}_{x - 1}_{action}.sql" + ): + self.logger.error( + f"Could not find {action} script {game.upper()}_{x - 1}_{action}.sql in core/data/schema/versions folder" + ) + return + + with open( + f"core/data/schema/versions/{game.upper()}_{x - 1}_{action}.sql", + "r", + encoding="utf-8", + ) as f: + sql = f.read() + + result = self.base.execute(sql) + if result is None: + self.logger.error("Error execuing sql script!") + return None result = self.base.set_schema_ver(version, game) if result is None: @@ -237,3 +261,19 @@ class Data: if not cards: self.logger.info(f"Delete hanging user {user['id']}") self.user.delete_user(user["id"]) + + def autoupgrade(self) -> None: + all_games = self.base.get_all_schema_vers() + if all_games is None: + self.logger.warn("Failed to get schema versions") + + for x in all_games: + game = x["game"].upper() + update_ver = 1 + for y in range(2, 100): + if os.path.exists(f"core/data/schema/versions/{game}_{y}_upgrade.sql"): + update_ver = y + else: + break + + self.migrate_database(game, update_ver, "upgrade") \ No newline at end of file diff --git a/core/data/schema/base.py b/core/data/schema/base.py index 9899f29..f77a9aa 100644 --- a/core/data/schema/base.py +++ b/core/data/schema/base.py @@ -2,6 +2,7 @@ import json import logging from random import randrange from typing import Any, Optional, Dict, List +from sqlalchemy.engine import Row from sqlalchemy.engine.cursor import CursorResult from sqlalchemy.engine.base import Connection from sqlalchemy.sql import text, func, select @@ -80,6 +81,14 @@ class BaseData: Generate a random 5-7 digit id """ return randrange(10000, 9999999) + + def get_all_schema_vers(self) -> Optional[List[Row]]: + sql = select(schema_ver) + + result = self.execute(sql) + if result is None: + return None + return result.fetchall() def get_schema_ver(self, game: str) -> Optional[int]: sql = select(schema_ver).where(schema_ver.c.game == game) diff --git a/dbutils.py b/dbutils.py index 65b1f8e..176c67e 100644 --- a/dbutils.py +++ b/dbutils.py @@ -64,6 +64,9 @@ if __name__ == "__main__": else: data.migrate_database(args.game, int(args.version), args.action) + elif args.action == "autoupgrade": + data.autoupgrade() + elif args.action == "create-owner": data.create_owner(args.email) From 62b62db5b58c8c63b93644e5518b8e89af67e983 Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Sat, 18 Mar 2023 12:26:57 -0400 Subject: [PATCH 62/63] wacca: fix favorites, purchasing and unlocking songs, incorrectly displayed grades --- titles/wacca/base.py | 23 ++++++++--------------- titles/wacca/handlers/helpers.py | 16 +++++++++++++++- titles/wacca/handlers/user_info.py | 6 +++--- titles/wacca/index.py | 2 +- 4 files changed, 27 insertions(+), 20 deletions(-) diff --git a/titles/wacca/base.py b/titles/wacca/base.py index bc0c09a..275f380 100644 --- a/titles/wacca/base.py +++ b/titles/wacca/base.py @@ -635,14 +635,14 @@ class WaccaBase: new_tickets.append([ticket["id"], ticket["ticket_id"], 9999999999]) for item in req.itemsUsed: - if item.itemType == WaccaConstants.ITEM_TYPES["wp"]: + if item.itemType == WaccaConstants.ITEM_TYPES["wp"] and not self.game_config.mods.infinite_wp: if current_wp >= item.quantity: current_wp -= item.quantity self.data.profile.spend_wp(req.profileId, item.quantity) else: return BaseResponse().make() - elif item.itemType == WaccaConstants.ITEM_TYPES["ticket"]: + elif item.itemType == WaccaConstants.ITEM_TYPES["ticket"] and not self.game_config.mods.infinite_tickets: for x in range(len(new_tickets)): if new_tickets[x][1] == item.itemId: self.data.item.spend_ticket(new_tickets[x][0]) @@ -880,7 +880,7 @@ class WaccaBase: user_id = profile["user"] resp.currentWp = profile["wp"] - if req.purchaseType == PurchaseType.PurchaseTypeWP: + if req.purchaseType == PurchaseType.PurchaseTypeWP and not self.game_config.mods.infinite_wp: resp.currentWp -= req.cost self.data.profile.spend_wp(req.profileId, req.cost) @@ -1070,19 +1070,12 @@ class WaccaBase: ): if item.quantity > WaccaConstants.Difficulty.HARD.value: old_score = self.data.score.get_best_score( - user_id, item.itemId, item.quantity + user_id, item.itemId, item.quantity + ) + if not old_score: + self.data.score.put_best_score( + user_id, item.itemId, item.quantity, 0, [0] * 5, [0] * 13, 0, 0 ) - if not old_score: - self.data.score.put_best_score( - user_id, - item.itemId, - item.quantity, - 0, - [0] * 5, - [0] * 13, - 0, - 0, - ) if item.quantity == 0: item.quantity = WaccaConstants.Difficulty.HARD.value diff --git a/titles/wacca/handlers/helpers.py b/titles/wacca/handlers/helpers.py index 9e9847a..02b8bd7 100644 --- a/titles/wacca/handlers/helpers.py +++ b/titles/wacca/handlers/helpers.py @@ -577,7 +577,21 @@ class SongDetailGradeCountsV2(SongDetailGradeCountsV1): self.ssspCt = counts[12] def make(self) -> List: - return super().make() + [self.spCt, self.sspCt, self.ssspCt] + return [ + self.dCt, + self.cCt, + self.bCt, + self.aCt, + self.aaCt, + self.aaaCt, + self.sCt, + self.spCt, + self.ssCt, + self.sspCt, + self.sssCt, + self.ssspCt, + self.masterCt, + ] class BestScoreDetailV1: diff --git a/titles/wacca/handlers/user_info.py b/titles/wacca/handlers/user_info.py index 8c67db9..bf6b74b 100644 --- a/titles/wacca/handlers/user_info.py +++ b/titles/wacca/handlers/user_info.py @@ -11,9 +11,9 @@ class UserInfoUpdateRequest(BaseRequest): self.profileId = int(self.params[0]) self.optsUpdated: List[UserOption] = [] self.unknown2: List = self.params[2] - self.datesUpdated: List[DateUpdate] = [] - self.favoritesAdded: List[int] = self.params[4] - self.favoritesRemoved: List[int] = self.params[5] + self.datesUpdated: List[DateUpdate] = [] + self.favoritesRemoved: List[int] = self.params[4] + self.favoritesAdded: List[int] = self.params[5] for x in self.params[1]: self.optsUpdated.append(UserOption(x[0], x[1])) diff --git a/titles/wacca/index.py b/titles/wacca/index.py index 0b51849..a59cda1 100644 --- a/titles/wacca/index.py +++ b/titles/wacca/index.py @@ -102,7 +102,7 @@ class WaccaServlet: resp.message = "不正なリクエスト エラーです" return end(resp.make()) - if "/api/" in url_path: + if "api/" in url_path: func_to_find = ( "handle_" + url_path.partition("api/")[2].replace("/", "_") + "_request" ) From dfd38778892f5d2d36e0ea3b59ad7d49fb7375a3 Mon Sep 17 00:00:00 2001 From: Kevin Trocolli Date: Sat, 18 Mar 2023 12:55:04 -0400 Subject: [PATCH 63/63] wacca: rename locked -> lock_state in MusicUpdateDetailV1 --- titles/wacca/handlers/helpers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/titles/wacca/handlers/helpers.py b/titles/wacca/handlers/helpers.py index 02b8bd7..f86be2f 100644 --- a/titles/wacca/handlers/helpers.py +++ b/titles/wacca/handlers/helpers.py @@ -942,7 +942,7 @@ class MusicUpdateDetailV1: self.score = 0 self.lowestMissCount = 0 self.maxSkillPts = 0 - self.locked = 0 + self.lock_state = 0 def make(self) -> List: return [ @@ -954,7 +954,7 @@ class MusicUpdateDetailV1: self.score, self.lowestMissCount, self.maxSkillPts, - self.locked, + self.lock_state, ]