@bililive-tools/douyu-recorder 1.4.0 → 1.5.1

package/README.md

@@ -45,6 +45,7 @@ interface Options {
   disableProvideCommentsWhenRecording?: boolean; // 禁用弹幕录制
   saveGiftDanma?: boolean; // 保存礼物弹幕
   saveSCDanma?: boolean; // 保存高能弹幕
+  useServerTimestamp?: boolean; // 控制弹幕是否使用服务端时间戳，默认为true，斗鱼服务端时间戳只对文字弹幕生效，礼物等不生效
   saveCover?: boolean; // 保存封面
   videoFormat?: "auto"; // 视频格式： "auto", "ts", "mkv" ，auto模式下, 分段使用 "ts"，不分段使用 "mp4"
   onlyAudio?: boolean; // 只录制音频，默认为否

package/lib/danma.js

@@ -9,6 +9,7 @@ export const colorTab = {
 /**
  * from https://webconf.douyucdn.cn/resource/common/prop_gift_list/prop_gift_config.json
  */
+// 粉丝荧光棒被手动置为0了
 export const giftMap = {
     "192": { name: "赞", pc: 10 },
     "193": { name: "弱鸡", pc: 20 },
@@ -39,7 +40,7 @@ export const giftMap = {
     "804": { name: "铜牌", pc: 10 },
     "805": { name: "银牌", pc: 30 },
     "806": { name: "金牌", pc: 60 },
-    "824": { name: "粉丝荧光棒", pc: 10 },
+    "824": { name: "粉丝荧光棒", pc: 0 },
     "947": { name: "狼抓手", pc: 10 },
     "1005": { name: "超级火箭", pc: 200000 },
     "1075": { name: "这都不叫事", pc: 200000 },
@@ -253,13 +254,13 @@ export const giftMap = {
     "1800": { name: "69式饺子", pc: 200000 },
     "1804": { name: "帝国舰队", pc: 50100 },
     "1805": { name: "可爱羡羡火箭", pc: 50000 },
-    "1806": { name: "粉丝荧光棒", pc: 10 },
+    "1806": { name: "粉丝荧光棒", pc: 0 },
     "1813": { name: "石西叽", pc: 200000 },
     "1814": { name: "一箭丹心", pc: 200000 },
     "1823": { name: "赞", pc: 10 },
     "1824": { name: "弱鸡", pc: 20 },
     "1828": { name: "帝国舰队", pc: 10100 },
-    "1838": { name: "粉丝荧光棒", pc: 10 },
+    "1838": { name: "粉丝荧光棒", pc: 0 },
     "1844": { name: "英嘤英", pc: 200000 },
     "1850": { name: "一只狗", pc: 200000 },
     "1852": { name: "穷逼火箭", pc: 200000 },
@@ -280,7 +281,7 @@ export const giftMap = {
     "1897": { name: "大马猴火箭", pc: 50000 },
     "1912": { name: "岁月静好", pc: 200000 },
     "1913": { name: "吃鸡", pc: 10 },
-    "1914": { name: "粉丝荧光棒", pc: 10 },
+    "1914": { name: "粉丝荧光棒", pc: 0 },
     "1923": { name: "伊C", pc: 200000 },
     "1924": { name: "装逼王超火", pc: 200000 },
     "1925": { name: "超级达克宁", pc: 200000 },
@@ -377,7 +378,7 @@ export const giftMap = {
     "20384": { name: "测试专用皮肤", pc: 10 },
     "20388": { name: "全民乐PK", pc: 10000 },
     "20389": { name: "挚爱超火", pc: 200000 },
-    "20422": { name: "粉丝荧光棒", pc: 10 },
+    "20422": { name: "粉丝荧光棒", pc: 0 },
     "20426": { name: "不网恋超火", pc: 200000 },
     "20434": { name: "抢位道具卡", pc: 100 },
     "20435": { name: "普通家庭超火", pc: 200000 },

package/lib/index.js

@@ -19,6 +19,7 @@ function createRecorder(opts) {
         availableSources: [],
         qualityMaxRetry: opts.qualityRetry ?? 0,
         qualityRetry: opts.qualityRetry ?? 0,
+        useServerTimestamp: opts.useServerTimestamp ?? true,
         state: "idle",
         getChannelURL() {
             return `https://www.douyu.com/${this.channelId}`;
@@ -248,9 +249,10 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             return;
         switch (msg.type) {
             case "chatmsg": {
+                const timestamp = this.useServerTimestamp ? Number(msg.cst) : Date.now();
                 const comment = {
                     type: "comment",
-                    timestamp: Number(msg.cst),
+                    timestamp: timestamp,
                     text: msg.txt,
                     color: colorTab[msg.col] ?? "#ffffff",
                     sender: {
@@ -398,8 +400,8 @@ 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) {
@@ -443,14 +445,26 @@ export const provider = {
         const res = await requester.get(channelURL);
         const html = res.data;
         const matched = html.match(/\$ROOM\.room_id.?=(.*?);/);
-        if (!matched)
+        let roomId = undefined;
+        if (matched) {
+            roomId = matched[1].trim();
+        }
+        else {
+            // 解析<link rel="canonical" href="xxxxxxx"/>中的href
+            const canonicalLink = html.match(/<link rel="canonical" href="(.*?)"/);
+            if (canonicalLink) {
+                const url = canonicalLink[1];
+                roomId = url.split("/").pop();
+            }
+        }
+        if (!roomId)
             return null;
-        const room_id = matched[1].trim();
-        const roomInfo = await getRoomInfo(Number(room_id));
+        const roomInfo = await getRoomInfo(Number(roomId));
         return {
-            id: matched[1].trim(),
+            id: roomId,
             title: roomInfo.room.room_name,
             owner: roomInfo.room.nickname,
+            avatar: roomInfo.room.avatar?.big,
         };
     },
     createRecorder(opts) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/douyu-recorder",
-  "version": "1.4.0",
+  "version": "1.5.1",
   "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.3.0"
+    "@bililive-tools/manager": "^1.4.1"
   },
   "devDependencies": {
     "@types/ws": "^8.5.13"