@bililive-tools/douyin-recorder 1.5.0 → 1.5.2

package/lib/douyin_api.js

@@ -71,6 +71,13 @@ export const getCookie = async () => {
         return cookie.split(";")[0];
     })
         .join("; ");
+    if (!cookies.includes("ttwid")) {
+        // 如果不含ttwid，且已经存在含ttwid的cookie，将缓存时间直接增加1小时，复用之前的参数
+        if (cookieCache?.cookies) {
+            cookieCache.startTimestamp += 60 * 60 * 1000; // 增加1小时
+            return cookieCache.cookies;
+        }
+    }
     cookieCache = {
         startTimestamp: now,
         cookies,
@@ -105,6 +112,7 @@ export async function getRoomInfo(webRoomId, opts = {}) {
             // enter_source:,
             "Room-Enter-User-Login-Ab": 0,
             is_need_double_stream: "false",
+            a_bogus: "1",
         },
         headers: {
             cookie: cookies,
@@ -125,7 +133,7 @@ export async function getRoomInfo(webRoomId, opts = {}) {
             doubleScreen: opts.doubleScreen,
         });
     }
-    assert(res.data.status_code === 0, `Unexpected resp, code ${res.data.status_code}, msg ${JSON.stringify(res.data.data)}, id ${webRoomId}`);
+    assert(res.data.status_code === 0, `Unexpected resp, code ${res.data.status_code}, msg ${JSON.stringify(res.data.data)}, id ${webRoomId}, cookies: ${cookies}`);
     const data = res.data.data;
     const room = data.data[0];
     assert(room, `No room data, id ${webRoomId}`);

package/lib/index.js

@@ -253,7 +253,31 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     client.on("reconnect", (attempts) => {
         this.emit("DebugLog", {
             type: "common",
-            text: `danma has reconnect ${attempts}`,
+            text: `douyin ${this.channelId}  danma has reconnect ${attempts}`,
+        });
+    });
+    client.on("error", (err) => {
+        this.emit("DebugLog", {
+            type: "common",
+            text: `douyin ${this.channelId}  danma error: ${String(err)}`,
+        });
+    });
+    client.on("init", (url) => {
+        this.emit("DebugLog", {
+            type: "common",
+            text: `douyin ${this.channelId}  danma init ${url}`,
+        });
+    });
+    client.on("open", () => {
+        this.emit("DebugLog", {
+            type: "common",
+            text: `douyin ${this.channelId} danma open`,
+        });
+    });
+    client.on("close", () => {
+        this.emit("DebugLog", {
+            type: "common",
+            text: `douyin danma close`,
         });
     });
     // client.on("open", () => {
@@ -287,8 +311,8 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         if (!this.recordHandle)
             return;
         this.state = "stopping-record";
-        client.close();
         try {
+            client.close();
             await recorder.stop();
         }
         catch (err) {
@@ -323,7 +347,7 @@ export const provider = {
     siteURL: "https://live.douyin.com/",
     matchURL(channelURL) {
         // 支持 v.douyin.com 和 live.douyin.com
-        return /https?:\/\/(live|v)\.douyin\.com\//.test(channelURL);
+        return /https?:\/\/(live|v|www)\.douyin\.com\//.test(channelURL);
     },
     async resolveChannelInfoFromURL(channelURL) {
         if (!this.matchURL(channelURL))
@@ -347,6 +371,7 @@ export const provider = {
             id: info.roomId,
             title: info.title,
             owner: info.owner,
+            avatar: info.avatar,
         };
     },
     createRecorder(opts) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/douyin-recorder",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "@bililive-tools douyin recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -37,8 +37,8 @@
     "axios": "^1.7.8",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",
-    "@bililive-tools/manager": "^1.4.0",
-    "douyin-danma-listener": "0.2.0"
+    "douyin-danma-listener": "0.2.0",
+    "@bililive-tools/manager": "^1.4.1"
   },
   "devDependencies": {
     "@types/node": "*"