onebots 0.4.23 → 0.4.25

package/lib/service/V12/action/guild.js

@@ -1,28 +1,116 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GuildAction = void 0;
-const utils_1 = require("../../../service/V12/utils");
 class GuildAction {
+    async getGuildSelfInfo() {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'getSelfInfo');
+    }
+    async getChannelPermissionOfRole(channel_id, role_id) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'getChannelPermissionOfRole', [channel_id, role_id]);
+    }
+    async setChannelAnnounce(guild_id, channel_id, message_id) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'setChannelAnnounce', [guild_id, channel_id, message_id]);
+    }
+    async updateChannelPermissionOfRole(channel_id, role_id, permission) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'updateChannelPermissionOfRole', [channel_id, role_id, permission]);
+    }
+    async getChannelMemberPermission(channel_id, member_id) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'getChannelMemberPermission', [channel_id, member_id]);
+    }
+    async updateChannelMemberPermission(channel_id, member_id, permission) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'updateChannelMemberPermission', [channel_id, member_id, permission]);
+    }
+    async getChannelPins(channel_id) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'getChannelPins', [channel_id]);
+    }
+    async pinChannelMessage(channel_id, message_id) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'pinChannelMessage', [channel_id, message_id]);
+    }
+    async unPinChannelMessage(channel_id, message_id) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'unPinChannelMessage', [channel_id, message_id]);
+    }
+    async createChannel(guild_id, channelInfo) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'createChannel', [guild_id, channelInfo]);
+    }
+    async updateChannel({ channel_id, ...updateInfo }) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'updateChannel', [channel_id, updateInfo]);
+    }
+    async deleteChannel(channel_id) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'deleteChannel', [channel_id]);
+    }
+    async getGuildRoles(guild_id) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'getGuildRoles', [guild_id]);
+    }
+    async creatGuildRole(guild_id, role) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'creatGuildRole', [guild_id, role]);
+    }
+    async updateGuildRole(guild_id, { id, ...role }) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'updateGuildRole', [guild_id, role]);
+    }
+    async deleteGuildRole(role_id) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'deleteGuildRole', [role_id]);
+    }
+    async getGuildAccessApis(guild_id) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'getGuildAccessApis', [guild_id]);
+    }
+    async applyGuildAccess(guild_id, channel_id, apiInfo, desc) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'applyGuildAccess', [guild_id, channel_id, apiInfo, desc]);
+    }
+    async unMuteGuild(guild_id) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'unMuteGuild', [guild_id]);
+    }
+    async muteGuild(guild_id, seconds, end_time) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'muteGuild', [guild_id, seconds, end_time]);
+    }
+    async unMuteGuildMembers(guild_id, member_ids) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'unMuteGuildMembers', [guild_id, member_ids]);
+    }
+    async muteGuildMembers(guild_id, member_ids, seconds, end_time) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'muteGuildMembers', [guild_id, member_ids, seconds, end_time]);
+    }
+    async addGuildMemberRoles(guild_id, channel_id, member_id, role_id) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'addGuildMemberRoles', [guild_id, channel_id, member_id, role_id]);
+    }
+    async removeGuildMemberRoles(guild_id, channel_id, member_id, role_id) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'removeGuildMemberRoles', [guild_id, channel_id, member_id, role_id]);
+    }
+    async kickGuildMember(guild_id, member_id, clean = 0, blacklist) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'kickGuildMember', [guild_id, member_id, clean, blacklist]);
+    }
+    async unMuteGuildMember(guild_id, member_id) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'unMuteGuildMember', [guild_id, member_id]);
+    }
+    async muteGuildMember(guild_id, member_id, seconds, end_time) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'muteGuildMember', [guild_id, member_id, seconds, end_time]);
+    }
     getGuildList() {
-        return this.client.getGuildList();
+        return this.adapter.call(this.oneBot.uin, 'V12', 'getGuildList');
+    }
+    getGuildInfo(guild_id) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'getGuildInfo', [guild_id]);
     }
     getChannelList(guild_id) {
-        return this.client.getChannelList(guild_id);
+        return this.adapter.call(this.oneBot.uin, 'V12', 'getChannelList', [guild_id]);
+    }
+    getChannelInfo(channel_id) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'getChannelInfo', [channel_id]);
     }
     getGuildMemberList(guild_id) {
-        return this.client.getGuildMemberList(guild_id);
+        return this.adapter.call(this.oneBot.uin, 'V12', 'getGuildMemberList', [guild_id]);
     }
     /**
-     * 发送群聊消息
-     * @param guild_id {number} 频道id
+     * 发送频道消息
      * @param channel_id {string} 子频道id
      * @param message {import('icqq/lib/service').Sendable} 消息
      */
-    async sendGuildMsg(guild_id, channel_id, message) {
-        const { element } = await utils_1.processMessage.apply(this, [message]);
-        if (!element.length)
-            return;
-        return await this.client.sendGuildMsg(guild_id, channel_id, element);
+    async sendGuildMsg(channel_id, message) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'sendGuildMessage', [channel_id, message]);
+    }
+    async createDirectSession(guild_id, user_id) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'createDirectSession', [guild_id, user_id]);
+    }
+    async sendDirectMsg(guild_id, message) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'sendDirectMessage', [guild_id, message]);
     }
 }
 exports.GuildAction = GuildAction;

package/lib/service/V12/action/index.d.ts

@@ -4,7 +4,7 @@ import { GroupAction } from "./group";
 import { GuildAction } from "./guild";
 export interface Action extends CommonAction, FriendAction, GroupAction, GuildAction {
 }
-declare const Action_base: import("../../../utils").Class;
+declare const Action_base: import("../../../utils").Class<any>;
 export declare class Action extends Action_base {
 }
 export {};

package/lib/service/V12/index.d.ts

@@ -1,24 +1,24 @@
 /// <reference types="node" />
-import { Client, EventMap, MessageElem, Sendable as IcqqCanSend } from "icqq";
+import { EventMap } from "icqq";
 import { Config } from './config';
 import { OneBot } from "../../onebot";
 import { Action } from "./action";
 import { Logger } from "log4js";
 import { WebSocket, WebSocketServer } from "ws";
 import { Service } from "../../service";
+import { Dict } from "@zhinjs/shared";
 export declare class V12 extends Service<'V12'> implements OneBot.Base {
     oneBot: OneBot<'V12'>;
-    client: Client;
-    version: string;
+    config: OneBot.Config<'V12'>;
+    version: OneBot.Version;
     action: Action;
     protected timestamp: number;
     protected heartbeat?: NodeJS.Timeout;
     logger: Logger;
-    private path;
     wss?: WebSocketServer;
     wsr: Set<WebSocket>;
     private db;
-    constructor(oneBot: OneBot<'V12'>, client: Client, config: OneBot.Config<'V12'>);
+    constructor(oneBot: OneBot<'V12'>, config: OneBot.Config<'V12'>);
     get history(): V12.Payload<keyof Action>[];
     getFile(file_id: string): V12.FileInfo;
     delFile(file_id: string): boolean;
@@ -27,7 +27,7 @@ export declare class V12 extends Service<'V12'> implements OneBot.Base {
         file_id: string;
     } & V12.FileInfo)[];
     set history(value: any[]);
-    start(path?: string): void;
+    start(): void;
     private startHttp;
     private startWebhook;
     private runActions;
@@ -66,8 +66,6 @@ export declare class V12 extends Service<'V12'> implements OneBot.Base {
 }
 export declare namespace V12 {
     type Sendable = string | SegmentElem | (string | SegmentElem)[];
-    function fromSegment(msgList: Sendable[]): MessageElem[];
-    function toSegment(msgList: IcqqCanSend): SegmentElem<keyof SegmentMap>[];
     interface SegmentMap {
         face: {
             id: number;
@@ -172,20 +170,23 @@ export declare namespace V12 {
         echo?: string;
     }
     const defaultConfig: Config;
-    type Payload<T extends any> = {
+    type Payload<T = Dict> = {
         id: string;
         impl: 'onebots';
         version: 12;
-        platform: 'qq';
+        platform: string;
         self: {
-            platform: 'qq';
-            user_id: `${number}`;
+            platform: string;
+            user_id: string;
         };
         time: number;
         type: 'meta' | 'message' | 'notice' | 'request';
         detail_type: string;
         sub_type: string;
     } & T;
+    type SelfInfo = {
+        nickname?: string;
+    };
     interface Protocol {
         action: string;
         params: any;
@@ -220,7 +221,7 @@ export declare namespace V12 {
     };
     function success<T extends any>(data: T, retcode?: Result<T>['retcode'], echo?: string): Result<T>;
     function error(message: string, retcode?: Result<null>['retcode'], echo?: string): Result<null>;
-    function formatPayload<K extends keyof BotEventMap>(uin: number, type: K, data: Omit<BotEventMap[K], K>): {
+    function formatPayload<K extends keyof BotEventMap>(uin: string, type: K, data: Omit<BotEventMap[K], K>): {
         self_id: string;
         time: number;
         detail_type: K;
@@ -246,4 +247,27 @@ export declare namespace V12 {
         sha256?: string;
         total_size?: number;
     };
+    interface GroupInfo {
+        group_id: string;
+        group_name: string;
+    }
+    interface UserInfo {
+        user_id: string;
+        user_name: string;
+    }
+    interface GroupMemberInfo {
+        group_id: string;
+        user_id: string;
+        user_name: string;
+    }
+    interface Segment {
+    }
+    interface Message {
+    }
+    interface MessageElement extends Dict {
+        type: string;
+    }
+    interface MessageRet {
+        message_id: string;
+    }
 }

package/lib/service/V12/index.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.V12 = void 0;
-const icqq_1 = require("icqq");
 const utils_1 = require("../../utils");
 const path_1 = require("path");
 const onebot_1 = require("../../onebot");
@@ -15,22 +14,21 @@ const https_1 = __importDefault(require("https"));
 const ws_1 = require("ws");
 const utils_2 = require("../../utils");
 const db_1 = require("../../db");
-const app_1 = require("../../server/app");
-const fs_1 = require("fs");
 const message_1 = require("icqq/lib/message");
 const service_1 = require("../../service");
+const app_1 = require("../../server/app");
 class V12 extends service_1.Service {
-    constructor(oneBot, client, config) {
-        super(config);
+    constructor(oneBot, config) {
+        super(oneBot.adapter, config);
         this.oneBot = oneBot;
-        this.client = client;
+        this.config = config;
         this.version = 'V12';
         this.timestamp = Date.now();
         this.wsr = new Set();
         this.db = new db_1.Database((0, path_1.join)(app_1.App.configDir, 'data', this.oneBot.uin + '.json'));
         this.db.sync({ eventBuffer: [], msgIdMap: {}, files: {} });
         this.action = new action_1.Action();
-        this.logger = this.oneBot.app.getLogger(this.oneBot.uin, this.version);
+        this.logger = this.oneBot.adapter.getLogger(this.oneBot.uin, this.version);
     }
     get history() {
         return this.db.get('eventBuffer');
@@ -59,10 +57,7 @@ class V12 extends service_1.Service {
     set history(value) {
         this.db.set('eventBuffer', value);
     }
-    start(path) {
-        this.path = `/${this.oneBot.uin}`;
-        if (path)
-            this.path += path;
+    start() {
         if (this.config.use_http) {
             const config = typeof this.config.use_http === 'boolean' ? {} : this.config.use_http || {};
             this.startHttp({
@@ -137,6 +132,18 @@ class V12 extends service_1.Service {
                 }));
             }, this.config.heartbeat * 1000);
         }
+        this.adapter.on('message.receive', (uin, event) => {
+            const payload = this.adapter.formatEventPayload('V12', 'message', event);
+            this.dispatch(payload);
+        });
+        this.adapter.on('notice.receive', (uin, event) => {
+            const payload = this.adapter.formatEventPayload('V12', 'notice', event);
+            this.dispatch(payload);
+        });
+        this.adapter.on('request.receive', (uin, event) => {
+            const payload = this.adapter.formatEventPayload('V12', 'request', event);
+            this.dispatch(payload);
+        });
     }
     startHttp(config) {
         this.oneBot.app.router.all(this.path, (ctx) => this.httpRequestHandler(ctx, config));
@@ -281,16 +288,10 @@ class V12 extends service_1.Service {
         this._createWsr(config.url, config);
     }
     async stop(force) {
-        if (this.client.status === icqq_1.OnlineStatus.Online) {
-            await this.client.terminate();
-        }
         this.wss.close();
         for (const ws of this.wsr) {
             ws.close();
         }
-        if (force) {
-            (0, fs_1.rmSync)(this.client.dir, { force: true, recursive: true });
-        }
     }
     format(event, ...args) {
         const data = (typeof args[0]) === 'object' ? args.shift() || {} : {};
@@ -335,7 +336,7 @@ class V12 extends service_1.Service {
         data.self = this.action.getSelfInfo.apply(this);
         if (!data.detail_type)
             data.detail_type = data.message_type || data.notice_type || data.request_type || data.system_type;
-        data.message = data.type === 'message' ? V12.toSegment(data.message) : data.message;
+        data.message = data.type === 'message' ? this.adapter.toSegment('V12', data.message) : data.message;
         if (data.source)
             data.source = {
                 ...data.source,
@@ -370,7 +371,7 @@ class V12 extends service_1.Service {
         this.emit('dispatch', payload);
     }
     async apply(req) {
-        let { action, params, echo } = req;
+        let { action = "", params = {}, echo } = req;
         action = (0, utils_2.toLine)(action);
         let is_async = action.includes("_async");
         if (is_async)
@@ -402,16 +403,31 @@ class V12 extends service_1.Service {
                 if (Reflect.has(params, k)) {
                     if (onebot_1.BOOLS.includes(k))
                         params[k] = (0, utils_2.toBool)(params[k]);
+                    if (k === 'message') {
+                        if (typeof params[k] === 'string') {
+                            if (/[CQ:music,type=.+,id=.+]/.test(params[k])) {
+                                params[k] = params[k].replace(',type=', ',platform=');
+                            }
+                            params[k] = this.adapter.fromCqcode('V11', params[k]);
+                        }
+                        else {
+                            if (params[k][0].type == 'music' && params[k][0]?.data?.type) {
+                                params[k][0].data.platform = params[k][0].data.type;
+                                delete params[k][0].data.type;
+                            }
+                            params[k] = this.adapter.fromSegment('V11', params[k]);
+                        }
+                    }
                     args.push(params[k]);
                 }
             }
             let ret, result;
             try {
-                console.log(method, args);
                 ret = this.action[method].apply(this, args);
             }
             catch (e) {
-                return JSON.stringify(V12.error(e.message));
+                this.logger.error(e);
+                return "API 调用异常";
             }
             if (ret instanceof Promise) {
                 if (is_async) {
@@ -426,6 +442,8 @@ class V12 extends service_1.Service {
             }
             if (result.data instanceof Map)
                 result.data = [...result.data.values()];
+            if (result.data?.message)
+                result.data.message = this.adapter.toSegment('V12', result.data.message);
             if (echo) {
                 result.echo = echo;
             }
@@ -528,16 +546,16 @@ class V12 extends service_1.Service {
             }
             if (event.detail_type === "group") {
                 if (res.delete)
-                    this.client.deleteMsg(event.message_id);
+                    this.adapter.call(this.oneBot.uin, 'V12', 'deleteMsg', [event.message_id]);
                 if (res.kick && !event.anonymous)
-                    this.client.setGroupKick(event.group_id, event.user_id, res.reject_add_request);
+                    this.adapter.call(this.oneBot.uin, 'V12', 'setGroupKick', [event.group_id, event.user_id, res.reject_add_request]);
                 if (res.ban)
-                    this.client.setGroupBan(event.group_id, event.user_id, res.ban_duration > 0 ? res.ban_duration : 1800);
+                    this.adapter.call(this.oneBot.uin, 'V12', 'setGroupBan', [event.group_id, event.user_id, res.ban_duration > 0 ? res.ban_duration : 1800]);
             }
         }
         if (event.type === "request" && "approve" in res) {
             const action = event.detail_type === "friend" ? "setFriendAddRequest" : "setGroupAddRequest";
-            this.client[action](event.flag, res.approve, res.reason ? res.reason : "", !!res.block);
+            this.adapter.call(this.oneBot.uin, 'V12', action, [event.flag, res.approve, res.reason ? res.reason : "", !!res.block]);
         }
     }
     /**
@@ -636,52 +654,6 @@ class V12 extends service_1.Service {
 exports.V12 = V12;
 (function (V12) {
     const fileTypes = ['image', "file", 'record', 'video', 'flash'];
-    function fromSegment(msgList) {
-        msgList = [].concat(msgList);
-        return msgList.map((msg) => {
-            if (typeof msg !== 'object')
-                msg = String(msg);
-            if (typeof msg === 'string') {
-                return { type: 'text', text: msg };
-            }
-            const { type, data = {}, ...other } = msg;
-            Object.assign(data, other);
-            if (type === 'music' && !data['platform']) {
-                data['platform'] = data['type'];
-                delete data['type'];
-            }
-            if (type === 'mention')
-                data['qq'] = Number(data['user_id']);
-            if (fileTypes.includes(type) && !data['file']) {
-                data['file'] = data['file_id'];
-                delete data['file_id'];
-            }
-            return {
-                type: type.replace('mention', 'at').replace('at_all', 'at'),
-                ...other,
-                ...data
-            };
-        });
-    }
-    V12.fromSegment = fromSegment;
-    function toSegment(msgList) {
-        msgList = [].concat(msgList);
-        return msgList.map((msg) => {
-            if (typeof msg === 'string')
-                return { type: 'text', data: { text: msg } };
-            let { type, ...other } = msg;
-            if (fileTypes.includes(type))
-                other['file_id'] = other['file'];
-            return {
-                type: type === 'at' ? other['qq'] ? 'mention' : "mention_all" : type,
-                data: {
-                    ...other,
-                    user_id: other['qq']
-                }
-            };
-        });
-    }
-    V12.toSegment = toSegment;
     V12.defaultConfig = {
         heartbeat: 3,
         access_token: '',
@@ -716,7 +688,7 @@ exports.V12 = V12;
     V12.error = error;
     function formatPayload(uin, type, data) {
         return {
-            self_id: uin + '',
+            self_id: uin,
             time: Math.floor(Date.now() / 1000),
             detail_type: type,
             type: 'meta',

package/lib/service.d.ts

@@ -2,12 +2,17 @@
 import { EventEmitter } from "events";
 import { OneBot } from "./onebot";
 import { Dict } from "@zhinjs/shared";
+import { Adapter } from "./adapter";
 export interface Service<V extends OneBot.Version> {
     filterFn(event: Dict): boolean;
 }
 export declare class Service<V extends OneBot.Version> extends EventEmitter {
-    config: OneBot.Config<V>;
-    constructor(config: OneBot.Config<V>);
+    adapter: Adapter;
+    config: OneBot.Config;
+    oneBot: OneBot;
+    version: OneBot.Version;
+    protected get path(): string;
+    constructor(adapter: Adapter, config: OneBot.Config);
 }
 export declare namespace Service {
     type MaybeArray<T = any> = T | T[];

package/lib/service.js

@@ -3,8 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Service = void 0;
 const events_1 = require("events");
 class Service extends events_1.EventEmitter {
-    constructor(config) {
+    get path() {
+        return `/${this.oneBot.platform}/${this.oneBot.uin}/${this.version}`;
+    }
+    constructor(adapter, config) {
         super();
+        this.adapter = adapter;
         this.config = config;
         this.filterFn = Service.createFilterFunction(config.filters || {});
     }
@@ -14,61 +18,59 @@ exports.Service = Service;
     function createFilterFunction(filters) {
         const isLogicKey = (key) => {
             return [
-                "$and",
-                "$or",
-                "$not",
-                "$nor",
-                "$regexp",
-                "$like",
-                "$gt",
-                "$gte",
-                "$lt",
-                "$lte",
-                "$between",
+                '$and',
+                '$or',
+                '$not',
+                '$nor',
+                '$regexp',
+                '$like',
+                '$gt',
+                '$gte',
+                '$lt',
+                '$lte',
+                '$between',
             ].includes(key);
         };
         const filterFn = (event, key, value) => {
             // 如果 key 为 $and、$or、$not、$nor 则递归调用
-            if (key === "$and" || key === "$or" || key === "$not" || key === "$nor") {
-                if (!value || typeof value !== "object")
+            if (key === "$and" || key === "$or" || key === "$not" || key === '$nor') {
+                if (!value || typeof value !== 'object')
                     throw new Error("invalid filter");
                 switch (key) {
                     case "$and":
-                        return Array.isArray(value)
-                            ? value.every(item => filterFn(event, key, item))
-                            : Object.entries(value).every(([key, value]) => filterFn(event, key, value));
+                        return Array.isArray(value) ? value.every((item) => filterFn(event, key, item)) :
+                            Object.entries(value).every(([key, value]) => filterFn(event, key, value));
                     case "$or":
-                        return Array.isArray(value)
-                            ? value.some(item => filterFn(event, key, item))
-                            : Object.entries(value).some(([key, value]) => filterFn(event, key, value));
+                        return Array.isArray(value) ? value.some((item) => filterFn(event, key, item)) :
+                            Object.entries(value).some(([key, value]) => filterFn(event, key, value));
                     case "$nor":
-                        return !filterFn(event, "$or", value);
+                        return !filterFn(event, '$or', value);
                     case "$not":
-                        return !filterFn(event, "$and", value);
+                        return !filterFn(event, '$and', value);
                 }
             }
             if (typeof value === "boolean" && typeof event[key] !== "boolean") {
                 return value;
             }
             if (typeof value !== "object") {
-                if (key === "$regex" && typeof value === "string")
+                if (key === '$regex' && typeof value === 'string')
                     return new RegExp(value).test(String(event));
-                if (key === "$like" && typeof value === "string")
+                if (key === '$like' && typeof value === 'string')
                     return String(event).includes(value);
-                if (key === "$gt" && typeof value === "number")
+                if (key === '$gt' && typeof value === 'number')
                     return Number(event) > value;
-                if (key === "$gte" && typeof value === "number")
+                if (key === '$gte' && typeof value === 'number')
                     return Number(event) >= value;
-                if (key === "$lt" && typeof value === "number")
+                if (key === '$lt' && typeof value === 'number')
                     return Number(event) < value;
-                if (key === "$lte" && typeof value === "number")
+                if (key === '$lte' && typeof value === 'number')
                     return Number(event) <= value;
                 return value === event[key];
             }
-            if (key === "$between" &&
+            if (key === '$between' &&
                 Array.isArray(value) &&
                 value.length === 2 &&
-                value.every(item => typeof item === "number")) {
+                value.every((item) => typeof item === 'number')) {
                 const [start, end] = value;
                 return event >= start && event <= end;
             }

package/lib/utils.d.ts

@@ -4,6 +4,9 @@ export declare function transformObj(obj: any, callback: any): any;
 export declare function deepClone<T extends any>(obj: T): T;
 export declare function pick<T extends object, K extends keyof T>(source: T, keys?: Iterable<K>, forced?: boolean): Pick<T, K>;
 export declare function omit<T, K extends keyof T>(source: T, keys?: Iterable<K>): Omit<T, K>;
+export declare function randomId(seed: string): number;
+export declare function randomId(seed: string, length: number): number;
+export declare function randomId(seed: string, min: number, max: number): number;
 /**
  * 将驼峰命名替换为下划线分割命名
  * @param name
@@ -11,13 +14,13 @@ export declare function omit<T, K extends keyof T>(source: T, keys?: Iterable<K>
  * @todo 是否应该改名 ToUnderLine()？
  */
 export declare function toLine<T extends string>(name: T): string;
-export interface Class {
-    new (...args: any[]): any;
+export interface Class<T = any> {
+    new (...args: any[]): T;
 }
-export declare function Mixin(base: Class, ...classes: Class[]): Class;
+export declare function Mixin(base: Class, ...classes: Class[]): Class<any>;
 export declare function toHump(action: string): string;
 export declare function remove<T>(list: T[], item: T): void;
 export declare function toBool(v: any): boolean;
 export declare function uuid(): string;
-export declare function protectedFields<T>(source: T, ...keys: (keyof T)[]): T;
+export declare function protectedFields<T>(source: T, ...keys: ((keyof T) | string)[]): T;
 export declare function getProperties(obj: any): any;