floating-live 0.16.0-alpha.16 → 0.16.0-alpha.17

package/dist/live/room.d.ts

@@ -21,12 +21,12 @@ export declare abstract class LiveRoom extends CustomEventEmitter implements Liv
     timestamp: number;
     /** 当前直播id */
     liveId?: string;
-    /** 房间是否打开 */
-    opened: boolean;
     /** 房间连接状态 */
-    connection: LiveConnectionStatus;
-    /** 房间是否可用 */
-    available: boolean;
+    connectionStatus: LiveConnectionStatus;
+    /** 房间开启状态 */
+    openStatus: LiveRoomOpenStatus;
+    get opened(): boolean;
+    get available(): boolean;
     /** 打开连接 */
     abstract open(): void;
     /** 关闭连接 */
@@ -78,12 +78,14 @@ export interface LiveRoomData {
     liveId?: string;
     /** 直播状态 */
     status: LiveRoomStatus;
-    /** 直播间是否可用 */
-    available: boolean;
-    /** 房间监听是否打开 */
-    opened: boolean;
     /** 房间连接状态 */
-    connection: LiveConnectionStatus;
+    connectionStatus: LiveConnectionStatus;
+    /** 房间监听状态 */
+    openStatus: LiveRoomOpenStatus;
+    /** 房间是否开启 */
+    opened: boolean;
+    /** 房间是否可用 */
+    available: boolean;
 }
 /** 房间展示信息 */
 export interface LiveRoomDetailInfo {
@@ -133,6 +135,18 @@ export declare const LiveConnectionStatus: {
     readonly disconnected: -1;
 };
 export type LiveConnectionStatus = EnumValue<typeof LiveConnectionStatus>;
+/** 直播间开启状态 */
+export declare const LiveRoomOpenStatus: {
+    /** 已关闭 */
+    readonly closed: 0;
+    /** 正在开启 */
+    readonly opening: 1;
+    /** 已开启 */
+    readonly opened: 2;
+    /** 不可用 */
+    readonly unavailable: -1;
+};
+export type LiveRoomOpenStatus = EnumValue<typeof LiveRoomOpenStatus>;
 export interface LiveRoomEventMap {
     /**  */
     status: {

package/dist/live/room.js

@@ -7,12 +7,16 @@ export class LiveRoom extends CustomEventEmitter {
         this.status = LiveRoomStatus.off;
         /** 时间戳 */
         this.timestamp = 0;
-        /** 房间是否打开 */
-        this.opened = false;
         /** 房间连接状态 */
-        this.connection = LiveConnectionStatus.off;
-        /** 房间是否可用 */
-        this.available = false;
+        this.connectionStatus = LiveConnectionStatus.off;
+        /** 房间开启状态 */
+        this.openStatus = -1;
+    }
+    get opened() {
+        return this.openStatus == 2;
+    }
+    get available() {
+        return this.openStatus > -1;
     }
     /** 销毁 */
     destroy() {
@@ -70,9 +74,10 @@ export class LiveRoom extends CustomEventEmitter {
             timestamp: this.timestamp,
             status: this.status,
             liveId: this.liveId,
-            available: this.available,
+            openStatus: this.openStatus,
             opened: this.opened,
-            connection: this.connection,
+            available: this.available,
+            connectionStatus: this.connectionStatus,
             key: this.key,
         };
     }
@@ -106,3 +111,14 @@ export const LiveConnectionStatus = {
     /** 连接失败或断开 */
     disconnected: -1,
 };
+/** 直播间开启状态 */
+export const LiveRoomOpenStatus = {
+    /** 已关闭 */
+    closed: 0,
+    /** 正在开启 */
+    opening: 1,
+    /** 已开启 */
+    opened: 2,
+    /** 不可用 */
+    unavailable: -1,
+};

package/dist/plugins/room/index.js

@@ -168,19 +168,35 @@ export class Room extends BasePlugin {
     /** 打开房间连接 */
     open(key) {
         let room = this.map.get(key);
-        room?.available && !room.opened && room.open();
+        if (!room) {
+            this.throw(new this.Error("room:open_unexist", {
+                message: "打开的房间不存在",
+                target: `room/${key}`,
+            }));
+        }
+        room.open();
     }
     /** 关闭房间连接 */
     close(key) {
         let room = this.map.get(key);
-        room?.opened && room.close();
+        if (!room) {
+            this.throw(new this.Error("room:close_unexist", {
+                message: "关闭的房间不存在",
+                target: `room/${key}`,
+            }));
+        }
+        room.close();
     }
     /** 更改某个房间的顺序 */
     move(key, position) {
         const arr = [...this.map];
         const index = arr.findIndex(([k]) => k == key);
-        if (index == -1)
-            return;
+        if (index == -1) {
+            this.throw(new this.Error("room:move_unexist", {
+                message: "要移动的房间不存在",
+                target: `room/${key}`,
+            }));
+        }
         const [item] = arr.splice(index, 1);
         arr.splice(position, 0, item);
         this.map = new Map(arr);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "floating-live",
-  "version": "0.16.0-alpha.16",
+  "version": "0.16.0-alpha.17",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",