floating-live 0.11.2 → 0.12.1

package/index.d.ts

@@ -3,3 +3,4 @@ export * from "./src/types";
 export * from "./src/enum";
 export * from "./src/lib/LiveRoom";
 export * from "./src/lib/Reglist";
+export * from "./src/utils";

package/index.js

@@ -21,3 +21,4 @@ __exportStar(require("./src/types"), exports);
 __exportStar(require("./src/enum"), exports);
 __exportStar(require("./src/lib/LiveRoom"), exports);
 __exportStar(require("./src/lib/Reglist"), exports);
+__exportStar(require("./src/utils"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "floating-live",
-  "version": "0.11.2",
+  "version": "0.12.1",
   "type": "commonjs",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,7 +17,7 @@
   "dependencies": {
     "acfun-live-danmaku": "^0.6.1",
     "axios": "^1.4.0",
-    "bilibili-live-ws": "^6.0.3",
+    "bilibili-live-ws": "^6.3.1",
     "fs-extra": "^11.1.0"
   },
   "devDependencies": {

package/plugin/acfun/acfunLive.d.ts

@@ -1,6 +1,7 @@
+import { RoomDetail } from "./../../src/lib/LiveRoom";
 import { MedalInfo, UserInfo } from "../..";
 import AcClient from "acfun-live-danmaku/client";
-import { LiveRoom, RoomStatsInfo, RoomViewInfo } from "../..";
+import { LiveRoom, RoomStatsInfo } from "../..";
 declare type ZtLiveUserInfo = {
     userIdentity: {
         managerType?: number;
@@ -20,7 +21,7 @@ declare class acfunLive extends LiveRoom {
     /** 房间id */
     readonly id: number;
     /** 直播展示信息 */
-    view: RoomViewInfo;
+    detail: RoomDetail;
     /** 直播数据信息 */
     stats: RoomStatsInfo;
     /** 主播信息 */

package/plugin/acfun/acfunLive.js

@@ -24,7 +24,7 @@ class acfunLive extends __1.LiveRoom {
         /** 平台id */
         this.platform = "acfun";
         /** 直播展示信息 */
-        this.view = {
+        this.detail = {
             /** 直播标题 */
             title: "",
             /** 分区 */
@@ -60,18 +60,17 @@ class acfunLive extends __1.LiveRoom {
     get available() {
         return Boolean(this.client);
     }
-    ;
     async getInfo() {
         if (!this.client) {
-            this.client = await (0, acfun_live_danmaku_1.default)(this.id) || null;
+            this.client = (await (0, acfun_live_danmaku_1.default)(this.id)) || null;
             if (this.client) {
                 this.status = __2.RoomStatus.live;
                 this.timestamp = this.client.liveStartTime;
-                this.view.title = this.client.caption; // bug
-                this.view.cover = `https://tx2.a.kwimgs.com/bs2/ztlc/cover_${this.client.liveId}_raw.jpg`;
+                this.detail.title = this.client.caption; // bug
+                this.detail.cover = `https://tx2.a.kwimgs.com/bs2/ztlc/cover_${this.client.liveId}_raw.jpg`;
             }
             await fetch(`https://live.acfun.cn/rest/pc-direct/user/userInfo?userId=${this.id}`, {
-                method: "GET"
+                method: "GET",
             })
                 .then((response) => response.json())
                 .then((res) => {
@@ -114,13 +113,26 @@ class acfunLive extends __1.LiveRoom {
             //收到的弹幕
             this.msg_Comment(danmaku);
         });
-        client.on("Gift", (gift) => { this.msg_Gift(gift); });
-        client.on("UserEnterRoom", (entry) => { this.msg_Interact(entry, "entry"); });
-        client.on("Like", (like) => { this.msg_Interact(like, "like"); });
-        // client.on("JoinClub", (join: any) => { this.msg_Interact(join, "join"); });
-        client.on("DisplayInfo", (info) => { this.msg_DisplayInfo(info); });
-        client.on("LiveClosed", (end) => { this.msg_LiveClosed(); });
-        client.on("LiveBanned", (end) => { this.msg_LiveBanned(); });
+        client.on("Gift", (msg) => {
+            this.msg_Gift(msg);
+        });
+        client.on("UserEnterRoom", (msg) => {
+            this.msg_Interact(msg, "entry");
+        });
+        client.on("Like", (msg) => {
+            this.msg_Interact(msg, "like");
+        });
+        // client.on("UserFollowAuthor", (join: any) => { this.msg_Interact(msg, "follow"); });
+        // client.on("JoinClub", (msg: any) => { this.msg_Interact(msg, "join"); });
+        client.on("DisplayInfo", (msg) => {
+            this.msg_DisplayInfo(msg);
+        });
+        client.on("LiveClosed", (msg) => {
+            this.msg_LiveClosed();
+        });
+        client.on("LiveBanned", (msg) => {
+            this.msg_LiveBanned();
+        });
         this.wsInit = true;
     }
     /** 关闭直播间监听 */
@@ -135,7 +147,6 @@ class acfunLive extends __1.LiveRoom {
         this.close();
         this.removeAllListeners();
     }
-    ;
     /** 根据守护徽章字符串获取粉丝牌信息 */
     getMedal(badge) {
         if (badge) {
@@ -151,44 +162,48 @@ class acfunLive extends __1.LiveRoom {
         }
     }
     getUser(user) {
-        let identity = null;
+        let identity = 0;
         if (user.userIdentity?.managerType == 1) {
-            identity = __2.UserAdmin.admin;
+            identity = __2.UserType.admin;
         }
         else if (parseInt(user.userId) == this.anchor.id) {
-            identity = __2.UserAdmin.anchor;
+            identity = __2.UserType.anchor;
         }
         return {
             name: user.nickname,
             id: parseInt(user.userId),
             medal: this.getMedal(user.badge),
             avatar: user.avatar[0].url,
-            admin: identity
+            type: identity,
         };
     }
     /** 文本信息(Comment) */
     msg_Comment(data) {
-        let danmaku = {
+        const userInfo = this.getUser(data.userInfo);
+        let m = {
             platform: "acfun",
             room: this.id,
+            id: `${userInfo.id}-${data.sendTimeMs}`,
             timestamp: parseInt(data.sendTimeMs),
             type: "chat",
             info: {
                 content: data.content,
-                user: this.getUser(data.userInfo),
+                user: userInfo,
             },
         };
-        this.emitMsg(danmaku);
+        this.emitMsg(m);
     }
     /** 礼物信息(Gift) */
     msg_Gift(data) {
-        let gift = {
+        const userInfo = this.getUser(data.user);
+        let m = {
             platform: "acfun",
             room: this.id,
             type: "gift",
+            id: `${userInfo.id}-${data.sendTimeMs}`,
             timestamp: parseInt(data.sendTimeMs),
             info: {
-                user: this.getUser(data.user),
+                user: userInfo,
                 gift: {
                     name: data.giftName,
                     id: parseInt(data.giftId),
@@ -198,59 +213,67 @@ class acfunLive extends __1.LiveRoom {
                 },
             },
         };
-        this.emitMsg(gift);
+        this.emitMsg(m);
     }
     /** 互动信息 */
     msg_Interact(data, type) {
-        let like = {
+        const userInfo = this.getUser(data.userInfo);
+        let m = {
             platform: "acfun",
             room: this.id,
             type: type,
+            id: `${userInfo.id}-${data.sendTimeMs}`,
             timestamp: parseInt(data.sendTimeMs),
             info: {
-                user: this.getUser(data.userInfo),
+                user: userInfo,
             },
         };
-        this.emitMsg(like);
+        this.emitMsg(m);
     }
     msg_LiveClosed() {
-        let off = {
+        const timestamp = getDateTimestamp();
+        let m = {
             platform: "acfun",
             room: this.id,
             type: "live_end",
-            timestamp: getDateTimestamp(),
+            id: `${timestamp}`,
+            timestamp: timestamp,
             info: {
-                status: __2.RoomStatus.off
-            }
+                status: __2.RoomStatus.off,
+            },
         };
         this.client = null;
-        this.emitMsg(off);
+        this.emitMsg(m);
     }
     msg_LiveBanned() {
-        let cut = {
+        const timestamp = getDateTimestamp();
+        let m = {
             platform: "acfun",
             room: this.id,
             type: "live_cut",
-            timestamp: getDateTimestamp(),
+            id: `${timestamp}`,
+            timestamp: timestamp,
             info: {
-                message: ""
-            }
+                message: "",
+            },
         };
         this.client = null;
-        this.emitMsg(cut);
+        this.emitMsg(m);
     }
     msg_DisplayInfo(data) {
-        let stats = {
+        const timestamp = getDateTimestamp();
+        let m = {
             platform: "acfun",
             room: this.id,
             type: "live_stats",
-            timestamp: getDateTimestamp(),
+            id: `${timestamp}`,
+            timestamp: timestamp,
             info: {
                 like: stringToNumber(data.likeCount),
                 online: stringToNumber(data.watchingCount),
-            }
+            },
         };
-        this.emitMsg(stats);
+        this.emitMsg(m);
     }
 }
 exports.default = acfunLive;

package/plugin/bilibili/bilibiliLive.d.ts

@@ -1,6 +1,6 @@
 import { UserInfo } from "../..";
 import { KeepLiveWS } from "bilibili-live-ws";
-import { LiveRoom, RoomStatsInfo, RoomViewInfo } from "../..";
+import { LiveRoom, RoomStatsInfo, RoomDetail } from "../..";
 declare class bilibiliLive extends LiveRoom {
     /** 平台id */
     readonly platform: string;
@@ -8,8 +8,8 @@ declare class bilibiliLive extends LiveRoom {
     readonly id: number;
     /** 直播间room_id */
     roomid: number;
-    /** 展示信息 */
-    view: RoomViewInfo;
+    /** 房间信息 */
+    detail: RoomDetail;
     stats: RoomStatsInfo;
     /** 房间是否可用 */
     available: boolean;
@@ -27,7 +27,7 @@ declare class bilibiliLive extends LiveRoom {
         connectInterval: number;
     });
     /** 获取房间信息 */
-    getInfo(refresh?: boolean): Promise<void>;
+    getInfo(): Promise<void>;
     /** 开启直播间监听 */
     open(): Promise<void>;
     /** 连接直播服务端 */
@@ -48,6 +48,7 @@ declare class bilibiliLive extends LiveRoom {
     msg_WATCHED_CHANGE(msg: any): void;
     /** 点赞数变化 */
     msg_LIKE_INFO_V3_UPDATE(msg: any): void;
+    msg_ONLINE_RANK_COUNT(msg: any): void;
     msg_ROOM_BLOCK_MSG(msg: any): void;
     msg_LIVE(msg: any): void;
     msg_CUT_OFF(msg: any): void;

package/plugin/bilibili/bilibiliLive.js

@@ -8,6 +8,16 @@ const __2 = require("../..");
 function getDateTimestamp() {
     return Math.floor(Date.now() / 1000) * 1000;
 }
+function getRoomStatus(s) {
+    switch (s) {
+        case 1:
+            return __1.RoomStatus.live;
+        case 2:
+            return __1.RoomStatus.round;
+        default:
+            return __1.RoomStatus.off;
+    }
+}
 class bilibiliLive extends __2.LiveRoom {
     constructor(id, // 房间id
     open = false, // 生成房间后是否打开
@@ -17,8 +27,8 @@ class bilibiliLive extends __2.LiveRoom {
         this.platform = "bilibili";
         /** 直播间room_id */
         this.roomid = 0;
-        /** 展示信息 */
-        this.view = {
+        /** 房间信息 */
+        this.detail = {
             /** 直播标题 */
             title: "",
             /** 分区 */
@@ -50,19 +60,24 @@ class bilibiliLive extends __2.LiveRoom {
         }
     }
     /** 获取房间信息 */
-    async getInfo(refresh) {
+    async getInfo() {
         await fetch(`https://api.live.bilibili.com/xlive/web-room/v1/index/getInfoByRoom?room_id=${this.id}`, {
-            method: "GET"
+            method: "GET",
         }) // 获取直播间信息
             .then((response) => response.json())
             .then((res) => {
             const { room_info, anchor_info, like_info_v3, watched_show } = res.data;
             this.roomid = room_info.room_id;
-            this.status = room_info.live_status == 1 ? __1.RoomStatus.live : __1.RoomStatus.off;
-            this.timestamp = this.status == __1.RoomStatus.live ? room_info.live_start_time * 1000 : refresh ? Date.now() : this.timestamp;
-            this.view.title = room_info.title;
-            this.view.area = [room_info.parent_area_name, room_info.area_name];
-            this.view.cover = room_info.cover;
+            this.status = room_info.lock_status
+                ? __1.RoomStatus.banned
+                : getRoomStatus(room_info.live_status);
+            this.timestamp =
+                this.status == __1.RoomStatus.live
+                    ? room_info.live_start_time * 1000
+                    : this.timestamp;
+            this.detail.title = room_info.title;
+            this.detail.area = [room_info.parent_area_name, room_info.area_name];
+            this.detail.cover = room_info.cover;
             this.stats.watch = watched_show.num;
             this.stats.like = like_info_v3.total_likes;
             this.anchor.id = room_info.uid;
@@ -82,7 +97,7 @@ class bilibiliLive extends __2.LiveRoom {
         // 如果直播间监听已打开，则返回
         if (this.opening)
             return;
-        await this.getInfo(true);
+        await this.getInfo();
         // 如果直播间不可用，则返回
         if (!this.available)
             return;
@@ -94,7 +109,7 @@ class bilibiliLive extends __2.LiveRoom {
     async createWS() {
         // 与Websocket服务器连接
         console.log("[bilibili-live-ws] 开始连接bilibili直播服务器");
-        this.client = new bilibili_live_ws_1.KeepLiveWS(this.roomid);
+        this.client = new bilibili_live_ws_1.KeepLiveWS(this.roomid, { uid: this.anchor.id });
         let client = this.client;
         client.interval = this.connectInterval;
         client.on("open", () => {
@@ -125,6 +140,7 @@ class bilibiliLive extends __2.LiveRoom {
         client.on("ROOM_CHANGE", this.msg_ROOM_CHANGE.bind(this));
         client.on("WATCHED_CHANGE", this.msg_WATCHED_CHANGE.bind(this));
         client.on("LIKE_INFO_V3_UPDATE", this.msg_LIKE_INFO_V3_UPDATE.bind(this));
+        client.on("ONLINE_RANK_COUNT", this.msg_ONLINE_RANK_COUNT.bind(this));
     }
     /** 关闭直播间监听 */
     close() {
@@ -136,22 +152,25 @@ class bilibiliLive extends __2.LiveRoom {
     }
     /** 获取弹幕消息 */
     msg_DANMU_MSG(msg) {
-        let content = msg.info[1];
-        let mode = msg.info[0][1];
-        let color = msg.info[0][3];
-        let uname = msg.info[2][1];
-        let uid = msg.info[2][0];
-        let timestamp = msg.info[0][4];
-        let guard_level = msg.info[7]; // 舰长级别
-        let extra = JSON.parse(msg.info[0][15].extra);
-        let medal = (msg.info[3].length) ? {
-            level: msg.info[3][0],
-            name: msg.info[3][1],
-            // user: msg.info[3][2],
-            id: msg.info[3][12],
-            membership: msg.info[3][10] || 0,
-        } : null;
-        let identity = null;
+        const { info, msg_id } = msg;
+        let content = info[1];
+        let mode = info[0][1];
+        let color = info[0][3];
+        let uname = info[2][1];
+        let uid = info[2][0];
+        let timestamp = info[0][4];
+        let guard_level = info[7]; // 舰长级别
+        let extra = JSON.parse(info[0][15].extra);
+        let medal = info[3].length
+            ? {
+                level: info[3][0],
+                name: info[3][1],
+                // user: info[3][2],
+                id: info[3][12],
+                membership: info[3][10] || 0,
+            }
+            : null;
+        let identity = 0;
         let emoticon = undefined;
         if (extra.emots) {
             emoticon = {};
@@ -164,42 +183,48 @@ class bilibiliLive extends __2.LiveRoom {
                 };
             }
         }
-        if (msg.info[2][2]) {
-            identity = __1.UserAdmin.admin;
+        if (info[2][2]) {
+            identity = __1.UserType.admin;
         }
         else if (uid == this.anchor.id) {
-            identity = __1.UserAdmin.anchor;
+            identity = __1.UserType.anchor;
         }
         let danmaku = {
             platform: "bilibili",
             room: this.id,
             type: "chat",
             timestamp: timestamp,
+            id: msg_id,
             info: {
                 color: color,
                 mode: mode,
                 content: content,
-                image: msg.info[0][12] ? {
-                    name: content,
-                    id: msg.info[0][13].emoticon_unique,
-                    url: msg.info[0][13].url,
-                    size: msg.info[0][13].width == msg.info[0][13].height ? __1.ImageSize.large : __1.ImageSize.small,
-                } : undefined,
+                image: info[0][12]
+                    ? {
+                        name: content,
+                        id: info[0][13].emoticon_unique,
+                        url: info[0][13].url,
+                        size: info[0][13].width == info[0][13].height
+                            ? __1.ImageSize.large
+                            : __1.ImageSize.small,
+                    }
+                    : undefined,
                 emoticon: emoticon,
                 user: {
                     name: uname,
                     id: uid,
                     medal: medal,
                     membership: guard_level,
-                    admin: identity,
-                }
-            }
+                    type: identity,
+                },
+            },
         };
+        danmaku.id ?? (danmaku.id = (0, __1.generateId)(danmaku));
         this.emitMsg(danmaku);
     }
     /** 获取互动消息 */
     msg_INTERACT_WORD(msg) {
-        const data = msg.data;
+        const { data, msg_id, send_time } = msg;
         let type;
         switch (data.msg_type) {
             case 1:
@@ -218,42 +243,49 @@ class bilibiliLive extends __2.LiveRoom {
             platform: "bilibili",
             room: this.id,
             type: type,
-            timestamp: Math.floor(data.trigger_time / 1000000),
+            id: msg_id,
+            timestamp: send_time || Math.floor(data.trigger_time / 1000000),
             info: {
                 user: {
                     name: data.uname,
                     id: data.uid,
-                    medal: (data.fans_medal?.medal_level) ? {
-                        level: data.fans_medal.medal_level,
-                        name: data.fans_medal.medal_name,
-                        id: data.fans_medal.target_id,
-                        membership: data.fans_medal.guard_level,
-                    } : null
-                }
+                    medal: data.fans_medal?.medal_level
+                        ? {
+                            level: data.fans_medal.medal_level,
+                            name: data.fans_medal.medal_name,
+                            id: data.fans_medal.target_id,
+                            membership: data.fans_medal.guard_level,
+                        }
+                        : null,
+                },
             },
         };
+        interact.id ?? (interact.id = (0, __1.generateId)(interact));
         this.emitMsg(interact);
     }
     /** 获取礼物消息 */
     msg_SEND_GIFT(msg) {
-        const data = msg.data;
+        const { data, msg_id, send_time } = msg;
         let gift = {
             platform: "bilibili",
             room: this.id,
             type: "gift",
-            timestamp: data.timestamp * 1000,
+            id: msg_id || data.combo_id,
+            timestamp: send_time || data.timestamp * 1000,
             info: {
                 user: {
                     name: data.uname,
                     id: data.uid,
-                    medal: (data.fans_medal && data.fans_medal.medal_level) ? {
-                        level: data.fans_medal.medal_level,
-                        name: data.fans_medal.medal_name,
-                        id: data.fans_medal.target_id,
-                        membership: data.fans_medal.guard_level,
-                    } : null,
+                    medal: data.fans_medal && data.fans_medal.medal_level
+                        ? {
+                            level: data.fans_medal.medal_level,
+                            name: data.fans_medal.medal_name,
+                            id: data.fans_medal.target_id,
+                            membership: data.fans_medal.guard_level,
+                        }
+                        : null,
                     membership: data.guard_level,
-                    avatar: data.face
+                    avatar: data.face,
                 },
                 gift: {
                     name: data.giftName,
@@ -262,20 +294,22 @@ class bilibiliLive extends __2.LiveRoom {
                     value: data.total_coin,
                     currency: data.coin_type,
                     action: data.action,
-                    combo_id: data.batch_combo_id,
-                }
+                    comboId: data.batch_combo_id,
+                },
             },
         };
+        gift.id ?? (gift.id = (0, __1.generateId)(gift));
         this.emitMsg(gift);
     }
     /** 获取舰长开通消息 */
     msg_GUARD_BUY(msg) {
-        const data = msg.data;
+        const { data, msg_id, send_time } = msg;
         let gift = {
             platform: "bilibili",
             room: this.id,
             type: "membership",
-            timestamp: data.start_time * 1000,
+            id: msg_id,
+            timestamp: send_time || data.start_time * 1000,
             info: {
                 user: {
                     name: data.username,
@@ -294,28 +328,32 @@ class bilibiliLive extends __2.LiveRoom {
                 duration: data.num * 30,
             },
         };
+        gift.id ?? (gift.id = (0, __1.generateId)(gift));
         this.emitMsg(gift);
     }
     /** 获取醒目留言消息 */
     msg_SUPER_CHAT_MESSAGE(msg) {
-        const data = msg.data;
+        const { data, msg_id, send_time } = msg;
         let sc = {
             platform: "bilibili",
             room: this.id,
             type: "superchat",
-            timestamp: data.ts * 1000,
+            id: msg_id,
+            timestamp: send_time || data.ts * 1000,
             info: {
                 id: data.id,
                 user: {
                     name: data.user_info.uname,
                     id: data.uid,
                     avatar: data.user_info.face,
-                    medal: (data.medal_info && data.medal_info.medal_level) ? {
-                        level: data.medal_info.medal_level,
-                        name: data.medal_info.medal_name,
-                        id: data.medal_info.target_id,
-                        membership: data.medal_info.guard_level,
-                    } : null,
+                    medal: data.medal_info && data.medal_info.medal_level
+                        ? {
+                            level: data.medal_info.medal_level,
+                            name: data.medal_info.medal_name,
+                            id: data.medal_info.target_id,
+                            membership: data.medal_info.guard_level,
+                        }
+                        : null,
                     membership: data.user_info.guard_level,
                 },
                 content: data.message,
@@ -327,110 +365,145 @@ class bilibiliLive extends __2.LiveRoom {
                     num: data.gift.num,
                     value: data.price * 1000,
                     currency: "gold",
-                }
+                },
             },
         };
+        sc.id ?? (sc.id = (0, __1.generateId)(sc));
         this.emitMsg(sc);
     }
     /** 观看数变化 */
     msg_WATCHED_CHANGE(msg) {
-        const data = msg.data;
+        const { data, msg_id, send_time } = msg;
         const stats = {
             platform: "bilibili",
             room: this.id,
             type: "live_stats",
-            timestamp: getDateTimestamp(),
+            id: msg_id,
+            timestamp: send_time || getDateTimestamp(),
             info: {
-                watch: data.num
+                watch: data.num,
             },
         };
+        stats.id ?? (stats.id = (0, __1.generateId)(stats));
         this.emitMsg(stats);
     }
     /** 点赞数变化 */
     msg_LIKE_INFO_V3_UPDATE(msg) {
-        const data = msg.data;
+        const { data, msg_id, send_time } = msg;
         const stats = {
             platform: "bilibili",
             room: this.id,
             type: "live_stats",
-            timestamp: getDateTimestamp(),
+            id: msg_id,
+            timestamp: send_time || getDateTimestamp(),
             info: {
-                like: data.click_count
+                like: data.click_count,
             },
         };
+        stats.id ?? (stats.id = (0, __1.generateId)(stats));
         this.emitMsg(stats);
     }
+    msg_ONLINE_RANK_COUNT(msg) {
+        const { data, msg_id, send_time } = msg;
+        const stats = {
+            platform: "bilibili",
+            room: this.id,
+            type: "live_stats",
+            id: msg_id,
+            timestamp: send_time || getDateTimestamp(),
+            info: {
+                online: data.online_count,
+            },
+        };
+        stats.id ?? (stats.id = (0, __1.generateId)(stats));
+        if (data.online_count != null)
+            this.emitMsg(stats);
+    }
     msg_ROOM_BLOCK_MSG(msg) {
         // 禁言
-        const data = msg.data;
+        const { data, msg_id, send_time } = msg;
         const block = {
             platform: "bilibili",
             room: this.id,
             type: "block",
-            timestamp: getDateTimestamp(),
+            id: msg_id,
+            timestamp: send_time || getDateTimestamp(),
             info: {
                 user: {
                     id: data.uid,
-                    name: data.uname
+                    name: data.uname,
                 },
                 operator: {
-                    admin: data.operator == 2 ? __1.UserAdmin.anchor : __1.UserAdmin.admin
-                }
+                    type: data.operator == 2 ? __1.UserType.anchor : __1.UserType.admin,
+                },
             },
         };
+        block.id ?? (block.id = (0, __1.generateId)(block));
         this.emitMsg(block);
     }
     msg_LIVE(msg) {
+        const { data, msg_id, send_time } = msg;
         // 直播间开播
         if (msg.live_time) {
             let live = {
                 platform: "bilibili",
                 room: this.id,
                 type: "live_start",
-                timestamp: msg.live_time * 1000,
+                id: msg_id,
+                timestamp: send_time || msg.live_time * 1000,
                 info: {
                     id: msg.live_key.toString(),
                 },
             };
+            live.id ?? (live.id = (0, __1.generateId)(live));
             this.emitMsg(live);
         }
     }
     msg_CUT_OFF(msg) {
+        const { msg_id, send_time } = msg;
         // 直播间被切断
         let cut = {
             platform: "bilibili",
             room: this.id,
             type: "live_cut",
-            timestamp: getDateTimestamp(),
+            id: msg_id,
+            timestamp: send_time || getDateTimestamp(),
             info: {
                 message: msg.msg,
             },
         };
+        cut.id ?? (cut.id = (0, __1.generateId)(cut));
         this.emitMsg(cut);
     }
     msg_PREPARING(msg) {
+        const { msg_id, send_time } = msg;
         let off = {
             platform: "bilibili",
             room: this.id,
             type: "live_end",
-            timestamp: getDateTimestamp(),
+            id: msg_id,
+            timestamp: send_time || getDateTimestamp(),
             info: {
-                status: msg.round ? __1.RoomStatus.round : __1.RoomStatus.off
-            }
+                status: msg.round ? __1.RoomStatus.round : __1.RoomStatus.off,
+            },
         };
+        off.id ?? (off.id = (0, __1.generateId)(off));
         this.emitMsg(off);
     }
     msg_ROOM_CHANGE(msg) {
+        const { data, msg_id, send_time } = msg;
         let change = {
             platform: "bilibili",
             room: this.id,
-            type: "live_view",
-            timestamp: Date.now(),
+            type: "live_detail",
+            id: msg_id,
+            timestamp: send_time || getDateTimestamp(),
             info: {
-                title: msg.data.title,
-                area: [msg.data.parent_area_name, msg.data.area_name]
-            }
+                title: data.title,
+                area: [data.parent_area_name, data.area_name],
+            },
         };
+        change.id ?? (change.id = (0, __1.generateId)(change));
         this.emitMsg(change);
     }
 }

package/plugin/chatPrint/chatPrint.js

@@ -7,15 +7,23 @@ class chatPrint {
         this.main = main;
         let hidden = [];
         this.hideType = new Set(hidden); // 隐藏类型
-        this.main.on("live_message", (msg) => { this.log(msg); });
+        this.main.on("live_message", (msg) => {
+            this.log(msg);
+        });
     }
     /** 获取用户信息 */
     getUserInfo(message) {
         let user = message.info.user; // 用户信息
         let name = `${"\x1b[33m"}${user.name}`; // 用户名
-        let medal = user.medal ? `${"\x1b[32m"}[${user.medal.name}(${user.medal.level})] ` : ""; // 粉丝牌
-        let membership = user.membership ? `${"\x1b[36m"}[${this.getPriviliegeName(message.platform, user.membership)}]` : ""; // 特权粉丝
-        let admin = user.admin ? `${"\x1b[95m"}[${{ [__1.UserAdmin.admin]: "房管", [__1.UserAdmin.anchor]: "主播" }[user.admin]}]` : ""; // 房管
+        let medal = user.medal
+            ? `${"\x1b[32m"}[${user.medal.name}(${user.medal.level})] `
+            : ""; // 粉丝牌
+        let membership = user.membership
+            ? `${"\x1b[36m"}[${this.getPriviliegeName(message.platform, user.membership)}]`
+            : ""; // 特权粉丝
+        let admin = user.type
+            ? `${"\x1b[95m"}[${{ [__1.UserType.admin]: "房管", [__1.UserType.anchor]: "主播" }[user.type]}]`
+            : ""; // 房管
         return `${medal}${membership}${admin}${name}${"\x1b[0m"}`; //[粉丝牌(等级)] [特权][房管]用户名
     }
     /** 获取特权粉丝名称 */
@@ -81,7 +89,9 @@ class chatPrint {
             }
             case "block": {
                 let user = this.getUserInfo(message);
-                let operator = message.info.operator.admin ? { [__1.UserAdmin.admin]: "房管", [__1.UserAdmin.anchor]: "主播" }[message.info.operator.admin] : "管理员";
+                let operator = message.info.operator.type
+                    ? { [__1.UserType.admin]: "房管", [__1.UserType.anchor]: "主播" }[message.info.operator.type]
+                    : "管理员";
                 console.log(`${user} 已被${operator}禁言`);
                 break;
             }

package/src/enum.d.ts

@@ -25,8 +25,10 @@ export declare enum DanmakuMode {
     top = 5,
     right = 6
 }
-/** 管理等级 */
-export declare enum UserAdmin {
+/** 用户类型 */
+export declare enum UserType {
+    /** 普通观众 */
+    normal = 0,
     /** 房管 */
     admin = 1,
     /** 主播 */

package/src/enum.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserAdmin = exports.DanmakuMode = exports.ImageSize = exports.RoomStatus = void 0;
+exports.UserType = exports.DanmakuMode = exports.ImageSize = exports.RoomStatus = void 0;
 /** 直播间状态 */
 var RoomStatus;
 (function (RoomStatus) {
@@ -31,11 +31,13 @@ var DanmakuMode;
     DanmakuMode[DanmakuMode["top"] = 5] = "top";
     DanmakuMode[DanmakuMode["right"] = 6] = "right";
 })(DanmakuMode = exports.DanmakuMode || (exports.DanmakuMode = {}));
-/** 管理等级 */
-var UserAdmin;
-(function (UserAdmin) {
+/** 用户类型 */
+var UserType;
+(function (UserType) {
+    /** 普通观众 */
+    UserType[UserType["normal"] = 0] = "normal";
     /** 房管 */
-    UserAdmin[UserAdmin["admin"] = 1] = "admin";
+    UserType[UserType["admin"] = 1] = "admin";
     /** 主播 */
-    UserAdmin[UserAdmin["anchor"] = 2] = "anchor";
-})(UserAdmin = exports.UserAdmin || (exports.UserAdmin = {}));
+    UserType[UserType["anchor"] = 2] = "anchor";
+})(UserType = exports.UserType || (exports.UserType = {}));

package/src/lib/LiveRoom.d.ts

@@ -10,7 +10,7 @@ export interface RoomInfo {
     /** 房间key */
     key: string;
     /** 基本信息 */
-    view: RoomViewInfo;
+    detail: RoomDetail;
     /** 统计信息 */
     stats?: RoomStatsInfo;
     /** 主播信息 */
@@ -29,7 +29,7 @@ export interface RoomInfo {
     connected: boolean;
 }
 /** 房间展示信息 */
-export declare type RoomViewInfo = {
+export declare type RoomDetail = {
     /** 直播标题 */
     title?: string;
     /** 分区 */
@@ -54,8 +54,8 @@ export declare abstract class LiveRoom extends EventEmitter implements RoomInfo
     abstract readonly platform: string;
     /** 房间id */
     abstract readonly id: string | number;
-    /** 基本信息 */
-    abstract view: RoomViewInfo;
+    /** 房间详情 */
+    abstract detail: RoomDetail;
     /** 统计信息 */
     stats?: RoomStatsInfo;
     /** 主播信息 */

package/src/lib/LiveRoom.js

@@ -29,9 +29,9 @@ class LiveRoom extends events_1.EventEmitter {
                 this.timestamp = msg.timestamp;
                 this.emit("status", enum_1.RoomStatus.live, { timestamp: msg.timestamp, id: msg.info.id });
                 break;
-            case "live_view":
-                this.view = Object.assign(this.view, msg.info);
-                this.emit("view", msg.info);
+            case "live_detail":
+                this.detail = Object.assign(this.detail, msg.info);
+                this.emit("detail", msg.info);
                 break;
             case "live_stats":
                 this.stats = Object.assign(this.stats, msg.info);
@@ -55,7 +55,7 @@ class LiveRoom extends events_1.EventEmitter {
         return {
             platform: this.platform,
             id: this.id,
-            view: this.view,
+            detail: this.detail,
             stats: this.stats,
             anchor: this.anchor,
             timestamp: this.timestamp,

package/src/module/Room.js

@@ -53,8 +53,8 @@ class RoomController {
             this.main.emit("room_info", key, room.info);
         });
         // 直播展示信息更改
-        room.on("view", (data) => {
-            this.main.emit("room_view", key, data);
+        room.on("detail", (data) => {
+            this.main.emit("room_detail", key, data);
         });
         // 直播状态更改
         room.on("status", (status, { id, timestamp }) => {

package/src/types/message/AttributeInfo.d.ts

@@ -1,4 +1,4 @@
-import { ImageSize, UserAdmin } from "../../enum";
+import { ImageSize, UserType } from "../../enum";
 /** 用户信息 */
 export interface UserInfo {
     /** 用户名 */
@@ -9,8 +9,8 @@ export interface UserInfo {
     avatar?: string;
     /** 粉丝勋章 */
     medal?: MedalInfo | null;
-    /** 管理等级 */
-    admin?: UserAdmin | null;
+    /** 用户类型 */
+    type?: UserType | null;
     /** 粉丝vip等级 */
     membership?: boolean | number;
     /** vip等级 */
@@ -55,13 +55,13 @@ export interface GiftInfo {
     /** 礼物连击数 */
     combo?: string;
     /** 礼物连击id */
-    combo_id?: string;
+    comboId?: string;
     /** 人民币价值 */
     cny?: number;
     /** 行为 */
     action?: string;
     /** 随机礼物信息 */
-    blind_gift?: GiftInfo;
+    blindGift?: GiftInfo;
     /** 图片信息 */
     image?: string;
 }

package/src/types/message/MessageData.d.ts

@@ -1,6 +1,7 @@
-import { RoomInfo } from './../../lib/LiveRoom';
-import { DanmakuMode, RoomStatus, UserAdmin } from '../../enum';
-import { RoomViewInfo, RoomStatsInfo } from "../../lib/LiveRoom";
+import { UserType } from "./../../enum";
+import { RoomInfo } from "./../../lib/LiveRoom";
+import { DanmakuMode, RoomStatus } from "../../enum";
+import { RoomDetail, RoomStatsInfo } from "../../lib/LiveRoom";
 import { UserInfo, GiftInfo, ImageInfo } from "./AttributeInfo";
 declare type MessageBase = {
     /** 平台名称 */
@@ -11,6 +12,8 @@ declare type MessageBase = {
     type: string;
     /** 时间戳 */
     timestamp: number;
+    /** 消息id */
+    id: string;
     /** 其他属性 */
     [attr: string]: any;
 };
@@ -28,7 +31,7 @@ export declare type MessageExt<T extends MessageInterface, E extends {
     info: E;
 };
 /** 文本聊天消息 */
-export declare type MessageChat = MessageBase & {
+export interface MessageChat extends MessageBase {
     type: "chat";
     info: {
         /** 用户信息 */
@@ -50,9 +53,9 @@ export declare type MessageChat = MessageBase & {
         /** 标签信息 */
         tag?: string;
     };
-};
+}
 /** 礼物消息 */
-export declare type MessageGift = MessageBase & {
+export interface MessageGift extends MessageBase {
     type: "gift";
     info: {
         /** 用户信息 */
@@ -60,9 +63,9 @@ export declare type MessageGift = MessageBase & {
         /** 礼物信息 */
         gift: GiftInfo;
     };
-};
+}
 /** 互动消息(进入直播间、点赞、关注、分享、加入粉丝团) */
-export declare type MessageInteract = MessageBase & {
+export interface MessageInteract extends MessageBase {
     type: "entry" | "like" | "follow" | "share" | "join";
     info: {
         /** 用户信息 */
@@ -70,9 +73,9 @@ export declare type MessageInteract = MessageBase & {
         /** 信息标签 */
         tag?: string | boolean;
     };
-};
+}
 /** 粉丝vip开通消息 */
-export declare type MessageMembership = MessageBase & {
+export interface MessageMembership extends MessageBase {
     type: "membership";
     info: {
         /** 用户信息 */
@@ -86,13 +89,13 @@ export declare type MessageMembership = MessageBase & {
         /** 持续时间(天数) */
         duration: number;
     };
-};
+}
 /** 粉丝vip开通消息 */
-export declare type MessageSuperchat = MessageBase & {
+export interface MessageSuperchat extends MessageBase {
     type: "superchat";
     info: {
         /** 留言id */
-        id?: string;
+        id: string;
         /** 用户信息 */
         user: UserInfo;
         /** 文本内容 */
@@ -104,35 +107,35 @@ export declare type MessageSuperchat = MessageBase & {
         /** (SC)持续时间 */
         duration: number;
     };
-};
+}
 /** 禁言消息 */
-export declare type MessageBlock = MessageBase & {
+export interface MessageBlock extends MessageBase {
     type: "block";
     info: {
         /** 用户信息 */
         user: UserInfo;
         /** 操作者 */
         operator: UserInfo | {
-            admin: null | UserAdmin;
+            type: null | UserType;
         };
     };
-};
+}
 /** 直播开播消息 */
-export declare type MessageLiveStart = MessageBase & {
+export interface MessageLiveStart extends MessageBase {
     type: "live_start";
     info: {
         /** 直播id */
         id: string;
     };
-};
+}
 /** 直播切断消息 */
-export declare type MessageLiveCut = MessageBase & {
+export interface MessageLiveCut extends MessageBase {
     type: "live_cut";
     info: {
         /** 切断消息 */
         message: string;
     };
-};
+}
 /** 获取房间信息 */
 export interface MessageRoomInfo extends MessageBase {
     type: "room_info";
@@ -140,24 +143,24 @@ export interface MessageRoomInfo extends MessageBase {
     info: RoomInfo;
 }
 /** 直播数据更新 */
-export declare type MessageLiveStats = MessageBase & {
+export interface MessageLiveStats extends MessageBase {
     type: "live_stats";
     info: RoomStatsInfo;
-};
+}
 /** 直播展示信息更新 */
-export declare type MessageLiveView = MessageBase & {
-    type: "live_view";
-    info: RoomViewInfo;
-};
+export interface MessageLiveDetail extends MessageBase {
+    type: "live_detail";
+    info: RoomDetail;
+}
 /** 直播结束 */
-export declare type MessageLiveEnd = MessageBase & {
+export interface MessageLiveEnd extends MessageBase {
     type: "live_end";
     info: {
         /** 直播状态 */
         status: RoomStatus;
     };
-};
-declare type AllMessageType = MessageChat | MessageGift | MessageInteract | MessageMembership | MessageSuperchat | MessageBlock | MessageLiveStart | MessageLiveEnd | MessageLiveCut | MessageLiveView | MessageLiveStats;
+}
+declare type AllMessageType = MessageChat | MessageGift | MessageInteract | MessageMembership | MessageSuperchat | MessageBlock | MessageLiveStart | MessageLiveEnd | MessageLiveCut | MessageLiveDetail | MessageLiveStats;
 export declare type MessageData<T extends AllMessageType["type"] = AllMessageType["type"]> = AllMessageType & {
     type: T;
 };

package/src/utils.d.ts

@@ -0,0 +1,2 @@
+import { MessageData } from './types/message/MessageData';
+export declare function generateId(msg: MessageData): string;

package/src/utils.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateId = void 0;
+function generateId(msg) {
+    switch (msg.type) {
+        case "gift":
+            return `gift:${msg.info.user.id}-${msg.timestamp}`;
+        case "superchat":
+            return `superchat:${msg.info.id}`;
+        case "membership":
+            return `membership:${msg.info.user.id}-${msg.info.level || 0}-${msg.timestamp}`;
+        default:
+            if (/^live_/.test(msg.type)) {
+                return `${msg.type}:${msg.platform}:${msg.room}-${msg.timestamp}`;
+            }
+            else {
+                return `${msg.type}:${msg.info.user?.id || 0}-${msg.timestamp}`;
+            }
+    }
+}
+exports.generateId = generateId;