floating-live 0.15.0-beta.5 → 0.15.0-beta.6

package/dist/core/LiveRoom.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { EventEmitter } from "events";
-import { RoomStatus } from "../enums";
+import { ConnectStatus, RoomStatus } from "../enums";
 import { RoomDetail, RoomInfo, RoomStatsInfo } from "../types";
 import { Message, UserInfo } from "../types/message";
 export declare abstract class LiveRoom extends EventEmitter implements RoomInfo {
@@ -22,11 +22,11 @@ export declare abstract class LiveRoom extends EventEmitter implements RoomInfo
     /** 当前直播id */
     liveId?: string;
     /** 房间是否打开 */
-    opened: boolean;
+    get opened(): boolean;
+    /** 是否连接上房间 */
+    connection: ConnectStatus;
     /** 房间是否可用 */
     abstract available: boolean;
-    /** 是否连接上房间 */
-    abstract connected: boolean;
     /** 打开连接 */
     abstract open(): void;
     /** 关闭连接 */
@@ -34,7 +34,7 @@ export declare abstract class LiveRoom extends EventEmitter implements RoomInfo
     /** 从服务器获取信息 */
     abstract getInfo(): Promise<void>;
     /** 销毁事件 */
-    protected onDestory?(): void;
+    protected onDestroy?(): void;
     /** 销毁 */
     destroy(): void;
     protected emitMsg(msg: Message.All): void;

package/dist/core/LiveRoom.js

@@ -10,14 +10,18 @@ class LiveRoom extends events_1.EventEmitter {
         this.status = enums_1.RoomStatus.off;
         /** 时间戳 */
         this.timestamp = 0;
-        /** 房间是否打开 */
-        this.opened = false;
+        /** 是否连接上房间 */
+        this.connection = enums_1.ConnectStatus.off;
+    }
+    /** 房间是否打开 */
+    get opened() {
+        return !!this.connection;
     }
     /** 销毁 */
     destroy() {
         this.close();
         this.removeAllListeners();
-        this.onDestory?.();
+        this.onDestroy?.();
     }
     // 发送消息
     emitMsg(msg) {
@@ -42,9 +46,9 @@ class LiveRoom extends events_1.EventEmitter {
                 break;
             case "live_end":
             case "live_cut":
-                this.emit("msg", msg);
                 this.status = msg.status || enums_1.RoomStatus.off;
                 this.timestamp = msg.timestamp;
+                this.emit("msg", msg);
                 this.emit("status", msg.status || enums_1.RoomStatus.off, {
                     timestamp: msg.timestamp,
                 });
@@ -68,7 +72,7 @@ class LiveRoom extends events_1.EventEmitter {
             liveId: this.liveId,
             available: this.available,
             opened: this.opened,
-            connected: this.connected,
+            connection: this.connection,
             key: this.key,
         };
     }

package/dist/enums.d.ts

@@ -11,6 +11,19 @@ export declare enum RoomStatus {
     /** 已上锁 */
     locked = -2
 }
+/** 直播间状态 */
+export declare enum ConnectStatus {
+    /** 未连接 */
+    off = 0,
+    /** 连接中 */
+    connecting = 1,
+    /** 连接到服务器 */
+    connected = 2,
+    /** 连接到房间 */
+    entered = 3,
+    /** 连接失败或断开 */
+    disconnected = -1
+}
 /** 图片大小 */
 export declare enum ImageSize {
     /** 自定义大小 */

package/dist/enums.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserType = exports.DanmakuMode = exports.ImageSize = exports.RoomStatus = void 0;
+exports.UserType = exports.DanmakuMode = exports.ImageSize = exports.ConnectStatus = exports.RoomStatus = void 0;
 /** 直播间状态 */
 var RoomStatus;
 (function (RoomStatus) {
@@ -15,6 +15,20 @@ var RoomStatus;
     /** 已上锁 */
     RoomStatus[RoomStatus["locked"] = -2] = "locked";
 })(RoomStatus = exports.RoomStatus || (exports.RoomStatus = {}));
+/** 直播间状态 */
+var ConnectStatus;
+(function (ConnectStatus) {
+    /** 未连接 */
+    ConnectStatus[ConnectStatus["off"] = 0] = "off";
+    /** 连接中 */
+    ConnectStatus[ConnectStatus["connecting"] = 1] = "connecting";
+    /** 连接到服务器 */
+    ConnectStatus[ConnectStatus["connected"] = 2] = "connected";
+    /** 连接到房间 */
+    ConnectStatus[ConnectStatus["entered"] = 3] = "entered";
+    /** 连接失败或断开 */
+    ConnectStatus[ConnectStatus["disconnected"] = -1] = "disconnected";
+})(ConnectStatus = exports.ConnectStatus || (exports.ConnectStatus = {}));
 /** 图片大小 */
 var ImageSize;
 (function (ImageSize) {

package/dist/module/room.js

@@ -35,14 +35,18 @@ class ModRoom {
         room.on("raw", (data, { platform, room }) => {
             this.main.emit("live:raw", data, { platform, room });
         });
-        // 连接到直播间
+        // 连接到服务器
         room.on("connect", () => {
             this.main.emit("room:connect", key);
         });
-        // 与直播间的连接已断开
+        // 与服务器的连接已断开
         room.on("disconnect", () => {
             this.main.emit("room:disconnect", key);
         });
+        // 连接到直播间
+        room.on("enter", () => {
+            this.main.emit("room:enter", key);
+        });
         // 获取房间信息
         room.on("info", () => {
             this.main.emit("room:info", key, room.info);

package/dist/types/events.d.ts

@@ -8,6 +8,7 @@ export interface FloatingEventMap {
         room: string | number;
     }) => void;
     "room:connect": (key: string) => void;
+    "room:enter": (key: string) => void;
     "room:disconnect": (key: string) => void;
     "room:info": (key: string, info: RoomInfo) => void;
     "room:detail": (key: string, info: RoomDetail) => void;

package/dist/types/room.d.ts

@@ -1,4 +1,4 @@
-import { RoomStatus } from "../enums";
+import { ConnectStatus, RoomStatus } from "../enums";
 import { UserInfo } from "./message";
 /** 房间配置 */
 export interface RoomConfig {
@@ -33,8 +33,8 @@ export interface RoomInfo {
     available: boolean;
     /** 房间监听是否打开 */
     opened: boolean;
-    /** 是否连接到房间 */
-    connected: boolean;
+    /** 房间连接状态 */
+    connection: ConnectStatus;
 }
 /** 房间展示信息 */
 export interface RoomDetail {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "floating-live",
-  "version": "0.15.0-beta.5",
+  "version": "0.15.0-beta.6",
   "type": "commonjs",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",