begin move

titles/mai2/base.py

@@ -26,12 +26,12 @@ class Mai2Base:
         self.date_time_format = "%Y-%m-%d %H:%M:%S"
 
         if not self.core_config.server.is_using_proxy and Utils.get_title_port(self.core_config) != 80:
-            self.old_server = f"http://{self.core_config.title.hostname}:{Utils.get_title_port(cfg)}/197/MaimaiServlet/"
+            self.old_server = f"http://{self.core_config.server.hostname}:{Utils.get_title_port(cfg)}/197/MaimaiServlet/"
 
         else:
-            self.old_server = f"http://{self.core_config.title.hostname}/197/MaimaiServlet/"
+            self.old_server = f"http://{self.core_config.server.hostname}/197/MaimaiServlet/"
 
-    def handle_get_game_setting_api_request(self, data: Dict):
+    async def handle_get_game_setting_api_request(self, data: Dict):
         # if reboot start/end time is not defined use the default behavior of being a few hours ago
         if self.core_config.title.reboot_start_time == "" or self.core_config.title.reboot_end_time == "":
             reboot_start = datetime.strftime(
@@ -74,14 +74,14 @@ class Mai2Base:
             },
         }
 
-    def handle_get_game_ranking_api_request(self, data: Dict) -> Dict:
+    async def handle_get_game_ranking_api_request(self, data: Dict) -> Dict:
         return {"length": 0, "gameRankingList": []}
 
-    def handle_get_game_tournament_info_api_request(self, data: Dict) -> Dict:
+    async def handle_get_game_tournament_info_api_request(self, data: Dict) -> Dict:
         # TODO: Tournament support
         return {"length": 0, "gameTournamentInfoList": []}
 
-    def handle_get_game_event_api_request(self, data: Dict) -> Dict:
+    async 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 or not events:
@@ -108,10 +108,10 @@ class Mai2Base:
             "gameEventList": events_lst,
         }
 
-    def handle_get_game_ng_music_id_api_request(self, data: Dict) -> Dict:
+    async 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:
+    async 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": []}
@@ -130,19 +130,19 @@ class Mai2Base:
 
         return {"length": len(charge_list), "gameChargeList": charge_list}
 
-    def handle_upsert_client_setting_api_request(self, data: Dict) -> Dict:
+    async def handle_upsert_client_setting_api_request(self, data: Dict) -> Dict:
         return {"returnCode": 1, "apiName": "UpsertClientSettingApi"}
 
-    def handle_upsert_client_upload_api_request(self, data: Dict) -> Dict:
+    async def handle_upsert_client_upload_api_request(self, data: Dict) -> Dict:
         return {"returnCode": 1, "apiName": "UpsertClientUploadApi"}
 
-    def handle_upsert_client_bookkeeping_api_request(self, data: Dict) -> Dict:
+    async def handle_upsert_client_bookkeeping_api_request(self, data: Dict) -> Dict:
         return {"returnCode": 1, "apiName": "UpsertClientBookkeepingApi"}
 
-    def handle_upsert_client_testmode_api_request(self, data: Dict) -> Dict:
+    async def handle_upsert_client_testmode_api_request(self, data: Dict) -> Dict:
         return {"returnCode": 1, "apiName": "UpsertClientTestmodeApi"}
 
-    def handle_get_user_preview_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_preview_api_request(self, data: Dict) -> Dict:
         p = self.data.profile.get_profile_detail(data["userId"], self.version, False)
         w = self.data.profile.get_web_option(data["userId"], self.version)
         if p is None or w is None:
@@ -169,7 +169,7 @@ class Mai2Base:
             "totalLv": profile["totalLv"],
         }
 
-    def handle_user_login_api_request(self, data: Dict) -> Dict:
+    async def handle_user_login_api_request(self, data: Dict) -> Dict:
         profile = self.data.profile.get_profile_detail(data["userId"], self.version)
         consec = self.data.profile.get_consec_login(data["userId"], self.version)
 
@@ -210,7 +210,7 @@ class Mai2Base:
             "consecutiveLoginCount": consec_ct, # Number of consecutive days we've logged in.
         }
 
-    def handle_upload_user_playlog_api_request(self, data: Dict) -> Dict:
+    async def handle_upload_user_playlog_api_request(self, data: Dict) -> Dict:
         user_id = data["userId"]
         playlog = data["userPlaylog"]
 
@@ -218,7 +218,7 @@ class Mai2Base:
 
         return {"returnCode": 1, "apiName": "UploadUserPlaylogApi"}
 
-    def handle_upsert_user_chargelog_api_request(self, data: Dict) -> Dict:
+    async def handle_upsert_user_chargelog_api_request(self, data: Dict) -> Dict:
         user_id = data["userId"]
         charge = data["userCharge"]
 
@@ -234,7 +234,7 @@ class Mai2Base:
 
         return {"returnCode": 1, "apiName": "UpsertUserChargelogApi"}
 
-    def handle_upsert_user_all_api_request(self, data: Dict) -> Dict:
+    async def handle_upsert_user_all_api_request(self, data: Dict) -> Dict:
         user_id = data["userId"]
         upsert = data["upsertUserAll"]
         
@@ -375,10 +375,10 @@ class Mai2Base:
 
         return {"returnCode": 1, "apiName": "UpsertUserAllApi"}
 
-    def handle_user_logout_api_request(self, data: Dict) -> Dict:
+    async def handle_user_logout_api_request(self, data: Dict) -> Dict:
         return {"returnCode": 1}
 
-    def handle_get_user_data_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_data_api_request(self, data: Dict) -> Dict:
         profile = self.data.profile.get_profile_detail(data["userId"], self.version, False)
         if profile is None:
             return
@@ -390,7 +390,7 @@ class Mai2Base:
 
         return {"userId": data["userId"], "userData": profile_dict}
 
-    def handle_get_user_extend_api_request(self, data: Dict) -> Dict:
+    async 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
@@ -402,7 +402,7 @@ class Mai2Base:
 
         return {"userId": data["userId"], "userExtend": extend_dict}
 
-    def handle_get_user_option_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_option_api_request(self, data: Dict) -> Dict:
         options = self.data.profile.get_profile_option(data["userId"], self.version, False)
         if options is None:
             return
@@ -414,7 +414,7 @@ class Mai2Base:
 
         return {"userId": data["userId"], "userOption": options_dict}
 
-    def handle_get_user_card_api_request(self, data: Dict) -> Dict:
+    async 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 {"userId": data["userId"], "nextIndex": 0, "userCardList": []}
@@ -448,7 +448,7 @@ class Mai2Base:
             "userCardList": card_list[start_idx:end_idx],
         }
 
-    def handle_get_user_charge_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_charge_api_request(self, data: Dict) -> Dict:
         user_charges = self.data.item.get_charges(data["userId"])
         if user_charges is None:
             return {"userId": data["userId"], "length": 0, "userChargeList": []}
@@ -467,16 +467,16 @@ class Mai2Base:
             "userChargeList": user_charge_list,
         }
 
-    def handle_get_user_present_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_present_api_request(self, data: Dict) -> Dict:
         return { "userId": data.get("userId", 0), "length": 0, "userPresentList": []}
     
-    def handle_get_transfer_friend_api_request(self, data: Dict) -> Dict:
+    async def handle_get_transfer_friend_api_request(self, data: Dict) -> Dict:
         return {}
 
-    def handle_get_user_present_event_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_present_event_api_request(self, data: Dict) -> Dict:
         return { "userId": data.get("userId", 0), "length": 0, "userPresentEventList": []}
     
-    def handle_get_user_boss_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_boss_api_request(self, data: Dict) -> Dict:
         b = self.data.profile.get_boss_list(data["userId"])
         if b is None:
             return { "userId": data.get("userId", 0), "userBossData": {}}
@@ -486,7 +486,7 @@ class Mai2Base:
 
         return { "userId": data.get("userId", 0), "userBossData": boss_lst}
 
-    def handle_get_user_item_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_item_api_request(self, data: Dict) -> Dict:
         kind = int(data["nextIndex"] / 10000000000)
         next_idx = int(data["nextIndex"] % 10000000000)
         user_item_list = self.data.item.get_items(data["userId"], kind)
@@ -514,7 +514,7 @@ class Mai2Base:
             "userItemList": items,
         }
 
-    def handle_get_user_character_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_character_api_request(self, data: Dict) -> Dict:
         characters = self.data.item.get_characters(data["userId"])
 
         chara_list = []
@@ -528,7 +528,7 @@ class Mai2Base:
 
         return {"userId": data["userId"], "userCharacterList": chara_list}
 
-    def handle_get_user_favorite_api_request(self, data: Dict) -> Dict:
+    async 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
@@ -545,7 +545,7 @@ class Mai2Base:
 
         return {"userId": data["userId"], "userFavoriteData": userFavs}
 
-    def handle_get_user_ghost_api_request(self, data: Dict) -> Dict:
+    async 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
@@ -557,7 +557,7 @@ class Mai2Base:
 
         return {"userId": data["userId"], "userGhost": ghost_dict}
 
-    def handle_get_user_recent_rating_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_recent_rating_api_request(self, data: Dict) -> Dict:
         rating = self.data.profile.get_recent_rating(data["userId"])
         if rating is None:
             return
@@ -567,7 +567,7 @@ class Mai2Base:
         
         return {"userId": data["userId"], "length": len(lst), "userRecentRatingList": lst}
 
-    def handle_get_user_rating_api_request(self, data: Dict) -> Dict:
+    async 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
@@ -579,7 +579,7 @@ class Mai2Base:
 
         return {"userId": data["userId"], "userRating": rating_dict}
 
-    def handle_get_user_activity_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_activity_api_request(self, data: Dict) -> Dict:
         """
         kind 1 is playlist, kind 2 is music list
         """
@@ -607,7 +607,7 @@ class Mai2Base:
 
         return {"userActivity": {"playList": plst, "musicList": mlst}}
 
-    def handle_get_user_course_api_request(self, data: Dict) -> Dict:
+    async 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": []}
@@ -621,11 +621,11 @@ class Mai2Base:
 
         return {"userId": data["userId"], "nextIndex": 0, "userCourseList": course_list}
 
-    def handle_get_user_portrait_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_portrait_api_request(self, data: Dict) -> Dict:
         # No support for custom pfps
         return {"length": 0, "userPortraitList": []}
 
-    def handle_get_user_friend_season_ranking_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_friend_season_ranking_api_request(self, data: Dict) -> Dict:
         friend_season_ranking = self.data.item.get_friend_season_ranking(data["userId"])
         if friend_season_ranking is None:
             return {
@@ -661,7 +661,7 @@ class Mai2Base:
             "userFriendSeasonRankingList": friend_season_ranking_list,
         }
 
-    def handle_get_user_map_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_map_api_request(self, data: Dict) -> Dict:
         maps = self.data.item.get_maps(data["userId"])
         if maps is None:
             return {
@@ -694,7 +694,7 @@ class Mai2Base:
             "userMapList": map_list,
         }
 
-    def handle_get_user_login_bonus_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_login_bonus_api_request(self, data: Dict) -> Dict:
         login_bonuses = self.data.item.get_login_bonuses(data["userId"])
         if login_bonuses is None:
             return {
@@ -727,10 +727,10 @@ class Mai2Base:
             "userLoginBonusList": login_bonus_list,
         }
 
-    def handle_get_user_region_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_region_api_request(self, data: Dict) -> Dict:
         return {"userId": data["userId"], "length": 0, "userRegionList": []}
     
-    def handle_get_user_web_option_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_web_option_api_request(self, data: Dict) -> Dict:
         w = self.data.profile.get_web_option(data["userId"], self.version)
         if  w is None:
             return {"userId": data["userId"], "userWebOption": {}}
@@ -742,10 +742,10 @@ class Mai2Base:
 
         return {"userId": data["userId"], "userWebOption": web_opt}
 
-    def handle_get_user_survival_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_survival_api_request(self, data: Dict) -> Dict:
         return {"userId": data["userId"], "length": 0, "userSurvivalList": []}
 
-    def handle_get_user_grade_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_grade_api_request(self, data: Dict) -> Dict:
         g = self.data.profile.get_grade_status(data["userId"])
         if g is None:
             return {"userId": data["userId"], "userGradeStatus": {}, "length": 0, "userGradeList": []}
@@ -755,7 +755,7 @@ class Mai2Base:
 
         return {"userId": data["userId"], "userGradeStatus": grade_stat, "length": 0, "userGradeList": []}
 
-    def handle_get_user_music_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_music_api_request(self, data: Dict) -> Dict:
         user_id = data.get("userId", 0)        
         next_index = data.get("nextIndex", 0)
         max_ct = data.get("maxCount", 50)
@@ -794,10 +794,10 @@ class Mai2Base:
             "userMusicList": [{"userMusicDetailList": music_detail_list}],
         }
 
-    def handle_upload_user_portrait_api_request(self, data: Dict) -> Dict:
+    async def handle_upload_user_portrait_api_request(self, data: Dict) -> Dict:
         self.logger.debug(data)
 
-    def handle_upload_user_photo_api_request(self, data: Dict) -> Dict:
+    async def handle_upload_user_photo_api_request(self, data: Dict) -> Dict:
         if not self.game_config.uploads.photos or not self.game_config.uploads.photos_dir:
             return {'returnCode': 0, 'apiName': 'UploadUserPhotoApi'}
 

titles/mai2/dx.py

@@ -15,7 +15,7 @@ class Mai2DX(Mai2Base):
         super().__init__(cfg, game_cfg)
         self.version = Mai2Constants.VER_MAIMAI_DX
 
-    def handle_get_game_setting_api_request(self, data: Dict):
+    async def handle_get_game_setting_api_request(self, data: Dict):
         return {
             "gameSetting": {
                 "isMaintenance": False,
@@ -33,7 +33,7 @@ class Mai2DX(Mai2Base):
             "isAouAccession": False,
         }
 
-    def handle_get_user_preview_api_request(self, data: Dict) -> Dict:
+    async 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:
@@ -69,7 +69,7 @@ class Mai2DX(Mai2Base):
             else 0,  # New with uni+
         }
 
-    def handle_upload_user_playlog_api_request(self, data: Dict) -> Dict:
+    async def handle_upload_user_playlog_api_request(self, data: Dict) -> Dict:
         user_id = data["userId"]
         playlog = data["userPlaylog"]
 
@@ -77,7 +77,7 @@ class Mai2DX(Mai2Base):
 
         return {"returnCode": 1, "apiName": "UploadUserPlaylogApi"}
 
-    def handle_upsert_user_chargelog_api_request(self, data: Dict) -> Dict:
+    async def handle_upsert_user_chargelog_api_request(self, data: Dict) -> Dict:
         user_id = data["userId"]
         charge = data["userCharge"]
 
@@ -93,7 +93,7 @@ class Mai2DX(Mai2Base):
 
         return {"returnCode": 1, "apiName": "UpsertUserChargelogApi"}
 
-    def handle_upsert_user_all_api_request(self, data: Dict) -> Dict:
+    async def handle_upsert_user_all_api_request(self, data: Dict) -> Dict:
         user_id = data["userId"]
         upsert = data["upsertUserAll"]
         
@@ -215,7 +215,7 @@ class Mai2DX(Mai2Base):
 
         return {"returnCode": 1, "apiName": "UpsertUserAllApi"}
 
-    def handle_get_user_data_api_request(self, data: Dict) -> Dict:
+    async 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
@@ -227,7 +227,7 @@ class Mai2DX(Mai2Base):
 
         return {"userId": data["userId"], "userData": profile_dict}
 
-    def handle_get_user_extend_api_request(self, data: Dict) -> Dict:
+    async 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
@@ -239,7 +239,7 @@ class Mai2DX(Mai2Base):
 
         return {"userId": data["userId"], "userExtend": extend_dict}
 
-    def handle_get_user_option_api_request(self, data: Dict) -> Dict:
+    async 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
@@ -251,7 +251,7 @@ class Mai2DX(Mai2Base):
 
         return {"userId": data["userId"], "userOption": options_dict}
 
-    def handle_get_user_card_api_request(self, data: Dict) -> Dict:
+    async 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 {"userId": data["userId"], "nextIndex": 0, "userCardList": []}
@@ -285,7 +285,7 @@ class Mai2DX(Mai2Base):
             "userCardList": card_list[start_idx:end_idx],
         }
 
-    def handle_get_user_charge_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_charge_api_request(self, data: Dict) -> Dict:
         user_charges = self.data.item.get_charges(data["userId"])
         if user_charges is None:
             return {"userId": data["userId"], "length": 0, "userChargeList": []}
@@ -310,7 +310,7 @@ class Mai2DX(Mai2Base):
             "userChargeList": user_charge_list,
         }
 
-    def handle_get_user_item_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_item_api_request(self, data: Dict) -> Dict:
         kind = int(data["nextIndex"] / 10000000000)
         next_idx = int(data["nextIndex"] % 10000000000)
         user_item_list = self.data.item.get_items(data["userId"], kind)
@@ -338,7 +338,7 @@ class Mai2DX(Mai2Base):
             "userItemList": items,
         }
 
-    def handle_get_user_character_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_character_api_request(self, data: Dict) -> Dict:
         characters = self.data.item.get_characters(data["userId"])
 
         chara_list = []
@@ -350,7 +350,7 @@ class Mai2DX(Mai2Base):
 
         return {"userId": data["userId"], "userCharacterList": chara_list}
 
-    def handle_get_user_favorite_api_request(self, data: Dict) -> Dict:
+    async 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
@@ -367,7 +367,7 @@ class Mai2DX(Mai2Base):
 
         return {"userId": data["userId"], "userFavoriteData": userFavs}
 
-    def handle_get_user_ghost_api_request(self, data: Dict) -> Dict:
+    async 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
@@ -379,7 +379,7 @@ class Mai2DX(Mai2Base):
 
         return {"userId": data["userId"], "userGhost": ghost_dict}
 
-    def handle_get_user_rating_api_request(self, data: Dict) -> Dict:
+    async 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
@@ -391,7 +391,7 @@ class Mai2DX(Mai2Base):
 
         return {"userId": data["userId"], "userRating": rating_dict}
 
-    def handle_get_user_activity_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_activity_api_request(self, data: Dict) -> Dict:
         """
         kind 1 is playlist, kind 2 is music list
         """
@@ -419,7 +419,7 @@ class Mai2DX(Mai2Base):
 
         return {"userActivity": {"playList": plst, "musicList": mlst}}
 
-    def handle_get_user_course_api_request(self, data: Dict) -> Dict:
+    async 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": []}
@@ -433,11 +433,11 @@ class Mai2DX(Mai2Base):
 
         return {"userId": data["userId"], "nextIndex": 0, "userCourseList": course_list}
 
-    def handle_get_user_portrait_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_portrait_api_request(self, data: Dict) -> Dict:
         # No support for custom pfps
         return {"length": 0, "userPortraitList": []}
 
-    def handle_get_user_friend_season_ranking_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_friend_season_ranking_api_request(self, data: Dict) -> Dict:
         friend_season_ranking = self.data.item.get_friend_season_ranking(data["userId"])
         if friend_season_ranking is None:
             return {
@@ -473,7 +473,7 @@ class Mai2DX(Mai2Base):
             "userFriendSeasonRankingList": friend_season_ranking_list,
         }
 
-    def handle_get_user_map_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_map_api_request(self, data: Dict) -> Dict:
         maps = self.data.item.get_maps(data["userId"])
         if maps is None:
             return {
@@ -506,7 +506,7 @@ class Mai2DX(Mai2Base):
             "userMapList": map_list,
         }
 
-    def handle_get_user_login_bonus_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_login_bonus_api_request(self, data: Dict) -> Dict:
         login_bonuses = self.data.item.get_login_bonuses(data["userId"])
         if login_bonuses is None:
             return {
@@ -539,7 +539,7 @@ class Mai2DX(Mai2Base):
             "userLoginBonusList": login_bonus_list,
         }
 
-    def handle_get_user_region_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_region_api_request(self, data: Dict) -> Dict:
         """
         class UserRegionList:
             regionId: int
@@ -548,7 +548,7 @@ class Mai2DX(Mai2Base):
         """
         return {"userId": data["userId"], "length": 0, "userRegionList": []}
 
-    def handle_get_user_rival_data_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_rival_data_api_request(self, data: Dict) -> Dict:
         user_id = data["userId"]
         rival_id = data["rivalId"]
 
@@ -559,7 +559,7 @@ class Mai2DX(Mai2Base):
         """
         return {"userId": user_id, "userRivalData": {}}
 
-    def handle_get_user_rival_music_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_rival_music_api_request(self, data: Dict) -> Dict:
         user_id = data["userId"]
         rival_id = data["rivalId"]
         next_idx = data["nextIndex"]
@@ -577,7 +577,7 @@ class Mai2DX(Mai2Base):
         """
         return {"userId": user_id, "nextIndex": 0, "userRivalMusicList": []}
 
-    def handle_get_user_music_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_music_api_request(self, data: Dict) -> Dict:
         user_id = data.get("userId", 0)        
         next_index = data.get("nextIndex", 0)
         max_ct = data.get("maxCount", 50)
@@ -616,8 +616,8 @@ class Mai2DX(Mai2Base):
             "userMusicList": [{"userMusicDetailList": music_detail_list}],
         }
 
-    def handle_user_login_api_request(self, data: Dict) -> Dict:
-        ret = super().handle_user_login_api_request(data)
+    async def handle_user_login_api_request(self, data: Dict) -> Dict:
+        ret = await super().handle_user_login_api_request(data)
         if ret is None or not ret:
             return ret
         ret['loginId'] = ret.get('loginCount', 0)

titles/mai2/festival.py

@@ -11,26 +11,26 @@ class Mai2Festival(Mai2UniversePlus):
         super().__init__(cfg, game_cfg)
         self.version = Mai2Constants.VER_MAIMAI_DX_FESTIVAL
 
-    def handle_cm_get_user_preview_api_request(self, data: Dict) -> Dict:
-        user_data = super().handle_cm_get_user_preview_api_request(data)
+    async def handle_cm_get_user_preview_api_request(self, data: Dict) -> Dict:
+        user_data = await super().handle_cm_get_user_preview_api_request(data)
 
         # hardcode lastDataVersion for CardMaker
         user_data["lastDataVersion"] = "1.30.00"
         return user_data
 
-    def handle_user_login_api_request(self, data: Dict) -> Dict:
-        user_login = super().handle_user_login_api_request(data)
+    async def handle_user_login_api_request(self, data: Dict) -> Dict:
+        user_login = await super().handle_user_login_api_request(data)
         # useless?
         user_login["Bearer"] = "ARTEMiSTOKEN"
         return user_login
 
-    def handle_get_user_recommend_rate_music_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_recommend_rate_music_api_request(self, data: Dict) -> Dict:
         """
         userRecommendRateMusicIdList: list[int]
         """
         return {"userId": data["userId"], "userRecommendRateMusicIdList": []}
 
-    def handle_get_user_recommend_select_music_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_recommend_select_music_api_request(self, data: Dict) -> Dict:
         """
         userRecommendSelectionMusicIdList: list[int]
         """

titles/mai2/festivalplus.py

@@ -11,14 +11,14 @@ class Mai2FestivalPlus(Mai2Festival):
         super().__init__(cfg, game_cfg)
         self.version = Mai2Constants.VER_MAIMAI_DX_FESTIVAL_PLUS
 
-    def handle_cm_get_user_preview_api_request(self, data: Dict) -> Dict:
-        user_data = super().handle_cm_get_user_preview_api_request(data)
+    async def handle_cm_get_user_preview_api_request(self, data: Dict) -> Dict:
+        user_data = await super().handle_cm_get_user_preview_api_request(data)
 
         # hardcode lastDataVersion for CardMaker
         user_data["lastDataVersion"] = "1.35.00"
         return user_data
 
-    def handle_get_user_favorite_item_api_request(self, data: Dict) -> Dict:
+    async def handle_get_user_favorite_item_api_request(self, data: Dict) -> Dict:
         user_id = data.get("userId", 0)
         kind = data.get("kind", 2)
         next_index = data.get("nextIndex", 0)

titles/mai2/index.py

@@ -1,9 +1,9 @@
-from twisted.web.http import Request
-from twisted.web.server import NOT_DONE_YET
+from starlette.requests import Request
+from starlette.responses import Response, JSONResponse
+from starlette.routing import Route
 import json
 import inflection
 import yaml
-import string
 import logging, coloredlogs
 import zlib
 from logging.handlers import TimedRotatingFileHandler
@@ -101,33 +101,29 @@ class Mai2Servlet(BaseServlet):
         
         return True
     
-    def get_endpoint_matchers(self) -> Tuple[List[Tuple[str, str, Dict]], List[Tuple[str, str, Dict]]]:
-        return (
-            [
-                ("handle_movie", "/{version}/MaimaiServlet/api/movie/{endpoint}", {}),
-                ("handle_old_srv", "/{version}/MaimaiServlet/old/{endpoint}", {}),
-                ("handle_old_srv_userdata", "/{version}/MaimaiServlet/old/{endpoint}/{placeid}/{keychip}/{userid}", {}),
-                ("handle_old_srv_userdata", "/{version}/MaimaiServlet/old/{endpoint}/{userid}", {}),
-                ("handle_usbdl", "/{version}/MaimaiServlet/usbdl/{endpoint}", {}),
-                ("handle_deliver", "/{version}/MaimaiServlet/deliver/{endpoint}", {}),
-            ], 
-            [
-                ("handle_movie", "/{version}/MaimaiServlet/api/movie/{endpoint}", {}),
-                ("handle_mai", "/{version}/MaimaiServlet/{endpoint}", {}),
-                ("handle_mai2", "/{version}/Maimai2Servlet/{endpoint}", {}),
-            ]
-        )
-    
+    def get_routes(self) -> List[Route]:
+        return [
+            Route("/{version:int}/MaimaiServlet/api/movie/{endpoint:str}", self.handle_movie, methods=['GET', 'POST']),
+            Route("/{version:int}/MaimaiServlet/old/{endpoint:str}", self.handle_old_srv),
+            Route("/{version:int}/MaimaiServlet/old/{endpoint:str}/{placeid:str}/{keychip:str}/{userid:int}", self.handle_old_srv_userdata),
+            Route("/{version:int}/MaimaiServlet/old/{endpoint:str}/{userid:int}", self.handle_old_srv_userdata),
+            Route("/{version:int}/MaimaiServlet/old/{endpoint:str}/{userid:int}", self.handle_old_srv_userdata),
+            Route("/{version:int}/MaimaiServlet/usbdl/{endpoint:str}", self.handle_usbdl),
+            Route("/{version:int}/MaimaiServlet/deliver/{endpoint:str}", self.handle_deliver),
+            Route("/{version:int}/MaimaiServlet/{endpoint:str}", self.handle_mai, methods=['POST']),
+            Route("/{version:int}/Maimai2Servlet/{endpoint:str}", self.handle_mai2, methods=['POST']),
+        ]
+        
     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)}/{game_ver}/",
-                f"{self.core_cfg.title.hostname}",
+                f"http://{self.core_cfg.server.hostname}:{Utils.get_title_port(self.core_cfg)}/{game_ver}/",
+                f"{self.core_cfg.server.hostname}",
             )
 
         return (
-            f"http://{self.core_cfg.title.hostname}/{game_ver}/",
-            f"{self.core_cfg.title.hostname}",
+            f"http://{self.core_cfg.server.hostname}/{game_ver}/",
+            f"{self.core_cfg.server.hostname}",
         )
 
     def setup(self):
@@ -155,13 +151,22 @@ class Mai2Servlet(BaseServlet):
                     f"Failed to make movie upload directory at {self.game_cfg.uploads.movies_dir}"
                 )
 
-    def handle_mai(self, request: Request, game_code: str, matchers: Dict) -> bytes:
-        endpoint = matchers['endpoint']
-        version = int(matchers['version'])
+    async def handle_movie(self, request: Request):
+        return JSONResponse()
+    
+    async def handle_usbdl(self, request: Request):
+        return Response("OK")
+
+    async def handle_deliver(self, request: Request):
+        return Response(status_code=404)
+
+    async def handle_mai(self, request: Request) -> bytes:
+        endpoint: str = request.path_params.get('endpoint')
+        version: int = request.path_params.get('version')
         if endpoint.lower() == "ping":
-            return zlib.compress(b'{"returnCode": "1"}')
+            return Response(zlib.compress(b'{"returnCode": "1"}'))
         
-        req_raw = request.content.getvalue()
+        req_raw = await request.body()
         internal_ver = 0
         client_ip = Utils.get_ip_addr(request)
         
@@ -199,7 +204,7 @@ class Mai2Servlet(BaseServlet):
             self.logger.error(
                 f"Failed to decompress v{version} {endpoint} request -> {e}"
             )
-            return zlib.compress(b'{"stat": "0"}')
+            return Response(zlib.compress(b'{"stat": "0"}'))
 
         req_data = json.loads(unzip)
 
@@ -216,26 +221,26 @@ class Mai2Servlet(BaseServlet):
         else:
             try:
                 handler = getattr(handler_cls, func_to_find)
-                resp = handler(req_data)
+                resp = await handler(req_data)
 
             except Exception as e:
                 self.logger.error(f"Error handling v{version} method {endpoint} - {e}")
-                return zlib.compress(b'{"returnCode": "0"}')
+                return Response(zlib.compress(b'{"returnCode": "0"}'))
 
         if resp == None:
             resp = {"returnCode": 1}
 
         self.logger.debug(f"Response {resp}")
 
-        return zlib.compress(json.dumps(resp, ensure_ascii=False).encode("utf-8"))
+        return Response(zlib.compress(json.dumps(resp, ensure_ascii=False).encode("utf-8")))
 
-    def handle_mai2(self, request: Request, game_code: str, matchers: Dict) -> bytes:
-        endpoint = matchers['endpoint']
-        version = int(matchers['version'])
+    async def handle_mai2(self, request: Request) -> bytes:
+        endpoint: str = request.path_params.get('endpoint')
+        version: int = request.path_params.get('version')
         if endpoint.lower() == "ping":
-            return zlib.compress(b'{"returnCode": "1"}')
+            return Response(zlib.compress(b'{"returnCode": "1"}'))
 
-        req_raw = request.content.getvalue()
+        req_raw = await request.body()
         internal_ver = 0
         client_ip = Utils.get_ip_addr(request)
         if version < 105:  # 1.0
@@ -256,17 +261,17 @@ class Mai2Servlet(BaseServlet):
             internal_ver = Mai2Constants.VER_MAIMAI_DX_FESTIVAL_PLUS
 
         if (
-            request.getHeader("Mai-Encoding") is not None
-            or request.getHeader("X-Mai-Encoding") is not None
+            request.headers.get("Mai-Encoding") is not None
+            or request.headers.get("X-Mai-Encoding") is not None
         ):
             # The has is some flavor of MD5 of the endpoint with a constant bolted onto the end of it.
             # See cake.dll's Obfuscator function for details. Hopefully most DLL edits will remove
             # these two(?) headers to not cause issues, but given the general quality of SEGA data...
-            enc_ver = request.getHeader("Mai-Encoding")
+            enc_ver = request.headers.get("Mai-Encoding")
             if enc_ver is None:
-                enc_ver = request.getHeader("X-Mai-Encoding")
+                enc_ver = request.headers.get("X-Mai-Encoding")
             self.logger.debug(
-                f"Encryption v{enc_ver} - User-Agent: {request.getHeader('User-Agent')}"
+                f"Encryption v{enc_ver} - User-Agent: {request.headers.get('User-Agent')}"
             )
 
         try:
@@ -276,7 +281,7 @@ class Mai2Servlet(BaseServlet):
             self.logger.error(
                 f"Failed to decompress v{version} {endpoint} request -> {e}"
             )
-            return zlib.compress(b'{"stat": "0"}')
+            return Response(zlib.compress(b'{"stat": "0"}'))
 
         req_data = json.loads(unzip)
 
@@ -293,80 +298,27 @@ class Mai2Servlet(BaseServlet):
         else:
             try:
                 handler = getattr(handler_cls, func_to_find)
-                resp = handler(req_data)
+                resp = await handler(req_data)
 
             except Exception as e:
                 self.logger.error(f"Error handling v{version} method {endpoint} - {e}")
-                return zlib.compress(b'{"stat": "0"}')
+                return Response(zlib.compress(b'{"stat": "0"}'))
 
         if resp == None:
             resp = {"returnCode": 1}
 
         self.logger.debug(f"Response {resp}")
 
-        return zlib.compress(json.dumps(resp, ensure_ascii=False).encode("utf-8"))
+        return Response(zlib.compress(json.dumps(resp, ensure_ascii=False).encode("utf-8")))
 
-    def handle_old_srv(self, request: Request, game_code: str, matchers: Dict) -> bytes:
-        endpoint = matchers['endpoint']
-        version = matchers['version']
+    async def handle_old_srv(self, request: Request) -> bytes:
+        endpoint = request.path_params.get('endpoint')
+        version = request.path_params.get('version')
         self.logger.info(f"v{version} old server {endpoint}")
-        return zlib.compress(b"ok")
+        return Response(zlib.compress(b"ok"))
 
-    def handle_old_srv_userdata(self, request: Request, game_code: str, matchers: Dict) -> bytes:
-        endpoint = matchers['endpoint']
-        version = matchers['version']
+    async def handle_old_srv_userdata(self, request: Request) -> bytes:
+        endpoint = request.path_params.get('endpoint')
+        version = request.path_params.get('version')
         self.logger.info(f"v{version} old server {endpoint}")
-        return zlib.compress(b"{}")
-
-    def render_GET(self, request: Request, version: int, url_path: str) -> bytes:
-        self.logger.debug(f"v{version} GET {url_path}")
-        url_split = url_path.split("/")
-
-        if (url_split[0] == "api" and url_split[1] == "movie") or url_split[
-            0
-        ] == "movie":
-            if url_split[2] == "moviestart":
-                return json.dumps({"moviestart": {"status": "OK"}}).encode()
-
-            else:
-                request.setResponseCode(404)
-                return b""
-
-        elif url_split[0] == "usbdl":
-            if url_split[1] == "CONNECTIONTEST":
-                self.logger.info(f"v{version} usbdl server test")
-                return b""
-
-            elif self.game_cfg.deliver.udbdl_enable and path.exists(
-                f"{self.game_cfg.deliver.content_folder}/usb/{url_split[-1]}"
-            ):
-                with open(
-                    f"{self.game_cfg.deliver.content_folder}/usb/{url_split[-1]}", "rb"
-                ) as f:
-                    return f.read()
-
-            else:
-                request.setResponseCode(404)
-                return b""
-
-        elif url_split[0] == "deliver":
-            file = url_split[len(url_split) - 1]
-            self.logger.info(f"v{version} {file} deliver inquire")
-            self.logger.debug(
-                f"{self.game_cfg.deliver.content_folder}/net_deliver/{file}"
-            )
-
-            if self.game_cfg.deliver.enable and path.exists(
-                f"{self.game_cfg.deliver.content_folder}/net_deliver/{file}"
-            ):
-                with open(
-                    f"{self.game_cfg.deliver.content_folder}/net_deliver/{file}", "rb"
-                ) as f:
-                    return f.read()
-
-            else:
-                request.setResponseCode(404)
-                return b""
-
-        else:
-            return zlib.compress(b"{}")
+        return Response(zlib.compress(b"{}"))

titles/mai2/universe.py

@@ -15,7 +15,7 @@ class Mai2Universe(Mai2SplashPlus):
         super().__init__(cfg, game_cfg)
         self.version = Mai2Constants.VER_MAIMAI_DX_UNIVERSE
 
-    def handle_cm_get_user_preview_api_request(self, data: Dict) -> Dict:
+    async 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 {}
@@ -30,7 +30,7 @@ class Mai2Universe(Mai2SplashPlus):
             "isExistSellingCard": True,
         }
 
-    def handle_cm_get_user_data_api_request(self, data: Dict) -> Dict:
+    async 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)
 
@@ -52,13 +52,13 @@ class Mai2Universe(Mai2SplashPlus):
 
         return {"userId": data["userId"], "userData": user_data}
 
-    def handle_cm_login_api_request(self, data: Dict) -> Dict:
+    async def handle_cm_login_api_request(self, data: Dict) -> Dict:
         return {"returnCode": 1}
 
-    def handle_cm_logout_api_request(self, data: Dict) -> Dict:
+    async 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:
+    async 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": []}
@@ -88,7 +88,7 @@ class Mai2Universe(Mai2SplashPlus):
 
         return {"length": len(selling_card_list), "sellingCardList": selling_card_list}
 
-    def handle_cm_get_user_card_api_request(self, data: Dict) -> Dict:
+    async 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": []}
@@ -124,10 +124,10 @@ class Mai2Universe(Mai2SplashPlus):
             "userCardList": card_list[start_idx:end_idx],
         }
 
-    def handle_cm_get_user_item_api_request(self, data: Dict) -> Dict:
+    async 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:
+    async def handle_cm_get_user_character_api_request(self, data: Dict) -> Dict:
         characters = self.data.item.get_characters(data["userId"])
 
         chara_list = []
@@ -153,10 +153,10 @@ class Mai2Universe(Mai2SplashPlus):
             "userCharacterList": chara_list,
         }
 
-    def handle_cm_get_user_card_print_error_api_request(self, data: Dict) -> Dict:
+    async 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:
+    async def handle_cm_upsert_user_print_api_request(self, data: Dict) -> Dict:
         user_id = data["userId"]
         upsert = data["userPrintDetail"]
 
@@ -209,12 +209,12 @@ class Mai2Universe(Mai2SplashPlus):
             "endDate": datetime.strftime(end_date, Mai2Constants.DATE_TIME_FORMAT),
         }
 
-    def handle_cm_upsert_user_printlog_api_request(self, data: Dict) -> Dict:
+    async 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:
+    async def handle_cm_upsert_buy_card_api_request(self, data: Dict) -> Dict:
         return {"returnCode": 1}

titles/mai2/universeplus.py

@@ -11,8 +11,8 @@ class Mai2UniversePlus(Mai2Universe):
         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)
+    async def handle_cm_get_user_preview_api_request(self, data: Dict) -> Dict:
+        user_data = await super().handle_cm_get_user_preview_api_request(data)
 
         # hardcode lastDataVersion for CardMaker 1.35
         user_data["lastDataVersion"] = "1.25.00"