解小黑屋现可投入测试

API_TitleServer.py

@@ -20,9 +20,6 @@ ObfuscateParam = "BEs2D5vW"
 class SDGBApiError(Exception):
     pass
     
-class SDGBMaxRetriesError(SDGBApiError):
-    pass
-
 class SDGBRequestError(SDGBApiError):
     pass
 
@@ -97,8 +94,8 @@ def apiSDGB(data:str, targetApi:str, userAgentExtraData:str, noLog:bool=False, t
                 verify=False,
                 timeout=timeout
             )
-
-            logger.info(f"{targetApi} 请求结果: {response.status_code}")
+            if not noLog:
+                logger.info(f"{targetApi} 请求结果: {response.status_code}")
 
             if response.status_code == 200:
                 logger.debug("200 OK!")
@@ -112,11 +109,16 @@ def apiSDGB(data:str, targetApi:str, userAgentExtraData:str, noLog:bool=False, t
             try:
                 responseDecompressed = zlib.decompress(responseRAWContent)
                 logger.debug("成功解压响应！")
-            except zlib.error:
+            except:
                 logger.warning(f"无法解压，得到的原始响应: {responseRAWContent}")
-                raise SDGBResponseError("Decompression failed")
-
-            resultResponse = unpad(aes.decrypt(responseDecompressed), 16).decode()
+                raise SDGBResponseError("解压失败")
+            try:
+                resultResponse = unpad(aes.decrypt(responseDecompressed), 16).decode()
+                logger.debug(f"成功解密响应！")
+            except:
+                logger.warning(f"解密失败，得到的原始响应: {responseDecompressed}")
+                raise SDGBResponseError("解密失败")
+            
             if not noLog:
                 logger.debug(f"响应: {resultResponse}")
             return resultResponse
@@ -134,7 +136,7 @@ def apiSDGB(data:str, targetApi:str, userAgentExtraData:str, noLog:bool=False, t
             # 其他错误，重试
             logger.warning(f"Will now retry. {e}")
             retries += 1
-            time.sleep(3)
+            time.sleep(2)
 
     raise SDGBApiError("Multiple retries failed to make a successful request")