floating-live 0.8.4 → 0.8.6

package/package.json

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

package/plugin/acfun/acfunLive.d.ts

@@ -4,6 +4,7 @@ import LiveRoom from "../../src/types/room/LiveRoom";
 import AcClient from "acfun-live-danmaku/client";
 import { EventEmitter } from "events";
 import { LiveInfo } from "../../src/types/room/LiveInfo";
+import { MessageType } from "../../src/types/message/MessageData";
 declare class acfunLive extends EventEmitter implements LiveRoom {
     /** 平台id */
     readonly platform: string;
@@ -68,7 +69,8 @@ declare class acfunLive extends EventEmitter implements LiveRoom {
     msg_LiveClosed(): void;
     msg_LiveBanned(): void;
     msg_DisplayInfo(data: any): void;
-    emitMsg(data: any): void;
+    emitMsg(data: MessageType): void;
     emitOrigin(data: any): void;
+    emitChange(data: Partial<LiveInfo>): void;
 }
 export default acfunLive;

package/plugin/acfun/acfunLive.js

@@ -203,8 +203,8 @@ class acfunLive extends events_1.EventEmitter {
                 status: "off"
             }
         };
-        this.live.status = "off";
         this.client = null;
+        this.emit("change", { status: "off" });
         this.emitMsg(off);
     }
     msg_LiveBanned() {
@@ -217,8 +217,8 @@ class acfunLive extends events_1.EventEmitter {
                 message: ""
             }
         };
-        this.live.status = "off";
         this.client = null;
+        this.emit("change", { status: "off" });
         this.emitMsg(cut);
     }
     msg_DisplayInfo(data) {
@@ -232,5 +232,10 @@ class acfunLive extends events_1.EventEmitter {
         // 源消息
         this.emit("origin", data);
     }
+    emitChange(data) {
+        this.live = Object.assign(this.live, data);
+        // 直播信息
+        this.emit("change", data);
+    }
 }
 exports.default = acfunLive;

package/plugin/bilibili/bilibiliLive.d.ts

@@ -39,6 +39,7 @@ declare class bilibiliLive extends EventEmitter implements LiveRoom {
     destory(): void;
     emitMsg(data: any): void;
     emitOrigin(data: any): void;
+    emitChange(data: Partial<LiveInfo>): void;
     getDanmakuMode(n: number): string;
     /** 获取弹幕消息 */
     msg_DANMU_MSG(msg: any): void;
@@ -54,5 +55,6 @@ declare class bilibiliLive extends EventEmitter implements LiveRoom {
     msg_LIVE(msg: any): void;
     msg_CUT_OFF(msg: any): void;
     msg_PREPARING(msg: any): void;
+    msg_ROOM_CHANGE(msg: any): void;
 }
 export default bilibiliLive;

package/plugin/bilibili/bilibiliLive.js

@@ -111,6 +111,7 @@ class bilibiliLive extends events_1.EventEmitter {
         client.on("CUT_OFF", this.msg_CUT_OFF.bind(this));
         client.on("PREPARING", this.msg_PREPARING.bind(this));
         client.on("LIVE", this.msg_LIVE.bind(this));
+        client.on("ROOM_CHANGE", this.msg_ROOM_CHANGE.bind(this));
     }
     close() {
         if (!this.opening)
@@ -131,6 +132,11 @@ class bilibiliLive extends events_1.EventEmitter {
         // 源消息
         this.emit("origin", data);
     }
+    emitChange(data) {
+        this.live = Object.assign(this.live, data);
+        // 直播信息
+        this.emit("change", data);
+    }
     getDanmakuMode(n) {
         switch (n) {
             case 1:
@@ -386,7 +392,7 @@ class bilibiliLive extends events_1.EventEmitter {
                     start_time: msg.live_time * 1000,
                 },
             };
-            this.live.status = "live";
+            this.emitChange({ status: "live" });
             this.emitMsg(live);
         }
     }
@@ -401,7 +407,7 @@ class bilibiliLive extends events_1.EventEmitter {
                 message: msg.msg,
             },
         };
-        this.live.status = "off";
+        this.emitChange({ status: "off" });
         this.emitMsg(cut);
     }
     msg_PREPARING(msg) {
@@ -414,8 +420,21 @@ class bilibiliLive extends events_1.EventEmitter {
                 status: msg.round ? "round" : "off"
             }
         };
-        this.live.status = msg.round ? "round" : "off";
+        this.emitChange({ status: msg.round ? "round" : "off" });
         this.emitMsg(off);
     }
+    msg_ROOM_CHANGE(msg) {
+        let change = {
+            platform: "bilibili",
+            room: this.id,
+            type: "live_change",
+            info: {
+                title: msg.data.title,
+                area: [msg.data.parent_area_name, msg.data.area_name]
+            }
+        };
+        this.emitChange(change.info);
+        this.emitMsg(change);
+    }
 }
 exports.default = bilibiliLive;

package/src/controller/Room.d.ts

@@ -21,7 +21,7 @@ declare class Room {
     /** 获取房间 */
     get(roomKey: string): LiveRoom | undefined;
     /** 获取房间信息 */
-    getInfo(roomKey: string): import("../types/room/RoomInfo").default | undefined;
+    info(roomKey: string): import("../types/room/RoomInfo").default | undefined;
     /** 更新房间信息 */
     update(roomKey: string): void;
     /** 获取roomKey列表 */

package/src/controller/Room.js

@@ -52,9 +52,9 @@ class Room {
         room.on("info", () => {
             this.main.emit("room_info", key, (0, getRoomInfo_1.default)(room));
         });
-        // 更新直播间信息
-        room.on("update", (data) => {
-            this.main.emit("room_update", key, data);
+        // 直播信息更改
+        room.on("change", (data) => {
+            this.main.emit("room_change", key, data);
         });
         // 房间被打开
         room.on("open", () => {
@@ -72,20 +72,20 @@ class Room {
     /** 移除房间 */
     remove(roomKey) {
         if (!this.roomMap.has(roomKey)) {
-            this.main.emit("room", { key: "room_unexist", value: { key: roomKey } });
+            this.main.emit("room_unexist", roomKey);
             return;
         }
         let room = this.roomMap.get(roomKey);
         this.roomMap.delete(roomKey); // 从表中删除房间
         room?.removeAllListeners(); // 移除房间监听实例
-        this.main.emit("room", { key: "room_remove", value: { key: roomKey } });
+        this.main.emit("room_remove", roomKey);
     }
     /** 获取房间 */
     get(roomKey) {
         return this.roomMap.get(roomKey);
     }
     /** 获取房间信息 */
-    getInfo(roomKey) {
+    info(roomKey) {
         let room = this.roomMap.get(roomKey);
         return room ? (0, getRoomInfo_1.default)(room) : undefined;
     }