@bililive-tools/douyin-recorder 1.12.0 → 1.12.2

package/lib/douyin_api.js

@@ -309,6 +309,22 @@ async function getRoomInfoByWeb(webRoomId, opts = {}) {
             "User-Agent": ua,
         },
     });
+    if (res.data.status_code === 30003) {
+        // 直播已结束
+        return {
+            living: false,
+            nickname: "",
+            sec_uid: "",
+            avatar: "",
+            api: "web",
+            room: {
+                title: "",
+                cover: "",
+                id_str: "",
+                stream_url: null,
+            },
+        };
+    }
     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];

package/lib/index.js

@@ -234,9 +234,14 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         const extraDataController = downloader.getExtraDataController();
         if (!extraDataController)
             return;
+        let timestamp = Date.now();
+        if (this.useServerTimestamp && msg.eventTime) {
+            // 某些消息可能没有 eventTime 字段
+            timestamp = Number(msg.eventTime) * 1000;
+        }
         const comment = {
             type: "comment",
-            timestamp: this.useServerTimestamp ? Number(msg.eventTime) * 1000 : Date.now(),
+            timestamp: timestamp,
             text: msg.content,
             color: "#ffffff",
             sender: {
@@ -248,6 +253,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
                 // },
             },
         };
+        console.log("Message", JSON.stringify(msg), null, 2);
         this.emit("Message", comment);
         extraDataController.addMessage(comment);
     });
@@ -304,7 +310,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             color: "#ffffff",
             sender: {
                 uid: msg.user.id,
-                name: msg?.user?.nickName ?? "unknown",
+                name: msg?.user?.nickName || "unknown",
                 // avatar: msg.ic,
                 // extra: {
                 //   level: msg.level,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/douyin-recorder",
-  "version": "1.12.0",
+  "version": "1.12.2",
   "description": "@bililive-tools douyin recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -38,8 +38,8 @@
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",
     "sm-crypto": "^0.3.13",
-    "@bililive-tools/manager": "^1.12.0",
-    "douyin-danma-listener": "0.3.1"
+    "@bililive-tools/manager": "^1.13.0",
+    "douyin-danma-listener": "0.4.0"
   },
   "devDependencies": {
     "@types/node": "*"