@bililive-tools/huya-recorder 1.3.0 → 1.3.2

package/lib/huya_api.js

@@ -63,9 +63,6 @@ export async function getRoomInfo(roomIdOrShortId, formatPriorities = ["flv", "h
     }
     const startTime = new Date(data.gameLiveInfo?.startTime * 1000);
     const formatSources = getFormatSources(sources, formatPriorities);
-    if (!formatSources) {
-        throw new Error("No format sources found");
-    }
     return {
         living: vMultiStreamInfo.length > 0 && data.gameStreamInfoList.length > 0,
         id: data.gameLiveInfo.profileRoom,
@@ -75,7 +72,7 @@ export async function getRoomInfo(roomIdOrShortId, formatPriorities = ["flv", "h
         avatar: data.gameLiveInfo.avatar180,
         cover: data.gameLiveInfo.screenshot,
         streams,
-        sources: formatSources.sources,
+        sources: formatSources?.sources ?? [],
         startTime,
         liveId: utils.md5(`${roomIdOrShortId}-${startTime?.getTime()}`),
         gid: data.gameLiveInfo.gid,

package/lib/index.js

@@ -176,7 +176,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 +242,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 +266,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 +312,7 @@ export const provider = {
             id: info.roomId.toString(),
             title: info.title,
             owner: info.owner,
+            avatar: info.avatar,
         };
     },
     createRecorder(opts) {

package/lib/stream.js

@@ -70,12 +70,17 @@ export async function getStream(opts) {
                 .replace("&fs=bhct", "&fs=bgct");
         }
     }
+    let url = expectSource.url;
+    // MP协议下原画不需要添加ratio参数
+    if (expectStream.bitRate) {
+        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.0",
+  "version": "1.3.2",
   "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.3.0",
-    "huya-danma-listener": "0.1.1"
+    "@bililive-tools/manager": "^1.4.1",
+    "huya-danma-listener": "0.1.2"
   },
   "devDependencies": {},
   "scripts": {