koishi-plugin-xlon 1.0.1 → 1.0.3

package/lib/index.js

@@ -114,12 +114,12 @@ async function expandShortLink(ctx, url) {
       maxRedirects: 0,
       validateStatus: /* @__PURE__ */ __name(() => true, "validateStatus")
     });
-    const location = res?.headers?.location;
-    return location || url;
+    const location2 = res?.headers?.location;
+    return location2 || url;
   } catch (err) {
     try {
-      const location = err?.response?.headers?.location;
-      return location || url;
+      const location2 = err?.response?.headers?.location;
+      return location2 || url;
     } catch (_) {
       return url;
     }
@@ -439,20 +439,67 @@ function buildVxApiUrl(tweetUrl) {
   return tweetUrl.replace(/(twitter\.com|x\.com)/i, "api.vxtwitter.com");
 }
 __name(buildVxApiUrl, "buildVxApiUrl");
+async function diagnosePage(page) {
+  return await page.evaluate(() => {
+    const url = location.href;
+    const title = document.title || "";
+    const bodyText = (document.body && document.body.innerText || "").slice(0, 600);
+    let reason = "页面未渲染出推文（可能网络缓慢或 X 页面结构变化）";
+    const isLoginWall = /\/i\/flow\/login|\/login|\/i\/flow\/single-sign-on/i.test(url) || !!document.querySelector('input[autocomplete="username"]') || /^(log in|登录|登入|sign in)/i.test(title.trim());
+    if (isLoginWall) {
+      reason = "Cookie(auth_token) 可能已失效，被重定向到登录页，请更新 cookies 配置";
+    } else if (/rate limit|too many requests|请求过于频繁|尝试次数过多/i.test(bodyText)) {
+      reason = "触发限流(Rate limit)，请调大 updateInterval 或更换账号";
+    } else if (/account doesn.?t exist|账号不存在|這個帳號不存在|user not found/i.test(bodyText)) {
+      reason = "账号不存在或用户名拼写有误";
+    } else if (/suspended|账号已被冻结|帳號已遭凍結/i.test(bodyText)) {
+      reason = "账号已被冻结(suspended)";
+    } else if (/something went wrong|出错了|发生了一些错误|重试/i.test(bodyText)) {
+      reason = "X 返回错误页(Something went wrong)，通常为临时故障或限流";
+    }
+    return { url, reason };
+  });
+}
+__name(diagnosePage, "diagnosePage");
+async function waitForArticle(page, timeout = 3e4) {
+  const outcome = await Promise.race([
+    page.waitForSelector("article", { timeout }).then(() => "article").catch(() => null),
+    page.waitForFunction(
+      () => /\/i\/flow\/login|\/login|\/i\/flow\/single-sign-on/i.test(location.href) || !!document.querySelector('input[autocomplete="username"]'),
+      { timeout }
+    ).then(() => "login").catch(() => null)
+  ]);
+  if (outcome === "article") return;
+  const diag = await diagnosePage(page).catch(() => null);
+  throw new Error(
+    diag ? `未加载到推文（${diag.reason}）| URL: ${diag.url}` : "未加载到推文（页面状态未知）"
+  );
+}
+__name(waitForArticle, "waitForArticle");
 async function screenshotTweetArticle(page, selector = 'article[data-testid="tweet"]') {
   const element = await page.waitForSelector(selector, { timeout: 15e3 });
   if (!element) throw new Error("未能找到推文容器");
-  await page.waitForFunction(
+  const mediaLoadResult = await page.waitForFunction(
     (sel) => {
-      const a = document.querySelector(sel);
-      if (!a) return false;
-      const imgs = Array.from(a.querySelectorAll("img"));
-      return imgs.every((img) => img.complete && img.naturalWidth > 0);
+      const article = document.querySelector(sel);
+      if (!article) return false;
+      const imgs = Array.from(article.querySelectorAll("img"));
+      const imgsLoaded = imgs.every((img) => img.complete && img.naturalWidth > 0);
+      const videos = Array.from(article.querySelectorAll("video"));
+      const videosLoaded = videos.every((video) => video.readyState >= 2);
+      return imgsLoaded && videosLoaded;
     },
-    { timeout: 8e3 },
+    { timeout: 2e4 },
+    // 增加到 20 秒
     selector
-  ).catch(() => {
+  ).catch((err) => {
+    logger6.warn(`媒体加载超时: ${err.message}`);
+    return null;
   });
+  if (!mediaLoadResult) {
+    logger6.warn("部分媒体可能未完全加载,额外等待 2 秒");
+    await page.evaluate(() => new Promise((resolve) => setTimeout(resolve, 2e3)));
+  }
   await page.evaluate(() => {
     const column = document.querySelector('div[data-testid="primaryColumn"]');
     if (!column) return;
@@ -547,7 +594,7 @@ var XFetcher = class {
         });
         await preparePage(page, this.config.cookies);
         await page.goto(url, { waitUntil: "domcontentloaded", timeout: 6e4 });
-        await page.waitForSelector("article", { timeout: 3e4 });
+        await waitForArticle(page, 3e4);
         const result = await page.evaluate(() => {
           const articles = Array.from(document.querySelectorAll("article"));
           const collected = [];
@@ -630,8 +677,8 @@ var XFetcher = class {
             else req.continue();
           });
           await preparePage(page, this.config.cookies);
-          await page.goto(tweetUrl, { waitUntil: "domcontentloaded", timeout: 6e4 });
-          await page.waitForSelector("article", { timeout: 3e4 });
+          await page.goto(tweetUrl, { waitUntil: "networkidle2", timeout: 6e4 });
+          await waitForArticle(page, 3e4);
           protectedAccount = await page.evaluate(() => {
             return !!(document.querySelector('[data-testid="icon-lock"]') || document.querySelector('[aria-label*="rotect"]') || document.querySelector('[aria-label*="保护"]') || document.querySelector('[aria-label*="保護"]'));
           });

package/package.json

@@ -1,40 +1,40 @@
 {
-    "name": "koishi-plugin-xlon",
-    "description": "x subscriber",
-    "version": "1.0.1",
-    "contributors": [
-        "Logthm <logthm@outlook.com>"
-    ],
-    "main": "lib/index.js",
-    "typings": "lib/index.d.ts",
-    "files": [
-        "lib",
-        "dist"
-    ],
-    "license": "MIT",
-    "keywords": [
-        "chatbot",
-        "koishi",
-        "plugin"
-    ],
-    "koishi": {
-        "service": {
-            "required": [
-                "database"
-            ],
-            "optional": [
-                "puppeteer"
-            ]
-        }
-    },
-    "peerDependencies": {
-        "koishi": "^4.18.10"
-    },
-    "devDependencies": {
-        "koishi-plugin-puppeteer": "^3.9.0",
-        "typescript": "^5.9.3"
-    },
-    "dependencies": {
-        "yml-register": "^1.2.5"
+  "name": "koishi-plugin-xlon",
+  "description": "x subscriber",
+  "version": "1.0.3",
+  "contributors": [
+    "Logthm <logthm@outlook.com>"
+  ],
+  "main": "lib/index.js",
+  "typings": "lib/index.d.ts",
+  "files": [
+    "lib",
+    "dist"
+  ],
+  "license": "MIT",
+  "keywords": [
+    "chatbot",
+    "koishi",
+    "plugin"
+  ],
+  "koishi": {
+    "service": {
+      "required": [
+        "database"
+      ],
+      "optional": [
+        "puppeteer"
+      ]
     }
+  },
+  "peerDependencies": {
+    "koishi": "^4.18.11"
+  },
+  "devDependencies": {
+    "koishi-plugin-puppeteer": "^3.9.0",
+    "typescript": "^5.9.3"
+  },
+  "dependencies": {
+    "yml-register": "^1.2.5"
+  }
 }