@bililive-tools/huya-recorder 1.15.0 → 1.17.0

package/lib/index.js

@@ -2,7 +2,6 @@ import path from "node:path";
 import mitt from "mitt";
 import { defaultFromJSON, defaultToJSON, genRecorderUUID, genRecordUUID, utils, createDownloader, } from "@bililive-tools/manager";
 import { getInfo, getStream } from "./stream.js";
-import { ensureFolderExist } from "./utils.js";
 import HuYaDanMu from "huya-danma-listener";
 function createRecorder(opts) {
     // 内部实现时，应该只有 proxy 包裹的那一层会使用这个 recorder 标识符，不应该有直接通过
@@ -14,6 +13,7 @@ function createRecorder(opts) {
         ...mitt(),
         ...opts,
         cache: null,
+        appendTimeline: null,
         availableStreams: [],
         availableSources: [],
         qualityRetry: opts.qualityRetry ?? 0,
@@ -72,10 +72,13 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     try {
         const liveInfo = await getInfo(this.channelId);
         this.liveInfo = liveInfo;
-        this.state = "idle";
+        this.emit("stateChange", { state: "idle" });
     }
     catch (error) {
-        this.state = "check-error";
+        this.emit("stateChange", {
+            state: "check-error",
+            msg: `检查失败，` + (error instanceof Error ? error.message : String(error)),
+        });
         throw error;
     }
     const { living, owner, title, liveStartTime, recordStartTime } = this.liveInfo;
@@ -109,10 +112,13 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     catch (err) {
         if (qualityRetryLeft > 0)
             await this.cache.set("qualityRetryLeft", qualityRetryLeft - 1);
-        this.state = "check-error";
+        this.emit("stateChange", {
+            state: "check-error",
+            msg: `检查失败，` + (err instanceof Error ? err.message : String(err)),
+        });
         throw err;
     }
-    this.state = "recording";
+    this.emit("stateChange", { state: "recording" });
     const { currentStream: stream, sources: availableSources, streams: availableStreams } = res;
     this.availableStreams = availableStreams.map((s) => s.desc);
     this.availableSources = availableSources.map((s) => s.name);
@@ -146,6 +152,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             startTime: opts.startTime,
             liveStartTime,
             recordStartTime,
+            extraMs: opts.extraMs,
         }),
         disableDanma: this.disableProvideCommentsWhenRecording,
         videoFormat: this.videoFormat ?? "auto",
@@ -153,24 +160,11 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         headers: {
             "User-Agent": stream.ua,
         },
+        proxy: this.proxy,
     }, onEnd, async () => {
         const info = await getInfo(this.channelId);
         return info;
     });
-    const savePath = getSavePath({
-        owner,
-        title,
-        startTime: Date.now(),
-        liveStartTime,
-        recordStartTime,
-    });
-    try {
-        ensureFolderExist(savePath);
-    }
-    catch (err) {
-        this.state = "idle";
-        throw err;
-    }
     const handleVideoCreated = async ({ filename, title, cover, rawFilename }) => {
         this.emit("videoFileCreated", { filename, cover, rawFilename });
         if (title && this?.liveInfo) {
@@ -190,8 +184,8 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         });
     };
     downloader.on("videoFileCreated", handleVideoCreated);
-    downloader.on("videoFileCompleted", ({ filename }) => {
-        this.emit("videoFileCompleted", { filename });
+    downloader.on("videoFileCompleted", (data) => {
+        this.emit("videoFileCompleted", data);
     });
     downloader.on("DebugLog", (data) => {
         this.emit("DebugLog", data);
@@ -255,7 +249,11 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         client.on("error", (e) => {
             this.emit("DebugLog", { type: "common", text: String(e) });
         });
+        client.on("connect", () => {
+            this.appendTimeline({ text: `弹幕连接已建立` });
+        });
         client.on("retry", (e) => {
+            this.appendTimeline({ text: `弹幕连接断开，正在重试: ${e.count}/${e.max}` });
             this.emit("DebugLog", {
                 type: "common",
                 text: `${this?.liveInfo?.owner}:${this.channelId} huya danmu retry: ${e.count}/${e.max}`,
@@ -273,7 +271,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     const stop = utils.singleton(async (reason) => {
         if (!this.recordHandle)
             return;
-        this.state = "stopping-record";
+        this.emit("stateChange", { state: "stopping-record" });
         try {
             client?.stop();
             await downloader.stop();
@@ -289,7 +287,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         this.emit("RecordStop", { recordHandle: this.recordHandle, reason });
         this.recordHandle = undefined;
         this.liveInfo = undefined;
-        this.state = "idle";
+        this.emit("stateChange", { state: "idle" });
         this.cache.set("qualityRetryLeft", this.qualityRetry);
     });
     this.recordHandle = {
@@ -299,7 +297,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         recorderType: downloader.type,
         url: stream.url,
         downloaderArgs,
-        savePath: savePath,
+        savePath: downloader.videoFilePath,
         stop,
         cut,
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/huya-recorder",
-  "version": "1.15.0",
+  "version": "1.17.0",
   "description": "bililive-tools huya recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -38,7 +38,7 @@
     "axios": "^1.15.0",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",
-    "@bililive-tools/manager": "^1.14.1",
+    "@bililive-tools/manager": "^1.17.0",
     "huya-danma-listener": "0.1.4"
   },
   "scripts": {