floating-live 0.15.0-beta.2 → 0.15.0-beta.4

package/dist/enums.d.ts

@@ -7,7 +7,9 @@ export declare enum RoomStatus {
     /** 正在轮播 */
     round = 2,
     /** 被封禁 */
-    banned = -1
+    banned = -1,
+    /** 已上锁 */
+    locked = -2
 }
 /** 图片大小 */
 export declare enum ImageSize {

package/dist/enums.js

@@ -12,6 +12,8 @@ var RoomStatus;
     RoomStatus[RoomStatus["round"] = 2] = "round";
     /** 被封禁 */
     RoomStatus[RoomStatus["banned"] = -1] = "banned";
+    /** 已上锁 */
+    RoomStatus[RoomStatus["locked"] = -2] = "locked";
 })(RoomStatus = exports.RoomStatus || (exports.RoomStatus = {}));
 /** 图片大小 */
 var ImageSize;

package/dist/live.d.ts

@@ -7,6 +7,7 @@ import ModCommand from "./module/command";
 import { ModValues } from "./module/values";
 import { ModHook } from "./module/hook";
 import { FloatingEventMap } from "./types/events";
+import { FloatingCommandMap } from "./types";
 export declare class FloatingLive extends EventEmitter {
     /** 房间控制模块 */
     room: ModRoom;
@@ -18,11 +19,17 @@ export declare class FloatingLive extends EventEmitter {
     store: ModStore;
     /** 数值模块 */
     values: ModValues;
-    /** 数值模块 */
+    /** 钩子模块 */
     hook: ModHook;
     constructor();
-    call(name: string, ...args: any[]): any;
+    call<T extends keyof FloatingCommandMap>(name: T, ...args: Parameters<FloatingCommandMap[T]>): ReturnType<FloatingCommandMap[T]>;
     on<T extends keyof FloatingEventMap>(eventName: T, listener: FloatingEventMap[T]): this;
-    emit<T extends keyof FloatingEventMap>(eventName: T, ...args: any[]): boolean;
+    emit<T extends keyof FloatingEventMap>(eventName: T, ...args: Parameters<FloatingEventMap[T]>): boolean;
     throw(err: Error): void;
+    snapshot(): {
+        room: import("./types").RoomInfo[];
+        values: Record<string, any>;
+        store: Record<string, Record<string, any>>;
+        command: string[];
+    };
 }

package/dist/live.js

@@ -33,5 +33,13 @@ class FloatingLive extends events_1.EventEmitter {
     throw(err) {
         this.emit("error", err);
     }
+    snapshot() {
+        return {
+            room: this.room.snapshot(),
+            values: this.values.snapshot(),
+            store: this.store.snapshot(),
+            command: this.command.snapshot(),
+        };
+    }
 }
 exports.FloatingLive = FloatingLive;

package/dist/module/command.d.ts

@@ -1,15 +1,16 @@
 import { FloatingLive } from "../live";
-declare type CommandFunction = (...args: any[]) => any;
+import { FloatingCommandMap } from "../types";
 export default class ModCommand {
     /** 功能列表 */
     private readonly list;
     protected readonly main: FloatingLive;
     constructor(main: FloatingLive);
     /** 注册命令 */
-    register(name: string, func: CommandFunction): void;
+    register<T extends keyof FloatingCommandMap>(name: T, func: FloatingCommandMap[T]): void;
     /** 取消注册命令 */
     unregister(name: string): void;
     /** 调用命令 */
-    call(name: string, ...args: any[]): any;
+    call<T extends keyof FloatingCommandMap>(name: T, ...args: Parameters<FloatingCommandMap[T]>): any;
+    /** 获取快照 */
+    snapshot(): string[];
 }
-export {};

package/dist/module/command.js

@@ -20,5 +20,9 @@ class ModCommand {
     call(name, ...args) {
         return this.list.get(name)?.(...args);
     }
+    /** 获取快照 */
+    snapshot() {
+        return [...this.list].map(([key]) => key);
+    }
 }
 exports.default = ModCommand;

package/dist/module/hook.d.ts

@@ -1,13 +1,14 @@
 import { FloatingLive } from "../live";
+import { FloatingHookMap } from "../types/hook";
 export declare type HookFunction<T> = (ctx: T) => boolean | void | Promise<boolean | void>;
 export declare class ModHook {
     private list;
     protected readonly main: FloatingLive;
     constructor(main: FloatingLive);
     /** 注册钩子函数 */
-    register<T>(name: string, func: HookFunction<T>): void;
+    register<T extends keyof FloatingHookMap>(name: T, func: HookFunction<FloatingHookMap[T]>): void;
     /** 取消注册钩子函数 */
-    unregister(name: string, func: HookFunction<any>): void;
+    unregister<T extends keyof FloatingHookMap>(name: T, func: HookFunction<FloatingHookMap[T]>): void;
     /** 调用钩子函数 */
-    call<T>(name: string, ctx: T): Promise<boolean>;
+    call<T extends keyof FloatingHookMap>(name: T, ctx: FloatingHookMap[T]): Promise<boolean>;
 }

package/dist/module/room.d.ts

@@ -24,4 +24,8 @@ export declare class ModRoom {
     open(roomKey: string): void;
     /** 关闭房间连接 */
     close(roomKey: string): void;
+    /** 更改某个房间的顺序 */
+    move(roomKey: string, position: number): void;
+    /** 获取快照 */
+    snapshot(): RoomInfo[];
 }

package/dist/module/room.js

@@ -77,7 +77,7 @@ class ModRoom {
         if (typeof config == "boolean") {
             config = { open: config };
         }
-        const room = this.main.call(platform, id, config);
+        const room = this.main.call(`room.create.${platform}`, id, config);
         room && this.addRoom(room);
     }
     /** 移除房间 */
@@ -121,5 +121,19 @@ class ModRoom {
         let room = this.list.get(roomKey);
         room?.opened && room.close();
     }
+    /** 更改某个房间的顺序 */
+    move(roomKey, position) {
+        const arr = [...this.list];
+        const index = arr.findIndex(([key]) => key == roomKey);
+        if (index == -1)
+            return;
+        const [item] = arr.splice(index, 1);
+        arr.splice(position, 0, item);
+        this.list = new Map(arr);
+    }
+    /** 获取快照 */
+    snapshot() {
+        return [...this.list].map(([key, room]) => room.info);
+    }
 }
 exports.ModRoom = ModRoom;

package/dist/module/store.d.ts

@@ -1,14 +1,15 @@
 import { FloatingLive } from "../live";
+import { FloatingStoreMap } from "../types/store";
 export declare class ModStore {
     private list;
     protected readonly main: FloatingLive;
     constructor(main: FloatingLive);
-    /** 注册钩子函数 */
-    register<T>(name: string, id: string, value: T): void;
-    /** 取消注册钩子函数 */
-    unregister(name: string, id: string): void;
+    /** 注册store */
+    register<T extends keyof FloatingStoreMap>(name: T, id: string, value: FloatingStoreMap[T]): void;
+    /** 取消注册store */
+    unregister<T extends keyof FloatingStoreMap>(name: T, id: string): void;
     /** 获取值 */
     get(name: string): Map<string, any> | undefined;
-    /** 获取注册的所有值 */
-    getMap(): Record<string, Record<string, any>>;
+    /** 获取快照 */
+    snapshot(): Record<string, Record<string, any>>;
 }

package/dist/module/store.js

@@ -6,7 +6,7 @@ class ModStore {
         this.list = new Map();
         this.main = main;
     }
-    /** 注册钩子函数 */
+    /** 注册store */
     register(name, id, value) {
         let store = this.list.get(name);
         if (!store) {
@@ -14,20 +14,22 @@ class ModStore {
             this.list.set(name, store);
         }
         store.set(id, value);
+        this.main.emit("store:add", name, id, value);
     }
-    /** 取消注册钩子函数 */
+    /** 取消注册store */
     unregister(name, id) {
         let store = this.list.get(name);
         if (store) {
             store.delete(id);
+            this.main.emit("store:remove", name, id);
         }
     }
     /** 获取值 */
     get(name) {
         return this.list.get(name);
     }
-    /** 获取注册的所有值 */
-    getMap() {
+    /** 获取快照 */
+    snapshot() {
         const map = {};
         this.list.forEach((store, name) => {
             const part = {};

package/dist/module/values.d.ts

@@ -1,4 +1,5 @@
 import { FloatingLive } from "../live";
+import { FloatingValueMap } from "../types/values";
 interface ValueConfig<T> {
     get: () => T;
     set?: (value: T) => void;
@@ -16,6 +17,9 @@ export declare class ModValues {
     /** 设置值 */
     set(name: string, value: any): boolean;
     /** 获取注册的所有值 */
-    getMap(): Record<string, any>;
+    snapshot(): Record<string, any>;
+    emit<T extends keyof FloatingValueMap>(name: T, value: FloatingValueMap[T]): void;
+    watch<T extends keyof FloatingValueMap>(name: T, listener: (value: FloatingValueMap[T]) => void): void;
+    unwatch<T extends keyof FloatingValueMap>(name: T, listener: (value: FloatingValueMap[T]) => void): void;
 }
 export {};

package/dist/module/values.js

@@ -30,12 +30,22 @@ class ModValues {
         }
     }
     /** 获取注册的所有值 */
-    getMap() {
+    snapshot() {
         const map = {};
         this.list.forEach((config, name) => {
             map[name] = config.get();
         });
         return map;
     }
+    emit(name, value) {
+        this.main.emit("values:change", name, value);
+        this.main.emit(`change:${name}`, value);
+    }
+    watch(name, listener) {
+        this.main.on(`change:${name}`, listener);
+    }
+    unwatch(name, listener) {
+        this.main.off(`change:${name}`, listener);
+    }
 }
 exports.ModValues = ModValues;

package/dist/types/command.d.ts

@@ -0,0 +1,9 @@
+import { LiveRoom } from "../core";
+export interface FloatingCommandMap {
+    add: (platform: string, id: number, config?: boolean | Record<string, any>) => void;
+    remove: (key: string) => void;
+    open: (key: string) => void;
+    close: (key: string) => void;
+    update: (key: string) => void;
+    [name: `room.create.${string}`]: (id: string | number, config?: Record<string, any>) => LiveRoom;
+}

package/dist/types/command.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/events.d.ts

@@ -3,7 +3,10 @@ import { Message } from "./message";
 import { RoomDetail, RoomInfo, RoomStatsInfo } from "./room";
 export interface FloatingEventMap {
     "live:message": (msg: Message.All) => void;
-    "live:raw": (data: any) => void;
+    "live:raw": (data: any, { platform, room }: {
+        platform: string;
+        room: string | number;
+    }) => void;
     "room:connect": (key: string) => void;
     "room:disconnect": (key: string) => void;
     "room:info": (key: string, info: RoomInfo) => void;
@@ -17,10 +20,15 @@ export interface FloatingEventMap {
     "room:open": (key: string, info: RoomInfo) => void;
     "room:close": (key: string, info: RoomInfo) => void;
     "room:add": (key: string, info: RoomInfo) => void;
-    "room:remove": (key: string, info: RoomInfo) => void;
+    "room:remove": (key: string) => void;
     "plugin:add": (name: string) => void;
     "plugin:remove": (name: string) => void;
     "command:add": (name: string) => void;
     "command:remove": (name: string) => void;
+    "store:add": (name: string, id: string, value: any) => void;
+    "store:remove": (name: string, id: string) => void;
+    "values:register": (name: string) => void;
+    "values:change": (name: string, value: any) => void;
+    [name: `change:${string}`]: (value: any) => void;
     error: (err: Error) => void;
 }

package/dist/types/hook.d.ts

@@ -0,0 +1,5 @@
+import { Message } from "./message";
+export interface FloatingHookMap {
+    message: Message.All;
+    add: Record<string, any>;
+}

package/dist/types/hook.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/index.d.ts

@@ -1,3 +1,5 @@
 export * from "./message";
 export * from "./plugin";
 export * from "./room";
+export * from "./command";
+export * from "./events";

package/dist/types/index.js

@@ -17,3 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./message"), exports);
 __exportStar(require("./plugin"), exports);
 __exportStar(require("./room"), exports);
+__exportStar(require("./command"), exports);
+__exportStar(require("./events"), exports);

package/dist/types/message.d.ts

@@ -16,9 +16,9 @@ export declare namespace Message {
         /** 其他属性 */
         [attr: string]: any;
     }
-    /** 文本聊天消息 */
-    interface Chat extends Base {
-        type: "chat";
+    /** 聊天消息 */
+    interface Comment extends Base {
+        type: "comment";
         info: {
             /** 用户信息 */
             user: UserInfo;
@@ -140,7 +140,43 @@ export declare namespace Message {
         type: "live_detail";
         info: RoomDetail;
     }
-    type All = Chat | Gift | Interact | Membership | Superchat | Block | LiveStart | LiveEnd | LiveCut | LiveDetail | LiveStats;
+    interface Lottery extends Base {
+        type: "lottery";
+        info: {
+            id: number;
+            award: GiftInfo;
+        };
+    }
+    interface LotteryResult extends Base {
+        type: "lottery_result";
+        info: {
+            id: number;
+            award: GiftInfo;
+            result: UserInfo[];
+        };
+    }
+    interface Redpacket extends Base {
+        type: "redpacket";
+        info: {
+            id: number;
+            gifts?: GiftInfo[];
+            value?: number;
+            currency?: string | number;
+        };
+    }
+    interface RedpacketResult extends Base {
+        type: "redpacket_result";
+        info: {
+            id: number;
+            result: {
+                user: UserInfo;
+                gift?: GiftInfo;
+                value?: number;
+                currency?: string | number;
+            }[];
+        };
+    }
+    type All = Comment | Gift | Interact | Membership | Superchat | Block | LiveStart | LiveEnd | LiveCut | LiveDetail | LiveStats | Lottery | LotteryResult | Redpacket | RedpacketResult;
 }
 /** 用户信息 */
 export interface UserInfo {
@@ -200,11 +236,13 @@ export interface GiftInfo {
     /** 礼物连击id */
     comboId?: string;
     /** 人民币价值 */
-    cny?: number;
+    money?: number;
     /** 行为 */
     action?: string;
     /** 随机礼物信息 */
     blindGift?: GiftInfo;
     /** 图片信息 */
     image?: string;
+    /** 单位 */
+    unit?: string;
 }

package/dist/types/room.d.ts

@@ -59,10 +59,8 @@ export interface RoomStatsInfo {
 export interface PlatformInfo {
     /** 平台名称 */
     name: string;
-    /** 平台id */
-    id: string;
     /** 平台vip信息 */
-    vip: {
+    vip?: {
         /** 平台vip对应id */
         id: string;
         /** 平台vip名称 */
@@ -71,7 +69,7 @@ export interface PlatformInfo {
         level?: string[];
     };
     /** 粉丝vip信息 */
-    membership: {
+    membership?: {
         /** 粉丝vip对应id */
         id: string;
         /** 粉丝vip名称 */
@@ -80,16 +78,19 @@ export interface PlatformInfo {
         level?: string[];
     };
     /** 礼物信息 */
-    gift: {
+    gift?: {
+        /** 默认送出礼物行为 */
         action: string;
     };
+    /** 统计信息 */
+    stats?: Record<string, string>;
     /** 货币信息 */
-    currency: Record<string, {
+    currency?: Record<string, {
         /** 货币名称 */
         name: string;
         /** 1货币面值等值value (1面值/1数值) */
-        face: number;
-        /** 1人民币等值value (1.00CNY/1数值) (若为0则为免费货币) */
-        cny?: number;
+        ratio: number;
+        /** 1单位消费金额等值value (1.00CNY/1数值) (若为0则为免费货币) */
+        money?: number;
     }>;
 }

package/dist/types/store.d.ts

@@ -0,0 +1,4 @@
+import { PlatformInfo } from "./room";
+export interface FloatingStoreMap {
+    platform: PlatformInfo;
+}

package/dist/types/store.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/values.d.ts

@@ -0,0 +1,2 @@
+export interface FloatingValueMap {
+}

package/dist/types/values.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

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