@bililive-tools/bilibili-recorder 1.5.1 → 1.7.0

package/README.md

@@ -53,6 +53,7 @@ interface Options {
   m3u8ProxyUrl?: string; // 代理链接，文档待补充
   videoFormat?: "auto"; // 视频格式： "auto", "ts", "mkv" ，auto模式下, 分段使用 "ts"，不分段使用 "mp4"
   onlyAudio?: boolean; // 只录制音频，默认为否
+  recorderType?: "auto" | "ffmpeg" | "mesio"; // 底层录制器，使用mesio时videoFormat参数无效
 }
 ```
 

package/lib/danma.d.ts

@@ -8,7 +8,7 @@ declare class DanmaClient extends EventEmitter {
     private useServerTimestamp;
     constructor(roomId: number, { auth, uid, useServerTimestamp, }: {
         auth: string | undefined;
-        uid: number | undefined;
+        uid: number;
         useServerTimestamp?: boolean;
     });
     start(): Promise<void>;

package/lib/danma.js

@@ -74,10 +74,10 @@ class DanmaClient extends EventEmitter {
                         uid: String(msg.body.user.uid),
                         name: msg.body.user.uname,
                         avatar: msg.body.user.face,
-                        extra: {
-                            badgeName: msg.body.user.badge?.name,
-                            badgeLevel: msg.body.user.badge?.level,
-                        },
+                        // extra: {
+                        //   badgeName: msg.body.user?.badge?.name,
+                        //   badgeLevel: msg.body.user?.badge?.level,
+                        // },
                     },
                 };
                 this.emit("Message", comment);
@@ -93,10 +93,10 @@ class DanmaClient extends EventEmitter {
                         uid: String(msg.body.user.uid),
                         name: msg.body.user.uname,
                         avatar: msg.body.user.face,
-                        extra: {
-                            badgeName: msg.body.user.badge?.name,
-                            badgeLevel: msg.body.user.badge?.level,
-                        },
+                        // extra: {
+                        //   badgeName: msg.body.user?.badge?.name,
+                        //   badgeLevel: msg.body.user?.badge?.level,
+                        // },
                     },
                 };
                 this.emit("Message", comment);
@@ -106,17 +106,17 @@ class DanmaClient extends EventEmitter {
                     type: "guard",
                     timestamp: this.useServerTimestamp ? msg.timestamp : Date.now(),
                     name: msg.body.gift_name,
-                    price: msg.body.price,
+                    price: msg.body.price / 1000,
                     count: 1,
                     level: msg.body.guard_level,
                     sender: {
                         uid: String(msg.body.user.uid),
                         name: msg.body.user.uname,
                         avatar: msg.body.user.face,
-                        extra: {
-                            badgeName: msg.body.user.badge?.name,
-                            badgeLevel: msg.body.user.badge?.level,
-                        },
+                        // extra: {
+                        //   badgeName: msg.body.user?.badge?.name,
+                        //   badgeLevel: msg.body.user?.badge?.level,
+                        // },
                     },
                 };
                 this.emit("Message", gift);
@@ -132,10 +132,10 @@ class DanmaClient extends EventEmitter {
                         uid: String(msg.body.user.uid),
                         name: msg.body.user.uname,
                         avatar: msg.body.user.face,
-                        extra: {
-                            badgeName: msg.body.user.badge?.name,
-                            badgeLevel: msg.body.user.badge?.level,
-                        },
+                        // extra: {
+                        //   badgeName: msg.body.user?.badge?.name,
+                        //   badgeLevel: msg.body.user?.badge?.level,
+                        // },
                     },
                     extra: {
                         hits: msg.body.combo?.combo_num,

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, getLiveStatus, getStrictStream } from "./stream.js";
 import { ensureFolderExist, hasKeyword } from "./utils.js";
 import DanmaClient from "./danma.js";
@@ -23,6 +23,7 @@ function createRecorder(opts) {
         m3u8ProxyUrl: opts.m3u8ProxyUrl,
         formatName: opts.formatName ?? "auto",
         codecName: opts.codecName ?? "auto",
+        recorderType: opts.recorderType ?? "ffmpeg",
         getChannelURL() {
             return `https://live.bilibili.com/${this.channelId}`;
         },
@@ -85,16 +86,22 @@ const ffmpegInputOptions = [
 const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, banLiveId, }) {
     if (this.recordHandle != null)
         return this.recordHandle;
-    const { living, liveId, owner: _owner, title: _title } = await getLiveStatus(this.channelId);
-    this.liveInfo = {
-        living,
-        owner: _owner,
-        title: _title,
-        avatar: "",
-        cover: "",
-        liveId: liveId,
-    };
-    if (liveId === banLiveId) {
+    try {
+        const { living, liveId, owner: _owner, title: _title } = await getLiveStatus(this.channelId);
+        this.liveInfo = {
+            living,
+            owner: _owner,
+            title: _title,
+            avatar: "",
+            cover: "",
+            liveId: liveId,
+        };
+    }
+    catch (error) {
+        this.state = "check-error";
+        throw error;
+    }
+    if (this.liveInfo.liveId === banLiveId) {
         this.tempStopIntervalCheck = true;
     }
     else {
@@ -102,7 +109,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
     }
     if (this.tempStopIntervalCheck)
         return null;
-    if (!living)
+    if (!this.liveInfo.living)
         return null;
     // 检查标题是否包含关键词，如果包含则不自动录制
     // 手动开始录制时不检查标题关键词
@@ -110,11 +117,11 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         this.titleKeywords &&
         typeof this.titleKeywords === "string" &&
         this.titleKeywords.trim()) {
-        const hasTitleKeyword = hasKeyword(_title, this.titleKeywords);
+        const hasTitleKeyword = hasKeyword(this.liveInfo.title, this.titleKeywords);
         if (hasTitleKeyword) {
             this.emit("DebugLog", {
                 type: "common",
-                text: `跳过录制：直播间标题 "${_title}" 包含关键词 "${this.titleKeywords}"`,
+                text: `跳过录制：直播间标题 "${this.liveInfo.title}" 包含关键词 "${this.titleKeywords}"`,
             });
             return null;
         }
@@ -146,8 +153,9 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         });
     }
     catch (err) {
-        this.qualityRetry -= 1;
-        this.state = "idle";
+        if (this.qualityRetry > 0)
+            this.qualityRetry -= 1;
+        this.state = "check-error";
         throw err;
     }
     this.state = "recording";
@@ -159,7 +167,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
     let url = stream.url;
     let intervalId = null;
     if (this.useM3U8Proxy && streamOptions.protocol_name === "http_hls") {
-        url = `${this.m3u8ProxyUrl}?id=${this.id}`;
+        url = `${this.m3u8ProxyUrl}?id=${this.id}&format=hls`;
         this.emit("DebugLog", {
             type: "common",
             text: `is hls stream, use proxy: ${url}`,
@@ -193,18 +201,20 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         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: url,
         outputOptions: ffmpegOutputOptions,
         inputOptions: ffmpegInputOptions,
+        mesioOptions: ["-H", "Referer:https://live.bilibili.com/"],
         segment: this.segment ?? 0,
         getSavePath: (opts) => getSavePath({ owner, title: opts.title ?? title, startTime: opts.startTime }),
-        isHls: streamOptions.protocol_name === "http_hls",
+        formatName: streamOptions.format_name,
         disableDanma: this.disableProvideCommentsWhenRecording,
         videoFormat: this.videoFormat,
     }, onEnd, async () => {
@@ -255,7 +265,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
     });
     let danmaClient = new DanmaClient(roomId, {
         auth: this.auth,
-        uid: this.uid,
+        uid: Number(this.uid),
         useServerTimestamp: this.useServerTimestamp,
     });
     if (!this.disableProvideCommentsWhenRecording) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/bilibili-recorder",
-  "version": "1.5.1",
+  "version": "1.7.0",
   "description": "bililive-tools bilibili recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -39,7 +39,7 @@
     "tiny-bilibili-ws": "^1.0.2",
     "lodash-es": "^4.17.21",
     "axios": "^1.7.8",
-    "@bililive-tools/manager": "^1.4.1"
+    "@bililive-tools/manager": "^1.6.1"
   },
   "scripts": {
     "build": "tsc",