koishi-plugin-nitter 0.0.5 → 0.0.6

package/lib/index.d.ts

@@ -19,3 +19,4 @@ export interface Config {
 }
 export declare const Config: Schema<Config, Dict>;
 export declare function apply(ctx: Context, config: Config): void;
+export declare function downloadVideosToBase64(videoUrls: any): Promise<any[]>;

package/lib/index.js

@@ -32,6 +32,7 @@ var src_exports = {};
 __export(src_exports, {
   Config: () => Config,
   apply: () => apply,
+  downloadVideosToBase64: () => downloadVideosToBase64,
   inject: () => inject,
   name: () => name
 });
@@ -154,13 +155,11 @@ __name(addTranslate, "addTranslate");
 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 logger = new import_koishi.Logger(name);
 var inject = ["puppeteer", "subscription"];
 var Config = import_koishi.Schema.intersect([
   import_koishi.Schema.object({
@@ -248,15 +247,14 @@ function apply(ctx, 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);
+      const videoUrls = await downloadVideosToBase64(hlsUrls);
       if (imageUrls.length > 0) {
         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 }) })));
+        forwardMsg.push(...videoUrls.map((url) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("message", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("video", { src: url }) })));
       }
       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 "获取推文失败";
@@ -273,18 +271,17 @@ function apply(ctx, 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);
+      let forwardMsg = [];
+      const videoUrls = await downloadVideosToBase64(hlsUrls);
       if (imageUrls.length > 0) {
-        forwardMsg += 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 += 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 }) }));
+        forwardMsg.push(...videoUrls.map((url) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("message", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("video", { src: url }) })));
       }
       if (forwardMsg.length > 0) {
         await ctx.subscription.broadcastForward(config.app, account, forwardMsg);
       }
-      await deleteFiles(videoUrls);
     } catch (error) {
       ctx.logger("nitter").error("获取推文失败:", error);
     }
@@ -316,33 +313,47 @@ function apply(ctx, config) {
 }
 __name(apply, "apply");
 var tempDir = import_path.default.join(process.cwd(), "tmp");
-async function downloadAndConvertVideos(videoUrls) {
+async function downloadVideosToBase64(videoUrls) {
   await import_promises.default.mkdir(tempDir, { recursive: true });
-  const promises = videoUrls.map(async (url, index) => {
+  const results = [];
+  for (const url of videoUrls) {
+    let outputPath = null;
     try {
-      const outputPath = import_path.default.join(tempDir, `video_${index}_${Date.now()}.mp4`);
+      outputPath = import_path.default.join(tempDir, `video_${Date.now()}_${Math.random().toString(36).substr(2, 9)}.mp4`);
       await new Promise((resolve, reject) => {
-        (0, import_fluent_ffmpeg.default)(url).output(outputPath).on("end", () => {
-          resolve(outputPath);
-        }).on("error", reject).run();
+        (0, import_fluent_ffmpeg.default)(url).inputOptions([
+          "-protocol_whitelist",
+          "file,http,https,tcp,tls,crypto"
+        ]).outputOptions([
+          "-c",
+          "copy"
+        ]).output(outputPath).on("end", () => resolve(outputPath)).on("error", reject).run();
       });
-      return outputPath;
+      const stats = await import_promises.default.stat(outputPath);
+      const fileSizeInMB = stats.size / (1024 * 1024);
+      if (fileSizeInMB > 10) {
+        logger.info(`视频大小 ${fileSizeInMB.toFixed(2)}MB 超过10MB限制，跳过转换`);
+      } else {
+        const fileBuffer = await import_promises.default.readFile(outputPath);
+        const base64String = fileBuffer.toString("base64");
+        const dataUrl = `data:video/mp4;base64,${base64String}`;
+        results.push(dataUrl);
+      }
     } catch (error) {
       console.error(`处理失败 (${url}):`, error.message);
-      return null;
+      results.push(null);
+    } finally {
+      if (outputPath) {
+        try {
+          await import_promises.default.unlink(outputPath);
+        } catch (deleteError) {
+        }
+      }
     }
-  });
-  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(() => {
-    }))
-  );
+  }
+  return results;
 }
-__name(deleteFiles, "deleteFiles");
+__name(downloadVideosToBase64, "downloadVideosToBase64");
 async function renderTweetScreenshot(ctx, tweetId, config) {
   const puppeteer = ctx.puppeteer;
   if (!puppeteer) {
@@ -399,6 +410,7 @@ __name(renderTweetScreenshot, "renderTweetScreenshot");
 0 && (module.exports = {
   Config,
   apply,
+  downloadVideosToBase64,
   inject,
   name
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-nitter",
   "description": "使用Rettiwt-API订阅推文，并使用nitter渲染",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -24,7 +24,6 @@
   "dependencies": {
     "node-cron": "^4.2.1",
     "rettiwt-api": "^6.0.6",
-    "ffmpeg-static": "^5.2.0",
     "fluent-ffmpeg": "^2.1.3"
   }
 }