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

package/lib/biliAPI.d.ts

@@ -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;

package/lib/biliAPI.js

@@ -53,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;

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"];
@@ -32,8 +32,6 @@ class BLive extends koishi_1.Service {
                 uid: mySelfInfo.data.mid,
             },
         });
-        // logger
-        this.logger.info(`[${roomId}]开始监听直播间消息！`);
     }
     closeListener(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,6 +1093,31 @@ 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;
@@ -1545,17 +1574,17 @@ class ComRegister {
             // 判断是否有数据
             if (!this.loginDBData?.dynamic_group_id) {
                 // 没有数据，没有创建分组，尝试创建分组
-                const createGroupData = await this.ctx.ba.createGroup("订阅");
+                const createGroupData = (await this.ctx.ba.createGroup("订阅"));
                 // 如果分组已创建，则获取分组id
                 if (createGroupData.code === 22106) {
                     // 分组已存在，拿到之前的分组id
-                    const allGroupData = await this.ctx.ba.getAllGroup();
+                    const allGroupData = (await this.ctx.ba.getAllGroup());
                     // 遍历所有分组
                     for (const group of allGroupData.data) {
                         // 找到订阅分组
                         if (group.name === "订阅") {
                             // 拿到分组id
-                            this.loginDBData.dynamic_group_id = group.tagid;
+                            this.loginDBData.dynamic_group_id = group.tagid.toString();
                             // 保存到数据库
                             this.ctx.database.set("loginBili", 1, {
                                 dynamic_group_id: this.loginDBData.dynamic_group_id,
@@ -1571,7 +1600,7 @@ class ComRegister {
                 }
                 // 创建成功，保存到数据库
                 this.ctx.database.set("loginBili", 1, {
-                    dynamic_group_id: this.loginDBData.dynamic_group_id,
+                    dynamic_group_id: createGroupData.data.tagid.toString(),
                 });
                 // 创建成功
                 return { code: createGroupData.code, msg: createGroupData.message };

package/lib/type/index.d.ts

@@ -241,3 +241,22 @@ export type Result = {
     msg?: string;
     data?: any;
 };
+export type CreateGroup = {
+    code: number;
+    message: string;
+    ttl: number;
+    data: {
+        tagid: number;
+    };
+};
+export type GroupList = {
+    code: number;
+    message: string;
+    ttl: number;
+    data: Array<{
+        tagid: number;
+        name: string;
+        count: number;
+        tip: string;
+    }>;
+};

package/package.json

@@ -1,12 +1,19 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.2.1-alpha.9",
+  "version": "3.2.1",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
+  "scripts": {
+    "build": "yakumo build",
+    "clean": "yakumo clean",
+    "bump": "yakumo version",
+    "dep": "yakumo upgrade",
+    "pub": "yakumo publish"
+  },
   "files": [
     "lib",
     "dist"
@@ -30,7 +37,6 @@
     "@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": "^24.1.3",
     "luxon": "^3.5.0",
@@ -40,12 +46,30 @@
   },
   "devDependencies": {
     "@biomejs/biome": "1.9.4",
+    "@koishijs/cache": "^2.1.0",
+    "@koishijs/client": "^5.30.7",
+    "@koishijs/plugin-help": "^2.4.5",
+    "@koishijs/plugin-hmr": "^1.2.9",
+    "@koishijs/plugin-notifier": "^1.2.1",
+    "@koishijs/scripts": "^4.6.1",
     "@types/luxon": "^3.4.2",
     "@types/md5": "^2.3.5",
     "@types/qrcode": "^1.5.5",
     "@types/tough-cookie": "^4.0.5",
+    "esbuild": "^0.25.5",
+    "esbuild-register": "^3.6.0",
     "globals": "^15.14.0",
-    "koishi-plugin-puppeteer": "^3.9.0"
+    "koishi": "^4.18.8",
+    "koishi-plugin-puppeteer": "^3.9.0",
+    "tsx": "^4.19.4",
+    "typescript": "^5.8.3",
+    "yakumo": "^1.0.0",
+    "yakumo-esbuild": "^1.0.0",
+    "yakumo-tsc": "^1.0.0",
+    "yml-register": "^1.2.5"
+  },
+  "engines": {
+    "node": ">= 18.0.0"
   },
   "koishi": {
     "service": {

package/readme.md

@@ -263,6 +263,9 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 - ver 3.2.1-alpha.4 优化：直播监听初始化没有提示；
 - ver 3.2.1-alpha.4 - ver 3.2.1-alpha.8 `deprecate`
 - ver 3.2.1-alpha.9 修复：`bugs`
+- ver 3.2.1-alpha.10 修复：临时切换依赖 `blive-message-listener` 为 `@akokko/blive-message-listener` 以解决直播检测模式 `WS` 掉线问题、第一次使用插件报错 `TypeError: Cannot set properties of undefined (setting 'dynamic_group_id')`；
+- ver 3.2.1-alpha.11 WARNING:测试版本；
+- ver 3.2.1 优化：移除不必要成员变量、创建自动上传npm `github actions`，添加相关开发依赖；
 
 ## 交流群