koishi-plugin-nitter 0.0.16 → 0.0.18

package/lib/download.d.ts

@@ -1,3 +1,3 @@
-export declare function downloadImagesToBase64(imageUrls: any): Promise<any[]>;
+export declare function downloadImagesToBase64(imageUrls: string[]): Promise<Array<string | null>>;
 export declare function downloadVideosToTempFiles(videoUrls: string[], tempDir: string, maxSize?: number): Promise<string[]>;
 export declare function cleanupTempFiles(files: Array<string | null>): Promise<void>;

package/lib/index.d.ts

@@ -14,6 +14,7 @@ export interface Config {
     temperature: number;
     timeout?: number;
     app: string;
+    ownerAccount?: string;
     enablePollingOnStart: boolean;
     enableReTweet: boolean;
     sendPic: boolean;

package/lib/index.js

@@ -176,6 +176,19 @@ var import_fluent_ffmpeg = __toESM(require("fluent-ffmpeg"));
 var import_path = __toESM(require("path"));
 var import_promises = __toESM(require("fs/promises"));
 var import_axios2 = __toESM(require("axios"));
+async function downloadImagesToBase64(imageUrls) {
+  return Promise.all(imageUrls.map(async (url) => {
+    try {
+      const response = await import_axios2.default.get(url, { responseType: "arraybuffer" });
+      const base64 = Buffer.from(response.data).toString("base64");
+      const contentType = response.headers?.["content-type"] || "image/jpeg";
+      return `data:${contentType};base64,${base64}`;
+    } catch {
+      return null;
+    }
+  }));
+}
+__name(downloadImagesToBase64, "downloadImagesToBase64");
 async function downloadVideosToTempFiles(videoUrls, tempDir, maxSize = 20) {
   await import_promises.default.mkdir(tempDir, { recursive: true });
   const results = [];
@@ -278,7 +291,8 @@ var Config = import_koishi.Schema.intersect([
     import_koishi.Schema.object({})
   ]),
   import_koishi.Schema.object({
-    app: import_koishi.Schema.string().description("subscription配置中应用名")
+    app: import_koishi.Schema.string().description("subscription配置中应用名"),
+    ownerAccount: import_koishi.Schema.string().description("主人账号。轮询连续失败3次后会停止轮询并向该账号发送告警。可填写 userId，或 platform:userId 指定平台。")
   }).description("订阅配置"),
   import_koishi.Schema.object({
     enablePollingOnStart: import_koishi.Schema.boolean().default(true).description("启动后是否立刻开始轮询"),
@@ -302,6 +316,7 @@ function apply(ctx, config) {
     logging: true
   });
   let cronJob;
+  let pollingFailures = 0;
   const queue = new taskQueue();
   (async () => {
     if (config.enableTranslate == "google") {
@@ -336,7 +351,21 @@ function apply(ctx, config) {
   })();
   ctx.command("nitter.follow", "按照subscription中的订阅配置，使用登录的推特账号关注所有需要订阅的账号", { authority: 3 }).action(async () => {
     const whiteList = ctx.subscription.getAvailableAccounts(config.app);
-    const { list: followingList } = await twitterClient.user.following();
+    const followingList = [];
+    let cursor = void 0;
+    while (true) {
+      const res = await retry(
+        3,
+        async () => {
+          return await twitterClient.user.following(void 0, 100, cursor);
+        },
+        (err) => ctx.logger("nitter").error(`获取已关注账号列表失败: ${err}`)
+      );
+      followingList.push(...res.list);
+      if (!res.next || res.next.split("|")[0] == "0") break;
+      cursor = res.next;
+      await new Promise((resolve) => setTimeout(resolve, 1e3));
+    }
     const followingIdList = followingList.map((user) => user.userName);
     for (const id of whiteList) {
       if (!followingIdList.includes(id)) {
@@ -350,7 +379,7 @@ function apply(ctx, config) {
           await twitterClient.user.follow(user.id);
           ctx.logger("nitter").info(`关注${id}成功`);
         }, (err) => ctx.logger("nitter").error(`关注${id}失败: ${err}`));
-        await new Promise((resolve) => setTimeout(resolve, 30 * 1e3));
+        await new Promise((resolve) => setTimeout(resolve, 60 * 1e3));
       }
     }
     return "关注完成";
@@ -384,10 +413,13 @@ function apply(ctx, config) {
       await sendFunc(screenshotMsg);
       const forwardMsg = [];
       const videoUrls = pieces.filter((p) => p.type === "video").map((p) => p.url);
+      const imageUrls = pieces.filter((p) => p.type === "image").map((p) => p.url);
       const tmpDir = config.tmpDir ?? "/shared/tmp";
+      const imageSources = imageUrls.length ? await downloadImagesToBase64(imageUrls) : [];
       if (videoUrls.length) {
         videoFiles = await downloadVideosToTempFiles(videoUrls, tmpDir, config.maxSize ?? 20);
       }
+      let iIdx = 0;
       let vIdx = 0;
       for (const p of pieces) {
         if (p.type === "account") {
@@ -395,9 +427,12 @@ function apply(ctx, config) {
         } else if (p.type === "text") {
           forwardMsg.push(/* @__PURE__ */ (0, import_jsx_runtime.jsx)("message", { children: p.text }));
         } else if (p.type === "image") {
-          forwardMsg.push(
-            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("message", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("img", { src: p.url }) })
-          );
+          const src = imageSources[iIdx++];
+          if (src) {
+            forwardMsg.push(
+              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("message", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("img", { src }) })
+            );
+          }
         } else if (p.type === "video") {
           const file = videoFiles[vIdx++];
           if (file) {
@@ -436,6 +471,7 @@ function apply(ctx, config) {
     checking = Date.now();
     try {
       const tweetList = await getFollowedFeed();
+      pollingFailures = 0;
       if (tweetList.length === 0) {
         return;
       }
@@ -451,11 +487,67 @@ function apply(ctx, config) {
         ctx.logger("nitter").info(`检测到推文id:${data.id}，开始推送`);
         queue.push({ account: data.tweetBy.userName, tweetId: data.id });
       }
+    } catch (error) {
+      pollingFailures += 1;
+      ctx.logger("nitter").warn("检查推文更新失败：%o", error);
+      if (pollingFailures >= 3) {
+        cronJob?.stop();
+        const message = `Nitter 轮询连续失败 ${pollingFailures} 次，已停止轮询。
+${formatError(error)}`;
+        ctx.logger("nitter").warn(message);
+        await notifyOwner(message);
+      }
     } finally {
       checking = void 0;
     }
   }
   __name(checkForUpdates, "checkForUpdates");
+  async function notifyOwner(message) {
+    const owner = parseOwnerAccount(config.ownerAccount);
+    if (!owner) return;
+    try {
+      const bot = await findOwnerBot(owner.platform);
+      if (!bot) {
+        ctx.logger("nitter").warn("未找到可用于发送 Nitter 轮询告警的 bot");
+        return;
+      }
+      await bot.sendPrivateMessage(owner.userId, /* @__PURE__ */ (0, import_jsx_runtime.jsx)("message", { children: message }));
+    } catch (error) {
+      ctx.logger("nitter").warn("发送 Nitter 轮询告警失败：%o", error);
+    }
+  }
+  __name(notifyOwner, "notifyOwner");
+  async function findOwnerBot(platform) {
+    if (platform) return ctx.bots.find((bot) => bot.platform === platform);
+    const accounts = ctx.subscription.getAvailableAccounts(config.app);
+    for (const account of accounts) {
+      const groups = await ctx.subscription.getSubscribedGroups(config.app, account);
+      for (const group of groups) {
+        const groupPlatform = group.split(":")[0];
+        const bot = ctx.bots.find((bot2) => bot2.platform === groupPlatform);
+        if (bot) return bot;
+      }
+    }
+    return ctx.bots[0];
+  }
+  __name(findOwnerBot, "findOwnerBot");
+  function parseOwnerAccount(input) {
+    const value = input?.trim();
+    if (!value) return null;
+    const index = value.indexOf(":");
+    if (index > 0) {
+      return {
+        platform: value.slice(0, index),
+        userId: value.slice(index + 1)
+      };
+    }
+    return { userId: value };
+  }
+  __name(parseOwnerAccount, "parseOwnerAccount");
+  function formatError(error) {
+    return error?.message || String(error);
+  }
+  __name(formatError, "formatError");
   async function renderTweetScreenshot(tweetId) {
     const puppeteer = ctx.puppeteer;
     if (!puppeteer) {
@@ -523,15 +615,15 @@ function apply(ctx, config) {
         const element2 = document.querySelector(".main-thread");
         if (!element2) return;
         Object.assign(element2.style, {
-          border: "1px solid #1DA1F2",
+          border: "3px solid transparent",
           borderRadius: "8px",
-          boxShadow: "0px 1px 9px 12px rgba(29, 161, 242, 0.2)",
+          background: "linear-gradient(#fff, #fff) padding-box, linear-gradient(135deg, #1DA1F2 0%, #35C2FF 35%, #6EE7F9 68%, #A7F3D0 100%) border-box",
+          boxShadow: "0 8px 24px rgba(29, 161, 242, 0.18)",
           margin: "20px",
           boxSizing: "border-box",
           overflow: "hidden",
           width: "100%",
-          padding: "20px 20px 10px 20px",
-          backgroundColor: "#fff"
+          padding: "20px 20px 10px 20px"
         });
       });
       await new Promise((resolve) => setTimeout(resolve, 100));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-nitter",
   "description": "使用Rettiwt-API订阅推文，并使用nitter渲染",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/readme.md

@@ -1,5 +1,5 @@
-# koishi-plugin-twitter
+# koishi-plugin-nitter
 
-[![npm](https://img.shields.io/npm/v/koishi-plugin-twitter?style=flat-square)](https://www.npmjs.com/package/koishi-plugin-twitter)
+[![npm](https://img.shields.io/npm/v/koishi-plugin-nitter?style=flat-square)](https://www.npmjs.com/package/koishi-plugin-twitter)
 
 推文订阅