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

package/dist/services/maimai-status.js

@@ -304,13 +304,17 @@ class MaimaiStatus extends koishi_1.Service {
                     this.clientLogger.warn(`Heartbeat JSON parse failed: ${err.message}; snippet=${snippet}`);
                     // 如果返回的是 CC HTML，尝试使用 Puppeteer 绕过
                     if (this.ctx.puppeteer && snippet.includes('<!DOCTYPE')) {
+                        let page = null;
                         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();
+                            page = await this.ctx.puppeteer.page();
+                            if (page.setUserAgent) {
+                                await page.setUserAgent(this.UA);
+                            }
+                            await page.goto(this.API_URL, { waitUntil: 'networkidle0', timeout: 15000 });
+                            const body = await page.evaluate(() => {
+                                const text = document.body?.innerText || document.body?.textContent || '';
+                                return text;
+                            });
                             try {
                                 data = JSON.parse(body);
                             }
@@ -323,6 +327,14 @@ class MaimaiStatus extends koishi_1.Service {
                             this.clientLogger.warn(`Puppeteer heartbeat fetch failed: ${pe.message}`);
                             return null;
                         }
+                        finally {
+                            if (page) {
+                                try {
+                                    await page.close();
+                                }
+                                catch { /* ignore */ }
+                            }
+                        }
                     }
                     else {
                         return null;

package/package.json

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

package/src/services/maimai-status.ts

@@ -360,28 +360,36 @@ export class MaimaiStatus extends Service {
         } 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()
+            // 如果返回的是 CC HTML，尝试使用 Puppeteer 绕过
+            if (this.ctx.puppeteer && snippet.includes('<!DOCTYPE')) {
+              let page: any = null
               try {
-                data = JSON.parse(body)
-              } catch (err2) {
-                this.clientLogger.warn(`Puppeteer heartbeat parse failed: ${(err2 as any).message}; body=${body.slice(0,200)}`)
+                page = await this.ctx.puppeteer.page()
+                if (page.setUserAgent) {
+                  await page.setUserAgent(this.UA)
+                }
+                await page.goto(this.API_URL, { waitUntil: 'networkidle0', timeout: 15000 })
+                const body = await page.evaluate(() => {
+                  const text = document.body?.innerText || document.body?.textContent || ''
+                  return text
+                })
+                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
+              } finally {
+                if (page) {
+                  try { await page.close() } catch { /* ignore */ }
+                }
               }
-            } catch (pe) {
-              this.clientLogger.warn(`Puppeteer heartbeat fetch failed: ${(pe as any).message}`)
+            } else {
               return null
             }
-          } else {
-            return null
-          }
         }
       }