koishi-plugin-maichuni-scorehelper 0.0.11-test → 0.0.13-test

package/dist/services/maimai-status.js

@@ -118,6 +118,11 @@ class MaimaiStatus extends koishi_1.Service {
             }
             const list = heartbeatData.heartbeatList;
             if (!list) {
+                // 兼容直接返回 heartbeatList 的情况（某些部署可能直接返回对象）
+                if (heartbeatData && typeof heartbeatData === 'object' && !Array.isArray(heartbeatData)) {
+                    this.clientLogger.warn('Heartbeat data missing heartbeatList, using raw object keys fallback.');
+                    return await this.analyzeAndNotify(heartbeatData);
+                }
                 this.clientLogger.warn('Heartbeat data format invalid: list missing', Object.keys(heartbeatData));
                 return;
             }
@@ -294,8 +299,34 @@ class MaimaiStatus extends koishi_1.Service {
                 try {
                     data = JSON.parse(data);
                 }
-                catch {
-                    return null;
+                catch (err) {
+                    const snippet = data.slice(0, 200);
+                    this.clientLogger.warn(`Heartbeat JSON parse failed: ${err.message}; snippet=${snippet}`);
+                    // 如果返回的是 CC HTML，尝试使用 Puppeteer 绕过
+                    if (this.ctx.puppeteer && snippet.includes('<!DOCTYPE')) {
+                        try {
+                            const page = await this.ctx.puppeteer.page();
+                            const body = await page.evaluate(async (url, ua) => {
+                                const res = await fetch(url, { headers: { 'User-Agent': ua } });
+                                return await res.text();
+                            }, this.API_URL, this.UA);
+                            await page.close();
+                            try {
+                                data = JSON.parse(body);
+                            }
+                            catch (err2) {
+                                this.clientLogger.warn(`Puppeteer heartbeat parse failed: ${err2.message}; body=${body.slice(0, 200)}`);
+                                return null;
+                            }
+                        }
+                        catch (pe) {
+                            this.clientLogger.warn(`Puppeteer heartbeat fetch failed: ${pe.message}`);
+                            return null;
+                        }
+                    }
+                    else {
+                        return null;
+                    }
                 }
             }
             // 返回原始对象，包含 heartbeatList 和 uptimeList

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-maichuni-scorehelper",
-  "version": "0.0.11-test",
+  "version": "0.0.13-test",
   "description": "一个基础的 Koishi 插件，未来用于舞萌中二节奏分数辅助。",
   "keywords": [
     "koishi",

package/src/services/maimai-status.ts

@@ -164,6 +164,11 @@ export class MaimaiStatus extends Service {
       
       const list = heartbeatData.heartbeatList
       if (!list) {
+          // 兼容直接返回 heartbeatList 的情况（某些部署可能直接返回对象）
+          if (heartbeatData && typeof heartbeatData === 'object' && !Array.isArray(heartbeatData)) {
+              this.clientLogger.warn('Heartbeat data missing heartbeatList, using raw object keys fallback.')
+              return await this.analyzeAndNotify(heartbeatData)
+          }
           this.clientLogger.warn('Heartbeat data format invalid: list missing', Object.keys(heartbeatData))
           return
       }
@@ -350,11 +355,34 @@ export class MaimaiStatus extends Service {
       
       // 如果不是对象，尝试解析 JSON (因为 Object.keys 打印出了索引，说明是字符串)
       if (typeof data === 'string') {
-          try {
-              data = JSON.parse(data)
-          } catch {
+        try {
+          data = JSON.parse(data)
+        } catch (err) {
+          const snippet = data.slice(0, 200)
+          this.clientLogger.warn(`Heartbeat JSON parse failed: ${(err as any).message}; snippet=${snippet}`)
+          // 如果返回的是 CC HTML，尝试使用 Puppeteer 绕过
+          if (this.ctx.puppeteer && snippet.includes('<!DOCTYPE')) {
+            try {
+              const page = await this.ctx.puppeteer.page()
+                const body = await page.evaluate(async (url: string, ua: string) => {
+                const res = await fetch(url, { headers: { 'User-Agent': ua } })
+                return await res.text()
+              }, this.API_URL, this.UA)
+              await page.close()
+              try {
+                data = JSON.parse(body)
+              } catch (err2) {
+                this.clientLogger.warn(`Puppeteer heartbeat parse failed: ${(err2 as any).message}; body=${body.slice(0,200)}`)
+                return null
+              }
+            } catch (pe) {
+              this.clientLogger.warn(`Puppeteer heartbeat fetch failed: ${(pe as any).message}`)
               return null
+            }
+          } else {
+            return null
           }
+        }
       }
       
       // 返回原始对象，包含 heartbeatList 和 uptimeList