koishi-plugin-nitter 0.0.3 → 0.0.5

package/lib/index.d.ts

@@ -5,11 +5,13 @@ export interface Config {
     apiKey: string;
     nitterUrl: string;
     proxy: string;
-    enableTranslate: "google" | "silicon" | "disable";
+    enableTranslate: "google" | "openai" | "disable";
     googleApiKey?: string;
-    siliconApiKey?: string;
+    baseurl?: string;
+    openaiApiKey?: string;
     model?: string;
     prompt?: string;
+    temperature: number;
     timeout?: number;
     app: string;
     sendPic: boolean;

package/lib/index.js

@@ -73,14 +73,13 @@ function setGoogleTranslate(key, proxy) {
   }, "translate");
 }
 __name(setGoogleTranslate, "setGoogleTranslate");
-function setSiliconTranslate(key, model, prompt, timeout = 6e4) {
+function setOpenAiTranslate(url, key, model, prompt, temperature, timeout = 6e4) {
   translate = /* @__PURE__ */ __name(async (texts) => {
-    const url = "https://api.siliconflow.cn/v1/chat/completions";
     let data;
     await retry(3, async () => {
       const response = await (0, import_axios.default)({
         method: "POST",
-        url,
+        url: `${url}/chat/completions`,
         headers: {
           "Authorization": `Bearer ${key}`,
           "Content-Type": "application/json"
@@ -94,14 +93,15 @@ function setSiliconTranslate(key, model, prompt, timeout = 6e4) {
             },
             {
               role: "user",
-              content: `请翻译以下${texts.length}条HTML内容，返回JSON数组：
+              content: `请以JSON数组格式翻译以下${texts.length}条HTML内容：
 
-${JSON.stringify(texts)}`
+${JSON.stringify(texts)}
+
+json输出格式：["翻译结果1", "翻译结果2", ...]`
             }
           ],
           stream: false,
-          temperature: 0.3,
-          // 较低的温度值使翻译更稳定
+          temperature,
           response_format: { type: "json_object" }
         },
         timeout
@@ -109,7 +109,14 @@ ${JSON.stringify(texts)}`
       if (response.data && response.data.choices && response.data.choices[0]) {
         const content = response.data.choices[0].message.content;
         data = JSON.parse(content);
-        if (!Array.isArray(data)) throw new Error("模型未返回数组");
+        if (!Array.isArray(data)) {
+          if (typeof data === "object" && Object.keys(data).length === 1) {
+            const keys = Object.keys(data);
+            if (!Array.isArray(data[keys[0]]))
+              throw new Error("API返回数据格式异常");
+            data = data[keys[0]];
+          } else throw new Error("API返回数据格式异常");
+        }
       } else {
         throw new Error("API返回数据格式异常");
       }
@@ -117,7 +124,7 @@ ${JSON.stringify(texts)}`
     return data;
   }, "translate");
 }
-__name(setSiliconTranslate, "setSiliconTranslate");
+__name(setOpenAiTranslate, "setOpenAiTranslate");
 async function addTranslate(page, className) {
   const elementsHTML = await page.evaluate((className2) => {
     const elements = document.querySelectorAll(className2);
@@ -146,7 +153,13 @@ __name(addTranslate, "addTranslate");
 // src/index.tsx
 var import_rettiwt_api = require("rettiwt-api");
 var import_node_cron = require("node-cron");
+var import_fluent_ffmpeg = __toESM(require("fluent-ffmpeg"));
+var import_ffmpeg_static = __toESM(require("ffmpeg-static"));
+var import_path = __toESM(require("path"));
+var import_promises = __toESM(require("fs/promises"));
+var import_url = require("url");
 var import_jsx_runtime = require("@satorijs/element/jsx-runtime");
+import_fluent_ffmpeg.default.setFfmpegPath(import_ffmpeg_static.default);
 var name = "nitter";
 var inject = ["puppeteer", "subscription"];
 var Config = import_koishi.Schema.intersect([
@@ -158,7 +171,7 @@ var Config = import_koishi.Schema.intersect([
   import_koishi.Schema.object({
     enableTranslate: import_koishi.Schema.union([
       import_koishi.Schema.const("google").description("google cloud translation"),
-      import_koishi.Schema.const("silicon").description("硅基流动"),
+      import_koishi.Schema.const("openai").description("openai"),
       import_koishi.Schema.const("disable").description("关闭")
     ]).default("disable").role("radio")
   }).description("翻译设置"),
@@ -168,10 +181,12 @@ var Config = import_koishi.Schema.intersect([
       googleApiKey: import_koishi.Schema.string().required().description("访问https://cloud.google.com/获取,使用v2")
     }),
     import_koishi.Schema.object({
-      enableTranslate: import_koishi.Schema.const("silicon").required(),
-      siliconApiKey: import_koishi.Schema.string().required().description("访问https://www.siliconflow.cn/获取"),
+      enableTranslate: import_koishi.Schema.const("openai").required(),
+      baseurl: import_koishi.Schema.string().required().description('不要在后面添加"/"'),
+      openaiApiKey: import_koishi.Schema.string().required().role("secret"),
       model: import_koishi.Schema.string().required().description("模型名称"),
       prompt: import_koishi.Schema.string().required().default("你是一个专业的HTML翻译助手。请将一个HTML数组翻译为中文，严格遵循以下规则：\n1. 翻译文本内容，包括链接标签（如<a>）内的显示文本\n2.保持所有HTML标签、属性、class、id，以及结构和格式，URL链接完全不变\n3. 返回一个严格的由html文本组成的JSON数组，包含与输入数量完全相同的翻译结果，不要添加任何额外说明").role("textarea").description("提示词"),
+      temperature: import_koishi.Schema.number().default(1.3).required(),
       timeout: import_koishi.Schema.number().default(6e4).description("等待翻译时长")
     }),
     import_koishi.Schema.object({})
@@ -195,8 +210,8 @@ function apply(ctx, config) {
   (async () => {
     if (config.enableTranslate == "google") {
       setGoogleTranslate(config.googleApiKey, config.proxy);
-    } else if (config.enableTranslate == "silicon") {
-      setSiliconTranslate(config.siliconApiKey, config.model, config.prompt, config.timeout);
+    } else if (config.enableTranslate == "openai") {
+      setOpenAiTranslate(config.baseurl, config.openaiApiKey, config.model, config.prompt, config.temperature, config.timeout);
     }
     const tweetList = await getFollowedFeed();
     for (const data of tweetList) {
@@ -230,12 +245,18 @@ function apply(ctx, config) {
       return "请输入推文ID";
     }
     try {
-      const [screenshot, imageUrls] = await renderTweetScreenshot(ctx, tweetId, config);
+      const [screenshot, imageUrls, hlsUrls] = await renderTweetScreenshot(ctx, tweetId, config);
       let msg = /* @__PURE__ */ (0, import_jsx_runtime.jsx)("img", { src: "data:image/png;base64," + screenshot.toString("base64") });
+      let forwardMsg = [];
+      const videoUrls = await downloadAndConvertVideos(hlsUrls);
       if (imageUrls.length > 0) {
-        msg += /* @__PURE__ */ (0, import_jsx_runtime.jsx)("message", { forward: true, children: imageUrls.map((url) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("message", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("img", { src: url }) })) });
+        forwardMsg.push(...imageUrls.map((url) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("message", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("img", { src: url }) })));
+      }
+      if (videoUrls.length > 0) {
+        forwardMsg.push(...videoUrls.map((url) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("message", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("video", { src: (0, import_url.pathToFileURL)(url).href }) })));
       }
-      return msg;
+      await session.send(msg + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("message", { forward: true, children: forwardMsg }));
+      await deleteFiles(videoUrls);
     } catch (error) {
       ctx.logger("nitter").error("获取推文失败:", error);
       return "获取推文失败";
@@ -249,13 +270,21 @@ function apply(ctx, config) {
   });
   async function broadcast(account, tweetId) {
     try {
-      const [screenshot, imageUrls] = await renderTweetScreenshot(ctx, tweetId, config);
+      const [screenshot, imageUrls, hlsUrls] = await renderTweetScreenshot(ctx, tweetId, config);
       const screenshotMsg = /* @__PURE__ */ (0, import_jsx_runtime.jsx)("img", { src: "data:image/png;base64," + screenshot.toString("base64") });
       ctx.subscription.broadcast(config.app, account, screenshotMsg);
+      let forwardMsg = ``;
+      const videoUrls = await downloadAndConvertVideos(hlsUrls);
       if (imageUrls.length > 0) {
-        const picsForward = imageUrls.map((url) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("message", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("img", { src: url }) }));
-        ctx.subscription.broadcastForward(config.app, account, picsForward);
+        forwardMsg += imageUrls.map((url) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("message", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("img", { src: url }) }));
       }
+      if (videoUrls.length > 0) {
+        forwardMsg += videoUrls.map((url) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("message", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("video", { src: (0, import_url.pathToFileURL)(url).href }) }));
+      }
+      if (forwardMsg.length > 0) {
+        await ctx.subscription.broadcastForward(config.app, account, forwardMsg);
+      }
+      await deleteFiles(videoUrls);
     } catch (error) {
       ctx.logger("nitter").error("获取推文失败:", error);
     }
@@ -286,6 +315,34 @@ function apply(ctx, config) {
   __name(checkForUpdates, "checkForUpdates");
 }
 __name(apply, "apply");
+var tempDir = import_path.default.join(process.cwd(), "tmp");
+async function downloadAndConvertVideos(videoUrls) {
+  await import_promises.default.mkdir(tempDir, { recursive: true });
+  const promises = videoUrls.map(async (url, index) => {
+    try {
+      const outputPath = import_path.default.join(tempDir, `video_${index}_${Date.now()}.mp4`);
+      await new Promise((resolve, reject) => {
+        (0, import_fluent_ffmpeg.default)(url).output(outputPath).on("end", () => {
+          resolve(outputPath);
+        }).on("error", reject).run();
+      });
+      return outputPath;
+    } catch (error) {
+      console.error(`处理失败 (${url}):`, error.message);
+      return null;
+    }
+  });
+  const results = await Promise.all(promises);
+  return results.filter((path2) => path2 !== null);
+}
+__name(downloadAndConvertVideos, "downloadAndConvertVideos");
+async function deleteFiles(filePaths) {
+  await Promise.allSettled(
+    filePaths.map((filePath) => import_promises.default.unlink(filePath).catch(() => {
+    }))
+  );
+}
+__name(deleteFiles, "deleteFiles");
 async function renderTweetScreenshot(ctx, tweetId, config) {
   const puppeteer = ctx.puppeteer;
   if (!puppeteer) {
@@ -320,20 +377,17 @@ async function renderTweetScreenshot(ctx, tweetId, config) {
       omitBackground: false
     });
     if (config.sendPic) {
-      const originalImages = await page.evaluate((url) => {
-        const stillImageLinks = document.querySelectorAll(".main-tweet a.still-image");
-        const imageUrls = [];
-        stillImageLinks.forEach((link) => {
-          const href = link.getAttribute("href");
-          if (href) {
-            imageUrls.push(`${url}${href}`);
-          }
-        });
-        return imageUrls;
+      const originalImages = await page.$$eval(
+        ".main-tweet a.still-image",
+        (links, baseUrl) => links.map((link) => link.getAttribute("href")).filter((href) => href).map((href) => `${baseUrl}${href}`),
+        config.nitterUrl
+      );
+      const hlsUrls = await page.$$eval(".main-tweet video", (videos, baseUrl) => {
+        return videos.map((video) => video.getAttribute("data-url")).filter((dataUrl) => dataUrl).map((dataUrl) => `${baseUrl}${dataUrl}`);
       }, config.nitterUrl);
-      return [buffer, originalImages];
+      return [buffer, originalImages, hlsUrls];
     }
-    return [buffer, []];
+    return [buffer, [], []];
   } catch (e) {
     throw e;
   } finally {

package/lib/translate.d.ts

@@ -2,4 +2,5 @@ import { Page } from 'puppeteer-core';
 export declare function retry(retries: number, fn: () => any, delay?: number): any;
 export declare function setGoogleTranslate(key: string, proxy: string): void;
 export declare function setSiliconTranslate(key: string, model: string, prompt: string, timeout?: number): void;
+export declare function setOpenAiTranslate(url: string, key: string, model: string, prompt: string, temperature: number, timeout?: number): void;
 export declare function addTranslate(page: Page, className: string): Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-nitter",
   "description": "使用Rettiwt-API订阅推文，并使用nitter渲染",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -19,8 +19,12 @@
     "axios": "^1.12.2",
     "https-proxy-agent": "^7.0.6",
     "koishi": "^4.18.9",
-    "koishi-plugin-subscription": "^0.0.1",
+    "koishi-plugin-subscription": "^0.0.5"
+  },
+  "dependencies": {
     "node-cron": "^4.2.1",
-    "rettiwt-api": "^6.0.6"
+    "rettiwt-api": "^6.0.6",
+    "ffmpeg-static": "^5.2.0",
+    "fluent-ffmpeg": "^2.1.3"
   }
 }