From 3badda23f03b72a0dfc6059ffa36a42a13ce6d0d Mon Sep 17 00:00:00 2001
From: qwerdvd <2450899274@qq.com>
Date: Sun, 24 Sep 2023 14:29:54 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E6=AD=A3=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=80=BC=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ArknightsUID/utils/api/skd/request.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/ArknightsUID/utils/api/skd/request.py b/ArknightsUID/utils/api/skd/request.py
index 0be4a0c..517c095 100644
--- a/ArknightsUID/utils/api/skd/request.py
+++ b/ArknightsUID/utils/api/skd/request.py
@@ -58,7 +58,7 @@ class BaseArkApi:
                 url=f'{_pass_api}&gt={gt}&challenge={ch}',
                 method='GET',
             )
-            if isinstance(data, int):
+            if isinstance(data, Union[int, None]):
                 return None, None
             else:
                 validate = data['data']['validate']
@@ -86,6 +86,8 @@ class BaseArkApi:
         )
         if isinstance(raw_data, int):
             return raw_data
+        if raw_data is None:
+            return -61
         unpack_data = self.unpack(raw_data)
         if isinstance(unpack_data, int):
             return unpack_data
@@ -121,6 +123,8 @@ class BaseArkApi:
         )
         if isinstance(raw_data, int):
             return raw_data
+        if raw_data is None:
+            return -61
         unpack_data = self.unpack(raw_data)
         if isinstance(unpack_data, int):
             return unpack_data
@@ -156,6 +160,8 @@ class BaseArkApi:
         )
         if isinstance(raw_data, int):
             return raw_data
+        if raw_data is None:
+            return -61
         unpack_data = self.unpack(raw_data)
         if isinstance(unpack_data, int):
             return unpack_data
@@ -173,7 +179,7 @@ class BaseArkApi:
         header['cred'] = cred
         header = await self.set_sign(ARK_USER_ME, header=header, token=token)
         raw_data = await self.ark_request(ARK_USER_ME, header=header)
-        if isinstance(raw_data, int):
+        if isinstance(raw_data, Union[int, None]):
             return False
         if 'code' in raw_data and raw_data['code'] == 10001:
             logger.info(f'cred is invalid {raw_data}')
@@ -193,7 +199,7 @@ class BaseArkApi:
         header['cred'] = cred
         header['sign_enable'] = 'false'
         raw_data = await self.ark_request(url=ARK_REFRESH_TOKEN, header=header)
-        if isinstance(raw_data, int):
+        if isinstance(raw_data, Union[int, None]):
             raise TokenRefreshFailed
         else:
             token = cast(str, self.unpack(raw_data)['token'])
@@ -253,7 +259,7 @@ class BaseArkApi:
         params: Union[Dict[str, Any], None] = None,
         data: Union[Dict[str, Any], None] = None,
         use_proxy: Union[bool, None] = False,
-    ) -> Union[Dict, int]:
+    ) -> Union[Dict, Union[int, None]]:
         logger.debug(f'{url} {method} {header} {params} {data} {use_proxy}')
         try:
             raw_data = await self._ark_request(
@@ -285,7 +291,7 @@ class BaseArkApi:
         params: Union[Dict[str, Any], None ]= None,
         data: Union[Dict[str, Any], None] = None,
         use_proxy: Union[bool, None] = False,
-    ) -> Union[Dict, int]:
+    ) -> Union[Dict, Union[int, None]]:
         async with ClientSession(
             connector=TCPConnector(verify_ssl=ssl_verify)
         ) as client: