koishi-plugin-bilibili-notify 3.3.13 → 3.3.15

package/lib/{index.js → index.cjs}

@@ -30,24 +30,18 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 //#endregion
 let koishi = require("koishi");
-koishi = __toESM(koishi);
 require("@koishijs/plugin-notifier");
 require("@koishijs/plugin-help");
+let node_url = require("node:url");
+let node_path = require("node:path");
+let blive_message_listener = require("blive-message-listener");
 let qrcode = require("qrcode");
 qrcode = __toESM(qrcode);
 let cron = require("cron");
-cron = __toESM(cron);
 let luxon = require("luxon");
-luxon = __toESM(luxon);
 let __node_rs_jieba = require("@node-rs/jieba");
-__node_rs_jieba = __toESM(__node_rs_jieba);
 let __node_rs_jieba_dict = require("@node-rs/jieba/dict");
-__node_rs_jieba_dict = __toESM(__node_rs_jieba_dict);
 require("koishi-plugin-puppeteer");
-let node_path = require("node:path");
-node_path = __toESM(node_path);
-let node_url = require("node:url");
-node_url = __toESM(node_url);
 let md5 = require("md5");
 md5 = __toESM(md5);
 let node_crypto = require("node:crypto");
@@ -59,13 +53,8 @@ node_https = __toESM(node_https);
 let axios = require("axios");
 axios = __toESM(axios);
 let tough_cookie = require("tough-cookie");
-tough_cookie = __toESM(tough_cookie);
-let jsdom = require("jsdom");
-jsdom = __toESM(jsdom);
 let openai = require("openai");
 openai = __toESM(openai);
-let blive_message_listener = require("blive-message-listener");
-blive_message_listener = __toESM(blive_message_listener);
 
 //#region src/config.ts
 const BAConfigSchema = koishi.Schema.object({
@@ -199,7 +188,7 @@ async function withRetry(fn, maxAttempts = 3, delayMs = 1e3) {
 	} catch (error) {
 		attempt++;
 		if (attempt >= maxAttempts) throw error;
-		await new Promise((resolve$1) => setTimeout(resolve$1, delayMs * attempt));
+		await new Promise((resolve$2) => setTimeout(resolve$2, delayMs * attempt));
 	}
 }
 function replaceButKeep(oldObj, newObj, keepKeys) {
@@ -1321,6 +1310,11 @@ var ComRegister = class {
 		let masterInfo;
 		const liveData = { likedNum: "0" };
 		const liveMsgObj = this.liveMsgManager.get(sub.uid);
+		const guardLevelImg = {
+			[blive_message_listener.GuardLevel.Jianzhang]: (0, node_url.pathToFileURL)((0, node_path.resolve)(__dirname, "img/captain.png")),
+			[blive_message_listener.GuardLevel.Tidu]: (0, node_url.pathToFileURL)((0, node_path.resolve)(__dirname, "img/supervisor.png")),
+			[blive_message_listener.GuardLevel.Zongdu]: (0, node_url.pathToFileURL)((0, node_path.resolve)(__dirname, "img/governor.png"))
+		};
 		const sendDanmakuWordCloudAndLiveSummary = async (customLiveSummary) => {
 			this.logger.info("开始制作弹幕词云");
 			this.logger.info("正在获取前90热词");
@@ -1458,7 +1452,8 @@ var ComRegister = class {
 				console.log(liveData.likedNum);
 			},
 			onGuardBuy: ({ body }) => {
-				const content = (0, koishi.h)("message", [koishi.h.text(`【${masterInfo.username}的直播间】${body.user.uname}加入了大航海（${body.gift_name}）`)]);
+				const guardImg = guardLevelImg[body.guard_level];
+				const content = (0, koishi.h)("message", [koishi.h.text(`【${masterInfo.username}的直播间】${body.user.uname}加入了大航海（${body.gift_name}）`), koishi.h.image(guardImg.href)]);
 				this.broadcastToTargets(sub.uid, content, PushType.LiveGuardBuy);
 			},
 			onLiveStart: async () => {
@@ -1698,10 +1693,10 @@ var ComRegister = class {
 		this.subNotifier = this.ctx.notifier.create(table);
 	}
 	async checkIfLoginInfoIsLoaded() {
-		return new Promise((resolve$1) => {
+		return new Promise((resolve$2) => {
 			const check = () => {
 				if (!this.ctx["bilibili-notify-api"].getLoginInfoIsLoaded()) this.ctx.setTimeout(check, 500);
-				else resolve$1("success");
+				else resolve$2("success");
 			};
 			check();
 		});
@@ -4192,7 +4187,8 @@ var BiliAPI = class extends koishi.Service {
 		}
 		const correspondPath = await getCorrespondPath(luxon.DateTime.now().toMillis());
 		const { data: refreshCsrfHtml } = await this.client.get(`https://www.bilibili.com/correspond/1/${correspondPath}`);
-		const { document } = new jsdom.JSDOM(refreshCsrfHtml).window;
+		const { JSDOM } = await import("jsdom");
+		const { document } = new JSDOM(refreshCsrfHtml).window;
 		const targetElement = document.getElementById("1-name");
 		const refresh_csrf = targetElement ? targetElement.textContent : null;
 		const { data: refreshData } = await this.client.post("https://passport.bilibili.com/x/passport-login/web/cookie/refresh", {
@@ -4409,10 +4405,10 @@ var ServerManager = class extends koishi.Service {
 	};
 	disposePlugin = async () => {
 		if (this.servers.length === 0) return false;
-		await new Promise((resolve$1) => {
+		await new Promise((resolve$2) => {
 			for (const fork of this.servers) fork.dispose();
 			this.servers = [];
-			resolve$1("ok");
+			resolve$2("ok");
 		});
 		return true;
 	};
@@ -4422,15 +4418,15 @@ var ServerManager = class extends koishi.Service {
 			return false;
 		}
 		await this.disposePlugin();
-		return new Promise((resolve$1) => {
+		return new Promise((resolve$2) => {
 			this.ctx.setTimeout(() => {
 				try {
 					this.registerPlugin();
 				} catch (e) {
 					this.logger.error("重启插件失败", e);
-					resolve$1(false);
+					resolve$2(false);
 				}
-				resolve$1(true);
+				resolve$2(true);
 			}, 1e3);
 		});
 	};

package/lib/index.mjs

@@ -2,23 +2,22 @@ import "node:module";
 import { Schema, Service, Universal, h } from "koishi";
 import "@koishijs/plugin-notifier";
 import "@koishijs/plugin-help";
+import { pathToFileURL } from "node:url";
+import { resolve } from "node:path";
+import { GuardLevel, startListen } from "blive-message-listener";
 import QRCode from "qrcode";
 import { CronJob } from "cron";
 import { DateTime } from "luxon";
 import { Jieba } from "@node-rs/jieba";
 import { dict } from "@node-rs/jieba/dict";
 import "koishi-plugin-puppeteer";
-import { resolve } from "node:path";
-import { pathToFileURL } from "node:url";
 import md5 from "md5";
 import crypto from "node:crypto";
 import http from "node:http";
 import https from "node:https";
 import axios from "axios";
 import { Cookie, CookieJar } from "tough-cookie";
-import { JSDOM } from "jsdom";
 import OpenAI from "openai";
-import { startListen } from "blive-message-listener";
 
 //#region rolldown:runtime
 var __defProp = Object.defineProperty;
@@ -1286,6 +1285,11 @@ var ComRegister = class {
 		let masterInfo;
 		const liveData = { likedNum: "0" };
 		const liveMsgObj = this.liveMsgManager.get(sub.uid);
+		const guardLevelImg = {
+			[GuardLevel.Jianzhang]: pathToFileURL(resolve(__dirname, "img/captain.png")),
+			[GuardLevel.Tidu]: pathToFileURL(resolve(__dirname, "img/supervisor.png")),
+			[GuardLevel.Zongdu]: pathToFileURL(resolve(__dirname, "img/governor.png"))
+		};
 		const sendDanmakuWordCloudAndLiveSummary = async (customLiveSummary) => {
 			this.logger.info("开始制作弹幕词云");
 			this.logger.info("正在获取前90热词");
@@ -1423,7 +1427,8 @@ var ComRegister = class {
 				console.log(liveData.likedNum);
 			},
 			onGuardBuy: ({ body }) => {
-				const content = h("message", [h.text(`【${masterInfo.username}的直播间】${body.user.uname}加入了大航海（${body.gift_name}）`)]);
+				const guardImg = guardLevelImg[body.guard_level];
+				const content = h("message", [h.text(`【${masterInfo.username}的直播间】${body.user.uname}加入了大航海（${body.gift_name}）`), h.image(guardImg.href)]);
 				this.broadcastToTargets(sub.uid, content, PushType.LiveGuardBuy);
 			},
 			onLiveStart: async () => {
@@ -4157,6 +4162,7 @@ var BiliAPI = class extends Service {
 		}
 		const correspondPath = await getCorrespondPath(DateTime.now().toMillis());
 		const { data: refreshCsrfHtml } = await this.client.get(`https://www.bilibili.com/correspond/1/${correspondPath}`);
+		const { JSDOM } = await import("jsdom");
 		const { document } = new JSDOM(refreshCsrfHtml).window;
 		const targetElement = document.getElementById("1-name");
 		const refresh_csrf = targetElement ? targetElement.textContent : null;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.3.13",
-  "main": "./lib/index.js",
+  "version": "3.3.15",
+  "main": "./lib/index.cjs",
   "typings": "lib/index.d.ts",
   "files": [
     "lib",
@@ -29,30 +29,30 @@
   },
   "dependencies": {
     "@node-rs/jieba": "^2.0.1",
-    "axios": "^1.11.0",
+    "axios": "^1.13.2",
     "axios-cookiejar-support": "^6.0.4",
-    "blive-message-listener": "^0.5.1",
+    "blive-message-listener": "^0.5.2",
     "cacheable-lookup": "^7.0.0",
     "cron": "^4.3.3",
-    "jsdom": "^26.1.0",
-    "luxon": "^3.7.1",
+    "jsdom": "^27.1.0",
+    "luxon": "^3.8.0-alpha.1",
     "md5": "^2.3.0",
-    "openai": "^5.20.0",
-    "p-retry": "^6.2.1",
+    "openai": "^6.8.1",
+    "p-retry": "^7.1.0",
     "qrcode": "^1.5.4",
-    "tough-cookie": "^5.1.2"
+    "tough-cookie": "^6.0.0"
   },
   "devDependencies": {
-    "@types/jsdom": "^21.1.7",
+    "@types/jsdom": "^27.0.0",
     "@types/luxon": "^3.7.1",
-    "@types/md5": "^2.3.5",
-    "@types/qrcode": "^1.5.5",
+    "@types/md5": "^2.3.6",
+    "@types/qrcode": "^1.5.6",
     "@types/tough-cookie": "^4.0.5",
     "koishi-plugin-puppeteer": "^3.9.0",
-    "tsdown": "^0.13.3"
+    "tsdown": "^0.16.0"
   },
   "peerDependencies": {
-    "koishi": "^4.18.8"
+    "koishi": "^4.18.9"
   },
   "engines": {
     "node": ">= 20.0.0"
@@ -73,11 +73,11 @@
     "access": "public"
   },
   "module": "./lib/index.mjs",
-  "types": "./lib/index.d.ts",
+  "types": "./lib/index.d.cts",
   "exports": {
     ".": {
       "import": "./lib/index.mjs",
-      "require": "./lib/index.js"
+      "require": "./lib/index.cjs"
     },
     "./package.json": "./package.json"
   }