floating-live 0.8.7 → 0.10.0

package/plugin/bilibili/bilibiliLive.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const bilibili_live_ws_1 = require("bilibili-live-ws");
 const axios_1 = __importDefault(require("axios"));
-const events_1 = require("events");
-class bilibiliLive extends events_1.EventEmitter {
+const LiveRoom_1 = require("../../src/lib/LiveRoom");
+class bilibiliLive extends LiveRoom_1.LiveRoom {
     constructor(id, // 房间id
     open = false, // 生成房间后是否打开
     config) {
@@ -16,33 +16,30 @@ class bilibiliLive extends events_1.EventEmitter {
         /** 直播间room_id */
         this.roomid = 0;
         /** 直播信息 */
-        this.live = {
+        this.base = {
             /** 直播标题 */
             title: "",
             /** 分区 */
             area: [],
             /** 封面url */
             cover: "",
-            /** 直播状态 */
-            status: "off",
-            /** 开始直播时间 */
-            start_time: 0
         };
-        this.cover = "";
+        /** 房间是否可用 */
+        this.available = false;
+        /** 是否连接上房间 */
+        this.connected = false;
         /** 主播信息 */
         this.anchor = { name: "", id: 0 };
-        /** 直播间是否可用 */
-        this.available = false;
         /** 直播间弹幕api模块 */
         this.client = null;
-        /** 是否为持续监听状态 */
-        this.opening = false;
         this.id = id; // 直播间号
         this.connectInterval = config?.connectInterval || 100;
-        this.getInfo().then(() => {
-            if (open)
-                this.open();
-        });
+        if (open) {
+            this.open();
+        }
+        else {
+            this.getInfo();
+        }
     }
     /** 获取房间信息 */
     async getInfo() {
@@ -51,30 +48,28 @@ class bilibiliLive extends events_1.EventEmitter {
             .then((res) => {
             let data = res.data.data;
             this.roomid = data.room_info.room_id;
-            this.live.status = data.room_info.live_status == 1 ? "live" : "off";
-            this.live.start_time = this.live.status == "live" ? data.room_info.live_start_time * 1000 : 0;
-            this.live.title = data.room_info.title;
+            this.status = data.room_info.live_status == 1 ? "live" : "off";
+            this.timestamp = this.status == "live" ? data.room_info.live_start_time * 1000 : 0;
+            this.base.title = data.room_info.title;
+            this.base.area = [data.room_info.parent_area_name, data.room_info.area_name];
+            this.base.cover = data.room_info.cover;
             this.anchor.id = data.room_info.uid;
             this.anchor.name = data.anchor_info.base_info.uname;
             this.anchor.avatar = data.anchor_info.base_info.face;
-            this.live.area = [data.room_info.parent_area_name, data.room_info.area_name];
-            this.cover = data.room_info.cover;
             this.available = true;
+            console.log("[bilibiliLive] 已获取房间信息");
+            this.emit("info", this.info);
         })
             .catch((error) => {
             console.error(error);
         });
-        console.log("[bilibiliLive] 已获取房间信息");
-        this.emit("info");
     }
     /** 开启直播间监听 */
     async open() {
+        await this.getInfo();
+        // 如果直播间监听已打开或直播间不可用，则返回
         if (this.opening || !this.available)
             return;
-        if (!this.roomid) {
-            console.log("[bilibili-live-ws] 未获取直播间room_id属性");
-            return;
-        }
         this.opening = true;
         this.createWS();
         this.emit("open");
@@ -120,23 +115,6 @@ class bilibiliLive extends events_1.EventEmitter {
         this.client?.close();
         this.emit("close");
     }
-    destory() {
-        this.close();
-        this.removeAllListeners();
-    }
-    emitMsg(data) {
-        // 一般消息
-        this.emit("msg", data);
-    }
-    emitOrigin(data) {
-        // 源消息
-        this.emit("origin", data);
-    }
-    emitChange(data) {
-        this.live = Object.assign(this.live, data);
-        // 直播信息
-        this.emit("change", data);
-    }
     getDanmakuMode(n) {
         switch (n) {
             case 1:
@@ -151,74 +129,68 @@ class bilibiliLive extends events_1.EventEmitter {
     }
     /** 获取弹幕消息 */
     msg_DANMU_MSG(msg) {
-        let text = msg.info[1];
+        let content = msg.info[1];
         let mode = this.getDanmakuMode(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],
-            privilege: msg.info[3][10] || 0,
+            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,
+                };
+            }
+        }
+        console.log(extra.emots);
+        console.log(emoticon);
         if (msg.info[2][2]) {
-            admin = 2;
+            identity = "admin";
         }
         else if (uid == this.anchor.id) {
-            admin = 1;
+            identity = "anchor";
         }
-        let danmaku;
-        if (msg.info[0][12]) {
-            danmaku = {
-                platform: "bilibili",
-                room: this.id,
-                type: "image",
-                local_timestamp: new Date().valueOf(),
-                info: {
-                    timestamp: timestamp,
-                    mode: mode,
-                    image: {
-                        name: text,
-                        id: msg.info[0][13].emoticon_unique,
-                        url: msg.info[0][13].url,
-                        size: [msg.info[0][13].width, msg.info[0][13].height],
-                    },
-                    user: {
-                        name: uname,
-                        id: uid,
-                        medal: medal,
-                        privilege: guard_level,
-                        admin: admin,
-                    }
+        let danmaku = {
+            platform: "bilibili",
+            room: this.id,
+            type: "chat",
+            record_time: new Date().valueOf(),
+            info: {
+                timestamp: timestamp,
+                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,
+                    height: msg.info[0][13].height / 3,
+                } : undefined,
+                emoticon: emoticon,
+                user: {
+                    name: uname,
+                    id: uid,
+                    medal: medal,
+                    membership: guard_level,
+                    identity: identity,
                 }
-            };
-        }
-        else {
-            danmaku = {
-                platform: "bilibili",
-                room: this.id,
-                type: "text",
-                local_timestamp: new Date().valueOf(),
-                info: {
-                    timestamp: timestamp,
-                    text: text,
-                    color: color,
-                    mode: mode,
-                    user: {
-                        name: uname,
-                        id: uid,
-                        medal: medal,
-                        privilege: guard_level,
-                        admin: admin,
-                    }
-                },
-            };
-        }
+            }
+        };
         this.emitMsg(danmaku);
     }
     /** 获取互动消息 */
@@ -242,7 +214,7 @@ class bilibiliLive extends events_1.EventEmitter {
             platform: "bilibili",
             room: this.id,
             type: type,
-            local_timestamp: new Date().valueOf(),
+            record_time: new Date().valueOf(),
             info: {
                 timestamp: Math.floor(data.trigger_time / 1000000),
                 user: {
@@ -252,7 +224,7 @@ class bilibiliLive extends events_1.EventEmitter {
                         level: data.fans_medal.medal_level,
                         name: data.fans_medal.medal_name,
                         id: data.fans_medal.target_id,
-                        privilege: data.fans_medal.guard_level,
+                        membership: data.fans_medal.guard_level,
                     } : null
                 }
             },
@@ -266,7 +238,7 @@ class bilibiliLive extends events_1.EventEmitter {
             platform: "bilibili",
             room: this.id,
             type: "gift",
-            local_timestamp: new Date().valueOf(),
+            record_time: new Date().valueOf(),
             info: {
                 timestamp: data.timestamp * 1000,
                 user: {
@@ -276,9 +248,9 @@ class bilibiliLive extends events_1.EventEmitter {
                         level: data.fans_medal.medal_level,
                         name: data.fans_medal.medal_name,
                         id: data.fans_medal.target_id,
-                        privilege: data.fans_medal.guard_level,
+                        membership: data.fans_medal.guard_level,
                     } : null,
-                    privilege: data.guard_level,
+                    membership: data.guard_level,
                     avatar: data.face
                 },
                 gift: {
@@ -300,14 +272,14 @@ class bilibiliLive extends events_1.EventEmitter {
         let gift = {
             platform: "bilibili",
             room: this.id,
-            type: "privilege",
-            local_timestamp: new Date().valueOf(),
+            type: "membership",
+            record_time: new Date().valueOf(),
             info: {
                 timestamp: data.start_time * 1000,
                 user: {
                     name: data.username,
                     id: data.uid,
-                    privilege: data.guard_level,
+                    membership: data.guard_level,
                 },
                 gift: {
                     name: data.gift_name,
@@ -330,7 +302,7 @@ class bilibiliLive extends events_1.EventEmitter {
             platform: "bilibili",
             room: this.id,
             type: "superchat",
-            local_timestamp: new Date().valueOf(),
+            record_time: new Date().valueOf(),
             info: {
                 id: data.id,
                 timestamp: data.ts * 1000,
@@ -342,11 +314,11 @@ class bilibiliLive extends events_1.EventEmitter {
                         level: data.medal_info.medal_level,
                         name: data.medal_info.medal_name,
                         id: data.medal_info.target_id,
-                        privilege: data.medal_info.guard_level,
+                        membership: data.medal_info.guard_level,
                     } : null,
-                    privilege: data.user_info.guard_level,
+                    membership: data.user_info.guard_level,
                 },
-                text: data.message,
+                content: data.message,
                 color: data.background_bottom_color,
                 duration: data.time * 1000,
                 gift: {
@@ -367,14 +339,14 @@ class bilibiliLive extends events_1.EventEmitter {
             platform: "bilibili",
             room: this.id,
             type: "block",
-            local_timestamp: new Date().valueOf(),
+            record_time: new Date().valueOf(),
             info: {
                 user: {
                     id: data.uid,
                     name: data.uname
                 },
                 operator: {
-                    admin: data.operator == 2 ? 1 : 2
+                    identity: data.operator == 2 ? "anchor" : "admin"
                 }
             },
         };
@@ -387,12 +359,11 @@ class bilibiliLive extends events_1.EventEmitter {
                 platform: "bilibili",
                 room: this.id,
                 type: "live_start",
-                local_timestamp: new Date().valueOf(),
+                record_time: new Date().valueOf(),
                 info: {
-                    start_time: msg.live_time * 1000,
+                    timestamp: msg.live_time * 1000,
                 },
             };
-            this.emitChange({ status: "live" });
             this.emitMsg(live);
         }
     }
@@ -402,12 +373,11 @@ class bilibiliLive extends events_1.EventEmitter {
             platform: "bilibili",
             room: this.id,
             type: "live_cut",
-            local_timestamp: new Date().valueOf(),
+            record_time: new Date().valueOf(),
             info: {
                 message: msg.msg,
             },
         };
-        this.emitChange({ status: "off" });
         this.emitMsg(cut);
     }
     msg_PREPARING(msg) {
@@ -415,12 +385,11 @@ class bilibiliLive extends events_1.EventEmitter {
             platform: "bilibili",
             room: this.id,
             type: "live_end",
-            local_timestamp: new Date().valueOf(),
+            record_time: new Date().valueOf(),
             info: {
                 status: msg.round ? "round" : "off"
             }
         };
-        this.emitChange({ status: msg.round ? "round" : "off" });
         this.emitMsg(off);
     }
     msg_ROOM_CHANGE(msg) {
@@ -428,12 +397,12 @@ class bilibiliLive extends events_1.EventEmitter {
             platform: "bilibili",
             room: this.id,
             type: "live_change",
+            record_time: new Date().valueOf(),
             info: {
                 title: msg.data.title,
                 area: [msg.data.parent_area_name, msg.data.area_name]
             }
         };
-        this.emitChange(change.info);
         this.emitMsg(change);
     }
 }

package/plugin/bilibili/index.d.ts

@@ -1,3 +1,3 @@
-import FloatingLive from "../../src/index";
+import { FloatingLive } from "../../src/index";
 declare const _default: (ctx: FloatingLive) => void;
 export = _default;

package/plugin/bilibili/index.js

@@ -5,8 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 const bilibiliLive_1 = __importDefault(require("./bilibiliLive"));
 module.exports = (ctx) => {
     ctx.helper.roomGenerator.register("bilibili", (id, open) => {
-        let key = `bilibili:${Number(id)}`;
-        let room = new bilibiliLive_1.default(Number(id), open);
-        return { key, room };
+        return new bilibiliLive_1.default(Number(id), open);
     });
 };

package/plugin/chatPrint/chatPrint.d.ts

@@ -1,11 +1,11 @@
-import FloatingLiving from "../..";
+import { FloatingLive } from "../..";
 import { UserInfo } from "../../src/types/message/AttributeInfo";
-import { MessageType } from "../../src/types/message/MessageData";
-declare class chatPrint {
+import { MessageData } from "../../src/types/message/MessageData";
+export declare class chatPrint {
     /** 主模块 */
-    main: FloatingLiving;
+    main: FloatingLive;
     hideType: Set<string>;
-    constructor(main: FloatingLiving);
+    constructor(main: FloatingLive);
     /** 获取用户信息 */
     getUserInfo(message: {
         platform: string;
@@ -16,6 +16,5 @@ declare class chatPrint {
     /** 获取特权粉丝名称 */
     getPriviliegeName(platform: string, level: number | boolean): string | number | boolean;
     /** 记录在控制台上 */
-    log(message: MessageType): void;
+    log(message: MessageData): void;
 }
-export default chatPrint;

package/plugin/chatPrint/chatPrint.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.chatPrint = void 0;
 class chatPrint {
     constructor(main) {
         this.main = main;
@@ -12,9 +13,9 @@ class chatPrint {
         let user = message.info.user; // 用户信息
         let name = `${"\x1b[33m"}${user.name}`; // 用户名
         let medal = user.medal ? `${"\x1b[32m"}[${user.medal.name}(${user.medal.level})] ` : ""; // 粉丝牌
-        let privilege = user.privilege ? `${"\x1b[36m"}[${this.getPriviliegeName(message.platform, user.privilege)}]` : ""; // 特权粉丝
-        let admin = user.admin ? `${"\x1b[95m"}[${["", "主播", "房"][user.admin]}]` : ""; // 房管
-        return `${medal}${privilege}${admin}${name}${"\x1b[0m"}`; //[粉丝牌(等级)] [特权][房管]用户名
+        let membership = user.membership ? `${"\x1b[36m"}[${this.getPriviliegeName(message.platform, user.membership)}]` : ""; // 特权粉丝
+        let identity = user.identity ? `${"\x1b[95m"}[${{ admin: "房管", anchor: "主播" }[user.identity]}]` : ""; // 房管
+        return `${medal}${membership}${identity}${name}${"\x1b[0m"}`; //[粉丝牌(等级)] [特权][房管]用户名
     }
     /** 获取特权粉丝名称 */
     getPriviliegeName(platform, level) {
@@ -31,16 +32,10 @@ class chatPrint {
             return;
         }
         switch (message.type) {
-            case "text": {
+            case "chat": {
                 let user = this.getUserInfo(message);
-                let text = message.info.text;
-                console.log(`${user}: ${text}`);
-                break;
-            }
-            case "image": {
-                let user = this.getUserInfo(message);
-                let image = message.info.image.name || message.info.image.id;
-                console.log(`${user}: [img]${image}`);
+                let content = message.info.content;
+                console.log(`${user}: ${message.info.image ? "[img]" : ""}${content}`);
                 break;
             }
             case "like": {
@@ -56,17 +51,16 @@ class chatPrint {
                 console.log(`${user}${"\x1b[0m"} ${action} ${"\x1b[40;33m"}${name} x${num}${"\x1b[0m"}`);
                 break;
             }
-            case "privilege": {
+            case "membership": {
                 let user = this.getUserInfo(message);
                 let name = message.info.name;
-                let action = message.info.renew ? ["开通", "续费", "自动续费"][message.info.renew] : "开通";
-                console.log(`${user}${"\x1b[1;31m"} ${action}了主播的${"\x1b[33m"}${name}${"\x1b[0m"}`);
+                console.log(`${user}${"\x1b[1;31m"} 开通了主播的${"\x1b[33m"}${name}${"\x1b[0m"}`);
                 break;
             }
             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": {
@@ -86,7 +80,7 @@ class chatPrint {
             }
             case "block": {
                 let user = this.getUserInfo(message);
-                let operator = message.info.operator.admin ? ["", "主播", "房管"][message.info.operator.admin] : "管理员";
+                let operator = message.info.operator.identity ? { admin: "房管", anchor: "主播" }[message.info.operator.identity] : "管理员";
                 console.log(`${user} 已被${operator}禁言`);
                 break;
             }
@@ -108,4 +102,4 @@ class chatPrint {
         }
     }
 }
-exports.default = chatPrint;
+exports.chatPrint = chatPrint;

package/plugin/chatPrint/index.d.ts

@@ -1,4 +1,4 @@
-import FloatingLive from "../../src";
-import chatPrint from "./chatPrint";
+import { FloatingLive } from "../../src";
+import { chatPrint } from "./chatPrint";
 declare const _default: (ctx: FloatingLive) => chatPrint;
 export = _default;

package/plugin/chatPrint/index.js

@@ -1,8 +1,5 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const chatPrint_1 = __importDefault(require("./chatPrint"));
+const chatPrint_1 = require("./chatPrint");
 module.exports = (ctx) => {
-    return new chatPrint_1.default(ctx);
+    return new chatPrint_1.chatPrint(ctx);
 };

package/plugin/consoleEvent/index.d.ts

@@ -1,3 +1,3 @@
-import FloatingLive from "../../src";
+import { FloatingLive } from "../../src";
 declare const _default: (ctx: FloatingLive) => void;
 export = _default;

package/plugin/consoleEvent/index.js

@@ -1,10 +1,10 @@
 "use strict";
 module.exports = (ctx) => {
     ctx.on("start", () => {
-        console.log(`[controller]记录已开始: ${ctx.controller.timestamp}`);
+        console.log(`[controller]记录已开始: ${ctx.timestamp}`);
     });
     ctx.on("end", () => {
-        console.log(`[controller]记录已结束: ${ctx.controller.timestamp}`);
+        console.log(`[controller]记录已结束: ${ctx.timestamp}`);
     });
     ctx.on("room_connect", (key) => {
         console.log(`[${key}]已连接到直播服务器`);
@@ -36,4 +36,16 @@ module.exports = (ctx) => {
     ctx.on("room_unexist", (key) => {
         console.log(`[room]房间不存在: ${key}`);
     });
+    ctx.on("plugin_add", (name) => {
+        console.log(`[plugin]已添加插件: ${name}`);
+    });
+    ctx.on("plugin_remove", (name) => {
+        console.log(`[plugin]已移除插件: ${name}`);
+    });
+    ctx.on("plugin_unexist", (name) => {
+        console.log(`[plugin]插件不存在: ${name}`);
+    });
+    ctx.on("plugin_duplicate", (name) => {
+        console.log(`[plugin]插件名称重复: ${name}`);
+    });
 };

package/plugin/msgSave/index.d.ts

@@ -1,4 +1,4 @@
-import FloatingLive from "../../src";
+import { FloatingLive } from "../../src";
 import msgSave from "../msgSave/msgSave";
 export declare const messageSave: (ctx: FloatingLive) => msgSave;
 export declare const messageSaveOrigin: (ctx: FloatingLive) => msgSave;

package/plugin/msgSave/index.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.messageSaveOrigin = exports.messageSave = void 0;
 const msgSave_1 = __importDefault(require("../msgSave/msgSave"));
 const messageSave = (ctx) => {
-    let saveMessage = new msgSave_1.default(ctx, "live_message", `./save/undefined.txt`, ctx.controller.started);
+    let saveMessage = new msgSave_1.default(ctx, "live_message", `./save/undefined.txt`, ctx.started);
     ctx.on("start", () => {
-        let startDate = new Date(ctx.controller.timestamp);
-        let fileId = `${startDate.getFullYear()}${(startDate.getMonth() + 1).toString().padStart(2, '0')}${startDate.getDate().toString().padStart(2, '0')}_${startDate.getHours().toString().padStart(2, '0')}${startDate.getMinutes().toString().padStart(2, '0')}${startDate.getSeconds().toString().padStart(2, '0')}-${String(ctx.controller.room.keyList[0]).replace(":", "-")}`;
+        let startDate = new Date(ctx.timestamp);
+        let fileId = `${startDate.getFullYear()}${(startDate.getMonth() + 1).toString().padStart(2, '0')}${startDate.getDate().toString().padStart(2, '0')}_${startDate.getHours().toString().padStart(2, '0')}${startDate.getMinutes().toString().padStart(2, '0')}${startDate.getSeconds().toString().padStart(2, '0')}-${String(ctx.room.keyList[0]).replace(":", "-")}`;
         saveMessage.changeFile(`./save/${fileId}.txt`);
         saveMessage.start();
     });
@@ -18,10 +18,10 @@ const messageSave = (ctx) => {
 };
 exports.messageSave = messageSave;
 const messageSaveOrigin = (ctx) => {
-    let saveOrigin = new msgSave_1.default(ctx, "live_origin", `./save/undefined-origin.txt`, ctx.controller.started);
+    let saveOrigin = new msgSave_1.default(ctx, "live_origin", `./save/undefined-origin.txt`, ctx.started);
     ctx.on("start", () => {
-        let startDate = new Date(ctx.controller.timestamp);
-        let fileId = `${startDate.getFullYear()}${(startDate.getMonth() + 1).toString().padStart(2, '0')}${startDate.getDate().toString().padStart(2, '0')}_${startDate.getHours().toString().padStart(2, '0')}${startDate.getMinutes().toString().padStart(2, '0')}${startDate.getSeconds().toString().padStart(2, '0')}-${String(ctx.controller.room.keyList[0]).replace(":", "-")}`;
+        let startDate = new Date(ctx.timestamp);
+        let fileId = `${startDate.getFullYear()}${(startDate.getMonth() + 1).toString().padStart(2, '0')}${startDate.getDate().toString().padStart(2, '0')}_${startDate.getHours().toString().padStart(2, '0')}${startDate.getMinutes().toString().padStart(2, '0')}${startDate.getSeconds().toString().padStart(2, '0')}-${String(ctx.room.keyList[0]).replace(":", "-")}`;
         saveOrigin.changeFile(`./save/${fileId}-origin.txt`);
         saveOrigin.start();
     });

package/plugin/msgSave/msgSave.d.ts

@@ -1,13 +1,13 @@
-import FloatingLiving from "../..";
+import { FloatingLive } from "../..";
 declare class msgSave {
     /** 主模块 */
-    main: FloatingLiving;
+    main: FloatingLive;
     file: string;
     config: object;
     type: string;
     paused: boolean;
     listener: (msg: any) => void;
-    constructor(main: FloatingLiving, type: string, file: string, open?: boolean, config?: {
+    constructor(main: FloatingLive, type: string, file: string, open?: boolean, config?: {
         encoding: string;
         flag: string;
     });