@bililive-tools/huya-recorder 1.8.0 → 1.9.0

package/lib/huya_api.js

@@ -1,10 +1,7 @@
-import axios from "axios";
+import { requester } from "./requester.js";
 import { utils } from "@bililive-tools/manager";
 import { assert, getFormatSources } from "./utils.js";
 import { initInfo } from "./anticode.js";
-const requester = axios.create({
-    timeout: 10e3,
-});
 export async function getRoomInfo(roomIdOrShortId, opts = {}) {
     const res = await requester.get(`https://www.huya.com/${roomIdOrShortId}`);
     const html = res.data;

package/lib/huya_mobile_api.js

@@ -1,16 +1,14 @@
 // import { createHash, randomInt } from "node:crypto";
 // import { URLSearchParams } from "node:url";
-import axios from "axios";
+import { requester } from "./requester.js";
 import { utils } from "@bililive-tools/manager";
 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, formatPriorities = ["flv", "hls"]) {
-    const res = await requester.get(`https://mp.huya.com/cache.php?m=Live&do=profileRoom&roomid=${roomIdOrShortId}`);
+    const res = await requester.get(`https://mp.huya.com/cache.php?m=Live&do=profileRoom&roomid=${roomIdOrShortId}`, {
+        headers: {
+            "User-Agent": "Mozilla/5.0 (Linux; Android 5.0; SM-G900P Build/LRX21T) AppleWebKit/537.36 (KHTML, like Gecko)",
+        },
+    });
     const html = res.data;
     assert(html, `Unexpected resp, hyPlayerConfig is null`);
     if (res.status !== 200) {

package/lib/index.js

@@ -56,14 +56,7 @@ function createRecorder(opts) {
     });
     return recorderWithSupportUpdatedEvent;
 }
-const ffmpegOutputOptions = [
-    "-c",
-    "copy",
-    "-movflags",
-    "faststart+frag_keyframe+empty_moov",
-    "-min_frag_duration",
-    "10000000",
-];
+const ffmpegOutputOptions = [];
 const ffmpegInputOptions = ["-rw_timeout", "10000000", "-timeout", "10000000"];
 const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isManualStart, }) {
     // 如果已经在录制中，只在需要检查标题关键词时才获取最新信息
@@ -110,7 +103,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         this.state = "check-error";
         throw error;
     }
-    const { living, owner, title } = this.liveInfo;
+    const { living, owner, title, startTime } = this.liveInfo;
     if (this.liveInfo.liveId === banLiveId) {
         this.tempStopIntervalCheck = true;
     }
@@ -185,12 +178,19 @@ 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, {
         url: stream.url,
         outputOptions: ffmpegOutputOptions,
         inputOptions: ffmpegInputOptions,
         segment: this.segment ?? 0,
-        getSavePath: (opts) => getSavePath({ owner, title: opts.title ?? title, startTime: opts.startTime }),
+        getSavePath: (opts) => getSavePath({
+            owner,
+            title: opts.title ?? title,
+            startTime: opts.startTime,
+            liveStartTime: startTime,
+            recordStartTime,
+        }),
         disableDanma: this.disableProvideCommentsWhenRecording,
         videoFormat: this.videoFormat ?? "auto",
         debugLevel: this.debugLevel ?? "none",
@@ -201,6 +201,9 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     const savePath = getSavePath({
         owner,
         title,
+        startTime: Date.now(),
+        liveStartTime: startTime,
+        recordStartTime,
     });
     try {
         ensureFolderExist(savePath);
@@ -333,6 +336,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         id: genRecordUUID(),
         stream: stream.name,
         source: stream.source,
+        recorderType: recorder.type,
         url: stream.url,
         ffmpegArgs,
         savePath: savePath,

package/lib/requester.d.ts

@@ -0,0 +1,2 @@
+import axios from "axios";
+export declare const requester: axios.AxiosInstance;

package/lib/requester.js

@@ -0,0 +1,7 @@
+import axios from "axios";
+export const requester = axios.create({
+    timeout: 10e3,
+    // axios 会自动读取环境变量中的 http_proxy 和 https_proxy 并应用，
+    // 但会导致请求报错 "Client network socket disconnected before secure TLS connection was established"。
+    proxy: false,
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/huya-recorder",
-  "version": "1.8.0",
+  "version": "1.9.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",
-    "@bililive-tools/manager": "^1.8.0",
-    "huya-danma-listener": "0.1.3"
+    "huya-danma-listener": "0.1.3",
+    "@bililive-tools/manager": "^1.9.0"
   },
   "devDependencies": {},
   "scripts": {