forked from Hay1tsme/artemis
diva: change how requests are decoded
This commit is contained in:
@ -10,21 +10,16 @@ from ..const import DivaConstants
|
||||
|
||||
class PreStartRequest(BaseRequest):
|
||||
def __init__(self, raw: str) -> None:
|
||||
self.pmm: str
|
||||
self.idm: str
|
||||
self.mmgameid: str
|
||||
self.mmuid: str
|
||||
self.a_code: str
|
||||
self.aime_id: str
|
||||
self.aime_a_code: str
|
||||
|
||||
super().__init__(raw)
|
||||
try:
|
||||
self.key_obj_type = int(self.key_obj_type)
|
||||
self.exec_vu = int(self.exec_vu)
|
||||
|
||||
except AttributeError as e:
|
||||
raise DivaRequestParseException(f"PreStartRequest: {e}")
|
||||
self.pmm: str = self.raw_dict.get('pmm')
|
||||
self.idm: str = self.raw_dict.get('idm')
|
||||
self.mmgameid: str = self.raw_dict.get('mmgameid')
|
||||
self.mmuid: str = self.raw_dict.get('mmuid')
|
||||
self.a_code: str = self.raw_dict.get('a_code')
|
||||
self.aime_id: str = self.raw_dict.get('aime_id')
|
||||
self.aime_a_code: str = self.raw_dict.get('aime_a_code')
|
||||
self.key_obj_type = int(self.raw_dict.get('key_obj_type'))
|
||||
self.exec_vu = int(self.raw_dict.get('exec_vu'))
|
||||
|
||||
class PreStartResponse(BaseResponse):
|
||||
def __init__(self, req_id: int, pd_id: int) -> None:
|
||||
@ -57,12 +52,8 @@ class PreStartResponse(BaseResponse):
|
||||
class StartRequest(BaseRequest):
|
||||
def __init__(self, raw: str) -> None:
|
||||
super().__init__(raw)
|
||||
try:
|
||||
self.pd_id = int(self.pd_id)
|
||||
self.accept_idx = int(self.accept_idx)
|
||||
|
||||
except AttributeError as e:
|
||||
raise DivaRequestParseException(f"StartRequest: {e}")
|
||||
self.pd_id = int(self.raw_dict.get('pd_id'))
|
||||
self.accept_idx = int(self.raw_dict.get('accept_idx'))
|
||||
|
||||
class StartResponse(BaseResponse):
|
||||
def __init__(self, req_id: int, pv_id: int, pv_name: str) -> None:
|
||||
@ -97,7 +88,7 @@ class StartResponse(BaseResponse):
|
||||
self.dsp_intrm_rnk: int = 0
|
||||
self.dsp_clr_sts: int = 0
|
||||
self.rgo_sts: int = 0
|
||||
self.cv_cid: str = "-1,-1,-1,-1"
|
||||
self.cv_cid: str = "-1,-1,-1,-1"
|
||||
self.cv_sc: str = "-1,-1,-1,-1"
|
||||
#self.cv_bv: str = "-1,-1,-1,-1"
|
||||
self.cv_bv: str = "-1,-1,-1,-1"
|
||||
@ -117,21 +108,17 @@ class StartResponse(BaseResponse):
|
||||
|
||||
class RegisterRequest(BaseRequest):
|
||||
def __init__(self, raw: str) -> None:
|
||||
self.pmm: str
|
||||
self.idm: str
|
||||
self.mmgameid: str
|
||||
self.mmuid: str
|
||||
self.a_code: str
|
||||
self.aime_a_code: str
|
||||
self.player_name: str
|
||||
self.passwd: str
|
||||
super().__init__(raw)
|
||||
try:
|
||||
self.aime_id = int(self.aime_id)
|
||||
self.key_obj_type = int(self.key_obj_type)
|
||||
|
||||
except AttributeError as e:
|
||||
raise DivaRequestParseException(f"RegisterRequest: {e}")
|
||||
self.pmm: str = self.raw_dict.get('pmm')
|
||||
self.idm: str = self.raw_dict.get('idm')
|
||||
self.mmgameid: str = self.raw_dict.get('mmgameid')
|
||||
self.mmuid: str = self.raw_dict.get('mmuid')
|
||||
self.a_code: str = self.raw_dict.get('a_code')
|
||||
self.aime_a_code: str = self.raw_dict.get('aime_a_code')
|
||||
self.player_name: str = self.raw_dict.get('player_name')
|
||||
self.passwd: str = self.raw_dict.get('passwd')
|
||||
self.aime_id = int(self.raw_dict.get('aime_id'))
|
||||
self.key_obj_type = int(self.raw_dict.get('key_obj_type'))
|
||||
|
||||
class RegisterResponse(BaseResponse):
|
||||
def __init__(self, req_id: int, pv_id: int) -> None:
|
||||
@ -141,12 +128,12 @@ class RegisterResponse(BaseResponse):
|
||||
|
||||
class EndRequest(BaseRequest):
|
||||
def __init__(self, raw: Union[str, bytes]) -> None:
|
||||
self.my_qst_id: str
|
||||
self.my_qst_sts: str
|
||||
self.my_qst_id: str = self.raw_dict.get('my_qst_id')
|
||||
self.my_qst_sts: str = self.raw_dict.get('my_qst_sts')
|
||||
|
||||
super().__init__(raw)
|
||||
try:
|
||||
self.pd_id = int(self.pd_id)
|
||||
self.pd_id = int(self.raw_dict.get('pd_id'))
|
||||
|
||||
except AttributeError as e:
|
||||
raise DivaRequestParseException(f"EndRequest: {e}")
|
||||
|
Reference in New Issue
Block a user