@bililive-tools/huya-recorder 1.0.1 → 1.1.1

package/README.md

@@ -6,6 +6,8 @@
 
 # 安装
 
+**建议所有录制器和manager包都升级到最新版，我不会对兼容性做过多考虑**
+
 `npm i @bililive-tools/huya-recorder @bililive-tools/manager`
 
 # 使用
@@ -18,7 +20,7 @@ const manager = createRecorderManager({ providers: [provider] });
 manager.addRecorder({
   providerId: provider.id,
   channelId: "7734200",
-  quality: "highest",
+  quality: 0,
   streamPriorities: [],
   sourcePriorities: [],
 });
@@ -33,28 +35,55 @@ manager.startCheckLoop();
 interface Options {
   channelId: string; // 直播间ID，具体解析见文档，也可自行解析
   quality: number; // 见画质参数
-  qualityRetry?: number; // 画质匹配重试次数
+  qualityRetry?: number; // 画质匹配重试次数, -1为强制匹配画质，0为自动配置，正整数为最大匹配次数
   streamPriorities: []; // 废弃
-  sourcePriorities: []; // 废弃
+  sourcePriorities: []; // 按提供的源优先级去给CDN列表排序，并过滤掉不在优先级配置中的源，在未匹配到的情况下会优先使用TX的CDN，具体参数见 CDN 参数
+  formatName?: "auto" | "flv" | "hls"; // 支持 flv,hls参数，默认使用flv，具体见文档
   disableAutoCheck?: boolean; // 为 true 时 manager 将跳过自动检查
-  segment?: number; // 分段参数
+  segment?: number; // 分段参数，单位分钟
   disableProvideCommentsWhenRecording?: boolean; // 禁用弹幕录制
   saveGiftDanma?: boolean; // 保存礼物弹幕
   saveCover?: boolean; // 保存封面
+  api?: "auto" | "mp" | "web"; // 默认为auto，在星秀区使用mp接口，其他使用web接口，你也可以强制指定
 }
 ```
 
 ### 画质
 
-遗漏了部分画质，有了解的可以提PR
-
-| 画质   | 值  |
-| ------ | --- |
-| 原画   | 0   |
-| 蓝光8M | 8   |
-| 蓝光4M | 4   |
-| 超清   | 3   |
-| 高清   | 2   |
+| 画质     | 值    |
+| -------- | ----- |
+| 2K HDR   | 14100 |
+| 2K       | 14000 |
+| HDR(10M) | 4200  |
+| 原画     | 0     |
+| 蓝光20M  | 20000 |
+| 蓝光10M  | 10000 |
+| 蓝光8M   | 8000  |
+| 蓝光4M   | 4000  |
+| 超清     | 2000  |
+| 流畅     | 500   |
+
+### CDN
+
+不同直播间可能支持的cdn并不一致
+
+| 画质                       | 值   |
+| -------------------------- | ---- |
+| 阿里                       | AL   |
+| 腾讯                       | TX   |
+| 华为                       | HW   |
+| 火山                       | HS   |
+| 网宿                       | WS   |
+| 阿里13                     | AL13 |
+| 腾讯15                     | TX15 |
+| 华为16                     | HW16 |
+| 不知道是啥(可能是虎牙自建) | HYZJ |
+
+### 流格式
+
+hls 可能并不适合 mp 的 api，也许你能找到可以使用的cdn
+
+支持 hls 和 flv
 
 ## 直播间ID解析
 
@@ -63,7 +92,7 @@ interface Options {
 ```ts
 import { provider } from "@bililive-tools/huya-recorder";
 
-const url = "https://live.bilibili.com/5055636";
+const url = "https://www.huya.com/910323";
 const { id } = await provider.resolveChannelInfoFromURL(url);
 ```
 

package/lib/anticode.d.ts

@@ -2,8 +2,9 @@
  * 该文件是从 vplayer.js 中提取出来的，保留的部分注释掉的代码是为了标明改动前的代码逻辑
  */
 export declare function initInfo(info: {
-    sFlvUrl: string;
-    sFlvAntiCode: string;
+    baseUrl: string;
+    antiCode: string;
     sStreamName: string;
     _sessionId: number;
+    suffix: string;
 }, t?: unknown): any;

package/lib/anticode.js

@@ -12,8 +12,8 @@ const PLATFORM_TYPE = {
     web: 100,
 };
 const PLATFORM_TYPE_NAME = {
-    web: 'web',
-    wap: 'wap',
+    web: "web",
+    wap: "wap",
 };
 function pe(e, t) {
     var i = (65535 & e) + (65535 & t);
@@ -112,7 +112,7 @@ function ge(e, t) {
     return [o, h, u, l];
 }
 function Se(e) {
-    var t, i = '', s = 32 * e.length;
+    var t, i = "", s = 32 * e.length;
     for (t = 0; t < s; t += 8)
         i += String.fromCharCode((e[t >> 5] >>> t % 32) & 255);
     return i;
@@ -127,9 +127,10 @@ function Te(e) {
     return i;
 }
 function Pe(e) {
-    var t, i, s = '';
+    var t, i, s = "";
     for (i = 0; i < e.length; i += 1)
-        (t = e.charCodeAt(i)), (s += '0123456789abcdef'.charAt((t >>> 4) & 15) + '0123456789abcdef'.charAt(15 & t));
+        (t = e.charCodeAt(i)),
+            (s += "0123456789abcdef".charAt((t >>> 4) & 15) + "0123456789abcdef".charAt(15 & t));
     return s;
 }
 function Ee(e) {
@@ -166,74 +167,78 @@ class Anticode {
     }
     parseAnticode(e) {
         var self = this;
-        this._fm = '';
-        this['_wsTime'] = '';
-        this['_ctype'] = '';
-        this['_params'] = [];
+        this._fm = "";
+        this["_wsTime"] = "";
+        this["_ctype"] = "";
+        this["_params"] = [];
         this._sFlvAnticode = e;
-        e.split('&').forEach(function (e) {
-            let [key, val] = e.split('=');
-            if (key === 'fm') {
+        e.split("&").forEach(function (e) {
+            let [key, val] = e.split("=");
+            if (key === "fm") {
                 val = decodeURI(val);
                 val = unescape(val);
                 val = atob(val);
                 self._fm = val;
             }
-            else if (key === 'wsTime') {
-                self['_wsTime'] = val;
+            else if (key === "wsTime") {
+                self["_wsTime"] = val;
                 var r = 1e3 * parseInt(val, 16) + 3e5;
-                self['_invalidTime'] = performance.now() + (r - Date.now());
-                self['_nextRefreshTime'] = self['_invalidTime'] - 3e4;
+                self["_invalidTime"] = performance.now() + (r - Date.now());
+                self["_nextRefreshTime"] = self["_invalidTime"] - 3e4;
             }
             else
-                key == 'ctype' ? (self['_ctype'] = val) : key !== 'wsSecret' && self['_params'].push(e);
+                key == "ctype" ? (self["_ctype"] = val) : key !== "wsSecret" && self["_params"].push(e);
         });
     }
     hasAnticode() {
-        return '' !== this._sFlvAnticode;
+        return "" !== this._sFlvAnticode;
     }
     getAnticode(e) {
-        if ('' === this._fm)
+        if ("" === this._fm)
             return this._sFlvAnticode;
-        const platform = 'web';
+        const platform = "web";
         const i = PLATFORM_TYPE[platform] || PLATFORM_TYPE.web;
         this._seqid = Number(this.uid) + Date.now();
-        var s = keHash(''.concat(this._seqid, '|').concat(this._ctype, '|').concat(i));
+        var s = keHash("".concat(this._seqid, "|").concat(this._ctype, "|").concat(i));
         var uid = platform === PLATFORM_TYPE_NAME.wap ? this.uid : this.convertUid;
-        var r = this._fm.replace('$0', uid).replace('$1', this._sStreamName).replace('$2', s).replace('$3', this._wsTime);
+        var r = this._fm
+            .replace("$0", uid)
+            .replace("$1", this._sStreamName)
+            .replace("$2", s)
+            .replace("$3", this._wsTime);
         if (e)
             r += Ye;
-        var n = ''
-            .concat('wsSecret')
-            .concat('=')
+        var n = ""
+            .concat("wsSecret")
+            .concat("=")
             .concat(keHash(r))
-            .concat('&')
-            .concat('wsTime')
-            .concat('=')
+            .concat("&")
+            .concat("wsTime")
+            .concat("=")
             .concat(this._wsTime)
-            .concat('&')
-            .concat('seqid')
-            .concat('=')
+            .concat("&")
+            .concat("seqid")
+            .concat("=")
             .concat(this._seqid)
-            .concat('&')
-            .concat('ctype')
-            .concat('=')
+            .concat("&")
+            .concat("ctype")
+            .concat("=")
             .concat(this._ctype)
-            .concat('&')
-            .concat('ver=1');
+            .concat("&")
+            .concat("ver=1");
         if (this._params.length > 0) {
-            n += '&' + this._params.join('&');
+            n += "&" + this._params.join("&");
         }
         return n;
     }
 }
 export function initInfo(info, t) {
-    if (info.sFlvUrl && info.sStreamName) {
-        info.url = ''.concat(info.sFlvUrl, '/').concat(info.sStreamName, '.flv');
+    if (info.baseUrl && info.sStreamName) {
+        info.url = "".concat(info.baseUrl, "/").concat(info.sStreamName, `.${info.suffix}`);
     }
     var i = [];
     const anticode = new Anticode();
-    anticode.init(info.sFlvUrl, info.sStreamName, info.sFlvAntiCode);
+    anticode.init(info.baseUrl, info.sStreamName, info.antiCode);
     if (anticode.hasAnticode()) {
         i.push(anticode.getAnticode(t));
         // c.a.log('FlvPlayer.initInfo, anticode='.concat(this.anticode.getAnticode(t)))
@@ -245,7 +250,7 @@ export function initInfo(info, t) {
     // } else {
     //   localStorage._ratio && i.push('&ratio='.concat(localStorage._ratio))
     // }
-    i.push('ratio='.concat(info.curBitrate));
+    // i.push('ratio='.concat(info.curBitrate))
     // if (
     //   !info.httpDomainOnly &&
     //   !(
@@ -257,34 +262,38 @@ export function initInfo(info, t) {
     //   i.push('&https=1')
     // }
     if (i.length > 0) {
-        info.url += (-1 !== info.url.indexOf('?') ? '&' : '?') + ''.concat(i.join('&'));
+        info.url += (-1 !== info.url.indexOf("?") ? "&" : "?") + "".concat(i.join("&"));
     }
     // if (this.isUseAV1(e)) e.url += '&codec=av1'
     // else if (this.h265Proxy.isReady || this.h265Proxy.isH265MseCodec) this.h265Proxy.checkUrl(e)
-    info.url += '&codec=264';
+    info.url += "&codec=264";
     // info.url += '&dMod='.concat(getDMod(info._dMod, info._sMod))
     // this.url = info.url
     // this.lineType = info.lineType
-    info.url = _getUrlParams(info.url, !1, 'firstCdn');
+    info.url = _getUrlParams(info.url, !1, "firstCdn");
     function _getUrlParams(url, t, i) {
-        var s = '';
+        var s = "";
         // s += t ? "pulltype=pcdn&" : "sdkPcdn=".concat(this._cdnCnt, "_").concat(this._getSdkPcdnReason(i), "&");
-        s += t ? 'pulltype=pcdn&' : 'sdkPcdn='.concat(1, '_').concat(1, '&');
-        var platform = 'web';
+        s += t ? "pulltype=pcdn&" : "sdkPcdn=".concat(1, "_").concat(1, "&");
+        var platform = "web";
         var r = PLATFORM_TYPE[platform] || PLATFORM_TYPE.web;
         var n = platform === PLATFORM_TYPE_NAME.wap
-            ? 'uid='.concat(anticode.uid, '&uuid=').concat(anticode.uuid)
-            : 'u='.concat(anticode.convertUid);
+            ? "uid=".concat(anticode.uid, "&uuid=").concat(anticode.uuid)
+            : "u=".concat(anticode.convertUid);
         // s += ''.concat(n, '&t=').concat(r, '&sv=').concat(2401040319, '&sdk_sid=').concat(this._flvPlayer.info._sessionId)
-        s += ''.concat(n, '&t=').concat(r, '&sv=').concat(2401040319, '&sdk_sid=').concat(info._sessionId);
-        -1 === url.indexOf('?') ? (url += '?') : (url += '&');
+        s += ""
+            .concat(n, "&t=")
+            .concat(r, "&sv=")
+            .concat(2401040319, "&sdk_sid=")
+            .concat(info._sessionId);
+        -1 === url.indexOf("?") ? (url += "?") : (url += "&");
         return url + s;
     }
     return info.url;
 }
 function getDMod(e, t) {
-    return ('mseh' !== e && 'wcs' !== e && 'wasm' !== e && 'mses' !== e && (e = 'unknow'),
+    return ("mseh" !== e && "wcs" !== e && "wasm" !== e && "mses" !== e && (e = "unknow"),
         (t = Number(t)),
         isNaN(t) && (t = 0),
-        ''.concat(e, '-').concat(t));
+        "".concat(e, "-").concat(t));
 }

package/lib/huya_api.d.ts

@@ -1,4 +1,4 @@
-export declare function getRoomInfo(roomIdOrShortId: string): Promise<{
+export declare function getRoomInfo(roomIdOrShortId: string, formatName?: "auto" | "flv" | "hls"): Promise<{
     living: boolean;
     id: number;
     owner: string;
@@ -7,9 +7,13 @@ export declare function getRoomInfo(roomIdOrShortId: string): Promise<{
     avatar: string;
     cover: string;
     streams: StreamProfile[];
-    sources: SourceProfile[];
+    sources: {
+        name: string;
+        url: string;
+    }[];
     startTime: Date;
     liveId: string;
+    gid: number;
 }>;
 export interface StreamProfile {
     desc: string;

package/lib/huya_api.js

@@ -5,7 +5,7 @@ import { initInfo } from "./anticode.js";
 const requester = axios.create({
     timeout: 10e3,
 });
-export async function getRoomInfo(roomIdOrShortId) {
+export async function getRoomInfo(roomIdOrShortId, formatName = "auto") {
     const res = await requester.get(`https://www.huya.com/${roomIdOrShortId}`);
     const html = res.data;
     const match = html.match(/var hyPlayerConfig = ({[^]+?};)/);
@@ -20,15 +20,47 @@ export async function getRoomInfo(roomIdOrShortId) {
     }));
     const data = hyPlayerConfig.stream.data[0];
     assert(data, `Unexpected resp, data is null`);
-    const sources = data.gameStreamInfoList.map((info) => ({
-        name: `直播线路 ${info.iLineIndex}`,
-        url: initInfo({
-            sFlvUrl: info.sFlvUrl,
-            sStreamName: info.sStreamName,
-            sFlvAntiCode: info.sFlvAntiCode,
-            _sessionId: Date.now(),
-        }),
-    }));
+    const sources = {
+        flv: [],
+        hls: [],
+    };
+    // const sources: SourceProfile[] = data.gameStreamInfoList.map((info) => ({
+    //   name: info.sCdnType,
+    //   url: initInfo({
+    //     sFlvUrl: info.sFlvUrl,
+    //     sStreamName: info.sStreamName,
+    //     sFlvAntiCode: info.sFlvAntiCode,
+    //     _sessionId: Date.now(),
+    //   }),
+    // }));
+    for (const item of data?.gameStreamInfoList ?? []) {
+        if (item.sFlvAntiCode && item.sFlvAntiCode.length > 0) {
+            const url = initInfo({
+                baseUrl: item.sFlvUrl,
+                sStreamName: item.sStreamName,
+                antiCode: item.sFlvAntiCode,
+                suffix: item.sFlvUrlSuffix,
+                _sessionId: Date.now(),
+            });
+            sources.flv.push({
+                name: item.sCdnType,
+                url,
+            });
+        }
+        if (item.sHlsAntiCode && item.sHlsAntiCode.length > 0) {
+            const url = initInfo({
+                baseUrl: item.sHlsUrl,
+                sStreamName: item.sStreamName,
+                antiCode: item.sHlsAntiCode,
+                suffix: item.sHlsUrlSuffix,
+                _sessionId: Date.now(),
+            });
+            sources.hls.push({
+                name: item.sCdnType,
+                url,
+            });
+        }
+    }
     const startTime = new Date(data.gameLiveInfo?.startTime * 1000);
     return {
         living: vMultiStreamInfo.length > 0 && data.gameStreamInfoList.length > 0,
@@ -39,8 +71,9 @@ export async function getRoomInfo(roomIdOrShortId) {
         avatar: data.gameLiveInfo.avatar180,
         cover: data.gameLiveInfo.screenshot,
         streams,
-        sources,
+        sources: formatName === "hls" ? sources.hls : sources.flv,
         startTime,
         liveId: utils.md5(`${roomIdOrShortId}-${startTime?.getTime()}`),
+        gid: data.gameLiveInfo.gid,
     };
 }

package/lib/huya_mobile_api.d.ts

@@ -0,0 +1,24 @@
+export declare function getRoomInfo(roomIdOrShortId: string, formatName?: "auto" | "flv" | "hls"): Promise<{
+    living: boolean;
+    id: number;
+    owner: string;
+    title: string;
+    roomId: number;
+    avatar: string;
+    cover: string;
+    streams: StreamProfile[];
+    sources: {
+        name: string;
+        url: string;
+    }[];
+    startTime: Date;
+    liveId: string;
+}>;
+export interface StreamProfile {
+    desc: string;
+    bitRate: number;
+}
+export interface SourceProfile {
+    name: string;
+    url: string;
+}

package/lib/huya_mobile_api.js

@@ -0,0 +1,83 @@
+// import { createHash, randomInt } from "node:crypto";
+// import { URLSearchParams } from "node:url";
+import axios from "axios";
+import { utils } from "@bililive-tools/manager";
+import { assert } from "./utils.js";
+const requester = axios.create({
+    timeout: 10e3,
+    headers: {
+        "User-Agent": "Mozilla/5.0 (Linux; Android 5.0; SM-G900P Build/LRX21T) AppleWebKit/537.36 (KHTML, like Gecko)",
+    },
+});
+export async function getRoomInfo(roomIdOrShortId, formatName = "auto") {
+    const res = await requester.get(`https://mp.huya.com/cache.php?m=Live&do=profileRoom&roomid=${roomIdOrShortId}`);
+    const html = res.data;
+    assert(html, `Unexpected resp, hyPlayerConfig is null`);
+    if (res.status !== 200) {
+        throw new Error(`Unexpected resp, status is ${res.status}`);
+    }
+    const profile = html.data;
+    const sources = {
+        flv: [],
+        hls: [],
+    };
+    // const uid = await getAnonymousUid();
+    for (const item of profile?.stream?.baseSteamInfoList ?? []) {
+        if (item.sFlvAntiCode && item.sFlvAntiCode.length > 0) {
+            // const { uid, urlQuery, seq_id, ws_time, ws_secret } = generateStreamParams({
+            //   sFlvAntiCode: item.sFlvAntiCode,
+            //   sStreamName: item.sStreamName,
+            // });
+            // console.log("uid", uid, urlQuery);
+            // const url = `${item.sFlvUrl}/${item.sStreamName}.${item.sFlvUrlSuffix}?wsSecret=${ws_secret}&wsTime=${ws_time}&seqid=${seq_id}&ctype=${urlQuery.get("ctype")}&ver=1&fs=${urlQuery.get("fs")}&t=${urlQuery.get("t")}&uid=${uid}`;
+            const url = `${item.sFlvUrl}/${item.sStreamName}.${item.sFlvUrlSuffix}?${item.sFlvAntiCode}`;
+            sources.flv.push({
+                name: item.sCdnType,
+                url,
+            });
+        }
+        if (item.sHlsAntiCode && item.sHlsAntiCode.length > 0) {
+            const url = `${item.sHlsUrl}/${item.sStreamName}.${item.sHlsUrlSuffix}?${item.sHlsAntiCode}`;
+            sources.hls.push({
+                name: item.sCdnType,
+                url,
+            });
+        }
+    }
+    const streams = {
+        hls: profile.stream.hls.rateArray.map((info) => ({
+            desc: info.sDisplayName,
+            bitRate: info.iBitRate,
+        })),
+        flv: profile.stream.flv.rateArray.map((info) => ({
+            desc: info.sDisplayName,
+            bitRate: info.iBitRate,
+        })),
+    };
+    const startTime = new Date(profile.liveData?.startTime * 1000);
+    return {
+        living: profile.liveStatus === "ON",
+        id: profile.liveData.profileRoom,
+        owner: profile.liveData.nick,
+        title: profile.liveData.introduction,
+        roomId: profile.liveData.profileRoom,
+        avatar: profile.liveData.avatar180,
+        cover: profile.liveData.screenshot,
+        streams: formatName === "hls" ? streams.hls : streams.flv,
+        sources: formatName === "hls" ? sources.hls : sources.flv,
+        startTime,
+        liveId: utils.md5(`${roomIdOrShortId}-${startTime?.getTime()}`),
+    };
+}
+// type CacheProfileData = CacheProfileOffData | CacheProfileReplayData | CacheProfileOnData;
+const cdn = {
+    AL: "阿里",
+    AL13: "阿里13",
+    TX15: "腾讯15",
+    HW16: "华为16",
+    HYZJ: "不知道是啥",
+    TX: "腾讯",
+    HW: "华为",
+    HS: "火山",
+    WS: "网宿",
+};

package/lib/index.d.ts

@@ -1,2 +1,2 @@
-import { RecorderProvider } from "@bililive-tools/manager";
+import type { RecorderProvider } from "@bililive-tools/manager";
 export declare const provider: RecorderProvider<Record<string, unknown>>;

package/lib/index.js

@@ -1,8 +1,8 @@
-import path from "path";
+import path from "node:path";
 import mitt from "mitt";
-import { createFFMPEGBuilder, defaultFromJSON, defaultToJSON, genRecorderUUID, genRecordUUID, StreamManager, utils, } from "@bililive-tools/manager";
+import { defaultFromJSON, defaultToJSON, genRecorderUUID, genRecordUUID, utils, FFMPEGRecorder, } from "@bililive-tools/manager";
 import { getInfo, getStream } from "./stream.js";
-import { assertStringType, ensureFolderExist } from "./utils.js";
+import { ensureFolderExist } from "./utils.js";
 import HuYaDanMu from "huya-danma-listener";
 function createRecorder(opts) {
     // 内部实现时，应该只有 proxy 包裹的那一层会使用这个 recorder 标识符，不应该有直接通过
@@ -18,6 +18,8 @@ function createRecorder(opts) {
         qualityMaxRetry: opts.qualityRetry ?? 0,
         qualityRetry: opts.qualityRetry ?? 0,
         state: "idle",
+        api: opts.api ?? "auto",
+        formatName: opts.formatName ?? "auto",
         getChannelURL() {
             return `https://www.huya.com/${this.channelId}`;
         },
@@ -62,12 +64,25 @@ const ffmpegOutputOptions = [
     "-min_frag_duration",
     "60000000",
 ];
-const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, }) {
+const ffmpegInputOptions = [
+    "-reconnect",
+    "1",
+    "-reconnect_streamed",
+    "1",
+    "-reconnect_delay_max",
+    "10",
+    "-rw_timeout",
+    "15000000",
+    "-user_agent",
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:107.0) Gecko/20100101 Firefox/107.0",
+];
+const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isManualStart, }) {
     if (this.recordHandle != null)
         return this.recordHandle;
     const liveInfo = await getInfo(this.channelId);
-    const { living, owner, title, cover } = liveInfo;
+    const { living, owner, title, liveId } = liveInfo;
     this.liveInfo = liveInfo;
+    this.emit("LiveStart", { liveId });
     if (liveInfo.liveId === banLiveId) {
         this.tempStopIntervalCheck = true;
     }
@@ -78,29 +93,63 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, }) {
         return null;
     if (!living)
         return null;
-    this.state = "recording";
     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,
+            strictQuality,
+            formatName: this.formatName,
         });
-        // console.log('live info', res)
     }
     catch (err) {
         this.state = "idle";
         throw err;
     }
+    this.state = "recording";
     const { currentStream: stream, sources: availableSources, streams: availableStreams } = res;
     this.availableStreams = availableStreams.map((s) => s.desc);
     this.availableSources = availableSources.map((s) => s.name);
     this.usedStream = stream.name;
     this.usedSource = stream.source;
-    const savePath = getSavePath({ owner, title });
-    const hasSegment = !!this.segment;
+    let isEnded = false;
+    const onEnd = (...args) => {
+        if (isEnded)
+            return;
+        isEnded = true;
+        this.emit("DebugLog", {
+            type: "common",
+            text: `ffmpeg end, reason: ${JSON.stringify(args, (_, v) => (v instanceof Error ? v.stack : v))}`,
+        });
+        const reason = args[0] instanceof Error ? args[0].message : String(args[0]);
+        this.recordHandle?.stop(reason);
+    };
+    const recorder = new FFMPEGRecorder({
+        url: stream.url,
+        outputOptions: ffmpegOutputOptions,
+        inputOptions: ffmpegInputOptions,
+        segment: this.segment ?? 0,
+        getSavePath: (opts) => getSavePath({ owner, title, startTime: opts.startTime }),
+        disableDanma: this.disableProvideCommentsWhenRecording,
+    }, onEnd);
+    const savePath = getSavePath({
+        owner,
+        title,
+    });
     try {
         ensureFolderExist(savePath);
     }
@@ -108,25 +157,36 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, }) {
         this.state = "idle";
         throw err;
     }
-    const streamManager = new StreamManager(this, getSavePath, owner, title, savePath, hasSegment);
     const handleVideoCreated = async ({ filename }) => {
-        const extraDataController = streamManager?.getExtraDataController();
+        this.emit("videoFileCreated", { filename });
+        const extraDataController = recorder.getExtraDataController();
         extraDataController?.setMeta({
             room_id: this.channelId,
             platform: provider?.id,
             liveStartTimestamp: liveInfo.startTime?.getTime(),
+            recordStopTimestamp: Date.now(),
+            title: title,
+            user_name: owner,
         });
-        if (this.saveCover) {
-            const coverPath = utils.replaceExtName(filename, ".jpg");
-            utils.downloadImage(cover, coverPath);
-        }
     };
-    this.on("videoFileCreated", handleVideoCreated);
+    recorder.on("videoFileCreated", handleVideoCreated);
+    recorder.on("videoFileCompleted", ({ filename }) => {
+        this.emit("videoFileCompleted", { filename });
+    });
+    recorder.on("DebugLog", (data) => {
+        this.emit("DebugLog", data);
+    });
+    recorder.on("progress", (progress) => {
+        if (this.recordHandle) {
+            this.recordHandle.progress = progress;
+        }
+        this.emit("progress", progress);
+    });
     let client = null;
     if (!this.disableProvideCommentsWhenRecording) {
         client = new HuYaDanMu(this.channelId);
         client.on("message", (msg) => {
-            const extraDataController = streamManager.getExtraDataController();
+            const extraDataController = recorder.getExtraDataController();
             if (!extraDataController)
                 return;
             switch (msg.type) {
@@ -170,71 +230,27 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, }) {
         client.on("error", (e) => {
             this.emit("DebugLog", { type: "common", text: String(e) });
         });
-        try {
-            await client.start();
-        }
-        catch (err) {
-            this.state = "idle";
-            throw err;
-        }
+        client.start();
     }
-    let isEnded = false;
-    const onEnd = (...args) => {
-        if (isEnded)
-            return;
-        isEnded = true;
-        this.emit("DebugLog", {
-            type: "common",
-            text: `ffmpeg end, reason: ${JSON.stringify(args, (_, v) => (v instanceof Error ? v.stack : v))}`,
-        });
-        const reason = args[0] instanceof Error ? args[0].message : String(args[0]);
-        this.recordHandle?.stop(reason);
-    };
-    const isInvalidStream = utils.createInvalidStreamChecker();
-    const timeoutChecker = utils.createTimeoutChecker(() => onEnd("ffmpeg timeout"), 10e3);
-    const command = createFFMPEGBuilder()
-        .input(stream.url)
-        .addInputOptions("-user_agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:107.0) Gecko/20100101 Firefox/107.0")
-        .outputOptions(ffmpegOutputOptions)
-        .output(streamManager.videoFilePath)
-        .on("start", () => {
-        streamManager.handleVideoStarted();
-    })
-        .on("error", onEnd)
-        .on("end", () => onEnd("finished"))
-        .on("stderr", async (stderrLine) => {
-        if (utils.isFfmpegStartSegment(stderrLine)) {
-            await streamManager.handleVideoStarted(stderrLine);
-        }
-        assertStringType(stderrLine);
-        this.emit("DebugLog", { type: "ffmpeg", text: stderrLine });
-        if (isInvalidStream(stderrLine)) {
-            onEnd("invalid stream");
-        }
-    })
-        .on("stderr", timeoutChecker.update);
-    if (hasSegment) {
-        command.outputOptions("-f", "segment", "-segment_time", String(this.segment * 60), "-reset_timestamps", "1");
-    }
-    const ffmpegArgs = command._getArguments();
-    command.run();
+    const ffmpegArgs = recorder.getArguments();
+    recorder.run();
     const stop = utils.singleton(async (reason) => {
         if (!this.recordHandle)
             return;
         this.state = "stopping-record";
-        // TODO: emit update event
-        timeoutChecker.stop();
-        // @ts-ignore
-        command.ffmpegProc?.stdin?.write("q");
-        // TODO: 这里可能会有内存泄露，因为事件还没清，之后再检查下看看。
         client?.stop();
+        try {
+            await recorder.stop();
+        }
+        catch (err) {
+            this.emit("DebugLog", {
+                type: "common",
+                text: `stop ffmpeg error: ${String(err)}`,
+            });
+        }
         this.usedStream = undefined;
         this.usedSource = undefined;
-        // TODO: other codes
-        // TODO: emit update event
-        await streamManager.handleVideoCompleted();
         this.emit("RecordStop", { recordHandle: this.recordHandle, reason });
-        this.off("videoFileCreated", handleVideoCreated);
         this.recordHandle = undefined;
         this.liveInfo = undefined;
         this.state = "idle";

package/lib/stream.d.ts

@@ -1,5 +1,4 @@
 import { Recorder } from "@bililive-tools/manager";
-import { SourceProfile, StreamProfile } from "./huya_api.js";
 export declare function getInfo(channelId: string): Promise<{
     living: boolean;
     owner: string;
@@ -8,10 +7,10 @@ export declare function getInfo(channelId: string): Promise<{
     avatar: string;
     cover: string;
     startTime: Date;
-    liveId?: string;
+    liveId: string;
 }>;
-export declare function getStream(opts: Pick<Recorder, "channelId" | "quality" | "streamPriorities" | "sourcePriorities"> & {
-    rejectCache?: boolean;
+export declare function getStream(opts: Pick<Recorder, "channelId" | "quality" | "streamPriorities" | "sourcePriorities" | "api" | "formatName"> & {
+    strictQuality?: boolean;
 }): Promise<{
     currentStream: {
         name: string;
@@ -25,8 +24,11 @@ export declare function getStream(opts: Pick<Recorder, "channelId" | "quality" |
     roomId: number;
     avatar: string;
     cover: string;
-    streams: StreamProfile[];
-    sources: SourceProfile[];
+    streams: import("./huya_mobile_api.js").StreamProfile[];
+    sources: {
+        name: string;
+        url: string;
+    }[];
     startTime: Date;
     liveId: string;
 }>;

package/lib/stream.js

@@ -1,9 +1,10 @@
-import { Qualities } from "@bililive-tools/manager";
-import { getRoomInfo } from "./huya_api.js";
-import { getValuesFromArrayLikeFlexSpaceBetween } from "./utils.js";
 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 { assert } from "./utils.js";
 export async function getInfo(channelId) {
-    const info = await getRoomInfo(channelId);
+    const info = await getRoomInfoByWeb(channelId);
     return {
         living: info.living,
         owner: info.owner,
@@ -15,24 +16,43 @@ export async function getInfo(channelId) {
         liveId: info.liveId,
     };
 }
+async function getRoomInfo(channelId, options) {
+    if (options.api == "auto") {
+        const info = await getRoomInfoByWeb(channelId, options.formatName);
+        if (info.gid == 1663) {
+            return getRoomInfoByMobile(channelId, options.formatName);
+        }
+        return info;
+    }
+    else if (options.api == "mp") {
+        return getRoomInfoByMobile(channelId, options.formatName);
+    }
+    else if (options.api == "web") {
+        return getRoomInfoByWeb(channelId, options.formatName);
+    }
+    assert(false, "Invalid api");
+}
 export async function getStream(opts) {
-    const info = await getRoomInfo(opts.channelId);
+    const info = await getRoomInfo(opts.channelId, {
+        api: opts.api ?? "auto",
+        formatName: opts.formatName ?? "auto",
+    });
     if (!info.living) {
         throw new Error("It must be called getStream when living");
     }
-    let expectStream;
-    const streamsWithPriority = sortAndFilterStreamsByPriority(info.streams, opts.streamPriorities);
-    if (streamsWithPriority.length > 0) {
-        // 通过优先级来选择对应流
-        expectStream = streamsWithPriority[0];
+    if (info.streams.length === 0) {
+        throw new Error(`No stream found in huya ${opts.channelId} room`);
     }
-    else {
-        // 通过设置的画质选项来选择对应流
-        const flexedStreams = getValuesFromArrayLikeFlexSpaceBetween(
-        // 接口给的画质列表是按照清晰到模糊的顺序的，这里翻转下
-        info.streams.toReversed(), Qualities.length);
-        const qn = (Qualities.includes(opts.quality) ? opts.quality : "highest");
-        expectStream = flexedStreams[Qualities.indexOf(qn)];
+    const qn = (HuYaQualities.includes(opts.quality) ? opts.quality : 0);
+    let expectStream = info.streams.find((stream) => stream.bitRate === qn);
+    if (!expectStream && opts.strictQuality) {
+        throw new Error("Can not get expect quality because of strictQuality");
+    }
+    if (!expectStream) {
+        expectStream = info.streams[0];
+    }
+    if (!expectStream) {
+        throw new Error("未找到对应的流");
     }
     let expectSource = null;
     const sourcesWithPriority = sortAndFilterSourcesByPriority(info.sources, opts.sourcePriorities);
@@ -40,7 +60,15 @@ export async function getStream(opts) {
         expectSource = sourcesWithPriority[0];
     }
     else {
-        expectSource = info.sources[0];
+        expectSource = info.sources.find((source) => source.name === "TX") ?? null;
+        if (!expectSource) {
+            expectSource = info.sources[0];
+        }
+        if (expectSource.name === "TX") {
+            expectSource.url = expectSource.url
+                .replace("&ctype=tars_mp", "&ctype=huya_webh5")
+                .replace("&fs=bhct", "&fs=bgct");
+        }
     }
     return {
         ...info,
@@ -51,21 +79,27 @@ export async function getStream(opts) {
         },
     };
 }
-/**
- * 按提供的流优先级去给流列表排序，并过滤掉不在优先级配置中的流
- */
-function sortAndFilterStreamsByPriority(streams, streamPriorities) {
-    if (streamPriorities.length === 0)
-        return [];
-    return sortBy(
-    // 分配优先级属性，数字越大优先级越高
-    streams
-        .map((stream) => ({
-        ...stream,
-        priority: streamPriorities.toReversed().indexOf(stream.desc),
-    }))
-        .filter(({ priority }) => priority !== -1), "priority");
-}
+// /**
+//  * 按提供的流优先级去给流列表排序，并过滤掉不在优先级配置中的流
+//  */
+// function sortAndFilterStreamsByPriority(
+//   streams: StreamProfile[],
+//   streamPriorities: Recorder["streamPriorities"],
+// ): (StreamProfile & {
+//   priority: number;
+// })[] {
+//   if (streamPriorities.length === 0) return [];
+//   return sortBy(
+//     // 分配优先级属性，数字越大优先级越高
+//     streams
+//       .map((stream) => ({
+//         ...stream,
+//         priority: streamPriorities.toReversed().indexOf(stream.desc),
+//       }))
+//       .filter(({ priority }) => priority !== -1),
+//     "priority",
+//   );
+// }
 /**
  * 按提供的源优先级去给源列表排序，并过滤掉不在优先级配置中的源
  */

package/lib/utils.d.ts

@@ -20,3 +20,4 @@ export declare function assert(assertion: unknown, msg?: string): asserts assert
 export declare function assertStringType(data: unknown, msg?: string): asserts data is string;
 export declare function assertNumberType(data: unknown, msg?: string): asserts data is number;
 export declare function assertObjectType(data: unknown, msg?: string): asserts data is object;
+export declare function createInvalidStreamChecker(): (ffmpegLogLine: string) => boolean;

package/lib/utils.js

@@ -59,3 +59,28 @@ export function assertNumberType(data, msg) {
 export function assertObjectType(data, msg) {
     assert(typeof data === "object", msg);
 }
+export function createInvalidStreamChecker() {
+    let prevFrame = 0;
+    let frameUnchangedCount = 0;
+    return (ffmpegLogLine) => {
+        const streamInfo = ffmpegLogLine.match(/frame=\s*(\d+) fps=.*? q=.*? size=.*? time=.*? bitrate=.*? speed=.*?/);
+        if (streamInfo != null) {
+            const [, frameText] = streamInfo;
+            const frame = Number(frameText);
+            if (frame === prevFrame) {
+                if (++frameUnchangedCount >= 15) {
+                    return true;
+                }
+            }
+            else {
+                prevFrame = frame;
+                frameUnchangedCount = 0;
+            }
+            return false;
+        }
+        if (ffmpegLogLine.includes("HTTP error 404 Not Found")) {
+            return true;
+        }
+        return false;
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/huya-recorder",
-  "version": "1.0.1",
+  "version": "1.1.1",
   "description": "bililive-tools huya recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -37,13 +37,10 @@
     "mitt": "^3.0.1",
     "lodash-es": "^4.17.21",
     "axios": "^1.7.8",
-    "huya-danma-listener": "0.1.0",
-    "@bililive-tools/manager": "1.0.1"
+    "@bililive-tools/manager": "^1.1.0",
+    "huya-danma-listener": "0.1.0"
   },
   "devDependencies": {},
-  "peerDependencies": {
-    "@bililive-tools/manager": "*"
-  },
   "scripts": {
     "build": "tsc",
     "watch": "tsc -w"