koishi-plugin-bilibili-notify 3.2.9-rc.4 → 3.2.10-alpha.1

package/lib/index.js

@@ -862,7 +862,7 @@ var ComRegister = class {
 							bili_cookies: encryptedCookies,
 							bili_refresh_token: encryptedRefreshToken
 						}]);
-						this.loginDBData = (await this.ctx.database.get("loginBili", 1, ["dynamic_group_id"]))[0];
+						this.loginDBData = (await this.ctx.database.get("loginBili", 1))[0];
 						await this.ctx.ba.loadCookiesFromDatabase();
 						await this.checkIfLoginInfoIsLoaded();
 						this.loginTimer();
@@ -1038,6 +1038,34 @@ var ComRegister = class {
 			const danmakerRankMsg = this.config.liveSummary.replace("-dmc", "114").replace("-mdn", "特工").replace("-dca", "514").replace("-un1", `${top5DanmakuMaker[0][0]}`).replace("-dc1", `${top5DanmakuMaker[0][1]}`).replace("-un2", `${top5DanmakuMaker[1][0]}`).replace("-dc2", `${top5DanmakuMaker[1][1]}`).replace("-un3", `${top5DanmakuMaker[2][0]}`).replace("-dc3", `${top5DanmakuMaker[2][1]}`).replace("-un4", `${top5DanmakuMaker[3][0]}`).replace("-dc4", `${top5DanmakuMaker[3][1]}`).replace("-un5", `${top5DanmakuMaker[4][0]}`).replace("-dc5", `${top5DanmakuMaker[4][1]}`).replaceAll("\\n", "\n");
 			await session.send(danmakerRankMsg);
 		});
+		biliCom.subcommand(".cap").action(async ({ session }) => {
+			const { code: userInfoCode, data: userInfoData } = await withRetry(async () => {
+				const data$2 = await this.ctx.ba.getUserInfo("114514");
+				return {
+					code: 0,
+					data: data$2
+				};
+			}).then((content) => content.data);
+			if (userInfoCode !== -352 || !userInfoData.v_voucher) return "不满足验证条件，不需要执行该命令，如果提示风控可以尝试重启插件";
+			const { data: data$1 } = await ctx.ba.v_voucherCaptcha(userInfoData.v_voucher);
+			if (!data$1.geetest) return "当前风控无法通过该验证解除，或许考虑人工申诉？";
+			await session.send("请到该网站进行验证操作：https://kuresaru.github.io/geetest-validator/");
+			await session.send("请手动填入 gt 和 challenge 后点击生成进行验证，验证完成后点击结果，根据提示输入对应validate");
+			await session.send(`gt:${data$1.geetest.gt}`);
+			await session.send(`challenge:${data$1.geetest.challenge}`);
+			await session.send("请输入validate");
+			const validate$1 = await session.prompt();
+			const seccode = `${validate$1}|jordan`;
+			const { data: validateCaptchaData } = await ctx.ba.validateCaptcha(data$1.geetest.challenge, data$1.token, validate$1, seccode);
+			if (validateCaptchaData.is_valid !== 1) return "验证不成功！";
+			ctx.ba.addCookie(`x-bili-gaia-vtoken=${validateCaptchaData.grisk_id}`);
+			const encryptedCookies = ctx.ba.encrypt(ctx.ba.getCookies());
+			await ctx.database.upsert("loginBili", [{
+				id: 1,
+				bili_cookies: encryptedCookies
+			}]);
+			return "验证成功！请重启插件";
+		});
 	}
 	async init(config) {
 		this.logger = this.ctx.logger("cr");
@@ -1918,7 +1946,7 @@ var ComRegister = class {
 		this.preInitConfig(subs);
 		for (const sub of subs) {
 			this.logger.info(`加载订阅UID:${sub.uid}中...`);
-			const { code: userInfoCode, msg: userInfoMsg, data: userInfoData } = await withRetry(async () => {
+			const { code: userInfoCode, message: userInfoMsg, data: userInfoData } = await withRetry(async () => {
 				const data$1 = await this.ctx.ba.getUserInfo(sub.uid);
 				return {
 					code: 0,
@@ -1931,6 +1959,14 @@ var ComRegister = class {
 					message: `加载订阅UID:${sub.uid}失败！`
 				};
 			});
+			if (userInfoCode === -352 && userInfoData.v_voucher) {
+				this.logger.info("账号被风控，请使用指令 bili captcha 进行风控验证");
+				await this.sendPrivateMsg("账号被风控，请使用指令 bili cap 进行风控验证");
+				return {
+					code: userInfoCode,
+					msg: userInfoMsg
+				};
+			}
 			if (userInfoCode !== 0) return {
 				code: userInfoCode,
 				msg: userInfoMsg
@@ -94943,7 +94979,7 @@ var BiliAPI = class extends koishi.Service {
 			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.addCookie(`bili_ticket=${ticket.data.ticket}`);
 			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) {
@@ -95158,6 +95194,9 @@ var BiliAPI = class extends koishi.Service {
 			}
 		}));
 	}
+	addCookie(cookieStr) {
+		this.jar.setCookieSync(`${cookieStr}; path=/; domain=.bilibili.com`, "https://www.bilibili.com");
+	}
 	getCookies() {
 		try {
 			const cookies = this.jar.serializeSync().cookies.map((cookie) => {
@@ -95361,6 +95400,32 @@ var BiliAPI = class extends koishi.Service {
 			case -400: throw new Error("请求错误");
 		}
 	}
+	async v_voucherCaptcha(v_voucher) {
+		const csrf = this.getCSRF();
+		const { data: data$1 } = await this.client.post("https://api.bilibili.com/x/gaia-vgate/v1/register", {
+			csrf,
+			v_voucher
+		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } }).catch((e$1) => {
+			this.logger.error(e$1);
+		});
+		if (data$1.code !== 0) this.logger.error("验证码获取失败！");
+		return { data: data$1.data };
+	}
+	async validateCaptcha(challenge, token, validate$1, seccode) {
+		const csrf = this.getCSRF();
+		const { data: data$1 } = await this.client.post("https://api.bilibili.com/x/gaia-vgate/v1/validate", {
+			csrf,
+			challenge,
+			token,
+			validate: validate$1,
+			seccode
+		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
+		if (data$1.code !== 0) {
+			this.logger.info(`验证失败：错误码=${data$1.code}，错误消息:${data$1.message}`);
+			return { data: null };
+		}
+		return { data: data$1.data };
+	}
 };
 (0, import_decorate.default)([Retry({
 	attempts: 3,

package/lib/index.mjs

@@ -864,7 +864,7 @@ var ComRegister = class {
 							bili_cookies: encryptedCookies,
 							bili_refresh_token: encryptedRefreshToken
 						}]);
-						this.loginDBData = (await this.ctx.database.get("loginBili", 1, ["dynamic_group_id"]))[0];
+						this.loginDBData = (await this.ctx.database.get("loginBili", 1))[0];
 						await this.ctx.ba.loadCookiesFromDatabase();
 						await this.checkIfLoginInfoIsLoaded();
 						this.loginTimer();
@@ -1040,6 +1040,34 @@ var ComRegister = class {
 			const danmakerRankMsg = this.config.liveSummary.replace("-dmc", "114").replace("-mdn", "特工").replace("-dca", "514").replace("-un1", `${top5DanmakuMaker[0][0]}`).replace("-dc1", `${top5DanmakuMaker[0][1]}`).replace("-un2", `${top5DanmakuMaker[1][0]}`).replace("-dc2", `${top5DanmakuMaker[1][1]}`).replace("-un3", `${top5DanmakuMaker[2][0]}`).replace("-dc3", `${top5DanmakuMaker[2][1]}`).replace("-un4", `${top5DanmakuMaker[3][0]}`).replace("-dc4", `${top5DanmakuMaker[3][1]}`).replace("-un5", `${top5DanmakuMaker[4][0]}`).replace("-dc5", `${top5DanmakuMaker[4][1]}`).replaceAll("\\n", "\n");
 			await session.send(danmakerRankMsg);
 		});
+		biliCom.subcommand(".cap").action(async ({ session }) => {
+			const { code: userInfoCode, data: userInfoData } = await withRetry(async () => {
+				const data$2 = await this.ctx.ba.getUserInfo("114514");
+				return {
+					code: 0,
+					data: data$2
+				};
+			}).then((content) => content.data);
+			if (userInfoCode !== -352 || !userInfoData.v_voucher) return "不满足验证条件，不需要执行该命令，如果提示风控可以尝试重启插件";
+			const { data: data$1 } = await ctx.ba.v_voucherCaptcha(userInfoData.v_voucher);
+			if (!data$1.geetest) return "当前风控无法通过该验证解除，或许考虑人工申诉？";
+			await session.send("请到该网站进行验证操作：https://kuresaru.github.io/geetest-validator/");
+			await session.send("请手动填入 gt 和 challenge 后点击生成进行验证，验证完成后点击结果，根据提示输入对应validate");
+			await session.send(`gt:${data$1.geetest.gt}`);
+			await session.send(`challenge:${data$1.geetest.challenge}`);
+			await session.send("请输入validate");
+			const validate$1 = await session.prompt();
+			const seccode = `${validate$1}|jordan`;
+			const { data: validateCaptchaData } = await ctx.ba.validateCaptcha(data$1.geetest.challenge, data$1.token, validate$1, seccode);
+			if (validateCaptchaData.is_valid !== 1) return "验证不成功！";
+			ctx.ba.addCookie(`x-bili-gaia-vtoken=${validateCaptchaData.grisk_id}`);
+			const encryptedCookies = ctx.ba.encrypt(ctx.ba.getCookies());
+			await ctx.database.upsert("loginBili", [{
+				id: 1,
+				bili_cookies: encryptedCookies
+			}]);
+			return "验证成功！请重启插件";
+		});
 	}
 	async init(config) {
 		this.logger = this.ctx.logger("cr");
@@ -1920,7 +1948,7 @@ var ComRegister = class {
 		this.preInitConfig(subs);
 		for (const sub of subs) {
 			this.logger.info(`加载订阅UID:${sub.uid}中...`);
-			const { code: userInfoCode, msg: userInfoMsg, data: userInfoData } = await withRetry(async () => {
+			const { code: userInfoCode, message: userInfoMsg, data: userInfoData } = await withRetry(async () => {
 				const data$1 = await this.ctx.ba.getUserInfo(sub.uid);
 				return {
 					code: 0,
@@ -1933,6 +1961,14 @@ var ComRegister = class {
 					message: `加载订阅UID:${sub.uid}失败！`
 				};
 			});
+			if (userInfoCode === -352 && userInfoData.v_voucher) {
+				this.logger.info("账号被风控，请使用指令 bili captcha 进行风控验证");
+				await this.sendPrivateMsg("账号被风控，请使用指令 bili cap 进行风控验证");
+				return {
+					code: userInfoCode,
+					msg: userInfoMsg
+				};
+			}
 			if (userInfoCode !== 0) return {
 				code: userInfoCode,
 				msg: userInfoMsg
@@ -94945,7 +94981,7 @@ var BiliAPI = class extends Service {
 			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.addCookie(`bili_ticket=${ticket.data.ticket}`);
 			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) {
@@ -95160,6 +95196,9 @@ var BiliAPI = class extends Service {
 			}
 		}));
 	}
+	addCookie(cookieStr) {
+		this.jar.setCookieSync(`${cookieStr}; path=/; domain=.bilibili.com`, "https://www.bilibili.com");
+	}
 	getCookies() {
 		try {
 			const cookies = this.jar.serializeSync().cookies.map((cookie) => {
@@ -95363,6 +95402,32 @@ var BiliAPI = class extends Service {
 			case -400: throw new Error("请求错误");
 		}
 	}
+	async v_voucherCaptcha(v_voucher) {
+		const csrf = this.getCSRF();
+		const { data: data$1 } = await this.client.post("https://api.bilibili.com/x/gaia-vgate/v1/register", {
+			csrf,
+			v_voucher
+		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } }).catch((e$1) => {
+			this.logger.error(e$1);
+		});
+		if (data$1.code !== 0) this.logger.error("验证码获取失败！");
+		return { data: data$1.data };
+	}
+	async validateCaptcha(challenge, token, validate$1, seccode) {
+		const csrf = this.getCSRF();
+		const { data: data$1 } = await this.client.post("https://api.bilibili.com/x/gaia-vgate/v1/validate", {
+			csrf,
+			challenge,
+			token,
+			validate: validate$1,
+			seccode
+		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
+		if (data$1.code !== 0) {
+			this.logger.info(`验证失败：错误码=${data$1.code}，错误消息:${data$1.message}`);
+			return { data: null };
+		}
+		return { data: data$1.data };
+	}
 };
 (0, import_decorate.default)([Retry({
 	attempts: 3,

package/package.json

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

package/readme.md

@@ -307,6 +307,8 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 > - ver 3.2.9-rc.2 优化：弹幕词云生成效果；
 > - ver 3.2.9-rc.3 优化：弹幕词云生成效果； 新增：直播总结语，开启弹幕词云后自动发送、选项 `liveSummary` 可自定义直播总结语； 修复：一场直播完成后，如果插件中途没有被关闭过，会影响同一位up主下一次直播词云数据；
 > - ver 3.2.9-rc.4 优化：弹幕词云生成效果； 新增：直播总结 `-mdn` 变量，代表主播粉丝牌子名
+> - ver 3.2.10-alpha.0 新增：指令 `bili cap` 在遇到风控时，可以手动验证解除风控； 优化：错误消息提示；
+> - ver 3.2.10-alpha.1 优化：使用指令 `bili cap` 后将对应cookie保存到数据库中、 `bili cap` 提示信息；
 
 ## 交流群