@bililive-tools/douyu-recorder 1.5.1 → 1.7.0

package/README.md

@@ -49,6 +49,7 @@ interface Options {
   saveCover?: boolean; // 保存封面
   videoFormat?: "auto"; // 视频格式： "auto", "ts", "mkv" ，auto模式下, 分段使用 "ts"，不分段使用 "mp4"
   onlyAudio?: boolean; // 只录制音频，默认为否
+  recorderType?: "auto" | "ffmpeg" | "mesio"; // 底层录制器，使用mesio时videoFormat参数无效
 }
 ```
 
@@ -77,6 +78,8 @@ const { id } = await provider.resolveChannelInfoFromURL(url);
 
 ## cdn
 
+在 `cdn=auto` 且 `recorderType=mesio` 时，默认使用 `hw-h5` 线路
+
 如果有更多线路或者错误，请发issue
 
 | 线路   | 值        |

package/lib/danma.js

@@ -11,6 +11,59 @@ export const colorTab = {
  */
 // 粉丝荧光棒被手动置为0了
 export const giftMap = {
+    "20000": { name: "100鱼丸", pc: 0 },
+    "20001": { name: "弱鸡", pc: 20 },
+    "20002": { name: "办卡", pc: 600 },
+    "20003": { name: "飞机", pc: 10000 },
+    "20004": { name: "火箭", pc: 50000 },
+    "20005": { name: "超级火箭", pc: 200000 },
+    "20006": { name: "赞", pc: 10 },
+    "20008": { name: "超大丸星", pc: 0 },
+    "20541": { name: "大气", pc: 10 },
+    "20542": { name: "666", pc: 100 },
+    "23335": { name: "宇宙飞船", pc: 500000 },
+    "23338": { name: "告白卡", pc: 600 },
+    "23509": { name: "为爱发电", pc: 500 },
+    "23515": { name: "星际飞车", pc: 5000 },
+    "23622": { name: "至尊飞船", pc: 500000 },
+    "23623": { name: "至尊超火", pc: 200000 },
+    "23624": { name: "至尊火箭", pc: 50000 },
+    "23625": { name: "至尊飞机", pc: 10000 },
+    "23669": { name: "钻粉灯牌", pc: 600 },
+    "23670": { name: "粉丝灯牌", pc: 600 },
+    "24468": { name: "粉丝卡", pc: 600 },
+    "24470": { name: "爱的CD", pc: 100 },
+    "24472": { name: "怦然心动", pc: 600 },
+    "24473": { name: "浪漫旅行车", pc: 6600 },
+    "24474": { name: "童话马车", pc: 16600 },
+    "24475": { name: "星空丘比特", pc: 131400 },
+    "24478": { name: "全力守护", pc: 10 },
+    "24489": { name: "老司机", pc: 600 },
+    "24490": { name: "牛啤", pc: 600 },
+    "24491": { name: "小心心", pc: 10 },
+    "24492": { name: "GG", pc: 10 },
+    "24493": { name: "炒CP", pc: 5000 },
+    "24494": { name: "爱神丘比特", pc: 6600 },
+    "24495": { name: "陪伴飞机", pc: 10000 },
+    "24496": { name: "挚爱之吻", pc: 100000 },
+    "24497": { name: "斗鱼666号", pc: 100000 },
+    "24503": { name: "城堡气球", pc: 200000 },
+    "24504": { name: "挚爱之心", pc: 300000 },
+    "24505": { name: "珍珠奶茶", pc: 100 },
+    "24506": { name: "翻车了", pc: 20 },
+    "24507": { name: "古堡公主", pc: 18800 },
+    "24532": { name: "穿越千年", pc: 200000 },
+    "24533": { name: "青瓷絮语", pc: 30000 },
+    "24534": { name: "千里江山", pc: 10000 },
+    "24535": { name: "烽面惊鸿", pc: 600 },
+    "24553": { name: "能量魔方", pc: 5000 },
+    "24554": { name: "超能战舰", pc: 200000 },
+    "24560": { name: "破空飞机", pc: 10000 },
+    "24561": { name: "星际卡", pc: 600 },
+    "24597": { name: "高能弹幕", pc: 1000 },
+    "24623": { name: "带宽券", pc: 10 },
+    "24625": { name: "梦境小熊", pc: 10000 },
+    "24626": { name: "星跃猫娘", pc: 50000 },
     "192": { name: "赞", pc: 10 },
     "193": { name: "弱鸡", pc: 20 },
     "194": { name: "666", pc: 600 },

package/lib/dy_api.js

@@ -46,12 +46,15 @@ export async function getLiveInfo(opts) {
             delete signCaches[opts.channelId];
         throw new Error("Unexpected error code, " + json.error);
     }
-    // console.log("json", json, {
-    //   ...signed,
-    //   cdn: opts.cdn ?? "",
-    //   // 相当于清晰度类型的 id，给 -1 会由后端决定，0 为原画
-    //   rate: String(opts.rate ?? 0),
-    // });
+    const streamUrl = `${json.data.rtmp_url}/${json.data.rtmp_live}`;
+    let cdn = json.data.rtmp_cdn;
+    try {
+        const url = new URL(streamUrl);
+        cdn = url.searchParams.get("fcdn") ?? "";
+    }
+    catch (error) {
+        console.warn("解析 rtmp_url 失败", error);
+    }
     return {
         living: true,
         sources: json.data.cdnsWithName,
@@ -59,12 +62,12 @@ export async function getLiveInfo(opts) {
         isSupportRateSwitch: json.data.rateSwitch === 1,
         isOriginalStream: json.data.rateSwitch !== 1,
         currentStream: {
-            source: json.data.rtmp_cdn,
+            source: cdn,
             name: json.data.rateSwitch !== 1
                 ? "原画"
                 : (json.data.multirates.find(({ rate }) => rate === json.data.rate)?.name ?? "未知"),
             rate: json.data.rate,
-            url: `${json.data.rtmp_url}/${json.data.rtmp_live}`,
+            url: streamUrl,
         },
     };
 }

package/lib/dy_client/buffer_coder.js

@@ -18,6 +18,7 @@ export class BufferCoder {
         if (littleEndian == null) {
             littleEndian = this.littleEndian;
         }
+        // @ts-ignore
         this.buffer = this.concat(this.buffer, newBuffer).buffer;
         while (this.buffer && this.buffer.byteLength > 0) {
             if (this.readLength === 0) {
@@ -38,6 +39,7 @@ export class BufferCoder {
         if (littleEndian == null) {
             littleEndian = this.littleEndian;
         }
+        // @ts-ignore
         const out = this.concat(this.encoder.encode(msg), Uint8Array.of(0));
         const formatBodySize = 8 + out.length;
         const dv = new DataView(new ArrayBuffer(formatBodySize + 4));

package/lib/index.js

@@ -1,5 +1,5 @@
 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 } from "./stream.js";
 import { getRoomInfo } from "./dy_api.js";
 import { ensureFolderExist } from "./utils.js";
@@ -106,10 +106,16 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         return this.recordHandle;
     }
     // 获取直播间信息
-    const liveInfo = await getInfo(this.channelId);
-    const { living, owner, title } = liveInfo;
-    this.liveInfo = liveInfo;
-    if (liveInfo.liveId === banLiveId) {
+    try {
+        const liveInfo = await getInfo(this.channelId);
+        this.liveInfo = liveInfo;
+    }
+    catch (error) {
+        this.state = "check-error";
+        throw error;
+    }
+    const { living, owner, title } = this.liveInfo;
+    if (this.liveInfo.liveId === banLiveId) {
         this.tempStopIntervalCheck = true;
     }
     else {
@@ -138,8 +144,8 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             return null;
         }
     }
+    let recorderType = this.recorderType === "mesio" ? "mesio" : "ffmpeg";
     let res;
-    // TODO: 先不做什么错误处理，就简单包一下预期上会有错误的地方
     try {
         let strictQuality = false;
         if (this.qualityRetry > 0) {
@@ -157,11 +163,13 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             source: this.source,
             strictQuality,
             onlyAudio: this.onlyAudio,
+            avoidEdgeCDN: recorderType === "mesio",
         });
     }
     catch (err) {
-        this.state = "idle";
-        this.qualityRetry -= 1;
+        if (this.qualityRetry > 0)
+            this.qualityRetry -= 1;
+        this.state = "check-error";
         throw err;
     }
     this.state = "recording";
@@ -180,15 +188,16 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         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);
     };
     let isEnded = false;
     let isCutting = false;
-    const recorder = new FFMPEGRecorder({
+    const recorder = createBaseRecorder(recorderType, {
         url: stream.url,
+        // @ts-ignore
         outputOptions: ffmpegOutputOptions,
         segment: this.segment ?? 0,
         getSavePath: (opts) => getSavePath({ owner, title: opts.title ?? title, startTime: opts.startTime }),
@@ -221,7 +230,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         extraDataController?.setMeta({
             room_id: this.channelId,
             platform: provider?.id,
-            liveStartTimestamp: liveInfo.startTime?.getTime(),
+            liveStartTimestamp: this?.liveInfo?.startTime?.getTime(),
             // recordStopTimestamp: Date.now(),
             title: title,
             user_name: owner,
@@ -379,7 +388,6 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     client.on("error", (err) => {
         this.emit("DebugLog", { type: "common", text: String(err) });
     });
-    // console.log("this.disableProvideCommentsWhenRecording", this.disableProvideCommentsWhenRecording);
     if (!this.disableProvideCommentsWhenRecording) {
         client.start();
     }

package/lib/stream.d.ts

@@ -13,6 +13,7 @@ export declare function getStream(opts: Pick<Recorder, "channelId" | "quality">
     strictQuality?: boolean;
     source?: string;
     onlyAudio?: boolean;
+    avoidEdgeCDN?: boolean;
 }): Promise<{
     living: true;
     sources: import("./dy_api.js").SourceProfile[];

package/lib/stream.js

@@ -44,10 +44,15 @@ export async function getInfo(channelId) {
 }
 export async function getStream(opts) {
     const qn = (DouyuQualities.includes(opts.quality) ? opts.quality : 0);
+    let cdn = opts.source === "auto" ? undefined : opts.source;
+    if (opts.source === "auto" && opts.avoidEdgeCDN) {
+        // TODO: 如果不存在 cdn=hw-h5 的源，那么还是可能默认到边缘节点，就先这样吧
+        cdn = "hw-h5";
+    }
     let liveInfo = await getLiveInfo({
         channelId: opts.channelId,
         rate: qn,
-        cdn: opts.source === "auto" ? undefined : opts.source,
+        cdn,
         onlyAudio: opts.onlyAudio,
     });
     if (!liveInfo.living)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/douyu-recorder",
-  "version": "1.5.1",
+  "version": "1.7.0",
   "description": "bililive-tools douyu recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -41,7 +41,7 @@
     "lodash-es": "^4.17.21",
     "axios": "^1.7.8",
     "douyu-api": "^0.1.0",
-    "@bililive-tools/manager": "^1.4.1"
+    "@bililive-tools/manager": "^1.6.1"
   },
   "devDependencies": {
     "@types/ws": "^8.5.13"