koishi-plugin-bilibili-notify 3.0.1-alpha.2 → 3.0.2

package/lib/comRegister.d.ts

@@ -16,7 +16,6 @@ declare class ComRegister {
     loginDBData: FlatPick<LoginBili, "dynamic_group_id">;
     privateBot: Bot<Context>;
     dynamicDispose: () => void;
-    liveDispose: () => void;
     sendMsgFunc: (bot: Bot<Context, any>, channelId: string, content: any) => Promise<void>;
     constructor(ctx: Context, config: ComRegister.Config);
     init(config: ComRegister.Config): Promise<void>;
@@ -45,6 +44,7 @@ declare class ComRegister {
 }
 declare namespace ComRegister {
     interface Config {
+        subLoadTimeout: number;
         sub: Array<{
             uid: string;
             dynamic: boolean;

package/lib/comRegister.js

@@ -16,7 +16,7 @@ const type_1 = require("./type");
 // import { Segment, useDefault } from "segmentit";
 class ComRegister {
     // 必须服务
-    static inject = ["ba", "gi", "database", "bl", "sm"];
+    static inject = ["ba", "gi", "database", "bl", "sm", "cron"];
     // 定义数组：QQ相关bot
     qqRelatedBotList = [
         "qq",
@@ -47,8 +47,6 @@ class ComRegister {
     privateBot;
     // 动态检测销毁函数
     dynamicDispose;
-    // 直播检测销毁函数
-    liveDispose;
     // 发送消息方式
     sendMsgFunc;
     // 构造函数
@@ -328,6 +326,15 @@ class ComRegister {
         this.checkIfDynamicDetectIsNeeded();
         // 在控制台中显示订阅对象
         this.updateSubNotifier();
+        // 注册插件销毁函数
+        this.ctx.on("dispose", () => {
+            // 销毁登录定时器
+            if (this.loginTimer)
+                this.loginTimer();
+            // 销毁动态监测
+            if (this.dynamicDispose)
+                this.dynamicDispose();
+        });
         // logger
         this.logger.info("插件初始化完毕！");
     }
@@ -477,7 +484,9 @@ class ComRegister {
         // 更新基线
         let updateBaseline;
         // 第一条动态的动态ID
-        let dynamicIdStr;
+        let dynamicIdStr1st;
+        // 第二条动态的动态ID
+        let dynamicIdStr2nd;
         // 定义handler
         const handler = async () => {
             // 检测启动初始化
@@ -499,7 +508,12 @@ class ComRegister {
                 // 设置更新基线
                 updateBaseline = content.data.update_baseline;
                 // 设置第一条动态的动态ID
-                dynamicIdStr = content.data.items[0].id_str;
+                dynamicIdStr1st = content.data?.items[0]?.id_str || "0";
+                // 判断第二条动态是否存在
+                if (content.data?.items[1]) {
+                    // 设置第二条动态的动态ID
+                    dynamicIdStr2nd = content.data.items[1].id_str;
+                }
                 // 设置初始化为false
                 detectSetup = false;
                 // 初始化完成
@@ -569,7 +583,9 @@ class ComRegister {
             // 检查更新的动态
             for (const item of items) {
                 // 动态ID如果一致则结束循环
-                if (item.id_str === dynamicIdStr)
+                if (item.id_str === dynamicIdStr1st)
+                    break;
+                if (item.id_str === dynamicIdStr2nd)
                     break;
                 // 没有动态内容则直接跳过
                 if (!item)
@@ -637,7 +653,8 @@ class ComRegister {
                 }
             }
             // 更新本次请求第一条动态的动态ID
-            dynamicIdStr = items[0].id_str;
+            dynamicIdStr1st = items[0]?.id_str || "0";
+            dynamicIdStr2nd = items[1]?.id_str || "0";
         };
         // 返回一个闭包函数
         return (0, utils_1.withLock)(handler);
@@ -648,7 +665,8 @@ class ComRegister {
         // 更新基线
         let updateBaseline;
         // 第一条动态的动态ID
-        let dynamicIdStr;
+        let dynamicIdStr1st;
+        let dynamicIdStr2nd;
         // 定义handler
         const handler = async () => {
             this.logger.info(`初始化状态：${detectSetup}`);
@@ -672,8 +690,10 @@ class ComRegister {
                 updateBaseline = content.data.update_baseline;
                 this.logger.info(`更新基线：${updateBaseline}`);
                 // 设置第一条动态的动态ID
-                dynamicIdStr = content.data.items[0].id_str;
-                this.logger.info(`第一条动态ID：${dynamicIdStr}`);
+                dynamicIdStr1st = content.data.items[0]?.id_str || "0";
+                dynamicIdStr2nd = content.data.items[1]?.id_str || "0";
+                this.logger.info(`第一条动态ID：${dynamicIdStr1st}`);
+                this.logger.info(`第二条动态ID：${dynamicIdStr2nd}`);
                 // 设置初始化为false
                 detectSetup = false;
                 // 初始化完成
@@ -681,7 +701,8 @@ class ComRegister {
                 return;
             }
             this.logger.info(`更新基线：${updateBaseline}`);
-            this.logger.info(`第一条动态ID：${dynamicIdStr}`);
+            this.logger.info(`第一条动态ID：${dynamicIdStr1st}`);
+            this.logger.info(`第二条动态ID：${dynamicIdStr2nd}`);
             this.logger.info("获取动态内容中...");
             // 使用withRetry函数进行重试
             const content = await (0, utils_1.withRetry)(async () => {
@@ -751,10 +772,12 @@ class ComRegister {
             // 检查更新的动态
             for (const item of items) {
                 // 动态ID如果一致则结束循环
-                if (item.id_str === dynamicIdStr) {
+                if (item.id_str === dynamicIdStr1st ||
+                    item.id_str === dynamicIdStr2nd) {
+                    // logger
                     this.logger.info("动态ID与上次检测第一条一致，结束循环");
-                    // 结束循环
                     this.logger.info("动态检测结束");
+                    // 结束循环
                     break;
                 }
                 // 没有动态内容则直接跳过
@@ -830,7 +853,8 @@ class ComRegister {
                 }
             }
             // 更新本次请求第一条动态的动态ID
-            dynamicIdStr = items[0].id_str;
+            dynamicIdStr1st = items[0]?.id_str || "0";
+            dynamicIdStr2nd = items[1]?.id_str || "0";
         };
         // 返回一个闭包函数
         return (0, utils_1.withLock)(handler);
@@ -1349,7 +1373,7 @@ class ComRegister {
                         return;
                     // 终止
                     controller.abort(`加载订阅UID:${sub.uid}超时`);
-                }, 10 * 1000);
+                }, this.config.subLoadTimeout * 1000);
             });
             await Promise.race([
                 (async () => {
@@ -1391,6 +1415,8 @@ class ComRegister {
                         // 订阅加载超时，取消订阅加载
                         return;
                     }
+                    // 清除定时器
+                    timer();
                     // 将该订阅添加到sm中
                     this.subManager.push({
                         id: +sub.uid,
@@ -1403,8 +1429,6 @@ class ComRegister {
                         dynamic: sub.dynamic,
                         card: sub.card,
                     });
-                    // 清除定时器
-                    timer();
                     // logger
                     this.logger.info(`UID:${sub.uid}订阅加载完毕！`);
                 })(),
@@ -1419,12 +1443,9 @@ class ComRegister {
     }
     enableDynamicDetect() {
         // 开始动态监测
-        if (this.config.dynamicDebugMode) {
-            this.dynamicDispose = this.ctx.setInterval(this.debug_dynamicDetect(), this.config.dynamicLoopTime * 1000);
-        }
-        else {
-            this.dynamicDispose = this.ctx.setInterval(this.dynamicDetect(), this.config.dynamicLoopTime * 1000);
-        }
+        this.dynamicDispose = this.ctx.cron("*/2 * * * *", this.config.dynamicDebugMode
+            ? this.debug_dynamicDetect()
+            : this.dynamicDetect());
     }
     async checkIfIsLogin() {
         if ((await this.ctx.database.get("loginBili", 1)).length !== 0) {
@@ -1440,6 +1461,7 @@ class ComRegister {
 }
 (function (ComRegister) {
     ComRegister.Config = koishi_1.Schema.object({
+        subLoadTimeout: koishi_1.Schema.number(),
         sub: koishi_1.Schema.array(koishi_1.Schema.object({
             uid: koishi_1.Schema.string().description("订阅用户UID"),
             dynamic: koishi_1.Schema.boolean().description("是否订阅用户动态"),

package/lib/index.d.ts

@@ -32,6 +32,7 @@ export interface Config {
     automaticResend: boolean;
     userAgent: string;
     subTitle: {};
+    subLoadTimeout: number;
     sub: Array<{
         name: string;
         uid: string;

package/lib/index.js

@@ -46,7 +46,7 @@ const Database = __importStar(require("./database"));
 const generateImg_1 = __importDefault(require("./generateImg"));
 const biliAPI_1 = __importDefault(require("./biliAPI"));
 const blive_1 = __importDefault(require("./blive"));
-exports.inject = ["puppeteer", "database", "notifier"];
+exports.inject = ["puppeteer", "database", "notifier", "cron"];
 exports.name = "bilibili-notify";
 let globalConfig;
 class ServerManager extends koishi_1.Service {
@@ -139,6 +139,7 @@ class ServerManager extends koishi_1.Service {
             });
             // CR = ComRegister
             const cr = this.ctx.plugin(comRegister_1.default, {
+                subLoadTimeout: globalConfig.subLoadTimeout,
                 sub: globalConfig.sub,
                 master: globalConfig.master,
                 automaticResend: globalConfig.automaticResend,
@@ -276,6 +277,9 @@ exports.Config = koishi_1.Schema.object({
         .required()
         .description("设置请求头User-Agen，请求出现-352时可以尝试修改，UA获取方法可参考：https://blog.csdn.net/qq_44503987/article/details/104929111"),
     subTitle: koishi_1.Schema.object({}).description("订阅配置"),
+    subLoadTimeout: koishi_1.Schema.number()
+        .default(10)
+        .description("订阅加载超时时间，单位为秒，默认10秒"),
     sub: koishi_1.Schema.array(koishi_1.Schema.object({
         name: koishi_1.Schema.string().description("订阅用户昵称，只是给你自己看的(相当于备注)，可填可不填"),
         uid: koishi_1.Schema.string().required().description("订阅用户UID"),
@@ -308,8 +312,7 @@ exports.Config = koishi_1.Schema.object({
             koishi_1.Schema.object({
                 enable: koishi_1.Schema.boolean()
                     .default(false)
-                    .description("是否开启自定义卡片颜色")
-                    .experimental(),
+                    .description("是否开启自定义卡片颜色"),
             }),
             koishi_1.Schema.union([
                 koishi_1.Schema.object({

package/lib/type/index.d.ts

@@ -62,29 +62,27 @@ export type AllDynamicInfo = {
     message: string;
     data: {
         has_more: boolean;
-        items: [
-            {
-                id_str: string;
-                type: string;
-                modules: {
-                    module_author: {
-                        mid: number;
-                        name: string;
-                        face: string;
-                    };
-                    module_dynamic: {
-                        major: {
-                            draw: {
-                                items: Array<{
-                                    src: string;
-                                    alt: string;
-                                }>;
-                            };
+        items: Array<{
+            id_str: string;
+            type: string;
+            modules: {
+                module_author: {
+                    mid: number;
+                    name: string;
+                    face: string;
+                };
+                module_dynamic: {
+                    major: {
+                        draw: {
+                            items: Array<{
+                                src: string;
+                                alt: string;
+                            }>;
                         };
                     };
                 };
-            }
-        ];
+            };
+        }>;
         offset: string;
         update_baseline: string;
         update_num: number;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.0.1-alpha.2",
+  "version": "3.0.2",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],
@@ -44,6 +44,7 @@
     "@types/qrcode": "^1.5.5",
     "@types/tough-cookie": "^4.0.5",
     "globals": "^15.14.0",
+    "koishi-plugin-cron": "^3.1.0",
     "koishi-plugin-puppeteer": "^3.9.0"
   },
   "koishi": {

package/readme.md

@@ -216,6 +216,8 @@
 - ver 3.0.1-alpha.0 优化：动态推送逻辑
 - ver 3.0.1-alpha.1 新增：直播提示语换行符，配置项 `sub.name` 为可选项； 修复：debug模式下动态监测5S一次； 优化：加载订阅
 - ver 3.0.1-alpha.2 优化：改进错误提示，改进订阅加载方式
+- ver 3.0.1 修复：动态推送过程中，如果上一次请求的第一条动态被删除，可能导致动态重复推送(本次修复并不能完全保障不重复推送，如果第一条和第二条都被删除则可能会出现重复推送)； 新增：配置项 `subTimeout` 设置订阅超时时间
+- ver 3.0.2 优化：动态监测，新增依赖服务cron
 
 ## 交流群