@ikenxuan/amagi 6.2.0 → 6.4.0

package/dist/default/index.mjs

@@ -530,6 +530,15 @@ var BilibiliAPI = class {
 	getUserCard(data) {
 		return `https://api.bilibili.com/x/web-interface/card?mid=${data.host_mid}&photo=true`;
 	}
+	/**
+	* 按用户 UID 获取直播状态。
+	*
+	* @remarks
+	* 该接口直接返回用户当前直播状态，不依赖空间动态中的直播推荐卡片。
+	*/
+	getUserLiveStatus(data) {
+		return `https://api.live.bilibili.com/room/v1/Room/getRoomInfoOld?mid=${data.host_mid}`;
+	}
 	/** 获取直播间信息 */
 	getLiveRoomInfo(data) {
 		return `https://api.live.bilibili.com/room/v1/Room/get_info?room_id=${data.room_id}`;
@@ -975,6 +984,7 @@ const BilibiliUserParamsSchema = zod.object({
 	methodType: zod.enum([
 		"userCard",
 		"userDynamicList",
+		"userLiveStatus",
 		"uploaderTotalViews",
 		"userSpaceInfo"
 	], { error: "方法类型必须是指定的枚举值之一" }),
@@ -1075,6 +1085,7 @@ const BilibiliValidationSchemas = {
 	commentReplies: BilibiliCommentReplyParamsSchema,
 	userCard: BilibiliUserParamsSchema,
 	userDynamicList: BilibiliUserParamsSchema,
+	userLiveStatus: BilibiliUserParamsSchema,
 	userSpaceInfo: BilibiliUserParamsSchema,
 	emojiList: BilibiliEmojiParamsSchema,
 	bangumiInfo: BilibiliBangumiInfoParamsSchema,
@@ -1105,6 +1116,7 @@ const BilibiliMethodRoutes = {
 	commentReplies: "/fetch_comment_reply",
 	userCard: "/fetch_user_profile",
 	userDynamicList: "/fetch_user_dynamic",
+	userLiveStatus: "/fetch_user_live_status",
 	userSpaceInfo: "/fetch_user_space_info",
 	emojiList: "/fetch_emoji_list",
 	bangumiInfo: "/fetch_bangumi_video_info",
@@ -2376,6 +2388,27 @@ async function fetchUserDynamicList(options, cookie, requestConfig) {
 	});
 }
 /**
+* 按用户 UID 获取B站直播状态
+* @param options - 用户参数
+* @param options.host_mid - 用户 UID
+* @param cookie - B站 Cookie (可选)
+* @param requestConfig - 请求配置 (可选)
+* @returns 用户直播状态与直播间基础信息
+* @example
+* ```typescript
+* const result = await fetchUserLiveStatus({ host_mid: 123456, typeMode: 'strict' }, cookie)
+* if (result.success && result.data.data.liveStatus === 1) {
+*   console.log(result.data.data.roomid) // 正在直播的房间 ID
+* }
+* ```
+*/
+async function fetchUserLiveStatus(options, cookie, requestConfig) {
+	return fetchBilibiliInternal("userLiveStatus", options, {
+		cookie,
+		requestConfig
+	});
+}
+/**
 * 获取B站用户空间详细信息
 * @param options - 用户参数
 * @param options.host_mid - 用户 UID
@@ -2533,6 +2566,37 @@ async function fetchVideoDanmaku(options, cookie, requestConfig) {
 	});
 }
 //#endregion
+//#region src/model/fetchers/shared/request-config.ts
+/**
+* 合并 Fetcher 的实例级请求配置与单次请求配置。
+*
+* 单次配置优先，请求头单独合并。函数不会修改任一入参，因此同一绑定
+* Fetcher 可以安全地在并发任务中为不同请求使用不同配置。
+*/
+const mergeRequestConfig = (base, override) => {
+	if (!override) return base;
+	return {
+		...base ?? {},
+		...override,
+		headers: {
+			...base?.headers ?? {},
+			...override.headers ?? {}
+		}
+	};
+};
+/**
+* 解析绑定 Fetcher 当前调用实际使用的 cookie 与请求配置。
+*
+* 实例级或单次配置显式提供大写 `headers.Cookie` 时，合并后的值同时替换
+* 底层 Fetcher 的 cookie 参数，确保平台签名、前置请求和最终请求处于同一身份状态。
+*/
+const resolveBoundRequest = (boundCookie, base, override) => {
+	const requestConfig = mergeRequestConfig(base, override);
+	const headers = requestConfig?.headers;
+	const cookieOverride = Boolean(headers && Object.prototype.hasOwnProperty.call(headers, "Cookie")) ? headers.Cookie : void 0;
+	return [typeof cookieOverride === "string" ? cookieOverride : boundCookie, requestConfig];
+};
+//#endregion
 //#region src/model/fetchers/bilibili/bound.ts
 /**
 * 创建绑定了 Cookie 和请求配置的 B站 Fetcher
@@ -2548,35 +2612,37 @@ async function fetchVideoDanmaku(options, cookie, requestConfig) {
 * ```
 */
 function createBoundBilibiliFetcher(cookie, requestConfig) {
+	const resolveRequest = (override) => resolveBoundRequest(cookie, requestConfig, override);
 	return {
-		fetchVideoInfo: (options) => fetchVideoInfo(options, cookie, requestConfig),
-		fetchVideoStreamUrl: (options) => fetchVideoStreamUrl(options, cookie, requestConfig),
-		fetchVideoDanmaku: (options) => fetchVideoDanmaku(options, cookie, requestConfig),
-		fetchComments: (options) => fetchComments(options, cookie, requestConfig),
-		fetchCommentReplies: (options) => fetchCommentReplies$1(options, cookie, requestConfig),
-		fetchUserCard: (options) => fetchUserCard(options, cookie, requestConfig),
-		fetchUserDynamicList: (options) => fetchUserDynamicList(options, cookie, requestConfig),
-		fetchUserSpaceInfo: (options) => fetchUserSpaceInfo(options, cookie, requestConfig),
-		fetchUploaderTotalViews: (options) => fetchUploaderTotalViews(options, cookie, requestConfig),
-		fetchDynamicDetail: (options) => fetchDynamicDetail(options, cookie, requestConfig),
+		fetchVideoInfo: (options, override) => fetchVideoInfo(options, ...resolveRequest(override)),
+		fetchVideoStreamUrl: (options, override) => fetchVideoStreamUrl(options, ...resolveRequest(override)),
+		fetchVideoDanmaku: (options, override) => fetchVideoDanmaku(options, ...resolveRequest(override)),
+		fetchComments: (options, override) => fetchComments(options, ...resolveRequest(override)),
+		fetchCommentReplies: (options, override) => fetchCommentReplies$1(options, ...resolveRequest(override)),
+		fetchUserCard: (options, override) => fetchUserCard(options, ...resolveRequest(override)),
+		fetchUserDynamicList: (options, override) => fetchUserDynamicList(options, ...resolveRequest(override)),
+		fetchUserLiveStatus: (options, override) => fetchUserLiveStatus(options, ...resolveRequest(override)),
+		fetchUserSpaceInfo: (options, override) => fetchUserSpaceInfo(options, ...resolveRequest(override)),
+		fetchUploaderTotalViews: (options, override) => fetchUploaderTotalViews(options, ...resolveRequest(override)),
+		fetchDynamicDetail: (options, override) => fetchDynamicDetail(options, ...resolveRequest(override)),
 		/** @deprecated v6.1.3 已废弃，调用将返回错误信息 */
-		fetchDynamicCard: (options) => fetchDynamicCard(options, cookie, requestConfig),
-		fetchBangumiInfo: (options) => fetchBangumiInfo(options, cookie, requestConfig),
-		fetchBangumiStreamUrl: (options) => fetchBangumiStreamUrl(options, cookie, requestConfig),
-		fetchLiveRoomInfo: (options) => fetchLiveRoomInfo$2(options, cookie, requestConfig),
-		fetchLiveRoomInitInfo: (options) => fetchLiveRoomInitInfo(options, cookie, requestConfig),
-		fetchArticleContent: (options) => fetchArticleContent(options, cookie, requestConfig),
-		fetchArticleCards: (options) => fetchArticleCards(options, cookie, requestConfig),
-		fetchArticleInfo: (options) => fetchArticleInfo(options, cookie, requestConfig),
-		fetchArticleListInfo: (options) => fetchArticleListInfo(options, cookie, requestConfig),
-		fetchLoginStatus: (options) => fetchLoginStatus(options, cookie, requestConfig),
-		requestLoginQrcode: (options) => requestLoginQrcode$1(options, cookie, requestConfig),
-		checkQrcodeStatus: (options) => checkQrcodeStatus(options, cookie, requestConfig),
-		requestCaptchaFromVoucher: (options) => requestCaptchaFromVoucher(options, cookie, requestConfig),
-		validateCaptchaResult: (options) => validateCaptchaResult(options, cookie, requestConfig),
-		convertAvToBv: (options) => convertAvToBv(options, cookie, requestConfig),
-		convertBvToAv: (options) => convertBvToAv(options, cookie, requestConfig),
-		fetchEmojiList: (options) => fetchEmojiList$3(options, cookie, requestConfig)
+		fetchDynamicCard: (options, override) => fetchDynamicCard(options, ...resolveRequest(override)),
+		fetchBangumiInfo: (options, override) => fetchBangumiInfo(options, ...resolveRequest(override)),
+		fetchBangumiStreamUrl: (options, override) => fetchBangumiStreamUrl(options, ...resolveRequest(override)),
+		fetchLiveRoomInfo: (options, override) => fetchLiveRoomInfo$2(options, ...resolveRequest(override)),
+		fetchLiveRoomInitInfo: (options, override) => fetchLiveRoomInitInfo(options, ...resolveRequest(override)),
+		fetchArticleContent: (options, override) => fetchArticleContent(options, ...resolveRequest(override)),
+		fetchArticleCards: (options, override) => fetchArticleCards(options, ...resolveRequest(override)),
+		fetchArticleInfo: (options, override) => fetchArticleInfo(options, ...resolveRequest(override)),
+		fetchArticleListInfo: (options, override) => fetchArticleListInfo(options, ...resolveRequest(override)),
+		fetchLoginStatus: (options, override) => fetchLoginStatus(options, ...resolveRequest(override)),
+		requestLoginQrcode: (options, override) => requestLoginQrcode$1(options, ...resolveRequest(override)),
+		checkQrcodeStatus: (options, override) => checkQrcodeStatus(options, ...resolveRequest(override)),
+		requestCaptchaFromVoucher: (options, override) => requestCaptchaFromVoucher(options, ...resolveRequest(override)),
+		validateCaptchaResult: (options, override) => validateCaptchaResult(options, ...resolveRequest(override)),
+		convertAvToBv: (options, override) => convertAvToBv(options, ...resolveRequest(override)),
+		convertBvToAv: (options, override) => convertBvToAv(options, ...resolveRequest(override)),
+		fetchEmojiList: (options, override) => fetchEmojiList$3(options, ...resolveRequest(override))
 	};
 }
 //#endregion
@@ -2603,6 +2669,7 @@ const bilibiliFetcher = {
 	fetchCommentReplies: fetchCommentReplies$1,
 	fetchUserCard,
 	fetchUserDynamicList,
+	fetchUserLiveStatus,
 	fetchUserSpaceInfo,
 	fetchUploaderTotalViews,
 	fetchDynamicDetail,
@@ -5033,26 +5100,27 @@ async function fetchDanmakuList(options, cookie, requestConfig) {
 * ```
 */
 function createBoundDouyinFetcher(cookie, requestConfig) {
+	const resolveRequest = (override) => resolveBoundRequest(cookie, requestConfig, override);
 	return {
-		fetchVideoWork: (options, reqConfig) => fetchVideoWork$1(options, cookie, reqConfig ?? requestConfig),
-		fetchImageAlbumWork: (options, reqConfig) => fetchImageAlbumWork(options, cookie, reqConfig ?? requestConfig),
-		fetchSlidesWork: (options, reqConfig) => fetchSlidesWork(options, cookie, reqConfig ?? requestConfig),
-		fetchTextWork: (options, reqConfig) => fetchTextWork(options, cookie, reqConfig ?? requestConfig),
-		parseWork: (options, reqConfig) => parseWork(options, cookie, reqConfig ?? requestConfig),
-		fetchDanmakuList: (options, reqConfig) => fetchDanmakuList(options, cookie, reqConfig ?? requestConfig),
-		fetchWorkComments: (options, reqConfig) => fetchWorkComments$1(options, cookie, reqConfig ?? requestConfig),
-		fetchCommentReplies: (options, reqConfig) => fetchCommentReplies(options, cookie, reqConfig ?? requestConfig),
-		fetchUserProfile: (options, reqConfig) => fetchUserProfile$2(options, cookie, reqConfig ?? requestConfig),
-		fetchUserVideoList: (options, reqConfig) => fetchUserVideoList(options, cookie, reqConfig ?? requestConfig),
-		fetchUserFavoriteList: (options, reqConfig) => fetchUserFavoriteList(options, cookie, reqConfig ?? requestConfig),
-		fetchUserRecommendList: (options, reqConfig) => fetchUserRecommendList(options, cookie, reqConfig ?? requestConfig),
-		searchContent: (options, reqConfig) => searchContent(options, cookie, reqConfig ?? requestConfig),
-		fetchSuggestWords: (options, reqConfig) => fetchSuggestWords(options, cookie, reqConfig ?? requestConfig),
-		fetchMusicInfo: (options, reqConfig) => fetchMusicInfo(options, cookie, reqConfig ?? requestConfig),
-		fetchLiveRoomInfo: (options, reqConfig) => fetchLiveRoomInfo$1(options, cookie, reqConfig ?? requestConfig),
-		requestLoginQrcode: (options, reqConfig) => requestLoginQrcode(options, cookie, reqConfig ?? requestConfig),
-		fetchEmojiList: (options, reqConfig) => fetchEmojiList$2(options, cookie, reqConfig ?? requestConfig),
-		fetchDynamicEmojiList: (options, reqConfig) => fetchDynamicEmojiList(options, cookie, reqConfig ?? requestConfig)
+		fetchVideoWork: (options, override) => fetchVideoWork$1(options, ...resolveRequest(override)),
+		fetchImageAlbumWork: (options, override) => fetchImageAlbumWork(options, ...resolveRequest(override)),
+		fetchSlidesWork: (options, override) => fetchSlidesWork(options, ...resolveRequest(override)),
+		fetchTextWork: (options, override) => fetchTextWork(options, ...resolveRequest(override)),
+		parseWork: (options, override) => parseWork(options, ...resolveRequest(override)),
+		fetchDanmakuList: (options, override) => fetchDanmakuList(options, ...resolveRequest(override)),
+		fetchWorkComments: (options, override) => fetchWorkComments$1(options, ...resolveRequest(override)),
+		fetchCommentReplies: (options, override) => fetchCommentReplies(options, ...resolveRequest(override)),
+		fetchUserProfile: (options, override) => fetchUserProfile$2(options, ...resolveRequest(override)),
+		fetchUserVideoList: (options, override) => fetchUserVideoList(options, ...resolveRequest(override)),
+		fetchUserFavoriteList: (options, override) => fetchUserFavoriteList(options, ...resolveRequest(override)),
+		fetchUserRecommendList: (options, override) => fetchUserRecommendList(options, ...resolveRequest(override)),
+		searchContent: (options, override) => searchContent(options, ...resolveRequest(override)),
+		fetchSuggestWords: (options, override) => fetchSuggestWords(options, ...resolveRequest(override)),
+		fetchMusicInfo: (options, override) => fetchMusicInfo(options, ...resolveRequest(override)),
+		fetchLiveRoomInfo: (options, override) => fetchLiveRoomInfo$1(options, ...resolveRequest(override)),
+		requestLoginQrcode: (options, override) => requestLoginQrcode(options, ...resolveRequest(override)),
+		fetchEmojiList: (options, override) => fetchEmojiList$2(options, ...resolveRequest(override)),
+		fetchDynamicEmojiList: (options, override) => fetchDynamicEmojiList(options, ...resolveRequest(override))
 	};
 }
 //#endregion
@@ -7445,13 +7513,14 @@ const kuaishouFetcher = {
 * ```
 */
 function createBoundKuaishouFetcher(cookie, requestConfig) {
+	const resolveRequest = (override) => resolveBoundRequest(cookie, requestConfig, override);
 	return {
-		fetchVideoWork: (options, reqConfig) => fetchVideoWork(options, cookie, reqConfig ?? requestConfig),
-		fetchWorkComments: (options, reqConfig) => fetchWorkComments(options, cookie, reqConfig ?? requestConfig),
-		fetchUserProfile: (options, reqConfig) => fetchUserProfile$1(options, cookie, reqConfig ?? requestConfig),
-		fetchUserWorkList: (options, reqConfig) => fetchUserWorkList(options, cookie, reqConfig ?? requestConfig),
-		fetchLiveRoomInfo: (options, reqConfig) => fetchLiveRoomInfo(options, cookie, reqConfig ?? requestConfig),
-		fetchEmojiList: (options, reqConfig) => fetchEmojiList$1(options, cookie, reqConfig ?? requestConfig)
+		fetchVideoWork: (options, override) => fetchVideoWork(options, ...resolveRequest(override)),
+		fetchWorkComments: (options, override) => fetchWorkComments(options, ...resolveRequest(override)),
+		fetchUserProfile: (options, override) => fetchUserProfile$1(options, ...resolveRequest(override)),
+		fetchUserWorkList: (options, override) => fetchUserWorkList(options, ...resolveRequest(override)),
+		fetchLiveRoomInfo: (options, override) => fetchLiveRoomInfo(options, ...resolveRequest(override)),
+		fetchEmojiList: (options, override) => fetchEmojiList$1(options, ...resolveRequest(override))
 	};
 }
 //#endregion
@@ -7890,14 +7959,15 @@ const xiaohongshuFetcher = {
 * ```
 */
 function createBoundXiaohongshuFetcher(cookie, requestConfig) {
+	const resolveRequest = (override) => resolveBoundRequest(cookie, requestConfig, override);
 	return {
-		fetchHomeFeed: (options = {}, reqConfig) => fetchHomeFeed(options, cookie, reqConfig ?? requestConfig),
-		fetchNoteDetail: (options, reqConfig) => fetchNoteDetail(options, cookie, reqConfig ?? requestConfig),
-		fetchNoteComments: (options, reqConfig) => fetchNoteComments(options, cookie, reqConfig ?? requestConfig),
-		fetchUserProfile: (options, reqConfig) => fetchUserProfile(options, cookie, reqConfig ?? requestConfig),
-		fetchUserNoteList: (options, reqConfig) => fetchUserNoteList(options, cookie, reqConfig ?? requestConfig),
-		searchNotes: (options, reqConfig) => searchNotes(options, cookie, reqConfig ?? requestConfig),
-		fetchEmojiList: (options, reqConfig) => fetchEmojiList(options, cookie, reqConfig ?? requestConfig)
+		fetchHomeFeed: (options = {}, override) => fetchHomeFeed(options, ...resolveRequest(override)),
+		fetchNoteDetail: (options, override) => fetchNoteDetail(options, ...resolveRequest(override)),
+		fetchNoteComments: (options, override) => fetchNoteComments(options, ...resolveRequest(override)),
+		fetchUserProfile: (options, override) => fetchUserProfile(options, ...resolveRequest(override)),
+		fetchUserNoteList: (options, override) => fetchUserNoteList(options, ...resolveRequest(override)),
+		searchNotes: (options, override) => searchNotes(options, ...resolveRequest(override)),
+		fetchEmojiList: (options, override) => fetchEmojiList(options, ...resolveRequest(override))
 	};
 }
 //#endregion
@@ -8659,6 +8729,10 @@ const fetchBilibili = async (data, cookie, requestConfig) => {
 				url: bilibiliApiUrls.getUserCard({ host_mid })
 			});
 		}
+		case "userLiveStatus": return await GlobalGetData(data.methodType, {
+			...baseRequestConfig,
+			url: bilibiliApiUrls.getUserLiveStatus({ host_mid: data.host_mid })
+		});
 		case "userSpaceInfo": {
 			const wbiSignQuery = await wbi_sign(bilibiliApiUrls.getUserSpaceInfo({ host_mid: data.host_mid }), baseRequestConfig.headers?.cookie);
 			return await GlobalGetData(data.methodType, {
@@ -9744,6 +9818,7 @@ const BilibiliInternalMethods = {
 	COMMENT_REPLIES: "指定评论的回复",
 	USER_CARD: "用户主页数据",
 	USER_DYNAMICS: "用户主页动态列表数据",
+	USER_LIVE_STATUS: "用户直播状态",
 	USER_SPACE_INFO: "用户空间详细信息",
 	USER_TOTAL_VIEWS: "获取UP主总播放量",
 	DYNAMIC_DETAIL: "动态详情数据",
@@ -9774,6 +9849,7 @@ const BilibiliFetcherMethods = {
 	COMMENT_REPLIES: "fetchCommentReplies",
 	USER_CARD: "fetchUserCard",
 	USER_DYNAMICS: "fetchUserDynamicList",
+	USER_LIVE_STATUS: "fetchUserLiveStatus",
 	USER_SPACE_INFO: "fetchUserSpaceInfo",
 	USER_TOTAL_VIEWS: "fetchUploaderTotalViews",
 	DYNAMIC_DETAIL: "fetchDynamicDetail",
@@ -9882,6 +9958,7 @@ const BilibiliMethodToFetcher = {
 	[BilibiliInternalMethods.COMMENT_REPLIES]: BilibiliFetcherMethods.COMMENT_REPLIES,
 	[BilibiliInternalMethods.USER_CARD]: BilibiliFetcherMethods.USER_CARD,
 	[BilibiliInternalMethods.USER_DYNAMICS]: BilibiliFetcherMethods.USER_DYNAMICS,
+	[BilibiliInternalMethods.USER_LIVE_STATUS]: BilibiliFetcherMethods.USER_LIVE_STATUS,
 	[BilibiliInternalMethods.USER_SPACE_INFO]: BilibiliFetcherMethods.USER_SPACE_INFO,
 	[BilibiliInternalMethods.USER_TOTAL_VIEWS]: BilibiliFetcherMethods.USER_TOTAL_VIEWS,
 	[BilibiliInternalMethods.DYNAMIC_DETAIL]: BilibiliFetcherMethods.DYNAMIC_DETAIL,
@@ -10013,6 +10090,7 @@ const BilibiliMethodMapping = {
 	指定评论的回复: "fetchCommentReplies",
 	用户主页数据: "fetchUserCard",
 	用户主页动态列表数据: "fetchUserDynamicList",
+	用户直播状态: "fetchUserLiveStatus",
 	用户空间详细信息: "fetchUserSpaceInfo",
 	获取UP主总播放量: "fetchUploaderTotalViews",
 	动态详情数据: "fetchDynamicDetail",
@@ -10095,6 +10173,7 @@ const BilibiliApiRoutes = {
 	commentReplies: "/comment-replies",
 	userCard: "/user",
 	userDynamicList: "/user/dynamics",
+	userLiveStatus: "/user/live-status",
 	userSpaceInfo: "/user/space",
 	uploaderTotalViews: "/user/total-views",
 	dynamicDetail: "/dynamic",
@@ -10168,7 +10247,7 @@ function getApiRoute(platform, methodType) {
 * 构建后使用 __VERSION__，开发环境从 package.json 读取
 */
 const getVersion = () => {
-	return "6.2.0";
+	return "6.4.0";
 };
 const VERSION = getVersion();
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikenxuan/amagi",
-  "version": "6.2.0",
+  "version": "6.4.0",
   "description": "抖音、B站的 web 端相关数据接口基于 Node.js 的实现",
   "keywords": [
     "api",