koishi-plugin-bilibili-notify 3.0.1 → 3.0.3

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>;
@@ -84,7 +83,6 @@ declare namespace ComRegister {
         customLive: string;
         customLiveEnd: string;
         dynamicUrl: boolean;
-        dynamicLoopTime: number;
         filter: {
             enable: boolean;
             notify: 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("插件初始化完毕！");
     }
@@ -765,7 +772,8 @@ class ComRegister {
             // 检查更新的动态
             for (const item of items) {
                 // 动态ID如果一致则结束循环
-                if (item.id_str === dynamicIdStr1st || item.id_str === dynamicIdStr2nd) {
+                if (item.id_str === dynamicIdStr1st ||
+                    item.id_str === dynamicIdStr2nd) {
                     // logger
                     this.logger.info("动态ID与上次检测第一条一致，结束循环");
                     this.logger.info("动态检测结束");
@@ -1435,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) {
@@ -1500,7 +1505,6 @@ class ComRegister {
         customLive: koishi_1.Schema.string(),
         customLiveEnd: koishi_1.Schema.string().required(),
         dynamicUrl: koishi_1.Schema.boolean().required(),
-        dynamicLoopTime: koishi_1.Schema.number().default(60),
         filter: koishi_1.Schema.object({
             enable: koishi_1.Schema.boolean(),
             notify: koishi_1.Schema.boolean(),

package/lib/index.d.ts

@@ -8,15 +8,6 @@ declare module "koishi" {
 }
 declare class ServerManager extends Service {
     servers: ForkScope[];
-    dynamicLoopTime: number;
-    dynamicLoopTimePatternMatching: {
-        "1\u5206\u949F": number;
-        "2\u5206\u949F": number;
-        "3\u5206\u949F": number;
-        "5\u5206\u949F": number;
-        "10\u5206\u949F": number;
-        "20\u5206\u949F": number;
-    };
     constructor(ctx: Context);
     protected start(): void | Promise<void>;
     registerPlugin: () => boolean;
@@ -52,7 +43,6 @@ export interface Config {
     }>;
     dynamic: {};
     dynamicUrl: boolean;
-    dynamicLoopTime: "1分钟" | "2分钟" | "3分钟" | "5分钟" | "10分钟" | "20分钟";
     pushImgsInDynamic: boolean;
     live: {};
     liveDetectMode: "API" | "WS";

package/lib/index.js

@@ -46,23 +46,12 @@ 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 {
     // 服务
     servers = [];
-    // 动态循环时间
-    dynamicLoopTime;
-    // 定义具体时间模式匹配
-    dynamicLoopTimePatternMatching = {
-        "1分钟": 60,
-        "2分钟": 120,
-        "3分钟": 180,
-        "5分钟": 300,
-        "10分钟": 600,
-        "20分钟": 1200,
-    };
     constructor(ctx) {
         super(ctx, "sm");
         // 插件运行相关指令
@@ -104,10 +93,6 @@ class ServerManager extends koishi_1.Service {
         });
     }
     start() {
-        // 加载配置
-        // 转换为具体时间
-        this.dynamicLoopTime =
-            this.dynamicLoopTimePatternMatching[globalConfig.dynamicLoopTime];
         // 注册插件
         if (!this.registerPlugin()) {
             this.logger.error("插件启动失败");
@@ -150,7 +135,6 @@ class ServerManager extends koishi_1.Service {
                 customLiveStart: globalConfig.customLiveStart,
                 customLive: globalConfig.customLive,
                 customLiveEnd: globalConfig.customLiveEnd,
-                dynamicLoopTime: this.dynamicLoopTime,
                 dynamicUrl: globalConfig.dynamicUrl,
                 filter: globalConfig.filter,
                 dynamicDebugMode: globalConfig.dynamicDebugMode,
@@ -340,17 +324,6 @@ exports.Config = koishi_1.Schema.object({
     dynamicUrl: koishi_1.Schema.boolean()
         .default(false)
         .description("发送动态时是否同时发送链接。注意：如果使用的是QQ官方机器人不能开启此项！"),
-    dynamicLoopTime: koishi_1.Schema.union([
-        "1分钟",
-        "2分钟",
-        "3分钟",
-        "5分钟",
-        "10分钟",
-        "20分钟",
-    ])
-        .role("")
-        .default("2分钟")
-        .description("设定多久检测一次动态。若需动态的时效性，可以设置为1分钟。若订阅的UP主经常在短时间内连着发多条动态应该将该值提高，否则会出现动态漏推送和晚推送的问题，默认值为2分钟"),
     pushImgsInDynamic: koishi_1.Schema.boolean()
         .default(false)
         .description("是否推送动态中的图片，默认不开启。开启后会单独推送动态中的图片"),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "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": {
@@ -51,14 +52,12 @@
       "required": [
         "database",
         "puppeteer",
-        "notifier"
+        "notifier",
+        "cron"
       ]
     },
     "description": {
       "zh": "Bilibili动态推送，直播通知插件。具体使用方法请参考readme.md"
-    },
-    "locales": [
-      "zh"
-    ]
+    }
   }
 }

package/readme.md

@@ -217,6 +217,8 @@
 - 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`
+- ver 3.0.3 移除：配置项 `dynamicLoopTime` ，动态循环时间将不再可选，默认为两分钟
 
 ## 交流群