douyin-danma-listener 0.2.0 → 0.3.1

package/README.md

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

package/lib/index.js

@@ -26,11 +26,13 @@ class DouYinDanmaClient extends TypedEmitter {
     autoStart;
     autoReconnect;
     reconnectAttempts;
+    reconnectInterval;
     cookie;
     timeoutInterval;
     lastMessageTime;
     timeoutTimer;
     isTimeoutCheckRunning = false;
+    isReconnecting = false;
     constructor(roomId, options = {}) {
         super();
         this.roomId = roomId;
@@ -38,6 +40,7 @@ class DouYinDanmaClient extends TypedEmitter {
         this.autoStart = options.autoStart ?? false;
         this.autoReconnect = options.autoReconnect ?? 10;
         this.reconnectAttempts = 0;
+        this.reconnectInterval = options.reconnectInterval ?? 10000;
         this.cookie = options.cookie;
         this.timeoutInterval = options.timeoutInterval ?? 100000; // 默认100秒
         this.lastMessageTime = Date.now();
@@ -51,6 +54,7 @@ class DouYinDanmaClient extends TypedEmitter {
             this.emit("error", new Error("获取抖音弹幕签名失败"));
             return;
         }
+        this.emit("init", url);
         const cookies = this.cookie || (await getCookie());
         this.ws = new WebSocket(url, {
             headers: {
@@ -58,6 +62,7 @@ class DouYinDanmaClient extends TypedEmitter {
             },
         });
         this.ws.on("open", () => {
+            this.reconnectAttempts = 0;
             this.emit("open");
             this.startHeartbeat();
             this.startTimeoutCheck();
@@ -88,7 +93,9 @@ class DouYinDanmaClient extends TypedEmitter {
         this.reconnectAttempts = this.autoReconnect;
         this.stopHeartbeat();
         this.stopTimeoutCheck();
-        this.ws.close();
+        if (this.ws.readyState === WebSocket.OPEN) {
+            this.ws.close();
+        }
     }
     startHeartbeat() {
         if (this.isHeartbeatRunning) {
@@ -137,12 +144,19 @@ class DouYinDanmaClient extends TypedEmitter {
         }
     }
     reconnect() {
+        if (this.isReconnecting) {
+            return;
+        }
         this.stopHeartbeat();
         this.stopTimeoutCheck();
         if (this.reconnectAttempts < this.autoReconnect) {
+            this.isReconnecting = true;
             this.reconnectAttempts++;
-            this.connect();
-            this.emit("reconnect", this.reconnectAttempts);
+            setTimeout(() => {
+                this.connect();
+                this.isReconnecting = false;
+                this.emit("reconnect", this.reconnectAttempts);
+            }, this.reconnectInterval);
         }
     }
     async handleMessage() { }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "douyin-danma-listener",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "douyin danma listener",
   "main": "./lib/index.js",
   "types": "./types/index.d.ts",

package/types/types.d.ts

@@ -150,13 +150,17 @@ export interface SocialMessage {
 export interface GiftMessage {
   common: Common & { method: "WebcastGiftMessage" };
   user: User;
+  // 这个参数其实差不多是秒级时间戳，并不可靠
   groupId: string;
+  giftId: number;
   gift: Gift;
   publicAreaCommon: PublicAreaCommon;
   trayDisplayText: TrayDisplayText;
   totalCount: string;
   clientGiftSource: number;
   sendTime: string;
+  // repeatEnd 表示礼物连击完毕，这个为1时，sendTime值为秒级时间戳，否则为毫秒级时间戳
+  repeatEnd: null | 1;
 }
 
 export interface RoomUserSeqMessage {