douyin-danma-listener 0.1.1 → 0.2.0

package/README.md

@@ -29,8 +29,9 @@ client.connect();
 
 - `autoStart` (boolean): 是否自动开始连接，默认为 `false`
 - `autoReconnect` (number): 自动重连次数，默认为 `3`
-- `heartbeatInterval` (number): 心跳包发送间隔，单位为毫秒，默认为 `5000`
+- `heartbeatInterval` (number): 心跳包发送间隔，单位为毫秒，默认为 `10000`
 - `cookie` (string): 可选的 Cookie 字符串，某些直播间可能需要？
+- `timeoutInterval` (number): 没有数据返回但`ws`未被主动关闭时超时后重新连接，单位为秒，默认`100`
 
 ## 事件
 

package/lib/index.js

@@ -22,18 +22,25 @@ class DouYinDanmaClient extends TypedEmitter {
     roomId;
     heartbeatInterval;
     heartbeatTimer;
+    isHeartbeatRunning = false;
     autoStart;
     autoReconnect;
     reconnectAttempts;
     cookie;
+    timeoutInterval;
+    lastMessageTime;
+    timeoutTimer;
+    isTimeoutCheckRunning = false;
     constructor(roomId, options = {}) {
         super();
         this.roomId = roomId;
-        this.heartbeatInterval = options.heartbeatInterval ?? 5000;
+        this.heartbeatInterval = options.heartbeatInterval ?? 10000;
         this.autoStart = options.autoStart ?? false;
         this.autoReconnect = options.autoReconnect ?? 10;
         this.reconnectAttempts = 0;
         this.cookie = options.cookie;
+        this.timeoutInterval = options.timeoutInterval ?? 100000; // 默认100秒
+        this.lastMessageTime = Date.now();
         if (this.autoStart) {
             this.connect();
         }
@@ -44,7 +51,7 @@ class DouYinDanmaClient extends TypedEmitter {
             this.emit("error", new Error("获取抖音弹幕签名失败"));
             return;
         }
-        const cookies = this.cookie ?? (await getCookie());
+        const cookies = this.cookie || (await getCookie());
         this.ws = new WebSocket(url, {
             headers: {
                 Cookie: cookies,
@@ -53,27 +60,19 @@ class DouYinDanmaClient extends TypedEmitter {
         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.stopHeartbeat();
-            if (this.reconnectAttempts < this.autoReconnect) {
-                this.reconnectAttempts++;
-                this.connect();
-                this.emit("reconnect", this.reconnectAttempts);
-            }
+            this.reconnect();
         });
         this.ws.on("error", (error) => {
             this.emit("error", error);
-            this.stopHeartbeat();
-            if (this.reconnectAttempts < this.autoReconnect) {
-                this.reconnectAttempts++;
-                this.connect();
-                this.emit("reconnect", this.reconnectAttempts);
-            }
+            this.reconnect();
         });
     }
     send(data) {
@@ -87,16 +86,64 @@ class DouYinDanmaClient extends TypedEmitter {
             return;
         }
         this.reconnectAttempts = this.autoReconnect;
+        this.stopHeartbeat();
+        this.stopTimeoutCheck();
         this.ws.close();
     }
     startHeartbeat() {
+        if (this.isHeartbeatRunning) {
+            return;
+        }
+        this.stopHeartbeat();
+        this.isHeartbeatRunning = true;
         this.heartbeatTimer = setInterval(() => {
-            this.emit("heartbeat");
-            this.send(":\x02hb");
+            if (this.ws.readyState === WebSocket.OPEN) {
+                this.emit("heartbeat");
+                this.send(":\x02hb");
+            }
+            else {
+                console.log("连接未就绪，当前状态:", this.ws.readyState);
+            }
         }, this.heartbeatInterval);
     }
     stopHeartbeat() {
-        clearInterval(this.heartbeatTimer);
+        if (this.heartbeatTimer) {
+            clearInterval(this.heartbeatTimer);
+            this.isHeartbeatRunning = false;
+        }
+    }
+    startTimeoutCheck() {
+        if (this.isTimeoutCheckRunning) {
+            return;
+        }
+        this.stopTimeoutCheck();
+        this.isTimeoutCheckRunning = true;
+        // 重置最后消息时间，给连接一些初始化时间
+        this.lastMessageTime = Date.now();
+        this.timeoutTimer = setInterval(() => {
+            const now = Date.now();
+            if (now - this.lastMessageTime > this.timeoutInterval) {
+                console.log("No message received for too long, reconnecting...");
+                // 在重连前重置时间，避免立即触发下一次重连
+                this.lastMessageTime = now;
+                this.reconnect();
+            }
+        }, 1000);
+    }
+    stopTimeoutCheck() {
+        if (this.timeoutTimer) {
+            clearInterval(this.timeoutTimer);
+            this.isTimeoutCheckRunning = false;
+        }
+    }
+    reconnect() {
+        this.stopHeartbeat();
+        this.stopTimeoutCheck();
+        if (this.reconnectAttempts < this.autoReconnect) {
+            this.reconnectAttempts++;
+            this.connect();
+            this.emit("reconnect", this.reconnectAttempts);
+        }
     }
     async handleMessage() { }
     /**

package/lib/proto.js

@@ -1046,6 +1046,7 @@ export const douyin = ($root.douyin = (() => {
          * @property {douyin.ICommon|null} [common] ChatMessage common
          * @property {douyin.IUser|null} [user] ChatMessage user
          * @property {string|null} [content] ChatMessage content
+         * @property {number|Long|null} [eventTime] ChatMessage eventTime
          */
         /**
          * Constructs a new ChatMessage.
@@ -1082,6 +1083,13 @@ export const douyin = ($root.douyin = (() => {
          * @instance
          */
         ChatMessage.prototype.content = "";
+        /**
+         * ChatMessage eventTime.
+         * @member {number|Long} eventTime
+         * @memberof douyin.ChatMessage
+         * @instance
+         */
+        ChatMessage.prototype.eventTime = $util.Long ? $util.Long.fromBits(0, 0, true) : 0;
         /**
          * Creates a new ChatMessage instance using the specified properties.
          * @function create
@@ -1111,6 +1119,8 @@ export const douyin = ($root.douyin = (() => {
                 $root.douyin.User.encode(message.user, writer.uint32(/* id 2, wireType 2 =*/ 18).fork()).ldelim();
             if (message.content != null && Object.hasOwnProperty.call(message, "content"))
                 writer.uint32(/* id 3, wireType 2 =*/ 26).string(message.content);
+            if (message.eventTime != null && Object.hasOwnProperty.call(message, "eventTime"))
+                writer.uint32(/* id 15, wireType 0 =*/ 120).uint64(message.eventTime);
             return writer;
         };
         /**
@@ -1155,6 +1165,10 @@ export const douyin = ($root.douyin = (() => {
                         message.content = reader.string();
                         break;
                     }
+                    case 15: {
+                        message.eventTime = reader.uint64();
+                        break;
+                    }
                     default:
                         reader.skipType(tag & 7);
                         break;
@@ -1201,6 +1215,12 @@ export const douyin = ($root.douyin = (() => {
             if (message.content != null && message.hasOwnProperty("content"))
                 if (!$util.isString(message.content))
                     return "content: string expected";
+            if (message.eventTime != null && message.hasOwnProperty("eventTime"))
+                if (!$util.isInteger(message.eventTime) &&
+                    !(message.eventTime &&
+                        $util.isInteger(message.eventTime.low) &&
+                        $util.isInteger(message.eventTime.high)))
+                    return "eventTime: integer|Long expected";
             return null;
         };
         /**
@@ -1227,6 +1247,15 @@ export const douyin = ($root.douyin = (() => {
             }
             if (object.content != null)
                 message.content = String(object.content);
+            if (object.eventTime != null)
+                if ($util.Long)
+                    (message.eventTime = $util.Long.fromValue(object.eventTime)).unsigned = true;
+                else if (typeof object.eventTime === "string")
+                    message.eventTime = parseInt(object.eventTime, 10);
+                else if (typeof object.eventTime === "number")
+                    message.eventTime = object.eventTime;
+                else if (typeof object.eventTime === "object")
+                    message.eventTime = new $util.LongBits(object.eventTime.low >>> 0, object.eventTime.high >>> 0).toNumber(true);
             return message;
         };
         /**
@@ -1246,6 +1275,17 @@ export const douyin = ($root.douyin = (() => {
                 object.common = null;
                 object.user = null;
                 object.content = "";
+                if ($util.Long) {
+                    let long = new $util.Long(0, 0, true);
+                    object.eventTime =
+                        options.longs === String
+                            ? long.toString()
+                            : options.longs === Number
+                                ? long.toNumber()
+                                : long;
+                }
+                else
+                    object.eventTime = options.longs === String ? "0" : 0;
             }
             if (message.common != null && message.hasOwnProperty("common"))
                 object.common = $root.douyin.Common.toObject(message.common, options);
@@ -1253,6 +1293,17 @@ export const douyin = ($root.douyin = (() => {
                 object.user = $root.douyin.User.toObject(message.user, options);
             if (message.content != null && message.hasOwnProperty("content"))
                 object.content = message.content;
+            if (message.eventTime != null && message.hasOwnProperty("eventTime"))
+                if (typeof message.eventTime === "number")
+                    object.eventTime =
+                        options.longs === String ? String(message.eventTime) : message.eventTime;
+                else
+                    object.eventTime =
+                        options.longs === String
+                            ? $util.Long.prototype.toString.call(message.eventTime)
+                            : options.longs === Number
+                                ? new $util.LongBits(message.eventTime.low >>> 0, message.eventTime.high >>> 0).toNumber(true)
+                                : message.eventTime;
             return object;
         };
         /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "douyin-danma-listener",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "douyin danma listener",
   "main": "./lib/index.js",
   "types": "./types/index.d.ts",
@@ -43,6 +43,6 @@
   "scripts": {
     "build": "tsc",
     "watch": "tsc -w",
-    "gen:proto": "pbjs -t static-module -w es6 -o src/danma/proto.js src/danma/dy.proto"
+    "gen:proto": "pbjs -t static-module -w es6 -o src/proto.js src/dy.proto"
   }
 }

package/types/types.d.ts

@@ -111,6 +111,8 @@ export interface ChatMessage {
   common: Common & { method: "WebcastChatMessage" };
   user: User;
   content: string;
+  /** 秒级时间戳 */
+  eventTime: string;
   // giftImage: {
   //   urlListList: string[];
   //   width: string;