@ikenxuan/amagi 5.12.0 → 5.12.3

package/dist/default/index.js

@@ -2,14 +2,27 @@ import fs from "node:fs";
 import path from "node:path";
 import url from "node:url";
 import { Chalk } from "chalk";
-import log4js from "log4js";
 import axios, { AxiosError } from "axios";
 import zod from "zod";
-import crypto from "node:crypto";
 import { Xhshow } from "@ikenxuan/xhshow-ts";
+import crypto from "node:crypto";
 import express from "express";
 
 //#region src/model/logger.ts
+/**
+* 动态获取 log4js 库
+* 优先使用 node-karin/log4js (Karin 环境)
+* 失败则回退到 log4js (独立环境，通过别名映射到 @karinjs/log4js)
+*/
+const getLog4js = async () => {
+	try {
+		return (await import("node-karin/log4js")).default;
+	} catch {
+		const lib = await import("log4js");
+		return lib.default || lib;
+	}
+};
+const log4jsPromise = getLog4js();
 /** 获取包的绝对路径 */
 const getPackageLogsPath = () => {
 	const currentFileUrl = import.meta.url;
@@ -19,7 +32,11 @@ const getPackageLogsPath = () => {
 		if (fs.existsSync(path.join(packageRoot, "package.json"))) break;
 		packageRoot = path.dirname(packageRoot);
 	}
-	return path.join(packageRoot, "logs");
+	const logsDir = path.join(packageRoot, "logs");
+	try {
+		if (!fs.existsSync(logsDir)) fs.mkdirSync(logsDir, { recursive: true });
+	} catch (error) {}
+	return logsDir;
 };
 const logsPath = getPackageLogsPath();
 /** 获取日志级别，优先使用环境变量，默认为 info */
@@ -27,59 +44,65 @@ const getLogLevel = () => {
 	return process.env.LOG_LEVEL ?? "info";
 };
 const currentLogLevel = getLogLevel();
-log4js.configure({
-	appenders: {
-		console: {
-			type: "stdout",
-			layout: {
-				type: "pattern",
-				pattern: "%[[amagi][%d{hh:mm:ss.SSS}][%4.4p]%] %m"
-			}
-		},
-		command: {
-			type: "dateFile",
-			filename: path.join(logsPath, "application", "command"),
-			pattern: "yyyy-MM-dd.log",
-			numBackups: 15,
-			alwaysIncludePattern: true,
-			layout: {
-				type: "pattern",
-				pattern: "[%d{hh:mm:ss.SSS}][%4.4p] %m"
-			}
-		},
-		httpConsole: {
-			type: "stdout",
-			layout: {
-				type: "pattern",
-				pattern: "%[[amagi][%d{hh:mm:ss.SSS}][HTTP]%] %m"
-			}
-		},
-		httpRequest: {
-			type: "dateFile",
-			filename: path.join(logsPath, "http", "requests"),
-			pattern: "yyyy-MM-dd.log",
-			numBackups: 30,
-			alwaysIncludePattern: true,
-			layout: {
-				type: "pattern",
-				pattern: "[%d{hh:mm:ss.SSS}][%4.4p] %m"
-			}
-		}
-	},
-	categories: {
-		default: {
-			appenders: ["console", "command"],
-			level: currentLogLevel
-		},
-		http: {
-			appenders: ["httpConsole", "httpRequest"],
-			level: "debug"
-		}
-	},
-	pm2: true
-});
+/** 初始化 logger 配置 */
+const initLogger = () => {
+	log4jsPromise.then((log4js) => {
+		log4js.configure({
+			appenders: {
+				console: {
+					type: "stdout",
+					layout: {
+						type: "pattern",
+						pattern: "%[[amagi][%d{hh:mm:ss.SSS}][%4.4p]%] %m"
+					}
+				},
+				command: {
+					type: "dateFile",
+					filename: path.join(logsPath, "application", "command"),
+					pattern: "yyyy-MM-dd.log",
+					numBackups: 15,
+					alwaysIncludePattern: true,
+					layout: {
+						type: "pattern",
+						pattern: "[%d{hh:mm:ss.SSS}][%4.4p] %m"
+					}
+				},
+				httpConsole: {
+					type: "stdout",
+					layout: {
+						type: "pattern",
+						pattern: "%[[amagi][%d{hh:mm:ss.SSS}][HTTP]%] %m"
+					}
+				},
+				httpRequest: {
+					type: "dateFile",
+					filename: path.join(logsPath, "http", "requests"),
+					pattern: "yyyy-MM-dd.log",
+					numBackups: 30,
+					alwaysIncludePattern: true,
+					layout: {
+						type: "pattern",
+						pattern: "[%d{hh:mm:ss.SSS}][%4.4p] %m"
+					}
+				}
+			},
+			categories: {
+				default: {
+					appenders: ["console", "command"],
+					level: currentLogLevel
+				},
+				http: {
+					appenders: ["httpConsole", "httpRequest"],
+					level: "debug"
+				}
+			},
+			pm2: true
+		});
+	});
+};
 var CustomLogger = class {
 	logger;
+	queue = [];
 	chalk;
 	red;
 	green;
@@ -90,7 +113,10 @@ var CustomLogger = class {
 	white;
 	gray;
 	constructor(name) {
-		this.logger = log4js.getLogger(name);
+		log4jsPromise.then((log4js) => {
+			this.logger = log4js.getLogger(name);
+			this.flush();
+		});
 		this.chalk = new Chalk();
 		this.red = this.chalk.red;
 		this.green = this.chalk.green;
@@ -101,20 +127,31 @@ var CustomLogger = class {
 		this.white = this.chalk.white;
 		this.gray = this.chalk.gray;
 	}
+	flush() {
+		if (!this.logger) return;
+		while (this.queue.length) {
+			const [method, args] = this.queue.shift();
+			this.logger[method](...args);
+		}
+	}
+	proxy(method, args) {
+		if (this.logger) this.logger[method](...args);
+		else this.queue.push([method, args]);
+	}
 	info(message, ...args) {
-		this.logger.info(message, ...args);
+		this.proxy("info", [message, ...args]);
 	}
 	warn(message, ...args) {
-		this.logger.warn(message, ...args);
+		this.proxy("warn", [message, ...args]);
 	}
 	error(message, ...args) {
-		this.logger.error(message, ...args);
+		this.proxy("error", [message, ...args]);
 	}
 	mark(message, ...args) {
-		this.logger.mark(message, ...args);
+		this.proxy("mark", [message, ...args]);
 	}
 	debug(message, ...args) {
-		this.logger.debug(message, ...args);
+		this.proxy("debug", [message, ...args]);
 	}
 };
 const logger = new CustomLogger("default");
@@ -713,51 +750,26 @@ var xiaohongshuSign = class {
 		return this.client.signXsPost(path$1, a1Cookie, clientType, body);
 	}
 	/**
-	* 生成X-S签名（兼容旧接口）
-	* @param url - 请求URL
-	* @param body - 请求体
-	* @param userAgent - User-Agent（暂未使用）
-	* @param method - 请求方法，默认为 'POST'
-	* @param a1Cookie - a1 cookie值
-	* @returns X-S签名
-	*/
-	static generateXS(url$1, body, userAgent, method = "POST", a1Cookie = "") {
-		try {
-			const urlObj = new URL(url$1);
-			const path$1 = urlObj.pathname + urlObj.search;
-			if (method.toUpperCase() === "GET") {
-				const params = typeof body === "object" ? body : {};
-				return this.generateXSGet(path$1, a1Cookie, "xhs-pc-web", params);
-			} else {
-				const requestBody = typeof body === "object" ? body : {};
-				return this.generateXSPost(path$1, a1Cookie, "xhs-pc-web", requestBody);
-			}
-		} catch (error) {
-			console.error("生成X-S签名失败:", error);
-			throw new Error(`签名生成失败: ${error}`);
-		}
-	}
-	/**
 	* 生成X-S-Common参数
-	* @param length - 长度
+	* @param cookies - cookie字符串
 	* @returns Base64编码的随机字符串
 	*/
-	static generateXSCommon(length = 945) {
-		return crypto.randomBytes(length).toString("base64").replace(/=+$/, "");
+	static generateXSCommon(cookies) {
+		return this.client.signXsCommon(cookies);
 	}
 	/**
 	* 生成X-T时间戳
 	* @returns 当前时间戳字符串
 	*/
 	static generateXT() {
-		return Date.now().toString();
+		return this.client.getXT();
 	}
 	/**
 	* 生成X-B3-Traceid
 	* @returns 16位随机字符串
 	*/
 	static generateXB3Traceid() {
-		return Array.from({ length: 16 }, () => "abcdef0123456789"[Math.floor(Math.random() * 16)]).join("");
+		return this.client.getB3TraceId();
 	}
 	/**
 	* 从cookie字符串中提取a1值
@@ -1243,7 +1255,8 @@ const fetchResponse = async (config, maxRetries = DEFAULT_MAX_RETRIES) => {
 * 判断结果是否为网络错误响应
 * @param result - 请求结果
 * @returns 是否为ErrorResult
-* @description 通过检查 error 字段中的 amagiError 来区分网络错误和业务错误
+* 
+* 通过检查 error 字段中的 amagiError 来区分网络错误和业务错误
 */
 const isNetworkErrorResult = (result) => {
 	if (result === null || typeof result !== "object") return false;
@@ -3649,11 +3662,53 @@ const DouyinData = async (data$1, cookie, requestConfig) => {
 		}
 		case "评论数据": {
 			const urlGenerator = (params) => douyinApiUrls$1.评论(params);
-			return await fetchPaginatedData(data$1.methodType, urlGenerator, data$1, 50, baseRequestConfig, signType);
+			return await fetchPaginatedData({
+				type: data$1.methodType,
+				apiUrlGenerator: urlGenerator,
+				params: {
+					...data$1,
+					cursor: data$1.cursor ?? 0
+				},
+				maxPageSize: 50,
+				requestConfig: baseRequestConfig,
+				signType,
+				extractList: (resp) => resp.comments ?? [],
+				updateParams: (params, resp) => ({
+					...params,
+					cursor: resp.cursor
+				}),
+				hasMore: (resp) => resp.has_more === 1,
+				formatFinalResponse: (resp, list) => ({
+					...resp,
+					comments: list,
+					cursor: resp.cursor ?? list.length
+				})
+			});
 		}
 		case "指定评论回复数据": {
 			const urlGenerator = (params) => douyinApiUrls$1.二级评论(params);
-			return await fetchPaginatedData(data$1.methodType, urlGenerator, data$1, 3, baseRequestConfig, "x_bogus");
+			return await fetchPaginatedData({
+				type: data$1.methodType,
+				apiUrlGenerator: urlGenerator,
+				params: {
+					...data$1,
+					cursor: data$1.cursor ?? 0
+				},
+				maxPageSize: 3,
+				requestConfig: baseRequestConfig,
+				signType: "x_bogus",
+				extractList: (resp) => resp.comments ?? [],
+				updateParams: (params, resp) => ({
+					...params,
+					cursor: resp.cursor
+				}),
+				hasMore: (resp) => resp.has_more === 1,
+				formatFinalResponse: (resp, list) => ({
+					...resp,
+					comments: list,
+					cursor: resp.cursor ?? list.length
+				})
+			});
 		}
 		case "用户主页数据": {
 			const url$1 = douyinApiUrls$1.用户主页信息({ sec_uid: data$1.sec_uid });
@@ -3705,10 +3760,6 @@ const DouyinData = async (data$1, cookie, requestConfig) => {
 			});
 		}
 		case "搜索数据": {
-			let search_id = "";
-			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 = {
@@ -3720,146 +3771,82 @@ const DouyinData = async (data$1, cookie, requestConfig) => {
 			};
 			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.搜索({
+			return await fetchPaginatedData({
+				type: data$1.methodType,
+				apiUrlGenerator: (params) => douyinApiUrls$1.搜索(params),
+				params: {
 					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: url$1
-				});
-				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);
+					number: data$1.number ?? 10,
+					search_id: ""
+				},
+				maxPageSize: 15,
+				requestConfig: customConfig,
+				signType: null,
+				processRawResponse: (raw) => {
+					if (!isUserSearch && !isVideoSearch) {
+						const responses = filterSearchResponses(typeof raw === "string" ? parseDouyinMultiJson(raw) : [raw]);
+						if (responses.length === 0) return raw;
+						const mergedData = [];
+						let lastValid = {};
+						for (const resp of responses) {
+							if (Array.isArray(resp.data) && resp.data.length > 0) mergedData.push(...resp.data);
+							lastValid = resp;
+						}
 						return {
-							data: raw,
-							amagiError: Err,
-							amagiMessage: warningMessage
+							...lastValid,
+							data: mergedData
 						};
 					}
-					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
-						};
+					return raw;
+				},
+				extractList: (resp) => {
+					if (isUserSearch) return resp.user_list ?? [];
+					return resp.data ?? [];
+				},
+				updateParams: (params, resp) => {
+					let nextSearchId = params.search_id;
+					if (isUserSearch) nextSearchId = resp.rid ?? nextSearchId;
+					else nextSearchId = resp.log_pb?.impr_id ?? nextSearchId;
+					return {
+						...params,
+						search_id: nextSearchId
+					};
+				},
+				hasMore: (resp) => {
+					return resp.has_more !== 0;
+				},
+				validateFirstPage: (list, raw, url$1) => {
+					const typeStr = isUserSearch ? "用户" : isVideoSearch ? "视频" : "综合";
+					let isInvalidResponse = false;
+					const rawAny = raw;
+					if (!rawAny || typeof rawAny !== "object") isInvalidResponse = true;
+					else if (isUserSearch && !rawAny.user_list) isInvalidResponse = true;
+					else if (isVideoSearch && !rawAny.data) isInvalidResponse = true;
+					else if (!isUserSearch && !isVideoSearch && !rawAny.data) isInvalidResponse = true;
+					if (isInvalidResponse) {
+						const desc = `抖音${typeStr}搜索返回无有效数据，疑似触发反爬机制，你的抖音Cookie可能已经失效！`;
 						const warningMessage = `
-            获取响应数据失败！原因：${logger.yellow("综合搜索接口返回无有效数据，疑似触发反爬机制，你的抖音Cookie可能已经失效！")}
+            获取响应数据失败！原因：${logger.yellow(`${typeStr}搜索返回无有效数据，疑似触发反爬机制`)}
             请求类型：「${data$1.methodType}」
             搜索关键词：「${data$1.query}」
             请求URL：${url$1}
             `;
-						!isFirstRequest && logger.warn(warningMessage);
 						return {
 							code: douoyinAPIErrorCode.COOKIE,
 							data: raw,
-							amagiError: Err,
+							amagiError: {
+								errorDescription: desc,
+								requestType: data$1.methodType ?? "未知请求类型",
+								requestUrl: url$1
+							},
 							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
-						};
+					if (!list || list.length === 0) {
+						const desc = `抖音${typeStr}搜索接口第一次请求就返回空数组，可能该关键词无搜索结果或触发风控限制，你的抖音Cookie可能已经失效！`;
 						const warningMessage = `
-            获取响应数据失败！原因：${logger.yellow("综合搜索索接第一次请求就返回空数组，你的抖音Cookie可能已经失效！")}
+            获取响应数据失败！原因：${logger.yellow(`${typeStr}搜索接口第一次请求就返回空数组，你的抖音Cookie可能已经失效！`)}
             请求类型：「${data$1.methodType}」
             搜索关键词：「${data$1.query}」
             请求URL：${url$1}
@@ -3867,25 +3854,27 @@ const DouyinData = async (data$1, cookie, requestConfig) => {
 						logger.warn(warningMessage);
 						return {
 							data: raw,
-							amagiError: Err,
+							amagiError: {
+								errorDescription: desc,
+								requestType: data$1.methodType ?? "未知请求类型",
+								requestUrl: url$1
+							},
 							amagiMessage: warningMessage
 						};
 					}
-					if (tmpresp && typeof tmpresp.has_more === "number" && tmpresp.has_more === 0) break;
+					return null;
+				},
+				formatFinalResponse: (resp, list) => {
+					if (isUserSearch) return {
+						...resp,
+						user_list: list
+					};
+					return {
+						...resp,
+						data: list
+					};
 				}
-				isFirstRequest = false;
-			}
-			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: slicedList
-			};
+			});
 		}
 		case "动态表情数据": {
 			const url$1 = douyinApiUrls$1.互动表情();
@@ -4021,40 +4010,48 @@ const DouyinData = async (data$1, cookie, requestConfig) => {
 };
 /**
 * 通用的分页请求函数
-* @param type - 请求类型
-* @param apiUrlGenerator - 接口URL生成器
-* @param params - 请求参数
-* @param maxPageSize - 单次请求的最大数据量
-* @param requestConfig - axios请求配置（外部配置优先）
-* @param signType - 签名算法类型
-* @returns 返回分页数据
+* 封装了循环分页请求、数据合并、错误处理和反爬检测逻辑
+*
+* @template T - 列表项类型
+* @template P - 参数类型
+* @template R - 返回值类型
+* @template RawResp - 原始响应类型
+* @param config - 分页请求配置对象
+* @returns Promise<R> 返回最终构造的数据对象
 */
-const fetchPaginatedData = async (type, apiUrlGenerator, params, maxPageSize, requestConfig, signType = "a_bogus") => {
-	let cursor = params.cursor ?? 0;
-	let fetchedData = [];
-	let tmpresp = {};
+const fetchPaginatedData = async (config) => {
+	const { type, apiUrlGenerator, params, maxPageSize, requestConfig, signType = "a_bogus", extractList, updateParams, hasMore, formatFinalResponse, processRawResponse, validateFirstPage } = config;
+	let currentParams = { ...params };
+	const fetchedData = [];
+	let lastResponse = {};
+	let isFirstRequest = true;
 	const userAgent = requestConfig.headers?.["User-Agent"];
-	while (fetchedData.length < Number(params.number ?? maxPageSize)) {
-		const requestCount = Math.min(Number(params.number ?? maxPageSize) - fetchedData.length, maxPageSize);
-		const url$1 = apiUrlGenerator({
-			...params,
-			number: requestCount,
-			cursor
-		});
-		const response = await GlobalGetData$2(type, {
+	const targetNumber = Number(params.number ?? maxPageSize);
+	while (fetchedData.length < targetNumber) {
+		const remaining = targetNumber - fetchedData.length;
+		currentParams.number = Math.min(remaining, maxPageSize);
+		const url$1 = apiUrlGenerator(currentParams);
+		const finalUrl = signType ? buildSignedUrl(url$1, signType, userAgent) : url$1;
+		const raw = await GlobalGetData$2(type, {
 			...requestConfig,
-			url: buildSignedUrl(url$1, signType, userAgent)
+			url: finalUrl
 		});
-		fetchedData.push(...response.comments ?? response.data ?? []);
-		tmpresp = response;
-		if ((response.comments ?? response.data ?? []).length < requestCount) break;
-		cursor = response.cursor;
+		const response = processRawResponse ? processRawResponse(raw) : raw;
+		if (response && response.amagiError) return response;
+		const list = extractList(response);
+		if (isFirstRequest && validateFirstPage) {
+			const error = validateFirstPage(list, response, finalUrl);
+			if (error) return error;
+		}
+		if (Array.isArray(list) && list.length > 0) fetchedData.push(...list);
+		lastResponse = response;
+		if (!hasMore(response)) break;
+		if (!list || list.length === 0) break;
+		currentParams = updateParams(currentParams, response);
+		isFirstRequest = false;
 	}
-	return {
-		...tmpresp,
-		comments: params.number === 0 ? [] : fetchedData.slice(0, Number(params.number ?? maxPageSize)),
-		cursor: params.number === 0 ? 0 : fetchedData.length
-	};
+	const slicedData = targetNumber === 0 ? [] : fetchedData.slice(0, targetNumber);
+	return formatFinalResponse(lastResponse, slicedData);
 };
 /**
 * 全局数据获取函数
@@ -4363,7 +4360,7 @@ const XiaohongshuData = async (data$1, cookie, requestConfig) => {
 			headers: {
 				...baseRequestConfig.headers,
 				"x-s": xiaohongshuSign.generateXSPost(xiaohongshuApiUrls$1.首页推荐数据(data$1).apiPath, xiaohongshuSign.extractA1FromCookie(cookie ?? ""), "xhs-pc-web", xiaohongshuApiUrls$1.首页推荐数据(data$1).Body),
-				"x-s-common": xiaohongshuSign.generateXSCommon(),
+				"x-s-common": xiaohongshuSign.generateXSCommon(cookie ?? ""),
 				"x-t": xiaohongshuSign.generateXT()
 			}
 		});
@@ -4374,7 +4371,7 @@ const XiaohongshuData = async (data$1, cookie, requestConfig) => {
 			headers: {
 				...baseRequestConfig.headers,
 				"x-s": xiaohongshuSign.generateXSPost(xiaohongshuApiUrls$1.单个笔记数据(data$1).apiPath, xiaohongshuSign.extractA1FromCookie(cookie ?? ""), "xhs-pc-web", xiaohongshuApiUrls$1.单个笔记数据(data$1).Body),
-				"x-s-common": xiaohongshuSign.generateXSCommon(),
+				"x-s-common": xiaohongshuSign.generateXSCommon(cookie ?? ""),
 				"x-t": xiaohongshuSign.generateXT()
 			}
 		});
@@ -4394,7 +4391,7 @@ const XiaohongshuData = async (data$1, cookie, requestConfig) => {
 				headers: {
 					...baseRequestConfig$1.headers,
 					"x-s": xiaohongshuSign.generateXSGet(xiaohongshuApiUrls$1.评论数据(data$1).apiPath, xiaohongshuSign.extractA1FromCookie(cookie ?? ""), "xhs-pc-web"),
-					"x-s-common": xiaohongshuSign.generateXSCommon(),
+					"x-s-common": xiaohongshuSign.generateXSCommon(cookie ?? ""),
 					"x-t": xiaohongshuSign.generateXT()
 				}
 			});
@@ -4417,7 +4414,7 @@ const XiaohongshuData = async (data$1, cookie, requestConfig) => {
 					headers: {
 						...baseRequestConfig$1.headers,
 						"x-s": xiaohongshuSign.generateXSGet(xiaohongshuApiUrls$1.用户数据(data$1).apiPath, xiaohongshuSign.extractA1FromCookie(cookie ?? ""), "xhs-pc-web"),
-						"x-s-common": xiaohongshuSign.generateXSCommon(),
+						"x-s-common": xiaohongshuSign.generateXSCommon(cookie ?? ""),
 						"x-t": xiaohongshuSign.generateXT()
 					}
 				})),
@@ -4432,7 +4429,7 @@ const XiaohongshuData = async (data$1, cookie, requestConfig) => {
 				...baseRequestConfig.headers,
 				"x-b3-traceid": xiaohongshuSign.generateXB3Traceid(),
 				"x-s": xiaohongshuSign.generateXSGet(xiaohongshuApiUrls$1.用户笔记数据(data$1).apiPath, xiaohongshuSign.extractA1FromCookie(cookie ?? ""), "xhs-pc-web"),
-				"x-s-common": xiaohongshuSign.generateXSCommon(),
+				"x-s-common": xiaohongshuSign.generateXSCommon(cookie ?? ""),
 				"x-t": xiaohongshuSign.generateXT()
 			}
 		});
@@ -4452,7 +4449,7 @@ const XiaohongshuData = async (data$1, cookie, requestConfig) => {
 				headers: {
 					...baseRequestConfig$1.headers,
 					"x-s": xiaohongshuSign.generateXSGet(xiaohongshuApiUrls$1.表情列表(data$1).apiPath, xiaohongshuSign.extractA1FromCookie(cookie ?? ""), "xhs-pc-web"),
-					"x-s-common": xiaohongshuSign.generateXSCommon(),
+					"x-s-common": xiaohongshuSign.generateXSCommon(cookie ?? ""),
 					"x-t": xiaohongshuSign.generateXT()
 				}
 			});
@@ -4464,7 +4461,7 @@ const XiaohongshuData = async (data$1, cookie, requestConfig) => {
 			headers: {
 				...baseRequestConfig.headers,
 				"x-s": xiaohongshuSign.generateXSPost(xiaohongshuApiUrls$1.搜索笔记(data$1).apiPath, xiaohongshuSign.extractA1FromCookie(cookie ?? ""), "xhs-pc-web"),
-				"x-s-common": xiaohongshuSign.generateXSCommon(),
+				"x-s-common": xiaohongshuSign.generateXSCommon(cookie ?? ""),
 				"x-t": xiaohongshuSign.generateXT()
 			}
 		});
@@ -4956,6 +4953,7 @@ const createAmagiClient = (options) => {
 	* @returns Express应用实例
 	*/
 	const startServer = (port = 4567) => {
+		initLogger();
 		const app = express();
 		app.use(express.json());
 		app.use(express.urlencoded({ extended: true }));
@@ -5173,7 +5171,7 @@ let DynamicType = /* @__PURE__ */ function(DynamicType$1) {
 
 //#endregion
 //#region src/index.ts
-const VERSION = "5.12.0";
+const VERSION = "5.12.3";
 /**
 * @deprecated 请使用 createAmagiClient 替代
 */
@@ -5209,4 +5207,5 @@ const Client = CreateApp;
 const amagi = Client;
 
 //#endregion
-export { AdditionalType, ApiError, BilibiliApplyCaptchaParamsSchema, BilibiliArticleCardParamsSchema, BilibiliArticleInfoParamsSchema, BilibiliArticleParamsSchema, BilibiliAv2BvParamsSchema, BilibiliBangumiInfoParamsSchema, BilibiliBangumiStreamParamsSchema, BilibiliBv2AvParamsSchema, BilibiliColumnInfoParamsSchema, BilibiliCommentParamsSchema, BilibiliCommentReplyParamsSchema, BilibiliDynamicParamsSchema, BilibiliEmojiParamsSchema, BilibiliLiveParamsSchema, BilibiliLoginParamsSchema, BilibiliMethodRoutes, BilibiliQrcodeParamsSchema, BilibiliQrcodeStatusParamsSchema, BilibiliUserParamsSchema, BilibiliValidateCaptchaParamsSchema, BilibiliValidationSchemas, BilibiliVideoDownloadParamsSchema, BilibiliVideoParamsSchema, CommentType, CreateApp, DouyinCommentParamsSchema, DouyinCommentReplyParamsSchema, DouyinDanmakuParamsSchema, DouyinEmojiListParamsSchema, DouyinEmojiProParamsSchema, DouyinHotWordsParamsSchema, DouyinLiveRoomParamsSchema, DouyinMethodRoutes, DouyinMusicParamsSchema, DouyinQrcodeParamsSchema, DouyinSearchParamsSchema, DouyinUserParamsSchema, DouyinValidationSchemas, DouyinWorkParamsSchema, DynamicType, KuaishouCommentParamsSchema, KuaishouEmojiParamsSchema, KuaishouMethodRoutes, KuaishouValidationSchemas, KuaishouVideoParamsSchema, MajorType, ValidationError, XiaohongshuMethodRoutes, XiaohongshuValidationSchemas, amagi, amagiClient, av2bv, bilibili, bilibiliApiUrls, bilibiliErrorCodeMap, bilibiliUtils, bv2av, createAmagiClient, createBilibiliRoutes, createBilibiliRoutes as registerBilibiliRoutes, createBoundBilibiliApi, createBoundDouyinApi, createBoundKuaishouApi, createBoundXiaohongshuApi, createDouyinRoutes, createDouyinRoutes as registerDouyinRoutes, createErrorResponse, createKuaishouRoutes, createKuaishouRoutes as registerKuaishouRoutes, createSuccessResponse, createXiaohongshuRoutes, createXiaohongshuRoutes as registerXiaohongshuRoutes, Client as default, douyin, douyinApiUrls, douyinSign, douyinUtils, fetchData, fetchResponse, getBilibiliData, getDouyinData, getHeadersAndData, getKuaishouData, handleError, httpLogger, isNetworkErrorResult, kuaishou, kuaishouApiUrls, kuaishouUtils, logMiddleware, logger, qtparam, validateBilibiliParams, validateDouyinParams, validateKuaishouParams, validateXiaohongshuParams, wbi_sign, xiaohongshu, xiaohongshuApiUrls, xiaohongshuSign, xiaohongshuUtils };
+export { AdditionalType, ApiError, BilibiliApplyCaptchaParamsSchema, BilibiliArticleCardParamsSchema, BilibiliArticleInfoParamsSchema, BilibiliArticleParamsSchema, BilibiliAv2BvParamsSchema, BilibiliBangumiInfoParamsSchema, BilibiliBangumiStreamParamsSchema, BilibiliBv2AvParamsSchema, BilibiliColumnInfoParamsSchema, BilibiliCommentParamsSchema, BilibiliCommentReplyParamsSchema, BilibiliDynamicParamsSchema, BilibiliEmojiParamsSchema, BilibiliLiveParamsSchema, BilibiliLoginParamsSchema, BilibiliMethodRoutes, BilibiliQrcodeParamsSchema, BilibiliQrcodeStatusParamsSchema, BilibiliUserParamsSchema, BilibiliValidateCaptchaParamsSchema, BilibiliValidationSchemas, BilibiliVideoDownloadParamsSchema, BilibiliVideoParamsSchema, CommentType, CreateApp, DouyinCommentParamsSchema, DouyinCommentReplyParamsSchema, DouyinDanmakuParamsSchema, DouyinEmojiListParamsSchema, DouyinEmojiProParamsSchema, DouyinHotWordsParamsSchema, DouyinLiveRoomParamsSchema, DouyinMethodRoutes, DouyinMusicParamsSchema, DouyinQrcodeParamsSchema, DouyinSearchParamsSchema, DouyinUserParamsSchema, DouyinValidationSchemas, DouyinWorkParamsSchema, DynamicType, KuaishouCommentParamsSchema, KuaishouEmojiParamsSchema, KuaishouMethodRoutes, KuaishouValidationSchemas, KuaishouVideoParamsSchema, MajorType, ValidationError, XiaohongshuMethodRoutes, XiaohongshuValidationSchemas, amagi, amagiClient, av2bv, bilibili, bilibiliApiUrls, bilibiliErrorCodeMap, bilibiliUtils, bv2av, createAmagiClient, createBilibiliRoutes, createBilibiliRoutes as registerBilibiliRoutes, createBoundBilibiliApi, createBoundDouyinApi, createBoundKuaishouApi, createBoundXiaohongshuApi, createDouyinRoutes, createDouyinRoutes as registerDouyinRoutes, createErrorResponse, createKuaishouRoutes, createKuaishouRoutes as registerKuaishouRoutes, createSuccessResponse, createXiaohongshuRoutes, createXiaohongshuRoutes as registerXiaohongshuRoutes, Client as default, douyin, douyinApiUrls, douyinSign, douyinUtils, fetchData, fetchResponse, getBilibiliData, getDouyinData, getHeadersAndData, getKuaishouData, handleError, httpLogger, initLogger, isNetworkErrorResult, kuaishou, kuaishouApiUrls, kuaishouUtils, logMiddleware, logger, qtparam, validateBilibiliParams, validateDouyinParams, validateKuaishouParams, validateXiaohongshuParams, wbi_sign, xiaohongshu, xiaohongshuApiUrls, xiaohongshuSign, xiaohongshuUtils };
+//# sourceMappingURL=index.js.map