koishi-plugin-xlon 1.0.3 → 1.1.0

package/lib/constants.d.ts

@@ -0,0 +1,2 @@
+/** 对外请求统一使用的 User-Agent */
+export declare const UA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36";

package/lib/features/translator.d.ts

@@ -1,10 +1,4 @@
 import { Context } from 'koishi';
 import { Config } from '../config';
-/**
- * 翻译入口。完整流程：
- * 1. 构建 system prompt（注入术语表）
- * 2. 调用 LLM → 退化检测
- * 3. 如退化 → 简化 prompt 重试一次
- * 4. 事后兜底：术语表强制替换
- */
+/** 翻译入口：注入术语表 → 调用 LLM → 退化检测 → 失败重试 → 术语表兜底。 */
 export declare function translateIfEnabled(ctx: Context, config: Config, text: string): Promise<string>;

package/lib/index.d.ts

@@ -1,7 +1,6 @@
-import { Context, Logger } from 'koishi';
+import { Context } from 'koishi';
 import { Config } from './config';
 export declare const name = "xlon";
-export declare const logger: Logger;
 export declare const inject: {
     required: string[];
     optional: string[];

package/lib/index.js

@@ -23,17 +23,16 @@ __export(src_exports, {
   Config: () => Config,
   apply: () => apply,
   inject: () => inject,
-  logger: () => logger7,
   name: () => name
 });
 module.exports = __toCommonJS(src_exports);
-var import_koishi8 = require("koishi");
+var import_koishi9 = require("koishi");
 
 // src/locales/zh-CN.yml
-var zh_CN_default = { _config: { cookies: "X 的 auth_token Cookie", updateInterval: "检查更新间隔（分钟）", messagePrefix: "推送消息前缀", screenshot: "是否启用推文截图（需要 puppeteer）", translateEnabled: "是否启用翻译", apiKey: "API Key（OpenAI 兼容）", apiUrl: "API 地址", model: "模型名称", systemPrompt: "系统提示词（{glossary} 会被术语表自动替换）", prompt: "用户消息模板（{text} 代表待翻译文本）", term: "术语表（注入 prompt + 翻译后兜底替换）", subscriptions: { id: "博主用户名（@ 后面的部分，不要加 @）", targets: "推送目标（格式 platform:channelId，如 onebot:123456）", blacklist: "违禁词（命中则跳过推送）" }, outputLogs: "日志调试模式", detectXLinks: "是否启用 X/Twitter 链接检测" }, commands: { "xlon.check": { description: "检查一次订阅更新" }, "xlon.tweet": { description: "根据 URL 或用户名获取推文内容" } }, messages: { fetching: "正在获取推文内容...", "empty-url": "请输入推文链接。", "no-latest-tweet": "未找到用户 {0} 的最新推文，请检查用户名是否正确。", checking: "正在检查更新...", busy: "上一轮检查尚未完成，请稍候。", "poll-fail": "轮询 {0} 失败（可能网络/用户名问题）。" } };
+var zh_CN_default = { _config: { cookies: "X 的 auth_token Cookie", updateInterval: "检查更新间隔（分钟）", messagePrefix: "推送消息前缀", screenshot: "是否启用推文截图（需要 puppeteer）", translateEnabled: "是否启用翻译", apiKey: "API Key（OpenAI 兼容）", apiUrl: "API 地址", model: "模型名称", systemPrompt: "系统提示词（{glossary} 会被术语表自动替换）", prompt: "用户消息模板（{text} 代表待翻译文本）", term: "术语表（注入 prompt + 翻译后兜底替换）", subscriptions: { id: "博主用户名（@ 后面的部分，不要加 @）", targets: "推送目标（格式 platform:channelId，如 onebot:123456）", blacklist: "违禁词（命中则跳过推送）" }, outputLogs: "日志调试模式", detectXLinks: "是否启用 X/Twitter 链接检测" }, commands: { "xlon.check": { description: "检查一次订阅更新" }, "xlon.tweet": { description: "根据 URL 或用户名获取推文内容" } }, messages: { fetching: "正在获取推文内容...", "empty-url": "请输入推文链接。", "no-latest-tweet": "未找到用户 {0} 的最新推文，请检查用户名是否正确。", checking: "正在检查更新...", busy: "上一轮检查尚未完成，请稍候。", "poll-fail": "轮询 {0} 失败（可能网络/用户名问题）。", error: "处理请求时发生错误，请稍后重试。" } };
 
 // src/locales/en-US.yml
-var en_US_default = { _config: { cookies: "X auth_token cookie", updateInterval: "Poll interval (minutes)", messagePrefix: "Message prefix", screenshot: "Enable tweet screenshot (requires puppeteer)", translateEnabled: "Enable translation", apiKey: "API key (OpenAI-compatible)", apiUrl: "API base URL", model: "Model name", systemPrompt: "System prompt ({glossary} is replaced by glossary)", prompt: "User message template ({text} is replaced by source text)", term: "Glossary (injected into prompt + post-process fallback)", subscriptions: { id: "Username (without @)", targets: "Targets (format platform:channelId, e.g. onebot:123456)", blacklist: "Block words (skip when hit)" }, outputLogs: "Verbose logs", detectXLinks: "Detect X/Twitter links in messages" }, commands: { "xlon.check": { description: "Check subscriptions for updates" }, "xlon.tweet": { description: "Fetch tweet content by URL or username" } }, messages: { fetching: "Fetching tweet content...", "empty-url": "Please provide a tweet URL.", "no-latest-tweet": "No latest tweet found for user {0}. Please check the username.", checking: "Checking for updates...", busy: "Previous check is still running, please wait.", "poll-fail": "Failed to poll {0} (possible network/username issue)." } };
+var en_US_default = { _config: { cookies: "X auth_token cookie", updateInterval: "Poll interval (minutes)", messagePrefix: "Message prefix", screenshot: "Enable tweet screenshot (requires puppeteer)", translateEnabled: "Enable translation", apiKey: "API key (OpenAI-compatible)", apiUrl: "API base URL", model: "Model name", systemPrompt: "System prompt ({glossary} is replaced by glossary)", prompt: "User message template ({text} is replaced by source text)", term: "Glossary (injected into prompt + post-process fallback)", subscriptions: { id: "Username (without @)", targets: "Targets (format platform:channelId, e.g. onebot:123456)", blacklist: "Block words (skip when hit)" }, outputLogs: "Verbose logs", detectXLinks: "Detect X/Twitter links in messages" }, commands: { "xlon.check": { description: "Check subscriptions for updates" }, "xlon.tweet": { description: "Fetch tweet content by URL or username" } }, messages: { fetching: "Fetching tweet content...", "empty-url": "Please provide a tweet URL.", "no-latest-tweet": "No latest tweet found for user {0}. Please check the username.", checking: "Checking for updates...", busy: "Previous check is still running, please wait.", "poll-fail": "Failed to poll {0} (possible network/username issue).", error: "An error occurred while processing the request. Please try again later." } };
 
 // src/db/model.ts
 var import_koishi = require("koishi");
@@ -51,7 +50,6 @@ function extendDatabase(ctx) {
       autoInc: false
     }
   );
-  logger.info("数据库初始化成功");
 }
 __name(extendDatabase, "extendDatabase");
 
@@ -77,52 +75,61 @@ var XlonRepo = class {
 };
 
 // src/features/commands/index.ts
+var import_koishi2 = require("koishi");
+var logger2 = new import_koishi2.Logger("xlon/commands");
 function registerCommands(ctx, config, deps) {
   ctx.command("x.check").alias("check").action(async ({ session }) => {
-    await session.send(session.text("messages.checking"));
-    await deps.checkOnce(session);
+    try {
+      await session.send(session.text("messages.checking"));
+      await deps.checkOnce(session);
+    } catch (e) {
+      logger2.error("x.check 命令执行失败", e);
+      await session.send(session.text("messages.error"));
+    }
   });
   ctx.command("x.tweet <input:text>").alias("tweet").action(async ({ session }, input) => {
-    await deps.handleTweetInput(session, input || "");
+    try {
+      await deps.handleTweetInput(session, input || "");
+    } catch (e) {
+      logger2.error("x.tweet 命令执行失败", e);
+      await session.send(session.text("messages.error"));
+    }
   });
 }
 __name(registerCommands, "registerCommands");
 
 // src/features/link-detector.ts
-var import_koishi2 = require("koishi");
-var logger2 = new import_koishi2.Logger("xlon/link-detector");
-var urlRe = /((https?:\/\/)?[^\s'"\)]+\.[^\s'"\)]+)/g;
+var import_koishi3 = require("koishi");
+var logger3 = new import_koishi3.Logger("xlon/link-detector");
+var urlRe = /https?:\/\/[^\s'")\]]+/g;
 function extractUrls(text) {
   const matches = text.match(urlRe) || [];
-  return matches.map((m) => m.replace(/[\u3002\uFF0C\uFF1F\uFF01\.,!?，。？！、]+$/g, ""));
+  return matches.map((m) => m.replace(/[。，？！.,!?，。？！、]+$/g, ""));
 }
 __name(extractUrls, "extractUrls");
 function isXDomain(urlStr) {
   try {
-    const u = new URL(urlStr.includes("://") ? urlStr : `https://${urlStr}`);
+    const u = new URL(urlStr);
     const hn = (u.hostname || "").toLowerCase();
     return hn === "t.co" || hn === "x.com" || hn.endsWith(".x.com") || hn === "twitter.com" || hn.endsWith(".twitter.com") || hn === "m.twitter.com" || hn === "mobile.twitter.com";
-  } catch (_) {
+  } catch {
     return false;
   }
 }
 __name(isXDomain, "isXDomain");
-async function expandShortLink(ctx, url) {
+async function expandShortLink(url) {
   try {
-    const axios = ctx.http.axios ?? ctx.http;
-    const res = await axios.get(url, {
-      maxRedirects: 0,
-      validateStatus: /* @__PURE__ */ __name(() => true, "validateStatus")
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), 5e3);
+    const res = await fetch(url, {
+      method: "HEAD",
+      redirect: "follow",
+      signal: controller.signal
     });
-    const location2 = res?.headers?.location;
-    return location2 || url;
-  } catch (err) {
-    try {
-      const location2 = err?.response?.headers?.location;
-      return location2 || url;
-    } catch (_) {
-      return url;
-    }
+    clearTimeout(timer);
+    return res.url || url;
+  } catch {
+    return url;
   }
 }
 __name(expandShortLink, "expandShortLink");
@@ -136,27 +143,26 @@ function registerLinkDetector(ctx, config, handler) {
       if (!candidates.length) return next();
       const found = [];
       for (const c of candidates) {
-        const normalized = c.startsWith("http") ? c : `https://${c}`;
-        if (/^https?:\/\/t\.co\//i.test(normalized)) {
-          const exp = await expandShortLink(ctx, normalized);
+        if (/^https?:\/\/t\.co\//i.test(c)) {
+          const exp = await expandShortLink(c);
           if (isXDomain(exp)) found.push(exp);
-        } else if (isXDomain(normalized)) {
-          found.push(normalized);
+        } else if (isXDomain(c)) {
+          found.push(c);
         }
         if (found.length >= 3) break;
       }
       if (found.length && config.outputLogs) {
-        logger2.info("检测到 X/Twitter 链接:", found);
+        logger3.info("检测到 X/Twitter 链接:", found);
       }
       for (const link of found) {
         try {
           await handler(session, link);
         } catch (e) {
-          logger2.error("处理检测到的 X/Twitter 链接时出错", e);
+          logger3.error("处理检测到的 X/Twitter 链接时出错", e);
         }
       }
     } catch (err) {
-      logger2.error("X/Twitter 链接检测失败", err);
+      logger3.error("X/Twitter 链接检测失败", err);
     }
     return next();
   });
@@ -164,8 +170,8 @@ function registerLinkDetector(ctx, config, handler) {
 __name(registerLinkDetector, "registerLinkDetector");
 
 // src/features/translator.ts
-var import_koishi3 = require("koishi");
-var logger3 = new import_koishi3.Logger("xlon/translator");
+var import_koishi4 = require("koishi");
+var logger4 = new import_koishi4.Logger("xlon/translator");
 function buildGlossaryBlock(term) {
   const entries = Object.entries(term || {}).filter(([k]) => !!k);
   if (!entries.length) return "";
@@ -208,24 +214,20 @@ function validateTranslation(original, translated) {
   if (original.length > 30 && translated.length < original.length * 0.15) {
     return { ok: false, reason: `翻译结果疑似截断（原文 ${original.length} 字 → 译文 ${translated.length} 字）` };
   }
-  for (let winLen = 8; winLen <= Math.min(30, Math.floor(translated.length / 3)); winLen++) {
-    for (let i = 0; i <= translated.length - winLen * 3; i++) {
-      const seg = translated.slice(i, i + winLen);
+  const sample = translated.length > 1500 ? translated.slice(0, 1500) : translated;
+  for (let winLen = 8; winLen <= Math.min(30, Math.floor(sample.length / 3)); winLen++) {
+    for (let i = 0; i + winLen * 3 <= sample.length; i++) {
+      if (sample.slice(i + winLen, i + winLen * 2) !== sample.slice(i, i + winLen)) continue;
+      if (sample.slice(i + winLen * 2, i + winLen * 3) !== sample.slice(i, i + winLen)) continue;
+      const seg = sample.slice(i, i + winLen);
       if (/^[\s\p{P}]+$/u.test(seg)) continue;
-      const rest = translated.slice(i + winLen);
-      let count = 1;
-      let pos = 0;
-      while (pos <= rest.length - winLen) {
-        if (rest.slice(pos, pos + winLen) === seg) {
-          count++;
-          pos += winLen;
-        } else {
-          break;
-        }
-      }
-      if (count >= 3) {
-        return { ok: false, reason: `翻译结果包含连续重复片段："${seg.slice(0, 20)}…" 重复 ${count} 次` };
+      let count = 3;
+      let j = i + winLen * 3;
+      while (j + winLen <= sample.length && sample.slice(j, j + winLen) === seg) {
+        count++;
+        j += winLen;
       }
+      return { ok: false, reason: `翻译结果包含连续重复片段："${seg.slice(0, 20)}…" 重复 ${count} 次` };
     }
   }
   return { ok: true };
@@ -245,13 +247,16 @@ async function callTranslateAPI(ctx, config, opts) {
     ],
     stream: false
   };
-  const response = await ctx.http.post(url, data, { headers });
+  const response = await ctx.http.post(url, data, { headers, timeout: 3e4 });
   return String(response?.choices?.[0]?.message?.content ?? "").trim();
 }
 __name(callTranslateAPI, "callTranslateAPI");
 async function translateIfEnabled(ctx, config, text) {
   if (!config.translateEnabled) return text;
-  if (!config.apiKey) return text;
+  if (!config.apiKey) {
+    logger4.warn("translateEnabled 已开启，但 apiKey 未配置，跳过翻译");
+    return text;
+  }
   if (!text?.trim()) return text;
   const glossaryBlock = buildGlossaryBlock(config.term);
   const systemContent = injectGlossary(config.systemPrompt || "", glossaryBlock);
@@ -264,10 +269,10 @@ async function translateIfEnabled(ctx, config, text) {
     });
     const v1 = validateTranslation(text, translated);
     if (v1.ok) {
-      if (config.outputLogs) logger3.info("翻译通过退化检测");
+      if (config.outputLogs) logger4.info("翻译通过退化检测");
       return applyTermMap(translated, config.term);
     }
-    logger3.warn(`翻译退化（${v1.reason}），使用简化 prompt 重试`);
+    logger4.warn(`翻译退化（${v1.reason}），使用简化 prompt 重试`);
     const retrySystem = "你是翻译助手。直接输出简体中文翻译，不要添加任何额外内容。";
     const retryUser = text;
     try {
@@ -278,33 +283,37 @@ async function translateIfEnabled(ctx, config, text) {
       });
       const v2 = validateTranslation(text, retried);
       if (v2.ok) {
-        if (config.outputLogs) logger3.info("重试翻译通过退化检测");
+        if (config.outputLogs) logger4.info("重试翻译通过退化检测");
         return applyTermMap(retried, config.term);
       }
-      logger3.warn(`重试翻译仍退化（${v2.reason}），回退原文`);
+      logger4.warn(`重试翻译仍退化（${v2.reason}），回退原文`);
       return text;
     } catch (retryErr) {
-      logger3.error("重试翻译 API 调用失败", retryErr);
+      logger4.error("重试翻译 API 调用失败", retryErr);
       return text;
     }
   } catch (err) {
-    logger3.error("翻译 API 调用失败", err);
+    logger4.error("翻译 API 调用失败", err);
     return text;
   }
 }
 __name(translateIfEnabled, "translateIfEnabled");
 
 // src/service/message-builder.ts
-var import_koishi4 = require("koishi");
-var logger4 = new import_koishi4.Logger("xlon/message-builder");
+var import_koishi5 = require("koishi");
+
+// src/constants.ts
+var UA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36";
+
+// src/service/message-builder.ts
+var logger5 = new import_koishi5.Logger("xlon/message-builder");
 async function fetchBinary(ctx, url, maxRetries = 3) {
   for (let attempt = 1; attempt <= maxRetries; attempt++) {
     try {
       return await ctx.http.get(url, {
         responseType: "arraybuffer",
-        headers: {
-          "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
-        }
+        headers: { "User-Agent": UA },
+        timeout: 3e4
       });
     } catch (e) {
       if (attempt >= maxRetries) throw e;
@@ -318,13 +327,15 @@ async function buildTweetMessages(ctx, config, detail, translated, opts) {
   const altOriginalText = detail.altTexts && detail.altTexts.length ? "\n" + detail.altTexts.map(
     (alt, i) => `[图片${detail.altTexts.length > 1 ? i + 1 : ""}描述原文: ${alt}]`
   ).join("\n") : "";
-  const isVideo = detail.mediaUrls?.some((u) => u.endsWith(".mp4"));
+  const hasMedia = (detail.mediaUrls?.length ?? 0) > 0;
+  const hasVideo = detail.mediaUrls?.some((u) => u.endsWith(".mp4")) ?? false;
+  const mediaLabel = !hasMedia ? "文字" : hasVideo ? "视频" : "图片";
   const prefixUser = opts?.username ? `【${opts.username}】 ` : "";
   const retweetNote = opts?.isRetweet ? "[转发推文]\n" : "";
-  let textMsg = `${prefixUser}${config.messagePrefix}一条${isVideo ? "视频" : "图片"}推文：
+  let textMsg = `${prefixUser}${config.messagePrefix}一条${mediaLabel}推文：
 ${translated}${altOriginalText}
 ${retweetNote}`;
-  if (detail.screenshotBuffer) textMsg += `${import_koishi4.h.image(detail.screenshotBuffer, "image/webp")}`;
+  if (detail.screenshotBuffer) textMsg += `${import_koishi5.h.image(detail.screenshotBuffer, "image/webp")}`;
   segments.push({ content: textMsg });
   const imageUrls = (detail.mediaUrls || []).filter((u) => !u.endsWith(".mp4"));
   if (imageUrls.length) {
@@ -332,20 +343,20 @@ ${retweetNote}`;
     for (const imgUrl of imageUrls) {
       try {
         const bin = await fetchBinary(ctx, imgUrl);
-        images.push(import_koishi4.h.image(bin, "image/jpeg"));
+        images.push(String(import_koishi5.h.image(bin, "image/jpeg")));
       } catch (e) {
-        logger4.error(`下载图片失败：${imgUrl}`, e);
+        logger5.error(`下载图片失败：${imgUrl}`, e);
       }
     }
-    if (images.length) segments.push({ content: images.join("\n") });
+    if (images.length) segments.push({ content: images.join("") });
   }
   const videoUrl = (detail.mediaUrls || []).find((u) => u.endsWith(".mp4"));
   if (videoUrl) {
     try {
       const bin = await fetchBinary(ctx, videoUrl);
-      segments.push({ content: import_koishi4.h.video(bin, "video/mp4") });
+      segments.push({ content: import_koishi5.h.video(bin, "video/mp4") });
     } catch (e) {
-      logger4.error(`下载视频失败：${videoUrl}`, e);
+      logger5.error(`下载视频失败：${videoUrl}`, e);
     }
   }
   return segments;
@@ -353,28 +364,32 @@ ${retweetNote}`;
 __name(buildTweetMessages, "buildTweetMessages");
 
 // src/scheduler/poller.ts
-var import_koishi5 = require("koishi");
-var logger5 = new import_koishi5.Logger("xlon/poller");
+var import_koishi6 = require("koishi");
+var logger6 = new import_koishi6.Logger("xlon/poller");
 function createPoller(ctx, config, repo, fetcher, deps) {
   let checking = false;
   async function init() {
     const existingIds = new Set(await repo.listIds());
     const newSubs = config.subscriptions.filter((s) => !existingIds.has(s.id));
     if (config.outputLogs) {
-      logger5.info(`[初始化] 已存在订阅：${Array.from(existingIds).join(", ")}`);
-      logger5.info(`[初始化] 需要初始化：${newSubs.map((s) => s.id).join(", ")}`);
+      logger6.info(`[初始化] 已存在订阅：${Array.from(existingIds).join(", ")}`);
+      logger6.info(`[初始化] 需要初始化：${newSubs.map((s) => s.id).join(", ")}`);
     }
-    for (const sub of newSubs) {
+    for (let i = 0; i < newSubs.length; i++) {
+      const sub = newSubs[i];
       try {
         const latest = await fetcher.getLatestTweet(sub.id);
         const link = latest.tweets[0]?.link;
         if (!link) continue;
         await repo.upsert({ id: sub.id, link, content: latest.wordContent || "" });
       } catch (e) {
-        logger5.error(`[初始化] 获取 ${sub.id} 最新推文失败（请检查用户名/网络）`, e);
+        logger6.error(`[初始化] 获取 ${sub.id} 最新推文失败（请检查用户名/网络）`, e);
+      }
+      if (i < newSubs.length - 1) {
+        await ctx.sleep(1e3 + Math.random() * 2e3);
       }
     }
-    logger5.info("初始化完成");
+    logger6.info("初始化完成");
   }
   __name(init, "init");
   async function checkOnce(session) {
@@ -384,7 +399,8 @@ function createPoller(ctx, config, repo, fetcher, deps) {
     }
     checking = true;
     try {
-      for (const sub of config.subscriptions) {
+      for (let i = 0; i < config.subscriptions.length; i++) {
+        const sub = config.subscriptions[i];
         const username = sub.id;
         try {
           const latest = await fetcher.getLatestTweet(username);
@@ -392,24 +408,29 @@ function createPoller(ctx, config, repo, fetcher, deps) {
           if (!latestLink) continue;
           const stored = await repo.get(username);
           const storedLink = stored?.link || "";
-          if (!storedLink || storedLink !== latestLink) {
-            await repo.upsert({
-              id: username,
-              link: latestLink,
-              content: latest.wordContent || ""
-            });
+          await repo.upsert({
+            id: username,
+            link: latestLink,
+            content: latest.wordContent || ""
+          });
+          if (!storedLink) {
+            if (config.outputLogs) logger6.info(`[轮询] 首次记录基准：${username}`);
+          } else if (storedLink !== latestLink) {
             await deps.pushTweet({
               username,
               url: latestLink,
               isRetweet: latest.tweets[0]?.isRetweet || false
             });
           } else if (config.outputLogs) {
-            logger5.info(`已是最新：${username}`);
+            logger6.info(`已是最新：${username}`);
           }
         } catch (e) {
-          logger5.error(`轮询 ${username} 失败`, e);
+          logger6.error(`轮询 ${username} 失败`, e);
           if (session) await session.send(session.text("messages.poll-fail", [username]));
         }
+        if (i < config.subscriptions.length - 1) {
+          await ctx.sleep(1e3 + Math.random() * 2e3);
+        }
       }
     } finally {
       checking = false;
@@ -418,7 +439,7 @@ function createPoller(ctx, config, repo, fetcher, deps) {
   __name(checkOnce, "checkOnce");
   function start() {
     const ms = Math.max(1, config.updateInterval) * 60 * 1e3;
-    ctx.setInterval(() => checkOnce().catch((e) => logger5.error("定时任务异常", e)), ms);
+    ctx.setInterval(() => checkOnce().catch((e) => logger6.error("定时任务异常", e)), ms);
   }
   __name(start, "start");
   return { init, checkOnce, start };
@@ -426,9 +447,8 @@ function createPoller(ctx, config, repo, fetcher, deps) {
 __name(createPoller, "createPoller");
 
 // src/service/fetcher.ts
-var import_koishi6 = require("koishi");
-var logger6 = new import_koishi6.Logger("xlon/fetcher");
-var UA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36";
+var import_koishi7 = require("koishi");
+var logger7 = new import_koishi7.Logger("xlon/fetcher");
 function toAbsoluteUrl(input) {
   const raw = (input || "").trim();
   if (!raw) return raw;
@@ -490,14 +510,13 @@ async function screenshotTweetArticle(page, selector = 'article[data-testid="twe
       return imgsLoaded && videosLoaded;
     },
     { timeout: 2e4 },
-    // 增加到 20 秒
     selector
   ).catch((err) => {
-    logger6.warn(`媒体加载超时: ${err.message}`);
+    logger7.warn(`媒体加载超时: ${err.message}`);
     return null;
   });
   if (!mediaLoadResult) {
-    logger6.warn("部分媒体可能未完全加载,额外等待 2 秒");
+    logger7.warn("部分媒体可能未完全加载,额外等待 2 秒");
     await page.evaluate(() => new Promise((resolve) => setTimeout(resolve, 2e3)));
   }
   await page.evaluate(() => {
@@ -556,7 +575,6 @@ async function preparePage(page, cookies) {
     secure: true
   });
   await page.setUserAgent(UA);
-  await page.setDefaultNavigationTimeout(6e4);
   await page.setDefaultTimeout(6e4);
 }
 __name(preparePage, "preparePage");
@@ -578,7 +596,7 @@ var XFetcher = class {
    */
   async getLatestTweet(username, maxRetries = 3) {
     if (!this.hasPuppeteer) {
-      logger6.warn("puppeteer 不可用，无法获取最新推文");
+      logger7.warn("puppeteer 不可用，无法获取最新推文");
       return { tweets: [], wordContent: "" };
     }
     const url = `https://x.com/${username}`;
@@ -617,7 +635,7 @@ var XFetcher = class {
             const textEl = article.querySelector(
               'div[data-testid="tweetText"], div[lang]'
             );
-            const word_content = (textEl && textEl.textContent ? textEl.textContent : "").trim();
+            const wordContent = (textEl && textEl.textContent ? textEl.textContent : "").trim();
             const timeEl = article.querySelector('a[href*="/status/"] time');
             const linkEl = timeEl && timeEl.parentElement || article.querySelector('a[href*="/status/"]');
             const href = linkEl && linkEl.getAttribute("href") || "";
@@ -634,7 +652,7 @@ var XFetcher = class {
             let absolute = href;
             if (absolute.startsWith("/")) absolute = "https://x.com" + absolute;
             if (!absolute.startsWith("http")) absolute = "https://x.com/" + absolute;
-            collected.push({ link: absolute, isRetweet, isVideo, word_content });
+            collected.push({ link: absolute, isRetweet, isVideo, wordContent });
           }
           const latest = collected.slice(0, 1);
           return {
@@ -643,17 +661,18 @@ var XFetcher = class {
               isRetweet: t.isRetweet,
               isVideo: t.isVideo
             })),
-            wordContent: latest.length ? latest[0].word_content : ""
+            wordContent: latest.length ? latest[0].wordContent : ""
           };
         });
         return result;
       } catch (error) {
-        logger6.error(`抓取最新推文失败（第 ${attempt} 次）: ${username}`, error);
+        logger7.error(`抓取最新推文失败（第 ${attempt} 次）: ${username}`, error);
         if (attempt >= maxRetries) return { tweets: [], wordContent: "" };
         await this.ctx.sleep(2e3 * attempt);
       } finally {
         if (page) await page.close().catch(() => {
         });
+        page = void 0;
       }
     }
     return { tweets: [], wordContent: "" };
@@ -677,7 +696,7 @@ var XFetcher = class {
             else req.continue();
           });
           await preparePage(page, this.config.cookies);
-          await page.goto(tweetUrl, { waitUntil: "networkidle2", timeout: 6e4 });
+          await page.goto(tweetUrl, { waitUntil: "domcontentloaded", 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*="保護"]'));
@@ -701,7 +720,8 @@ var XFetcher = class {
         }
         const apiUrl = buildVxApiUrl(tweetUrl);
         const apiResponse = await this.ctx.http.get(apiUrl, {
-          headers: { "User-Agent": UA }
+          headers: { "User-Agent": UA },
+          timeout: 15e3
         });
         const mediaExt = apiResponse && apiResponse.media_extended || [];
         const altTexts = mediaExt.filter((m) => m && m.altText && String(m.altText).trim()).map((m) => String(m.altText).trim());
@@ -721,7 +741,7 @@ var XFetcher = class {
           protectedAccount
         };
       } catch (error) {
-        logger6.error(`抓取推文详情失败（第 ${attempt} 次）: ${tweetUrlInput}`, error);
+        logger7.error(`抓取推文详情失败（第 ${attempt} 次）: ${tweetUrlInput}`, error);
         if (attempt >= maxRetries) {
           return {
             url: tweetUrlInput,
@@ -735,6 +755,7 @@ var XFetcher = class {
       } finally {
         if (page) await page.close().catch(() => {
         });
+        page = void 0;
       }
     }
     return {
@@ -748,43 +769,43 @@ var XFetcher = class {
 };
 
 // src/config.ts
-var import_koishi7 = require("koishi");
-var Config = import_koishi7.Schema.intersect([
-  import_koishi7.Schema.object({
-    cookies: import_koishi7.Schema.string().required(),
-    updateInterval: import_koishi7.Schema.number().min(1).default(5),
-    messagePrefix: import_koishi7.Schema.string().default("获取了"),
-    screenshot: import_koishi7.Schema.boolean().default(true)
+var import_koishi8 = require("koishi");
+var Config = import_koishi8.Schema.intersect([
+  import_koishi8.Schema.object({
+    cookies: import_koishi8.Schema.string().required(),
+    updateInterval: import_koishi8.Schema.number().min(1).default(5),
+    messagePrefix: import_koishi8.Schema.string().default("获取了"),
+    screenshot: import_koishi8.Schema.boolean().default(true)
   }).description("基础设置"),
-  import_koishi7.Schema.object({
-    translateEnabled: import_koishi7.Schema.boolean().default(false)
+  import_koishi8.Schema.object({
+    translateEnabled: import_koishi8.Schema.boolean().default(false)
   }).description("翻译设置"),
-  import_koishi7.Schema.union([
-    import_koishi7.Schema.object({
-      translateEnabled: import_koishi7.Schema.const(true).required(),
-      apiKey: import_koishi7.Schema.string().required(),
-      apiUrl: import_koishi7.Schema.string().default("https://api.deepseek.com"),
-      model: import_koishi7.Schema.string().default("deepseek-chat"),
-      systemPrompt: import_koishi7.Schema.string().role("textarea").default(
+  import_koishi8.Schema.union([
+    import_koishi8.Schema.object({
+      translateEnabled: import_koishi8.Schema.const(true).required(),
+      apiKey: import_koishi8.Schema.string().required(),
+      apiUrl: import_koishi8.Schema.string().default("https://api.deepseek.com"),
+      model: import_koishi8.Schema.string().default("deepseek-chat"),
+      systemPrompt: import_koishi8.Schema.string().role("textarea").default(
         "你是一名推文翻译专员，负责将推文翻译为简体中文。规则：\n1. 直接输出翻译结果，不添加任何前缀、解释或注释\n2. 保留原文中的 @用户名、#话题标签、URL 不翻译\n3. 保留原文的 emoji\n4. 不要修改标点符号的使用习惯\n{glossary}"
       ),
-      prompt: import_koishi7.Schema.string().role("textarea").default("{text}"),
-      term: import_koishi7.Schema.dict(String).role("table").default({})
+      prompt: import_koishi8.Schema.string().role("textarea").default("{text}"),
+      term: import_koishi8.Schema.dict(String).role("table").default({})
     }),
-    import_koishi7.Schema.object({})
+    import_koishi8.Schema.object({})
   ]),
-  import_koishi7.Schema.object({
-    subscriptions: import_koishi7.Schema.array(
-      import_koishi7.Schema.object({
-        id: import_koishi7.Schema.string().required(),
-        targets: import_koishi7.Schema.array(String).role("table").default([]),
-        blacklist: import_koishi7.Schema.array(import_koishi7.Schema.string()).default([])
+  import_koishi8.Schema.object({
+    subscriptions: import_koishi8.Schema.array(
+      import_koishi8.Schema.object({
+        id: import_koishi8.Schema.string().required(),
+        targets: import_koishi8.Schema.array(String).role("table").default([]),
+        blacklist: import_koishi8.Schema.array(import_koishi8.Schema.string()).default([])
       })
     ).default([])
   }).description("订阅列表"),
-  import_koishi7.Schema.object({
-    outputLogs: import_koishi7.Schema.boolean().default(true),
-    detectXLinks: import_koishi7.Schema.boolean().default(true)
+  import_koishi8.Schema.object({
+    outputLogs: import_koishi8.Schema.boolean().default(true),
+    detectXLinks: import_koishi8.Schema.boolean().default(true)
   }).description("调试设置")
 ]).i18n({
   "en-US": en_US_default._config,
@@ -793,7 +814,7 @@ var Config = import_koishi7.Schema.intersect([
 
 // src/index.ts
 var name = "xlon";
-var logger7 = new import_koishi8.Logger("xlon");
+var logger8 = new import_koishi9.Logger("xlon");
 var inject = {
   required: ["database"],
   optional: ["puppeteer"]
@@ -801,14 +822,14 @@ var inject = {
 async function sendToTarget(ctx, target, content) {
   const idx = target.indexOf(":");
   if (idx < 0) {
-    logger7.warn(`无效 target 格式（应为 platform:channelId）：${target}`);
+    logger8.warn(`无效 target 格式（应为 platform:channelId）：${target}`);
     return;
   }
   const platform = target.slice(0, idx);
   const channelId = target.slice(idx + 1);
   const bot = ctx.bots.find((b) => b.platform === platform);
   if (!bot) {
-    logger7.warn(`未找到平台 ${platform} 上的 bot，跳过 target: ${target}`);
+    logger8.warn(`未找到平台 ${platform} 上的 bot，跳过 target: ${target}`);
     return;
   }
   await bot.sendMessage(channelId, content);
@@ -841,7 +862,7 @@ function apply(ctx, config) {
         });
         if (hit.length) {
           if (config.outputLogs)
-            logger7.info(`命中违禁词，跳过推送：${opts.username} -> ${hit.join(", ")}`);
+            logger8.info(`命中违禁词，跳过推送：${opts.username} -> ${hit.join(", ")}`);
           return;
         }
       }
@@ -858,7 +879,7 @@ function apply(ctx, config) {
       await session.send(session.text("messages.empty-url"));
       return;
     }
-    if (config.outputLogs) logger7.info("处理推文链接:", u);
+    if (config.outputLogs) logger8.info("处理推文链接:", u);
     await session.send(session.text("messages.fetching"));
     await processAndSend((content) => session.send(content), u);
   }
@@ -878,7 +899,7 @@ function apply(ctx, config) {
       await session.send(session.text("messages.empty-url"));
       return;
     }
-    if (config.outputLogs) logger7.info("按用户名处理最新推文:", username);
+    if (config.outputLogs) logger8.info("按用户名处理最新推文:", username);
     await session.send(session.text("messages.fetching"));
     const latest = await fetcher.getLatestTweet(username);
     const first = latest.tweets[0];
@@ -901,7 +922,7 @@ function apply(ctx, config) {
           try {
             await sendToTarget(ctx, target, content);
           } catch (e) {
-            logger7.error(`推送到 ${target} 失败`, e);
+            logger8.error(`推送到 ${target} 失败`, e);
           }
         }
       }, "send");
@@ -925,6 +946,5 @@ __name(apply, "apply");
   Config,
   apply,
   inject,
-  logger,
   name
 });

package/lib/service/message-builder.d.ts

@@ -2,7 +2,7 @@ import { Context, h } from 'koishi';
 import { Config } from '../config';
 import { TweetDetail } from '../types';
 export interface MessageSegment {
-    content: string | ReturnType<typeof h.image> | ReturnType<typeof h.video>;
+    content: string | ReturnType<typeof h.video>;
 }
 export interface BuildOptions {
     username?: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-xlon",
   "description": "x subscriber",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "contributors": [
     "Logthm <logthm@outlook.com>"
   ],