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

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

@@ -2,9 +2,9 @@
 import { EventEmitter } from "events";
 import { ModPlugin } from "./module/plugin";
 import { ModRoom } from "./module/room";
-import { ModStore } from "./module/store";
-import ModCommand from "./module/command";
-import { ModValues } from "./module/values";
+import { ModManifest } from "./module/manifest";
+import { ModCommand } from "./module/command";
+import { ModValue } from "./module/value";
 import { ModHook } from "./module/hook";
 import { FloatingEventMap } from "./types/events";
 import { FloatingCommandMap } from "./types";
@@ -15,10 +15,10 @@ export declare class FloatingLive extends EventEmitter {
     plugin: ModPlugin;
     /** 命令模块 */
     command: ModCommand;
-    /** 状态模块 */
-    store: ModStore;
+    /** Manifest模块 */
+    manifest: ModManifest;
     /** 数值模块 */
-    values: ModValues;
+    value: ModValue;
     /** 钩子模块 */
     hook: ModHook;
     constructor();
@@ -26,10 +26,10 @@ export declare class FloatingLive extends EventEmitter {
     on<T extends keyof FloatingEventMap>(eventName: T, listener: FloatingEventMap[T]): this;
     emit<T extends keyof FloatingEventMap>(eventName: T, ...args: Parameters<FloatingEventMap[T]>): boolean;
     throw(err: Error): void;
-    snapshot(): {
+    getSnapshot(): {
         room: import("./types").RoomInfo[];
-        values: Record<string, any>;
-        store: Record<string, Record<string, any>>;
+        value: Record<string, any>;
+        manifest: Record<string, Record<string, any>>;
         command: string[];
     };
 }

package/dist/live.js

@@ -1,24 +1,21 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FloatingLive = void 0;
 const events_1 = require("events");
 const plugin_1 = require("./module/plugin");
 const room_1 = require("./module/room");
-const store_1 = require("./module/store");
-const command_1 = __importDefault(require("./module/command"));
-const values_1 = require("./module/values");
+const manifest_1 = require("./module/manifest");
+const command_1 = require("./module/command");
+const value_1 = require("./module/value");
 const hook_1 = require("./module/hook");
 class FloatingLive extends events_1.EventEmitter {
     constructor() {
         super();
-        this.command = new command_1.default(this);
-        this.store = new store_1.ModStore(this);
+        this.command = new command_1.ModCommand(this);
+        this.manifest = new manifest_1.ModManifest(this);
         this.plugin = new plugin_1.ModPlugin(this);
         this.room = new room_1.ModRoom(this);
-        this.values = new values_1.ModValues(this);
+        this.value = new value_1.ModValue(this);
         this.hook = new hook_1.ModHook(this);
     }
     call(name, ...args) {
@@ -33,12 +30,12 @@ class FloatingLive extends events_1.EventEmitter {
     throw(err) {
         this.emit("error", err);
     }
-    snapshot() {
+    getSnapshot() {
         return {
-            room: this.room.snapshot(),
-            values: this.values.snapshot(),
-            store: this.store.snapshot(),
-            command: this.command.snapshot(),
+            room: this.room.getSnapshot(),
+            value: this.value.getSnapshot(),
+            manifest: this.manifest.getSnapshot(),
+            command: this.command.getSnapshot(),
         };
     }
 }

package/dist/module/command.d.ts

@@ -1,6 +1,6 @@
 import { FloatingLive } from "../live";
 import { FloatingCommandMap } from "../types";
-export default class ModCommand {
+export declare class ModCommand {
     /** 功能列表 */
     private readonly list;
     protected readonly main: FloatingLive;
@@ -12,5 +12,5 @@ export default class ModCommand {
     /** 调用命令 */
     call<T extends keyof FloatingCommandMap>(name: T, ...args: Parameters<FloatingCommandMap[T]>): any;
     /** 获取快照 */
-    snapshot(): string[];
+    getSnapshot(): string[];
 }

package/dist/module/command.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModCommand = void 0;
 class ModCommand {
     constructor(main) {
         /** 功能列表 */
@@ -21,8 +22,8 @@ class ModCommand {
         return this.list.get(name)?.(...args);
     }
     /** 获取快照 */
-    snapshot() {
+    getSnapshot() {
         return [...this.list].map(([key]) => key);
     }
 }
-exports.default = ModCommand;
+exports.ModCommand = ModCommand;

package/dist/module/manifest.d.ts

@@ -0,0 +1,15 @@
+import { FloatingLive } from "../live";
+import { FloatingManifestMap } from "../types/manifest";
+export declare class ModManifest {
+    private list;
+    protected readonly main: FloatingLive;
+    constructor(main: FloatingLive);
+    /** 注册manifest */
+    register<T extends keyof FloatingManifestMap>(name: T, id: string, value: FloatingManifestMap[T]): void;
+    /** 取消注册manifest */
+    unregister<T extends keyof FloatingManifestMap>(name: T, id: string): void;
+    /** 获取值 */
+    get(name: string): Map<string, any> | undefined;
+    /** 获取快照 */
+    getSnapshot(): Record<string, Record<string, any>>;
+}

package/dist/module/{store.js → manifest.js}

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModStore = void 0;
-class ModStore {
+exports.ModManifest = void 0;
+class ModManifest {
     constructor(main) {
         this.list = new Map();
         this.main = main;
     }
-    /** 注册store */
+    /** 注册manifest */
     register(name, id, value) {
         let store = this.list.get(name);
         if (!store) {
@@ -14,14 +14,14 @@ class ModStore {
             this.list.set(name, store);
         }
         store.set(id, value);
-        this.main.emit("store:add", name, id, value);
+        this.main.emit("manifest:add", name, id, value);
     }
-    /** 取消注册store */
+    /** 取消注册manifest */
     unregister(name, id) {
         let store = this.list.get(name);
         if (store) {
             store.delete(id);
-            this.main.emit("store:remove", name, id);
+            this.main.emit("manifest:remove", name, id);
         }
     }
     /** 获取值 */
@@ -29,7 +29,7 @@ class ModStore {
         return this.list.get(name);
     }
     /** 获取快照 */
-    snapshot() {
+    getSnapshot() {
         const map = {};
         this.list.forEach((store, name) => {
             const part = {};
@@ -41,4 +41,4 @@ class ModStore {
         return map;
     }
 }
-exports.ModStore = ModStore;
+exports.ModManifest = ModManifest;

package/dist/module/room.d.ts

@@ -27,5 +27,5 @@ export declare class ModRoom {
     /** 更改某个房间的顺序 */
     move(roomKey: string, position: number): void;
     /** 获取快照 */
-    snapshot(): RoomInfo[];
+    getSnapshot(): RoomInfo[];
 }

package/dist/module/room.js

@@ -77,7 +77,7 @@ class ModRoom {
         if (typeof config == "boolean") {
             config = { open: config };
         }
-        const room = this.main.call(`room.create.${platform}`, id, config);
+        const room = this.main.call(`${platform}.room.create`, id, config);
         room && this.addRoom(room);
     }
     /** 移除房间 */
@@ -132,7 +132,7 @@ class ModRoom {
         this.list = new Map(arr);
     }
     /** 获取快照 */
-    snapshot() {
+    getSnapshot() {
         return [...this.list].map(([key, room]) => room.info);
     }
 }

package/dist/module/{values.d.ts → value.d.ts}

@@ -1,10 +1,10 @@
 import { FloatingLive } from "../live";
-import { FloatingValueMap } from "../types/values";
+import { FloatingValueMap } from "../types/value";
 interface ValueConfig<T> {
     get: () => T;
     set?: (value: T) => void;
 }
-export declare class ModValues {
+export declare class ModValue {
     private list;
     protected readonly main: FloatingLive;
     constructor(main: FloatingLive);
@@ -17,7 +17,7 @@ export declare class ModValues {
     /** 设置值 */
     set(name: string, value: any): boolean;
     /** 获取注册的所有值 */
-    snapshot(): Record<string, any>;
+    getSnapshot(): 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;

package/dist/module/{values.js → value.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModValues = void 0;
-class ModValues {
+exports.ModValue = void 0;
+class ModValue {
     constructor(main) {
         this.list = new Map();
         this.main = main;
@@ -9,10 +9,12 @@ class ModValues {
     /** 注册值 */
     register(name, config) {
         this.list.set(name, config);
+        this.main.emit("value:add", name);
     }
     /** 取消注册 */
     unregister(name) {
         this.list.delete(name);
+        this.main.emit("value:remove", name);
     }
     /** 获取值 */
     get(name) {
@@ -30,7 +32,7 @@ class ModValues {
         }
     }
     /** 获取注册的所有值 */
-    snapshot() {
+    getSnapshot() {
         const map = {};
         this.list.forEach((config, name) => {
             map[name] = config.get();
@@ -38,8 +40,8 @@ class ModValues {
         return map;
     }
     emit(name, value) {
-        this.main.emit("values:change", name, value);
         this.main.emit(`change:${name}`, value);
+        this.main.emit("value:change", name, value);
     }
     watch(name, listener) {
         this.main.on(`change:${name}`, listener);
@@ -48,4 +50,4 @@ class ModValues {
         this.main.off(`change:${name}`, listener);
     }
 }
-exports.ModValues = ModValues;
+exports.ModValue = ModValue;

package/dist/types/command.d.ts

@@ -5,5 +5,5 @@ export interface FloatingCommandMap {
     open: (key: string) => void;
     close: (key: string) => void;
     update: (key: string) => void;
-    [name: `room.create.${string}`]: (id: string | number, config?: Record<string, any>) => LiveRoom;
+    [name: `${string}.room.create`]: (id: string | number, config?: Record<string, any>) => LiveRoom;
 }

package/dist/types/events.d.ts

@@ -25,10 +25,11 @@ export interface FloatingEventMap {
     "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;
+    "manifest:add": (name: string, id: string, value: any) => void;
+    "manifest:remove": (name: string, id: string) => void;
+    "value:add": (name: string) => void;
+    "value:remove": (name: string) => void;
+    "value:change": (name: string, value: any) => void;
     [name: `change:${string}`]: (value: any) => void;
     error: (err: Error) => void;
 }

package/dist/types/index.d.ts

@@ -3,3 +3,6 @@ export * from "./plugin";
 export * from "./room";
 export * from "./command";
 export * from "./events";
+export * from "./manifest";
+export * from "./hook";
+export * from "./value";

package/dist/types/index.js

@@ -19,3 +19,6 @@ __exportStar(require("./plugin"), exports);
 __exportStar(require("./room"), exports);
 __exportStar(require("./command"), exports);
 __exportStar(require("./events"), exports);
+__exportStar(require("./manifest"), exports);
+__exportStar(require("./hook"), exports);
+__exportStar(require("./value"), exports);

package/dist/types/{store.d.ts → manifest.d.ts}

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

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

@@ -79,15 +79,18 @@ export interface PlatformInfo {
     };
     /** 礼物信息 */
     gift?: {
+        /** 默认送出礼物行为 */
         action: string;
     };
+    /** 统计信息 */
+    stats?: Record<string, string>;
     /** 货币信息 */
     currency?: Record<string, {
         /** 货币名称 */
         name: string;
         /** 1货币面值等值value (1面值/1数值) */
         ratio: number;
-        /** 1单位消费现金等值value (1.00CNY/1数值) (若为0则为免费货币) */
-        cash?: number;
+        /** 1单位消费金额等值value (1.00CNY/1数值) (若为0则为免费货币) */
+        money?: number;
     }>;
 }

package/package.json

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

package/dist/module/store.d.ts

@@ -1,15 +0,0 @@
-import { FloatingLive } from "../live";
-import { FloatingStoreMap } from "../types/store";
-export declare class ModStore {
-    private list;
-    protected readonly main: FloatingLive;
-    constructor(main: FloatingLive);
-    /** 注册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;
-    /** 获取快照 */
-    snapshot(): Record<string, Record<string, any>>;
-}