floating-live 0.16.0-alpha.11 → 0.16.0-alpha.12

package/dist/live/room.d.ts

@@ -2,6 +2,7 @@ import { CustomEventEmitter } from "../utils/EventEmitter";
 import { EnumValue } from "../utils/types";
 import { LiveMessage } from "./message";
 import { UserInfo } from "./messageInfo";
+/** 直播间客户端API */
 export declare abstract class LiveRoom extends CustomEventEmitter implements LiveRoomData {
     constructor();
     /** 平台 */
@@ -30,20 +31,24 @@ export declare abstract class LiveRoom extends CustomEventEmitter implements Liv
     abstract open(): void;
     /** 关闭连接 */
     abstract close(): void;
-    /** 从服务器获取信息 */
-    abstract getInfo(): Promise<void>;
-    /** 销毁事件 */
-    protected onDestroy?(): void;
+    /** 更新房间数据 */
+    abstract update(): Promise<void>;
+    /** 从服务器获取房间数据 */
+    abstract fetchData?(): Promise<void>;
     /** 销毁 */
     destroy(): void;
+    /** 销毁事件 */
+    protected onDestroy?: () => void;
     protected emitMessage(msg: LiveMessage.All): void;
     /** 发送源消息 */
     protected emitRaw(msg: any): void;
     /** 获取数据 */
     toData(): LiveRoomData;
     get key(): string;
-    on<K extends keyof LiveRoomEventMap>(type: K, listener: (e: LiveRoomEventMap[K]) => void): void;
-    once<K extends keyof LiveRoomEventMap>(type: K, listener: (e: LiveRoomEventMap[K]) => void): void;
+}
+export interface LiveRoom {
+    on<K extends keyof LiveRoomEventMap>(type: K, listener: (e: LiveRoomEventMap[K]) => void, signal?: AbortSignal): void;
+    once<K extends keyof LiveRoomEventMap>(type: K, listener: (e: LiveRoomEventMap[K]) => void, signal?: AbortSignal): void;
     off<K extends keyof LiveRoomEventMap>(type: K, listener: (e: LiveRoomEventMap[K]) => void): void;
     emit<K extends keyof LiveRoomEventMap>(type: LiveRoomEventMap[K] extends Record<string, never> ? K : never): void;
     emit<K extends keyof LiveRoomEventMap>(type: K, detail: LiveRoomEventMap[K]): void;
@@ -124,33 +129,50 @@ export declare const LiveConnectionStatus: {
 };
 export type LiveConnectionStatus = EnumValue<typeof LiveConnectionStatus>;
 export interface LiveRoomEventMap {
+    /**  */
     status: {
         status: LiveRoomStatus;
         timestamp: number;
         liveId?: string | number;
     };
+    /** 房间数据更新 */
     update: {
         room: LiveRoomData;
     };
+    /** 细节改变 */
     detail: {
         detail: Partial<LiveRoomDetailInfo>;
     };
+    /** 统计信息改变 */
     stats: {
         stats: Partial<LiveRoomStatsInfo>;
     };
+    /** 消息 */
     message: {
         message: LiveMessage.All;
     };
+    /** 消息源数据 */
     raw: {
         platform: string;
         roomId: string | number;
         data: any;
     };
+    /** 初始化 */
     init: {};
+    /** 正在连接 */
     connecting: {};
+    /** 连接到服务器 */
     connected: {};
+    /** 断开连接 */
     disconnect: {};
+    /** 连接到房间 */
     enter: {};
+    /** 连接超时 */
+    timeout: {
+        time: number;
+    };
+    /** 开启直播间连接 */
     open: {};
+    /** 关闭直播间连接 */
     close: {};
 }

package/dist/live/room.js

@@ -1,4 +1,5 @@
 import { CustomEventEmitter } from "../utils/EventEmitter";
+/** 直播间客户端API */
 export class LiveRoom extends CustomEventEmitter {
     constructor() {
         super();
@@ -76,19 +77,6 @@ export class LiveRoom extends CustomEventEmitter {
     get key() {
         return `${this.platform}:${this.id}`;
     }
-    on(type, listener) {
-        super.on(type, listener);
-    }
-    once(type, listener) {
-        super.once(type, listener);
-        this.emit("connecting");
-    }
-    off(type, listener) {
-        super.off(type, listener);
-    }
-    emit(type, detail) {
-        super.emit(type, detail);
-    }
 }
 /** 直播间状态 */
 export const LiveRoomStatus = {

package/dist/plugins/room/index.d.ts

@@ -101,11 +101,11 @@ declare module "../.." {
 export declare class Room extends BasePlugin {
     static pluginName: string;
     private map;
-    private symbolRoomEventHandlers;
+    private symbolAbortController;
     init(ctx: PluginContext): void;
     expose(): PluginExposes;
     /** 添加房间监听实例 */
-    attachRoom(room: LiveRoom, open?: boolean): void;
+    attach(room: LiveRoom, open?: boolean): void;
     /** 添加房间 */
     add(platform: string, id: number, options?: boolean | Record<string, any>): Promise<void>;
     /** 移除房间 */

package/dist/plugins/room/index.js

@@ -5,7 +5,7 @@ export class Room extends BasePlugin {
     constructor() {
         super(...arguments);
         this.map = new Map();
-        this.symbolRoomEventHandlers = Symbol("room.roomEventHandlers");
+        this.symbolAbortController = Symbol("room.abortController");
     }
     init(ctx) {
         ctx.registerCommand("add", bindCommand(this.add, this));
@@ -29,7 +29,7 @@ export class Room extends BasePlugin {
         };
     }
     /** 添加房间监听实例 */
-    attachRoom(room, open) {
+    attach(room, open) {
         let key = room.key;
         if (this.map.has(key)) {
             this.ctx.throw(new AppError("room:add_exist", {
@@ -38,11 +38,11 @@ export class Room extends BasePlugin {
             return;
         }
         this.map.set(key, room);
-        const eventHandlers = [];
-        room[this.symbolRoomEventHandlers] = eventHandlers;
+        const abortController = new AbortController();
+        room[this.symbolAbortController] =
+            abortController;
         const setHandler = (type, listener) => {
-            room.on(type, listener);
-            eventHandlers.push([type, listener]);
+            room.on(type, listener, abortController.signal);
         };
         // 添加监听事件
         // 直播消息
@@ -115,7 +115,7 @@ export class Room extends BasePlugin {
             this.ctx.throw(this.ctx.error("room:create_fail", { message: "无法创建房间" }));
         }
         else {
-            this.attachRoom(room);
+            this.attach(room);
         }
     }
     /** 移除房间 */
@@ -127,9 +127,7 @@ export class Room extends BasePlugin {
             }));
         }
         this.map.delete(key); // 从表中删除房间
-        room[this.symbolRoomEventHandlers].forEach(([type, listener]) => {
-            room?.removeEventListener(type, listener);
-        }); // 移除房间监听实例
+        room[this.symbolAbortController]?.abort(); // 移除房间监听实例
         this.ctx.emit("room:remove", { key });
     }
     /** 获取房间 */
@@ -147,7 +145,7 @@ export class Room extends BasePlugin {
     /** 更新房间信息 */
     update(key) {
         let room = this.map.get(key);
-        room && room.getInfo();
+        room && room.update();
     }
     /** 获取房间key列表 */
     get keys() {

package/package.json

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