floating-live 0.12.0 → 0.12.1

package/index.d.ts

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

package/index.js

@@ -21,4 +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/tool"), exports);
+__exportStar(require("./src/utils"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "floating-live",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "type": "commonjs",
   "main": "index.js",
   "types": "index.d.ts",

package/plugin/acfun/acfunLive.d.ts

@@ -1,4 +1,4 @@
-import { RoomDetail } from './../../src/lib/LiveRoom';
+import { RoomDetail } from "./../../src/lib/LiveRoom";
 import { MedalInfo, UserInfo } from "../..";
 import AcClient from "acfun-live-danmaku/client";
 import { LiveRoom, RoomStatsInfo } from "../..";

package/plugin/acfun/acfunLive.js

@@ -162,19 +162,19 @@ 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) */

package/plugin/bilibili/bilibiliLive.js

@@ -170,7 +170,7 @@ class bilibiliLive extends __2.LiveRoom {
                 membership: info[3][10] || 0,
             }
             : null;
-        let identity = null;
+        let identity = 0;
         let emoticon = undefined;
         if (extra.emots) {
             emoticon = {};
@@ -184,10 +184,10 @@ class bilibiliLive extends __2.LiveRoom {
             }
         }
         if (info[2][2]) {
-            identity = __1.UserAdmin.admin;
+            identity = __1.UserType.admin;
         }
         else if (uid == this.anchor.id) {
-            identity = __1.UserAdmin.anchor;
+            identity = __1.UserType.anchor;
         }
         let danmaku = {
             platform: "bilibili",
@@ -215,10 +215,11 @@ class bilibiliLive extends __2.LiveRoom {
                     id: uid,
                     medal: medal,
                     membership: guard_level,
-                    admin: identity,
+                    type: identity,
                 },
             },
         };
+        danmaku.id ?? (danmaku.id = (0, __1.generateId)(danmaku));
         this.emitMsg(danmaku);
     }
     /** 获取互动消息 */
@@ -243,7 +244,7 @@ class bilibiliLive extends __2.LiveRoom {
             room: this.id,
             type: type,
             id: msg_id,
-            timestamp: send_time,
+            timestamp: send_time || Math.floor(data.trigger_time / 1000000),
             info: {
                 user: {
                     name: data.uname,
@@ -259,6 +260,7 @@ class bilibiliLive extends __2.LiveRoom {
                 },
             },
         };
+        interact.id ?? (interact.id = (0, __1.generateId)(interact));
         this.emitMsg(interact);
     }
     /** 获取礼物消息 */
@@ -268,8 +270,8 @@ class bilibiliLive extends __2.LiveRoom {
             platform: "bilibili",
             room: this.id,
             type: "gift",
-            id: msg_id,
-            timestamp: send_time,
+            id: msg_id || data.combo_id,
+            timestamp: send_time || data.timestamp * 1000,
             info: {
                 user: {
                     name: data.uname,
@@ -296,6 +298,7 @@ class bilibiliLive extends __2.LiveRoom {
                 },
             },
         };
+        gift.id ?? (gift.id = (0, __1.generateId)(gift));
         this.emitMsg(gift);
     }
     /** 获取舰长开通消息 */
@@ -306,7 +309,7 @@ class bilibiliLive extends __2.LiveRoom {
             room: this.id,
             type: "membership",
             id: msg_id,
-            timestamp: send_time,
+            timestamp: send_time || data.start_time * 1000,
             info: {
                 user: {
                     name: data.username,
@@ -325,6 +328,7 @@ class bilibiliLive extends __2.LiveRoom {
                 duration: data.num * 30,
             },
         };
+        gift.id ?? (gift.id = (0, __1.generateId)(gift));
         this.emitMsg(gift);
     }
     /** 获取醒目留言消息 */
@@ -335,7 +339,7 @@ class bilibiliLive extends __2.LiveRoom {
             room: this.id,
             type: "superchat",
             id: msg_id,
-            timestamp: send_time,
+            timestamp: send_time || data.ts * 1000,
             info: {
                 id: data.id,
                 user: {
@@ -364,6 +368,7 @@ class bilibiliLive extends __2.LiveRoom {
                 },
             },
         };
+        sc.id ?? (sc.id = (0, __1.generateId)(sc));
         this.emitMsg(sc);
     }
     /** 观看数变化 */
@@ -374,11 +379,12 @@ class bilibiliLive extends __2.LiveRoom {
             room: this.id,
             type: "live_stats",
             id: msg_id,
-            timestamp: send_time,
+            timestamp: send_time || getDateTimestamp(),
             info: {
                 watch: data.num,
             },
         };
+        stats.id ?? (stats.id = (0, __1.generateId)(stats));
         this.emitMsg(stats);
     }
     /** 点赞数变化 */
@@ -389,11 +395,12 @@ class bilibiliLive extends __2.LiveRoom {
             room: this.id,
             type: "live_stats",
             id: msg_id,
-            timestamp: send_time,
+            timestamp: send_time || getDateTimestamp(),
             info: {
                 like: data.click_count,
             },
         };
+        stats.id ?? (stats.id = (0, __1.generateId)(stats));
         this.emitMsg(stats);
     }
     msg_ONLINE_RANK_COUNT(msg) {
@@ -403,12 +410,14 @@ class bilibiliLive extends __2.LiveRoom {
             room: this.id,
             type: "live_stats",
             id: msg_id,
-            timestamp: send_time,
+            timestamp: send_time || getDateTimestamp(),
             info: {
-                online: data.count,
+                online: data.online_count,
             },
         };
-        this.emitMsg(stats);
+        stats.id ?? (stats.id = (0, __1.generateId)(stats));
+        if (data.online_count != null)
+            this.emitMsg(stats);
     }
     msg_ROOM_BLOCK_MSG(msg) {
         // 禁言
@@ -418,17 +427,18 @@ class bilibiliLive extends __2.LiveRoom {
             room: this.id,
             type: "block",
             id: msg_id,
-            timestamp: send_time,
+            timestamp: send_time || getDateTimestamp(),
             info: {
                 user: {
                     id: data.uid,
                     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) {
@@ -440,11 +450,12 @@ class bilibiliLive extends __2.LiveRoom {
                 room: this.id,
                 type: "live_start",
                 id: msg_id,
-                timestamp: send_time,
+                timestamp: send_time || msg.live_time * 1000,
                 info: {
                     id: msg.live_key.toString(),
                 },
             };
+            live.id ?? (live.id = (0, __1.generateId)(live));
             this.emitMsg(live);
         }
     }
@@ -456,11 +467,12 @@ class bilibiliLive extends __2.LiveRoom {
             room: this.id,
             type: "live_cut",
             id: msg_id,
-            timestamp: send_time,
+            timestamp: send_time || getDateTimestamp(),
             info: {
                 message: msg.msg,
             },
         };
+        cut.id ?? (cut.id = (0, __1.generateId)(cut));
         this.emitMsg(cut);
     }
     msg_PREPARING(msg) {
@@ -470,11 +482,12 @@ class bilibiliLive extends __2.LiveRoom {
             room: this.id,
             type: "live_end",
             id: msg_id,
-            timestamp: send_time,
+            timestamp: send_time || getDateTimestamp(),
             info: {
                 status: msg.round ? __1.RoomStatus.round : __1.RoomStatus.off,
             },
         };
+        off.id ?? (off.id = (0, __1.generateId)(off));
         this.emitMsg(off);
     }
     msg_ROOM_CHANGE(msg) {
@@ -484,12 +497,13 @@ class bilibiliLive extends __2.LiveRoom {
             room: this.id,
             type: "live_detail",
             id: msg_id,
-            timestamp: send_time,
+            timestamp: send_time || getDateTimestamp(),
             info: {
                 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/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等级 */

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

@@ -1,5 +1,6 @@
+import { UserType } from "./../../enum";
 import { RoomInfo } from "./../../lib/LiveRoom";
-import { DanmakuMode, RoomStatus, UserAdmin } from "../../enum";
+import { DanmakuMode, RoomStatus } from "../../enum";
 import { RoomDetail, RoomStatsInfo } from "../../lib/LiveRoom";
 import { UserInfo, GiftInfo, ImageInfo } from "./AttributeInfo";
 declare type MessageBase = {
@@ -115,7 +116,7 @@ export interface MessageBlock extends MessageBase {
         user: UserInfo;
         /** 操作者 */
         operator: UserInfo | {
-            admin: null | UserAdmin;
+            type: null | UserType;
         };
     };
 }

package/src/utils.d.ts

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

package/src/{tool.js → utils.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateKey = void 0;
-function generateKey(msg) {
+exports.generateId = void 0;
+function generateId(msg) {
     switch (msg.type) {
         case "gift":
-            return `gift:${msg.info.gift.comboId || `${msg.info.user.id}-${msg.timestamp}`}`;
+            return `gift:${msg.info.user.id}-${msg.timestamp}`;
         case "superchat":
             return `superchat:${msg.info.id}`;
         case "membership":
@@ -18,4 +18,4 @@ function generateKey(msg) {
             }
     }
 }
-exports.generateKey = generateKey;
+exports.generateId = generateId;

package/src/tool.d.ts

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