douyin-danma-listener 0.2.1 → 0.4.0

package/README.md

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

package/lib/index.js

@@ -26,11 +26,14 @@ class DouYinDanmaClient extends TypedEmitter {
     autoStart;
     autoReconnect;
     reconnectAttempts;
+    reconnectInterval;
     cookie;
     timeoutInterval;
     lastMessageTime;
     timeoutTimer;
     isTimeoutCheckRunning = false;
+    isReconnecting = false;
+    host;
     constructor(roomId, options = {}) {
         super();
         this.roomId = roomId;
@@ -38,9 +41,11 @@ 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();
+        this.host = options.host ?? "webcast100-ws-web-hl.douyin.com";
         if (this.autoStart) {
             this.connect();
         }
@@ -59,6 +64,7 @@ class DouYinDanmaClient extends TypedEmitter {
             },
         });
         this.ws.on("open", () => {
+            this.reconnectAttempts = 0;
             this.emit("open");
             this.startHeartbeat();
             this.startTimeoutCheck();
@@ -140,12 +146,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() { }
@@ -205,6 +218,14 @@ class DouYinDanmaClient extends TypedEmitter {
         this.emit("roomRank", message);
         this.emit("message", message);
     }
+    async handlePrivilegeScreenChatMessage(message) {
+        this.emit("privilegeScreenChat", message);
+        this.emit("message", message);
+    }
+    async handleScreenChatMessage(message) {
+        this.emit("screenChat", message);
+        this.emit("message", message);
+    }
     /**
      * 处理其他消息
      */
@@ -232,6 +253,10 @@ class DouYinDanmaClient extends TypedEmitter {
         const RoomStatsMessage = protobuf.douyin.RoomStatsMessage;
         // @ts-ignore
         const RoomRankMessage = protobuf.douyin.RoomRankMessage;
+        // @ts-ignore
+        const PrivilegeScreenChatMessage = protobuf.douyin.PrivilegeScreenChatMessage;
+        // @ts-ignore
+        const ScreenChatMessage = protobuf.douyin.ScreenChatMessage;
         const wssPackage = PushFrame.decode(data);
         // @ts-ignore
         const logId = wssPackage.logId;
@@ -298,6 +323,14 @@ class DouYinDanmaClient extends TypedEmitter {
                     const message = RoomRankMessage.decode(msg.payload);
                     this.handleRoomRankMessage(message.toJSON());
                 }
+                else if (msg.method === "WebcastPrivilegeScreenChatMessage") {
+                    const message = PrivilegeScreenChatMessage.decode(msg.payload);
+                    this.handlePrivilegeScreenChatMessage(message.toJSON());
+                }
+                else if (msg.method === "WebcastScreenChatMessage") {
+                    const message = ScreenChatMessage.decode(msg.payload);
+                    this.handleScreenChatMessage(message.toJSON());
+                }
                 else {
                     // WebcastRanklistHourEntranceMessage,WebcastInRoomBannerMessage,WebcastRoomStreamAdaptationMessage
                 }
@@ -315,7 +348,7 @@ class DouYinDanmaClient extends TypedEmitter {
         const userUniqueId = getUserUniqueId();
         // const userUniqueId = "7877922945687137703";
         const versionCode = 180800;
-        const webcastSdkVersion = "1.0.14-beta.0";
+        const webcastSdkVersion = "1.0.15";
         const sigParams = {
             live_id: "1",
             aid: "6383",
@@ -350,7 +383,7 @@ class DouYinDanmaClient extends TypedEmitter {
             identity: "audience",
             signature: signature.toString(),
         };
-        const wssUrl = `wss://webcast5-ws-web-lf.douyin.com/webcast/im/push/v2/?${new URLSearchParams(webcast5Params).toString()}`;
+        const wssUrl = `wss://${this.host}/webcast/im/push/v2/?${new URLSearchParams(webcast5Params).toString()}`;
         return buildRequestUrl(wssUrl);
     }
 }

package/lib/proto.js

@@ -1332,6 +1332,543 @@ export const douyin = ($root.douyin = (() => {
         };
         return ChatMessage;
     })();
+    douyin.PrivilegeScreenChatMessage = (function () {
+        /**
+         * Properties of a PrivilegeScreenChatMessage.
+         * @memberof douyin
+         * @interface IPrivilegeScreenChatMessage
+         * @property {douyin.ICommon|null} [common] PrivilegeScreenChatMessage common
+         * @property {douyin.IUser|null} [user] PrivilegeScreenChatMessage user
+         * @property {string|null} [content] PrivilegeScreenChatMessage content
+         */
+        /**
+         * Constructs a new PrivilegeScreenChatMessage.
+         * @memberof douyin
+         * @classdesc Represents a PrivilegeScreenChatMessage.
+         * @implements IPrivilegeScreenChatMessage
+         * @constructor
+         * @param {douyin.IPrivilegeScreenChatMessage=} [properties] Properties to set
+         */
+        function PrivilegeScreenChatMessage(properties) {
+            if (properties)
+                for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+                    if (properties[keys[i]] != null)
+                        this[keys[i]] = properties[keys[i]];
+        }
+        /**
+         * PrivilegeScreenChatMessage common.
+         * @member {douyin.ICommon|null|undefined} common
+         * @memberof douyin.PrivilegeScreenChatMessage
+         * @instance
+         */
+        PrivilegeScreenChatMessage.prototype.common = null;
+        /**
+         * PrivilegeScreenChatMessage user.
+         * @member {douyin.IUser|null|undefined} user
+         * @memberof douyin.PrivilegeScreenChatMessage
+         * @instance
+         */
+        PrivilegeScreenChatMessage.prototype.user = null;
+        /**
+         * PrivilegeScreenChatMessage content.
+         * @member {string} content
+         * @memberof douyin.PrivilegeScreenChatMessage
+         * @instance
+         */
+        PrivilegeScreenChatMessage.prototype.content = "";
+        /**
+         * Creates a new PrivilegeScreenChatMessage instance using the specified properties.
+         * @function create
+         * @memberof douyin.PrivilegeScreenChatMessage
+         * @static
+         * @param {douyin.IPrivilegeScreenChatMessage=} [properties] Properties to set
+         * @returns {douyin.PrivilegeScreenChatMessage} PrivilegeScreenChatMessage instance
+         */
+        PrivilegeScreenChatMessage.create = function create(properties) {
+            return new PrivilegeScreenChatMessage(properties);
+        };
+        /**
+         * Encodes the specified PrivilegeScreenChatMessage message. Does not implicitly {@link douyin.PrivilegeScreenChatMessage.verify|verify} messages.
+         * @function encode
+         * @memberof douyin.PrivilegeScreenChatMessage
+         * @static
+         * @param {douyin.IPrivilegeScreenChatMessage} message PrivilegeScreenChatMessage message or plain object to encode
+         * @param {$protobuf.Writer} [writer] Writer to encode to
+         * @returns {$protobuf.Writer} Writer
+         */
+        PrivilegeScreenChatMessage.encode = function encode(message, writer) {
+            if (!writer)
+                writer = $Writer.create();
+            if (message.common != null && Object.hasOwnProperty.call(message, "common"))
+                $root.douyin.Common.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/ 10).fork()).ldelim();
+            if (message.user != null && Object.hasOwnProperty.call(message, "user"))
+                $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);
+            return writer;
+        };
+        /**
+         * Encodes the specified PrivilegeScreenChatMessage message, length delimited. Does not implicitly {@link douyin.PrivilegeScreenChatMessage.verify|verify} messages.
+         * @function encodeDelimited
+         * @memberof douyin.PrivilegeScreenChatMessage
+         * @static
+         * @param {douyin.IPrivilegeScreenChatMessage} message PrivilegeScreenChatMessage message or plain object to encode
+         * @param {$protobuf.Writer} [writer] Writer to encode to
+         * @returns {$protobuf.Writer} Writer
+         */
+        PrivilegeScreenChatMessage.encodeDelimited = function encodeDelimited(message, writer) {
+            return this.encode(message, writer).ldelim();
+        };
+        /**
+         * Decodes a PrivilegeScreenChatMessage message from the specified reader or buffer.
+         * @function decode
+         * @memberof douyin.PrivilegeScreenChatMessage
+         * @static
+         * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+         * @param {number} [length] Message length if known beforehand
+         * @returns {douyin.PrivilegeScreenChatMessage} PrivilegeScreenChatMessage
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        PrivilegeScreenChatMessage.decode = function decode(reader, length) {
+            if (!(reader instanceof $Reader))
+                reader = $Reader.create(reader);
+            let end = length === undefined ? reader.len : reader.pos + length, message = new $root.douyin.PrivilegeScreenChatMessage();
+            while (reader.pos < end) {
+                let tag = reader.uint32();
+                switch (tag >>> 3) {
+                    case 1: {
+                        message.common = $root.douyin.Common.decode(reader, reader.uint32());
+                        break;
+                    }
+                    case 2: {
+                        message.user = $root.douyin.User.decode(reader, reader.uint32());
+                        break;
+                    }
+                    case 3: {
+                        message.content = reader.string();
+                        break;
+                    }
+                    default:
+                        reader.skipType(tag & 7);
+                        break;
+                }
+            }
+            return message;
+        };
+        /**
+         * Decodes a PrivilegeScreenChatMessage message from the specified reader or buffer, length delimited.
+         * @function decodeDelimited
+         * @memberof douyin.PrivilegeScreenChatMessage
+         * @static
+         * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+         * @returns {douyin.PrivilegeScreenChatMessage} PrivilegeScreenChatMessage
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        PrivilegeScreenChatMessage.decodeDelimited = function decodeDelimited(reader) {
+            if (!(reader instanceof $Reader))
+                reader = new $Reader(reader);
+            return this.decode(reader, reader.uint32());
+        };
+        /**
+         * Verifies a PrivilegeScreenChatMessage message.
+         * @function verify
+         * @memberof douyin.PrivilegeScreenChatMessage
+         * @static
+         * @param {Object.<string,*>} message Plain object to verify
+         * @returns {string|null} `null` if valid, otherwise the reason why it is not
+         */
+        PrivilegeScreenChatMessage.verify = function verify(message) {
+            if (typeof message !== "object" || message === null)
+                return "object expected";
+            if (message.common != null && message.hasOwnProperty("common")) {
+                let error = $root.douyin.Common.verify(message.common);
+                if (error)
+                    return "common." + error;
+            }
+            if (message.user != null && message.hasOwnProperty("user")) {
+                let error = $root.douyin.User.verify(message.user);
+                if (error)
+                    return "user." + error;
+            }
+            if (message.content != null && message.hasOwnProperty("content"))
+                if (!$util.isString(message.content))
+                    return "content: string expected";
+            return null;
+        };
+        /**
+         * Creates a PrivilegeScreenChatMessage message from a plain object. Also converts values to their respective internal types.
+         * @function fromObject
+         * @memberof douyin.PrivilegeScreenChatMessage
+         * @static
+         * @param {Object.<string,*>} object Plain object
+         * @returns {douyin.PrivilegeScreenChatMessage} PrivilegeScreenChatMessage
+         */
+        PrivilegeScreenChatMessage.fromObject = function fromObject(object) {
+            if (object instanceof $root.douyin.PrivilegeScreenChatMessage)
+                return object;
+            let message = new $root.douyin.PrivilegeScreenChatMessage();
+            if (object.common != null) {
+                if (typeof object.common !== "object")
+                    throw TypeError(".douyin.PrivilegeScreenChatMessage.common: object expected");
+                message.common = $root.douyin.Common.fromObject(object.common);
+            }
+            if (object.user != null) {
+                if (typeof object.user !== "object")
+                    throw TypeError(".douyin.PrivilegeScreenChatMessage.user: object expected");
+                message.user = $root.douyin.User.fromObject(object.user);
+            }
+            if (object.content != null)
+                message.content = String(object.content);
+            return message;
+        };
+        /**
+         * Creates a plain object from a PrivilegeScreenChatMessage message. Also converts values to other types if specified.
+         * @function toObject
+         * @memberof douyin.PrivilegeScreenChatMessage
+         * @static
+         * @param {douyin.PrivilegeScreenChatMessage} message PrivilegeScreenChatMessage
+         * @param {$protobuf.IConversionOptions} [options] Conversion options
+         * @returns {Object.<string,*>} Plain object
+         */
+        PrivilegeScreenChatMessage.toObject = function toObject(message, options) {
+            if (!options)
+                options = {};
+            let object = {};
+            if (options.defaults) {
+                object.common = null;
+                object.user = null;
+                object.content = "";
+            }
+            if (message.common != null && message.hasOwnProperty("common"))
+                object.common = $root.douyin.Common.toObject(message.common, options);
+            if (message.user != null && message.hasOwnProperty("user"))
+                object.user = $root.douyin.User.toObject(message.user, options);
+            if (message.content != null && message.hasOwnProperty("content"))
+                object.content = message.content;
+            return object;
+        };
+        /**
+         * Converts this PrivilegeScreenChatMessage to JSON.
+         * @function toJSON
+         * @memberof douyin.PrivilegeScreenChatMessage
+         * @instance
+         * @returns {Object.<string,*>} JSON object
+         */
+        PrivilegeScreenChatMessage.prototype.toJSON = function toJSON() {
+            return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
+        };
+        /**
+         * Gets the default type url for PrivilegeScreenChatMessage
+         * @function getTypeUrl
+         * @memberof douyin.PrivilegeScreenChatMessage
+         * @static
+         * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns {string} The default type url
+         */
+        PrivilegeScreenChatMessage.getTypeUrl = function getTypeUrl(typeUrlPrefix) {
+            if (typeUrlPrefix === undefined) {
+                typeUrlPrefix = "type.googleapis.com";
+            }
+            return typeUrlPrefix + "/douyin.PrivilegeScreenChatMessage";
+        };
+        return PrivilegeScreenChatMessage;
+    })();
+    douyin.ScreenChatMessage = (function () {
+        /**
+         * Properties of a ScreenChatMessage.
+         * @memberof douyin
+         * @interface IScreenChatMessage
+         * @property {douyin.ICommon|null} [common] ScreenChatMessage common
+         * @property {douyin.IUser|null} [user] ScreenChatMessage user
+         * @property {string|null} [content] ScreenChatMessage content
+         * @property {number|Long|null} [eventTime] ScreenChatMessage eventTime
+         */
+        /**
+         * Constructs a new ScreenChatMessage.
+         * @memberof douyin
+         * @classdesc Represents a ScreenChatMessage.
+         * @implements IScreenChatMessage
+         * @constructor
+         * @param {douyin.IScreenChatMessage=} [properties] Properties to set
+         */
+        function ScreenChatMessage(properties) {
+            if (properties)
+                for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+                    if (properties[keys[i]] != null)
+                        this[keys[i]] = properties[keys[i]];
+        }
+        /**
+         * ScreenChatMessage common.
+         * @member {douyin.ICommon|null|undefined} common
+         * @memberof douyin.ScreenChatMessage
+         * @instance
+         */
+        ScreenChatMessage.prototype.common = null;
+        /**
+         * ScreenChatMessage user.
+         * @member {douyin.IUser|null|undefined} user
+         * @memberof douyin.ScreenChatMessage
+         * @instance
+         */
+        ScreenChatMessage.prototype.user = null;
+        /**
+         * ScreenChatMessage content.
+         * @member {string} content
+         * @memberof douyin.ScreenChatMessage
+         * @instance
+         */
+        ScreenChatMessage.prototype.content = "";
+        /**
+         * ScreenChatMessage eventTime.
+         * @member {number|Long} eventTime
+         * @memberof douyin.ScreenChatMessage
+         * @instance
+         */
+        ScreenChatMessage.prototype.eventTime = $util.Long ? $util.Long.fromBits(0, 0, true) : 0;
+        /**
+         * Creates a new ScreenChatMessage instance using the specified properties.
+         * @function create
+         * @memberof douyin.ScreenChatMessage
+         * @static
+         * @param {douyin.IScreenChatMessage=} [properties] Properties to set
+         * @returns {douyin.ScreenChatMessage} ScreenChatMessage instance
+         */
+        ScreenChatMessage.create = function create(properties) {
+            return new ScreenChatMessage(properties);
+        };
+        /**
+         * Encodes the specified ScreenChatMessage message. Does not implicitly {@link douyin.ScreenChatMessage.verify|verify} messages.
+         * @function encode
+         * @memberof douyin.ScreenChatMessage
+         * @static
+         * @param {douyin.IScreenChatMessage} message ScreenChatMessage message or plain object to encode
+         * @param {$protobuf.Writer} [writer] Writer to encode to
+         * @returns {$protobuf.Writer} Writer
+         */
+        ScreenChatMessage.encode = function encode(message, writer) {
+            if (!writer)
+                writer = $Writer.create();
+            if (message.common != null && Object.hasOwnProperty.call(message, "common"))
+                $root.douyin.Common.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/ 10).fork()).ldelim();
+            if (message.user != null && Object.hasOwnProperty.call(message, "user"))
+                $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 4, wireType 2 =*/ 34).string(message.content);
+            if (message.eventTime != null && Object.hasOwnProperty.call(message, "eventTime"))
+                writer.uint32(/* id 12, wireType 0 =*/ 96).uint64(message.eventTime);
+            return writer;
+        };
+        /**
+         * Encodes the specified ScreenChatMessage message, length delimited. Does not implicitly {@link douyin.ScreenChatMessage.verify|verify} messages.
+         * @function encodeDelimited
+         * @memberof douyin.ScreenChatMessage
+         * @static
+         * @param {douyin.IScreenChatMessage} message ScreenChatMessage message or plain object to encode
+         * @param {$protobuf.Writer} [writer] Writer to encode to
+         * @returns {$protobuf.Writer} Writer
+         */
+        ScreenChatMessage.encodeDelimited = function encodeDelimited(message, writer) {
+            return this.encode(message, writer).ldelim();
+        };
+        /**
+         * Decodes a ScreenChatMessage message from the specified reader or buffer.
+         * @function decode
+         * @memberof douyin.ScreenChatMessage
+         * @static
+         * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+         * @param {number} [length] Message length if known beforehand
+         * @returns {douyin.ScreenChatMessage} ScreenChatMessage
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        ScreenChatMessage.decode = function decode(reader, length) {
+            if (!(reader instanceof $Reader))
+                reader = $Reader.create(reader);
+            let end = length === undefined ? reader.len : reader.pos + length, message = new $root.douyin.ScreenChatMessage();
+            while (reader.pos < end) {
+                let tag = reader.uint32();
+                switch (tag >>> 3) {
+                    case 1: {
+                        message.common = $root.douyin.Common.decode(reader, reader.uint32());
+                        break;
+                    }
+                    case 2: {
+                        message.user = $root.douyin.User.decode(reader, reader.uint32());
+                        break;
+                    }
+                    case 4: {
+                        message.content = reader.string();
+                        break;
+                    }
+                    case 12: {
+                        message.eventTime = reader.uint64();
+                        break;
+                    }
+                    default:
+                        reader.skipType(tag & 7);
+                        break;
+                }
+            }
+            return message;
+        };
+        /**
+         * Decodes a ScreenChatMessage message from the specified reader or buffer, length delimited.
+         * @function decodeDelimited
+         * @memberof douyin.ScreenChatMessage
+         * @static
+         * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+         * @returns {douyin.ScreenChatMessage} ScreenChatMessage
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        ScreenChatMessage.decodeDelimited = function decodeDelimited(reader) {
+            if (!(reader instanceof $Reader))
+                reader = new $Reader(reader);
+            return this.decode(reader, reader.uint32());
+        };
+        /**
+         * Verifies a ScreenChatMessage message.
+         * @function verify
+         * @memberof douyin.ScreenChatMessage
+         * @static
+         * @param {Object.<string,*>} message Plain object to verify
+         * @returns {string|null} `null` if valid, otherwise the reason why it is not
+         */
+        ScreenChatMessage.verify = function verify(message) {
+            if (typeof message !== "object" || message === null)
+                return "object expected";
+            if (message.common != null && message.hasOwnProperty("common")) {
+                let error = $root.douyin.Common.verify(message.common);
+                if (error)
+                    return "common." + error;
+            }
+            if (message.user != null && message.hasOwnProperty("user")) {
+                let error = $root.douyin.User.verify(message.user);
+                if (error)
+                    return "user." + error;
+            }
+            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;
+        };
+        /**
+         * Creates a ScreenChatMessage message from a plain object. Also converts values to their respective internal types.
+         * @function fromObject
+         * @memberof douyin.ScreenChatMessage
+         * @static
+         * @param {Object.<string,*>} object Plain object
+         * @returns {douyin.ScreenChatMessage} ScreenChatMessage
+         */
+        ScreenChatMessage.fromObject = function fromObject(object) {
+            if (object instanceof $root.douyin.ScreenChatMessage)
+                return object;
+            let message = new $root.douyin.ScreenChatMessage();
+            if (object.common != null) {
+                if (typeof object.common !== "object")
+                    throw TypeError(".douyin.ScreenChatMessage.common: object expected");
+                message.common = $root.douyin.Common.fromObject(object.common);
+            }
+            if (object.user != null) {
+                if (typeof object.user !== "object")
+                    throw TypeError(".douyin.ScreenChatMessage.user: object expected");
+                message.user = $root.douyin.User.fromObject(object.user);
+            }
+            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;
+        };
+        /**
+         * Creates a plain object from a ScreenChatMessage message. Also converts values to other types if specified.
+         * @function toObject
+         * @memberof douyin.ScreenChatMessage
+         * @static
+         * @param {douyin.ScreenChatMessage} message ScreenChatMessage
+         * @param {$protobuf.IConversionOptions} [options] Conversion options
+         * @returns {Object.<string,*>} Plain object
+         */
+        ScreenChatMessage.toObject = function toObject(message, options) {
+            if (!options)
+                options = {};
+            let object = {};
+            if (options.defaults) {
+                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);
+            if (message.user != null && message.hasOwnProperty("user"))
+                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;
+        };
+        /**
+         * Converts this ScreenChatMessage to JSON.
+         * @function toJSON
+         * @memberof douyin.ScreenChatMessage
+         * @instance
+         * @returns {Object.<string,*>} JSON object
+         */
+        ScreenChatMessage.prototype.toJSON = function toJSON() {
+            return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
+        };
+        /**
+         * Gets the default type url for ScreenChatMessage
+         * @function getTypeUrl
+         * @memberof douyin.ScreenChatMessage
+         * @static
+         * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns {string} The default type url
+         */
+        ScreenChatMessage.getTypeUrl = function getTypeUrl(typeUrlPrefix) {
+            if (typeUrlPrefix === undefined) {
+                typeUrlPrefix = "type.googleapis.com";
+            }
+            return typeUrlPrefix + "/douyin.ScreenChatMessage";
+        };
+        return ScreenChatMessage;
+    })();
     douyin.LandscapeAreaCommon = (function () {
         /**
          * Properties of a LandscapeAreaCommon.

package/package.json

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

package/types/index.d.ts

@@ -9,6 +9,8 @@ import type {
   RoomStatsMessage,
   RoomRankMessage,
   Message,
+  PrivilegeScreenChatMessage,
+  ScreenChatMessage,
 } from "../types/types.js";
 import WebSocket from "ws";
 
@@ -27,6 +29,8 @@ interface Events {
   roomStats: (message: RoomStatsMessage) => void;
   roomRank: (message: RoomRankMessage) => void;
   message: (message: Message) => void;
+  privilegeScreenChat: (message: PrivilegeScreenChatMessage) => void;
+  screenChat: (message: ScreenChatMessage) => void;
 }
 declare class DouYinDanmaClient extends TypedEmitter<Events> {
   private ws: WebSocket;

package/types/types.d.ts

@@ -150,7 +150,9 @@ export interface SocialMessage {
 export interface GiftMessage {
   common: Common & { method: "WebcastGiftMessage" };
   user: User;
+  // 这个参数其实差不多是秒级时间戳，并不可靠
   groupId: string;
+  giftId: number;
   gift: Gift;
   publicAreaCommon: PublicAreaCommon;
   trayDisplayText: TrayDisplayText;
@@ -190,6 +192,19 @@ export interface RoomRankMessage {
   }[];
 }
 
+export interface PrivilegeScreenChatMessage {
+  common: Common & { method: "WebcastPrivilegeScreenChatMessage" };
+  user: User;
+  content: string;
+}
+
+export interface ScreenChatMessage {
+  common: Common & { method: "WebcastScreenChatMessage" };
+  user: User;
+  content: string;
+  eventTime: string;
+}
+
 export type Message =
   | ChatMessage
   | MemberMessage
@@ -198,4 +213,6 @@ export type Message =
   | GiftMessage
   | RoomUserSeqMessage
   | RoomStatsMessage
-  | RoomRankMessage;
+  | RoomRankMessage
+  | PrivilegeScreenChatMessage
+  | ScreenChatMessage;