From e6d35010e642f2fe432d54aef989a8f4b0dedec2 Mon Sep 17 00:00:00 2001
From: Remik1r3n <remik1r3n@outlook.com>
Date: Mon, 14 Jul 2025 11:40:16 +0800
Subject: [PATCH] =?UTF-8?q?TitleServer=E9=80=9A=E8=AE=AF=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 API_TitleServer.py | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/API_TitleServer.py b/API_TitleServer.py
index 01a6618..fa72f6d 100644
--- a/API_TitleServer.py
+++ b/API_TitleServer.py
@@ -14,16 +14,16 @@ from Config import *
 from typing import Optional
 import certifi
 
-# 舞萌DX 2024
-# omg it's leaking
-#AesKey = "n7bx6:@Fg_:2;5E89Phy7AyIcpxEQ:R@"
-#AesIV = ";;KjR1C3hgB1ovXa"
-#ObfuscateParam = "BEs2D5vW"
+use2024Api = False  # 是否使用 2024 API
 
-# 2025
-AesKey = "a>32bVP7v<63BVLkY[xM>daZ1s9MBP<R"
-AesIV = "d6xHIKq]1J]Dt^ue"
-ObfuscateParam = "B44df8yT"
+if use2024Api:
+    AesKey = "n7bx6:@Fg_:2;5E89Phy7AyIcpxEQ:R@"
+    AesIV = ";;KjR1C3hgB1ovXa"
+    ObfuscateParam = "BEs2D5vW"
+else:
+    AesKey = "a>32bVP7v<63BVLkY[xM>daZ1s9MBP<R"
+    AesIV = "d6xHIKq]1J]Dt^ue"
+    ObfuscateParam = "B44df8yT"
 
 class SDGBApiError(Exception):
     pass
@@ -107,7 +107,6 @@ def apiSDGB(
                 logger.debug("使用代理")
                 httpClient = httpx.Client(proxy=proxyUrl, verify=False)
             else:
-                logger.debug("不使用代理")
                 httpClient = httpx.Client(verify=False)
             
             # 发送请求
@@ -147,15 +146,23 @@ def apiSDGB(
                 raise SDGBResponseError("解密失败")
             # 然后尝试解压
             try:
-                # 看看文件头是否正确
-                if not responseContentDecrypted.startswith(b'\x78\x9c'):
-                    logger.warning("NOT ZLIB FORMAT")
-                    raise Exception(f"响应内容不是 zlib 压缩格式, 内容: {responseContentDecrypted}")
-                responseContentFinal = zlib.decompress(responseContentDecrypted).decode('utf-8')
+                # 看看文件头是否是压缩过的
+                if responseContentDecrypted.startswith(b'\x78\x9c'):
+                    logger.debug("响应内容是 zlib 压缩格式")
+                    responseContentFinal = zlib.decompress(responseContentDecrypted).decode('utf-8')
+                else:
+                    logger.warning(f"响应内容不是 zlib 压缩格式, 内容: {responseContentDecrypted}")
+                    responseContentFinal = responseContentDecrypted.decode('utf-8')
                 if not noLog:
-                    #logger.debug("成功解压响应！")
                     logger.debug(f"响应: {responseContentFinal}")
-                return responseContentFinal
+                # 最终处理，检查是否是 JSON 格式
+                if responseContentFinal.startswith('{') and responseContentFinal.endswith('}'):
+                    # 如果是 JSON 格式，直接返回
+                    return responseContentFinal
+                else:
+                    # 如果不是 JSON 格式，可能是文本或其他格式，直接返回
+                    logger.warning("响应内容不对劲！可能有错误！")
+                    return responseContentFinal
             except:
                 logger.warning(f"解压失败，原始响应: {responseContentDecrypted}")
                 raise SDGBResponseError("解压失败")
@@ -190,7 +197,6 @@ def calcPlaySpecial():
         num2 >>= 1
     return c_int32(result.value).value
 
-
 class AESPKCS7_2024:
     # 实现了 maimai 通讯所用的 AES 加密的类
     def __init__(self, key: str, iv: str):