node-karin 0.6.12 → 0.6.14

package/lib/adapter/input/index.d.ts

@@ -12,7 +12,8 @@ export declare class AdapterInput implements KarinAdapter {
     version: KarinAdapter['version'];
     constructor();
     get self_id(): string;
-    stdin(): void;
+    stdin(): this;
+    init(): void;
     logger(level: 'info' | 'error' | 'trace' | 'debug' | 'mark' | 'warn' | 'fatal', ...args: any[]): void;
     GetVersion(): Promise<{
         name: string;

package/lib/adapter/input/index.js

@@ -2,20 +2,18 @@ import fs from 'fs';
 import { randomUUID } from 'crypto';
 import { listener } from '../../core/index.js';
 import { KarinMessage } from '../../event/index.js';
-import { config, common, YamlEditor } from '../../utils/index.js';
+import { config, common, YamlEditor, logger } from '../../utils/index.js';
 const { enable, msgToFile, token: oldToken, ip } = config.Config.AdapterInput;
 /**
  * - 标准输入输出适配器
  */
 export class AdapterInput {
     token;
-    #stdin;
     socket;
     account;
     adapter;
     version;
     constructor() {
-        this.#stdin = false;
         this.token = oldToken;
         this.account = { uid: 'input', uin: 'input', name: 'input' };
         this.adapter = { id: 'shell', name: 'input', type: 'internal', sub_type: 'internal', start_time: Date.now(), connect: '', index: 0 };
@@ -25,9 +23,6 @@ export class AdapterInput {
         return this.account.uid;
     }
     stdin() {
-        if (this.#stdin)
-            return;
-        this.#stdin = true;
         if (oldToken === 'AdapterInput') {
             try {
                 this.token = randomUUID();
@@ -57,8 +52,14 @@ export class AdapterInput {
         const index = listener.addBot({ bot: this, type: this.adapter.type });
         if (index)
             this.adapter.index = index;
+        return this;
+    }
+    init() {
         process.stdin.on('data', data => this.#input(data.toString()));
-        process.once('stdin.close', () => process.stdin.removeAllListeners('data'));
+        process.once('stdin.close', () => {
+            process.stdin.removeAllListeners('data');
+            process.stdin.once('stdin.open', () => this.init());
+        });
     }
     logger(level, ...args) {
         logger.bot(level, this.account.uid || this.account.uin, ...args);
@@ -89,9 +90,6 @@ export class AdapterInput {
         };
         const e = new KarinMessage(message);
         e.bot = this;
-        /**
-         * 快速回复 开发者不应该使用这个方法，应该使用由karin封装过后的reply方法
-         */
         e.replyCallback = async (elements) => {
             this.SendMessage(e.contact, elements);
             return { message_id: e.message_id };
@@ -111,7 +109,6 @@ export class AdapterInput {
         const buffer = await common.buffer(file);
         // 生成文件名 根据type生成不同的文件后缀
         const name = `${Date.now()}.${type === 'image' ? 'jpg' : type === 'voice' ? 'mp3' : 'file'}`;
-        // 写入文件
         fs.writeFileSync(`./temp/input/${name}`, buffer);
         return `[${type === 'image' ? '图片' : '语音'}: http://${ip}:${config.Server.http.port}/api/input?name=${name}&token=${this.token} ]`;
     }
@@ -187,4 +184,4 @@ export class AdapterInput {
     async GetGroupHonor() { throw new Error('Method not implemented.'); }
 }
 if (enable)
-    new AdapterInput().stdin();
+    new AdapterInput().stdin().init();

package/lib/adapter/onebot/onebot11.d.ts

@@ -153,17 +153,9 @@ export declare class AdapterOneBot11 implements KarinAdapter {
     SetGroupWholeBan(group_id: string, is_ban?: boolean): Promise<void>;
     /**
      * 设置群管理员
-     * @param {{
-     *  group_id:string,
-     *  target_uid?:string,
-     *  target_uin?:string,
-     *  is_admin:boolean
-     * }} options - 设置管理员选项
-     * @param options.group_id - 群组ID
-     * @param options.target_uid - 要设置为管理员的用户uid
-     * @param options.target_uin - 要设置为管理员的用户uin
-     * @param options.is_admin - 是否设置为管理员
-     * @returns {Promise<SetGroupAdminResponse>} - 设置群管理员操作的响应
+     * @param group_id - 群号
+     * @param target_uid_or_uin - 目标用户ID
+     * @param is_admin - 是否设置为管理员
      */
     SetGroupAdmin(group_id: string, target_uid_or_uin: string, is_admin: boolean): Promise<void>;
     /**
@@ -278,13 +270,26 @@ export declare class AdapterOneBot11 implements KarinAdapter {
     GetVersion(): Promise<any>;
     DownloadForwardMessage(): Promise<void>;
     GetEssenceMessageList(): Promise<void>;
+    /**
+     * 上传群文件
+     * @param group_id - 群号
+     * @param file - 本地文件绝对路径
+     * @param name - 文件名称 必须提供
+     * @param folder - 父目录ID 不提供则上传到根目录
+     */
+    UploadPrivateFile(group_id: string, file: string, name: string, folder?: string): Promise<any>;
+    /**
+     * 上传私聊文件
+     * @param user_id - 用户ID
+     * @param file - 本地文件绝对路径
+     * @param name - 文件名称 必须提供
+     */
+    UploadGroupFile(user_id: string, file: string, name: string): Promise<any>;
     SetEssenceMessage(): Promise<void>;
     DeleteEssenceMessage(): Promise<void>;
     SetFriendApplyResult(): Promise<void>;
     SetGroupApplyResult(): Promise<void>;
     SetInvitedJoinGroupResult(): Promise<void>;
-    UploadPrivateFile(): Promise<void>;
-    UploadGroupFile(): Promise<void>;
     sendForwardMessage(contact: contact, elements: KarinNodeElement[]): Promise<{
         message_id: any;
     }>;

package/lib/adapter/onebot/onebot11.js

@@ -213,7 +213,7 @@ export class AdapterOneBot11 {
             uid: data.user_id + '',
             uin: data.user_id + '',
             nick: '',
-            role: '',
+            role: 'unknown',
         };
         const contact = {
             scene: ('group_id' in data ? 'group' : 'friend'),
@@ -223,8 +223,9 @@ export class AdapterOneBot11 {
         switch (data.notice_type) {
             // 群文件上传
             case 'group_upload': {
+                const group_id = data.group_id + '';
                 const content = {
-                    group_id: data.group_id + '',
+                    group_id,
                     operator_uid: data.user_id + '',
                     operator_uin: data.user_id + '',
                     file_id: data.file.id,
@@ -242,6 +243,7 @@ export class AdapterOneBot11 {
                     content,
                     sender,
                     contact,
+                    group_id,
                     sub_event: 'group_file_uploaded',
                 };
                 notice = new KarinNotice(options);
@@ -249,8 +251,9 @@ export class AdapterOneBot11 {
             }
             // 群管理员变动
             case 'group_admin': {
+                const group_id = data.group_id + '';
                 const content = {
-                    group_id: data.group_id + '',
+                    group_id,
                     target_uid: data.user_id + '',
                     target_uin: data.user_id + '',
                     is_admin: data.sub_type === 'set',
@@ -263,6 +266,7 @@ export class AdapterOneBot11 {
                     sender,
                     contact,
                     content,
+                    group_id,
                     sub_event: 'group_admin_changed',
                 };
                 notice = new KarinNotice(options);
@@ -270,10 +274,11 @@ export class AdapterOneBot11 {
             }
             // 群成员减少
             case 'group_decrease': {
+                const group_id = data.group_id + '';
                 const content = {
-                    group_id: data.group_id + '',
-                    operator_uid: data.operator_id || '',
-                    operator_uin: data.operator_id || '',
+                    group_id,
+                    operator_uid: (data.operator_id + '') || '',
+                    operator_uin: (data.operator_id + '') || '',
                     target_uid: data.user_id || '',
                     target_uin: data.user_id || '',
                     type: data.sub_type,
@@ -286,6 +291,7 @@ export class AdapterOneBot11 {
                     sender,
                     contact,
                     content,
+                    group_id,
                     sub_event: 'group_member_decrease',
                 };
                 notice = new KarinNotice(options);
@@ -293,8 +299,9 @@ export class AdapterOneBot11 {
             }
             // 群成员增加
             case 'group_increase': {
+                const group_id = data.group_id + '';
                 const content = {
-                    group_id: data.group_id + '',
+                    group_id,
                     operator_uid: (data.operator_id || '') + '',
                     operator_uin: (data.operator_id || '') + '',
                     target_uid: (data.user_id || '') + '',
@@ -309,6 +316,7 @@ export class AdapterOneBot11 {
                     sender,
                     contact,
                     content,
+                    group_id,
                     sub_event: 'group_member_increase',
                 };
                 notice = new KarinNotice(options);
@@ -316,10 +324,11 @@ export class AdapterOneBot11 {
             }
             // 群禁言事件
             case 'group_ban': {
+                const group_id = data.group_id + '';
                 const content = {
-                    group_id: data.group_id,
-                    operator_uid: data.operator_id || '',
-                    operator_uin: data.operator_id || '',
+                    group_id,
+                    operator_uid: (data.operator_id + '') || '',
+                    operator_uin: (data.operator_id + '') || '',
                     target_uid: data.user_id || '',
                     target_uin: data.user_id || '',
                     duration: data.duration,
@@ -333,6 +342,7 @@ export class AdapterOneBot11 {
                     sender,
                     contact,
                     content,
+                    group_id,
                     sub_event: 'group_member_ban',
                 };
                 notice = new KarinNotice(options);
@@ -343,10 +353,11 @@ export class AdapterOneBot11 {
                 this.logger('info', `[好友添加]：${JSON.stringify(data)}`);
                 break;
             case 'group_recall': {
+                const group_id = data.group_id + '';
                 const content = {
-                    group_id: data.group_id,
-                    operator_uid: data.operator_id || '',
-                    operator_uin: data.operator_id || '',
+                    group_id,
+                    operator_uid: (data.operator_id + '') || '',
+                    operator_uin: (data.operator_id + '') || '',
                     target_uid: data.user_id || '',
                     target_uin: data.user_id || '',
                     message_id: data.message_id,
@@ -360,6 +371,7 @@ export class AdapterOneBot11 {
                     sender,
                     contact,
                     content,
+                    group_id,
                     sub_event: 'group_recall',
                 };
                 notice = new KarinNotice(options);
@@ -388,8 +400,9 @@ export class AdapterOneBot11 {
             case 'notify':
                 switch (data.sub_type) {
                     case 'poke': {
+                        const group_id = 'group_id' in data ? data.group_id + '' : '';
                         const content = {
-                            group_id: data.group_id + '',
+                            group_id,
                             operator_uid: data.user_id + '',
                             operator_uin: data.user_id + '',
                             target_uid: data.target_id + '',
@@ -406,6 +419,7 @@ export class AdapterOneBot11 {
                             sender,
                             contact,
                             content,
+                            group_id,
                             sub_event: data.group_id ? 'group_poke' : 'private_poke',
                         };
                         notice = new KarinNotice(options);
@@ -422,8 +436,9 @@ export class AdapterOneBot11 {
                 }
                 break;
             case 'group_msg_emoji_like': {
+                const group_id = data.group_id + '';
                 const content = {
-                    group_id: data.group_id + '',
+                    group_id,
                     message_id: data.message_id,
                     face_id: data.likes[0].emoji_id,
                     is_set: true,
@@ -436,6 +451,7 @@ export class AdapterOneBot11 {
                     sender,
                     contact,
                     content,
+                    group_id,
                     sub_event: 'group_message_reaction',
                 };
                 notice = new KarinNotice(options);
@@ -465,7 +481,7 @@ export class AdapterOneBot11 {
                         uid: data.user_id + '',
                         uin: data.user_id + '',
                         nick: '',
-                        role: '',
+                        role: 'unknown',
                     },
                     sub_event: 'private_apply',
                     content: {
@@ -492,7 +508,7 @@ export class AdapterOneBot11 {
                         uid: data.user_id + '',
                         uin: data.user_id + '',
                         nick: '',
-                        role: '',
+                        role: 'unknown',
                     },
                     sub_event: data.sub_type === 'add' ? 'group_apply' : 'invited_group',
                     content: {
@@ -871,17 +887,9 @@ export class AdapterOneBot11 {
     }
     /**
      * 设置群管理员
-     * @param {{
-     *  group_id:string,
-     *  target_uid?:string,
-     *  target_uin?:string,
-     *  is_admin:boolean
-     * }} options - 设置管理员选项
-     * @param options.group_id - 群组ID
-     * @param options.target_uid - 要设置为管理员的用户uid
-     * @param options.target_uin - 要设置为管理员的用户uin
-     * @param options.is_admin - 是否设置为管理员
-     * @returns {Promise<SetGroupAdminResponse>} - 设置群管理员操作的响应
+     * @param group_id - 群号
+     * @param target_uid_or_uin - 目标用户ID
+     * @param is_admin - 是否设置为管理员
      */
     async SetGroupAdmin(group_id, target_uid_or_uin, is_admin) {
         const user_id = Number(target_uid_or_uin);
@@ -1208,13 +1216,30 @@ export class AdapterOneBot11 {
     async GetEssenceMessageList() {
         throw new Error('Method not implemented.');
     }
+    /**
+     * 上传群文件
+     * @param group_id - 群号
+     * @param file - 本地文件绝对路径
+     * @param name - 文件名称 必须提供
+     * @param folder - 父目录ID 不提供则上传到根目录
+     */
+    async UploadPrivateFile(group_id, file, name, folder) {
+        return await this.SendApi('upload_group_file', { group_id, file, name, folder });
+    }
+    /**
+     * 上传私聊文件
+     * @param user_id - 用户ID
+     * @param file - 本地文件绝对路径
+     * @param name - 文件名称 必须提供
+     */
+    async UploadGroupFile(user_id, file, name) {
+        return await this.SendApi('upload_private_file', { user_id, file, name });
+    }
     async SetEssenceMessage() { }
     async DeleteEssenceMessage() { }
     async SetFriendApplyResult() { }
     async SetGroupApplyResult() { }
     async SetInvitedJoinGroupResult() { }
-    async UploadPrivateFile() { }
-    async UploadGroupFile() { }
     async sendForwardMessage(contact, elements) {
         let message_id = await this.UploadForwardMessage(contact, elements);
         if (this.version.name === 'Lagrange.OneBot') {

package/lib/core/karin.d.ts

@@ -51,10 +51,10 @@ export interface OptionsElement extends OptionsCommand {
 }
 export declare class Karin {
     /**
-     * @param reg - 正则表达式
-     * @param fnc - 函数
-     * @param options - 选项
-     */
+    * @param reg - 正则表达式
+    * @param fnc - 函数
+    * @param options - 选项
+    */
     command(reg: string | RegExp, fnc: FncFunction, options?: OptionsCommand): PluginApps;
     /**
      * @param reg - 正则表达式

package/lib/core/karin.js

@@ -11,7 +11,6 @@ export class Karin {
      * @param options - 选项
      * @returns - 返回插件对象
      */
-
   command (reg, second, options = {}) {
     reg = typeof reg === 'string' ? new RegExp(reg) : reg
     const fnc = typeof second === 'function'

package/lib/core/listener.js

@@ -163,7 +163,7 @@ class Listeners extends EventEmitter {
     /** 标准化 */
     const NewElements = common.makeMessage(elements)
     /** 结果 */
-    let result = { message_id: '' }
+    let result = {}
     const reply_log = common.makeMessageLog(NewElements)
     const self_id = bot.account.uid || bot.account.uin
     if (contact.scene === 'group') {

package/lib/core/plugin.loader.js

@@ -123,14 +123,23 @@ class PluginLoader {
         this.getApps(dir, this.isTs, true)
         continue
       }
-      /** 入口文件 */
+      /** package */
+      const pack = common.readJson(`${PluginPath}/package.json`)
+      /** 旧版本入口文件 */
       const index = this.getIndex(PluginPath, process.env.karin_app_lang)
       if (index) {
         this.FileList.push({ dir, name: index })
         this.isDev && this.watchList.push({ dir, name: index })
       }
+      /** 新版本入口 */
+      if (pack.main) {
+        const { dir: dirName, pop } = common.splitPath(pack.main)
+        const dirPath = `${dir}/${dirName}`
+        this.FileList.push({ dir: dirPath, name: pop })
+        this.isDev && this.watchList.push({ dir: dirPath, name: pop })
+      }
       /** 检查是否存在karin.apps */
-      const pack = common.readJson(`${PluginPath}/package.json`)
+      const outDir = (pack?.karin?.outDir || 'dist')
       if (pack && pack?.karin?.apps) {
         const cfg = pack.karin.apps
         if (Array.isArray(cfg)) {
@@ -144,8 +153,8 @@ class PluginLoader {
       /** ts环境 全部加载  如果存在编译产物 则不加载ts */
       if (this.isTs) {
         /** 编译产物 存在不加载ts */
-        if (common.exists(`${PluginPath}/dist/apps`)) {
-          this.getApps((`${dir}/dist/apps`), false)
+        if (common.exists(`${PluginPath}/${outDir}/apps`)) {
+          this.getApps((`${dir}/${outDir}/apps`), false)
           continue
         }
         /** ts */
@@ -157,7 +166,7 @@ class PluginLoader {
       /** js环境 */
       if (common.isDir(`${PluginPath}/apps`)) { this.getApps(`${dir}/apps`, false) }
       /** 这里需要判断下 不然ts环境下会重复加载 */
-      if (!this.isTs && common.isDir(`${PluginPath}/dist/apps`)) { this.getApps(`${dir}/dist/apps`, false) }
+      if (!this.isTs && common.isDir(`${PluginPath}/${outDir}/apps`)) { this.getApps(`${dir}/${outDir}/apps`, false) }
     }
   }
 
@@ -247,6 +256,9 @@ class PluginLoader {
           if (!App?.name) { return logger.error(`[${dir}][${name}] 插件名称错误`) }
           App.file.dir = dir
           App.file.name = name
+          App.rule.forEach((v, index) => {
+            App.rule[index].log = v.log === false ? (id, log) => logger.bot('debug', id, log) : (id, log) => logger.bot('mark', id, log)
+          })
           /** handler */
           App.task = this.addTaskFnc(dir, App)
           this.PluginList[index] = App

package/lib/core/server.d.ts

@@ -19,7 +19,7 @@ export declare const server: {
     /**
      * 构建静态资源路径
      */
-    staticPath(): void;
+    staticPath(): Promise<void>;
     /** 重启当前HTTP服务器 */
     "__#17@#restartServer"(): Promise<void>;
 };

package/lib/core/server.js

@@ -201,7 +201,7 @@ export const server = new (class Server {
   /**
      * 构建静态资源路径
      */
-  staticPath () {
+  async staticPath () {
     this.list = []
     /** 读取./resources文件夹 */
     const resDir = './resources'
@@ -217,17 +217,32 @@ export const server = new (class Server {
       const file = `${htmlDir}/${dir}`
       if (common.isDir(file)) { this.list.push(file.replace('.', '')) }
     }
-    /** 读取./plugins/html下所有文件夹 */
+    /** 读取./plugins/xxx/resources下所有文件夹 */
     const pluginsDir = './plugins'
     const plugins = fs.readdirSync(pluginsDir)
     for (const dir of plugins) {
+      /** 忽略不是karin-plugin-开头 */
+      if (!dir.startsWith('karin-plugin-')) { continue }
       const file = `${pluginsDir}/${dir}`
       const resFile = `${file}/resources`
       /** 包含resources文件夹 */
       if (common.isDir(file) && common.isDir(resFile)) { this.list.push(resFile.replace('.', '')) }
-      const componentsFile = `${file}/components`
-      /** 包含components文件夹 兼容mys */
+      const componentsFile = `${file}/lib/components`
+      /** 包含lib/components文件夹 兼容mys */
       if (common.isDir(file) && common.isDir(componentsFile)) { this.list.push(componentsFile.replace('.', '')) }
+      /** 读取package.json 查找是否存在自定义资源文件入口 */
+      const pkgFile = `${file}/package.json`
+      if (!common.exists(pkgFile)) { continue }
+      const pkg = common.readJson(pkgFile)
+      if (!pkg?.karin?.static || !Array.isArray(pkg.karin.static)) { continue }
+      /** 标准格式为 lib/test/xxxx */
+      for (let staticFile of pkg.karin.static) {
+        /** 不允许向上级目录 ../开头等 */
+        if (staticFile.startsWith('../')) { continue }
+        /** ./开头去掉./ */
+        if (staticFile.startsWith('./')) { staticFile = staticFile.slice(2) }
+        this.list.push(`${file}/${staticFile}`)
+      }
     }
     this.reg = new RegExp(`(${this.list.join('|')})`, 'g')
   }

package/lib/event/event.handler.js

@@ -16,7 +16,7 @@ export default class EventHandler {
     this.config = {}
     this.GroupMsgPrint = false
     /** 加入e.bot */
-    Object.defineProperty(this.e, 'bot', { value: listener.getBot(this.e.self_id) })
+    !this.e.bot && Object.defineProperty(this.e, 'bot', { value: listener.getBot(this.e.self_id) })
     if (this.e.group_id) { this.config = config.group(this.e.group_id) }
   }
 

package/lib/event/message.handler.js

@@ -25,7 +25,6 @@ export class MessageHandler extends EventHandler {
       logger.debug('[消息拦截] 响应模式不匹配')
       return
     }
-    this.GroupMsgPrint = false
     /** 处理回复 */
     this.reply()
     /** 处理消息 */
@@ -51,8 +50,9 @@ export class MessageHandler extends EventHandler {
           if ('GroupCD' in this.config && !review.PluginEnable(app, this.config)) { continue }
           /** 判断子事件 */
           if (v.event && !this.filtEvent(v.event)) { continue }
-          this.e.logFnc = `[${app.file.dir}][${app.name}][${v.fnc}]`
-          const logFnc = logger.fnc(`[${app.name}][${v.fnc}]`)
+          const fncName = app.file.type === 'function' ? 'default' : v.fnc
+          this.e.logFnc = `[${app.file.dir}][${app.name}][${fncName}]`
+          const logFnc = logger.fnc(`[${app.name}][${fncName}]`)
           this.GroupMsgPrint && typeof v.log === 'function' && v.log(this.e.self_id, `${logFnc}${this.e.logText} ${lodash.truncate(this.e.msg, { length: 80 })}`)
           /** 判断权限 */
           if (!this.filterPermission(v.permission)) { break a }
@@ -88,10 +88,7 @@ export class MessageHandler extends EventHandler {
     for (const val of this.e.elements) {
       switch (val.type) {
         case 'text': {
-          const msg = (val.text || '')
-            .replace(/^\s*[＃井#]+\s*/, '#')
-            .replace(/^\s*[\\*※＊]+\s*/, '*')
-            .trim()
+          const msg = (val.text || '').replace(/^\s*[＃井#]+\s*/, '#').replace(/^\s*[\\*※＊]+\s*/, '*').trim()
           this.e.msg += msg
           /** 美观一点... */
           logs.push(msg)
@@ -114,11 +111,9 @@ export class MessageHandler extends EventHandler {
           break
         case 'at':
           /** atBot不计入e.at */
-          // eslint-disable-next-line eqeqeq
-          if (val.uid && val.uid == this.e.bot.account.uid) {
+          if (val.uid && val.uid === this.e.bot.account.uid) {
             this.e.atBot = true
-            // eslint-disable-next-line eqeqeq
-          } else if (val.uin == this.e.bot.account.uin) {
+          } else if (val.uin === this.e.bot.account.uin) {
             this.e.atBot = true
           } else if (val.uid && val.uid === 'all') {
             this.e.atAll = true
@@ -165,13 +160,15 @@ export class MessageHandler extends EventHandler {
           logs.push(`[json:${JSON.stringify(val.data)}]`)
           break
         case 'markdown': {
-          if (val.content) {
-            logs.push(`[markdown:${val.content}]`)
-          } else {
-            const content = { id: val.custom_template_id }
-            for (const v of val.params) { content[v.key] = v.values[0] }
-            logs.push(`[markdown:${JSON.stringify(content)}]`)
-          }
+          logs.push(`[markdown:${val.content}]`)
+          break
+        }
+        case 'markdown_tpl': {
+          const params = val.params
+          if (!params) { break }
+          const content = { id: val.custom_template_id }
+          for (const v of params) { content[v.key] = v.values[0] }
+          logs.push(`[markdown_tpl:${JSON.stringify(content)}]`)
           break
         }
         case 'rows': {
@@ -183,6 +180,9 @@ export class MessageHandler extends EventHandler {
         case 'button':
           logs.push(`[button:${JSON.stringify(val.data)}]`)
           break
+        case 'long_msg':
+          logs.push(`[long_msg:${val.id}]`)
+          break
         default:
           logs.push(`[未知:${JSON.stringify(val)}]`)
       }

package/lib/event/request.d.ts

@@ -1,5 +1,5 @@
 import { KarinEvent } from './event.js';
-import { contact, Sender, EventToSubEvent, RequestType, KarinRequestEvent } from '../types/index.js';
+import { contact, Sender, EventToSubEvent, RequestType } from '../types/index.js';
 /**
  * - 请求事件基类
  */
@@ -45,5 +45,5 @@ export declare class KarinRequest extends KarinEvent {
     /**
      * - 事件对应的内容参数
      */
-    content: KarinRequestEvent;
+    content: RequestType[EventToSubEvent['request']];
 }

package/lib/event/request.js

@@ -5,7 +5,6 @@ import { KarinEvent } from './event.js'
 export class KarinRequest extends KarinEvent {
   constructor ({ self_id, event_id, user_id, time, contact, sender, sub_event, content, group_id = '' }) {
     super({ event: 'request', event_id, self_id, user_id, group_id, time, contact, sender, sub_event })
-    // ...
     this.content = content
   }
 

package/lib/index.d.ts

@@ -28,9 +28,10 @@ export declare const Renderer: {
     renderHtml(data: string): Promise<string | string[]>;
 };
 export declare const Cfg: {
-    dir: string;
-    _path: string;
-    npmCfgDir: string;
+    projPath: string;
+    projConfigPath: string;
+    pkgPath: string;
+    pkgConfigPath: string;
     change: Map<string, any>;
     watcher: Map<string, any>;
     review: boolean;
@@ -38,7 +39,7 @@ export declare const Cfg: {
     initCfg(): Promise<void>;
     getPlugins(): string[];
     mkdir(dirname: string): boolean;
-    dirPath(name: string, plugins: string[]): Promise<void>;
+    dirPath(_path: string, plugins: string[]): Promise<void>;
     timeout(type?: "ws" | "grpc"): number;
     readonly redis: import("./types/index.js").Redis;
     readonly master: string[];