@bililive-tools/huya-recorder 1.2.0 → 1.3.1

package/README.md

@@ -38,7 +38,7 @@ interface Options {
   qualityRetry?: number; // 画质匹配重试次数, -1为强制匹配画质，0为自动配置，正整数为最大匹配次数
   streamPriorities: []; // 废弃
   sourcePriorities: []; // 按提供的源优先级去给CDN列表排序，并过滤掉不在优先级配置中的源，在未匹配到的情况下会优先使用TX的CDN，具体参数见 CDN 参数
-  formatName?: "auto" | "flv" | "hls"; // 支持 flv,hls参数，默认使用flv，具体见文档
+  formatPriorities?: string[]; // 支持，`flv`和`hls` 参数，默认为['flv','hls']
   disableAutoCheck?: boolean; // 为 true 时 manager 将跳过自动检查
   segment?: number; // 分段参数，单位分钟
   disableProvideCommentsWhenRecording?: boolean; // 禁用弹幕录制

package/lib/huya_api.d.ts

@@ -1,4 +1,5 @@
-export declare function getRoomInfo(roomIdOrShortId: string, formatName?: "auto" | "flv" | "hls"): Promise<{
+import type { StreamProfile } from "./types.js";
+export declare function getRoomInfo(roomIdOrShortId: string, formatPriorities?: Array<"flv" | "hls">): Promise<{
     living: boolean;
     id: number;
     owner: string;
@@ -7,19 +8,8 @@ export declare function getRoomInfo(roomIdOrShortId: string, formatName?: "auto"
     avatar: string;
     cover: string;
     streams: StreamProfile[];
-    sources: {
-        name: string;
-        url: string;
-    }[];
+    sources: import("./types.js").SourceProfile[];
     startTime: Date;
     liveId: string;
     gid: number;
 }>;
-export interface StreamProfile {
-    desc: string;
-    bitRate: number;
-}
-export interface SourceProfile {
-    name: string;
-    url: string;
-}

package/lib/huya_api.js

@@ -1,11 +1,11 @@
 import axios from "axios";
 import { utils } from "@bililive-tools/manager";
-import { assert } from "./utils.js";
+import { assert, getFormatSources } from "./utils.js";
 import { initInfo } from "./anticode.js";
 const requester = axios.create({
     timeout: 10e3,
 });
-export async function getRoomInfo(roomIdOrShortId, formatName = "auto") {
+export async function getRoomInfo(roomIdOrShortId, formatPriorities = ["flv", "hls"]) {
     const res = await requester.get(`https://www.huya.com/${roomIdOrShortId}`);
     const html = res.data;
     const match = html.match(/var hyPlayerConfig = ({[^]+?};)/);
@@ -62,6 +62,7 @@ export async function getRoomInfo(roomIdOrShortId, formatName = "auto") {
         }
     }
     const startTime = new Date(data.gameLiveInfo?.startTime * 1000);
+    const formatSources = getFormatSources(sources, formatPriorities);
     return {
         living: vMultiStreamInfo.length > 0 && data.gameStreamInfoList.length > 0,
         id: data.gameLiveInfo.profileRoom,
@@ -71,7 +72,7 @@ export async function getRoomInfo(roomIdOrShortId, formatName = "auto") {
         avatar: data.gameLiveInfo.avatar180,
         cover: data.gameLiveInfo.screenshot,
         streams,
-        sources: formatName === "hls" ? sources.hls : sources.flv,
+        sources: formatSources?.sources ?? [],
         startTime,
         liveId: utils.md5(`${roomIdOrShortId}-${startTime?.getTime()}`),
         gid: data.gameLiveInfo.gid,

package/lib/huya_mobile_api.d.ts

@@ -1,4 +1,5 @@
-export declare function getRoomInfo(roomIdOrShortId: string, formatName?: "auto" | "flv" | "hls"): Promise<{
+import type { StreamProfile } from "./types.js";
+export declare function getRoomInfo(roomIdOrShortId: string, formatPriorities?: Array<"flv" | "hls">): Promise<{
     living: boolean;
     id: number;
     owner: string;
@@ -7,18 +8,7 @@ export declare function getRoomInfo(roomIdOrShortId: string, formatName?: "auto"
     avatar: string;
     cover: string;
     streams: StreamProfile[];
-    sources: {
-        name: string;
-        url: string;
-    }[];
+    sources: import("./types.js").SourceProfile[];
     startTime: Date;
     liveId: string;
 }>;
-export interface StreamProfile {
-    desc: string;
-    bitRate: number;
-}
-export interface SourceProfile {
-    name: string;
-    url: string;
-}

package/lib/huya_mobile_api.js

@@ -2,14 +2,14 @@
 // import { URLSearchParams } from "node:url";
 import axios from "axios";
 import { utils } from "@bililive-tools/manager";
-import { assert } from "./utils.js";
+import { assert, getFormatSources } 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") {
+export async function getRoomInfo(roomIdOrShortId, formatPriorities = ["flv", "hls"]) {
     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`);
@@ -55,6 +55,10 @@ export async function getRoomInfo(roomIdOrShortId, formatName = "auto") {
         })),
     };
     const startTime = new Date(profile.liveData?.startTime * 1000);
+    const formatSources = getFormatSources(sources, formatPriorities);
+    if (!formatSources) {
+        throw new Error("No format sources found");
+    }
     return {
         living: profile.liveStatus === "ON",
         id: profile.liveData.profileRoom,
@@ -63,8 +67,8 @@ export async function getRoomInfo(roomIdOrShortId, formatName = "auto") {
         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,
+        streams: formatSources.formatName === "hls" ? streams.hls : streams.flv,
+        sources: formatSources.sources,
         startTime,
         liveId: utils.md5(`${roomIdOrShortId}-${startTime?.getTime()}`),
     };

package/lib/index.js

@@ -19,7 +19,7 @@ function createRecorder(opts) {
         qualityRetry: opts.qualityRetry ?? 0,
         state: "idle",
         api: opts.api ?? "auto",
-        formatName: opts.formatName ?? "auto",
+        formatPriorities: opts.formatPriorities ?? ["flv", "hls"],
         getChannelURL() {
             return `https://www.huya.com/${this.channelId}`;
         },
@@ -62,7 +62,7 @@ const ffmpegOutputOptions = [
     "-movflags",
     "faststart+frag_keyframe+empty_moov",
     "-min_frag_duration",
-    "60000000",
+    "10000000",
 ];
 const ffmpegInputOptions = [
     "-reconnect",
@@ -73,14 +73,12 @@ const ffmpegInputOptions = [
     "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, liveId } = liveInfo;
+    const { living, owner, title } = liveInfo;
     this.liveInfo = liveInfo;
     if (liveInfo.liveId === banLiveId) {
         this.tempStopIntervalCheck = true;
@@ -92,7 +90,6 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         return null;
     if (!living)
         return null;
-    this.emit("LiveStart", { liveId });
     let res;
     // TODO: 先不做什么错误处理，就简单包一下预期上会有错误的地方
     try {
@@ -113,7 +110,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             sourcePriorities: this.sourcePriorities,
             api: this.api,
             strictQuality,
-            formatName: this.formatName,
+            formatPriorities: this.formatPriorities,
         });
     }
     catch (err) {
@@ -127,7 +124,12 @@ 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;
@@ -143,10 +145,13 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         outputOptions: ffmpegOutputOptions,
         inputOptions: ffmpegInputOptions,
         segment: this.segment ?? 0,
-        getSavePath: (opts) => getSavePath({ owner, title, startTime: opts.startTime }),
+        getSavePath: (opts) => getSavePath({ owner, title: opts.title ?? title, startTime: opts.startTime }),
         disableDanma: this.disableProvideCommentsWhenRecording,
         videoFormat: this.videoFormat ?? "auto",
-    }, onEnd);
+    }, onEnd, async () => {
+        const info = await getInfo(this.channelId);
+        return info;
+    });
     const savePath = getSavePath({
         owner,
         title,
@@ -158,8 +163,14 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         this.state = "idle";
         throw err;
     }
-    const handleVideoCreated = async ({ filename }) => {
-        this.emit("videoFileCreated", { filename });
+    const handleVideoCreated = async ({ filename, title, cover }) => {
+        this.emit("videoFileCreated", { filename, cover });
+        if (title && this?.liveInfo) {
+            this.liveInfo.title = title;
+        }
+        if (cover && this?.liveInfo) {
+            this.liveInfo.cover = cover;
+        }
         const extraDataController = recorder.getExtraDataController();
         extraDataController?.setMeta({
             room_id: this.channelId,
@@ -235,6 +246,16 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     }
     const ffmpegArgs = recorder.getArguments();
     recorder.run();
+    const cut = utils.singleton(async () => {
+        if (!this.recordHandle)
+            return;
+        if (isCutting)
+            return;
+        isCutting = true;
+        await recorder.stop();
+        recorder.createCommand();
+        recorder.run();
+    });
     const stop = utils.singleton(async (reason) => {
         if (!this.recordHandle)
             return;
@@ -264,6 +285,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         ffmpegArgs,
         savePath: savePath,
         stop,
+        cut,
     };
     this.emit("RecordStart", this.recordHandle);
     return this.recordHandle;

package/lib/stream.d.ts

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

package/lib/stream.js

@@ -18,24 +18,24 @@ export async function getInfo(channelId) {
 }
 async function getRoomInfo(channelId, options) {
     if (options.api == "auto") {
-        const info = await getRoomInfoByWeb(channelId, options.formatName);
+        const info = await getRoomInfoByWeb(channelId, options.formatPriorities);
         if (info.gid == 1663) {
-            return getRoomInfoByMobile(channelId, options.formatName);
+            return getRoomInfoByMobile(channelId, options.formatPriorities);
         }
         return info;
     }
     else if (options.api == "mp") {
-        return getRoomInfoByMobile(channelId, options.formatName);
+        return getRoomInfoByMobile(channelId, options.formatPriorities);
     }
     else if (options.api == "web") {
-        return getRoomInfoByWeb(channelId, options.formatName);
+        return getRoomInfoByWeb(channelId, options.formatPriorities);
     }
     assert(false, "Invalid api");
 }
 export async function getStream(opts) {
     const info = await getRoomInfo(opts.channelId, {
         api: opts.api ?? "auto",
-        formatName: opts.formatName ?? "auto",
+        formatPriorities: opts.formatPriorities ?? ["flv", "hls"],
     });
     if (!info.living) {
         throw new Error("It must be called getStream when living");

package/lib/types.d.ts

@@ -0,0 +1,18 @@
+export interface StreamResult {
+    flv: {
+        name: string;
+        url: string;
+    }[];
+    hls: {
+        name: string;
+        url: string;
+    }[];
+}
+export interface StreamProfile {
+    desc: string;
+    bitRate: number;
+}
+export interface SourceProfile {
+    name: string;
+    url: string;
+}

package/lib/types.js

@@ -0,0 +1 @@
+export {};

package/lib/utils.d.ts

@@ -1,3 +1,4 @@
+import type { StreamResult, SourceProfile } from "./types.js";
 /**
  * 从数组中按照特定算法提取一些值（允许同个索引重复提取）。
  * 算法的行为类似 flex 的 space-between。
@@ -21,3 +22,7 @@ export declare function assertStringType(data: unknown, msg?: string): asserts d
 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;
+export declare function getFormatSources(sources: StreamResult, formatPriorities?: Array<"flv" | "hls">): {
+    sources: SourceProfile[];
+    formatName: "flv" | "hls";
+} | null;

package/lib/utils.js

@@ -84,3 +84,18 @@ export function createInvalidStreamChecker() {
         return false;
     };
 }
+// 根据formatPriorities获取最终的sources
+// 如果formatPriorities为空或者undefined，则使用['flv','hls']
+// 如果有参数，按照顺序进行匹配，如果匹配的值不存在或者为空，则使用下一个参数，最后返回的是流数组
+export function getFormatSources(sources, formatPriorities = ["flv", "hls"]) {
+    for (const format of formatPriorities) {
+        if (sources[format] && sources[format].length > 0) {
+            return {
+                sources: sources[format],
+                formatName: format,
+            };
+        }
+    }
+    // 如果没有匹配到任何格式,使用默认的flv格式
+    return null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/huya-recorder",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "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",
-    "@bililive-tools/manager": "^1.2.0",
-    "huya-danma-listener": "0.1.1"
+    "huya-danma-listener": "0.1.1",
+    "@bililive-tools/manager": "^1.3.0"
   },
   "devDependencies": {},
   "scripts": {