koishi-plugin-bilibili-notify 3.2.9-rc.1 → 3.2.9-rc.2

package/lib/index.js

@@ -39,7 +39,8 @@ const path = __toESM$1(require("path"));
 const qrcode = __toESM$1(require("qrcode"));
 const cron = __toESM$1(require("cron"));
 const luxon = __toESM$1(require("luxon"));
-const segmentit = __toESM$1(require("segmentit"));
+const __node_rs_jieba = __toESM$1(require("@node-rs/jieba"));
+const __node_rs_jieba_dict = __toESM$1(require("@node-rs/jieba/dict"));
 const __satorijs_element_jsx_runtime = __toESM$1(require("@satorijs/element/jsx-runtime"));
 const node_path = __toESM$1(require("node:path"));
 const node_url = __toESM$1(require("node:url"));
@@ -615,7 +616,142 @@ const PushTypeMsg = {
 };
 
 //#endregion
-//#region src/comRegister.tsx
+//#region src/stop_words.ts
+const stopwords = new Set([
+	"，",
+	"。",
+	"！",
+	"？",
+	"：",
+	"；",
+	"“",
+	"”",
+	"‘",
+	"’",
+	"（",
+	"）",
+	"、",
+	"……",
+	"——",
+	"-",
+	"_",
+	".",
+	",",
+	"(",
+	")",
+	"【",
+	"】",
+	"而且",
+	"但是",
+	"如果",
+	"虽然",
+	"因为",
+	"所以",
+	"但是",
+	"那么",
+	"那么就",
+	"今天",
+	"昨天",
+	"后天",
+	"明天",
+	"现在",
+	"刚刚",
+	"刚才",
+	"一直",
+	"一直在",
+	"目前",
+	"以前",
+	"以后",
+	"以前的",
+	"the",
+	"and",
+	"to",
+	"of",
+	"a",
+	"is",
+	"in",
+	"on",
+	"for",
+	"with",
+	"this",
+	"that",
+	"you",
+	"觉得",
+	"表示",
+	"发现",
+	"认为",
+	"看到",
+	"听说",
+	"了解",
+	"知道",
+	"说明",
+	"指出",
+	"讨论",
+	"讨论一下",
+	"看看",
+	"想想",
+	"说说",
+	"讲讲",
+	"一个",
+	"一些",
+	"这个",
+	"那个",
+	"每个",
+	"什么",
+	"东西",
+	"事情",
+	"这些",
+	"那些",
+	"这种",
+	"那种",
+	"怎么说",
+	"怎么会",
+	"怎么可能",
+	"不可能",
+	"有点像",
+	"真的很",
+	"特别是",
+	"有时候",
+	"每次都",
+	"一点点",
+	"哪里有",
+	"太离谱",
+	"太搞笑",
+	"太真实",
+	"为了",
+	"因为",
+	"所以",
+	"但是",
+	"而且",
+	"然后",
+	"如果",
+	"虽然",
+	"然而",
+	"不过",
+	"并且",
+	"即使",
+	"由于",
+	"那么",
+	"除非",
+	"比如",
+	"比如说",
+	"现在",
+	"刚刚",
+	"刚才",
+	"以前",
+	"以后",
+	"一直",
+	"从来",
+	"目前",
+	"最近",
+	"已经",
+	"后来",
+	"之前",
+	"某天"
+]);
+
+//#endregion
+//#region src/command_register.tsx
 var import_lib$1 = __toESM$1(require_lib$3());
 var ComRegister = class {
 	static inject = [
@@ -648,7 +784,7 @@ var ComRegister = class {
 	privateBot;
 	dynamicJob;
 	liveJob;
-	_segmentit = (0, segmentit.useDefault)(new segmentit.Segment());
+	_jieba = __node_rs_jieba.Jieba.withDict(__node_rs_jieba_dict.dict);
 	constructor(ctx, config) {
 		this.ctx = ctx;
 		this.init(config);
@@ -981,7 +1117,7 @@ var ComRegister = class {
 	}
 	async broadcastToTargets(uid, content, type, retry = 3e3) {
 		if (!this.checkAllBotsAreReady()) {
-			this.logger.error(`有机器人未准备好，无法进行推送，${retry / 1e3}秒后重试`);
+			this.logger.error(`存在机器人未初始化完毕，无法进行推送，${retry / 1e3}秒后重试`);
 			this.ctx.setTimeout(() => {
 				this.broadcastToTargets(uid, content, type, retry * 2);
 			}, retry);
@@ -996,7 +1132,7 @@ var ComRegister = class {
 			const success = await withRetry(async () => {
 				return await this.ctx.broadcast(atAllArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("at", { type: "all" }) }));
 			}, 1);
-			this.logger.info(`成功推送全体成员消息群组/频道：${success}`);
+			this.logger.info(`成功推送全体成员消息：${success.length}条`);
 		}
 		if (type === PushType.Dynamic && record.dynamicArr?.length >= 1) {
 			this.logger.info(record.dynamicArr);
@@ -1004,7 +1140,7 @@ var ComRegister = class {
 			const success = await withRetry(async () => {
 				return await this.ctx.broadcast(dynamicArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
 			}, 1);
-			this.logger.info(`成功推送动态消息群组/频道：${success}`);
+			this.logger.info(`成功推送动态消息：${success.length}条`);
 		}
 		if ((type === PushType.Live || type === PushType.StartBroadcasting) && record.liveArr?.length >= 1) {
 			this.logger.info(record.liveArr);
@@ -1012,7 +1148,7 @@ var ComRegister = class {
 			const success = await withRetry(async () => {
 				return await this.ctx.broadcast(liveArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
 			}, 1);
-			this.logger.info(`成功推送直播消息群组/频道：${success}`);
+			this.logger.info(`成功推送直播消息：${success.length}条`);
 		}
 		if (type === PushType.LiveGuardBuy && record.liveGuardBuyArr?.length >= 1) {
 			this.logger.info(record.liveGuardBuyArr);
@@ -1020,7 +1156,7 @@ var ComRegister = class {
 			const success = await withRetry(async () => {
 				return await this.ctx.broadcast(liveGuardBuyArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
 			}, 1);
-			this.logger.info(`成功推送上舰消息群组/频道：${success}`);
+			this.logger.info(`成功推送上舰消息：${success.length}条`);
 		}
 		return;
 	}
@@ -1280,8 +1416,7 @@ var ComRegister = class {
 		return await this.broadcastToTargets(uid, msg, liveType === LiveType.StartBroadcasting ? PushType.StartBroadcasting : PushType.Live);
 	}
 	async segmentDanmaku(danmaku, danmakuWeightRecord) {
-		this._segmentit.doSegment(danmaku).map(({ w: w$3, p: p$1 }) => {
-			if (p$1 && p$1 === 2048) return;
+		this._jieba.cut(danmaku, true).filter((word) => word.length >= 2 && !stopwords.has(word)).map((w$3) => {
 			danmakuWeightRecord[w$3] = (danmakuWeightRecord[w$3] || 0) + 1;
 		});
 	}
@@ -1848,7 +1983,7 @@ var ComRegister = class {
 		dynamicDebugMode: koishi.Schema.boolean().required()
 	});
 })(ComRegister || (ComRegister = {}));
-var comRegister_default = ComRegister;
+var command_register_default = ComRegister;
 
 //#endregion
 //#region src/database.ts
@@ -93102,7 +93237,7 @@ var require_lib = __commonJS$1({ "node_modules/koishi-plugin-puppeteer/lib/index
 } });
 
 //#endregion
-//#region src/generateImg.ts
+//#region src/generate_img.ts
 var import_lib = __toESM$1(require_lib());
 const DYNAMIC_TYPE_NONE = "DYNAMIC_TYPE_NONE";
 const DYNAMIC_TYPE_FORWARD = "DYNAMIC_TYPE_FORWARD";
@@ -94590,7 +94725,7 @@ var GenerateImg = class extends koishi.Service {
 		followerDisplay: koishi.Schema.boolean()
 	});
 })(GenerateImg || (GenerateImg = {}));
-var generateImg_default = GenerateImg;
+var generate_img_default = GenerateImg;
 
 //#endregion
 //#region node_modules/@oxc-project/runtime/src/helpers/decorate.js
@@ -94605,7 +94740,7 @@ var require_decorate = __commonJS$1({ "node_modules/@oxc-project/runtime/src/hel
 } });
 
 //#endregion
-//#region src/biliAPI.ts
+//#region src/bili_api.ts
 var import_decorate = __toESM$1(require_decorate());
 const mixinKeyEncTab = [
 	46,
@@ -95298,10 +95433,10 @@ var BiliAPI = class extends koishi.Service {
 		key: koishi.Schema.string().pattern(/^[0-9a-f]{32}$/).required()
 	});
 })(BiliAPI || (BiliAPI = {}));
-var biliAPI_default = BiliAPI;
+var bili_api_default = BiliAPI;
 
 //#endregion
-//#region src/blive.ts
+//#region src/bili_live.ts
 var BLive = class extends koishi.Service {
 	static inject = ["ba"];
 	listenerRecord = {};
@@ -95331,7 +95466,7 @@ var BLive = class extends koishi.Service {
 		this.logger.warn(`${roomId}直播间连接未成功关闭`);
 	}
 };
-var blive_default = BLive;
+var bili_live_default = BLive;
 
 //#endregion
 //#region src/index.ts
@@ -95373,11 +95508,11 @@ var ServerManager = class extends koishi.Service {
 	registerPlugin = () => {
 		if (this.servers.length !== 0) return false;
 		try {
-			const ba = this.ctx.plugin(biliAPI_default, {
+			const ba = this.ctx.plugin(bili_api_default, {
 				userAgent: globalConfig.userAgent,
 				key: globalConfig.key
 			});
-			const gi = this.ctx.plugin(generateImg_default, {
+			const gi = this.ctx.plugin(generate_img_default, {
 				filter: globalConfig.filter,
 				removeBorder: globalConfig.removeBorder,
 				cardColorStart: globalConfig.cardColorStart,
@@ -95389,7 +95524,7 @@ var ServerManager = class extends koishi.Service {
 				font: globalConfig.font,
 				followerDisplay: globalConfig.followerDisplay
 			});
-			const cr = this.ctx.plugin(comRegister_default, {
+			const cr = this.ctx.plugin(command_register_default, {
 				sub: globalConfig.sub,
 				master: globalConfig.master,
 				wordcloud: globalConfig.wordcloud,
@@ -95406,7 +95541,7 @@ var ServerManager = class extends koishi.Service {
 				filter: globalConfig.filter,
 				dynamicDebugMode: globalConfig.dynamicDebugMode
 			});
-			const bl = this.ctx.plugin(blive_default);
+			const bl = this.ctx.plugin(bili_live_default);
 			this.servers.push(ba);
 			this.servers.push(bl);
 			this.servers.push(gi);

package/lib/index.mjs

@@ -4,7 +4,8 @@ import { resolve } from "path";
 import QRCode from "qrcode";
 import { CronJob } from "cron";
 import { DateTime } from "luxon";
-import { Segment, useDefault } from "segmentit";
+import { Jieba } from "@node-rs/jieba";
+import { dict } from "@node-rs/jieba/dict";
 import { Fragment, jsx, jsxs } from "@satorijs/element/jsx-runtime";
 import { resolve as resolve$1 } from "node:path";
 import { pathToFileURL } from "node:url";
@@ -617,7 +618,142 @@ const PushTypeMsg = {
 };
 
 //#endregion
-//#region src/comRegister.tsx
+//#region src/stop_words.ts
+const stopwords = new Set([
+	"，",
+	"。",
+	"！",
+	"？",
+	"：",
+	"；",
+	"“",
+	"”",
+	"‘",
+	"’",
+	"（",
+	"）",
+	"、",
+	"……",
+	"——",
+	"-",
+	"_",
+	".",
+	",",
+	"(",
+	")",
+	"【",
+	"】",
+	"而且",
+	"但是",
+	"如果",
+	"虽然",
+	"因为",
+	"所以",
+	"但是",
+	"那么",
+	"那么就",
+	"今天",
+	"昨天",
+	"后天",
+	"明天",
+	"现在",
+	"刚刚",
+	"刚才",
+	"一直",
+	"一直在",
+	"目前",
+	"以前",
+	"以后",
+	"以前的",
+	"the",
+	"and",
+	"to",
+	"of",
+	"a",
+	"is",
+	"in",
+	"on",
+	"for",
+	"with",
+	"this",
+	"that",
+	"you",
+	"觉得",
+	"表示",
+	"发现",
+	"认为",
+	"看到",
+	"听说",
+	"了解",
+	"知道",
+	"说明",
+	"指出",
+	"讨论",
+	"讨论一下",
+	"看看",
+	"想想",
+	"说说",
+	"讲讲",
+	"一个",
+	"一些",
+	"这个",
+	"那个",
+	"每个",
+	"什么",
+	"东西",
+	"事情",
+	"这些",
+	"那些",
+	"这种",
+	"那种",
+	"怎么说",
+	"怎么会",
+	"怎么可能",
+	"不可能",
+	"有点像",
+	"真的很",
+	"特别是",
+	"有时候",
+	"每次都",
+	"一点点",
+	"哪里有",
+	"太离谱",
+	"太搞笑",
+	"太真实",
+	"为了",
+	"因为",
+	"所以",
+	"但是",
+	"而且",
+	"然后",
+	"如果",
+	"虽然",
+	"然而",
+	"不过",
+	"并且",
+	"即使",
+	"由于",
+	"那么",
+	"除非",
+	"比如",
+	"比如说",
+	"现在",
+	"刚刚",
+	"刚才",
+	"以前",
+	"以后",
+	"一直",
+	"从来",
+	"目前",
+	"最近",
+	"已经",
+	"后来",
+	"之前",
+	"某天"
+]);
+
+//#endregion
+//#region src/command_register.tsx
 var import_lib$1 = __toESM$1(require_lib$3());
 var ComRegister = class {
 	static inject = [
@@ -650,7 +786,7 @@ var ComRegister = class {
 	privateBot;
 	dynamicJob;
 	liveJob;
-	_segmentit = useDefault(new Segment());
+	_jieba = Jieba.withDict(dict);
 	constructor(ctx, config) {
 		this.ctx = ctx;
 		this.init(config);
@@ -983,7 +1119,7 @@ var ComRegister = class {
 	}
 	async broadcastToTargets(uid, content, type, retry = 3e3) {
 		if (!this.checkAllBotsAreReady()) {
-			this.logger.error(`有机器人未准备好，无法进行推送，${retry / 1e3}秒后重试`);
+			this.logger.error(`存在机器人未初始化完毕，无法进行推送，${retry / 1e3}秒后重试`);
 			this.ctx.setTimeout(() => {
 				this.broadcastToTargets(uid, content, type, retry * 2);
 			}, retry);
@@ -998,7 +1134,7 @@ var ComRegister = class {
 			const success = await withRetry(async () => {
 				return await this.ctx.broadcast(atAllArr, /* @__PURE__ */ jsx("message", { children: /* @__PURE__ */ jsx("at", { type: "all" }) }));
 			}, 1);
-			this.logger.info(`成功推送全体成员消息群组/频道：${success}`);
+			this.logger.info(`成功推送全体成员消息：${success.length}条`);
 		}
 		if (type === PushType.Dynamic && record.dynamicArr?.length >= 1) {
 			this.logger.info(record.dynamicArr);
@@ -1006,7 +1142,7 @@ var ComRegister = class {
 			const success = await withRetry(async () => {
 				return await this.ctx.broadcast(dynamicArr, /* @__PURE__ */ jsx("message", { children: content }));
 			}, 1);
-			this.logger.info(`成功推送动态消息群组/频道：${success}`);
+			this.logger.info(`成功推送动态消息：${success.length}条`);
 		}
 		if ((type === PushType.Live || type === PushType.StartBroadcasting) && record.liveArr?.length >= 1) {
 			this.logger.info(record.liveArr);
@@ -1014,7 +1150,7 @@ var ComRegister = class {
 			const success = await withRetry(async () => {
 				return await this.ctx.broadcast(liveArr, /* @__PURE__ */ jsx("message", { children: content }));
 			}, 1);
-			this.logger.info(`成功推送直播消息群组/频道：${success}`);
+			this.logger.info(`成功推送直播消息：${success.length}条`);
 		}
 		if (type === PushType.LiveGuardBuy && record.liveGuardBuyArr?.length >= 1) {
 			this.logger.info(record.liveGuardBuyArr);
@@ -1022,7 +1158,7 @@ var ComRegister = class {
 			const success = await withRetry(async () => {
 				return await this.ctx.broadcast(liveGuardBuyArr, /* @__PURE__ */ jsx("message", { children: content }));
 			}, 1);
-			this.logger.info(`成功推送上舰消息群组/频道：${success}`);
+			this.logger.info(`成功推送上舰消息：${success.length}条`);
 		}
 		return;
 	}
@@ -1282,8 +1418,7 @@ var ComRegister = class {
 		return await this.broadcastToTargets(uid, msg, liveType === LiveType.StartBroadcasting ? PushType.StartBroadcasting : PushType.Live);
 	}
 	async segmentDanmaku(danmaku, danmakuWeightRecord) {
-		this._segmentit.doSegment(danmaku).map(({ w: w$3, p: p$1 }) => {
-			if (p$1 && p$1 === 2048) return;
+		this._jieba.cut(danmaku, true).filter((word) => word.length >= 2 && !stopwords.has(word)).map((w$3) => {
 			danmakuWeightRecord[w$3] = (danmakuWeightRecord[w$3] || 0) + 1;
 		});
 	}
@@ -1850,7 +1985,7 @@ var ComRegister = class {
 		dynamicDebugMode: Schema.boolean().required()
 	});
 })(ComRegister || (ComRegister = {}));
-var comRegister_default = ComRegister;
+var command_register_default = ComRegister;
 
 //#endregion
 //#region src/database.ts
@@ -93104,7 +93239,7 @@ var require_lib = __commonJS$1({ "node_modules/koishi-plugin-puppeteer/lib/index
 } });
 
 //#endregion
-//#region src/generateImg.ts
+//#region src/generate_img.ts
 var import_lib = __toESM$1(require_lib());
 const DYNAMIC_TYPE_NONE = "DYNAMIC_TYPE_NONE";
 const DYNAMIC_TYPE_FORWARD = "DYNAMIC_TYPE_FORWARD";
@@ -94592,7 +94727,7 @@ var GenerateImg = class extends Service {
 		followerDisplay: Schema.boolean()
 	});
 })(GenerateImg || (GenerateImg = {}));
-var generateImg_default = GenerateImg;
+var generate_img_default = GenerateImg;
 
 //#endregion
 //#region node_modules/@oxc-project/runtime/src/helpers/decorate.js
@@ -94607,7 +94742,7 @@ var require_decorate = __commonJS$1({ "node_modules/@oxc-project/runtime/src/hel
 } });
 
 //#endregion
-//#region src/biliAPI.ts
+//#region src/bili_api.ts
 var import_decorate = __toESM$1(require_decorate());
 const mixinKeyEncTab = [
 	46,
@@ -95300,10 +95435,10 @@ var BiliAPI = class extends Service {
 		key: Schema.string().pattern(/^[0-9a-f]{32}$/).required()
 	});
 })(BiliAPI || (BiliAPI = {}));
-var biliAPI_default = BiliAPI;
+var bili_api_default = BiliAPI;
 
 //#endregion
-//#region src/blive.ts
+//#region src/bili_live.ts
 var BLive = class extends Service {
 	static inject = ["ba"];
 	listenerRecord = {};
@@ -95333,7 +95468,7 @@ var BLive = class extends Service {
 		this.logger.warn(`${roomId}直播间连接未成功关闭`);
 	}
 };
-var blive_default = BLive;
+var bili_live_default = BLive;
 
 //#endregion
 //#region src/index.ts
@@ -95375,11 +95510,11 @@ var ServerManager = class extends Service {
 	registerPlugin = () => {
 		if (this.servers.length !== 0) return false;
 		try {
-			const ba = this.ctx.plugin(biliAPI_default, {
+			const ba = this.ctx.plugin(bili_api_default, {
 				userAgent: globalConfig.userAgent,
 				key: globalConfig.key
 			});
-			const gi = this.ctx.plugin(generateImg_default, {
+			const gi = this.ctx.plugin(generate_img_default, {
 				filter: globalConfig.filter,
 				removeBorder: globalConfig.removeBorder,
 				cardColorStart: globalConfig.cardColorStart,
@@ -95391,7 +95526,7 @@ var ServerManager = class extends Service {
 				font: globalConfig.font,
 				followerDisplay: globalConfig.followerDisplay
 			});
-			const cr = this.ctx.plugin(comRegister_default, {
+			const cr = this.ctx.plugin(command_register_default, {
 				sub: globalConfig.sub,
 				master: globalConfig.master,
 				wordcloud: globalConfig.wordcloud,
@@ -95408,7 +95543,7 @@ var ServerManager = class extends Service {
 				filter: globalConfig.filter,
 				dynamicDebugMode: globalConfig.dynamicDebugMode
 			});
-			const bl = this.ctx.plugin(blive_default);
+			const bl = this.ctx.plugin(bili_live_default);
 			this.servers.push(ba);
 			this.servers.push(bl);
 			this.servers.push(gi);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.2.9-rc.1",
+  "version": "3.2.9-rc.2",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],
@@ -36,6 +36,7 @@
   },
   "dependencies": {
     "@akokko/blive-message-listener": "^0.5.1",
+    "@node-rs/jieba": "^2.0.1",
     "@satorijs/element": "^3.1.8",
     "axios": "^1.10.0",
     "axios-cookiejar-support": "^6.0.2",
@@ -45,7 +46,6 @@
     "luxon": "^3.6.1",
     "md5": "^2.3.0",
     "qrcode": "^1.5.4",
-    "segmentit": "^2.0.3",
     "tough-cookie": "^5.1.2"
   },
   "devDependencies": {

package/readme.md

@@ -5,7 +5,6 @@
 ---
 
 - koishi-plugin-bilibili-notify [![npm](https://img.shields.io/npm/v/koishi-plugin-bilibili-notify?style=flat-square)](https://www.npmjs.com/package/koishi-plugin-bilibili-notify)
-  - [重要通知](#重要通知)
   - [重新订阅](#重新订阅)
   - [功能](#功能)
   - [注意事项](#注意事项)
@@ -16,10 +15,6 @@
   - [感谢](#感谢)
   - [License](#License)
 
-## 重要通知
-> [!WARNING]
-> `3.2.5-alpha.x` 目前均为测试版本，请不要更新🙅
-
 ## 重新订阅
 > [!NOTE]
 >由于版本 `2.0.0-alpha.7` 重构了订阅功能，从 `2.0.0-alpha.7` 以前版本升级到以后版本的需重新订阅
@@ -305,8 +300,11 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 > - ver 3.2.9-alpha.2 修复：`AxiosError: Request failed with status code 404 xxx at async BiliAPI.checkIfTokenNeedRefresh`、潜在cookie相关bug、弹幕词云bug `Error: 生成图片失败！错误: TimeoutError: Navigation timeout of 30000 ms exceeded`
 > - ver 3.2.9-alpha.3 修复：词云生成空白
 > - ver 3.2.9-alpha.4 修复：弹幕词云bug `Error: 生成图片失败！错误: TimeoutError: Navigation timeout of 30000 ms exceeded`
+
+> [!NOTE]
 > - ver 3.2.9-rc.0 优化：弹幕词云生成效果、选项 `pushTime` 设置为0时可关闭该功能； 新增：选项 `wordcloud` 可选择在直播结束后是否生成弹幕词云
 > - ver 3.2.9-rc.1 优化：弹幕词云生成效果；
+> - ver 3.2.9-rc.2 优化：弹幕词云生成效果；
 
 ## 交流群