@ikenxuan/amagi 5.11.0 → 5.12.0

package/dist/default/index.cjs

@@ -429,7 +429,8 @@ const BilibiliUserParamsSchema = zod.default.object({
 	methodType: zod.default.enum([
 		"用户主页数据",
 		"用户主页动态列表数据",
-		"获取UP主总播放量"
+		"获取UP主总播放量",
+		"用户空间详细信息"
 	], { error: "方法类型必须是指定的枚举值之一" }),
 	host_mid: smartNumber("UP主UID不能为空", 1, true)
 });
@@ -485,6 +486,19 @@ const BilibiliColumnInfoParamsSchema = zod.default.object({
 	methodType: zod.default.literal("文集基本信息", { error: "方法类型必须是\"文集基本信息\"" }),
 	id: zod.default.string({ error: "文集ID必须是字符串" }).min(1, { error: "文集ID不能为空" })
 });
+const BilibiliApplyCaptchaParamsSchema = zod.default.object({
+	methodType: zod.default.literal("从_v_voucher_申请_captcha", { error: "方法类型必须是\"从_v_voucher_申请_captcha\"" }),
+	csrf: zod.default.string({ error: "CSRF Token必须是字符串" }).optional(),
+	v_voucher: zod.default.string({ error: "验证码ID必须是字符串" }).min(1, { error: "验证码ID不能为空" })
+});
+const BilibiliValidateCaptchaParamsSchema = zod.default.object({
+	methodType: zod.default.literal("验证验证码结果", { error: "方法类型必须是\"验证验证码结果\"" }),
+	csrf: zod.default.string({ error: "CSRF Token必须是字符串" }).optional(),
+	challenge: zod.default.string({ error: "验证码challenge必须是字符串" }).min(1, { error: "验证码challenge不能为空" }),
+	token: zod.default.string({ error: "验证码token必须是字符串" }).min(1, { error: "验证码token不能为空" }),
+	validate: zod.default.string({ error: "验证码validate必须是字符串" }).min(1, { error: "验证码validate不能为空" }),
+	seccode: zod.default.string({ error: "验证码seccode必须是字符串" }).min(1, { error: "验证码seccode不能为空" })
+});
 const BilibiliValidationSchemas = {
 	单个视频作品数据: BilibiliVideoParamsSchema,
 	单个视频下载信息数据: BilibiliVideoDownloadParamsSchema,
@@ -492,6 +506,7 @@ const BilibiliValidationSchemas = {
 	指定评论的回复: BilibiliCommentReplyParamsSchema,
 	用户主页数据: BilibiliUserParamsSchema,
 	用户主页动态列表数据: BilibiliUserParamsSchema,
+	用户空间详细信息: BilibiliUserParamsSchema,
 	Emoji数据: BilibiliEmojiParamsSchema,
 	番剧基本信息数据: BilibiliBangumiInfoParamsSchema,
 	番剧下载信息数据: BilibiliBangumiStreamParamsSchema,
@@ -508,7 +523,9 @@ const BilibiliValidationSchemas = {
 	专栏正文内容: BilibiliArticleParamsSchema,
 	专栏显示卡片信息: BilibiliArticleCardParamsSchema,
 	专栏文章基本信息: BilibiliArticleInfoParamsSchema,
-	文集基本信息: BilibiliColumnInfoParamsSchema
+	文集基本信息: BilibiliColumnInfoParamsSchema,
+	从_v_voucher_申请_captcha: BilibiliApplyCaptchaParamsSchema,
+	验证验证码结果: BilibiliValidateCaptchaParamsSchema
 };
 const BilibiliMethodRoutes = {
 	单个视频作品数据: "/fetch_one_video",
@@ -517,6 +534,7 @@ const BilibiliMethodRoutes = {
 	指定评论的回复: "/fetch_comment_reply",
 	用户主页数据: "/fetch_user_profile",
 	用户主页动态列表数据: "/fetch_user_dynamic",
+	用户空间详细信息: "/fetch_user_space_info",
 	Emoji数据: "/fetch_emoji_list",
 	番剧基本信息数据: "/fetch_bangumi_video_info",
 	番剧下载信息数据: "/fetch_bangumi_video_playurl",
@@ -533,7 +551,9 @@ const BilibiliMethodRoutes = {
 	专栏正文内容: "/fetch_article_content",
 	专栏显示卡片信息: "/fetch_article_card",
 	专栏文章基本信息: "/fetch_article_info",
-	文集基本信息: "/fetch_column_info"
+	文集基本信息: "/fetch_column_info",
+	从_v_voucher_申请_captcha: "/apply_captcha",
+	验证验证码结果: "/validate_captcha"
 };
 
 //#endregion
@@ -1093,13 +1113,13 @@ const createSuccessResponse = (data$1, message, code = 200) => {
 * @param code - 错误状态码（可选，默认500）
 * @returns 格式化的错误响应对象
 */
-const createErrorResponse = (error, message, code = 500) => {
+const createErrorResponse = (error, message, code = 500, data$1) => {
 	return {
 		success: false,
 		error,
 		message,
 		code,
-		data: void 0
+		data: data$1
 	};
 };
 
@@ -1233,9 +1253,12 @@ const fetchResponse = async (config, maxRetries = DEFAULT_MAX_RETRIES) => {
 * 判断结果是否为网络错误响应
 * @param result - 请求结果
 * @returns 是否为ErrorResult
+* @description 通过检查 error 字段中的 amagiError 来区分网络错误和业务错误
 */
 const isNetworkErrorResult = (result) => {
-	return result !== null && typeof result === "object" && "success" in result && result.success === false;
+	if (result === null || typeof result !== "object") return false;
+	const obj = result;
+	return obj.success === false && obj.error !== null && typeof obj.error === "object" && "amagiError" in obj.error;
 };
 /**
 * 获取响应头和数据（带自动重试）
@@ -1262,7 +1285,7 @@ const getHeadersAndData = async (config, maxRetries = DEFAULT_MAX_RETRIES) => {
 const generateSecChUa = (userAgent) => {
 	const chromeMatch = userAgent.match(/Chrome\/(\d+)/);
 	const chromeVersion = chromeMatch ? chromeMatch[1] : "125";
-	return `"Not)A;Brand";v="8", "Chromium";v="${chromeVersion}", "Google Chrome";v="${chromeVersion}"`;
+	return `"Not_A Brand";v="99", "Chromium";v="${chromeVersion}", "Google Chrome";v="${chromeVersion}"`;
 };
 /**
 * 抖音平台默认请求配置
@@ -1277,7 +1300,7 @@ const getDouyinDefaultConfig = (cookie, requestConfig) => {
 		Accept: "application/json, text/plain, */*",
 		"Accept-Encoding": "gzip, deflate, br, zstd",
 		"Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6",
-		Cookie: cookie ? cookie.replace(/\s+/g, "") : "",
+		Cookie: cookie?.trim() ?? "",
 		Priority: "u=1, i",
 		Referer: "https://www.douyin.com/",
 		"Sec-Ch-Ua": generateSecChUa(finalUserAgent),
@@ -1305,20 +1328,24 @@ const getDouyinDefaultConfig = (cookie, requestConfig) => {
 * @returns 合并后的请求配置
 */
 const getBilibiliDefaultConfig = (cookie, requestConfig) => {
+	let finalUserAgent = requestConfig?.headers?.["User-Agent"] ?? "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36";
+	finalUserAgent = finalUserAgent.replace(/\s+Edg\/[\d.]+/g, "");
 	const defHeaders = {
 		Accept: "application/json, text/plain, */*",
-		"Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6",
-		"Accept-Encoding": "gzip, deflate, br",
-		Origin: "https://www.bilibili.com",
+		"Accept-Language": "zh-CN,zh;q=0.9",
+		"Accept-Encoding": "gzip, deflate, br, zstd",
+		"Cache-Control": "no-cache",
+		Pragma: "no-cache",
 		Referer: "https://www.bilibili.com/",
 		Priority: "u=1, i",
-		"Sec-Ch-Ua": "\"Microsoft Edge\";v=\"141\", \"Chromium\";v=\"141\", \"Not_A Brand\";v=\"24\"",
+		"Sec-Ch-Ua": generateSecChUa(finalUserAgent),
 		"Sec-Ch-Ua-Mobile": "?0",
 		"Sec-Ch-Ua-Platform": "\"Windows\"",
 		"Sec-Fetch-Dest": "empty",
 		"Sec-Fetch-Mode": "cors",
 		"Sec-Fetch-Site": "same-site",
-		Cookie: cookie ? cookie.replace(/\s+/g, "") : ""
+		"User-Agent": finalUserAgent,
+		Cookie: cookie?.trim() ?? ""
 	};
 	return {
 		method: "GET",
@@ -1346,7 +1373,7 @@ const getKuaishouDefaultConfig = (cookie, requestConfig) => {
 		"Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6",
 		Priority: "u=0, i",
 		"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 Edg/130.0.0.0",
-		Cookie: cookie ? cookie.replace(/\s+/g, "") : ""
+		Cookie: cookie?.trim() ?? ""
 	};
 	return {
 		method: "POST",
@@ -1428,7 +1455,12 @@ var BiLiBiLiAPI = class {
 		return `https://api.bilibili.com/pgc/player/web/playurl?cid=${data$1.cid}&ep_id=${data$1.ep_id}`;
 	}
 	用户空间动态(data$1) {
-		return `https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/space?host_mid=${data$1.host_mid}&dm_img_switch=0&&features=itemOpusStyle,listOnlyfans,opusBigCover,onlyfansVote,forwardListHidden,decorationCard,commentsNewVersion,onlyfansAssetsV2,ugcDelete,onlyfansQaCard`;
+		return `https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/space?${new URLSearchParams({
+			host_mid: data$1.host_mid.toString(),
+			offset: "",
+			platform: "web",
+			features: "itemOpusStyle,listOnlyfans,opusBigCover,onlyfansVote,forwardListHidden,decorationCard,commentsNewVersion,onlyfansAssetsV2,ugcDelete,onlyfansQaCard,avatarAutoTheme,sunflowerStyle,eva3CardOpus,eva3CardVideo,eva3CardComment"
+		}).toString()}`;
 	}
 	动态详情(data$1) {
 		return `https://api.bilibili.com/x/polymer/web-dynamic/v1/detail?id=${data$1.dynamic_id}&features=itemOpusStyle,opusBigCover,onlyfansVote,endFooterHidden,decorationCard,onlyfansAssetsV2,ugcDelete,onlyfansQaCard,editable,opusPrivateVisible,avatarAutoTheme`;
@@ -1466,6 +1498,30 @@ var BiLiBiLiAPI = class {
 	文集基本信息(data$1) {
 		return `https://api.bilibili.com/x/article/list/web/articles?id=${data$1.id}`;
 	}
+	用户空间详细信息(data$1) {
+		return `https://api.bilibili.com/x/space/wbi/acc/info?mid=${data$1.host_mid}`;
+	}
+	从_v_voucher_申请_captcha(data$1) {
+		return {
+			Url: "https://api.bilibili.com/x/gaia-vgate/v1/register",
+			Body: {
+				...data$1.csrf !== void 0 && { csrf: data$1.csrf },
+				v_voucher: data$1.v_voucher
+			}
+		};
+	}
+	验证验证码结果(data$1) {
+		return {
+			Url: "https://api.bilibili.com/x/gaia-vgate/v1/validate",
+			Body: {
+				challenge: data$1.challenge,
+				token: data$1.token,
+				validate: data$1.validate,
+				seccode: data$1.seccode,
+				...data$1.csrf !== void 0 && { csrf: data$1.csrf }
+			}
+		};
+	}
 };
 /** 该类下的所有方法只会返回拼接好参数后的 Url 地址，需要手动请求该地址以获取数据 */
 const bilibiliApiUrls = new BiLiBiLiAPI();
@@ -1527,7 +1583,10 @@ const bilibili = {
 	getArticleContent: createBilibiliApiMethod("专栏正文内容"),
 	getArticleCard: createBilibiliApiMethod("专栏显示卡片信息"),
 	getArticleInfo: createBilibiliApiMethod("专栏文章基本信息"),
-	getColumnInfo: createBilibiliApiMethod("文集基本信息")
+	getColumnInfo: createBilibiliApiMethod("文集基本信息"),
+	getUserProfileDetail: createBilibiliApiMethod("用户空间详细信息"),
+	applyVoucherCaptcha: createBilibiliApiMethod("从_v_voucher_申请_captcha"),
+	validateCaptcha: createBilibiliApiMethod("验证验证码结果")
 };
 /**
 * 创建绑定了cookie的B站API对象
@@ -1558,7 +1617,10 @@ const createBoundBilibiliApi = (cookie, requestConfig) => {
 		getArticleContent: createBoundBilibiliApiMethod("专栏正文内容", cookie),
 		getArticleCard: createBoundBilibiliApiMethod("专栏显示卡片信息", cookie),
 		getArticleInfo: createBoundBilibiliApiMethod("专栏文章基本信息", cookie),
-		getColumnInfo: createBoundBilibiliApiMethod("文集基本信息", cookie)
+		getColumnInfo: createBoundBilibiliApiMethod("文集基本信息", cookie),
+		getUserProfileDetail: createBoundBilibiliApiMethod("用户空间详细信息", cookie),
+		applyVoucherCaptcha: createBoundBilibiliApiMethod("从_v_voucher_申请_captcha", cookie),
+		validateCaptcha: createBoundBilibiliApiMethod("验证验证码结果", cookie)
 	};
 };
 
@@ -1979,17 +2041,7 @@ const qtparam = async (BASEURL, cookie) => {
 * @returns 返回B站数据
 */
 const fetchBilibili = async (data$1, cookie, requestConfig) => {
-	const defHeaders = getBilibiliDefaultConfig(cookie)["headers"];
-	const baseRequestConfig = {
-		method: "GET",
-		timeout: 1e4,
-		...requestConfig,
-		headers: {
-			Referer: "https://www.bilibili.com/",
-			...defHeaders,
-			...requestConfig?.headers ?? {}
-		}
-	};
+	const baseRequestConfig = getBilibiliDefaultConfig(cookie, requestConfig);
 	switch (data$1.methodType) {
 		case "单个视频作品数据": return await GlobalGetData$3(data$1.methodType, {
 			...baseRequestConfig,
@@ -2103,44 +2155,41 @@ const fetchBilibili = async (data$1, cookie, requestConfig) => {
 		}
 		case "用户主页动态列表数据": {
 			const { host_mid } = data$1;
-			const customConfig = {
-				...baseRequestConfig,
-				headers: {
-					...baseRequestConfig.headers,
-					...requestConfig?.headers && ("referer" in requestConfig.headers || "Referer" in requestConfig.headers) ? {} : { Referer: `https://space.bilibili.com/${host_mid}` },
-					Origin: "https://space.bilibili.com"
-				}
+			const hasExternalReferer = requestConfig?.headers && ("referer" in requestConfig.headers || "Referer" in requestConfig.headers);
+			const customHeaders = {
+				...baseRequestConfig.headers,
+				Origin: "https://space.bilibili.com",
+				...!hasExternalReferer && { Referer: `https://space.bilibili.com/${host_mid}/dynamic` }
 			};
 			const wbiSignQuery = await wbi_sign(bilibiliApiUrls.用户空间动态({ host_mid }), baseRequestConfig.headers?.cookie);
 			return await GlobalGetData$3(data$1.methodType, {
-				...customConfig,
+				...baseRequestConfig,
+				headers: customHeaders,
 				url: bilibiliApiUrls.用户空间动态({ host_mid }) + wbiSignQuery
 			});
 		}
 		case "动态详情数据": {
-			const customConfig = {
-				...baseRequestConfig,
-				headers: {
-					...baseRequestConfig.headers,
-					...(!requestConfig?.headers || !("referer" in requestConfig.headers)) && { referer: void 0 }
-				}
+			const hasExternalReferer = requestConfig?.headers && "referer" in requestConfig.headers;
+			const customHeaders = {
+				...baseRequestConfig.headers,
+				...!hasExternalReferer && { Referer: void 0 }
 			};
 			return await GlobalGetData$3(data$1.methodType, {
-				...customConfig,
+				...baseRequestConfig,
+				headers: customHeaders,
 				url: bilibiliApiUrls.动态详情({ dynamic_id: data$1.dynamic_id })
 			});
 		}
 		case "动态卡片数据": {
-			const customConfig = {
-				...baseRequestConfig,
-				headers: {
-					...baseRequestConfig.headers,
-					...(!requestConfig?.headers || !("referer" in requestConfig.headers)) && { referer: void 0 }
-				}
-			};
 			const { dynamic_id } = data$1;
+			const hasExternalReferer = requestConfig?.headers && "referer" in requestConfig.headers;
+			const customHeaders = {
+				...baseRequestConfig.headers,
+				...!hasExternalReferer && { Referer: void 0 }
+			};
 			return await GlobalGetData$3(data$1.methodType, {
-				...customConfig,
+				...baseRequestConfig,
+				headers: customHeaders,
 				url: bilibiliApiUrls.动态卡片信息({ dynamic_id })
 			});
 		}
@@ -2151,6 +2200,13 @@ const fetchBilibili = async (data$1, cookie, requestConfig) => {
 				url: bilibiliApiUrls.用户名片信息({ host_mid })
 			});
 		}
+		case "用户空间详细信息": {
+			const wbiSignQuery = await wbi_sign(bilibiliApiUrls.用户空间详细信息({ host_mid: data$1.host_mid }), baseRequestConfig.headers?.cookie);
+			return await GlobalGetData$3(data$1.methodType, {
+				...baseRequestConfig,
+				url: bilibiliApiUrls.用户空间详细信息({ host_mid: data$1.host_mid }) + wbiSignQuery
+			});
+		}
 		case "直播间信息": return await GlobalGetData$3(data$1.methodType, {
 			...baseRequestConfig,
 			url: bilibiliApiUrls.直播间信息({ room_id: data$1.room_id })
@@ -2246,6 +2302,18 @@ const fetchBilibili = async (data$1, cookie, requestConfig) => {
 			...baseRequestConfig,
 			url: bilibiliApiUrls.文集基本信息({ id: data$1.id })
 		});
+		case "从_v_voucher_申请_captcha": return await GlobalGetData$3(data$1.methodType, {
+			...baseRequestConfig,
+			method: "POST",
+			url: bilibiliApiUrls.从_v_voucher_申请_captcha(data$1).Url,
+			data: bilibiliApiUrls.从_v_voucher_申请_captcha(data$1).Body
+		});
+		case "验证验证码结果": return await GlobalGetData$3(data$1.methodType, {
+			...baseRequestConfig,
+			method: "POST",
+			url: bilibiliApiUrls.验证验证码结果(data$1).Url,
+			data: bilibiliApiUrls.验证验证码结果(data$1).Body
+		});
 		default:
 			logger.warn(`未知的B站数据接口：「${logger.red(data$1.methodType)}」`);
 			return null;
@@ -2387,7 +2455,9 @@ const bilibiliErrorCodeMap = {
 	"-689": "版权限制",
 	"-701": "扣节操失败",
 	"-799": "请求过于频繁，请稍后再试",
-	"-8888": "对不起，服务器开小差了~ (ಥ﹏ಥ)"
+	"-8888": "对不起，服务器开小差了~ (ಥ﹏ಥ)",
+	1e5: "验证码获取失败",
+	100003: "验证码过期"
 };
 
 //#endregion
@@ -4483,16 +4553,19 @@ async function getBilibiliData(methodType, optionsOrCookie, cookieOrOptions, req
 	try {
 		let options;
 		let cookie;
+		let config;
 		if (typeof optionsOrCookie === "string") {
 			cookie = optionsOrCookie;
 			options = cookieOrOptions;
+			config = requestConfig;
 		} else {
 			options = optionsOrCookie;
 			cookie = cookieOrOptions;
+			config = requestConfig;
 		}
 		const { typeMode: _, ...validationOptions } = options ?? {};
-		const rawData = await fetchBilibili({ ...validateBilibiliParams(methodType, validationOptions) }, cookie);
-		if (rawData.code !== 0) return createErrorResponse(rawData.amagiError, "B站数据获取失败");
+		const rawData = await fetchBilibili({ ...validateBilibiliParams(methodType, validationOptions) }, cookie, config);
+		if (rawData.code !== 0) return createErrorResponse(rawData.amagiError, "B站数据获取失败", rawData.code, rawData.data);
 		return createSuccessResponse(rawData, "获取成功", 200);
 	} catch (error) {
 		const errorMessage = error instanceof Error ? error.message : "未知错误";
@@ -5110,7 +5183,7 @@ let DynamicType = /* @__PURE__ */ function(DynamicType$1) {
 
 //#endregion
 //#region src/index.ts
-const VERSION = "5.11.0";
+const VERSION = "5.12.0";
 /**
 * @deprecated 请使用 createAmagiClient 替代
 */
@@ -5148,6 +5221,7 @@ const amagi = Client;
 //#endregion
 exports.AdditionalType = AdditionalType;
 exports.ApiError = ApiError;
+exports.BilibiliApplyCaptchaParamsSchema = BilibiliApplyCaptchaParamsSchema;
 exports.BilibiliArticleCardParamsSchema = BilibiliArticleCardParamsSchema;
 exports.BilibiliArticleInfoParamsSchema = BilibiliArticleInfoParamsSchema;
 exports.BilibiliArticleParamsSchema = BilibiliArticleParamsSchema;
@@ -5166,6 +5240,7 @@ exports.BilibiliMethodRoutes = BilibiliMethodRoutes;
 exports.BilibiliQrcodeParamsSchema = BilibiliQrcodeParamsSchema;
 exports.BilibiliQrcodeStatusParamsSchema = BilibiliQrcodeStatusParamsSchema;
 exports.BilibiliUserParamsSchema = BilibiliUserParamsSchema;
+exports.BilibiliValidateCaptchaParamsSchema = BilibiliValidateCaptchaParamsSchema;
 exports.BilibiliValidationSchemas = BilibiliValidationSchemas;
 exports.BilibiliVideoDownloadParamsSchema = BilibiliVideoDownloadParamsSchema;
 exports.BilibiliVideoParamsSchema = BilibiliVideoParamsSchema;