node-karin 0.12.10 → 0.12.11

package/lib/core/init/config.js

@@ -94,7 +94,7 @@ export class KarinCfgInit {
     modifyPackage() {
         const pkg = this.readJson(path.join(karinDir, 'package.json'));
         const projPkg = this.readJson('./package.json');
-        const main = 'node_modules/node-karin/lib/index.js';
+        const main = 'node_modules/node-karin/lib/cli/start.js';
         delete pkg.bin;
         pkg.main = `./${main}`;
         pkg.types = `./${main.replace('.js', '.d.ts')}`;
@@ -105,13 +105,12 @@ export class KarinCfgInit {
         projPkg.main = `./${main}`;
         projPkg.dependencies = { ...projPkg.dependencies, ...pkg.dependencies };
         projPkg.dependencies['node-karin'] = 'latest';
-        projPkg.dependencies['kritor-proto'] = 'latest';
         if (!projPkg.scripts)
             projPkg.scripts = {};
         if (!projPkg.devDependencies)
             projPkg.devDependencies = {};
         projPkg.scripts.debug = `node --watch ${main}`;
-        projPkg.scripts.dev = `tsx --watch ${main}`;
+        // projPkg.scripts.dev = `tsx --watch ${main}`
         fs.writeFileSync('./package.json', JSON.stringify(projPkg, null, 2));
     }
     /**

package/lib/core/karin/karin.d.ts

@@ -1,4 +1,4 @@
-import { Contact, KarinElement, KarinMessage, KarinRenderType, PermissionType, RenderResult, KarinNoticeType, KarinRequestType, AllMessageSubType, CommandInfo, TaskInfo, HandlerInfo, AcceptInfo, UseInfo, AllNoticeSubType, AllRequestSubType, UseMapType } from '../../types/index.js';
+import { Contact, KarinElement, KarinMessage, KarinRenderType, RenderResult, AllMessageSubType, CommandInfo, TaskInfo, HandlerInfo, AcceptInfo, UseInfo, AllNoticeSubType, AllRequestSubType, UseMapType, ButtonInfo, Permission } from '../../types/index.js';
 import { Listeners } from '../listener/listener.js';
 export type FncFunction = (e: KarinMessage) => Promise<boolean>;
 export type FncElement = string | KarinElement | Array<KarinElement>;
@@ -28,7 +28,7 @@ export interface OptionsCommand extends Options {
      * - 权限
      * @default 'all'
      */
-    permission?: PermissionType;
+    permission?: `${Permission}`;
 }
 export interface OptionsElement extends OptionsCommand {
     /**
@@ -87,17 +87,7 @@ export declare class Karin extends Listeners {
      * @param fn - 函数实现
      * @param options - 选项
      */
-    handler(key: string, fn: (
-    /**
-     * - 自定义参数 由调用方传递
-     */
-    args: {
-        [key: string]: any;
-    }, 
-    /**
-     * - 停止循环函数 调用后则不再继续执行下一个处理器
-     */
-    reject: (msg?: string) => void) => Promise<any>, options?: Omit<Options, 'log'>): HandlerInfo;
+    handler(key: string, fn: HandlerInfo['fn'], options?: Omit<Options, 'log'>): HandlerInfo;
     /**
      * 构建contact
      * @param scene - 场景
@@ -164,7 +154,7 @@ export declare class Karin extends Listeners {
      * @param event - 监听事件
      * @param fn - 实现函数
      */
-    accept(event: AllNoticeSubType | AllRequestSubType, fn: (e: KarinNoticeType | KarinRequestType) => Promise<boolean>, options?: Options): AcceptInfo;
+    accept(event: AllNoticeSubType | AllRequestSubType, fn: AcceptInfo['fn'], options?: Options): AcceptInfo;
     /**
      * 中间件
      * @param type 中间件类型
@@ -172,6 +162,12 @@ export declare class Karin extends Listeners {
      * @param options 选项配置
      */
     use<T extends keyof UseMapType>(type: `${T}`, fn: UseMapType[T][number]['fn'], options?: Omit<Options, 'log'>): UseInfo;
+    /**
+     * 按钮
+     * @param reg - 正则表达式
+     * @param fn - 函数
+     */
+    button(reg: RegExp | string, fn: ButtonInfo['fn'], options?: Omit<Options, 'log'>): ButtonInfo;
     /**
      * - 启动
      */

package/lib/core/karin/karin.js

@@ -48,11 +48,11 @@ export class Karin extends Listeners {
             fn,
             fnname: 'fnc',
             log,
-            name: options.name || 'command',
+            name: options.name || "command" /* AppType.Command */,
             perm: options.permission || 'all',
             rank: options.priority || 10000,
             reg,
-            type: 'command',
+            type: "command" /* AppType.Command */,
         };
     }
     /**
@@ -74,9 +74,9 @@ export class Karin extends Listeners {
             cron,
             fn,
             log,
-            name: options?.name || 'task',
+            name: options?.name || "task" /* AppType.Task */,
             fnname: name,
-            type: 'task',
+            type: "task" /* AppType.Task */,
         };
     }
     /**
@@ -93,9 +93,9 @@ export class Karin extends Listeners {
         return {
             fn,
             key,
-            name: options?.name || 'handler',
+            name: options?.name || "handler" /* AppType.Handler */,
             rank: options?.priority || 10000,
-            type: 'handler',
+            type: "handler" /* AppType.Handler */,
         };
     }
     /**
@@ -182,9 +182,9 @@ export class Karin extends Listeners {
             event,
             fn,
             log,
-            name: options?.name || 'accept',
+            name: options?.name || "accept" /* AppType.Accept */,
             rank: options?.priority || 10000,
-            type: 'accept',
+            type: "accept" /* AppType.Accept */,
         };
     }
     /**
@@ -197,9 +197,23 @@ export class Karin extends Listeners {
         return {
             fn,
             key: type,
-            name: options?.name || 'use',
+            name: options?.name || "use" /* AppType.Use */,
             rank: options?.priority || 10000,
-            type: 'use',
+            type: "use" /* AppType.Use */,
+        };
+    }
+    /**
+     * 按钮
+     * @param reg - 正则表达式
+     * @param fn - 函数
+     */
+    button(reg, fn, options) {
+        return {
+            fn,
+            reg: reg instanceof RegExp ? reg : new RegExp(reg),
+            name: options?.name || "button" /* AppType.Button */,
+            rank: options?.priority || 10000,
+            type: "button" /* AppType.Button */,
         };
     }
     /**

package/lib/core/plugin/loader.d.ts

@@ -1,5 +1,5 @@
 import chokidar from 'chokidar';
-import { UseInfo, AppsType, TaskInfo, ButtonInfo, AcceptInfo, CommandInfo, HandlerInfo, PluginInfoType, PluginTaskInfoType, PluginButtonInfoType, PluginAcceptInfoType, PluginHandlerInfoType, PluginCommandInfoType, UseValueType } from '../../types/index.js';
+import { UseInfo, AppsType, TaskInfo, ButtonInfo, AcceptInfo, CommandInfo, HandlerInfo, UseMapType, PluginInfoType, PluginTaskInfoType, PluginButtonInfoType, PluginAcceptInfoType, PluginHandlerInfoType, PluginCommandInfoType } from '../../types/index.js';
 type AppType = CommandInfo | TaskInfo | HandlerInfo | ButtonInfo | AcceptInfo | UseInfo;
 export interface AppFile {
     /** 插件包名称 */
@@ -59,7 +59,7 @@ declare class PluginLoader {
     /** task定时任务信息 */
     task: PluginTaskInfoType[];
     /** 中间件 */
-    use: UseValueType;
+    use: UseMapType;
     /** 加载的文件数组 .js .ts */
     ext: string[];
     constructor();

package/lib/core/plugin/loader.js

@@ -52,11 +52,11 @@ class PluginLoader {
         this.plugin = new Map();
         this.task = [];
         this.use = {
-            recvMsg: [],
-            replyMsg: [],
-            sendMsg: [],
-            forwardMsg: [],
-            notFoundMsg: [],
+            ["recvMsg" /* UseKeyType['ReceiveMsg'] */]: [],
+            ["replyMsg" /* UseKeyType['ReplyMsg'] */]: [],
+            ["sendMsg" /* UseKeyType['SendMsg'] */]: [],
+            ["forwardMsg" /* UseKeyType['ForwardMsg'] */]: [],
+            ["notFoundMsg" /* UseKeyType['NotFoundMsg'] */]: [],
         };
         this.ext = process.env.karin_app_lang === 'ts' ? ['.js', '.ts'] : ['.js'];
         this.index = 0;
@@ -288,11 +288,11 @@ class PluginLoader {
         this.button = lodash.orderBy(this.button, ['rank'], ['asc']);
         this.command = lodash.orderBy(this.command, ['rank'], ['asc']);
         this.task = lodash.orderBy(this.task, ['rank'], ['asc']);
-        this.use.recvMsg = lodash.orderBy(this.use.recvMsg, ['rank'], ['asc']);
-        this.use.replyMsg = lodash.orderBy(this.use.replyMsg, ['rank'], ['asc']);
-        this.use.sendMsg = lodash.orderBy(this.use.sendMsg, ['rank'], ['asc']);
-        this.use.forwardMsg = lodash.orderBy(this.use.forwardMsg, ['rank'], ['asc']);
-        this.use.notFoundMsg = lodash.orderBy(this.use.notFoundMsg, ['rank'], ['asc']);
+        this.use["recvMsg" /* UseKeyType['ReceiveMsg'] */] = lodash.orderBy(this.use["recvMsg" /* UseKeyType['ReceiveMsg'] */], ['rank'], ['asc']);
+        this.use["replyMsg" /* UseKeyType['ReplyMsg'] */] = lodash.orderBy(this.use["replyMsg" /* UseKeyType['ReplyMsg'] */], ['rank'], ['asc']);
+        this.use["sendMsg" /* UseKeyType['SendMsg'] */] = lodash.orderBy(this.use["sendMsg" /* UseKeyType['SendMsg'] */], ['rank'], ['asc']);
+        this.use["forwardMsg" /* UseKeyType['ForwardMsg'] */] = lodash.orderBy(this.use["forwardMsg" /* UseKeyType['ForwardMsg'] */], ['rank'], ['asc']);
+        this.use["notFoundMsg" /* UseKeyType['NotFoundMsg'] */] = lodash.orderBy(this.use["notFoundMsg" /* UseKeyType['NotFoundMsg'] */], ['rank'], ['asc']);
         const handler = Object.keys(this.handler);
         handler.forEach(key => {
             this.handler[key] = lodash.orderBy(this.handler[key], ['rank'], ['asc']);
@@ -552,11 +552,11 @@ class PluginLoader {
                 this.accept = this.accept.filter(val => val.key !== key);
                 this.button = this.button.filter(val => val.key !== key);
                 this.command = this.command.filter(val => val.key !== key);
-                this.use.recvMsg = this.use.recvMsg.filter(val => val.key !== key);
-                this.use.replyMsg = this.use.replyMsg.filter(val => val.key !== key);
-                this.use.sendMsg = this.use.sendMsg.filter(val => val.key !== key);
-                this.use.forwardMsg = this.use.forwardMsg.filter(val => val.key !== key);
-                this.use.notFoundMsg = this.use.notFoundMsg.filter(val => val.key !== key);
+                this.use["recvMsg" /* UseKeyType['ReceiveMsg'] */] = this.use["recvMsg" /* UseKeyType['ReceiveMsg'] */].filter(val => val.key !== key);
+                this.use["replyMsg" /* UseKeyType['ReplyMsg'] */] = this.use["replyMsg" /* UseKeyType['ReplyMsg'] */].filter(val => val.key !== key);
+                this.use["sendMsg" /* UseKeyType['SendMsg'] */] = this.use["sendMsg" /* UseKeyType['SendMsg'] */].filter(val => val.key !== key);
+                this.use["forwardMsg" /* UseKeyType['ForwardMsg'] */] = this.use["forwardMsg" /* UseKeyType['ForwardMsg'] */].filter(val => val.key !== key);
+                this.use["notFoundMsg" /* UseKeyType['NotFoundMsg'] */] = this.use["notFoundMsg" /* UseKeyType['NotFoundMsg'] */].filter(val => val.key !== key);
                 /** 定时任务需要先停止 */
                 this.task = this.task.filter(val => {
                     if (val.key === key) {

package/lib/types/event/sender.d.ts

@@ -17,10 +17,6 @@ export declare const enum Permission {
     GroupOwner = "group.owner",
     GroupAdmin = "group.admin"
 }
-/**
- * - 权限类型 纯文本
- */
-export type PermissionType = 'all' | 'master' | 'admin' | 'group.owner' | 'group.admin';
 /**
  * - 事件发送者信息
  */

package/lib/types/plugin/app.d.ts

@@ -1,4 +1,4 @@
-import { AllMessageSubType, AllNoticeSubType, AllRequestSubType, KarinMessageType, KarinNoticeType, KarinRequestType, NewMessagePlugin, Permission, UseMapType } from '../../types/index.js';
+import { AllMessageSubType, AllNoticeSubType, AllRequestSubType, ButtonElement, Contact, KarinAdapter, KarinElement, KarinMessage, KarinMessageType, KarinNoticeType, KarinRequestType, KeyBoardElement, NewMessagePlugin, NodeElement, Permission, UseMapType } from '../../types/index.js';
 export declare const enum AppType {
     Command = "command",
     Task = "task",
@@ -7,7 +7,7 @@ export declare const enum AppType {
     Accept = "accept",
     Use = "use"
 }
-interface AppInfo {
+export interface AppBase {
     /** 实现方法 */
     fn: Function;
     /** 插件名称 */
@@ -20,7 +20,7 @@ interface AppInfo {
     log: Function;
 }
 /** command规则集类型 */
-export interface CommandInfo extends AppInfo {
+export interface CommandInfo extends AppBase {
     fn: (e: KarinMessageType) => Promise<boolean>;
     /** 插件执行方法名称 */
     fnname: string;
@@ -35,7 +35,7 @@ export interface CommandInfo extends AppInfo {
     data: NewMessagePlugin | '';
 }
 /** task规则集类型 */
-export interface TaskInfo extends Omit<AppInfo, 'rank'> {
+export interface TaskInfo extends Omit<AppBase, 'rank'> {
     type: `${AppType.Task}`;
     /** 任务名称 */
     fnname: string;
@@ -43,28 +43,106 @@ export interface TaskInfo extends Omit<AppInfo, 'rank'> {
     cron: string;
 }
 /** handler规则集类型 */
-export interface HandlerInfo extends Omit<AppInfo, 'log'> {
+export interface HandlerInfo extends Omit<AppBase, 'log'> {
     type: `${AppType.Handler}`;
     /** 入口秘钥 */
     key: string;
+    /** 实现方法 */
+    fn: (
+    /**
+     * - 自定义参数 由调用方传递
+     */
+    args: {
+        [key: string]: any;
+    }, 
+    /**
+     * - 停止循环函数 调用后则不再继续执行下一个处理器
+     */
+    next: (msg?: string) => void) => Promise<any>;
 }
 /** button规则集类型 */
-export interface ButtonInfo extends AppInfo {
+export interface ButtonInfo extends Omit<AppBase, 'log'> {
     type: `${AppType.Button}`;
     /** 正则 */
     reg: RegExp;
+    fn: (
+    /** 是否继续匹配下一个按钮 默认否 调用后则继续 */
+    next: () => void, 
+    /** 消息事件 可能不存在~ */
+    e?: KarinMessage, 
+    /** 自定义参数 */
+    ...args: any[]) => Promise<ButtonElement | KeyBoardElement | Array<ButtonElement | KeyBoardElement>>;
 }
 /** accept规则集类型 */
-export interface AcceptInfo extends AppInfo {
+export interface AcceptInfo extends AppBase {
     fn: (e: KarinNoticeType | KarinRequestType) => Promise<boolean>;
     type: `${AppType.Accept}`;
     /** 监听事件 */
     event: `${AllNoticeSubType}` | `${AllRequestSubType}`;
 }
+/**
+ * 初始化消息前 中间件实现方法
+ */
+export type UseRecvMsgFn = (
+/** 消息事件方法 */
+e: KarinMessageType, 
+/** 是否继续执行下一个中间件 */
+next: () => void, 
+/** 是否退出此条消息 不再执行匹配插件 */
+exit: () => void) => Promise<boolean>;
+/**
+ * 回复消息前 中间件实现方法
+ */
+export type UseSendMsgFn = (
+/** 消息事件方法 */
+e: KarinMessageType, 
+/** 回复的消息体 */
+element: KarinElement[], 
+/** 是否继续执行下一个中间件 */
+next: () => void, 
+/** 是否不发送此条消息 */
+exit: () => void) => Promise<boolean>;
+/**
+ * 发送主动消息前 中间件实现方法
+ */
+export type UseSendNoticeFn = (
+/** 发送的bot */
+uid: string, 
+/** 发送目标 */
+contact: Contact, 
+/** 发送的消息体 */
+element: KarinElement[], 
+/** 是否继续执行下一个中间件 */
+next: () => void, 
+/** 是否不发送此条消息 */
+exit: () => void) => Promise<boolean>;
+/**
+ * 发送合并转发前 中间件实现方法
+ */
+export type UseForwardMsgFn = (bot: KarinAdapter, 
+/** 发送的目标信息 */
+contact: Contact, 
+/** 发送的消息体 */
+elements: Array<NodeElement>, 
+/** 是否继续执行下一个中间件 */
+next: () => void, 
+/** 是否不发送此条消息 */
+exit: () => void) => Promise<boolean>;
+/**
+ * 消息事件没有找到任何匹配的插件触发 中间件实现方法
+ */
+export type UseNotFoundMsgFn = (
+/** 消息事件方法 */
+e: KarinMessageType, 
+/** 是否继续执行下一个中间件 */
+next: () => void, 
+/** 是否退出此条消息 不再执行匹配插件 */
+exit: () => void) => Promise<boolean>;
 /** use规则集类型 */
-export interface UseInfo extends Omit<AppInfo, 'log'> {
+export interface UseInfo<T extends keyof UseMapType = keyof UseMapType> extends Omit<AppBase, 'log'> {
     type: `${AppType.Use}`;
     /** 中间件类型key */
-    key: `${keyof UseMapType}`;
+    key: `${T}`;
+    /** 中间件实现方法 */
+    fn: UseMapType[T][number]['fn'];
 }
-export {};

package/lib/types/plugin/plugin.d.ts

@@ -1,9 +1,7 @@
 import schedule from 'node-schedule';
-import { Plugin } from '../../core/index.js';
 import { Reply, replyCallback, replyForward } from '../event/reply.js';
-import { KarinNoticeType, KarinRequestType, AllListenEvent, KarinMessageType, PermissionType, AllMessageSubType, Contact, AllNoticeSubType, AllRequestSubType } from '../event/index.js';
-import { KarinElement, NodeElement } from '../element/element.js';
-import { KarinAdapter } from '../adapter/base.js';
+import { KarinNoticeType, KarinRequestType, AllListenEvent, KarinMessageType, AllMessageSubType, Permission } from '../event/index.js';
+import { AcceptInfo, ButtonInfo, CommandInfo, HandlerInfo, Plugin, UseForwardMsgFn, UseInfo, UseNotFoundMsgFn, UseRecvMsgFn, UseSendMsgFn, UseSendNoticeFn } from '../../core/index.js';
 /**
  * - 插件根目录名称
  * - 例如: karin-plugin-example
@@ -57,25 +55,25 @@ export interface PluginCommandInfoType {
     /** 插件基本信息的映射key */
     key: number;
     /** 插件包名称 */
-    name: string;
+    name: CommandInfo['name'];
     /** 插件正则 */
-    reg: RegExp;
+    reg: CommandInfo['reg'];
     /** 插件执行方法 */
-    fn: (e: KarinMessageType) => Promise<boolean>;
+    fn: CommandInfo['fn'];
     /** 插件执行方法名称 */
-    fnname: string;
+    fnname: CommandInfo['fnname'];
     /** 插件类型 */
     type: `${MethodType}`;
     /** 在type为class的时候 data为class 否则为空字符串 */
     data: (() => PluginType) | undefined;
     /** 插件执行权限 */
-    perm: `${PermissionType}`;
+    perm: CommandInfo['perm'];
     /** 执行打印日志方法 */
-    log: Function;
+    log: CommandInfo['log'];
     /** 监听的子事件 高于父事件 */
-    event: AllMessageSubType;
+    event: CommandInfo['event'];
     /** 优先级 */
-    rank: number;
+    rank: CommandInfo['rank'];
 }
 /**
  * accept规则集信息
@@ -84,15 +82,15 @@ export interface PluginAcceptInfoType {
     /** 插件基本信息的映射key */
     key: number;
     /** 插件包名称 */
-    name: string;
+    name: AcceptInfo['name'];
     /** 插件执行方法 */
-    fn: (e: KarinNoticeType | KarinRequestType) => Promise<boolean>;
+    fn: AcceptInfo['fn'];
     /** 优先级 */
-    rank: number;
+    rank: AcceptInfo['rank'];
     /** 监听事件 */
-    event: AllNoticeSubType | AllRequestSubType;
+    event: AcceptInfo['event'];
     /** 执行打印日志方法 */
-    log: Function;
+    log: AcceptInfo['log'];
 }
 /**
  * task规则集信息
@@ -122,13 +120,13 @@ export interface PluginButtonInfoType {
     /** 插件基本信息的映射key */
     key: number;
     /** 插件包名称 */
-    name: string;
+    name: ButtonInfo['name'];
     /** 插件正则 */
-    reg: RegExp;
+    reg: ButtonInfo['reg'];
     /** 插件执行方法 */
-    fn: (reject: Function, e?: KarinMessageType) => Promise<any>;
+    fn: ButtonInfo['fn'];
     /** 优先级 */
-    rank: number;
+    rank: ButtonInfo['rank'];
 }
 /**
  * handler规则集信息
@@ -137,109 +135,21 @@ export interface PluginHandlerInfoType {
     /** 插件基本信息的映射key */
     key: number;
     /** 插件包名称 */
-    name: string;
+    name: HandlerInfo['name'];
     /** handler的处理方法 */
-    fn: (args: any, reject: (msg?: string) => void) => Promise<any>;
+    fn: HandlerInfo['fn'];
     /** 优先级 */
-    rank: number;
+    rank: HandlerInfo['rank'];
 }
-/**
- * 中间件规则集信息
- */
-export interface UseValueType {
-    /** 初始化消息前 */
-    recvMsg: Array<{
-        /** 插件基本信息的映射key */
-        key: number;
-        /** 插件包名称 */
-        name: string;
-        /** 插件执行方法 */
-        fn: (
-        /** 消息事件方法 */
-        e: KarinMessageType, 
-        /** 是否继续执行下一个中间件 */
-        next: Function, 
-        /** 是否退出此条消息 不再执行匹配插件 */
-        exit: Function) => Promise<boolean>;
-        /** 优先级 */
-        rank: number;
-    }>;
-    /** 回复消息前 */
-    replyMsg: Array<{
-        /** 插件基本信息的映射key */
-        key: number;
-        /** 插件包名称 */
-        name: string;
-        /** 插件执行方法 */
-        fn: (
-        /** 消息事件方法 */
-        e: KarinMessageType, 
-        /** 回复的消息体 */
-        element: KarinElement[], 
-        /** 是否继续执行下一个中间件 */
-        next: Function, 
-        /** 是否不发送此条消息 */
-        exit: Function) => Promise<boolean>;
-        /** 优先级 */
-        rank: number;
-    }>;
-    /** 发送主动消息前 */
-    sendMsg: Array<{
-        /** 插件基本信息的映射key */
-        key: number;
-        /** 插件包名称 */
-        name: string;
-        /** 插件执行方法 */
-        fn: (
-        /** 发送的bot */
-        uid: string, 
-        /** 发送目标 */
-        contact: Contact, 
-        /** 发送的消息体 */
-        element: KarinElement[], 
-        /** 是否继续执行下一个中间件 */
-        next: Function, 
-        /** 是否不发送此条消息 */
-        exit: Function) => Promise<boolean>;
-        /** 优先级 */
-        rank: number;
-    }>;
-    /** 发送合并转发前 */
-    forwardMsg: Array<{
-        /** 插件基本信息的映射key */
-        key: number;
-        /** 插件包名称 */
-        name: string;
-        /** 插件执行方法 */
-        fn: (bot: KarinAdapter, 
-        /** 发送的目标信息 */
-        contact: Contact, 
-        /** 发送的消息体 */
-        elements: Array<NodeElement>, 
-        /** 是否继续执行下一个中间件 */
-        next: Function, 
-        /** 是否不发送此条消息 */
-        exit: Function) => Promise<boolean>;
-        /** 优先级 */
-        rank: number;
-    }>;
-    /** 消息事件没有找到任何匹配的插件触发 */
-    notFoundMsg: Array<{
-        /** 插件基本信息的映射key */
-        key: number;
-        /** 插件包名称 */
-        name: string;
-        /** 插件执行方法 */
-        fn: (
-        /** 消息事件方法 */
-        e: KarinMessageType, 
-        /** 是否继续执行下一个中间件 */
-        next: Function, 
-        /** 是否退出此条消息 不再执行匹配插件 */
-        exit: Function) => Promise<boolean>;
-        /** 优先级 */
-        rank: number;
-    }>;
+export interface UseBase<T> {
+    /** 插件基本信息的映射key */
+    key: number;
+    /** 插件包名称 */
+    name: UseInfo['name'];
+    /** 插件执行方法 */
+    fn: T;
+    /** 优先级 */
+    rank: UseInfo['rank'];
 }
 /**
  * 中间件类型
@@ -260,11 +170,11 @@ export declare const enum UseKeyType {
  * 中间件映射
  */
 export interface UseMapType {
-    [UseKeyType.ReceiveMsg]: UseValueType['recvMsg'];
-    [UseKeyType.ReplyMsg]: UseValueType['replyMsg'];
-    [UseKeyType.SendMsg]: UseValueType['sendMsg'];
-    [UseKeyType.ForwardMsg]: UseValueType['forwardMsg'];
-    [UseKeyType.NotFoundMsg]: UseValueType['notFoundMsg'];
+    [UseKeyType.ReceiveMsg]: Array<UseBase<UseRecvMsgFn>>;
+    [UseKeyType.ReplyMsg]: Array<UseBase<UseSendMsgFn>>;
+    [UseKeyType.SendMsg]: Array<UseBase<UseSendNoticeFn>>;
+    [UseKeyType.ForwardMsg]: Array<UseBase<UseForwardMsgFn>>;
+    [UseKeyType.NotFoundMsg]: Array<UseBase<UseNotFoundMsgFn>>;
 }
 /**
  * 上下文状态
@@ -304,7 +214,7 @@ export interface PluginRule {
     /**
      * 权限
      */
-    permission?: PermissionType;
+    permission?: `${Permission}`;
     /**
      * - 打印日志 默认为true
      */

package/lib/utils/common/common.js

@@ -612,9 +612,9 @@ export class Common {
                 const data = {
                     id: String(id),
                     render_data: {
-                        label: i.text,
+                        label: i.text || i.link || '',
                         style: i.style ?? 0,
-                        visited_label: i.show || i.text,
+                        visited_label: i.show || i.text || i.link || '',
                     },
                     action: {
                         type,

package/lib/utils/core/handler.js

@@ -19,12 +19,8 @@ export const handler = new (class EventHandler {
                  * 拒绝处理器 调用后则不再继续执行下一个处理器
                  * @param msg 错误信息
                  */
-                const reject = (msg = '') => {
-                    if (msg)
-                        logger.mark(`[Handler][Reject]: [${plugin.plugin}][${info.name}][${key}] ${msg}`);
-                    done = false;
-                };
-                res = await info.fn(args, reject);
+                const next = () => { done = false; };
+                res = await info.fn(args, next);
                 if (done) {
                     logger.mark(`[Handler][Done]: [${plugin.plugin}][${info.name}][${key}]`);
                     return res;

package/lib/utils/core/segment.d.ts

@@ -258,12 +258,9 @@ export declare const segment: {
     /**
      * 按钮 构建单行单个(obj)、多个按钮(obj[])
      * @param data - 按钮数据
-     * @returns {ButtonElement} 按钮元素
+     * @returns 按钮元素
      */
-    button(data: Button | Array<Button>): {
-        type: ButtonElement["type"];
-        data: Array<Button>;
-    };
+    button(data: Button | Array<Button>): ButtonElement;
     /**
      * 多维按钮
      * @param data - 按钮数据

package/lib/utils/core/segment.js

@@ -402,7 +402,7 @@ export const segment = new (class Segment {
     /**
      * 按钮 构建单行单个(obj)、多个按钮(obj[])
      * @param data - 按钮数据
-     * @returns {ButtonElement} 按钮元素
+     * @returns 按钮元素
      */
     button(data) {
         return {

package/lib/utils/tools/button.d.ts

@@ -1,2 +1,9 @@
-import { KarinMessageType } from '../../types/index.js';
-export declare const button: (msg: string, e?: KarinMessageType) => Promise<any>;
+import { ButtonElement, KarinMessageType, KeyBoardElement } from '../../types/index.js';
+/**
+ * 按钮处理器类
+ * @param msg 传e.msg就行
+ * @param e 消息事件 可不传
+ * @param arg 自定义参数 可不传
+ * @returns 返回按钮元素
+ */
+export declare const button: (msg: string, e?: KarinMessageType, ...arg: any[]) => Promise<(ButtonElement | KeyBoardElement)[]>;

package/lib/utils/tools/button.js

@@ -1,23 +1,35 @@
 import logger from '../core/logger.js';
 import { pluginLoader as loader } from '../../core/index.js';
-export const button = async (msg, e) => {
+/**
+ * 按钮处理器类
+ * @param msg 传e.msg就行
+ * @param e 消息事件 可不传
+ * @param arg 自定义参数 可不传
+ * @returns 返回按钮元素
+ */
+export const button = async (msg, e, ...arg) => {
     const button = [];
     for (const info of loader.button) {
         const reg = info.reg;
         if (reg.test(msg)) {
             try {
-                let done = true;
-                /**
-                 * 标记函数 如果调用则继续执行 循环下一个按钮插件处理
-                 */
-                const reject = () => { done = false; };
-                const res = await info.fn(reject, e);
-                if (res)
-                    button.push(res);
-                if (done)
-                    return res;
+                let isnext = false;
+                /** 如果调用则继续执行 循环下一个按钮插件处理 */
+                const next = () => { isnext = true; };
+                const list = await info.fn(next, e, arg);
+                if (list) {
+                    if (Array.isArray(list)) {
+                        button.push(...list);
+                    }
+                    else {
+                        button.push(list);
+                    }
+                }
+                if (!isnext)
+                    return button;
             }
             catch (error) {
+                logger.error(`[Button][Error]: [${info.name}]:`);
                 logger.error(error);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.12.10",
+  "version": "0.12.11",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",