node-karin 0.11.9 → 0.11.11

package/README.md

@@ -2,7 +2,8 @@
 
 [![neostandard javascript style](https://img.shields.io/badge/code_style-neostandard-brightgreen?style=flat)](https://github.com/neostandard/neostandard)
 
-[文档](https://karinjs.github.io/Karin/)
+[文档](https://karinjs.github.io/Karin/)  
+[文档`(瑜笙提供)`](https://karin.fun)
 
 基于 [Kritor](https://github.com/KarinJS/kritor-kotlin) 标准进行开发的 [nodejs](https://nodejs.org/en) 机器人框架  
 
@@ -14,11 +15,11 @@
 
 ### 目前计划
 
-- [x] [kritor标准](https://github.com/KarinJS/kritor)
+- [x] [kritor标准](https://github.com/KarinJS/kritor) **暂时去除**
 - [x] [onebot11](https://github.com/botuniverse/onebot-11)
 - [ ] [onebot12](https://onebot.dev/)
 - [ ] 支持主动[grpc](https://grpc.io/)
-- [x] 支持被动[grpc](https://grpc.io/)
+- [x] 支持被动[grpc](https://grpc.io/) **暂时去除**
 - [x] 支持主动ws 12暂未支持
 - [x] 支持被动ws
 - [ ] 支持onebot HTTP
@@ -26,8 +27,6 @@
 - [x] 外置[puppeteer](https://github.com/KarinJS/karin-plugin-puppeteer)
 - [x] 降低对`redis`的依赖，开始逐渐抛弃redis
 - [x] 支持 package.karin
-- [ ] ~~支持db通用接口~~
-- [ ] ~~支持动态加载插件~~
 - [x] 支持`redis`集群
 
 ### 感谢
@@ -44,7 +43,7 @@ Karin的开发离不开以下项目的帮助：
 
 ### 来加入我们吧~
 
-QQGroup: 967068507 
+QQGroup: 967068507
 
 Discord: [☘Karin的喵趴～](https://discord.com/channels/1251552521957408878/1251552521957408881)
 

package/lib/adapter/input/index.js

@@ -98,7 +98,7 @@ export class AdapterInput {
             this.SendMessage(e.contact, elements);
             return { message_id: e.message_id, message_time: Date.now(), raw_data: elements };
         };
-        listener.emit('message', e);
+        listener.emit('adapter.message', e);
     }
     async #MsgToFile(type, file) {
         if (!msgToFile)
@@ -142,7 +142,7 @@ export class AdapterInput {
                     text.push(`[未知消息类型:${JSON.stringify(v)}]`);
             }
         }
-        this.logger('info', `${logger.green('Send private input: ')}${text.join('')}`);
+        this.logger('info', `${logger.green('Send private input: ')}${text.join('').replace(/\n/g, '\\n')}`);
         return { message_id: 'input' };
     }
     getAvatarUrl() {

package/lib/adapter/onebot/11/event.js

@@ -81,7 +81,7 @@ export class OB11Event {
          * 快速回复 开发者不应该使用这个方法，应该使用由karin封装过后的reply方法
          */
         e.replyCallback = async (elements) => await this.adapter.SendMessage(e.contact, elements);
-        listener.emit('message', e);
+        listener.emit('adapter.message', e);
     }
     /**
      * 通知事件
@@ -360,7 +360,7 @@ export class OB11Event {
          * 快速回复 开发者不应该使用这个方法，应该使用由karin封装过后的reply方法
          */
         notice.replyCallback = async (elements) => await this.adapter.SendMessage(notice.contact, elements);
-        listener.emit('notice', notice);
+        listener.emit('adapter.notice', notice);
     }
     /** 请求事件 */
     requestEvent(data) {
@@ -395,7 +395,7 @@ export class OB11Event {
                  * 快速回复 开发者不应该使用这个方法，应该使用由karin封装过后的reply方法
                  */
                 request.replyCallback = async (elements) => await this.adapter.SendMessage(request.contact, elements);
-                listener.emit('request', request);
+                listener.emit('adapter.request', request);
                 return;
             }
             case 'group': {
@@ -431,7 +431,7 @@ export class OB11Event {
                  * 快速回复 开发者不应该使用这个方法，应该使用由karin封装过后的reply方法
                  */
                 request.replyCallback = async (elements) => await this.adapter.SendMessage(request.contact, elements);
-                listener.emit('request', request);
+                listener.emit('adapter.request', request);
                 return;
             }
             default: {

package/lib/adapter/onebot/11/index.js

@@ -1,6 +1,6 @@
 import WebSocket from 'ws';
 import { randomUUID } from 'crypto';
-import { listener } from '../../../core/listener/listener.js';
+import { karin } from '../../../core/karin/karin.js';
 import { common, config, logger, segment } from '../../../utils/index.js';
 import { OB11Event } from './event.js';
 import { AdapterConvertKarin, KarinConvertAdapter } from './convert.js';
@@ -80,7 +80,7 @@ export class AdapterOneBot11 {
             /** 停止全部监听 */
             this.socket.removeAllListeners();
             /** 注销bot */
-            this.adapter.index && listener.delBot(this.adapter.index);
+            this.adapter.index && karin.delBot(this.adapter.index);
             /** 正向ws需要重连 */
             if (this.adapter.sub_type === 'client') {
                 this.index++;
@@ -121,7 +121,7 @@ export class AdapterOneBot11 {
         this.account.name = data.account_name;
         this.logger('info', `[加载完成][app_name:${this.version.name}][version:${this.version.version}] ` + logger.green(this.adapter.connect));
         /** 注册bot */
-        const index = listener.addBot({ type: this.adapter.type, bot: this });
+        const index = karin.addBot({ type: this.adapter.type, bot: this });
         if (index)
             this.adapter.index = index;
     }

package/lib/core/index.d.ts

@@ -1,6 +1,6 @@
+export * from './karin/karin.js';
 export * from './init/dir.js';
 export * from './init/init.js';
-export * from './karin/karin.js';
 export * from './listener/listener.js';
 export * from './plugin/base.js';
 export * from '../types/plugin/app.js';

package/lib/core/index.js

@@ -1,6 +1,6 @@
+export * from './karin/karin.js'
 export * from './init/dir.js'
 export * from './init/init.js'
-export * from './karin/karin.js'
 export * from './listener/listener.js'
 export * from './plugin/base.js'
 export * from '../types/plugin/app.js'

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

@@ -1,4 +1,5 @@
 import { Contact, KarinElement, KarinMessage, KarinRenderType, PermissionType, RenderResult, KarinNoticeType, KarinRequestType, KarinMessageType, AllMessageSubType, CommandInfo, TaskInfo, HandlerInfo, AcceptInfo, UseInfo, AllNoticeSubType, AllRequestSubType } from '../../types/index.js';
+import { Listeners } from '../listener/listener.js';
 type FncFunction = (e: KarinMessage) => Promise<boolean>;
 type FncElement = string | KarinElement | Array<KarinElement>;
 type UseReceive = (e: KarinMessageType, next: Function, exit: Function) => Promise<void>;
@@ -68,8 +69,8 @@ export interface OptionsElement extends OptionsCommand {
      */
     stop?: boolean;
 }
-export declare class Karin {
-    start: boolean;
+export declare class Karin extends Listeners {
+    #private;
     constructor();
     /**
     * @param reg - 正则表达式
@@ -165,7 +166,17 @@ export declare class Karin {
     /**
      * - 启动
      */
-    run(): void;
+    run(): Promise<void>;
 }
 export declare const karin: Karin;
+/**
+ * 即将废弃 请使用karin
+ * @deprecated
+ */
+export declare const listener: Karin;
+/**
+ * 即将废弃 请使用karin
+ * @deprecated
+ */
+export declare const Bot: Karin;
 export default karin;

package/lib/core/karin/karin.js

@@ -1,13 +1,17 @@
-import { server } from '../server/server.js';
 import { stateArr } from '../plugin/base.js';
-import { common } from '../../utils/index.js';
-import { listener } from '../listener/listener.js';
 import onebot11 from '../../adapter/onebot/11/index.js';
-import { render, RenderServer } from '../../render/index.js';
-export class Karin {
-    start;
+import { render } from '../../render/app.js';
+import { RenderServer } from '../../render/server.js';
+import { pluginLoader } from '../plugin/loader.js';
+import { common } from '../../utils/common/common.js';
+import { logger } from '../../utils/core/logger.js';
+import { Listeners } from '../listener/listener.js';
+export class Karin extends Listeners {
+    /** 是否启动 */
+    #start;
     constructor() {
-        this.start = false;
+        super();
+        this.#start = false;
         this.run();
     }
     /**
@@ -138,7 +142,6 @@ export class Karin {
         const userId = options?.userId || e.user_id;
         const key = e.group_id ? `${e.group_id}.${userId}` : userId;
         stateArr[key] = { type: 'ctx' };
-        // 返回promise 设置超时时间
         return new Promise((resolve, reject) => {
             setTimeout(() => {
                 if (stateArr[key]) {
@@ -149,7 +152,7 @@ export class Karin {
                     return true;
                 }
             }, time * 1000);
-            listener.once(`ctx:${key}`, (e) => resolve(e));
+            this.once(`ctx:${key}`, (e) => resolve(e));
         });
     }
     /**
@@ -187,15 +190,26 @@ export class Karin {
     /**
      * - 启动
      */
-    run() {
-        if (this.start)
+    async run() {
+        if (this.#start)
             return;
-        this.start = true;
+        this.#start = true;
+        const { server } = await import('../server/server.js');
         server.init();
-        listener.emit('load.plugin');
-        listener.emit('adapter', RenderServer);
-        listener.emit('adapter', onebot11);
+        pluginLoader.load();
+        this.emit('adapter', RenderServer);
+        this.emit('adapter', onebot11);
     }
 }
 export const karin = new Karin();
+/**
+ * 即将废弃 请使用karin
+ * @deprecated
+ */
+export const listener = karin;
+/**
+ * 即将废弃 请使用karin
+ * @deprecated
+ */
+export const Bot = karin;
 export default karin;

package/lib/core/listener/listener.d.ts

@@ -1,36 +1,81 @@
 import { EventEmitter } from 'events';
-import { KarinAdapter, Contact, KarinElement } from '../../types/index.js';
+import { Contact, KarinElement, KarinAdapter, KarinMessage, KarinNoticeType, KarinRequestType, KarinMessageType } from '../../types/index.js';
+type AdapterType = KarinAdapter['adapter']['type'];
+type onAdapter = {
+    type: AdapterType;
+    adapter: new () => KarinAdapter;
+    path?: string;
+};
 /**
- * 监听器管理
+ * 产生事件映射
+ */
+export interface EmittEventMap {
+    'karin:count:send': number;
+    'karin:count:fnc': string;
+    error: any;
+    adapter: onAdapter;
+    'adapter.message': KarinMessageType;
+    'adapter.notice': KarinNoticeType;
+    'adapter.request': KarinRequestType;
+    message: KarinMessageType;
+    notice: KarinNoticeType;
+    request: KarinRequestType;
+    'plugin.watch': undefined;
+    'restart.grpc': undefined;
+    'restart.http': undefined;
+}
+/** 上下文 */
+type ContextEvents = {
+    [K in `ctx:${string}`]: (e: KarinMessage) => void;
+};
+/**
+ * 监听事件映射
+ */
+export interface OnEventMap extends ContextEvents {
+    'karin:count:send': (count: number) => void;
+    'karin:count:fnc': (fnc: string) => void;
+    error: (error: any) => void;
+    adapter: (data: onAdapter) => void;
+    'adapter.message': (data: KarinMessageType) => void;
+    'adapter.notice': (data: KarinNoticeType) => void;
+    'adapter.request': (data: KarinRequestType) => void;
+    message: (data: KarinMessageType) => void;
+    notice: (data: KarinNoticeType) => void;
+    request: (data: KarinRequestType) => void;
+    'plugin.watch': undefined;
+    'restart.grpc': undefined;
+    'restart.http': undefined;
+}
+/**
+ * 监听器实例
  */
 export declare class Listeners extends EventEmitter {
     #private;
-    /**
-     * Bot索引
-     * @type - Bot索引
-     */
-    index: number;
-    /**
-     * 框架名称
-     */
+    /** 框架名称 */
     name: string;
+    /** Bot列表 */
     list: Array<{
         index: number;
-        type: KarinAdapter['adapter']['type'];
+        type: AdapterType;
         bot: KarinAdapter;
     }>;
+    /** 适配器列表 */
     adapter: Array<{
-        type: KarinAdapter['adapter']['type'];
+        type: AdapterType;
         adapter: new () => KarinAdapter;
         path: string;
     }>;
     constructor();
+    on<K extends keyof OnEventMap>(event: K, listener: OnEventMap[K]): this;
+    on(event: string, listener: (...args: any[]) => void): this;
+    emit<K extends keyof EmittEventMap>(event: K, ...args: Parameters<EmittEventMap[K]>): boolean;
+    emit(event: string | symbol, ...args: any[]): boolean;
     /**
      * 注册Bot 返回索引id
      */
     addBot(data: {
         bot: KarinAdapter;
-        type: KarinAdapter['adapter']['type'];
+        type: AdapterType;
     }): number | false;
     /**
      * 卸载Bot
@@ -66,11 +111,7 @@ export declare class Listeners extends EventEmitter {
      * @param data.adapter - 适配器实例
      * @param data.path - 适配器路径
      */
-    addAdapter(data: {
-        type: KarinAdapter['adapter']['type'];
-        adapter: new () => KarinAdapter;
-        path?: string;
-    }): void;
+    addAdapter(data: onAdapter): void;
     /**
      * 通过path获取适配器 仅适用于反向WS适配器
      * @param path - 适配器路径
@@ -81,7 +122,7 @@ export declare class Listeners extends EventEmitter {
      * @param isType - 是否返回包含的类型列表 默认返回适配器实例列表
      */
     getAdapterAll(isType?: boolean): {
-        type: KarinAdapter["adapter"]["type"];
+        type: AdapterType;
         adapter: new () => KarinAdapter;
         path: string;
     }[] | (new () => KarinAdapter)[];
@@ -101,5 +142,4 @@ export declare class Listeners extends EventEmitter {
         message_id: string;
     }>;
 }
-export declare const listener: Listeners;
-export declare const Bot: Listeners;
+export {};

package/lib/core/listener/listener.js

@@ -4,46 +4,44 @@ import { pluginLoader } from '../plugin/loader.js';
 import { common, logger, config, segment } from '../../utils/index.js';
 import { MessageHandler, NoticeHandler, RequestHandler } from '../../event/index.js';
 /**
- * 监听器管理
+ * 监听器实例
  */
 export class Listeners extends EventEmitter {
-    /**
-     * Bot索引
-     * @type - Bot索引
-     */
-    index;
-    /**
-     * 框架名称
-     */
+    /** 框架名称 */
     name;
+    /** Bot列表 */
     list;
+    /** 适配器列表 */
     adapter;
+    /** Bot自增索引 */
+    #index;
+    /** 是否启动 */
+    #start;
     constructor() {
         super();
-        this.index = 0;
+        this.#index = 0;
         this.name = 'Karin';
         this.list = [];
         this.adapter = [];
         this.on('error', data => logger.error(data));
-        this.on('load.plugin', () => pluginLoader.load());
-        this.on('adapter', data => {
-            let path = data.path || '无';
-            if (path && data.type !== 'grpc')
-                path = `ws://127.0.0.1:${config.Server.http.port}${data.path}`;
-            path = logger.green(path);
-            logger.info(`[适配器][注册][${data.type}]: ` + path);
-            this.addAdapter(data);
-        });
-        this.on('message', data => new MessageHandler(data));
-        this.on('notice', data => new NoticeHandler(data));
-        this.on('request', data => new RequestHandler(data));
+        this.on('adapter', data => this.addAdapter(data));
+        this.on('adapter.message', data => new MessageHandler(data));
+        this.on('adapter.notice', data => new NoticeHandler(data));
+        this.on('adapter.request', data => new RequestHandler(data));
+        this.#start = false;
+    }
+    on(event, listener) {
+        return super.on(event, listener);
+    }
+    emit(event, ...args) {
+        return super.emit(event, ...args);
     }
     /**
      * 注册Bot 返回索引id
      */
     addBot(data) {
-        this.index++;
-        const index = this.index;
+        this.#index++;
+        const index = this.#index;
         if (!data.bot) {
             logger.error('[Bot管理][注册] 注册失败: Bot实例不能为空', JSON.stringify(data));
             return false;
@@ -55,8 +53,8 @@ export class Listeners extends EventEmitter {
         return index;
     }
     /**
-   * 发送上线通知
-   */
+     * 发送上线通知
+     */
     async #online(uid) {
         /** 重启 */
         const key = `karin:restart:${uid}`;
@@ -140,6 +138,11 @@ export class Listeners extends EventEmitter {
      * @param data.path - 适配器路径
      */
     addAdapter(data) {
+        let path = data.path || '无';
+        if (path && data.type !== 'grpc')
+            path = `ws://127.0.0.1:${config.Server.http.port}${data.path}`;
+        path = logger.green(path);
+        logger.info(`[适配器][注册][${data.type}]: ` + path);
         const adapter = { type: data.type, adapter: data.adapter, path: '' };
         if (data.path)
             adapter.path = data.path;
@@ -230,5 +233,3 @@ export class Listeners extends EventEmitter {
         return result;
     }
 }
-export const listener = new Listeners();
-export const Bot = listener;

package/lib/core/plugin/loader.js

@@ -3,8 +3,8 @@ import path from 'path';
 import lodash from 'lodash';
 import chokidar from 'chokidar';
 import schedule from 'node-schedule';
-import { listener } from '../listener/listener.js';
 import { render } from '../../render/index.js';
+import { karin } from '../karin/karin.js';
 import { common, logger } from '../../utils/index.js';
 class PluginLoader {
     dir;
@@ -67,7 +67,7 @@ class PluginLoader {
      * 插件初始化
      */
     async load() {
-        listener.once('plugin.watch', () => {
+        karin.once('plugin.watch', () => {
             this.watchList.forEach(async ({ plugin, path }) => {
                 await this.watchDir(plugin, path);
                 logger.debug(`[热更新][${plugin}][${path}] 监听中...`);
@@ -84,7 +84,7 @@ class PluginLoader {
         this.printDependErr();
         /** 优先级排序并打印插件信息 */
         this.orderBy(true);
-        listener.emit('plugin.watch');
+        karin.emit('plugin.watch');
         return this;
     }
     /**
@@ -290,7 +290,7 @@ class PluginLoader {
         });
         if (!isPrint)
             return;
-        logger.info(`[插件][${Object.keys(this.plugin).length}个] 加载完成`);
+        logger.info(`[插件][${this.plugin.size}个] 加载完成`);
         logger.info(`[渲染器][${render.Apps.length}个] 加载完成`);
         logger.info(`[command][${this.command.length}个] 加载完成`);
         logger.info(`[button][${this.button.length}个] 加载完成`);

package/lib/core/process/process.js

@@ -1,4 +1,4 @@
-import { listener } from '../listener/listener.js';
+import { karin } from '../karin/karin.js';
 import { logger, common, config } from '../../utils/index.js';
 /**
  * 处理基本事件
@@ -35,15 +35,15 @@ export default class Process {
         /**
          * 捕获警告
          */
-        process.on('warning', warning => listener.emit('warn', warning));
+        process.on('warning', warning => karin.emit('warn', warning));
         /**
          * 捕获错误
          */
-        process.on('uncaughtException', error => listener.emit('error', error));
+        process.on('uncaughtException', error => karin.emit('error', error));
         /**
          * 捕获未处理的Promise错误
          */
-        process.on('unhandledRejection', error => listener.emit('error', error));
+        process.on('unhandledRejection', error => karin.emit('error', error));
         return this;
     }
     /**

package/lib/core/server/server.d.ts

@@ -21,5 +21,5 @@ export declare const server: {
      */
     staticPath(): Promise<void>;
     /** 重启当前HTTP服务器 */
-    "__#14@#restartServer"(): Promise<void>;
+    "__#15@#restartServer"(): Promise<void>;
 };

package/lib/core/server/server.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import Process from '../process/process.js';
 import { WebSocketServer } from 'ws';
 import { createServer } from 'http';
-import { listener } from '../listener/listener.js';
+import { karin } from '../karin/karin.js';
 import express from 'express';
 import { exec, config, logger, common } from '../../utils/index.js';
 import { AdapterOneBot11 } from '../../adapter/onebot/11/index.js';
@@ -34,7 +34,7 @@ export const server = new (class Server {
                 const headers = request.headers;
                 logger.debug('[反向WS]', path, JSON.stringify(headers, null, 2));
                 try {
-                    const Adapter = listener.getAdapter(path);
+                    const Adapter = karin.getAdapter(path);
                     if (!Adapter) {
                         logger.error(`[反向WS] 适配器不存在：${path}`);
                         return socket.close();
@@ -73,7 +73,7 @@ export const server = new (class Server {
                 if (req.hostname === 'localhost' || req.hostname === '127.0.0.1') {
                     logger.mark('[服务器][HTTP] 收到退出请求，即将退出');
                     /** 关闭服务器 */
-                    listener.emit('exit.grpc');
+                    karin.emit('exit.grpc');
                     this.server.close();
                     /** 如果是pm2 获取当前pm2ID 使用 */
                     if (process.env.pm_id)
@@ -113,7 +113,7 @@ export const server = new (class Server {
             this.server.listen(port, host, () => {
                 logger.mark('[服务器][启动成功][HTTP]: ' + logger.green(`http://${host}:${port}`));
             });
-            listener.once('restart.http', () => {
+            karin.once('restart.http', () => {
                 logger.mark('[服务器][重启][HTTP] 正在重启HTTP服务器...');
                 this.#restartServer();
             });

package/lib/event/handler/base.js

@@ -171,10 +171,10 @@ export class EventBaseHandler {
             const result = this.e.replyCallback(message, retry_count);
             const ReplyLog = common.makeMessageLog(message);
             if (this.e.isGroup) {
-                review.GroupMsgPrint(this.e) && logger.bot('info', this.e.self_id, `${logger.green(`Send Group ${this.e.group_id}: `)}${ReplyLog}`);
+                review.GroupMsgPrint(this.e) && logger.bot('info', this.e.self_id, `${logger.green(`Send Group ${this.e.group_id}: `)}${ReplyLog.replace(/\n/g, '\\n')}`);
             }
             else {
-                this.e.self_id !== 'input' && logger.bot('info', this.e.self_id, `${logger.green(`Send private ${this.e.user_id}: `)}${ReplyLog}`);
+                this.e.self_id !== 'input' && logger.bot('info', this.e.self_id, `${logger.green(`Send private ${this.e.user_id}: `)}${ReplyLog.replace(/\n/g, '\\n')}`);
             }
             try {
                 listener.emit('karin:count:send', 1);
@@ -186,7 +186,7 @@ export class EventBaseHandler {
                 logger.bot('debug', this.e.self_id, `回复消息结果:${JSON.stringify(request)}`);
             }
             catch (error) {
-                logger.bot('error', this.e.self_id, `回复消息失败:${ReplyLog}`);
+                logger.bot('error', this.e.self_id, `回复消息失败:${ReplyLog.replace(/\n/g, '\\n')}`);
                 logger.bot('error', this.e.self_id, error.stack || error.message || JSON.stringify(error));
             }
             /** 快速撤回 */

package/lib/event/handler/message.js

@@ -2,7 +2,7 @@ import lodash from 'lodash';
 import { review } from './review.js';
 import { EventBaseHandler } from './base.js';
 import { logger, config } from '../../utils/index.js';
-import { listener, stateArr, pluginLoader } from '../../core/index.js';
+import { karin, stateArr, pluginLoader } from '../../core/index.js';
 /**
  * 消息事件
  */
@@ -12,7 +12,6 @@ export class MessageHandler extends EventBaseHandler {
         super(e);
         this.e = e;
         this.init();
-        // todo: emit event
         if (this.e.group_id) {
             if (!this.getCd())
                 return;
@@ -34,7 +33,7 @@ export class MessageHandler extends EventBaseHandler {
      * 先对消息事件进行初始化
      */
     init() {
-        listener.emit('karin:count:recv', 1);
+        karin.emit('karin:count:recv', 1);
         const logs = [];
         for (const val of this.e.elements) {
             switch (val.type) {
@@ -176,6 +175,7 @@ export class MessageHandler extends EventBaseHandler {
         }
         logs.length = 0;
         this.reply();
+        karin.emit('message', this.e);
     }
     /**
      * 响应模式检查 返回false表示未通过
@@ -242,7 +242,7 @@ export class MessageHandler extends EventBaseHandler {
                     continue;
                 /** 计算插件处理时间 */
                 const start = Date.now();
-                listener.emit('karin:count:fnc', this.e.logFnc);
+                karin.emit('karin:count:fnc', this.e.logFnc);
                 try {
                     let res;
                     if (info.type === 'function') {
@@ -276,7 +276,7 @@ export class MessageHandler extends EventBaseHandler {
         if (App) {
             switch (App.type) {
                 case 'ctx': {
-                    listener.emit(`ctx:${key}`, this.e);
+                    karin.emit(`ctx:${key}`, this.e);
                     delete stateArr[key];
                     return true;
                 }

package/lib/event/handler/notice.js

@@ -1,7 +1,7 @@
 import { review } from './review.js';
 import { EventBaseHandler } from './base.js';
-import { pluginLoader } from '../../core/index.js';
 import { logger, config } from '../../utils/index.js';
+import { karin, pluginLoader } from '../../core/index.js';
 /**
  * 通知事件
  */
@@ -57,6 +57,7 @@ export class NoticeHandler extends EventBaseHandler {
             logger.bot('info', this.e.self_id, `未知来源通知事件：${JSON.stringify(this.e)}`);
         }
         this.reply();
+        karin.emit('notice', this.e);
     }
     /**
      * 处理事件
@@ -131,7 +132,7 @@ export class NoticeHandler extends EventBaseHandler {
             /** 群成员增加 */
             case "group_member_increase" /* NoticeSubType.GroupMemberIncrease */: {
                 const { operator_uid, operator_uin, target_uid, target_uin, type } = this.e.content;
-                this.e.raw_message = `[群成员新增]: ${operator_uid || operator_uin} ${type === 'invite' ? '邀请' : '同意'}  ${target_uid || target_uin} 加入群聊`;
+                this.e.raw_message = `[群成员新增]: ${operator_uid || operator_uin} ${type === 'invite' ? '邀请' : '同意'} ${target_uid || target_uin} 加入群聊`;
                 break;
             }
             /** 群成员减少 */

package/lib/event/handler/request.js

@@ -1,6 +1,6 @@
 import { review } from './review.js';
 import { EventBaseHandler } from './base.js';
-import { pluginLoader } from '../../core/index.js';
+import { karin, pluginLoader } from '../../core/index.js';
 import { logger, config } from '../../utils/index.js';
 /**
  * 请求事件
@@ -52,6 +52,7 @@ export class RequestHandler extends EventBaseHandler {
             logger.bot('info', this.e.self_id, `未知来源请求事件：${JSON.stringify(this.e)}`);
         }
         this.reply();
+        karin.emit('request', this.e);
     }
     /**
      * 处理事件

package/lib/event/handler/review.d.ts

@@ -25,31 +25,31 @@ export declare const review: {
     /**
      * 群聊黑白名单 允许哪个群触发事件
      */
-    "__#11@#GroupEnable"(): true | undefined;
+    "__#1@#GroupEnable"(): true | undefined;
     /**
      * 用户黑白名单 允许那个用户触发事件
      */
-    "__#11@#UserEnable"(): true | undefined;
+    "__#1@#UserEnable"(): true | undefined;
     /**
      * 群聊事件日志 是否打印
      */
-    "__#11@#GroupMsgPrint"(): true | undefined;
+    "__#1@#GroupMsgPrint"(): true | undefined;
     /**
      * 黑白名单插件 哪个插件可以被触发
      */
-    "__#11@#PluginEnable"(): boolean;
+    "__#1@#PluginEnable"(): boolean;
     /** 群聊cd */
-    "__#11@#CD"(): true | undefined;
+    "__#1@#CD"(): true | undefined;
     /**
      * 响应模式
      */
-    "__#11@#mode"(): true | undefined;
+    "__#1@#mode"(): true | undefined;
     /**
      * 前缀、别名
      */
-    "__#11@#alias"(): true | undefined;
+    "__#1@#alias"(): true | undefined;
     /**
      * 私聊功能
      */
-    "__#11@#Private"(): true | undefined;
+    "__#1@#Private"(): true | undefined;
 };

package/lib/utils/common/common.d.ts

@@ -85,6 +85,15 @@ declare class Common {
      * - 写入yaml文件
      */
     writeYaml(file: string, data: any): boolean;
+    /**
+     * 传入插件名称 返回解析后的package.json的内容
+     * @param name - 插件名称
+     */
+    pkgJson(name: string): {
+        name: string;
+        version: string;
+        [key: string]: any;
+    } | null;
     /**
      * 输入包名 返回包根目录的绝对路径 仅简单查找
      * @param name - 包名

package/lib/utils/common/common.js

@@ -191,6 +191,24 @@ class Common {
             return false;
         }
     }
+    /**
+     * 传入插件名称 返回解析后的package.json的内容
+     * @param name - 插件名称
+     */
+    pkgJson(name) {
+        try {
+            /** 先查git插件 */
+            const gitPath = `./plugins/${name}`;
+            if (fs.existsSync(gitPath))
+                return this.readJson(`${gitPath}/package.json`);
+            /** 查npm插件 */
+            const require = createRequire(import.meta.url);
+            return require(`${name}/package.json`);
+        }
+        catch {
+            return null;
+        }
+    }
     /**
      * 输入包名 返回包根目录的绝对路径 仅简单查找
      * @param name - 包名

package/lib/utils/config/config.d.ts

@@ -95,7 +95,7 @@ export declare const config: {
     changeApp(): Promise<void>;
     changeCfg(): Promise<void>;
     changeGroup(): Promise<void>;
-    "__#15@#review"(): Promise<void>;
+    "__#2@#review"(): Promise<void>;
 };
 export declare const Cfg: {
     /**
@@ -189,5 +189,5 @@ export declare const Cfg: {
     changeApp(): Promise<void>;
     changeCfg(): Promise<void>;
     changeGroup(): Promise<void>;
-    "__#15@#review"(): Promise<void>;
+    "__#2@#review"(): Promise<void>;
 };

package/lib/utils/config/config.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import Yaml from 'yaml';
 import path from 'path';
 import chokidar from 'chokidar';
-import { karinDir } from '../../core/index.js';
+import { karinDir } from '../../core/init/dir.js';
 import { common } from '../../utils/common/common.js';
 /**
  * 配置文件

package/package.json

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