@bililive-tools/huya-recorder 1.3.1 → 1.6.0

package/README.md

@@ -46,6 +46,7 @@ interface Options {
   saveCover?: boolean; // 保存封面
   api?: "auto" | "mp" | "web"; // 默认为auto，在星秀区使用mp接口，其他使用web接口，你也可以强制指定
   videoFormat?: "auto"; // 视频格式： "auto", "ts", "mkv" ，auto模式下, 分段使用 "ts"，不分段使用 "mp4"
+  recorderType?: "auto" | "ffmpeg" | "mesio"; // 底层录制器，使用mesio时videoFormat参数无效
 }
 ```
 

package/lib/huya_api.d.ts

@@ -1,5 +1,9 @@
+import type { Recorder } from "@bililive-tools/manager";
 import type { StreamProfile } from "./types.js";
-export declare function getRoomInfo(roomIdOrShortId: string, formatPriorities?: Array<"flv" | "hls">): Promise<{
+export declare function getRoomInfo(roomIdOrShortId: string, opts?: {
+    formatPriorities?: Array<"flv" | "hls">;
+    quality?: Recorder["quality"];
+}): Promise<{
     living: boolean;
     id: number;
     owner: 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, formatPriorities = ["flv", "hls"]) {
+export async function getRoomInfo(roomIdOrShortId, opts = {}) {
     const res = await requester.get(`https://www.huya.com/${roomIdOrShortId}`);
     const html = res.data;
     const match = html.match(/var hyPlayerConfig = ({[^]+?};)/);
@@ -18,6 +18,7 @@ export async function getRoomInfo(roomIdOrShortId, formatPriorities = ["flv", "h
         desc: info.sDisplayName,
         bitRate: info.iBitRate,
     }));
+    streams.push({ desc: "真原画", bitRate: -1 });
     const data = hyPlayerConfig.stream.data[0];
     assert(data, `Unexpected resp, data is null`);
     const sources = {
@@ -35,9 +36,13 @@ export async function getRoomInfo(roomIdOrShortId, formatPriorities = ["flv", "h
     // }));
     for (const item of data?.gameStreamInfoList ?? []) {
         if (item.sFlvAntiCode && item.sFlvAntiCode.length > 0) {
+            let sStreamName = item.sStreamName;
+            if (opts.quality === -1) {
+                sStreamName = sStreamName.replace("-imgplus", "");
+            }
             const url = initInfo({
                 baseUrl: item.sFlvUrl,
-                sStreamName: item.sStreamName,
+                sStreamName: sStreamName,
                 antiCode: item.sFlvAntiCode,
                 suffix: item.sFlvUrlSuffix,
                 _sessionId: Date.now(),
@@ -48,9 +53,13 @@ export async function getRoomInfo(roomIdOrShortId, formatPriorities = ["flv", "h
             });
         }
         if (item.sHlsAntiCode && item.sHlsAntiCode.length > 0) {
+            let sStreamName = item.sStreamName;
+            if (opts.quality === -1) {
+                sStreamName = sStreamName.replace("-imgplus", "");
+            }
             const url = initInfo({
                 baseUrl: item.sHlsUrl,
-                sStreamName: item.sStreamName,
+                sStreamName: sStreamName,
                 antiCode: item.sHlsAntiCode,
                 suffix: item.sHlsUrlSuffix,
                 _sessionId: Date.now(),
@@ -62,7 +71,7 @@ export async function getRoomInfo(roomIdOrShortId, formatPriorities = ["flv", "h
         }
     }
     const startTime = new Date(data.gameLiveInfo?.startTime * 1000);
-    const formatSources = getFormatSources(sources, formatPriorities);
+    const formatSources = getFormatSources(sources, opts.formatPriorities);
     return {
         living: vMultiStreamInfo.length > 0 && data.gameStreamInfoList.length > 0,
         id: data.gameLiveInfo.profileRoom,

package/lib/index.js

@@ -1,6 +1,6 @@
 import path from "node:path";
 import mitt from "mitt";
-import { defaultFromJSON, defaultToJSON, genRecorderUUID, genRecordUUID, utils, FFMPEGRecorder, } from "@bililive-tools/manager";
+import { defaultFromJSON, defaultToJSON, genRecorderUUID, genRecordUUID, utils, createBaseRecorder, } from "@bililive-tools/manager";
 import { getInfo, getStream } from "./stream.js";
 import { ensureFolderExist } from "./utils.js";
 import HuYaDanMu from "huya-danma-listener";
@@ -114,6 +114,8 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         });
     }
     catch (err) {
+        if (this.qualityRetry > 0)
+            this.qualityRetry -= 1;
         this.state = "idle";
         throw err;
     }
@@ -135,12 +137,13 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         isEnded = true;
         this.emit("DebugLog", {
             type: "common",
-            text: `ffmpeg end, reason: ${JSON.stringify(args, (_, v) => (v instanceof Error ? v.stack : v))}`,
+            text: `record 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({
+    let recorderType = this.recorderType === "mesio" ? "mesio" : "ffmpeg";
+    const recorder = createBaseRecorder(recorderType, {
         url: stream.url,
         outputOptions: ffmpegOutputOptions,
         inputOptions: ffmpegInputOptions,
@@ -176,7 +179,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             room_id: this.channelId,
             platform: provider?.id,
             liveStartTimestamp: liveInfo.startTime?.getTime(),
-            recordStopTimestamp: Date.now(),
+            // recordStopTimestamp: Date.now(),
             title: title,
             user_name: owner,
         });
@@ -242,6 +245,12 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         client.on("error", (e) => {
             this.emit("DebugLog", { type: "common", text: String(e) });
         });
+        client.on("retry", (e) => {
+            this.emit("DebugLog", {
+                type: "common",
+                text: `huya danmu retry: ${e.count}/${e.max}`,
+            });
+        });
         client.start();
     }
     const ffmpegArgs = recorder.getArguments();
@@ -260,13 +269,13 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         if (!this.recordHandle)
             return;
         this.state = "stopping-record";
-        client?.stop();
         try {
+            client?.stop();
             await recorder.stop();
         }
         catch (err) {
             this.emit("DebugLog", {
-                type: "common",
+                type: "error",
                 text: `stop ffmpeg error: ${String(err)}`,
             });
         }
@@ -306,6 +315,7 @@ export const provider = {
             id: info.roomId.toString(),
             title: info.title,
             owner: info.owner,
+            avatar: info.avatar,
         };
     },
     createRecorder(opts) {

package/lib/stream.d.ts

@@ -12,6 +12,7 @@ export declare function getInfo(channelId: string): Promise<{
 }>;
 export declare function getStream(opts: Pick<Recorder, "channelId" | "quality" | "streamPriorities" | "sourcePriorities" | "api" | "formatPriorities"> & {
     strictQuality?: boolean;
+    api?: "web" | "mp" | "auto";
 }): Promise<{
     currentStream: {
         name: string;

package/lib/stream.js

@@ -18,7 +18,10 @@ export async function getInfo(channelId) {
 }
 async function getRoomInfo(channelId, options) {
     if (options.api == "auto") {
-        const info = await getRoomInfoByWeb(channelId, options.formatPriorities);
+        const info = await getRoomInfoByWeb(channelId, {
+            formatPriorities: options.formatPriorities,
+            quality: options.quality,
+        });
         if (info.gid == 1663) {
             return getRoomInfoByMobile(channelId, options.formatPriorities);
         }
@@ -28,7 +31,10 @@ async function getRoomInfo(channelId, options) {
         return getRoomInfoByMobile(channelId, options.formatPriorities);
     }
     else if (options.api == "web") {
-        return getRoomInfoByWeb(channelId, options.formatPriorities);
+        return getRoomInfoByWeb(channelId, {
+            formatPriorities: options.formatPriorities,
+            quality: options.quality,
+        });
     }
     assert(false, "Invalid api");
 }
@@ -36,6 +42,7 @@ export async function getStream(opts) {
     const info = await getRoomInfo(opts.channelId, {
         api: opts.api ?? "auto",
         formatPriorities: opts.formatPriorities ?? ["flv", "hls"],
+        quality: opts.quality,
     });
     if (!info.living) {
         throw new Error("It must be called getStream when living");
@@ -70,12 +77,17 @@ export async function getStream(opts) {
                 .replace("&fs=bhct", "&fs=bgct");
         }
     }
+    let url = expectSource.url;
+    // MP协议下原画不需要添加ratio参数
+    if (expectStream.bitRate && expectStream.bitRate !== -1 && !url.includes("ratio=")) {
+        url = url + "&ratio=" + expectStream.bitRate;
+    }
     return {
         ...info,
         currentStream: {
             name: expectStream.desc,
             source: expectSource.name,
-            url: expectSource.url + "&ratio=" + expectStream.bitRate,
+            url,
         },
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/huya-recorder",
-  "version": "1.3.1",
+  "version": "1.6.0",
   "description": "bililive-tools huya recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -37,8 +37,8 @@
     "mitt": "^3.0.1",
     "lodash-es": "^4.17.21",
     "axios": "^1.7.8",
-    "huya-danma-listener": "0.1.1",
-    "@bililive-tools/manager": "^1.3.0"
+    "@bililive-tools/manager": "^1.6.0",
+    "huya-danma-listener": "0.1.2"
   },
   "devDependencies": {},
   "scripts": {