floating-live 0.14.1 → 0.14.3

package/README.md

@@ -26,7 +26,7 @@ const live = new FloatingLive()
 live.plugin.register(bilibili)
 
 // 添加房间并自动打开
-live.rooms.add("bilibili", 6, true)
+live.room.add("bilibili", 6, true)
 ```
 
 ### 拆包即用模式

package/package.json

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

package/plugin/acfun/acfunLive.d.ts

@@ -36,7 +36,7 @@ declare class acfunLive extends LiveRoom {
     /** 直播间是否可用 */
     get available(): boolean;
     constructor(id: number, open?: boolean);
-    getInfo(): Promise<void>;
+    getInfo(): Promise<import("../..").RoomInfo>;
     /** 开启直播间监听 */
     open(): Promise<void>;
     /** 初始化直播服务端监听 */

package/plugin/acfun/acfunLive.js

@@ -84,6 +84,7 @@ class acfunLive extends __1.LiveRoom {
             });
         }
         // 暂不能在连接房间后更新信息
+        return this.info;
     }
     /** 开启直播间监听 */
     async open() {

package/plugin/acfun/index.js

@@ -7,7 +7,7 @@ module.exports = () => {
     return {
         name: "acfun",
         register: (ctx) => {
-            ctx.rooms.generator.register("acfun", (id, open) => {
+            ctx.room.generator.register("acfun", (id, open) => {
                 return new acfunLive_1.default(Number(id), open);
             });
         },

package/plugin/bilibili/index.js

@@ -18,7 +18,7 @@ module.exports = () => {
     return {
         name: "bilibili",
         register: (ctx) => {
-            ctx.rooms.generator.register("bilibili", (id, open, config) => {
+            ctx.room.generator.register("bilibili", (id, open, config) => {
                 return new room_1.default(Number(id), open, config);
             });
             ctx.auth.options.register("bilibili", authConfig);

package/plugin/bilibili/room.d.ts

@@ -42,7 +42,7 @@ declare class RoomBilibili extends LiveRoom {
         connectInterval?: number;
     });
     /** 获取房间信息 */
-    getInfo(): Promise<void>;
+    getInfo(): Promise<import("../..").RoomInfo>;
     /** 开启直播间监听 */
     open(): Promise<void>;
     /** 设置登录凭据 */

package/plugin/bilibili/room.js

@@ -111,6 +111,7 @@ class RoomBilibili extends LiveRoom_1.LiveRoom {
             .catch((error) => {
             console.error(error);
         });
+        return this.info;
     }
     /** 开启直播间监听 */
     async open() {

package/plugin/msgSave/index.js

@@ -15,7 +15,7 @@ const messageSave = () => {
             });
             // 直播状态改变时，更新保存信息
             ctx.on("room:status", (roomKey, status, { timestamp }) => {
-                const { platform, id } = ctx.rooms.get(roomKey).info;
+                const { platform, id } = ctx.room.get(roomKey).info;
                 saveMessage.setSaveInfo({
                     platform,
                     room: id,

package/plugin/msgSave/msgSave.js

@@ -121,7 +121,7 @@ class MsgSave {
     }
     /** 创建保存信息，用于记录信息可能不存在的情况 */
     createSaveInfo({ platform, room, }) {
-        const { status, timestamp } = this.main.rooms.get(`${platform}:${room}`)
+        const { status, timestamp } = this.main.room.get(`${platform}:${room}`)
             ?.info || { status: __1.RoomStatus.off, timestamp: 0 };
         const saveInfoConfig = {
             platform,
@@ -153,7 +153,7 @@ class MsgSave {
             statusChanged: saveInfo.statusChanged,
             index: saveInfo.totalCount,
             part: saveInfo.part,
-            roomInfo: this.main.rooms.get(roomKey)?.info,
+            roomInfo: this.main.room.get(roomKey)?.info,
         };
         fs_extra_1.default.writeFileSync(file, JSON.stringify(message) + ",", {
             encoding: "utf8",

package/src/abstract/LiveRoom.d.ts

@@ -32,7 +32,7 @@ export declare abstract class LiveRoom extends EventEmitter implements RoomInfo
     /** 关闭连接 */
     abstract close(): void;
     /** 从服务器获取信息 */
-    abstract getInfo(): Promise<void>;
+    abstract getInfo(): Promise<RoomInfo>;
     /** 销毁事件 */
     protected onDestory?(): void;
     /** 销毁 */

package/src/index.d.ts

@@ -1,14 +1,14 @@
 /// <reference types="node" />
 import { EventEmitter } from "events";
 import { ModPlugin } from "./module/ModPlugin";
-import { ModRooms } from "./module/ModRooms";
+import { ModRoom } from "./module/ModRoom";
 import { ModAuth } from "./module/ModAuth";
 import { ModMessage } from "./module/ModMessage";
 import { ModState } from "./module/ModState";
 import ModCommand from "./module/ModCommand";
 export declare class FloatingLive extends EventEmitter {
     /** 房间控制模块 */
-    rooms: ModRooms;
+    room: ModRoom;
     /** 消息处理模块 */
     message: ModMessage;
     /** 用户登录凭据模块 */

package/src/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FloatingLive = void 0;
 const events_1 = require("events");
 const ModPlugin_1 = require("./module/ModPlugin");
-const ModRooms_1 = require("./module/ModRooms");
+const ModRoom_1 = require("./module/ModRoom");
 const ModAuth_1 = require("./module/ModAuth");
 const ModMessage_1 = require("./module/ModMessage");
 const ModState_1 = require("./module/ModState");
@@ -19,7 +19,7 @@ class FloatingLive extends events_1.EventEmitter {
         this.command = new ModCommand_1.default(this);
         this.state = new ModState_1.ModState(this);
         this.plugin = new ModPlugin_1.ModPlugin(this);
-        this.rooms = new ModRooms_1.ModRooms(this);
+        this.room = new ModRoom_1.ModRoom(this);
         this.message = new ModMessage_1.ModMessage(this);
         this.auth = new ModAuth_1.ModAuth(this);
         this.init();

package/src/module/ModAuth.js

@@ -22,7 +22,7 @@ class ModAuth {
         });
     }
     set(name, auth) {
-        this.main.rooms.setAuth(name, auth);
+        this.main.room.setAuth(name, auth);
     }
 }
 exports.ModAuth = ModAuth;

package/src/module/ModCommand.d.ts

@@ -1,6 +1,6 @@
 import { FloatingLive } from "..";
 import { Reglist } from "../abstract/Reglist";
-export default class ModCommand extends Reglist<(e: any, ...args: any[]) => any> {
+export default class ModCommand extends Reglist<(...args: any[]) => any> {
     constructor(main: FloatingLive);
     /** 批量注册命令 */
     batchRegister(list: Record<string, (...args: any) => any>): void;

package/src/module/ModCommand.js

@@ -13,7 +13,7 @@ class ModCommand extends Reglist_1.Reglist {
     }
     /** 执行命令 */
     execute(name, ...args) {
-        return this.get(name)?.(null, ...args);
+        return this.get(name)?.(...args);
     }
 }
 exports.default = ModCommand;

package/src/module/{ModRooms.d.ts → ModRoom.d.ts}

@@ -3,7 +3,7 @@ import { LiveRoom } from "../abstract/LiveRoom";
 import { FloatingLive } from "..";
 import { RoomInfo } from "../types";
 /** 直播间监听实例控制器 */
-export declare class ModRooms {
+export declare class ModRoom {
     readonly main: FloatingLive;
     private roomMap;
     private auths;

package/src/module/{ModRooms.js → ModRoom.js}

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModRooms = void 0;
+exports.ModRoom = void 0;
 const Reglist_1 = require("../abstract/Reglist");
 /** 直播间监听实例控制器 */
-class ModRooms {
+class ModRoom {
     constructor(main) {
         this.roomMap = new Map();
         this.auths = new Map();
         this.configs = new Map();
         this.main = main;
-        this.generator = new Reglist_1.Reglist(this.main, "rooms.generator");
-        this.main.state.register("rooms", () => {
+        this.generator = new Reglist_1.Reglist(this.main, "room.generator");
+        this.main.state.register("room", () => {
             const list = [];
             this.roomMap.forEach((room) => {
                 list.push(room.info);
@@ -156,4 +156,4 @@ class ModRooms {
         room?.opened && room.close();
     }
 }
-exports.ModRooms = ModRooms;
+exports.ModRoom = ModRoom;