@bililive-tools/huya-recorder 1.9.0 → 1.11.0

package/README.md

@@ -41,11 +41,11 @@ interface Options {
   sourcePriorities: []; // 按提供的源优先级去给CDN列表排序，并过滤掉不在优先级配置中的源，在未匹配到的情况下会优先使用TX的CDN，具体参数见 CDN 参数
   formatPriorities?: string[]; // 支持，`flv`和`hls` 参数，默认为['flv','hls']
   disableAutoCheck?: boolean; // 为 true 时 manager 将跳过自动检查
-  segment?: number; // 分段参数，单位分钟
+  segment?: number | string; // 分段参数，单位分钟，如果以"B","KB","MB","GB"结尾，会尝试使用文件大小分段，仅推荐在使用mesio录制引擎时使用
   disableProvideCommentsWhenRecording?: boolean; // 禁用弹幕录制
   saveGiftDanma?: boolean; // 保存礼物弹幕
   saveCover?: boolean; // 保存封面
-  api?: "auto" | "mp" | "web"; // 默认为auto，在星秀区使用mp接口，其他使用web接口，你也可以强制指定
+  api?: "auto" | "mp" | "web" | "wup"; // 默认为auto，在星秀区使用mp接口，其他使用web接口，你也可以强制指定
   videoFormat?: "auto"; // 视频格式： "auto", "ts", "mkv" ，auto模式下, 分段使用 "ts"，不分段使用 "mp4"
   recorderType?: "auto" | "ffmpeg" | "mesio"; // 底层录制器，使用mesio时videoFormat参数无效
   debugLevel?: `verbose` | "basic"; // verbose参数时，录制器会输出更加详细的log
@@ -100,6 +100,17 @@ const url = "https://www.huya.com/910323";
 const { id } = await provider.resolveChannelInfoFromURL(url);
 ```
 
+### API 接口选择
+
+虎牙提供多种API接口，可以根据情况选择：
+
+| 接口类型 | 说明                                     |
+| -------- | ---------------------------------------- |
+| auto     | 一般使用web接口，星秀区使用wup接口       |
+| web      | 你web看到的东西，星秀区会两分钟分段      |
+| wup      | 神奇的接口                               |
+| mp       | 小程序接口，也可以录星秀区，但画质差了点 |
+
 # 协议
 
 与原项目保存一致为 LGPL

package/lib/huya_api.d.ts

@@ -5,6 +5,7 @@ export declare function getRoomInfo(roomIdOrShortId: string, opts?: {
     quality?: Recorder["quality"];
 }): Promise<{
     living: boolean;
+    api: string;
     id: number;
     owner: string;
     title: string;

package/lib/huya_api.js

@@ -47,6 +47,11 @@ export async function getRoomInfo(roomIdOrShortId, opts = {}) {
             sources.flv.push({
                 name: item.sCdnType,
                 url,
+                streamName: sStreamName,
+                presenterUid: item.lPresenterUid,
+                subChannelId: item.lSubChannelId,
+                channelId: item.lChannelId,
+                suffix: item.sFlvUrlSuffix,
             });
         }
         if (item.sHlsAntiCode && item.sHlsAntiCode.length > 0) {
@@ -64,6 +69,11 @@ export async function getRoomInfo(roomIdOrShortId, opts = {}) {
             sources.hls.push({
                 name: item.sCdnType,
                 url,
+                streamName: sStreamName,
+                presenterUid: item.lPresenterUid,
+                subChannelId: item.lSubChannelId,
+                channelId: item.lChannelId,
+                suffix: item.sHlsUrlSuffix,
             });
         }
     }
@@ -71,6 +81,7 @@ export async function getRoomInfo(roomIdOrShortId, opts = {}) {
     const formatSources = getFormatSources(sources, opts.formatPriorities);
     return {
         living: vMultiStreamInfo.length > 0 && data.gameStreamInfoList.length > 0,
+        api: "web",
         id: data.gameLiveInfo.profileRoom,
         owner: data.gameLiveInfo.nick,
         title: data.gameLiveInfo.introduction,

package/lib/huya_mobile_api.d.ts

@@ -1,6 +1,7 @@
 import type { StreamProfile } from "./types.js";
 export declare function getRoomInfo(roomIdOrShortId: string, formatPriorities?: Array<"flv" | "hls">): Promise<{
     living: boolean;
+    api: string;
     id: number;
     owner: string;
     title: string;

package/lib/huya_mobile_api.js

@@ -19,6 +19,7 @@ export async function getRoomInfo(roomIdOrShortId, formatPriorities = ["flv", "h
         flv: [],
         hls: [],
     };
+    // console.log("profile", JSON.stringify(profile, null, 2));
     // const uid = await getAnonymousUid();
     for (const item of profile?.stream?.baseSteamInfoList ?? []) {
         if (item.sFlvAntiCode && item.sFlvAntiCode.length > 0) {
@@ -32,6 +33,11 @@ export async function getRoomInfo(roomIdOrShortId, formatPriorities = ["flv", "h
             sources.flv.push({
                 name: item.sCdnType,
                 url,
+                streamName: item.sStreamName,
+                presenterUid: item.lPresenterUid,
+                subChannelId: item.lSubChannelId,
+                channelId: item.lChannelId,
+                suffix: item.sFlvUrlSuffix,
             });
         }
         if (item.sHlsAntiCode && item.sHlsAntiCode.length > 0) {
@@ -39,6 +45,11 @@ export async function getRoomInfo(roomIdOrShortId, formatPriorities = ["flv", "h
             sources.hls.push({
                 name: item.sCdnType,
                 url,
+                streamName: item.sStreamName,
+                presenterUid: item.lPresenterUid,
+                subChannelId: item.lSubChannelId,
+                channelId: item.lChannelId,
+                suffix: item.sHlsUrlSuffix,
             });
         }
     }
@@ -59,6 +70,7 @@ export async function getRoomInfo(roomIdOrShortId, formatPriorities = ["flv", "h
     }
     return {
         living: profile.liveStatus === "ON",
+        api: "mp",
         id: profile.liveData.profileRoom,
         owner: profile.liveData.nick,
         title: profile.liveData.introduction,

package/lib/huya_wup_api.d.ts

@@ -0,0 +1,125 @@
+/**
+ * 虎牙 WUP 协议客户端
+ * 参考 https://github.com/hua0512/rust-srec 实现
+ */
+declare const WUP_URL = "https://wup.huya.com";
+declare const WUP_UA = "HYSDK(Windows, 30000002)_APP(pc_exe&7030003&official)_SDK(trans&2.29.0.5493)";
+declare const HUYA_ORIGIN = "https://www.huya.com";
+/**
+ * 流信息接口
+ */
+export interface StreamInfo {
+    url: string;
+    streamFormat: string;
+    extras?: StreamExtras;
+}
+/**
+ * 流扩展信息接口
+ */
+export interface StreamExtras {
+    cdn?: string;
+    stream_name: string;
+    presenter_uid?: number;
+}
+/**
+ * CDN Token 信息接口
+ */
+export interface CdnTokenInfo {
+    url: string;
+    cdnType: string;
+    streamName: string;
+    presenterUid: number;
+    antiCode: string;
+    sTime: string;
+    flvAntiCode: string;
+    hlsAntiCode: string;
+}
+/**
+ * GetCdnTokenInfoReq 请求结构体
+ * 对应 Rust 代码中的 GetCdnTokenInfoReq
+ */
+declare class GetCdnTokenInfoReq {
+    url: string;
+    cdnType: string;
+    streamName: string;
+    presenterUid: number;
+    constructor(url?: string, streamName?: string, cdnType?: string, presenterUid?: number);
+    /**
+     * TARS 编码方法 - 将结构体写入输出流
+     * @param os - TARS 输出流
+     */
+    _writeTo(os: any): void;
+    /**
+     * TARS 解码方法 - 从输入流读取结构体
+     * @param is - TARS 输入流
+     */
+    _readFrom(is: any): void;
+}
+/**
+ * HuyaGetTokenResp 响应结构体
+ * 对应 Rust 代码中的 HuyaGetTokenResp
+ */
+declare class HuyaGetTokenResp {
+    url: string;
+    cdnType: string;
+    streamName: string;
+    presenterUid: number;
+    antiCode: string;
+    sTime: string;
+    flvAntiCode: string;
+    hlsAntiCode: string;
+    constructor();
+    /**
+     * TARS 编码方法 - 将结构体写入输出流
+     * @param os - TARS 输出流
+     */
+    _writeTo(os: any): void;
+    /**
+     * TARS 解码方法 - 从输入流读取结构体
+     * @param is - TARS 输入流
+     */
+    _readFrom(is: any): void;
+}
+/**
+ * 构建 getCdnTokenInfo 请求
+ * 对应 Rust 中的 build_get_cdn_token_info_request 函数
+ *
+ * @param streamName - 流名称
+ * @param cdnType - CDN 类型 (例如: "AL")
+ * @param presenterUid - 主播 UID
+ * @returns TARS 编码的请求体
+ */
+declare function buildGetCdnTokenInfoRequest(streamName: string, cdnType: string, presenterUid: number): Buffer;
+/**
+ * 解码 getCdnTokenInfo 响应
+ * 对应 Rust 中的 decode_get_cdn_token_info_response 函数
+ *
+ * @param responseBytes - 响应二进制数据
+ * @returns 解码后的响应对象
+ */
+declare function decodeGetCdnTokenInfoResponse(responseBytes: Buffer): HuyaGetTokenResp;
+/**
+ * 发送 WUP 请求到虎牙服务器
+ *
+ * @param requestBody - 请求体
+ * @returns 响应体
+ */
+declare function sendWupRequest(requestBody: Buffer): Promise<Buffer>;
+/**
+ * 获取虎牙流的真实 URL(使用 WUP 协议)
+ * 对应 Rust 中的 get_stream_url_wup 方法
+ *
+ * @param streamInfo - 流信息对象
+ * @returns 真实流 URL
+ */
+export declare function getStreamUrlWup(streamInfo: StreamInfo): Promise<string>;
+/**
+ * 简化版本：直接获取防盗链参数
+ *
+ * @param streamName - 流名称
+ * @param cdnType - CDN 类型
+ * @param presenterUid - 主播 UID
+ * @returns 包含 flvAntiCode 和 hlsAntiCode
+ */
+export declare function getCdnTokenInfo(streamName: string, cdnType?: string, presenterUid?: number): Promise<CdnTokenInfo>;
+export { GetCdnTokenInfoReq, HuyaGetTokenResp, buildGetCdnTokenInfoRequest, decodeGetCdnTokenInfoResponse, sendWupRequest, WUP_URL, WUP_UA, HUYA_ORIGIN, };

package/lib/huya_wup_api.js

@@ -0,0 +1,227 @@
+/**
+ * 虎牙 WUP 协议客户端
+ * 参考 https://github.com/hua0512/rust-srec 实现
+ */
+import { requester } from "./requester.js";
+import TarsStream from "@tars/stream";
+const Tup = TarsStream.Tup;
+const WUP_URL = "https://wup.huya.com";
+const WUP_UA = "HYSDK(Windows, 30000002)_APP(pc_exe&7030003&official)_SDK(trans&2.29.0.5493)";
+const HUYA_ORIGIN = "https://www.huya.com";
+// ============================================================================
+// TARS 结构体定义
+// ============================================================================
+/**
+ * GetCdnTokenInfoReq 请求结构体
+ * 对应 Rust 代码中的 GetCdnTokenInfoReq
+ */
+class GetCdnTokenInfoReq {
+    url;
+    cdnType;
+    streamName;
+    presenterUid;
+    constructor(url = "", streamName = "", cdnType = "", presenterUid = 0) {
+        this.url = url; // tag=0, String
+        this.cdnType = cdnType; // tag=1, String
+        this.streamName = streamName; // tag=2, String
+        this.presenterUid = presenterUid; // tag=3, Long/Int64
+    }
+    /**
+     * TARS 编码方法 - 将结构体写入输出流
+     * @param os - TARS 输出流
+     */
+    _writeTo(os) {
+        os.writeString(0, this.url);
+        os.writeString(1, this.cdnType);
+        os.writeString(2, this.streamName);
+        os.writeInt64(3, this.presenterUid);
+    }
+    /**
+     * TARS 解码方法 - 从输入流读取结构体
+     * @param is - TARS 输入流
+     */
+    _readFrom(is) {
+        this.url = is.readString(0, false, "");
+        this.cdnType = is.readString(1, false, "");
+        this.streamName = is.readString(2, false, "");
+        this.presenterUid = is.readInt64(3, false, 0);
+    }
+}
+/**
+ * HuyaGetTokenResp 响应结构体
+ * 对应 Rust 代码中的 HuyaGetTokenResp
+ */
+class HuyaGetTokenResp {
+    url;
+    cdnType;
+    streamName;
+    presenterUid;
+    antiCode;
+    sTime;
+    flvAntiCode;
+    hlsAntiCode;
+    constructor() {
+        this.url = ""; // tag=0
+        this.cdnType = ""; // tag=1
+        this.streamName = ""; // tag=2
+        this.presenterUid = 0; // tag=3
+        this.antiCode = ""; // tag=4
+        this.sTime = ""; // tag=5
+        this.flvAntiCode = ""; // tag=6
+        this.hlsAntiCode = ""; // tag=7
+    }
+    /**
+     * TARS 编码方法 - 将结构体写入输出流
+     * @param os - TARS 输出流
+     */
+    _writeTo(os) {
+        os.writeString(0, this.url);
+        os.writeString(1, this.cdnType);
+        os.writeString(2, this.streamName);
+        os.writeInt64(3, this.presenterUid);
+        os.writeString(4, this.antiCode);
+        os.writeString(5, this.sTime);
+        os.writeString(6, this.flvAntiCode);
+        os.writeString(7, this.hlsAntiCode);
+    }
+    /**
+     * TARS 解码方法 - 从输入流读取结构体
+     * @param is - TARS 输入流
+     */
+    _readFrom(is) {
+        this.url = is.readString(0, false, "");
+        this.cdnType = is.readString(1, false, "");
+        this.streamName = is.readString(2, false, "");
+        this.presenterUid = is.readInt64(3, false, 0);
+        this.antiCode = is.readString(4, false, "");
+        this.sTime = is.readString(5, false, "");
+        this.flvAntiCode = is.readString(6, false, "");
+        this.hlsAntiCode = is.readString(7, false, "");
+    }
+}
+// ============================================================================
+// WUP 协议处理
+// ============================================================================
+/**
+ * 构建 getCdnTokenInfo 请求
+ * 对应 Rust 中的 build_get_cdn_token_info_request 函数
+ *
+ * @param streamName - 流名称
+ * @param cdnType - CDN 类型 (例如: "AL")
+ * @param presenterUid - 主播 UID
+ * @returns TARS 编码的请求体
+ */
+function buildGetCdnTokenInfoRequest(streamName, cdnType, presenterUid) {
+    // 1. 创建请求对象
+    const req = new GetCdnTokenInfoReq("", streamName, cdnType, presenterUid);
+    // 2. 创建 TUP 实例
+    const tup = new Tup();
+    // 3. 设置请求头信息
+    tup.tupVersion = 3; // version: 3
+    tup.requestId = 1; // request_id: 1
+    tup.servantName = "liveui"; // servant_name: "liveui"
+    tup.funcName = "getCdnTokenInfo"; // func_name: "getCdnTokenInfo"
+    // 4. 写入请求结构体到 body["tReq"]
+    tup.writeStruct("tReq", req);
+    // 5. 编码为二进制
+    const binBuffer = tup.encode();
+    return binBuffer.toNodeBuffer();
+}
+/**
+ * 解码 getCdnTokenInfo 响应
+ * 对应 Rust 中的 decode_get_cdn_token_info_response 函数
+ *
+ * @param responseBytes - 响应二进制数据
+ * @returns 解码后的响应对象
+ */
+function decodeGetCdnTokenInfoResponse(responseBytes) {
+    // 1. 将 Node.js Buffer 转换为 BinBuffer
+    const binBuffer = new TarsStream.BinBuffer();
+    binBuffer.writeNodeBuffer(responseBytes);
+    // 2. 创建 TUP 实例并解码
+    const tup = new Tup();
+    tup.decode(binBuffer);
+    // 3. 读取响应结构体 body["tRsp"]
+    const resp = new HuyaGetTokenResp();
+    tup.readStruct("tRsp", resp);
+    // 4. 返回响应对象
+    return resp;
+}
+/**
+ * 发送 WUP 请求到虎牙服务器
+ *
+ * @param requestBody - 请求体
+ * @returns 响应体
+ */
+async function sendWupRequest(requestBody) {
+    const response = await requester.post(WUP_URL, requestBody, {
+        headers: {
+            "User-Agent": WUP_UA,
+            Origin: HUYA_ORIGIN,
+            Referer: HUYA_ORIGIN,
+            "Content-Type": "application/octet-stream",
+        },
+        responseType: "arraybuffer",
+    });
+    return Buffer.from(response.data);
+}
+/**
+ * 获取虎牙流的真实 URL(使用 WUP 协议)
+ * 对应 Rust 中的 get_stream_url_wup 方法
+ *
+ * @param streamInfo - 流信息对象
+ * @returns 真实流 URL
+ */
+export async function getStreamUrlWup(streamInfo) {
+    // 1. 提取参数
+    const { extras } = streamInfo;
+    if (!extras) {
+        throw new Error("Stream extras not found for WUP request");
+    }
+    const cdn = extras.cdn || "AL";
+    const streamName = extras.stream_name;
+    const presenterUid = extras.presenter_uid || 0;
+    if (!streamName) {
+        throw new Error("Stream name not found in extras");
+    }
+    // 2. 构建请求
+    const requestBody = buildGetCdnTokenInfoRequest(streamName, cdn, presenterUid);
+    // 3. 发送请求
+    const responseBytes = await sendWupRequest(requestBody);
+    // 4. 解码响应
+    const tokenInfo = decodeGetCdnTokenInfoResponse(responseBytes);
+    // 5. 获取防盗链参数
+    const antiCode = streamInfo.streamFormat === "flv" ? tokenInfo.flvAntiCode : tokenInfo.hlsAntiCode;
+    // 6. 解析原始 URL
+    const url = new URL(streamInfo.url);
+    const host = url.host;
+    const pathParts = url.pathname.split("/");
+    const pathPrefix = pathParts[1] || "";
+    const baseUrl = `${url.protocol}//${host}/${pathPrefix}`;
+    // 7. 确定文件后缀
+    const suffix = streamInfo.streamFormat;
+    // 8. 构建新 URL
+    const newUrl = `${baseUrl}/${streamName}.${suffix}?${antiCode}`;
+    return newUrl;
+}
+/**
+ * 简化版本：直接获取防盗链参数
+ *
+ * @param streamName - 流名称
+ * @param cdnType - CDN 类型
+ * @param presenterUid - 主播 UID
+ * @returns 包含 flvAntiCode 和 hlsAntiCode
+ */
+export async function getCdnTokenInfo(streamName, cdnType = "AL", presenterUid = 0) {
+    const requestBody = buildGetCdnTokenInfoRequest(streamName, cdnType, presenterUid);
+    const responseBytes = await sendWupRequest(requestBody);
+    const tokenInfo = decodeGetCdnTokenInfoResponse(responseBytes);
+    return tokenInfo;
+}
+export { 
+// 类
+GetCdnTokenInfoReq, HuyaGetTokenResp, 
+// 核心函数
+buildGetCdnTokenInfoRequest, decodeGetCdnTokenInfoResponse, sendWupRequest, 
+// 常量
+WUP_URL, WUP_UA, HUYA_ORIGIN, };

package/lib/index.js

@@ -1,6 +1,6 @@
 import path from "node:path";
 import mitt from "mitt";
-import { defaultFromJSON, defaultToJSON, genRecorderUUID, genRecordUUID, utils, createBaseRecorder, } from "@bililive-tools/manager";
+import { defaultFromJSON, defaultToJSON, genRecorderUUID, genRecordUUID, utils, createDownloader, } from "@bililive-tools/manager";
 import { getInfo, getStream } from "./stream.js";
 import { ensureFolderExist } from "./utils.js";
 import HuYaDanMu from "huya-danma-listener";
@@ -13,9 +13,9 @@ function createRecorder(opts) {
         // @ts-ignore
         ...mitt(),
         ...opts,
+        cache: null,
         availableStreams: [],
         availableSources: [],
-        qualityMaxRetry: opts.qualityRetry ?? 0,
         qualityRetry: opts.qualityRetry ?? 0,
         state: "idle",
         api: opts.api ?? "auto",
@@ -61,34 +61,9 @@ const ffmpegInputOptions = ["-rw_timeout", "10000000", "-timeout", "10000000"];
 const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isManualStart, }) {
     // 如果已经在录制中，只在需要检查标题关键词时才获取最新信息
     if (this.recordHandle != null) {
-        // 只有当设置了标题关键词时，并且不是手动启动的录制，才获取最新的直播间信息
-        if (utils.shouldCheckTitleKeywords(isManualStart, this.titleKeywords)) {
-            const now = Date.now();
-            // 每5分钟检查一次标题变化
-            const titleCheckInterval = 5 * 60 * 1000; // 5分钟
-            // 获取上次检查时间
-            const lastCheckTime = typeof this.extra.lastTitleCheckTime === "number" ? this.extra.lastTitleCheckTime : 0;
-            // 如果距离上次检查时间不足指定间隔，则跳过检查
-            if (now - lastCheckTime < titleCheckInterval) {
-                return this.recordHandle;
-            }
-            // 更新检查时间
-            this.extra.lastTitleCheckTime = now;
-            // 获取直播间信息
-            const liveInfo = await getInfo(this.channelId);
-            const { title } = liveInfo;
-            // 检查标题是否包含关键词
-            if (utils.hasBlockedTitleKeywords(title, this.titleKeywords)) {
-                this.state = "title-blocked";
-                this.emit("DebugLog", {
-                    type: "common",
-                    text: `检测到标题包含关键词，停止录制：直播间标题 "${title}" 包含关键词 "${this.titleKeywords}"`,
-                });
-                // 停止录制
-                await this.recordHandle.stop("直播间标题包含关键词");
-                // 返回 null，停止录制
-                return null;
-            }
+        const shouldStop = await utils.checkTitleKeywordsWhileRecording(this, isManualStart, getInfo);
+        if (shouldStop) {
+            return null;
         }
         // 已经在录制中，直接返回
         return this.recordHandle;
@@ -103,7 +78,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         this.state = "check-error";
         throw error;
     }
-    const { living, owner, title, startTime } = this.liveInfo;
+    const { living, owner, title, liveStartTime, recordStartTime } = this.liveInfo;
     if (this.liveInfo.liveId === banLiveId) {
         this.tempStopIntervalCheck = true;
     }
@@ -114,44 +89,26 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         return null;
     if (!living)
         return null;
-    // 检查标题是否包含关键词，如果包含则不自动录制
-    // 手动开始录制时不检查标题关键词
-    if (utils.shouldCheckTitleKeywords(isManualStart, this.titleKeywords)) {
-        if (utils.hasBlockedTitleKeywords(title, this.titleKeywords)) {
-            this.state = "title-blocked";
-            this.emit("DebugLog", {
-                type: "common",
-                text: `跳过录制：直播间标题 "${title}" 包含关键词 "${this.titleKeywords}"`,
-            });
-            return null;
-        }
-    }
+    // 检查标题是否包含关键词
+    if (utils.checkTitleKeywordsBeforeRecord(title, this, isManualStart))
+        return null;
+    const qualityRetryLeft = (await this.cache.get("qualityRetryLeft")) ?? this.qualityRetry;
+    const strictQuality = utils.shouldUseStrictQuality(qualityRetryLeft, this.qualityRetry, isManualStart);
     let res;
-    // TODO: 先不做什么错误处理，就简单包一下预期上会有错误的地方
     try {
-        let strictQuality = false;
-        if (this.qualityRetry > 0) {
-            strictQuality = true;
-        }
-        if (this.qualityMaxRetry < 0) {
-            strictQuality = true;
-        }
-        if (isManualStart) {
-            strictQuality = false;
-        }
         res = await getStream({
             channelId: this.channelId,
             quality: this.quality,
             streamPriorities: this.streamPriorities,
             sourcePriorities: this.sourcePriorities,
-            api: this.api,
+            api: this.api, //"wup"
             strictQuality,
             formatPriorities: this.formatPriorities,
         });
     }
     catch (err) {
-        if (this.qualityRetry > 0)
-            this.qualityRetry -= 1;
+        if (qualityRetryLeft > 0)
+            await this.cache.set("qualityRetryLeft", qualityRetryLeft - 1);
         this.state = "check-error";
         throw err;
     }
@@ -162,12 +119,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     this.usedStream = stream.name;
     this.usedSource = stream.source;
     let isEnded = false;
-    let isCutting = false;
     const onEnd = (...args) => {
-        if (isCutting) {
-            isCutting = false;
-            return;
-        }
         if (isEnded)
             return;
         isEnded = true;
@@ -178,8 +130,11 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         const reason = args[0] instanceof Error ? args[0].message : String(args[0]);
         this.recordHandle?.stop(reason);
     };
-    const recordStartTime = new Date();
-    const recorder = createBaseRecorder(this.recorderType, {
+    let ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.86 Safari/537.36";
+    if (res.api === "wup") {
+        ua = "HYSDK(Windows,30000002)_APP(pc_exe&7030003&official)_SDK(trans&2.29.0.5493)";
+    }
+    const downloader = createDownloader(this.recorderType, {
         url: stream.url,
         outputOptions: ffmpegOutputOptions,
         inputOptions: ffmpegInputOptions,
@@ -188,12 +143,15 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             owner,
             title: opts.title ?? title,
             startTime: opts.startTime,
-            liveStartTime: startTime,
+            liveStartTime,
             recordStartTime,
         }),
         disableDanma: this.disableProvideCommentsWhenRecording,
         videoFormat: this.videoFormat ?? "auto",
         debugLevel: this.debugLevel ?? "none",
+        headers: {
+            "User-Agent": ua,
+        },
     }, onEnd, async () => {
         const info = await getInfo(this.channelId);
         return info;
@@ -202,7 +160,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         owner,
         title,
         startTime: Date.now(),
-        liveStartTime: startTime,
+        liveStartTime,
         recordStartTime,
     });
     try {
@@ -220,24 +178,24 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         if (cover && this?.liveInfo) {
             this.liveInfo.cover = cover;
         }
-        const extraDataController = recorder.getExtraDataController();
+        const extraDataController = downloader.getExtraDataController();
         extraDataController?.setMeta({
             room_id: this.channelId,
             platform: provider?.id,
-            liveStartTimestamp: this?.liveInfo?.startTime?.getTime(),
+            liveStartTimestamp: this?.liveInfo?.liveStartTime?.getTime(),
             // recordStopTimestamp: Date.now(),
             title: title,
             user_name: owner,
         });
     };
-    recorder.on("videoFileCreated", handleVideoCreated);
-    recorder.on("videoFileCompleted", ({ filename }) => {
+    downloader.on("videoFileCreated", handleVideoCreated);
+    downloader.on("videoFileCompleted", ({ filename }) => {
         this.emit("videoFileCompleted", { filename });
     });
-    recorder.on("DebugLog", (data) => {
+    downloader.on("DebugLog", (data) => {
         this.emit("DebugLog", data);
     });
-    recorder.on("progress", (progress) => {
+    downloader.on("progress", (progress) => {
         if (this.recordHandle) {
             this.recordHandle.progress = progress;
         }
@@ -245,9 +203,14 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     });
     let client = null;
     if (!this.disableProvideCommentsWhenRecording) {
-        client = new HuYaDanMu(this.channelId);
+        client = new HuYaDanMu({
+            roomid: this.channelId,
+            uid: res.currentStream.uid,
+            subChannelId: res.currentStream.subChannelId,
+            channelId: res.currentStream.channelId,
+        });
         client.on("message", (msg) => {
-            const extraDataController = recorder.getExtraDataController();
+            const extraDataController = downloader.getExtraDataController();
             if (!extraDataController)
                 return;
             switch (msg.type) {
@@ -299,17 +262,12 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         });
         client.start();
     }
-    const ffmpegArgs = recorder.getArguments();
-    recorder.run();
+    const downloaderArgs = downloader.getArguments();
+    downloader.run();
     const cut = utils.singleton(async () => {
         if (!this.recordHandle)
             return;
-        if (isCutting)
-            return;
-        isCutting = true;
-        await recorder.stop();
-        recorder.createCommand();
-        recorder.run();
+        downloader.cut();
     });
     const stop = utils.singleton(async (reason) => {
         if (!this.recordHandle)
@@ -317,12 +275,12 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         this.state = "stopping-record";
         try {
             client?.stop();
-            await recorder.stop();
+            await downloader.stop();
         }
         catch (err) {
             this.emit("DebugLog", {
                 type: "error",
-                text: `stop ffmpeg error: ${String(err)}`,
+                text: `stop record error: ${String(err)}`,
             });
         }
         this.usedStream = undefined;
@@ -331,14 +289,15 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         this.recordHandle = undefined;
         this.liveInfo = undefined;
         this.state = "idle";
+        this.cache.set("qualityRetryLeft", this.qualityRetry);
     });
     this.recordHandle = {
         id: genRecordUUID(),
         stream: stream.name,
         source: stream.source,
-        recorderType: recorder.type,
+        recorderType: downloader.type,
         url: stream.url,
-        ffmpegArgs,
+        downloaderArgs,
         savePath: savePath,
         stop,
         cut,

package/lib/stream.d.ts

@@ -7,19 +7,24 @@ export declare function getInfo(channelId: string): Promise<{
     roomId: number;
     avatar: string;
     cover: string;
-    startTime: Date;
+    liveStartTime: Date;
     liveId: string;
+    recordStartTime: Date;
 }>;
 export declare function getStream(opts: Pick<Recorder, "channelId" | "quality" | "streamPriorities" | "sourcePriorities" | "api" | "formatPriorities"> & {
     strictQuality?: boolean;
-    api?: "web" | "mp" | "auto";
+    api?: "web" | "mp" | "auto" | "wup";
 }): Promise<{
     currentStream: {
         name: string;
         source: string;
+        uid: number;
+        subChannelId: number;
+        channelId: number;
         url: string;
     };
     living: boolean;
+    api: string;
     id: number;
     owner: string;
     title: string;

package/lib/stream.js

@@ -2,9 +2,11 @@ import { sortBy } from "lodash-es";
 import { HuYaQualities } from "@bililive-tools/manager";
 import { getRoomInfo as getRoomInfoByWeb } from "./huya_api.js";
 import { getRoomInfo as getRoomInfoByMobile } from "./huya_mobile_api.js";
+import { getStreamUrlWup } from "./huya_wup_api.js";
 import { assert } from "./utils.js";
 export async function getInfo(channelId) {
     const info = await getRoomInfoByWeb(channelId);
+    const recordStartTime = new Date();
     return {
         living: info.living,
         owner: info.owner,
@@ -12,8 +14,9 @@ export async function getInfo(channelId) {
         avatar: info.avatar,
         cover: info.cover,
         roomId: info.roomId,
-        startTime: info.startTime,
+        liveStartTime: info.startTime,
         liveId: info.liveId,
+        recordStartTime: recordStartTime,
     };
 }
 async function getRoomInfo(channelId, options) {
@@ -23,7 +26,11 @@ async function getRoomInfo(channelId, options) {
             quality: options.quality,
         });
         if (info.gid == 1663) {
-            return getRoomInfoByMobile(channelId, options.formatPriorities);
+            return getRoomInfo(channelId, {
+                api: "wup",
+                formatPriorities: options.formatPriorities,
+                quality: options.quality,
+            });
         }
         return info;
     }
@@ -36,6 +43,14 @@ async function getRoomInfo(channelId, options) {
             quality: options.quality,
         });
     }
+    else if (options.api == "wup") {
+        // 参数与web一致，之后anticode有额外处理
+        const info = await getRoomInfoByWeb(channelId, {
+            formatPriorities: options.formatPriorities,
+            quality: options.quality,
+        });
+        return { ...info, api: "wup" };
+    }
     assert(false, "Invalid api");
 }
 export async function getStream(opts) {
@@ -78,6 +93,26 @@ export async function getStream(opts) {
         }
     }
     let url = expectSource.url;
+    if (info.api === "wup") {
+        try {
+            let newUrl = await getStreamUrlWup({
+                url,
+                streamFormat: expectSource.suffix,
+                extras: {
+                    stream_name: expectSource.streamName,
+                    cdn: expectSource.name,
+                    presenter_uid: expectSource.presenterUid,
+                },
+            });
+            if (!newUrl.includes("codec=")) {
+                newUrl += "&codec=264";
+            }
+            url = newUrl;
+        }
+        catch (e) {
+            console.warn("Get stream url by WUP failed, fallback to original url", e);
+        }
+    }
     // MP协议下原画不需要添加ratio参数
     if (expectStream.bitRate && expectStream.bitRate !== -1 && !url.includes("ratio=")) {
         url = url + "&ratio=" + expectStream.bitRate;
@@ -87,6 +122,9 @@ export async function getStream(opts) {
         currentStream: {
             name: expectStream.desc,
             source: expectSource.name,
+            uid: expectSource.presenterUid,
+            subChannelId: expectSource.subChannelId,
+            channelId: expectSource.channelId,
             url,
         },
     };

package/lib/types.d.ts

@@ -1,12 +1,6 @@
 export interface StreamResult {
-    flv: {
-        name: string;
-        url: string;
-    }[];
-    hls: {
-        name: string;
-        url: string;
-    }[];
+    flv: SourceProfile[];
+    hls: SourceProfile[];
 }
 export interface StreamProfile {
     desc: string;
@@ -15,4 +9,9 @@ export interface StreamProfile {
 export interface SourceProfile {
     name: string;
     url: string;
+    streamName: string;
+    presenterUid: number;
+    subChannelId: number;
+    channelId: number;
+    suffix: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/huya-recorder",
-  "version": "1.9.0",
+  "version": "1.11.0",
   "description": "bililive-tools huya recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -34,13 +34,13 @@
   "author": "renmu123",
   "license": "LGPL",
   "dependencies": {
-    "mitt": "^3.0.1",
-    "lodash-es": "^4.17.21",
+    "@tars/stream": "^2.0.3",
     "axios": "^1.7.8",
-    "huya-danma-listener": "0.1.3",
-    "@bililive-tools/manager": "^1.9.0"
+    "lodash-es": "^4.17.21",
+    "mitt": "^3.0.1",
+    "@bililive-tools/manager": "^1.10.0",
+    "huya-danma-listener": "0.1.4"
   },
-  "devDependencies": {},
   "scripts": {
     "build": "tsc",
     "watch": "tsc -w"