koishi-plugin-bilibili-notify 3.2.1-alpha.3 → 3.2.1-alpha.5

package/lib/biliAPI.d.ts

@@ -1,4 +1,4 @@
-import { type Awaitable, type Context, Schema, Service } from "koishi";
+import { type Context, Schema, Service } from "koishi";
 import { type AxiosInstance } from "axios";
 import { CookieJar } from "tough-cookie";
 import type { Notifier } from "@koishijs/plugin-notifier";
@@ -11,7 +11,6 @@ declare class BiliAPI extends Service {
     static inject: string[];
     jar: CookieJar;
     client: AxiosInstance;
-    cacheable: any;
     apiConfig: BiliAPI.Config;
     loginData: any;
     loginNotifier: Notifier;
@@ -19,8 +18,6 @@ declare class BiliAPI extends Service {
     loginInfoIsLoaded: boolean;
     constructor(ctx: Context, config: BiliAPI.Config);
     protected start(): void | Promise<void>;
-    protected stop(): Awaitable<void>;
-    init(): Promise<void>;
     getMixinKey: (orig: string) => string;
     encWbi(params: {
         [key: string]: string | number | object;
@@ -65,7 +62,7 @@ declare class BiliAPI extends Service {
         cookies: any;
         refresh_token: string;
     }>;
-    getCSRF(): any;
+    getCSRF(): string;
     loadCookiesFromDatabase(): Promise<void>;
     enableRefreshCookiesDetect(): void;
     checkIfTokenNeedRefresh(refreshToken: string, csrf: string, times?: number): Promise<void>;

package/lib/biliAPI.js

@@ -1,43 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -45,8 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const koishi_1 = require("koishi");
 const md5_1 = __importDefault(require("md5"));
 const node_crypto_1 = __importDefault(require("node:crypto"));
-const node_http_1 = __importDefault(require("node:http"));
-const node_https_1 = __importDefault(require("node:https"));
 const axios_1 = __importDefault(require("axios"));
 const tough_cookie_1 = require("tough-cookie");
 const axios_cookiejar_support_1 = require("axios-cookiejar-support");
@@ -88,8 +53,6 @@ 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;
@@ -101,27 +64,11 @@ class BiliAPI extends koishi_1.Service {
         this.apiConfig = config;
     }
     start() {
-        // init
-        this.init();
         // 创建新的http客户端(axios)
         this.createNewClient();
         // 从数据库加载cookies
         this.loadCookiesFromDatabase();
     }
-    stop() {
-        // 将DNS缓存卸载
-        this.cacheable.uninstall(node_http_1.default.globalAgent);
-        this.cacheable.uninstall(node_https_1.default.globalAgent);
-    }
-    async init() {
-        // 导入纯ESM模块Cacheable
-        const { default: CacheableLookup } = await Promise.resolve().then(() => __importStar(require("cacheable-lookup")));
-        // 创建Cacheable
-        this.cacheable = new CacheableLookup();
-        // 安装到http和https
-        this.cacheable.install(node_http_1.default.globalAgent);
-        this.cacheable.install(node_https_1.default.globalAgent);
-    }
     // WBI签名
     // 对 imgKey 和 subKey 进行字符顺序打乱编码
     getMixinKey = (orig) => mixinKeyEncTab

package/lib/blive.d.ts

@@ -1,5 +1,5 @@
 import { type Awaitable, type Context, Service } from "koishi";
-import { type MsgHandler } from "blive-message-listener";
+import { type MsgHandler } from "@akokko/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("blive-message-listener");
+const blive_message_listener_1 = require("@akokko/blive-message-listener");
 class BLive extends koishi_1.Service {
     // 必要服务
     static inject = ["ba"];
@@ -19,24 +19,29 @@ class BLive extends koishi_1.Service {
         }
     }
     async startLiveRoomListener(roomId, handler) {
-        // 获取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,
+        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,
                 },
-                uid: mySelfInfo.data.mid,
-            },
-        });
+            });
+        }
+        catch (e) {
+            // logger
+            this.logger.info(`[${roomId}]监听直播间消息失败！错误：${e.message}`);
+        }
     }
     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,6 +997,10 @@ class ComRegister {
         let pushAtTimeTimer;
         // 定义弹幕存放数组
         const currentLiveDanmakuArr = [];
+        // init flag
+        let initFlag = false;
+        // 连接中断flag
+        let connFlag = false;
         // 定义开播状态
         let liveStatus = false;
         // 定义channelIdArr总长度
@@ -1089,8 +1093,30 @@ class ComRegister {
         };
         // 构建消息处理函数
         const handler = {
-            onStartListen: () => {
-                this.logger.info(`[${roomId}]开始监听直播间消息！`);
+            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 () => {
                 // 更直播状态

package/package.json

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

package/readme.md

@@ -260,6 +260,8 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 - ver 3.2.1-alpha.1 调整：将项目构建产物调整为 `esm`；
 - 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` 模式连接中断的问题；
 
 ## 交流群