koishi-plugin-bilibili-notify 3.2.1-alpha.7 → 3.2.1-alpha.9

package/lib/biliAPI.d.ts

@@ -11,6 +11,7 @@ declare class BiliAPI extends Service {
     static inject: string[];
     jar: CookieJar;
     client: AxiosInstance;
+    cacheable: any;
     apiConfig: BiliAPI.Config;
     loginData: any;
     loginNotifier: Notifier;

package/lib/biliAPI.js

@@ -53,6 +53,8 @@ class BiliAPI extends koishi_1.Service {
     static inject = ["database", "notifier"];
     jar;
     client;
+    // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+    cacheable;
     apiConfig;
     // biome-ignore lint/suspicious/noExplicitAny: <explanation>
     loginData;

package/lib/blive.d.ts

@@ -1,5 +1,5 @@
 import { type Awaitable, type Context, Service } from "koishi";
-import { type MsgHandler } from "@akokko/blive-message-listener";
+import { type MsgHandler } from "blive-message-listener";
 declare module "koishi" {
     interface Context {
         bl: BLive;

package/lib/blive.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const koishi_1 = require("koishi");
-const blive_message_listener_1 = require("@akokko/blive-message-listener");
+const blive_message_listener_1 = require("blive-message-listener");
 class BLive extends koishi_1.Service {
     // 必要服务
     static inject = ["ba"];
@@ -19,29 +19,26 @@ class BLive extends koishi_1.Service {
         }
     }
     async startLiveRoomListener(roomId, handler) {
-        try {
-            // 获取cookieStr
-            const cookiesStr = await this.ctx.ba.getCookiesForHeader();
-            // 获取自身信息
-            const mySelfInfo = await this.ctx.ba.getMyselfInfo();
-            // 创建实例并保存到Record中
-            this.listenerRecord[roomId] = (0, blive_message_listener_1.startListen)(Number.parseInt(roomId), handler, {
-                ws: {
-                    headers: {
-                        Cookie: cookiesStr,
-                    },
-                    uid: mySelfInfo.data.mid,
+        // 获取cookieStr
+        const cookiesStr = await this.ctx.ba.getCookiesForHeader();
+        // 获取自身信息
+        const mySelfInfo = await this.ctx.ba.getMyselfInfo();
+        // 创建实例并保存到Record中
+        this.listenerRecord[roomId] = (0, blive_message_listener_1.startListen)(Number.parseInt(roomId), handler, {
+            ws: {
+                headers: {
+                    Cookie: cookiesStr,
                 },
-            });
-        }
-        catch (e) {
-            // logger
-            this.logger.info(`[${roomId}]监听直播间消息失败！错误：${e.message}`);
-        }
+                uid: mySelfInfo.data.mid,
+            },
+        });
+        // logger
+        this.logger.info(`[${roomId}]开始监听直播间消息！`);
     }
     closeListener(roomId) {
         // 判断直播间监听器是否关闭
-        if (!this.listenerRecord || !this.listenerRecord[roomId]?.closed) {
+        if (!this.listenerRecord ||
+            !this.listenerRecord[roomId]?.closed) {
             // 输出logger
             this.logger.info(`${roomId}直播间弹幕监听器无需关闭`);
         }

package/lib/comRegister.js

@@ -997,10 +997,6 @@ class ComRegister {
         let pushAtTimeTimer;
         // 定义弹幕存放数组
         const currentLiveDanmakuArr = [];
-        // init flag
-        let initFlag = false;
-        // 连接中断flag
-        let connFlag = false;
         // 定义开播状态
         let liveStatus = false;
         // 定义channelIdArr总长度
@@ -1093,31 +1089,6 @@ class ComRegister {
         };
         // 构建消息处理函数
         const handler = {
-            onOpen: () => {
-                if (!initFlag) {
-                    // init flag设置为true
-                    initFlag = true;
-                    // connFlag设置为false
-                    connFlag = false;
-                    // logger
-                    this.logger.info(`[${roomId}]直播间连接已建立！`);
-                }
-            },
-            onClose: async () => {
-                if (!connFlag) {
-                    // 更直播状态
-                    liveStatus = false;
-                    // 关闭定时推送
-                    pushAtTimeTimer?.();
-                    // 停止服务
-                    this.ctx.bl.closeListener(roomId);
-                    // 更改connFlag
-                    connFlag = true;
-                    // 发送消息
-                    await this.sendPrivateMsg(`[${roomId}]直播间连接已中断！`);
-                    this.logger.error(`[${roomId}]直播间连接已中断！`);
-                }
-            },
             onError: async () => {
                 // 更直播状态
                 liveStatus = false;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.2.1-alpha.7",
+  "version": "3.2.1-alpha.9",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],
@@ -30,20 +30,21 @@
     "@akokko/blive-message-listener": "^0.5.1",
     "axios": "^1.7.9",
     "axios-cookiejar-support": "^5.0.5",
+    "blive-message-listener": "^0.5.0",
     "cron": "^4.3.0",
-    "jsdom": "^26.1.0",
-    "luxon": "^3.6.1",
+    "jsdom": "^24.1.3",
+    "luxon": "^3.5.0",
     "md5": "^2.3.0",
     "qrcode": "^1.5.4",
     "tough-cookie": "^4.1.4"
   },
   "devDependencies": {
     "@biomejs/biome": "1.9.4",
-    "@types/luxon": "^3.6.2",
+    "@types/luxon": "^3.4.2",
     "@types/md5": "^2.3.5",
     "@types/qrcode": "^1.5.5",
     "@types/tough-cookie": "^4.0.5",
-    "globals": "^16.2.0",
+    "globals": "^15.14.0",
     "koishi-plugin-puppeteer": "^3.9.0"
   },
   "koishi": {

package/readme.md

@@ -261,9 +261,8 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 - ver 3.2.1-alpha.2 调整：将项目构建产物调整回 `cjs` 、将依赖 `cacheable-lookup` 导入方式更改为动态导入；
 - ver 3.2.1-alpha.3 修复：直播检测 `WS` 初始化后自动断开连接；
 - ver 3.2.1-alpha.4 优化：直播监听初始化没有提示；
-- ver 3.2.1-alpha.5 修复：临时更换依赖 `blive-message-listener` 为 `@akokko/blive-message-listener` 以解决直播检测 `WS` 模式连接中断的问题；
-- ver 3.2.1-alpha.6 修复：依赖 `axios-cookiejar-support@6.0.2` 为纯ESM依赖，运行报错 Error [ERR_REQUIRE_ESM]: require() of ES Module `xxx` not supported，降级回 `axios-cookiejar-support@5.0.5`
-- ver 3.2.1-alpha.7 修复：依赖 `tough-cookie` 和 `axios` 回退版本；
+- ver 3.2.1-alpha.4 - ver 3.2.1-alpha.8 `deprecate`
+- ver 3.2.1-alpha.9 修复：`bugs`
 
 ## 交流群