floating-live 0.9.0 → 0.10.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "floating-live",
-  "version": "0.9.0",
+  "version": "0.10.1",
   "type": "commonjs",
   "main": "index.js",
   "types": "index.d.ts",
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "acfun-live-danmaku": "^0.6.1",
-    "axios": "^0.26.0",
+    "axios": "^1.2.3",
     "bilibili-live-ws": "^6.0.3",
     "fs-extra": "^11.1.0"
   },

package/plugin/acfun/acfunLive.d.ts

@@ -1,6 +1,19 @@
 import { MedalInfo, UserInfo } from "../../src/types/message/AttributeInfo";
 import AcClient from "acfun-live-danmaku/client";
 import { LiveRoom, RoomBaseInfo } from "../../src/lib/LiveRoom";
+declare type ZtLiveUserInfo = {
+    userIdentity: {
+        managerType?: number;
+    };
+    badge?: string;
+    nickname: string;
+    userId: string;
+    avatar: [
+        {
+            url: string;
+        }
+    ];
+};
 declare class acfunLive extends LiveRoom {
     /** 平台id */
     readonly platform: string;
@@ -28,41 +41,27 @@ declare class acfunLive extends LiveRoom {
     close(): void;
     destory(): void;
     /** 根据守护徽章字符串获取粉丝牌信息 */
-    getMedal(badge: string): MedalInfo | null;
+    getMedal(badge?: string): MedalInfo | null;
+    getUser(user: ZtLiveUserInfo): UserInfo;
     /** 文本信息(Comment) */
     msg_Comment(data: {
         sendTimeMs: string;
-        userInfo: {
-            userIdentity: any;
-            badge: string;
-            nickname: any;
-            userId: string;
-        };
+        userInfo: ZtLiveUserInfo;
         content: any;
     }): void;
     /** 礼物信息(Gift) */
     msg_Gift(data: {
         sendTimeMs: string;
-        user: {
-            userIdentity: any;
-            badge: string;
-            nickname: any;
-            userId: string;
-        };
+        user: ZtLiveUserInfo;
         giftName: any;
         giftId: string;
-        count: any;
+        count: number;
         value: string;
     }): void;
     /** 互动信息 */
     msg_Interact(data: {
         sendTimeMs: string;
-        userInfo: {
-            userIdentity: any;
-            badge: string;
-            nickname: any;
-            userId: string;
-        };
+        userInfo: ZtLiveUserInfo;
     }, type: "entry" | "like" | "follow" | "share" | "join"): void;
     msg_LiveClosed(): void;
     msg_LiveBanned(): void;

package/plugin/acfun/acfunLive.js

@@ -36,7 +36,6 @@ class acfunLive extends LiveRoom_1.LiveRoom {
             if (open)
                 this.open();
         });
-        console.log("连接直播间");
     }
     /** 直播间是否可用 */
     get available() {
@@ -129,6 +128,22 @@ class acfunLive extends LiveRoom_1.LiveRoom {
             return null;
         }
     }
+    getUser(user) {
+        let identity = null;
+        if (user.userIdentity?.managerType == 1) {
+            identity = "admin";
+        }
+        else if (parseInt(user.userId) == this.anchor.id) {
+            identity = "anchor";
+        }
+        return {
+            name: user.nickname,
+            id: parseInt(user.userId),
+            medal: this.getMedal(user.badge),
+            avatar: user.avatar[0].url,
+            identity: identity
+        };
+    }
     /** 文本信息(Comment) */
     msg_Comment(data) {
         let danmaku = {
@@ -138,11 +153,7 @@ class acfunLive extends LiveRoom_1.LiveRoom {
             type: "chat",
             info: {
                 content: data.content,
-                user: {
-                    name: data.userInfo.nickname,
-                    id: parseInt(data.userInfo.userId),
-                    medal: this.getMedal(data.userInfo.badge),
-                },
+                user: this.getUser(data.userInfo),
                 timestamp: parseInt(data.sendTimeMs),
             },
         };
@@ -156,16 +167,12 @@ class acfunLive extends LiveRoom_1.LiveRoom {
             type: "gift",
             record_time: new Date().valueOf(),
             info: {
-                user: {
-                    name: data.user.nickname,
-                    id: parseInt(data.user.userId),
-                    medal: this.getMedal(data.user.badge),
-                },
+                user: this.getUser(data.user),
                 gift: {
                     name: data.giftName,
                     id: parseInt(data.giftId),
                     num: data.count,
-                    currency: "coin",
+                    currency: data.giftId == "1" ? "banana" : "coin",
                     value: parseInt(data.value), // 总价值
                 },
                 timestamp: parseInt(data.sendTimeMs),
@@ -181,11 +188,7 @@ class acfunLive extends LiveRoom_1.LiveRoom {
             type: type,
             record_time: new Date().valueOf(),
             info: {
-                user: {
-                    name: data.userInfo.nickname,
-                    id: parseInt(data.userInfo.userId),
-                    medal: this.getMedal(data.userInfo.badge),
-                },
+                user: this.getUser(data.userInfo),
                 timestamp: parseInt(data.sendTimeMs),
             },
         };

package/plugin/bilibili/bilibiliLive.js

@@ -136,6 +136,7 @@ class bilibiliLive extends LiveRoom_1.LiveRoom {
         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],
@@ -143,12 +144,24 @@ class bilibiliLive extends LiveRoom_1.LiveRoom {
             id: msg.info[3][12],
             membership: msg.info[3][10] || 0,
         } : null;
-        let admin = undefined;
+        let identity = null;
+        let emoticon = undefined;
+        if (extra.emots) {
+            emoticon = {};
+            for (let key in extra.emots) {
+                let emotItem = extra.emots[key];
+                emoticon[key] = {
+                    id: emotItem.emoticon_unique,
+                    url: emotItem.url,
+                    name: emotItem.emoji,
+                };
+            }
+        }
         if (msg.info[2][2]) {
-            admin = 2;
+            identity = "admin";
         }
         else if (uid == this.anchor.id) {
-            admin = 1;
+            identity = "anchor";
         }
         let danmaku = {
             platform: "bilibili",
@@ -164,14 +177,15 @@ class bilibiliLive extends LiveRoom_1.LiveRoom {
                     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],
+                    height: msg.info[0][13].height / 3,
                 } : undefined,
+                emoticon: emoticon,
                 user: {
                     name: uname,
                     id: uid,
                     medal: medal,
                     membership: guard_level,
-                    admin: admin,
+                    identity: identity,
                 }
             }
         };

package/plugin/chatPrint/chatPrint.js

@@ -60,7 +60,7 @@ class chatPrint {
             case "superchat": {
                 let user = this.getUserInfo(message);
                 let second = Math.round(message.info.duration / 1000);
-                console.log(`${"\x1b[1;36m"}SC(${second}s) ${user}${"\x1b[0m"}: ${message.info.text}`);
+                console.log(`${"\x1b[1;36m"}SC(${second}s) ${user}${"\x1b[0m"}: ${message.info.content}`);
                 break;
             }
             case "entry": {

package/src/lib/LiveRoom.js

@@ -55,9 +55,9 @@ class LiveRoom extends events_1.EventEmitter {
                 break;
             case "live_end":
             case "live_cut":
-                this.status = msg.info.status || "off";
-                this.timestamp = msg.info.timestamp || msg.record_time;
-                this.emit("status", msg.info.status || "off", msg.info.timestamp || msg.record_time);
+                this.status = msg.status || "off";
+                this.timestamp = msg.timestamp || msg.record_time;
+                this.emit("status", msg.status || "off", msg.timestamp || msg.record_time);
                 break;
             case "live_change":
                 this.base = Object.assign(this.base, msg.info);

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

@@ -36,8 +36,8 @@ export interface ImageInfo {
     id?: string | number;
     /** 图像url */
     url?: string;
-    /** 图像尺寸 */
-    size?: [number, number];
+    /** 图像高度 */
+    height?: number;
 }
 /** 礼物信息 */
 export interface GiftInfo {
@@ -61,4 +61,6 @@ export interface GiftInfo {
     action?: string;
     /** 随机礼物信息 */
     blind_gift?: GiftInfo;
+    /** 图片信息 */
+    image?: string;
 }

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

@@ -1,20 +1,22 @@
 import { RoomBaseInfo, RoomStatsInfo, RoomStatus } from "../../lib/LiveRoom";
 import { UserInfo, GiftInfo, ImageInfo } from "./AttributeInfo";
-export interface MessageInterface {
+declare type MessageBase = {
     /** 平台名称 */
     platform: string;
     /** 房间号 */
     room: number | string;
     /** 信息类型 */
     type: string;
-    /** 数据信息 */
-    info: {
-        [attr: string]: any;
-    };
     /** 记录时间 */
     record_time: number;
     /** 其他属性 */
     [attr: string]: any;
+};
+export interface MessageInterface extends MessageBase {
+    /** 数据信息 */
+    info: {
+        [attr: string]: any;
+    };
 }
 export declare type MessageExt<T extends MessageInterface, E extends {
     [attr: string]: any;
@@ -24,7 +26,7 @@ export declare type MessageExt<T extends MessageInterface, E extends {
     info: E;
 };
 /** 文本聊天消息 */
-export declare type MessageChat = MessageInterface & {
+export declare type MessageChat = MessageBase & {
     type: "chat";
     info: {
         /** 用户信息 */
@@ -42,11 +44,15 @@ export declare type MessageChat = MessageInterface & {
         /** 图片信息 */
         image?: ImageInfo;
         /** 表情信息 */
-        emoticon?: ImageInfo;
+        emoticon?: {
+            [keyword: string]: ImageInfo;
+        };
+        /** 标签信息 */
+        tag?: string;
     };
 };
 /** 礼物消息 */
-export declare type MessageGift = MessageInterface & {
+export declare type MessageGift = MessageBase & {
     type: "gift";
     info: {
         /** 用户信息 */
@@ -58,7 +64,7 @@ export declare type MessageGift = MessageInterface & {
     };
 };
 /** 互动消息(进入直播间、点赞、关注、分享、加入粉丝团) */
-export declare type MessageInteract = MessageInterface & {
+export declare type MessageInteract = MessageBase & {
     type: "entry" | "like" | "follow" | "share" | "join";
     info: {
         /** 用户信息 */
@@ -70,7 +76,7 @@ export declare type MessageInteract = MessageInterface & {
     };
 };
 /** 粉丝vip开通消息 */
-export declare type MessageMembership = MessageInterface & {
+export declare type MessageMembership = MessageBase & {
     type: "membership";
     info: {
         /** 用户信息 */
@@ -88,7 +94,7 @@ export declare type MessageMembership = MessageInterface & {
     };
 };
 /** 粉丝vip开通消息 */
-export declare type MessageSuperchat = MessageInterface & {
+export declare type MessageSuperchat = MessageBase & {
     type: "superchat";
     info: {
         /** 留言id */
@@ -108,7 +114,7 @@ export declare type MessageSuperchat = MessageInterface & {
     };
 };
 /** 禁言消息 */
-export declare type MessageBlock = MessageInterface & {
+export declare type MessageBlock = MessageBase & {
     type: "block";
     info: {
         /** 用户信息 */
@@ -122,7 +128,7 @@ export declare type MessageBlock = MessageInterface & {
     };
 };
 /** 直播开播消息 */
-export declare type MessageLiveStart = MessageInterface & {
+export declare type MessageLiveStart = MessageBase & {
     type: "live_start";
     info: {
         /** 开播时间 */
@@ -130,7 +136,7 @@ export declare type MessageLiveStart = MessageInterface & {
     };
 };
 /** 直播切断消息 */
-export declare type MessageLiveCut = MessageInterface & {
+export declare type MessageLiveCut = MessageBase & {
     type: "live_cut";
     info: {
         /** 切断消息 */
@@ -138,17 +144,17 @@ export declare type MessageLiveCut = MessageInterface & {
     };
 };
 /** 直播数据更新 */
-export declare type MessageLiveStats = MessageInterface & {
+export declare type MessageLiveStats = MessageBase & {
     type: "live_stats";
     info: RoomStatsInfo;
 };
 /** 直播信息更新 */
-export declare type MessageLiveChange = MessageInterface & {
+export declare type MessageLiveChange = MessageBase & {
     type: "live_change";
     info: RoomBaseInfo;
 };
 /** 直播结束 */
-export declare type MessageLiveEnd = MessageInterface & {
+export declare type MessageLiveEnd = MessageBase & {
     type: "live_end";
     info: {
         /** 直播状态 */