mirror of
https://gitea.tendokyu.moe/Hay1tsme/artemis.git
synced 2026-02-14 19:57:27 +08:00
begin move
This commit is contained in:
@@ -83,18 +83,18 @@ class WaccaBase:
|
||||
else:
|
||||
self.region_id = WaccaConstants.Region[prefecture_name]
|
||||
|
||||
def handle_housing_get_request(self, data: Dict) -> Dict:
|
||||
async 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:
|
||||
async def handle_advertise_GetRanking_request(self, data: Dict) -> Dict:
|
||||
req = AdvertiseGetRankingRequest(data)
|
||||
return AdvertiseGetRankingResponse().make()
|
||||
|
||||
def handle_housing_start_request(self, data: Dict) -> Dict:
|
||||
async def handle_housing_start_request(self, data: Dict) -> Dict:
|
||||
req = HousingStartRequestV1(data)
|
||||
allnet_region_id = None
|
||||
|
||||
@@ -126,16 +126,16 @@ class WaccaBase:
|
||||
resp = HousingStartResponseV1(region_id)
|
||||
return resp.make()
|
||||
|
||||
def handle_advertise_GetNews_request(self, data: Dict) -> Dict:
|
||||
async def handle_advertise_GetNews_request(self, data: Dict) -> Dict:
|
||||
resp = GetNewsResponseV1()
|
||||
return resp.make()
|
||||
|
||||
def handle_user_status_logout_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_status_logout_request(self, data: Dict) -> Dict:
|
||||
req = UserStatusLogoutRequest(data)
|
||||
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:
|
||||
async def handle_user_status_get_request(self, data: Dict) -> Dict:
|
||||
req = UserStatusGetRequest(data)
|
||||
resp = UserStatusGetV1Response()
|
||||
|
||||
@@ -181,7 +181,7 @@ class WaccaBase:
|
||||
|
||||
return resp.make()
|
||||
|
||||
def handle_user_status_login_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_status_login_request(self, data: Dict) -> Dict:
|
||||
req = UserStatusLoginRequest(data)
|
||||
resp = UserStatusLoginResponseV1()
|
||||
is_consec_day = True
|
||||
@@ -227,7 +227,7 @@ class WaccaBase:
|
||||
|
||||
return resp.make()
|
||||
|
||||
def handle_user_status_create_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_status_create_request(self, data: Dict) -> Dict:
|
||||
req = UserStatusCreateRequest(data)
|
||||
|
||||
profileId = self.data.profile.create_profile(
|
||||
@@ -268,7 +268,7 @@ class WaccaBase:
|
||||
|
||||
return UserStatusCreateResponseV2(profileId, req.username).make()
|
||||
|
||||
def handle_user_status_getDetail_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_status_getDetail_request(self, data: Dict) -> Dict:
|
||||
req = UserStatusGetDetailRequest(data)
|
||||
resp = UserStatusGetDetailResponseV1()
|
||||
|
||||
@@ -433,7 +433,7 @@ class WaccaBase:
|
||||
|
||||
return resp.make()
|
||||
|
||||
def handle_user_trial_get_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_trial_get_request(self, data: Dict) -> Dict:
|
||||
req = UserTrialGetRequest(data)
|
||||
resp = UserTrialGetResponse()
|
||||
|
||||
@@ -475,7 +475,7 @@ class WaccaBase:
|
||||
|
||||
return resp.make()
|
||||
|
||||
def handle_user_trial_update_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_trial_update_request(self, data: Dict) -> Dict:
|
||||
req = UserTrialUpdateRequest(data)
|
||||
|
||||
total_score = 0
|
||||
@@ -571,7 +571,7 @@ class WaccaBase:
|
||||
)
|
||||
return BaseResponse().make()
|
||||
|
||||
def handle_user_sugoroku_update_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_sugoroku_update_request(self, data: Dict) -> Dict:
|
||||
ver_split = data["appVersion"].split(".")
|
||||
resp = BaseResponse()
|
||||
|
||||
@@ -603,10 +603,10 @@ class WaccaBase:
|
||||
)
|
||||
return resp.make()
|
||||
|
||||
def handle_user_info_getMyroom_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_info_getMyroom_request(self, data: Dict) -> Dict:
|
||||
return UserInfogetMyroomResponseV1().make()
|
||||
|
||||
def handle_user_music_unlock_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_music_unlock_request(self, data: Dict) -> Dict:
|
||||
req = UserMusicUnlockRequest(data)
|
||||
|
||||
profile = self.data.profile.get_profile(req.profileId)
|
||||
@@ -672,12 +672,12 @@ class WaccaBase:
|
||||
|
||||
return UserMusicUnlockResponse(current_wp, new_tickets).make()
|
||||
|
||||
def handle_user_info_getRanking_request(self, data: Dict) -> Dict:
|
||||
async 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:
|
||||
async def handle_user_music_update_request(self, data: Dict) -> Dict:
|
||||
ver_split = data["appVersion"].split(".")
|
||||
if int(ver_split[0]) >= 3:
|
||||
resp = UserMusicUpdateResponseV3()
|
||||
@@ -831,18 +831,18 @@ class WaccaBase:
|
||||
return resp.make()
|
||||
|
||||
# TODO: Coop and vs data
|
||||
def handle_user_music_updateCoop_request(self, data: Dict) -> Dict:
|
||||
async 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:
|
||||
async 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:
|
||||
async 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:
|
||||
async def handle_user_mission_update_request(self, data: Dict) -> Dict:
|
||||
req = UserMissionUpdateRequest(data)
|
||||
page_status = req.params[1][1]
|
||||
|
||||
@@ -860,7 +860,7 @@ class WaccaBase:
|
||||
|
||||
return BaseResponse().make()
|
||||
|
||||
def handle_user_goods_purchase_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_goods_purchase_request(self, data: Dict) -> Dict:
|
||||
req = UserGoodsPurchaseRequest(data)
|
||||
resp = UserGoodsPurchaseResponse()
|
||||
|
||||
@@ -905,13 +905,13 @@ class WaccaBase:
|
||||
|
||||
return resp.make()
|
||||
|
||||
def handle_competition_status_login_request(self, data: Dict) -> Dict:
|
||||
async def handle_competition_status_login_request(self, data: Dict) -> Dict:
|
||||
return BaseResponse().make()
|
||||
|
||||
def handle_competition_status_update_request(self, data: Dict) -> Dict:
|
||||
async def handle_competition_status_update_request(self, data: Dict) -> Dict:
|
||||
return BaseResponse().make()
|
||||
|
||||
def handle_user_rating_update_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_rating_update_request(self, data: Dict) -> Dict:
|
||||
req = UserRatingUpdateRequest(data)
|
||||
|
||||
user_id = self.data.profile.profile_to_aime_user(req.profileId)
|
||||
@@ -931,7 +931,7 @@ class WaccaBase:
|
||||
|
||||
return BaseResponse().make()
|
||||
|
||||
def handle_user_status_update_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_status_update_request(self, data: Dict) -> Dict:
|
||||
req = UserStatusUpdateRequestV1(data)
|
||||
|
||||
user_id = self.data.profile.profile_to_aime_user(req.profileId)
|
||||
@@ -970,7 +970,7 @@ class WaccaBase:
|
||||
)
|
||||
return BaseResponse().make()
|
||||
|
||||
def handle_user_info_update_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_info_update_request(self, data: Dict) -> Dict:
|
||||
req = UserInfoUpdateRequest(data)
|
||||
|
||||
user_id = self.data.profile.profile_to_aime_user(req.profileId)
|
||||
@@ -989,7 +989,7 @@ class WaccaBase:
|
||||
|
||||
return BaseResponse().make()
|
||||
|
||||
def handle_user_vip_get_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_vip_get_request(self, data: Dict) -> Dict:
|
||||
req = UserVipGetRequest(data)
|
||||
resp = UserVipGetResponse()
|
||||
|
||||
@@ -1021,7 +1021,7 @@ class WaccaBase:
|
||||
|
||||
return resp.make()
|
||||
|
||||
def handle_user_vip_start_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_vip_start_request(self, data: Dict) -> Dict:
|
||||
req = UserVipStartRequest(data)
|
||||
|
||||
profile = self.data.profile.get_profile(req.profileId)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import yaml
|
||||
import jinja2
|
||||
from twisted.web.http import Request
|
||||
from starlette.requests import Request
|
||||
from os import path
|
||||
from twisted.web.server import Session
|
||||
|
||||
|
||||
@@ -1,16 +1,19 @@
|
||||
from starlette.routing import Route
|
||||
import yaml
|
||||
import logging, coloredlogs
|
||||
from logging.handlers import TimedRotatingFileHandler
|
||||
import logging
|
||||
import json
|
||||
from hashlib import md5
|
||||
from twisted.web.http import Request
|
||||
from starlette.requests import Request
|
||||
from starlette.responses import JSONResponse, Response
|
||||
from typing import Dict, Tuple, List
|
||||
from os import path
|
||||
import traceback
|
||||
import sys
|
||||
|
||||
from core import CoreConfig, Utils
|
||||
from core.title import BaseServlet
|
||||
from .config import WaccaConfig
|
||||
from .config import WaccaConfig
|
||||
from .const import WaccaConstants
|
||||
@@ -23,7 +26,7 @@ from .handlers.base import BaseResponse, BaseRequest
|
||||
from .handlers.helpers import Version
|
||||
|
||||
|
||||
class WaccaServlet:
|
||||
class WaccaServlet(BaseServlet):
|
||||
def __init__(self, core_cfg: CoreConfig, cfg_dir: str) -> None:
|
||||
self.core_cfg = core_cfg
|
||||
self.game_cfg = WaccaConfig()
|
||||
@@ -62,15 +65,12 @@ class WaccaServlet:
|
||||
coloredlogs.install(
|
||||
level=self.game_cfg.server.loglevel, logger=self.logger, fmt=log_fmt_str
|
||||
)
|
||||
|
||||
def get_endpoint_matchers(self) -> Tuple[List[Tuple[str, str, Dict]], List[Tuple[str, str, Dict]]]:
|
||||
return (
|
||||
[],
|
||||
[
|
||||
("render_POST", "/WaccaServlet/api/{api}/{endpoint}", {}),
|
||||
("render_POST", "/WaccaServlet/api/{api}/{branch}/{endpoint}", {})
|
||||
]
|
||||
)
|
||||
|
||||
def get_routes(self) -> List[Route]:
|
||||
return [
|
||||
Route("/WaccaServlet/api/{api:str}/{endpoint:str}", self.render_POST, methods=['POST']),
|
||||
Route("/WaccaServlet/api/{api:str}/{branch:str}/{endpoint:str}", self.render_POST, methods=['POST']),
|
||||
]
|
||||
|
||||
@classmethod
|
||||
def is_game_enabled(cls, game_code: str, core_cfg: CoreConfig, cfg_dir: str) -> bool:
|
||||
@@ -88,22 +88,22 @@ class WaccaServlet:
|
||||
def get_allnet_info(self, game_code: str, game_ver: int, keychip: str) -> Tuple[str, str]:
|
||||
if not self.core_cfg.server.is_using_proxy and Utils.get_title_port(self.core_cfg) != 80:
|
||||
return (
|
||||
f"http://{self.core_cfg.title.hostname}:{Utils.get_title_port(self.core_cfg)}/WaccaServlet",
|
||||
self.core_cfg.title.hostname,
|
||||
f"http://{self.core_cfg.server.hostname}:{Utils.get_title_port(self.core_cfg)}/WaccaServlet",
|
||||
self.core_cfg.server.hostname,
|
||||
)
|
||||
|
||||
return (f"http://{self.core_cfg.title.hostname}/WaccaServlet", self.core_cfg.title.hostname)
|
||||
return (f"http://{self.core_cfg.server.hostname}/WaccaServlet", self.core_cfg.server.hostname)
|
||||
|
||||
def render_POST(self, request: Request, game_code: str, matchers: Dict) -> bytes:
|
||||
async def render_POST(self, request: Request) -> bytes:
|
||||
def end(resp: Dict) -> bytes:
|
||||
hash = md5(json.dumps(resp, ensure_ascii=False).encode()).digest()
|
||||
request.responseHeaders.addRawHeader(b"X-Wacca-Hash", hash.hex().encode())
|
||||
return json.dumps(resp).encode()
|
||||
return JSONResponse(resp, headers=["X-Wacca-Hash", hash.hex()])
|
||||
|
||||
api = matchers['api']
|
||||
branch = matchers.get('branch', '')
|
||||
endpoint = matchers['endpoint']
|
||||
api = request.path_params.get('api', '')
|
||||
branch = request.path_params.get('branch', '')
|
||||
endpoint = request.path_params.get('endpoint', '')
|
||||
client_ip = Utils.get_ip_addr(request)
|
||||
bod = await request.body()
|
||||
|
||||
if branch:
|
||||
url_path = f"{api}/{branch}/{endpoint}"
|
||||
@@ -114,13 +114,13 @@ class WaccaServlet:
|
||||
func_to_find = f"handle_{api}_{endpoint}_request"
|
||||
|
||||
try:
|
||||
req_json = json.loads(request.content.getvalue())
|
||||
req_json = json.loads(bod)
|
||||
version_full = Version(req_json["appVersion"])
|
||||
req = BaseRequest(req_json)
|
||||
|
||||
except KeyError as e:
|
||||
self.logger.error(
|
||||
f"Failed to parse request to {request.content.getvalue()} -> Missing required value {e}"
|
||||
f"Failed to parse request to {bod} -> Missing required value {e}"
|
||||
)
|
||||
resp = BaseResponse()
|
||||
resp.status = 1
|
||||
@@ -129,7 +129,7 @@ class WaccaServlet:
|
||||
|
||||
except Exception as e:
|
||||
self.logger.error(
|
||||
f"Failed to parse request to {url_path} -> {request.content.getvalue()} -> {e}"
|
||||
f"Failed to parse request to {url_path} -> {bod} -> {e}"
|
||||
)
|
||||
resp = BaseResponse()
|
||||
resp.status = 1
|
||||
@@ -176,7 +176,7 @@ class WaccaServlet:
|
||||
|
||||
try:
|
||||
handler = getattr(self.versions[internal_ver], func_to_find)
|
||||
resp = handler(req_json)
|
||||
resp = await handler(req_json)
|
||||
|
||||
self.logger.debug(f"{req.appVersion} response {resp}")
|
||||
return end(resp)
|
||||
|
||||
@@ -37,13 +37,13 @@ class WaccaLily(WaccaS):
|
||||
(210003, 0),
|
||||
]
|
||||
|
||||
def handle_advertise_GetNews_request(self, data: Dict) -> Dict:
|
||||
async def handle_advertise_GetNews_request(self, data: Dict) -> Dict:
|
||||
resp = GetNewsResponseV3()
|
||||
return resp.make()
|
||||
|
||||
def handle_user_status_create_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_status_create_request(self, data: Dict) -> Dict:
|
||||
req = UserStatusCreateRequest(data)
|
||||
ret = super().handle_user_status_create_request(data)
|
||||
ret = await super().handle_user_status_create_request(data)
|
||||
|
||||
new_user = self.data.profile.get_profile(aime_id=req.aimeId)
|
||||
|
||||
@@ -64,7 +64,7 @@ class WaccaLily(WaccaS):
|
||||
|
||||
return ret
|
||||
|
||||
def handle_user_status_get_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_status_get_request(self, data: Dict) -> Dict:
|
||||
req = UserStatusGetRequest(data)
|
||||
resp = UserStatusGetV2Response()
|
||||
|
||||
@@ -145,7 +145,7 @@ class WaccaLily(WaccaS):
|
||||
|
||||
return resp.make()
|
||||
|
||||
def handle_user_status_login_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_status_login_request(self, data: Dict) -> Dict:
|
||||
req = UserStatusLoginRequest(data)
|
||||
resp = UserStatusLoginResponseV2()
|
||||
is_consec_day = True
|
||||
@@ -189,7 +189,7 @@ class WaccaLily(WaccaS):
|
||||
|
||||
return resp.make()
|
||||
|
||||
def handle_user_status_getDetail_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_status_getDetail_request(self, data: Dict) -> Dict:
|
||||
req = UserStatusGetDetailRequest(data)
|
||||
if req.appVersion.minor >= 53:
|
||||
resp = UserStatusGetDetailResponseV3()
|
||||
@@ -440,10 +440,10 @@ class WaccaLily(WaccaS):
|
||||
|
||||
return resp.make()
|
||||
|
||||
def handle_user_info_getMyroom_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_info_getMyroom_request(self, data: Dict) -> Dict:
|
||||
return UserInfogetMyroomResponseV2().make()
|
||||
|
||||
def handle_user_status_update_request(self, data: Dict) -> Dict:
|
||||
async 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(
|
||||
|
||||
@@ -39,7 +39,7 @@ class WaccaLilyR(WaccaLily):
|
||||
(210003, 0),
|
||||
]
|
||||
|
||||
def handle_housing_start_request(self, data: Dict) -> Dict:
|
||||
async def handle_housing_start_request(self, data: Dict) -> Dict:
|
||||
req = HousingStartRequestV2(data)
|
||||
allnet_region_id = None
|
||||
|
||||
@@ -71,9 +71,9 @@ class WaccaLilyR(WaccaLily):
|
||||
resp = HousingStartResponseV1(region_id)
|
||||
return resp.make()
|
||||
|
||||
def handle_user_status_create_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_status_create_request(self, data: Dict) -> Dict:
|
||||
req = UserStatusCreateRequest(data)
|
||||
resp = super().handle_user_status_create_request(data)
|
||||
resp = await super().handle_user_status_create_request(data)
|
||||
|
||||
self.data.item.put_item(
|
||||
req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 210054
|
||||
@@ -102,5 +102,5 @@ class WaccaLilyR(WaccaLily):
|
||||
|
||||
return resp
|
||||
|
||||
def handle_user_status_logout_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_status_logout_request(self, data: Dict) -> Dict:
|
||||
return BaseResponse().make()
|
||||
|
||||
@@ -47,12 +47,12 @@ class WaccaReverse(WaccaLilyR):
|
||||
(310006, 0),
|
||||
]
|
||||
|
||||
def handle_user_status_login_request(self, data: Dict) -> Dict:
|
||||
resp = super().handle_user_status_login_request(data)
|
||||
async def handle_user_status_login_request(self, data: Dict) -> Dict:
|
||||
resp = await super().handle_user_status_login_request(data)
|
||||
resp["params"].append([])
|
||||
return resp
|
||||
|
||||
def handle_user_status_getDetail_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_status_getDetail_request(self, data: Dict) -> Dict:
|
||||
req = UserStatusGetDetailRequest(data)
|
||||
resp = UserStatusGetDetailResponseV4()
|
||||
|
||||
@@ -305,9 +305,9 @@ class WaccaReverse(WaccaLilyR):
|
||||
|
||||
return resp.make()
|
||||
|
||||
def handle_user_status_create_request(self, data: Dict) -> Dict:
|
||||
async def handle_user_status_create_request(self, data: Dict) -> Dict:
|
||||
req = UserStatusCreateRequest(data)
|
||||
resp = super().handle_user_status_create_request(data)
|
||||
resp = await super().handle_user_status_create_request(data)
|
||||
|
||||
self.data.item.put_item(
|
||||
req.aimeId, WaccaConstants.ITEM_TYPES["navigator"], 310001
|
||||
|
||||
@@ -31,6 +31,6 @@ class WaccaS(WaccaBase):
|
||||
super().__init__(cfg, game_cfg)
|
||||
self.version = WaccaConstants.VER_WACCA_S
|
||||
|
||||
def handle_advertise_GetNews_request(self, data: Dict) -> Dict:
|
||||
async def handle_advertise_GetNews_request(self, data: Dict) -> Dict:
|
||||
resp = GetNewsResponseV2()
|
||||
return resp.make()
|
||||
|
||||
Reference in New Issue
Block a user