koishi-plugin-nitter 0.0.8 → 0.0.9

package/lib/index.d.ts

@@ -16,6 +16,7 @@ export interface Config {
     app: string;
     enableReTweet: boolean;
     sendPic: boolean;
+    cronString: string;
     maxSize: number;
 }
 declare module 'koishi' {

package/lib/index.js

@@ -41,18 +41,21 @@ var import_koishi = require("koishi");
 // src/translate.ts
 var import_axios = __toESM(require("axios"));
 var import_https_proxy_agent = require("https-proxy-agent");
+
+// src/retry.ts
 async function retry(retries, fn, delay = 500) {
   try {
-    await fn();
-    return Promise.resolve();
+    return await fn();
   } catch (err) {
     console.log(`剩余${retries}次尝试`, err);
-    await new Promise((resolve) => setTimeout(resolve, delay));
-    return retries > 1 ? retry(retries - 1, fn, delay * 2) : Promise.reject(err);
+    if (retries <= 1) throw err;
+    await new Promise((r) => setTimeout(r, delay));
+    return retry(retries - 1, fn, delay * 2);
   }
-  ;
 }
 __name(retry, "retry");
+
+// src/translate.ts
 var translate;
 function setGoogleTranslate(key, proxy) {
   translate = /* @__PURE__ */ __name((texts) => {
@@ -142,8 +145,8 @@ async function addTranslate(page, className) {
         tempDiv.innerHTML = translatedHTMLs2[index];
         const newElement = tempDiv.firstElementChild;
         if (newElement) {
-          element.insertAdjacentElement("afterend", newElement);
-          element.insertAdjacentHTML("afterend", '<div style="height: 1px;background-color: #ccc; margin-top: 10px; margin-bottom: 10px;"></div>');
+          element.insertAdjacentElement("beforebegin", newElement);
+          element.insertAdjacentHTML("beforebegin", '<div style="height: 1px;background-color: #ccc; margin-top: 10px; margin-bottom: 10px;"></div>');
         }
       }
     });
@@ -153,7 +156,6 @@ __name(addTranslate, "addTranslate");
 
 // src/index.tsx
 var import_rettiwt_api = require("rettiwt-api");
-var import_node_cron = require("node-cron");
 
 // src/download.ts
 var import_fluent_ffmpeg = __toESM(require("fluent-ffmpeg"));
@@ -269,7 +271,8 @@ var Config = import_koishi.Schema.intersect([
   }).description("订阅配置"),
   import_koishi.Schema.object({
     enableReTweet: import_koishi.Schema.boolean().default(false).description("是否发送转推"),
-    sendPic: import_koishi.Schema.boolean().default(false).description("是否单独发送推文中的图片")
+    sendPic: import_koishi.Schema.boolean().default(false).description("是否单独发送推文中的图片"),
+    cronString: import_koishi.Schema.string().default("15 */5 * * * *").description("使用cron表达式描述检查更新的时间，默认为每隔5分钟检查一次")
   }).description("推送设置"),
   import_koishi.Schema.union([
     import_koishi.Schema.object({
@@ -289,7 +292,8 @@ function apply(ctx, config) {
   config.nitterUrl = config.nitterUrl.replace(/\/+$/, "");
   const twitterClient = new import_rettiwt_api.Rettiwt({
     apiKey: config.apiKey,
-    proxyUrl: config.proxy ? new URL(config.proxy) : void 0
+    proxyUrl: config.proxy ? new URL(config.proxy) : void 0,
+    logging: true
   });
   let cronJob;
   const queue = new taskQueue();
@@ -307,11 +311,6 @@ function apply(ctx, config) {
       };
     }));
     queue.onProcess(broadcast);
-    cronJob = (0, import_node_cron.schedule)("15 */5 * * * *", checkForUpdates);
-    ctx.on("dispose", () => {
-      cronJob.stop();
-    });
-    ctx.logger("nitter").info("开始监听推特动态");
   })();
   ctx.command("nitter.follow", "按照subscription中的订阅配置，使用登录的推特账号关注所有需要订阅的账号", { authority: 3 }).action(async () => {
     const whiteList = ctx.subscription.getAvailableAccounts(config.app);
@@ -319,9 +318,14 @@ function apply(ctx, config) {
     const followingIdList = followingList.map((user) => user.userName);
     for (const id of whiteList) {
       if (!followingIdList.includes(id)) {
-        const user = await twitterClient.user.details(id);
+        let user;
+        await retry(3, async () => {
+          user = await twitterClient.user.details(id);
+        });
         await new Promise((resolve) => setTimeout(resolve, 3 * 1e3));
-        await twitterClient.user.follow(user.id);
+        await retry(3, async () => {
+          await twitterClient.user.follow(user.id);
+        }, 30 * 1e3);
         console.log(`关注${id}成功`);
         await new Promise((resolve) => setTimeout(resolve, 30 * 1e3));
       }
@@ -360,8 +364,8 @@ function apply(ctx, config) {
     try {
       const [screenshot, imageUrls, hlsUrls] = await renderTweetScreenshot(tweetId);
       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 = [];
+      await ctx.subscription.broadcast(config.app, account, screenshotMsg);
+      let forwardMsg = [`${ctx.subscription.getName(config.app, account)} ${ctx.subscription.getAccount(config.app, account)}`];
       const videoUrls = await downloadVideosToBase64(hlsUrls, config.maxSize);
       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 }) })));
@@ -390,7 +394,7 @@ function apply(ctx, config) {
     for (const data of tweetList) {
       if (!config.enableReTweet && data.retweetedTweet)
         continue;
-      if ((/* @__PURE__ */ new Date()).getTime() - new Date(data.createdAt).getTime() > 60 * 60 * 1e3)
+      if ((/* @__PURE__ */ new Date()).getTime() - new Date(data.createdAt).getTime() > 2 * 60 * 60 * 1e3)
         continue;
       if ((await ctx.database.get("nitter_records", { id: data.id })).length > 0)
         continue;
@@ -412,6 +416,7 @@ function apply(ctx, config) {
     }
     const page = await puppeteer.page();
     try {
+      await page.setCacheEnabled(false);
       const tweetUrl = `${config.nitterUrl}/i/status/${tweetId}`;
       await retry(3, async () => {
         await page.goto(tweetUrl);

package/lib/retry.d.ts

@@ -0,0 +1 @@
+export declare function retry<T>(retries: number, fn: () => Promise<T> | T, delay?: number): Promise<T>;

package/lib/translate.d.ts

@@ -1,5 +1,4 @@
 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 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.8",
+  "version": "0.0.9",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -19,11 +19,11 @@
     "axios": "^1.12.2",
     "https-proxy-agent": "^7.0.6",
     "koishi": "^4.18.9",
-    "koishi-plugin-subscription": "^0.0.5"
+    "koishi-plugin-subscription": "^0.0.6"
   },
   "dependencies": {
     "fluent-ffmpeg": "^2.1.3",
     "node-cron": "^4.2.1",
-    "rettiwt-api": "^6.1.3"
+    "rettiwt-api": "^6.1.7"
   }
 }