node-karin 0.12.2 → 0.12.6

package/config/defSet/group.yaml

@@ -18,7 +18,7 @@ default:
   disable: []
 
 # 单个Bot默认配置
-Bot.self_id:
+Bot:self_id:
   # 群聊中所有消息冷却时间，单位秒,0则无限制
   GroupCD: 0
   # 群聊中 每个人的消息冷却时间，单位秒，0则无限制。注意，开启后所有消息都会进CD，无论是否触发插件。
@@ -37,7 +37,7 @@ Bot.self_id:
   disable: []
 
 # 单个Bot单个群配置
-Bot.self_id.group_id:
+Bot:self_id:group_id:
   # 群聊中所有消息冷却时间，单位秒,0则无限制
   GroupCD: 0
   # 群聊中 每个人的消息冷却时间，单位秒，0则无限制。注意，开启后所有消息都会进CD，无论是否触发插件。

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

@@ -154,6 +154,9 @@ export function KarinConvertAdapter(data, bot) {
                 elements.push({ type: 'weather', data: { city: i.city, type: i.type } });
                 break;
             }
+            case 'raw':
+                elements.push(i.data);
+                break;
             case 'button':
             case 'markdown':
             case 'keyboard':

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

@@ -90,11 +90,12 @@ export class OB11Event {
         const time = data.time;
         const self_id = data.self_id + '';
         let notice = {};
-        const user_id = data.user_id + '';
+        /** 别问为啥any... 我是any糕手~ */
+        const user_id = (data.user_id || data.operator_id) + '';
         const event_id = `notice.${time}`;
         const sender = {
-            uid: data.user_id + '',
-            uin: data.user_id + '',
+            uid: user_id,
+            uin: user_id,
             nick: '',
             role: "unknown" /* Role.Unknown */,
         };
@@ -351,6 +352,30 @@ export class OB11Event {
                 notice = new KarinNotice(options);
                 break;
             }
+            // Language表情动态上报
+            case 'reaction': {
+                const group_id = data.group_id + '';
+                const content = {
+                    group_id,
+                    message_id: data.message_id,
+                    face_id: Number(data.code),
+                    is_set: data.sub_type === 'add',
+                };
+                const options = {
+                    raw_event: data,
+                    time,
+                    self_id,
+                    user_id,
+                    event_id,
+                    sender,
+                    contact,
+                    content,
+                    group_id,
+                    sub_event: "group_message_reaction" /* NoticeSubType.GroupMessageReaction */,
+                };
+                notice = new KarinNotice(options);
+                break;
+            }
             default: {
                 return this.adapter.logger('error', '未知通知事件：', JSON.stringify(data));
             }

package/lib/api/git.d.ts

@@ -0,0 +1,6 @@
+import { dirName } from '../types/index.js';
+/**
+ * 获取git插件列表
+ * @param isPack - 是否屏蔽不带package.json的插件，默认为false
+ */
+export declare function getGitPlugins(isPack?: boolean): Array<dirName>;

package/lib/api/git.js

@@ -0,0 +1,16 @@
+import fs from 'fs';
+/**
+ * 获取git插件列表
+ * @param isPack - 是否屏蔽不带package.json的插件，默认为false
+ */
+export function getGitPlugins(isPack = false) {
+    const dir = './plugins';
+    let list = fs.readdirSync(dir, { withFileTypes: true });
+    /** 忽略非文件夹、非 karin-plugin-开头的文件夹 */
+    list = list.filter(v => v.isDirectory() && v.name.startsWith('karin-plugin-'));
+    if (isPack)
+        list = list.filter(v => fs.existsSync(`${dir}/${v.name}/package.json`));
+    const arr = [];
+    list.map(v => arr.push(v.name));
+    return arr;
+}

package/lib/api/npm.d.ts

@@ -0,0 +1,7 @@
+import { NpmInfo } from '../utils/index.js';
+/**
+ * 获取npm插件列表
+ * @param showDetails - 是否返回详细信息
+ * 默认只返回插件npm包名，为true时返回详细的{dir, name}[]
+ */
+export declare function getNpmPlugins<T extends boolean>(showDetails: T): Promise<T extends true ? NpmInfo[] : string[]>;

package/lib/api/npm.js

@@ -0,0 +1,63 @@
+import fs from 'fs';
+import path from 'path';
+import { readJson } from './readJson.js';
+/**
+ * 获取npm插件列表
+ * @param showDetails - 是否返回详细信息
+ * 默认只返回插件npm包名，为true时返回详细的{dir, name}[]
+ */
+export async function getNpmPlugins(showDetails) {
+    /** 屏蔽的依赖包列表 */
+    const exclude = ['art-template', 'axios', 'chalk', 'chokidar', 'commander', 'express', 'level', 'lodash', 'log4js', 'moment', 'node-karin', 'node-schedule', 'redis', 'ws', 'yaml'];
+    const pkg = readJson('./package.json');
+    const dependencies = Object.keys(pkg.dependencies).filter((name) => !exclude.includes(name));
+    if (!showDetails) {
+        const list = [];
+        const readPackageJson = async (name) => {
+            try {
+                const pkgPath = path.join(process.cwd(), 'node_modules', name, 'package.json');
+                const pkg = readJson(pkgPath);
+                if (pkg?.karin)
+                    list.push(name);
+            }
+            catch (error) {
+                logger.error(`[common] 解析 package.json 时出错：${error.stack || error.message || JSON.stringify(error)}`);
+            }
+        };
+        await Promise.all(dependencies.map(readPackageJson));
+        return list;
+    }
+    const list = [];
+    /** 获取详细的npm信息 */
+    const readPackageJson = async (files) => {
+        try {
+            const root = path.join(process.cwd(), 'node_modules', files);
+            const pkgPath = path.join(root, 'package.json');
+            const pkg = readJson(pkgPath);
+            if (!pkg?.karin)
+                return;
+            if (pkg?.main) {
+                list.push({ plugin: files, path: path.dirname(pkg.main), file: path.basename(pkg.main), isMain: true });
+            }
+            if (pkg?.karin?.apps?.length) {
+                pkg.karin.apps.forEach((app) => {
+                    if (!fs.existsSync(path.join(root, app))) {
+                        logger.error(`[common] npm插件${files}的app目录${app}不存在 已跳过`);
+                        return;
+                    }
+                    fs.readdirSync(path.join(root, app)).forEach((filename) => {
+                        /** 忽略非js文件 npm包不考虑ts */
+                        if (!filename.endsWith('.js'))
+                            return;
+                        list.push({ plugin: files, path: app, file: filename, isMain: false });
+                    });
+                });
+            }
+        }
+        catch (error) {
+            logger.error(`[common] 获取npm插件列表时出错：${error.stack || error.message || JSON.stringify(error)}`);
+        }
+    };
+    await Promise.all(dependencies.map(readPackageJson));
+    return list;
+}

package/lib/api/readJson.d.ts

@@ -0,0 +1,5 @@
+/**
+ * - 解析json文件
+ * @param file - 文件路径
+ */
+export declare function readJson(file: string): any;

package/lib/api/readJson.js

@@ -0,0 +1,8 @@
+import fs from 'fs';
+/**
+ * - 解析json文件
+ * @param file - 文件路径
+ */
+export function readJson(file) {
+    return JSON.parse(fs.readFileSync(file, 'utf8'));
+}

package/lib/cli/index.d.ts

@@ -73,10 +73,6 @@ export declare class KarinCli {
      * @param pkg - 包管理器
      */
     getRemoteVersion(name: string, pkg: 'pnpm' | 'cnpm' | 'yarn' | 'npm'): Promise<string>;
-    /**
-     * 获取git插件列表
-     */
-    getGitPlugins(): Array<string>;
     /**
      * 封装exec
      * @param cmd - 命令

package/lib/cli/index.js

@@ -5,6 +5,8 @@ import axios from 'axios';
 import { fileURLToPath } from 'url';
 import { getRegistry } from './pkg.js';
 import { exec as execCmd, spawn } from 'child_process';
+import { getNpmPlugins } from '../api/npm.js';
+import { getGitPlugins } from '../api/git.js';
 export class KarinCli {
     child;
     filename;
@@ -123,7 +125,7 @@ export class KarinCli {
         const data = this.getConfigData('pm2');
         /** 修正入口文件路径 兼容0.6.28以前的版本 */
         if (!fs.existsSync('./src') && filePath === './config/config/pm2.yaml') {
-            const script = './node_modules/node-karin/lib/index.js';
+            const script = './node_modules/node-karin/lib/cli/start.js';
             if (data.apps[0].script !== script) {
                 data.apps[0].script = script;
                 fs.writeFileSync(filePath, yaml.stringify(data));
@@ -169,24 +171,8 @@ export class KarinCli {
      * 更新依赖
      */
     async update() {
-        /** 屏蔽的依赖包列表 */
-        const pkgdependencies = [
-            'art-template',
-            'axios',
-            'chalk',
-            'chokidar',
-            'commander',
-            'express',
-            'level',
-            'lodash',
-            'log4js',
-            'moment',
-            'node-schedule',
-            'redis',
-            'ws',
-            'yaml',
-        ];
-        const list = Object.keys(this.pkg(false).dependencies).filter(key => !pkgdependencies.includes(key));
+        const list = await getNpmPlugins(false);
+        list.push('node-karin');
         /** 获取包管理器 */
         const pkg = getRegistry();
         const cmd = pkg === 'yarn' ? 'yarn upgrade' : `${pkg} update`;
@@ -210,7 +196,7 @@ export class KarinCli {
         }));
         console.log('[依赖更新] 所有npm依赖已更新完成~');
         console.log('[依赖更新] 开始更新git插件...');
-        const gitList = this.getGitPlugins();
+        const gitList = getGitPlugins();
         if (!gitList.length)
             return console.log('[依赖更新] 没有git插件需要更新~');
         await Promise.all(gitList.map(async (item) => {
@@ -264,19 +250,6 @@ export class KarinCli {
         }
         return text.trim();
     }
-    /**
-     * 获取git插件列表
-     */
-    getGitPlugins() {
-        const dir = path.resolve(process.cwd(), 'plugins');
-        let list = fs.readdirSync(dir, { withFileTypes: true });
-        /** 忽略非文件夹、非 karin-plugin-开头的文件夹 */
-        list = list.filter(v => v.isDirectory() && v.name.startsWith('karin-plugin-'));
-        list = list.filter(v => fs.existsSync(`${dir}/${v.name}/package.json`));
-        const arr = [];
-        list.map(v => arr.push(v.name));
-        return arr;
-    }
     /**
      * 封装exec
      * @param cmd - 命令

package/lib/cli/start.js

@@ -1,5 +1,8 @@
 import { program } from 'commander';
 import { KarinCli } from './index.js';
+/** 兼容node .启动方式 */
+if (process.argv.length === 2)
+    process.argv.push('.');
 const karin = new KarinCli();
 program.version(karin.pkg(true).version, '-v, --version', '显示版本号');
 program.command('.').description('启动karin').action(() => karin.start("prod" /* Mode.Prod */, "js" /* Lang.Js */, "node" /* Runner.Node */));

package/lib/core/init/dir.d.ts

@@ -1,4 +1,4 @@
-/**
- * - 获取当前npm包的根目录
- */
+/** 获取当前npm包的根目录 */
 export declare const karinDir: string;
+/** 当前是否处于npm包环境 否则代表处于开发环境 */
+export declare const isPkg: boolean;

package/lib/core/init/dir.js

@@ -1,7 +1,7 @@
 import path from 'path';
 import { fileURLToPath } from 'url';
 const filename = fileURLToPath(import.meta.url);
-/**
- * - 获取当前npm包的根目录
- */
-export const karinDir = path.resolve(filename, '../../../../').replace(/\\/g, '/').replace(/\/$/, '');
+/** 获取当前npm包的根目录 */
+export const karinDir = path.resolve(filename, '../../../..').replace(/\/$/, '');
+/** 当前是否处于npm包环境 否则代表处于开发环境 */
+export const isPkg = karinDir.includes('node_modules');

package/lib/core/init/init.js

@@ -1,4 +1,4 @@
-import { logger } from '../../utils/index.js';
+import { logger } from '../../utils/core/logger.js';
 /**
  * 启动日志
  */

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

@@ -71,6 +71,8 @@ export interface OptionsElement extends OptionsCommand {
 }
 export declare class Karin extends Listeners {
     #private;
+    /** 存储器 由开发者自行调用 */
+    store: Map<any, any>;
     constructor();
     /**
     * @param reg - 正则表达式

package/lib/core/karin/karin.js

@@ -9,9 +9,12 @@ import { Listeners } from '../listener/listener.js';
 export class Karin extends Listeners {
     /** 是否启动 */
     #start;
+    /** 存储器 由开发者自行调用 */
+    store;
     constructor() {
         super();
         this.#start = false;
+        this.store = new Map();
         this.run();
     }
     /**

package/lib/core/listener/listener.js

@@ -49,6 +49,32 @@ export class Listeners extends EventEmitter {
         this.list.push({ index, type: data.type, bot: data.bot });
         logger.info(`[机器人][注册][${data.type}] ` + logger.green(`[account:${data.bot.account.uid || data.bot.account.uin}(${data.bot.account.name})]`));
         this.#online(data.bot.account.uid || data.bot.account.uin);
+        /** 对sendForwardMessage方法进行修改 添加中间键 */
+        const sendForwardMessage = data.bot.sendForwardMessage;
+        data.bot.sendForwardMessage = async (contact, elements) => {
+            for (const info of pluginLoader.use.forwardMsg) {
+                try {
+                    let next = false;
+                    let exit = false;
+                    const nextFn = () => { next = true; };
+                    const exitFn = () => { exit = true; };
+                    await info.fn(contact, elements, nextFn, exitFn);
+                    if (exit) {
+                        const plugin = pluginLoader.plugin.get(info.key);
+                        logger.debug(`[消息中间件][${plugin.plugin}][${plugin.file}] 主动操作退出`);
+                        return { message_id: '' };
+                    }
+                    if (!next)
+                        break;
+                }
+                catch (e) {
+                    logger.error('[消息中间件] 调用失败，已跳过');
+                    logger.error(e);
+                }
+            }
+            const result = await sendForwardMessage(contact, elements);
+            return result;
+        };
         logger.debug('注册', this.list);
         return index;
     }

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

@@ -110,11 +110,15 @@ export declare class Plugin implements PluginType {
         message_id: string;
     }>;
     /**
+     * - 已废弃 请使用karin.ctx
      * - 构建上下文键
+     * @deprecated
      */
     conKey(): string;
     /**
-     * 设置上下文状态
+     * - 已废弃 请使用karin.ctx
+     * - 设置上下文状态
+     * @deprecated
      */
     setContext(
     /**
@@ -130,11 +134,14 @@ export declare class Plugin implements PluginType {
      */
     time?: number): void;
     /**
-     * 获取上下文状态
+     * - 已废弃 请使用karin.ctx
+     * - 获取上下文状态
      */
     getContext(): stateArrType[string];
     /**
-     * 清除上下文状态
+     * - 已废弃 请使用karin.ctx
+     * - 清除上下文状态
+     * @deprecated
      */
     finish(): void;
     e: EType<this>;

package/lib/core/plugin/base.js

@@ -63,13 +63,17 @@ export class Plugin {
         return result;
     }
     /**
+     * - 已废弃 请使用karin.ctx
      * - 构建上下文键
+     * @deprecated
      */
     conKey() {
         return `${this.e.isGroup ? `${this.e.group_id}.` : ''}` + (this.userId || this.e.user_id);
     }
     /**
-     * 设置上下文状态
+     * - 已废弃 请使用karin.ctx
+     * - 设置上下文状态
+     * @deprecated
      */
     setContext(
     /**
@@ -101,14 +105,17 @@ export class Plugin {
         }, time * 1000);
     }
     /**
-     * 获取上下文状态
+     * - 已废弃 请使用karin.ctx
+     * - 获取上下文状态
      */
     getContext() {
         const key = this.conKey();
         return stateArr[key];
     }
     /**
-     * 清除上下文状态
+     * - 已废弃 请使用karin.ctx
+     * - 清除上下文状态
+     * @deprecated
      */
     finish() {
         const key = this.conKey();

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

@@ -119,6 +119,10 @@ declare class PluginLoader {
     /**
      * 缓存插件
      * @param index - 插件索引
+     * @param plugin - 插件名称
+     * @param file - 插件文件
+     * @param info - 插件信息
+     * @param App - 插件类
      */
     cachePlugin(index: number, plugin: string, file: string, info: AppType, App?: any): Promise<boolean>;
     /**
@@ -127,10 +131,16 @@ declare class PluginLoader {
     printDependErr(): void;
     /**
      * 卸载插件
+     * @param plugin - 插件名称
+     * @param _path - 插件apps相对路径
+     * @param file - 插件文件名称
      */
     uninstallApp(plugin: string, _path: string, file: string): void;
     /**
      * 监听文件夹更新
+     * @param plugin - 插件名称
+     * @param _path - 插件apps相对路径
+     * @returns 是否成功
      */
     watchDir(plugin: string, _path: string): Promise<boolean>;
 }

package/lib/core/plugin/loader.js

@@ -55,6 +55,8 @@ class PluginLoader {
             recvMsg: [],
             replyMsg: [],
             sendMsg: [],
+            forwardMsg: [],
+            notFound: [],
         };
         this.ext = process.env.karin_app_lang === 'ts' ? ['.js', '.ts'] : ['.js'];
         this.index = 0;
@@ -289,6 +291,8 @@ class PluginLoader {
         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.notFound = lodash.orderBy(this.use.notFound, ['rank'], ['asc']);
         const handler = Object.keys(this.handler);
         handler.forEach(key => {
             this.handler[key] = lodash.orderBy(this.handler[key], ['rank'], ['asc']);
@@ -414,6 +418,10 @@ class PluginLoader {
     /**
      * 缓存插件
      * @param index - 插件索引
+     * @param plugin - 插件名称
+     * @param file - 插件文件
+     * @param info - 插件信息
+     * @param App - 插件类
      */
     async cachePlugin(index, plugin, file, info, App) {
         if (!info?.name) {
@@ -532,6 +540,9 @@ class PluginLoader {
     }
     /**
      * 卸载插件
+     * @param plugin - 插件名称
+     * @param _path - 插件apps相对路径
+     * @param file - 插件文件名称
      */
     uninstallApp(plugin, _path, file) {
         this.plugin.forEach((info, key) => {
@@ -544,6 +555,8 @@ class PluginLoader {
                 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.notFound = this.use.notFound.filter(val => val.key !== key);
                 /** 定时任务需要先停止 */
                 this.task = this.task.filter(val => {
                     if (val.key === key) {
@@ -570,6 +583,9 @@ class PluginLoader {
     }
     /**
      * 监听文件夹更新
+     * @param plugin - 插件名称
+     * @param _path - 插件apps相对路径
+     * @returns 是否成功
      */
     async watchDir(plugin, _path) {
         const root = path.join(this.dir, plugin, _path);

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

@@ -5,11 +5,22 @@ import { KarinMessageType } from '../../types/index.js';
  */
 export declare class MessageHandler extends EventBaseHandler {
     e: KarinMessageType;
+    /** 当前事件是否是上下文事件 */
+    isContext: boolean;
     constructor(e: KarinMessageType);
+    start(): Promise<void>;
     /**
      * 先对消息事件进行初始化
      */
     init(): void;
+    /**
+     * 开始中间件
+     */
+    startUse(): Promise<void>;
+    /**
+     * 结束中间件
+     */
+    endUse(): Promise<void>;
     /**
      * 响应模式检查 返回false表示未通过
      */
@@ -18,6 +29,19 @@ export declare class MessageHandler extends EventBaseHandler {
      * 处理消息
      */
     deal(): Promise<void>;
+    /**
+     * 获取下文
+     */
+    getContext(): {
+        type: "fnc";
+        fnc: Function;
+    } | {
+        type: "class";
+        fnc: import("../../core/index.js").Plugin;
+        name: string;
+    } | {
+        type: "ctx";
+    };
     /**
      * 处理上下文
      */

package/lib/event/handler/message.js

@@ -8,14 +8,22 @@ import { karin, stateArr, pluginLoader } from '../../core/index.js';
  */
 export class MessageHandler extends EventBaseHandler {
     e;
+    /** 当前事件是否是上下文事件 */
+    isContext;
     constructor(e) {
         super(e);
         this.e = e;
+        this.start();
+        this.isContext = !!this.getContext();
+    }
+    async start() {
         this.init();
-        if (this.e.group_id) {
+        await this.startUse();
+        if (this.e.sub_event === "group_message" /* MessageSubType.GroupMessage */) {
             if (!this.getCd())
                 return;
-            if (!this.getMode())
+            /** 下文不走响应模式 */
+            if (!this.isContext && !this.getMode())
                 return;
             if (!this.getGroupEnable())
                 return;
@@ -26,6 +34,9 @@ export class MessageHandler extends EventBaseHandler {
             if (!this.private())
                 return;
         }
+        /** 上下文 */
+        if (await this.context())
+            return;
         /** 处理消息 */
         this.deal();
     }
@@ -33,7 +44,7 @@ export class MessageHandler extends EventBaseHandler {
      * 先对消息事件进行初始化
      */
     init() {
-        karin.emit('karin:count:recv', 1);
+        karin.emit('karin:count:recv', this.e);
         const logs = [];
         for (const val of this.e.elements) {
             switch (val.type) {
@@ -178,20 +189,35 @@ export class MessageHandler extends EventBaseHandler {
         karin.emit('message', this.e);
     }
     /**
-     * 响应模式检查 返回false表示未通过
+     * 开始中间件
      */
-    getMode() {
-        if (review.mode(this.e, this.config))
-            return true;
-        logger.debug(`[消息拦截][${this.e.group_id}][${this.e.user_id}] 响应模式不匹配`);
-        return false;
+    async startUse() {
+        for (const info of pluginLoader.use.recvMsg) {
+            try {
+                let next = false;
+                let exit = false;
+                const nextFn = () => { next = true; };
+                const exitFn = () => { exit = true; };
+                await info.fn(this.e, nextFn, exitFn);
+                if (exit) {
+                    const plugin = pluginLoader.plugin.get(info.key);
+                    logger.debug(`[消息中间件][${plugin.plugin}][${plugin.file}] 主动操作退出`);
+                    return;
+                }
+                if (!next)
+                    break;
+            }
+            catch (e) {
+                logger.error('[消息中间件] 调用失败，已跳过');
+                logger.error(e);
+            }
+        }
     }
     /**
-     * 处理消息
+     * 结束中间件
      */
-    async deal() {
-        /** 先调用中间件 */
-        for (const info of pluginLoader.use.recvMsg) {
+    async endUse() {
+        for (const info of pluginLoader.use.notFound) {
             try {
                 let next = false;
                 let exit = false;
@@ -211,9 +237,20 @@ export class MessageHandler extends EventBaseHandler {
                 logger.error(e);
             }
         }
-        /** 上下文 */
-        if (await this.context())
-            return;
+    }
+    /**
+     * 响应模式检查 返回false表示未通过
+     */
+    getMode() {
+        if (review.mode(this.e, this.config))
+            return true;
+        logger.debug(`[消息拦截][${this.e.group_id}][${this.e.user_id}] 响应模式不匹配`);
+        return false;
+    }
+    /**
+     * 处理消息
+     */
+    async deal() {
         const app = this.e.group_id
             ? (info) => review.PluginEnable(info, this.config)
             : () => true;
@@ -261,6 +298,15 @@ export class MessageHandler extends EventBaseHandler {
                 }
             }
         }
+        logger.debug(`[事件处理][${this.e.self_id}][${this.e.user_id}][${this.e.event_id}] 未匹配到任何插件`);
+        await this.endUse();
+    }
+    /**
+     * 获取下文
+     */
+    getContext() {
+        const key = this.e.isGroup ? `${this.e.group_id}.${this.e.user_id}` : this.e.user_id;
+        return stateArr[key];
     }
     /**
      * 处理上下文

package/lib/event/handler/notice.js

@@ -88,6 +88,7 @@ export class NoticeHandler extends EventBaseHandler {
                 break;
             }
         }
+        logger.debug(`[事件处理][${this.e.self_id}][${this.e.user_id}][${this.e.event_id}] 未匹配到任何插件`);
     }
     /**
      * 构建原始消息

package/lib/event/handler/request.js

@@ -83,6 +83,7 @@ export class RequestHandler extends EventBaseHandler {
                 break;
             }
         }
+        logger.debug(`[事件处理][${this.e.self_id}][${this.e.user_id}][${this.e.event_id}] 未匹配到任何插件`);
     }
     /**
      * 构建原始消息

package/lib/modules/commander.d.ts

@@ -1,2 +1 @@
 export * from 'commander';
-export { default } from 'commander';

package/lib/modules/commander.js

@@ -1,2 +1 @@
 export * from 'commander';
-export { default } from 'commander';

package/lib/types/element/element.d.ts

@@ -1,4 +1,4 @@
-export type ElementType = 'text' | 'at' | 'face' | 'bubble_face' | 'reply' | 'image' | 'video' | 'basketball' | 'dice' | 'rps' | 'poke' | 'music' | 'weather' | 'location' | 'share' | 'gift' | 'market_face' | 'forward' | 'contact' | 'json' | 'xml' | 'file' | 'markdown' | 'markdown_tpl' | 'keyboard' | 'node' | 'rows' | 'record' | 'long_msg';
+export type ElementType = 'text' | 'at' | 'face' | 'bubble_face' | 'reply' | 'image' | 'video' | 'basketball' | 'dice' | 'rps' | 'poke' | 'music' | 'weather' | 'location' | 'share' | 'gift' | 'market_face' | 'forward' | 'contact' | 'json' | 'xml' | 'file' | 'markdown' | 'markdown_tpl' | 'keyboard' | 'node' | 'rows' | 'record' | 'long_msg' | 'raw';
 export interface Element {
     /**
      * - 元素类型
@@ -552,7 +552,14 @@ export interface LongMsgElement extends Element {
      */
     id: string;
 }
-export type KarinElement = TextElement | AtElement | FaceElement | BubbleFaceElement | ReplyElement | ImageElement | VideoElement | BasketballElement | DiceElement | RpsElement | PokeElement | MusicElement | WeatherElement | LocationElement | ShareElement | GiftElement | MarketFaceElement | ForwardElement | ContactElement | JsonElement | XmlElement | FileElement | ButtonElement | KeyBoardElement | RecordElement | LongMsgElement | TplMarkdownElement | RawMarkdownElement;
+/**
+ * 原生元素
+ */
+export interface RawElement extends Element {
+    type: 'raw';
+    data: any;
+}
+export type KarinElement = TextElement | AtElement | FaceElement | BubbleFaceElement | ReplyElement | ImageElement | VideoElement | BasketballElement | DiceElement | RpsElement | PokeElement | MusicElement | WeatherElement | LocationElement | ShareElement | GiftElement | MarketFaceElement | ForwardElement | ContactElement | JsonElement | XmlElement | FileElement | ButtonElement | KeyBoardElement | RecordElement | LongMsgElement | TplMarkdownElement | RawMarkdownElement | RawElement;
 /**
  * - 构建自定义转发节点 此元素仅可通过专用接口发送 不支持混合发送
  */

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

@@ -240,7 +240,7 @@ export interface KarinEventType {
     /**
      * - 存储器 由开发者自行调用
      */
-    store: Map<string, any>;
+    store: Map<any, any>;
     /**
      * - 原始消息
      */

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

@@ -162,7 +162,8 @@ export declare const enum OB11NoticeType {
     GroupRecall = "group_recall",
     FriendRecall = "friend_recall",
     Notify = "notify",
-    GroupMsgEmojiLike = "group_msg_emoji_like"
+    GroupMsgEmojiLike = "group_msg_emoji_like",
+    GroupMsgEmojiLikeLagrange = "reaction"
 }
 /**
  * - 通知事件基类
@@ -476,6 +477,39 @@ export interface OneBot11GroupMessageReaction extends OneBot11Notice {
         emoji_id: number;
     }>;
 }
+/**
+ * 群表情回应事件 Lagrange
+ */
+export interface OneBot11GroupMessageReactionLagrange extends OneBot11Notice {
+    /**
+     * - 消息类型
+     */
+    notice_type: OB11NoticeType.GroupMsgEmojiLikeLagrange;
+    /**
+     * - 提示类型
+     */
+    sub_type: 'remove' | 'add';
+    /**
+     * - 群号
+     */
+    group_id: string;
+    /**
+     * - 发送者 QQ 号
+     */
+    operator_id: string;
+    /**
+     * - 消息 ID
+     */
+    message_id: string;
+    /**
+     * - 表情ID
+     */
+    code: string;
+    /**
+     * - 表情数量
+     */
+    count: number;
+}
 /**
  * 请求事件类型
  */
@@ -593,7 +627,7 @@ export type OB11MessageEvent = OB11PrivateMessage | OB11GroupMessage;
 /**
  * 所有通知事件类型
  */
-export type OB11NoticeEvent = OneBot11GroupUpload | OneBot11GroupAdmin | OneBot11GroupDecrease | OneBot11GroupIncrease | OneBot11GroupBan | OneBot11FriendAdd | OneBot11GroupRecall | OneBot11FriendRecall | OneBot11Poke | OneBot11LuckyKing | OneBot11Honor | OneBot11GroupMessageReaction;
+export type OB11NoticeEvent = OneBot11GroupUpload | OneBot11GroupAdmin | OneBot11GroupDecrease | OneBot11GroupIncrease | OneBot11GroupBan | OneBot11FriendAdd | OneBot11GroupRecall | OneBot11FriendRecall | OneBot11Poke | OneBot11LuckyKing | OneBot11Honor | OneBot11GroupMessageReaction | OneBot11GroupMessageReactionLagrange;
 /**
  * 所有请求事件类型
  */

package/lib/types/onebot11/event.js

@@ -1,2 +1 @@
-/* eslint-disable no-unused-vars */
 export {};

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

@@ -2,7 +2,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 } from '../element/element.js';
+import { KarinElement, NodeElement } from '../element/element.js';
 /**
  * - 插件根目录名称
  * - 例如: karin-plugin-example
@@ -203,6 +203,42 @@ export interface PluginMiddlewareInfoType {
         /** 优先级 */
         rank: number;
     }>;
+    /** 发送合并转发前 */
+    forwardMsg: Array<{
+        /** 插件基本信息的映射key */
+        key: number;
+        /** 插件包名称 */
+        name: string;
+        /** 插件执行方法 */
+        fn: (
+        /** 发送的目标信息 */
+        contact: Contact, 
+        /** 发送的消息体 */
+        elements: Array<NodeElement>, 
+        /** 是否继续执行下一个中间件 */
+        next: Function, 
+        /** 是否不发送此条消息 */
+        exit: Function) => Promise<boolean>;
+        /** 优先级 */
+        rank: number;
+    }>;
+    /** 消息事件没有找到任何匹配的插件触发 */
+    notFound: Array<{
+        /** 插件基本信息的映射key */
+        key: number;
+        /** 插件包名称 */
+        name: string;
+        /** 插件执行方法 */
+        fn: (
+        /** 消息事件方法 */
+        e: KarinMessageType, 
+        /** 是否继续执行下一个中间件 */
+        next: Function, 
+        /** 是否退出此条消息 不再执行匹配插件 */
+        exit: Function) => Promise<boolean>;
+        /** 优先级 */
+        rank: number;
+    }>;
 }
 /**
  * 上下文状态

package/lib/utils/common/common.js

@@ -8,6 +8,9 @@ import { fileURLToPath } from 'url';
 import { createRequire } from 'module';
 import { pipeline, Readable } from 'stream';
 import { logger, segment, YamlEditor } from '../../utils/index.js';
+import { readJson } from '../../api/readJson.js';
+import { getNpmPlugins } from '../../api/npm.js';
+import { getGitPlugins } from '../../api/git.js';
 /**
  * 常用方法
  */
@@ -153,7 +156,7 @@ export class Common {
      */
     readJson(file, isThrow = false) {
         try {
-            return JSON.parse(fs.readFileSync(file, 'utf8'));
+            return readJson(file);
         }
         catch (error) {
             logger.debug(`[common][error] 读取json文件错误: ${file} ` + error);
@@ -414,22 +417,14 @@ export class Common {
      * @param isPack - 是否屏蔽不带package.json的插件，默认为false
      */
     getPlugins(isPack = false) {
-        const dir = this.absPath('./plugins', false);
-        let list = fs.readdirSync(dir, { withFileTypes: true });
-        /** 忽略非文件夹、非 karin-plugin-开头的文件夹 */
-        list = list.filter(v => v.isDirectory() && v.name.startsWith('karin-plugin-'));
-        if (isPack)
-            list = list.filter(v => fs.existsSync(`${dir}/${v.name}/package.json`));
-        const arr = [];
-        list.map(v => arr.push(v.name));
-        return arr;
+        return this.getGitPlugins(isPack);
     }
     /**
      * 获取git插件列表
      * @param isPack - 是否屏蔽不带package.json的插件，默认为false
      */
     getGitPlugins(isPack = false) {
-        return this.getPlugins(isPack);
+        return getGitPlugins(isPack);
     }
     /**
      * 获取npm插件列表
@@ -437,59 +432,7 @@ export class Common {
      * 默认只返回插件npm包名，为true时返回详细的{dir, name}[]
      */
     async getNpmPlugins(showDetails) {
-        /** 屏蔽的依赖包列表 */
-        const exclude = ['art-template', 'axios', 'chalk', 'chokidar', 'commander', 'express', 'level', 'lodash', 'log4js', 'moment', 'node-karin', 'node-schedule', 'redis', 'ws', 'yaml'];
-        const pkg = this.readJson('./package.json');
-        const dependencies = Object.keys(pkg.dependencies).filter((name) => !exclude.includes(name));
-        if (!showDetails) {
-            const list = [];
-            const readPackageJson = async (name) => {
-                try {
-                    const pkgPath = path.join(process.cwd(), 'node_modules', name, 'package.json');
-                    const pkg = this.readJson(pkgPath);
-                    if (pkg?.karin)
-                        list.push(name);
-                }
-                catch (error) {
-                    logger.error(`[common] 解析 package.json 时出错：${error.stack || error.message || JSON.stringify(error)}`);
-                }
-            };
-            await Promise.all(dependencies.map(readPackageJson));
-            return list;
-        }
-        const list = [];
-        /** 获取详细的npm信息 */
-        const readPackageJson = async (files) => {
-            try {
-                const root = path.join(process.cwd(), 'node_modules', files);
-                const pkgPath = path.join(root, 'package.json');
-                const pkg = this.readJson(pkgPath);
-                if (!pkg?.karin)
-                    return;
-                if (pkg?.main) {
-                    list.push({ plugin: files, path: path.dirname(pkg.main), file: path.basename(pkg.main), isMain: true });
-                }
-                if (pkg?.karin?.apps?.length) {
-                    pkg.karin.apps.forEach((app) => {
-                        if (!fs.existsSync(path.join(root, app))) {
-                            logger.error(`[common] npm插件${files}的app目录${app}不存在 已跳过`);
-                            return;
-                        }
-                        fs.readdirSync(path.join(root, app)).forEach((filename) => {
-                            /** 忽略非js文件 npm包不考虑ts */
-                            if (!filename.endsWith('.js'))
-                                return;
-                            list.push({ plugin: files, path: app, file: filename, isMain: false });
-                        });
-                    });
-                }
-            }
-            catch (error) {
-                logger.error(`[common] 获取npm插件列表时出错：${error.stack || error.message || JSON.stringify(error)}`);
-            }
-        };
-        await Promise.all(dependencies.map(readPackageJson));
-        return list;
+        return getNpmPlugins(showDetails);
     }
     /**
      * 获取运行时间

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

@@ -4,24 +4,17 @@ import { Redis, App, Config, Server, Package, GroupCfg, KarinEventTypes } from '
  * 配置文件
  */
 export declare const config: {
-    /**
-     * 运行目录绝对路径
-     */
+    /** karin运行目录绝对路径 */
     dir: string;
-    /**
-     * 运行目录配置文件夹路径
-     */
+    /** 用户生成配置目录 */
     cfgDir: string;
-    /**
-     * node-karin npm包路径
-     */
-    pkgDir: string;
-    /**
-     * node-karin 包配置文件夹路径
-     */
+    /** 默认配置目录 */
     pkgCfgDir: string;
+    /** 缓存 */
     change: Map<string, any>;
+    /** 监听 */
     watcher: Map<string, any>;
+    /** 拦截器状态 */
     review: boolean;
     logger: Logger;
     /**
@@ -98,24 +91,17 @@ export declare const config: {
     "__#2@#review"(): Promise<void>;
 };
 export declare const Cfg: {
-    /**
-     * 运行目录绝对路径
-     */
+    /** karin运行目录绝对路径 */
     dir: string;
-    /**
-     * 运行目录配置文件夹路径
-     */
+    /** 用户生成配置目录 */
     cfgDir: string;
-    /**
-     * node-karin npm包路径
-     */
-    pkgDir: string;
-    /**
-     * node-karin 包配置文件夹路径
-     */
+    /** 默认配置目录 */
     pkgCfgDir: string;
+    /** 缓存 */
     change: Map<string, any>;
+    /** 监听 */
     watcher: Map<string, any>;
+    /** 拦截器状态 */
     review: boolean;
     logger: Logger;
     /**

package/lib/utils/config/config.js

@@ -2,37 +2,29 @@ import fs from 'fs';
 import Yaml from 'yaml';
 import path from 'path';
 import chokidar from 'chokidar';
-import { karinDir } from '../../core/init/dir.js';
+import { karinDir, isPkg } from '../../core/init/dir.js';
 import { common } from '../../utils/common/common.js';
 /**
  * 配置文件
  */
 export const config = new (class Cfg {
-    /**
-     * 运行目录绝对路径
-     */
+    /** karin运行目录绝对路径 */
     dir;
-    /**
-     * 运行目录配置文件夹路径
-     */
+    /** 用户生成配置目录 */
     cfgDir;
-    /**
-     * node-karin npm包路径
-     */
-    pkgDir;
-    /**
-     * node-karin 包配置文件夹路径
-     */
+    /** 默认配置目录 */
     pkgCfgDir;
+    /** 缓存 */
     change;
+    /** 监听 */
     watcher;
+    /** 拦截器状态 */
     review;
     logger;
     constructor() {
         this.dir = process.cwd();
-        this.pkgDir = karinDir;
         this.cfgDir = this.dir + '/config';
-        this.pkgCfgDir = this.pkgDir + '/config/defSet';
+        this.pkgCfgDir = karinDir + '/config/defSet';
         /** 缓存 */
         this.change = new Map();
         /** 监听文件 */
@@ -52,7 +44,8 @@ export const config = new (class Cfg {
             this.cfgDir + '/plugin',
         ];
         list.forEach(path => this.mkdir(path));
-        if (this.pkgCfgDir !== (this.cfgDir + '/defSet').replace(/\\/g, '/')) {
+        /** 拷贝默认配置文件 */
+        if (isPkg) {
             const files = fs.readdirSync(this.pkgCfgDir).filter(file => file.endsWith('.yaml'));
             files.forEach(file => {
                 const path = `${this.cfgDir}/config/${file}`;
@@ -61,6 +54,15 @@ export const config = new (class Cfg {
                     fs.copyFileSync(pathDef, path);
             });
         }
+        else {
+            const files = fs.readdirSync(this.cfgDir + '/defSet').filter(file => file.endsWith('.yaml'));
+            files.forEach(file => {
+                const path = `${this.cfgDir}/config/${file}`;
+                const pathDef = `${this.cfgDir}/defSet/${file}`;
+                if (!fs.existsSync(path))
+                    fs.copyFileSync(pathDef, path);
+            });
+        }
         /** 为每个插件包创建统一存储的文件夹 */
         const plugins = await this.getPlugins();
         const DataList = [
@@ -172,20 +174,20 @@ export const config = new (class Cfg {
         const Config = {
             ...data,
             WhiteList: {
-                users: data.WhiteList.users.map((i) => String(i)),
-                groups: data.WhiteList.groups.map((i) => String(i)),
-                GroupMsgLog: data.WhiteList.GroupMsgLog.map((i) => String(i)),
+                users: data?.WhiteList?.users?.map((i) => String(i)) || [],
+                groups: data?.WhiteList?.groups?.map((i) => String(i)) || [],
+                GroupMsgLog: data?.WhiteList?.GroupMsgLog?.map((i) => String(i)) || [],
             },
             BlackList: {
-                users: data.BlackList.users.map((i) => String(i)),
-                groups: data.BlackList.groups.map((i) => String(i)),
-                GroupMsgLog: data.BlackList.GroupMsgLog.map((i) => String(i)),
+                users: data?.BlackList?.users?.map((i) => String(i)) || [],
+                groups: data?.BlackList?.groups?.map((i) => String(i)) || [],
+                GroupMsgLog: data?.BlackList?.GroupMsgLog?.map((i) => String(i)) || [],
             },
-            master: data.master.map((i) => String(i)),
-            admin: data.admin.map((i) => String(i)),
+            master: data?.master?.map((i) => String(i)) || [],
+            admin: data?.admin?.map((i) => String(i)) || [],
             private: {
-                white_list: data.private.white_list.map((i) => String(i)),
-                tips: data.private.tips,
+                white_list: data?.private?.white_list?.map((i) => String(i)) || [],
+                tips: data?.private?.tips || '',
             },
         };
         /** 缓存 */
@@ -214,7 +216,7 @@ export const config = new (class Cfg {
      * 实时获取packageon文件
      */
     get package() {
-        const data = fs.readFileSync(this.pkgDir + '/package.json', 'utf8');
+        const data = fs.readFileSync(karinDir + '/package.json', 'utf8');
         const pack = JSON.parse(data);
         return pack;
     }
@@ -227,7 +229,7 @@ export const config = new (class Cfg {
         const key = 'change.group';
         /** 取缓存 */
         const res = this.change.get(key);
-        const keys = e?.self_id ? [`Bot.${e.self_id}.${group_id}`, `Bot.${e.self_id}`, group_id] : [group_id];
+        const keys = e?.self_id ? [`Bot:${e.self_id}:${group_id}`, `Bot:${e.self_id}`, group_id] : [group_id];
         if (res) {
             const cfg = { ...res.defCfg.default, ...res.Config.default };
             for (const k of keys) {
@@ -320,7 +322,7 @@ export const config = new (class Cfg {
         if (this.review)
             return;
         this.review = true;
-        const { review } = await import('../../event/index.js');
+        const { review } = await import('../../event/handler/review.js');
         review.main();
         this.review = false;
     }

package/lib/utils/core/logger.js

@@ -9,14 +9,14 @@ const { log_level, log_days_Keep, log4jsCfg } = config.Config;
 const level = log_level || log4jsCfg.level || 'info';
 const daysToKeep = log_days_Keep || log4jsCfg.daysToKeep || 7;
 const { overall, fragments, maxLogSize } = log4jsCfg;
-const defaultOptions = { appenders: ['console'], level, enableCallStack: process.env.KarinMode === 'dev' };
+const defaultOptions = { appenders: ['console'], level, enableCallStack: process.env.karin_app_mode === 'dev' };
 const options = {
     appenders: {
         console: {
             type: 'console',
             layout: {
                 type: 'pattern',
-                pattern: `%[[Karin][%d{hh:mm:ss.SSS}][%4.4p]%] ${process.env.KarinMode === 'dev' ? '[%f{3}:%l] ' : ''}%m`,
+                pattern: `%[[Karin][%d{hh:mm:ss.SSS}][%4.4p]%] ${process.env.karin_app_mode === 'dev' ? '[%f{3}:%l] ' : ''}%m`,
             },
         },
     },

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

@@ -1,4 +1,4 @@
-import { TextElement, AtElement, ImageElement, FaceElement, BubbleFaceElement, ReplyElement, VideoElement, BasketballElement, DiceElement, RpsElement, PokeElement, MusicElement, WeatherElement, LocationElement, ShareElement, GiftElement, MarketFaceElement, ForwardElement, ContactElement, JsonElement, XmlElement, FileElement, ButtonElement, CustomMusicElemen, TplMarkdownElement, RawMarkdownElement, NodeElement, KarinElement, LongMsgElement, RecordElement, KeyBoardElement, Button } from '../../types/index.js';
+import { TextElement, AtElement, ImageElement, FaceElement, BubbleFaceElement, ReplyElement, VideoElement, BasketballElement, DiceElement, RpsElement, PokeElement, MusicElement, WeatherElement, LocationElement, ShareElement, GiftElement, MarketFaceElement, ForwardElement, ContactElement, JsonElement, XmlElement, FileElement, ButtonElement, CustomMusicElemen, TplMarkdownElement, RawMarkdownElement, NodeElement, KarinElement, LongMsgElement, RecordElement, KeyBoardElement, Button, RawElement } from '../../types/index.js';
 export declare const segment: {
     /**
      * 纯文本
@@ -276,4 +276,9 @@ export declare const segment: {
      * @param content - 节点内容
      */
     node(user_id: string, nickname: string, content: KarinElement | Array<KarinElement>): NodeElement;
+    /**
+     * 发送原生格式给予适配器处理
+     * @param data - 原生数据
+     */
+    raw(data: any): RawElement;
 };

package/lib/utils/core/segment.js

@@ -448,4 +448,14 @@ export const segment = new (class Segment {
             content,
         };
     }
+    /**
+     * 发送原生格式给予适配器处理
+     * @param data - 原生数据
+     */
+    raw(data) {
+        return {
+            type: 'raw',
+            data,
+        };
+    }
 })();

package/package.json

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