koishi-plugin-bilibili-notify 3.2.6-alpha.0 → 3.2.7-alpha.1

package/lib/index.js

@@ -94412,6 +94412,11 @@ var BiliAPI = class extends koishi.Service {
 	loginNotifier;
 	refreshCookieTimer;
 	loginInfoIsLoaded = false;
+	wbiSign = {
+		img_key: "",
+		sub_key: ""
+	};
+	updateJob;
 	constructor(ctx, config) {
 		super(ctx, "ba");
 		this.apiConfig = config;
@@ -94422,11 +94427,29 @@ var BiliAPI = class extends koishi.Service {
 		this.cacheable.install(node_http.default.globalAgent);
 		this.cacheable.install(node_https.default.globalAgent);
 		await this.createNewClient();
-		this.loadCookiesFromDatabase();
+		await this.loadCookiesFromDatabase();
+		this.updateJob = new cron.CronJob("0 0 * * *", async () => {
+			await this.updateBiliTicket();
+		});
+		this.updateJob.start();
+		await this.updateBiliTicket();
 	}
 	stop() {
 		this.cacheable.uninstall(node_http.default.globalAgent);
 		this.cacheable.uninstall(node_https.default.globalAgent);
+		this.updateJob.stop();
+	}
+	async updateBiliTicket() {
+		try {
+			const csrf = this.getCSRF();
+			const ticket = await this.getBiliTicket(csrf);
+			if (ticket.code !== 0) throw new Error(`获取BiliTicket失败: ${ticket.message}`);
+			this.jar.setCookieSync(`bili_ticket=${ticket.data.ticket}; path=/; domain=.bilibili.com`, "https://www.bilibili.com");
+			this.wbiSign.img_key = ticket.data.nav.img.slice(ticket.data.nav.img.lastIndexOf("/") + 1, ticket.data.nav.img.lastIndexOf("."));
+			this.wbiSign.sub_key = ticket.data.nav.sub.slice(ticket.data.nav.sub.lastIndexOf("/") + 1, ticket.data.nav.sub.lastIndexOf("."));
+		} catch (e$1) {
+			this.logger.error(`更新BiliTicket失败: ${e$1.message}`);
+		}
 	}
 	getMixinKey = (orig) => mixinKeyEncTab.map((n$2) => orig[n$2]).join("").slice(0, 32);
 	encWbi(params, img_key, sub_key) {
@@ -94442,7 +94465,7 @@ var BiliAPI = class extends koishi.Service {
 		return `${query}&w_rid=${wbi_sign}`;
 	}
 	async getWbi(params) {
-		const web_keys = await this.getWbiKeys();
+		const web_keys = this.wbiSign || await this.getWbiKeys();
 		const img_key = web_keys.img_key;
 		const sub_key = web_keys.sub_key;
 		const query = this.encWbi(params, img_key, sub_key);
@@ -94587,16 +94610,39 @@ var BiliAPI = class extends koishi.Service {
 	disposeNotifier() {
 		if (this.loginNotifier) this.loginNotifier.dispose();
 	}
-	getRandomUserAgent() {
-		const userAgents = [
-			"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36",
-			"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36",
-			"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36",
-			"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36 Edg/123.0.0.0",
-			"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36"
-		];
-		const index = Math.floor(Math.random() * userAgents.length);
-		return userAgents[index];
+	/**
+	* Generate HMAC-SHA256 signature
+	* @param {string} key     The key string to use for the HMAC-SHA256 hash
+	* @param {string} message The message string to hash
+	* @returns {string} The HMAC-SHA256 signature as a hex string
+	*/
+	hmacSha256(key, message$1) {
+		const hmac = node_crypto.default.createHmac("sha256", key);
+		hmac.update(message$1);
+		return hmac.digest("hex");
+	}
+	/**
+	* Get Bilibili web ticket
+	* @param {string} csrf    CSRF token, can be empty or null
+	* @returns {Promise<any>} Promise of the ticket response in JSON format
+	*/
+	async getBiliTicket(csrf) {
+		const ts = Math.floor(Date.now() / 1e3);
+		const hexSign = this.hmacSha256("XgwSnGZ1p", `ts${ts}`);
+		const params = new URLSearchParams({
+			key_id: "ec02",
+			hexsign: hexSign,
+			"context[ts]": ts.toString(),
+			csrf: csrf || ""
+		});
+		const url = "https://api.bilibili.com/bapis/bilibili.api.ticket.v1.Ticket/GenWebTicket";
+		const resp = await this.client.post(`${url}?${params.toString()}`, {}, { headers: {
+			"Content-Type": "application/x-www-form-urlencoded",
+			"User-Agent": "Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/115.0"
+		} }).catch((e$1) => {
+			throw e$1;
+		});
+		return resp.data;
 	}
 	async createNewClient() {
 		const wrapper = (await import("axios-cookiejar-support")).wrapper;
@@ -94605,7 +94651,7 @@ var BiliAPI = class extends koishi.Service {
 			jar: this.jar,
 			headers: {
 				"Content-Type": "application/json",
-				"User-Agent": this.apiConfig.userAgent !== "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36" ? this.apiConfig.userAgent : this.getRandomUserAgent(),
+				"User-Agent": this.apiConfig.userAgent || "Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/115.0",
 				Origin: "https://www.bilibili.com",
 				Referer: "https://www.bilibili.com/"
 			}
@@ -95113,7 +95159,7 @@ const Config = koishi.Schema.object({
 		masterAccountGuildId: koishi.Schema.string().role("secret").description("主人账号所在的群组ID，只有在QQ频道、Discord这样的环境才需要填写，请使用inspect插件获取群组ID")
 	}), koishi.Schema.object({})])]),
 	basicSettings: koishi.Schema.object({}).description("基本设置"),
-	userAgent: koishi.Schema.string().required().description("设置请求头User-Agen，请求出现-352时可以尝试修改，UA获取方法可参考：https://blog.csdn.net/qq_44503987/article/details/104929111"),
+	userAgent: koishi.Schema.string().description("设置请求头User-Agen，请求出现-352时可以尝试修改，UA获取方法可参考：https://blog.csdn.net/qq_44503987/article/details/104929111"),
 	subTitle: koishi.Schema.object({}).description("订阅配置"),
 	sub: koishi.Schema.array(koishi.Schema.object({
 		name: koishi.Schema.string().description("订阅用户昵称，只是给你自己看的(相当于备注)，可填可不填"),

package/lib/index.mjs

@@ -94414,6 +94414,11 @@ var BiliAPI = class extends Service {
 	loginNotifier;
 	refreshCookieTimer;
 	loginInfoIsLoaded = false;
+	wbiSign = {
+		img_key: "",
+		sub_key: ""
+	};
+	updateJob;
 	constructor(ctx, config) {
 		super(ctx, "ba");
 		this.apiConfig = config;
@@ -94424,11 +94429,29 @@ var BiliAPI = class extends Service {
 		this.cacheable.install(http.globalAgent);
 		this.cacheable.install(https.globalAgent);
 		await this.createNewClient();
-		this.loadCookiesFromDatabase();
+		await this.loadCookiesFromDatabase();
+		this.updateJob = new CronJob("0 0 * * *", async () => {
+			await this.updateBiliTicket();
+		});
+		this.updateJob.start();
+		await this.updateBiliTicket();
 	}
 	stop() {
 		this.cacheable.uninstall(http.globalAgent);
 		this.cacheable.uninstall(https.globalAgent);
+		this.updateJob.stop();
+	}
+	async updateBiliTicket() {
+		try {
+			const csrf = this.getCSRF();
+			const ticket = await this.getBiliTicket(csrf);
+			if (ticket.code !== 0) throw new Error(`获取BiliTicket失败: ${ticket.message}`);
+			this.jar.setCookieSync(`bili_ticket=${ticket.data.ticket}; path=/; domain=.bilibili.com`, "https://www.bilibili.com");
+			this.wbiSign.img_key = ticket.data.nav.img.slice(ticket.data.nav.img.lastIndexOf("/") + 1, ticket.data.nav.img.lastIndexOf("."));
+			this.wbiSign.sub_key = ticket.data.nav.sub.slice(ticket.data.nav.sub.lastIndexOf("/") + 1, ticket.data.nav.sub.lastIndexOf("."));
+		} catch (e$1) {
+			this.logger.error(`更新BiliTicket失败: ${e$1.message}`);
+		}
 	}
 	getMixinKey = (orig) => mixinKeyEncTab.map((n$2) => orig[n$2]).join("").slice(0, 32);
 	encWbi(params, img_key, sub_key) {
@@ -94444,7 +94467,7 @@ var BiliAPI = class extends Service {
 		return `${query}&w_rid=${wbi_sign}`;
 	}
 	async getWbi(params) {
-		const web_keys = await this.getWbiKeys();
+		const web_keys = this.wbiSign || await this.getWbiKeys();
 		const img_key = web_keys.img_key;
 		const sub_key = web_keys.sub_key;
 		const query = this.encWbi(params, img_key, sub_key);
@@ -94589,16 +94612,39 @@ var BiliAPI = class extends Service {
 	disposeNotifier() {
 		if (this.loginNotifier) this.loginNotifier.dispose();
 	}
-	getRandomUserAgent() {
-		const userAgents = [
-			"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36",
-			"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36",
-			"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36",
-			"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36 Edg/123.0.0.0",
-			"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36"
-		];
-		const index = Math.floor(Math.random() * userAgents.length);
-		return userAgents[index];
+	/**
+	* Generate HMAC-SHA256 signature
+	* @param {string} key     The key string to use for the HMAC-SHA256 hash
+	* @param {string} message The message string to hash
+	* @returns {string} The HMAC-SHA256 signature as a hex string
+	*/
+	hmacSha256(key, message$1) {
+		const hmac = crypto.createHmac("sha256", key);
+		hmac.update(message$1);
+		return hmac.digest("hex");
+	}
+	/**
+	* Get Bilibili web ticket
+	* @param {string} csrf    CSRF token, can be empty or null
+	* @returns {Promise<any>} Promise of the ticket response in JSON format
+	*/
+	async getBiliTicket(csrf) {
+		const ts = Math.floor(Date.now() / 1e3);
+		const hexSign = this.hmacSha256("XgwSnGZ1p", `ts${ts}`);
+		const params = new URLSearchParams({
+			key_id: "ec02",
+			hexsign: hexSign,
+			"context[ts]": ts.toString(),
+			csrf: csrf || ""
+		});
+		const url = "https://api.bilibili.com/bapis/bilibili.api.ticket.v1.Ticket/GenWebTicket";
+		const resp = await this.client.post(`${url}?${params.toString()}`, {}, { headers: {
+			"Content-Type": "application/x-www-form-urlencoded",
+			"User-Agent": "Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/115.0"
+		} }).catch((e$1) => {
+			throw e$1;
+		});
+		return resp.data;
 	}
 	async createNewClient() {
 		const wrapper = (await import("axios-cookiejar-support")).wrapper;
@@ -94607,7 +94653,7 @@ var BiliAPI = class extends Service {
 			jar: this.jar,
 			headers: {
 				"Content-Type": "application/json",
-				"User-Agent": this.apiConfig.userAgent !== "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36" ? this.apiConfig.userAgent : this.getRandomUserAgent(),
+				"User-Agent": this.apiConfig.userAgent || "Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/115.0",
 				Origin: "https://www.bilibili.com",
 				Referer: "https://www.bilibili.com/"
 			}
@@ -95115,7 +95161,7 @@ const Config = Schema.object({
 		masterAccountGuildId: Schema.string().role("secret").description("主人账号所在的群组ID，只有在QQ频道、Discord这样的环境才需要填写，请使用inspect插件获取群组ID")
 	}), Schema.object({})])]),
 	basicSettings: Schema.object({}).description("基本设置"),
-	userAgent: Schema.string().required().description("设置请求头User-Agen，请求出现-352时可以尝试修改，UA获取方法可参考：https://blog.csdn.net/qq_44503987/article/details/104929111"),
+	userAgent: Schema.string().description("设置请求头User-Agen，请求出现-352时可以尝试修改，UA获取方法可参考：https://blog.csdn.net/qq_44503987/article/details/104929111"),
 	subTitle: Schema.object({}).description("订阅配置"),
 	sub: Schema.array(Schema.object({
 		name: Schema.string().description("订阅用户昵称，只是给你自己看的(相当于备注)，可填可不填"),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.2.6-alpha.0",
+  "version": "3.2.7-alpha.1",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],

package/readme.md

@@ -277,26 +277,24 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 > - ver 3.2.3 优化：移除不必要的代码；
 > - ver 3.2.4-alpha.0 优化：选项 `pushImgsInDynamic` 发送多图会以转发消息的格式发> 送； 新增：选项 `dynamicVideoUrlToBV` 开启后将链接转换为bv号以用作特殊用途；
 > - ver 3.2.4 修复：第一次使用插件时，使用登录指令报错； 插件配置页新增和删除提示信息；
-> 
-> > [!WARNING]
-> > `3.2.5-alpha.x` 目前均为测试版本，请不要更新🙅
-> > - ver 3.2.5-alpha.0 优化：新增 `DNS` 缓存，以减少DNS错误；
-> > - ver 3.2.5-alpha.1 测试版本
-> > - ver 3.2.5-alpha.2 测试版本
-> > - ver 3.2.5-alpha.3 更新依赖版本
-> > - ver 3.2.5-alpha.4 测试版本
-> > - ver 3.2.5-alpha.5 测试版本
-> > - ver 3.2.5-alpha.6 测试版本
-> > - ver 3.2.5-alpha.7 测试版本
-> > - ver 3.2.5-alpha.8 测试版本
-> > - ver 3.2.5-alpha.9 测试版本
-> > - ver 3.2.5-alpha.10 测试版本
-> > - ver 3.2.5-alpha.11 测试版本
-> > - ver 3.2.5-alpha.12 测试版本
-> > - ver 3.2.5-alpha.13 测试版本
-> 
+> - ver 3.2.5-alpha.0 优化：新增 `DNS` 缓存，以减少DNS错误；
+> - ver 3.2.5-alpha.1 测试版本
+> - ver 3.2.5-alpha.2 测试版本
+> - ver 3.2.5-alpha.3 更新依赖版本
+> - ver 3.2.5-alpha.4 测试版本
+> - ver 3.2.5-alpha.5 测试版本
+> - ver 3.2.5-alpha.6 测试版本
+> - ver 3.2.5-alpha.7 测试版本
+> - ver 3.2.5-alpha.8 测试版本
+> - ver 3.2.5-alpha.9 测试版本
+> - ver 3.2.5-alpha.10 测试版本
+> - ver 3.2.5-alpha.11 测试版本
+> - ver 3.2.5-alpha.12 测试版本
+> - ver 3.2.5-alpha.13 测试版本
 > - ver 3.2.5 重构：消息推送逻辑； 新增：选项 `dynamicCron`；
 > - ver 3.2.6-alpha.0 优化：更新依赖； 修复：长图动态向下箭头无法显示的bug；
+> - ver 3.2.7-alpha.0 优化：将选项 `userAgent` 更改为可选项，在 `cookies` 中添加 `bili_ticket` 降低风控概率；
+> - ver 3.2.7-alpha.1 修复：加载 `bili_ticket` 失败会导致插件加载失败；
 
 ## 交流群