@ikenxuan/amagi 5.9.1 → 5.10.0

package/dist/default/index.cjs

@@ -294,19 +294,18 @@ const getDouyinDefaultConfig = (cookie, requestConfig) => {
 */
 const getBilibiliDefaultConfig = (cookie, requestConfig) => {
 	const defHeaders = {
-		Accept: "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
+		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",
-		"Cache-Control": "max-age=0",
-		Priority: "u=0, i",
-		"Sec-Ch-Ua": "\"Microsoft Edge\";v=\"131\", \"Chromium\";v=\"131\", \"Not_A Brand\";v=\"24\"",
+		"Accept-Encoding": "gzip, deflate, br",
+		Origin: "https://www.bilibili.com",
+		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-Mobile": "?0",
 		"Sec-Ch-Ua-Platform": "\"Windows\"",
-		"Sec-Fetch-Dest": "document",
-		"Sec-Fetch-Mode": "navigate",
-		"Sec-Fetch-Site": "none",
-		"Sec-Fetch-User": "?1",
-		"Upgrade-Insecure-Requests": "1",
-		Referer: "https://www.bilibili.com/",
+		"Sec-Fetch-Dest": "empty",
+		"Sec-Fetch-Mode": "cors",
+		"Sec-Fetch-Site": "same-site",
 		Cookie: cookie ? cookie.replace(/\s+/g, "") : ""
 	};
 	return {
@@ -568,7 +567,7 @@ 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}&features=itemOpusStyle,listOnlyfans,opusBigCover,onlyfansVote,forwardListHidden,decorationCard,commentsNewVersion,onlyfansAssetsV2,ugcDelete,onlyfansQaCard`;
+		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`;
 	}
 	动态详情(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`;
@@ -1190,9 +1189,18 @@ const DouyinCommentParamsSchema = zod.default.object({
 	number: smartPositiveInteger("评论数量必须是正整数").optional().default(50),
 	cursor: zod.default.coerce.number({ error: "游标必须是数字" }).int({ error: "游标必须是整数" }).min(0, { error: "游标不能小于0" }).default(0).optional()
 });
+const DouyinHotWordsParamsSchema = zod.default.object({
+	methodType: zod.default.literal("热点词数据", { error: "方法类型必须是\"热点词数据\"" }),
+	query: zod.default.string({ error: "搜索词必须是字符串" }).min(1, { error: "搜索词不能为空" })
+});
 const DouyinSearchParamsSchema = zod.default.object({
-	methodType: zod.default.enum(["热点词数据", "搜索数据"], { error: "方法类型必须是\"热点词数据\"或\"搜索数据\"" }),
+	methodType: zod.default.literal("搜索数据", { error: "方法类型必须是\"搜索数据\"" }),
 	query: zod.default.string({ error: "搜索词必须是字符串" }).min(1, { error: "搜索词不能为空" }),
+	type: zod.default.enum([
+		"综合",
+		"用户",
+		"视频"
+	], { error: "搜索类型必须是\"综合\"、\"用户\"或\"视频\"" }).optional().default("综合"),
 	number: smartPositiveInteger("搜索数量必须是正整数").optional().default(10),
 	search_id: zod.default.string({ error: "搜索ID必须是字符串" }).optional()
 });
@@ -1250,7 +1258,7 @@ const DouyinValidationSchemas = {
 	评论数据: DouyinCommentParamsSchema,
 	用户主页数据: DouyinUserParamsSchema,
 	用户主页视频列表数据: DouyinUserParamsSchema,
-	热点词数据: DouyinSearchParamsSchema,
+	热点词数据: DouyinHotWordsParamsSchema,
 	搜索数据: DouyinSearchParamsSchema,
 	音乐数据: DouyinMusicParamsSchema,
 	直播间信息数据: DouyinLiveRoomParamsSchema,
@@ -1897,7 +1905,7 @@ const fetchBilibili = async (data$1, cookie, requestConfig) => {
 		timeout: 1e4,
 		...requestConfig,
 		headers: {
-			referer: "https://www.bilibili.com/",
+			Referer: "https://www.bilibili.com/",
 			...defHeaders,
 			...requestConfig?.headers ?? {}
 		}
@@ -2014,14 +2022,15 @@ 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: void 0 }
+					...requestConfig?.headers && ("referer" in requestConfig.headers || "Referer" in requestConfig.headers) ? {} : { Referer: `https://space.bilibili.com/${host_mid}` },
+					Origin: "https://space.bilibili.com"
 				}
 			};
-			const { host_mid } = data$1;
 			const wbiSignQuery = await wbi_sign(bilibiliApiUrls.用户空间动态({ host_mid }), baseRequestConfig.headers?.cookie);
 			return await GlobalGetData$3(data$1.methodType, {
 				...customConfig,
@@ -2155,31 +2164,11 @@ const fetchBilibili = async (data$1, cookie, requestConfig) => {
 * @param options - 网络请求配置
 * @returns
 */
-const GlobalGetData$3 = async (type, options) => {
+const GlobalGetData$3 = async (type, options, retryCount = 0) => {
+	const MAX_RETRIES = 3;
 	let warningMessage = "";
 	try {
 		const result = await fetchData(options);
-		if (typeof result === "string" && result.includes("<!DOCTYPE html>")) {
-			const Err = {
-				errorDescription: "触发B站风控策略，请求被拦截！可能原因：请求频率过高、Cookie失效、缺少必要请求头",
-				requestType: type ?? "未知请求类型",
-				requestUrl: options.url
-			};
-			warningMessage = `
-      ${logger.red("触发B站风控策略，请求被拦截")}
-      请求类型：「${type}」
-      请求URL：${options.url}
-      建议：降低请求频率、检查Cookie
-      `;
-			logger.warn(warningMessage);
-			const riskError = new Error(Err.errorDescription);
-			Object.assign(riskError, {
-				code: bilibiliAPIErrorCode.IP_BLOCKED,
-				data: result,
-				amagiError: Err
-			});
-			throw riskError;
-		}
 		if (!result || result === "") {
 			const Err = {
 				errorDescription: "获取响应数据失败！接口返回内容为空，你的B站ck可能已经失效！",
@@ -2201,11 +2190,13 @@ const GlobalGetData$3 = async (type, options) => {
 			throw riskError;
 		}
 		if (result.code !== 0 || !result.data || typeof result.data === "object" && Object.keys(result.data).length === 0) {
+			if (result.code === -412 && retryCount < MAX_RETRIES) return await GlobalGetData$3(type, options, retryCount + 1);
 			const errorMessage = bilibiliErrorCodeMap[result.code] || typeof result.data === "object" && Object.keys(result.data).length === 0 && "请求成功但无返回内容" || (result.message ?? "未知错误");
 			const Err = {
 				errorDescription: `获取响应数据失败！原因：${errorMessage}！`,
 				requestType: type ?? "未知请求类型",
-				requestUrl: options.url
+				requestUrl: options.url,
+				responseCode: result.code
 			};
 			warningMessage = `
       获取响应数据失败！原因：${logger.yellow(errorMessage)}
@@ -3157,12 +3148,68 @@ var DouyinAPI = class {
 	}
 	/**
 	* 获取搜索数据的接口地址
-	* @param data - 请求参数，包含query、number、search_id等
+	* @param data - 请求参数，包含query、type、number、search_id等
 	* @returns 完整的接口URL
 	*/
 	搜索(data$1) {
-		return `https://www.douyin.com/aweme/v1/web/general/search/stream/?${buildQueryString({
-			...this.getBaseParams(),
+		const searchType = data$1.type ?? "综合";
+		const { verifyFp, fp: fp$1, ...baseParamsWithoutFp } = this.getBaseParams();
+		if (searchType === "用户") return `https://www.douyin.com/aweme/v1/web/discover/search/?${buildQueryString({
+			...baseParamsWithoutFp,
+			count: data$1.number ?? 10,
+			disable_rs: "0",
+			from_group_id: "",
+			is_filter_search: "0",
+			keyword: data$1.query,
+			list_type: "single",
+			need_filter_settings: "1",
+			offset: "0",
+			pc_libra_divert: "Windows",
+			pc_search_top_1_params: "{\"enable_ai_search_top_1\":1}",
+			query_correct_type: "1",
+			round_trip_time: "250",
+			screen_height: "1310",
+			screen_width: "2328",
+			search_channel: "aweme_user_web",
+			search_source: "switch_tab",
+			support_dash: "1",
+			support_h265: "1",
+			version_code: "170400",
+			version_name: "17.4.0",
+			webid: "7521399115230610959",
+			...data$1.search_id && { search_id: data$1.search_id }
+		})}`;
+		else if (searchType === "视频") {
+			const baseUrl = "https://www.douyin.com/aweme/v1/web/search/item/";
+			const { verifyFp: verifyFp$1, fp: fp$2, ...baseParamsWithoutFp$1 } = this.getBaseParams();
+			return `${baseUrl}?${buildQueryString({
+				...baseParamsWithoutFp$1,
+				count: data$1.number ?? 10,
+				disable_rs: "0",
+				enable_history: "1",
+				from_group_id: "",
+				is_filter_search: "0",
+				keyword: data$1.query,
+				list_type: "single",
+				need_filter_settings: "1",
+				offset: "0",
+				pc_libra_divert: "Windows",
+				pc_search_top_1_params: "{\"enable_ai_search_top_1\":1}",
+				query_correct_type: "1",
+				round_trip_time: "50",
+				screen_height: "1310",
+				screen_width: "2328",
+				search_channel: "aweme_video_web",
+				search_source: "switch_tab",
+				support_dash: "1",
+				support_h265: "1",
+				version_code: "170400",
+				version_name: "17.4.0",
+				webid: "7521399115230610959",
+				...data$1.search_id && { search_id: data$1.search_id }
+			})}`;
+		} else return `https://www.douyin.com/aweme/v1/web/general/search/stream/?${buildQueryString({
+			...baseParamsWithoutFp,
 			count: data$1.number ?? 10,
 			disable_rs: "0",
 			enable_history: "1",
@@ -3480,10 +3527,7 @@ const DouyinData = async (data$1, cookie, requestConfig) => {
 			});
 		}
 		case "热点词数据": {
-			const url$1 = douyinApiUrls$1.热点词({
-				query: data$1.query,
-				number: data$1.number ?? 10
-			});
+			const url$1 = douyinApiUrls$1.热点词({ query: data$1.query });
 			const customConfig = {
 				...baseRequestConfig,
 				headers: {
@@ -3501,49 +3545,182 @@ const DouyinData = async (data$1, cookie, requestConfig) => {
 			const maxPageSize = 15;
 			let fetchedSearchList = [];
 			let tmpresp = null;
+			const searchType = data$1.type ?? "综合";
+			const refererUrl = searchType === "用户" ? `https://www.douyin.com/search/${encodeURIComponent(String(data$1.query))}?type=user` : searchType === "视频" ? `https://www.douyin.com/search/${encodeURIComponent(String(data$1.query))}?type=video` : `https://www.douyin.com/root/search/${encodeURIComponent(String(data$1.query))}`;
 			const customConfig = {
 				...baseRequestConfig,
 				headers: {
 					...baseRequestConfig.headers,
-					...(!requestConfig?.headers || !("Referer" in requestConfig.headers)) && { Referer: `https://www.douyin.com/root/search/${encodeURIComponent(String(data$1.query))}` }
+					...(!requestConfig?.headers || !("Referer" in requestConfig.headers)) && { referer: refererUrl }
 				}
 			};
+			const isUserSearch = searchType === "用户";
+			const isVideoSearch = searchType === "视频";
+			let isFirstRequest = true;
 			while (fetchedSearchList.length < Number(data$1.number ?? 10)) {
 				const requestCount = Math.min(Number(data$1.number ?? 50) - fetchedSearchList.length, maxPageSize);
 				const url$1 = douyinApiUrls$1.搜索({
 					query: data$1.query,
+					type: data$1.type,
 					number: requestCount,
 					search_id: search_id === "" ? void 0 : search_id
 				});
 				const raw = await GlobalGetData$2(data$1.methodType, {
 					...customConfig,
-					url: buildSignedUrl(url$1, "x_bogus", userAgent)
+					url: url$1
 				});
-				const responses = filterSearchResponses(typeof raw === "string" ? parseDouyinMultiJson(raw) : [raw]);
-				if (responses.length === 0) {
-					logger.warn("抖音搜索返回无有效数据，疑似触发反爬\n你的抖音ck可能已经失效！\n请求类型：" + data$1.methodType);
-					return {
-						success: false,
-						amagiError: "抖音搜索返回无有效数据，疑似触发反爬\n你的抖音ck可能已经失效！\n请求类型：" + data$1.methodType
-					};
-				}
-				for (const resp of responses) {
-					if (Array.isArray(resp.data) && resp.data.length > 0) fetchedSearchList.push(...resp.data);
-					tmpresp = resp;
-					search_id = resp.log_pb?.impr_id ?? search_id;
-				}
-				if (fetchedSearchList.length === 0) {
-					logger.warn("抖音搜索API请求成功，但返回数据长度为0，\n此问题暂时无法处理，也可能被风控！\n请求类型：" + data$1.methodType);
-					return {
-						success: false,
-						amagiError: "抖音搜索API请求成功，但返回数据长度为0，\n此问题暂时无法处理，也可能被风控！\n请求类型：" + data$1.methodType
-					};
+				if (isUserSearch) {
+					if (!raw || typeof raw !== "object") {
+						const Err = {
+							errorDescription: "抖音用户搜索返回无有效数据，疑似触发反爬机制，你的抖音Cookie可能已经失效！",
+							requestType: data$1.methodType ?? "未知请求类型",
+							requestUrl: url$1
+						};
+						const warningMessage = `
+            获取响应数据失败！原因：${logger.yellow("用户搜索返回无有效数据，疑似触发反爬机制")}
+            请求类型：「${data$1.methodType}」
+            搜索关键词：「${data$1.query}」
+            请求URL：${url$1}
+            `;
+						!isFirstRequest && logger.warn(warningMessage);
+						return {
+							code: douoyinAPIErrorCode.COOKIE,
+							data: raw,
+							amagiError: Err,
+							amagiMessage: warningMessage
+						};
+					}
+					const userList = raw.user_list;
+					if (isFirstRequest && (!userList || userList.length === 0)) {
+						const Err = {
+							errorDescription: "抖音用户搜索接口第一次请求就返回空数组，可能该关键词无搜索结果或触发风控限制，你的抖音Cookie可能已经失效！",
+							requestType: data$1.methodType ?? "未知请求类型",
+							requestUrl: url$1
+						};
+						const warningMessage = `
+            获取响应数据失败！原因：${logger.yellow("用户搜索接口第一次请求就返回空数组，你的抖音Cookie可能已经失效！")}
+            请求类型：「${data$1.methodType}」
+            搜索关键词：「${data$1.query}」
+            请求URL：${url$1}
+            `;
+						logger.warn(warningMessage);
+						return {
+							data: raw,
+							amagiError: Err,
+							amagiMessage: warningMessage
+						};
+					}
+					if (Array.isArray(userList) && userList.length > 0) fetchedSearchList.push(...userList);
+					tmpresp = raw;
+					search_id = raw.rid ?? search_id;
+					if (typeof raw.has_more === "number" && raw.has_more === 0) break;
+					if (!userList || userList.length === 0) break;
+				} else if (isVideoSearch) {
+					if (!raw || typeof raw !== "object") {
+						const Err = {
+							errorDescription: "抖音视频搜索接口返回无有效数据，疑似触发反爬机制，你的抖音Cookie可能已经失效，你的抖音Cookie可能已经失效！",
+							requestType: data$1.methodType ?? "未知请求类型",
+							requestUrl: url$1
+						};
+						const warningMessage = `
+            获取响应数据失败！原因：${logger.yellow("视频搜索接口返回无有效数据，疑似触发反爬机制，你的抖音Cookie可能已经失效！")}
+            请求类型：「${data$1.methodType}」
+            搜索关键词：「${data$1.query}」
+            请求URL：${url$1}
+            `;
+						!isFirstRequest && logger.warn(warningMessage);
+						return {
+							code: douoyinAPIErrorCode.COOKIE,
+							data: raw,
+							amagiError: Err,
+							amagiMessage: warningMessage
+						};
+					}
+					const videoList = raw.data;
+					if (isFirstRequest && (!videoList || videoList.length === 0)) {
+						const Err = {
+							errorDescription: "抖音视频搜索接口第一次请求就返回空数组，可能该关键词无搜索结果或触发风控限制，你的抖音Cookie可能已经失效！",
+							requestType: data$1.methodType ?? "未知请求类型",
+							requestUrl: url$1
+						};
+						const warningMessage = `
+            获取响应数据失败！原因：${logger.yellow("视频搜索接口第一次请求就返回空数组，你的抖音Cookie可能已经失效！")}
+            请求类型：「${data$1.methodType}」
+            搜索关键词：「${data$1.query}」
+            请求URL：${url$1}
+            `;
+						logger.warn(warningMessage);
+						return {
+							data: raw,
+							amagiError: Err,
+							amagiMessage: warningMessage
+						};
+					}
+					if (Array.isArray(videoList) && videoList.length > 0) fetchedSearchList.push(...videoList);
+					tmpresp = raw;
+					search_id = raw.log_pb?.impr_id ?? search_id;
+					if (typeof raw.has_more === "number" && raw.has_more === 0) break;
+					if (!videoList || videoList.length === 0) break;
+				} else {
+					const responses = filterSearchResponses(typeof raw === "string" ? parseDouyinMultiJson(raw) : [raw]);
+					if (responses.length === 0) {
+						const Err = {
+							errorDescription: "抖音综合搜索接口返回无有效数据，疑似触发反爬机制，你的抖音Cookie可能已经失效！",
+							requestType: data$1.methodType ?? "未知请求类型",
+							requestUrl: url$1
+						};
+						const warningMessage = `
+            获取响应数据失败！原因：${logger.yellow("综合搜索接口返回无有效数据，疑似触发反爬机制，你的抖音Cookie可能已经失效！")}
+            请求类型：「${data$1.methodType}」
+            搜索关键词：「${data$1.query}」
+            请求URL：${url$1}
+            `;
+						!isFirstRequest && logger.warn(warningMessage);
+						return {
+							code: douoyinAPIErrorCode.COOKIE,
+							data: raw,
+							amagiError: Err,
+							amagiMessage: warningMessage
+						};
+					}
+					for (const resp of responses) {
+						if (Array.isArray(resp.data) && resp.data.length > 0) fetchedSearchList.push(...resp.data);
+						tmpresp = resp;
+						search_id = resp.log_pb?.impr_id ?? search_id;
+					}
+					if (isFirstRequest && fetchedSearchList.length === 0) {
+						const Err = {
+							errorDescription: "抖音综合搜索接口第一次请求就返回空数组，可能该关键词无搜索结果或触发风控限制，你的抖音Cookie可能已经失效！",
+							requestType: data$1.methodType ?? "未知请求类型",
+							requestUrl: url$1
+						};
+						const warningMessage = `
+            获取响应数据失败！原因：${logger.yellow("综合搜索索接第一次请求就返回空数组，你的抖音Cookie可能已经失效！")}
+            请求类型：「${data$1.methodType}」
+            搜索关键词：「${data$1.query}」
+            请求URL：${url$1}
+            `;
+						logger.warn(warningMessage);
+						return {
+							data: raw,
+							amagiError: Err,
+							amagiMessage: warningMessage
+						};
+					}
+					if (tmpresp && typeof tmpresp.has_more === "number" && tmpresp.has_more === 0) break;
 				}
-				if (tmpresp && typeof tmpresp.has_more === "number" && tmpresp.has_more === 0) break;
+				isFirstRequest = false;
 			}
-			return {
+			const slicedList = Number(data$1.number ?? 10) === 0 ? [] : fetchedSearchList.slice(0, Number(data$1.number ?? 10));
+			return isUserSearch ? {
+				...tmpresp ?? {},
+				user_list: slicedList
+			} : isVideoSearch ? {
+				...tmpresp ?? {},
+				data: slicedList
+			} : {
 				...tmpresp ?? {},
-				data: Number(data$1.number ?? 10) === 0 ? [] : fetchedSearchList.slice(0, Number(data$1.number ?? 10))
+				data: slicedList
 			};
 		}
 		case "动态表情数据": {
@@ -4793,7 +4970,7 @@ let DynamicType = /* @__PURE__ */ function(DynamicType$1) {
 
 //#endregion
 //#region src/index.ts
-const VERSION = "5.9.1";
+const VERSION = "5.10.0";
 /**
 * @deprecated 请使用 createAmagiClient 替代
 */
@@ -4859,6 +5036,7 @@ exports.DouyinCommentReplyParamsSchema = DouyinCommentReplyParamsSchema;
 exports.DouyinDanmakuParamsSchema = DouyinDanmakuParamsSchema;
 exports.DouyinEmojiListParamsSchema = DouyinEmojiListParamsSchema;
 exports.DouyinEmojiProParamsSchema = DouyinEmojiProParamsSchema;
+exports.DouyinHotWordsParamsSchema = DouyinHotWordsParamsSchema;
 exports.DouyinLiveRoomParamsSchema = DouyinLiveRoomParamsSchema;
 exports.DouyinMethodRoutes = DouyinMethodRoutes;
 exports.DouyinMusicParamsSchema = DouyinMusicParamsSchema;