UNSTABLE：一大堆细节改进 警告：在测试稳定前可以先不要跟进此commit改动

API_TitleServer.py

@@ -9,7 +9,7 @@ import random
 import time
 from ctypes import c_int32
 from Crypto.Cipher import AES
-from Crypto.Util.Padding import unpad
+from Crypto.Util.Padding import pad, unpad
 from Config import *
 import certifi
 
@@ -28,35 +28,24 @@ class SDGBRequestError(SDGBApiError):
 class SDGBResponseError(SDGBApiError):
     pass
 
-class AES_PKCS7(object):
+class AESPKCS7:
+    # 实现了 maimai 通讯所用的 AES 加密的类
     def __init__(self, key: str, iv: str):
         self.key = key.encode('utf-8')
         self.iv = iv.encode('utf-8')
         self.mode = AES.MODE_CBC
-
-    def encrypt(self, content):
-        cipher = AES.new(self.key, AES.MODE_CBC, self.iv)
-        content_padding = self.pkcs7padding(content)
-        encrypt_bytes = cipher.encrypt(content_padding.encode('utf-8'))
-        return encrypt_bytes
-
-    def decrypt(self, content):
-        cipher = AES.new(self.key, AES.MODE_CBC, self.iv)
-        return cipher.decrypt(content)
-    
-    def pkcs7unpadding(self, text):
-        length = len(text)
-        unpadding = ord(text[length - 1])
-        return text[0:length - unpadding]
-
-    def pkcs7padding(self, text):
-        bs = 16
-        length = len(text)
-        bytes_length = len(text.encode('utf-8'))
-        padding_size = length if (bytes_length == length) else bytes_length
-        padding = bs - padding_size % bs
-        padding_text = chr(padding) * padding
-        return text + padding_text
+    # 加密
+    def encrypt(self, content: bytes) -> bytes:
+        cipher = AES.new(self.key, self.mode, self.iv)
+        content_padded = pad(content, AES.block_size)
+        encrypted_bytes = cipher.encrypt(content_padded)
+        return encrypted_bytes
+    # 解密
+    def decrypt(self, encrypted_content: bytes) -> str:
+        cipher = AES.new(self.key, self.mode, self.iv)
+        decrypted_padded = cipher.decrypt(encrypted_content)
+        decrypted = unpad(decrypted_padded, AES.block_size)
+        return decrypted
 
 def getSDGBApiHash(api):
     # API 的 Hash 的生成
@@ -73,7 +62,7 @@ def apiSDGB(data:str, targetApi:str, userAgentExtraData:str, noLog:bool=False, t
     """
     maxRetries = 3
     agentExtra = str(userAgentExtraData)
-    aes = AES_PKCS7(AesKey, AesIV)
+    aes = AESPKCS7(AesKey, AesIV)
     reqData_encrypted = aes.encrypt(data)
     reqData_deflated = zlib.compress(reqData_encrypted)
     endpoint = "https://maimai-gm.wahlap.com:42081/Maimai2Servlet/"
@@ -134,12 +123,12 @@ def apiSDGB(data:str, targetApi:str, userAgentExtraData:str, noLog:bool=False, t
             # 请求格式错误，不需要重试
             raise SDGBRequestError("请求格式错误")
         except SDGBResponseError as e:
-            # 响应解析错误，重试但是只一次
+            # 响应解析错误，这种有一定可能是我们的问题，所以只重试一次
             logger.warning(f"将重试一次 Resp Err: {e}")
             retries += 2
             time.sleep(2)
         except Exception as e:
-            # 其他错误，重试
+            # 其他错误，重试多次
             logger.warning(f"将开始重试请求. {e}")
             retries += 1
             time.sleep(2)