douyin-danma-listener 0.4.0 → 0.4.2

package/lib/api.js

@@ -1,4 +1,11 @@
+let cookieCache;
 export const getCookie = async () => {
+    const now = new Date().getTime();
+    // 缓存1小时：重连时优先复用，避免每次连接都依赖实时网络抓取，
+    // 瞬时网络抖动时不会导致 connect() 失败、重试链断裂
+    if (cookieCache?.startTimestamp && now - cookieCache.startTimestamp < 60 * 60 * 1000) {
+        return cookieCache.cookies;
+    }
     const res = await fetch("https://live.douyin.com/", {
         method: "GET",
     });
@@ -11,5 +18,16 @@ export const getCookie = async () => {
         return cookie.split(";")[0];
     })
         .join("; ");
+    if (!cookies.includes("ttwid")) {
+        // 新cookie不含ttwid，且缓存中有含ttwid的旧cookie时，延长旧缓存继续复用
+        if (cookieCache?.cookies) {
+            cookieCache.startTimestamp += 60 * 60 * 1000;
+            return cookieCache.cookies;
+        }
+    }
+    cookieCache = {
+        startTimestamp: now,
+        cookies,
+    };
     return cookies;
 };

package/lib/index.js

@@ -1,22 +1,8 @@
-import { parse, format } from "node:url";
 import WebSocket from "ws";
 import { TypedEmitter } from "tiny-typed-emitter";
 import { decompressGzip, getXMsStub, getSignature, getUserUniqueId } from "./utils.js";
 import protobuf from "./proto.js";
 import { getCookie } from "./api.js";
-function buildRequestUrl(url) {
-    const parsedUrl = parse(url, true);
-    const existingParams = parsedUrl.query;
-    existingParams["aid"] = "6383";
-    existingParams["device_platform"] = "web";
-    existingParams["browser_language"] = "zh-CN";
-    existingParams["browser_platform"] = "Win32";
-    existingParams["browser_name"] = "Mozilla";
-    existingParams["browser_version"] = "92.0.4515.159";
-    parsedUrl.search = null;
-    parsedUrl.query = existingParams;
-    return format(parsedUrl);
-}
 class DouYinDanmaClient extends TypedEmitter {
     ws;
     roomId;
@@ -51,36 +37,46 @@ class DouYinDanmaClient extends TypedEmitter {
         }
     }
     async connect() {
-        const url = await this.getWsInfo(this.roomId);
-        if (!url) {
-            this.emit("error", new Error("获取抖音弹幕签名失败"));
-            return;
+        try {
+            const url = await this.getWsInfo(this.roomId);
+            if (!url) {
+                throw new Error("获取抖音弹幕签名失败");
+            }
+            this.emit("init", url);
+            const cookies = this.cookie || (await getCookie());
+            this.ws = new WebSocket(url, {
+                headers: {
+                    Cookie: cookies,
+                    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36",
+                    Origin: "https://live.douyin.com",
+                    Referer: "https://live.douyin.com/",
+                },
+            });
+            this.ws.on("open", () => {
+                this.emit("open");
+                this.startHeartbeat();
+                this.startTimeoutCheck();
+            });
+            this.ws.on("message", (data) => {
+                this.lastMessageTime = Date.now();
+                this.decode(data);
+            });
+            this.ws.on("close", () => {
+                this.emit("close");
+                this.reconnect();
+            });
+            this.ws.on("error", (error) => {
+                this.emit("error", error);
+                this.reconnect();
+            });
         }
-        this.emit("init", url);
-        const cookies = this.cookie || (await getCookie());
-        this.ws = new WebSocket(url, {
-            headers: {
-                Cookie: cookies,
-            },
-        });
-        this.ws.on("open", () => {
-            this.reconnectAttempts = 0;
-            this.emit("open");
-            this.startHeartbeat();
-            this.startTimeoutCheck();
-        });
-        this.ws.on("message", (data) => {
-            this.lastMessageTime = Date.now();
-            this.decode(data);
-        });
-        this.ws.on("close", () => {
-            this.emit("close");
-            this.reconnect();
-        });
-        this.ws.on("error", (error) => {
-            this.emit("error", error);
+        catch (err) {
+            // getWsInfo/getCookie 等前置步骤失败时，必须让错误可见并继续重试：
+            // 否则 WebSocket 不会创建，没有任何事件能触发下一次 reconnect，
+            // 弹幕客户端将静默死亡直到录制结束
+            this.emit("error", err);
             this.reconnect();
-        });
+        }
     }
     send(data) {
         if (!this.ws) {
@@ -373,18 +369,37 @@ class DouYinDanmaClient extends TypedEmitter {
             return;
         }
         const webcast5Params = {
+            app_name: "douyin_web",
             room_id: roomId,
             compress: "gzip",
             version_code: String(versionCode),
             webcast_sdk_version: webcastSdkVersion,
+            update_version_code: webcastSdkVersion,
             live_id: "1",
             did_rule: "3",
             user_unique_id: userUniqueId,
             identity: "audience",
             signature: signature.toString(),
+            device_platform: "web",
+            cookie_enabled: "true",
+            screen_width: "1920",
+            screen_height: "1080",
+            browser_language: "zh-CN",
+            browser_platform: "Win32",
+            browser_name: "Mozilla",
+            browser_version: "5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36",
+            browser_online: "true",
+            tz_name: "Etc/GMT-8",
+            host: "https://live.douyin.com",
+            aid: "6383",
+            endpoint: "live_pc",
+            support_wrds: "1",
+            im_path: "/webcast/im/fetch/",
+            need_persist_msg_count: "15",
+            heartbeatDuration: "0",
         };
         const wssUrl = `wss://${this.host}/webcast/im/push/v2/?${new URLSearchParams(webcast5Params).toString()}`;
-        return buildRequestUrl(wssUrl);
+        return wssUrl;
     }
 }
 export default DouYinDanmaClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "douyin-danma-listener",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "douyin danma listener",
   "main": "./lib/index.js",
   "types": "./types/index.d.ts",
@@ -28,7 +28,11 @@
     "弹幕",
     "抖音"
   ],
-  "repository": "https://github.com/renmu123/biliLive-tools/tree/master/packages/DouYinDanma",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/renmu123/biliLive-tools",
+    "directory": "packages/DouYinDanma"
+  },
   "author": "renmu123",
   "license": "GPLV3",
   "dependencies": {
@@ -38,6 +42,7 @@
   },
   "devDependencies": {
     "@types/node": "*",
+    "@types/ws": "^8.5.13",
     "protobufjs-cli": "^1.1.3"
   },
   "scripts": {