node-karin 0.6.9 → 0.6.11

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

@@ -5,6 +5,7 @@ import { contact, KarinElement } from '../../types/index.js';
  */
 export declare class AdapterInput implements KarinAdapter {
     #private;
+    token: string;
     socket: WebSocket;
     account: KarinAdapter['account'];
     adapter: KarinAdapter['adapter'];

package/lib/adapter/input/index.js

@@ -4,36 +4,11 @@ import { listener } from '../../core/index.js';
 import { KarinMessage } from '../../event/index.js';
 import { config, common, YamlEditor } from '../../utils/index.js';
 const { enable, msgToFile, token: oldToken, ip } = config.Config.AdapterInput;
-let token = oldToken;
-if (oldToken === 'AdapterInput') {
-    try {
-        token = randomUUID();
-        const yaml = new YamlEditor('./config/config/config.yaml');
-        const data = yaml.get('AdapterInput');
-        if (!data) {
-            const yaml1 = new YamlEditor('./config/defSet/config.yaml');
-            const data1 = yaml1.get('AdapterInput');
-            data1.token = token;
-            yaml.set('AdapterInput', data1);
-        }
-        else {
-            data.token = token;
-            yaml.set('AdapterInput', data);
-        }
-        yaml.save();
-    }
-    catch (e) {
-        logger.error('AdapterInput token更换失败，请手动更换token');
-    }
-}
-// 清空文件夹
-fs.readdirSync('./temp/input').forEach((file) => {
-    fs.unlinkSync(`./temp/input/${file}`);
-});
 /**
  * - 标准输入输出适配器
  */
 export class AdapterInput {
+    token;
     #stdin;
     socket;
     account;
@@ -41,8 +16,9 @@ export class AdapterInput {
     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: '' };
+        this.adapter = { id: 'shell', name: 'input', type: 'internal', sub_type: 'internal', start_time: Date.now(), connect: '', index: 0 };
         this.version = { name: 'input', app_name: 'input', version: '1.0.0' };
     }
     get self_id() {
@@ -52,6 +28,35 @@ export class AdapterInput {
         if (this.#stdin)
             return;
         this.#stdin = true;
+        if (oldToken === 'AdapterInput') {
+            try {
+                this.token = randomUUID();
+                const yaml = new YamlEditor('./config/config/config.yaml');
+                const data = yaml.get('AdapterInput');
+                if (!data) {
+                    const yaml1 = new YamlEditor('./config/defSet/config.yaml');
+                    const data1 = yaml1.get('AdapterInput');
+                    data1.token = this.token;
+                    yaml.set('AdapterInput', data1);
+                }
+                else {
+                    data.token = this.token;
+                    yaml.set('AdapterInput', data);
+                }
+                yaml.save();
+            }
+            catch (e) {
+                logger.error('AdapterInput token更换失败，请手动更换token');
+            }
+        }
+        // 清空文件夹
+        fs.readdirSync('./temp/input').forEach((file) => {
+            fs.unlinkSync(`./temp/input/${file}`);
+        });
+        /** 注册bot */
+        const index = listener.addBot({ bot: this, type: this.adapter.type });
+        if (index)
+            this.adapter.index = index;
         process.stdin.on('data', data => this.#input(data.toString()));
         process.once('stdin.close', () => process.stdin.removeAllListeners('data'));
     }
@@ -108,7 +113,7 @@ export class AdapterInput {
         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=${token} ]`;
+        return `[${type === 'image' ? '图片' : '语音'}: http://${ip}:${config.Server.http.port}/api/input?name=${name}&token=${this.token} ]`;
     }
     async GetVersion() {
         const data = this.version;
@@ -181,9 +186,5 @@ export class AdapterInput {
     async GetGroupMemberList() { throw new Error('Method not implemented.'); }
     async GetGroupHonor() { throw new Error('Method not implemented.'); }
 }
-if (enable) {
-    const bot = new AdapterInput();
-    bot.stdin();
-    /** 注册bot */
-    listener.emit('bot', { type: 'internal', bot });
-}
+if (enable)
+    new AdapterInput().stdin();

package/lib/adapter/kritor/grpc.d.ts

@@ -30,4 +30,3 @@ export declare class KritorGrpc {
      */
     AdapterConvertKarin(data: Array<kritor.common.Element>): Array<KarinElement>;
 }
-export declare const grpcServer: KritorGrpc;

package/lib/adapter/kritor/grpc.js

@@ -721,7 +721,9 @@ export class KritorGrpc {
                     const bot = new AdapterKritor(grpc, uid, uin + '');
                     this.BotMap.set(uid, bot);
                     /** 注册bot */
-                    listener.emit('bot', { type: 'grpc', bot });
+                    const index = listener.addBot({ type: bot.adapter.type, bot });
+                    if (index)
+                        bot.adapter.index = index;
                 },
             };
             this.#server.addService(coreProtoGrpcType.kritor.core.CoreService.service, authenticationServer);
@@ -977,5 +979,3 @@ export class KritorGrpc {
         return elements;
     }
 }
-export const grpcServer = new KritorGrpc();
-grpcServer.init();

package/lib/adapter/kritor/index.js

@@ -1,5 +1,6 @@
 import { kritor } from 'kritor-proto';
 import { logger, config, segment } from '../../utils/index.js';
+import { listener } from '../../core/index.js';
 /**
  * @extends KarinAdapter
  */
@@ -21,7 +22,7 @@ export default class AdapterKritor {
      */
     grpc, uid, uin) {
         this.account = { uid, uin, name: '' };
-        this.adapter = { id: 'QQ', name: 'Kritor', type: 'grpc', sub_type: 'server', start_time: Date.now(), connect: '' };
+        this.adapter = { id: 'QQ', name: 'Kritor', type: 'grpc', sub_type: 'server', start_time: Date.now(), connect: '', index: 0 };
         this.version = { name: '', app_name: '', version: '' };
         this.grpc = grpc;
         /** 自增 */
@@ -29,7 +30,11 @@ export default class AdapterKritor {
         /** 监听响应事件 */
         this.grpc.on('data', data => this.grpc.emit(data.seq, data));
         /** 监听关闭事件 */
-        this.grpc.on('end', () => this.logger('warn', '连接已断开'));
+        this.grpc.once('end', () => {
+            this.logger('warn', '[反向gRPC] 连接已断开');
+            this.grpc.removeAllListeners();
+            this.adapter.index && listener.delBot(this.adapter.index);
+        });
         this.#init();
     }
     get self_id() {

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

@@ -31,8 +31,6 @@ export declare class AdapterOneBot11 implements KarinAdapter {
      * 获取当前登录号信息
      */
     getSelf(): Promise<void>;
-    /** 是否初始化 */
-    get isInit(): Promise<unknown>;
     /**
      * onebot11转karin
      * @return karin格式消息

package/lib/adapter/onebot/onebot11.js

@@ -23,7 +23,7 @@ export class AdapterOneBot11 {
     constructor() {
         this.index = 0;
         this.account = { uid: '', uin: '', name: '' };
-        this.adapter = { id: 'QQ', name: 'OneBot11', type: 'ws', sub_type: 'internal', start_time: Date.now(), connect: '' };
+        this.adapter = { id: 'QQ', name: 'OneBot11', type: 'ws', sub_type: 'internal', start_time: Date.now(), connect: '', index: 0 };
         this.version = { name: '', app_name: '', version: '' };
     }
     /**
@@ -54,15 +54,6 @@ export class AdapterOneBot11 {
             this.index = 0;
             this.#initListener(connect);
         });
-        /** 监听断开 */
-        this.socket.on('close', async () => {
-            this.index++;
-            logger.warn(`[正向WS][重连次数:${this.index}] 连接断开，将在5秒后重连：${connect}`);
-            /** 停止全部监听 */
-            this.socket.removeAllListeners();
-            await common.sleep(5000);
-            this.client(connect);
-        });
     }
     /**
      * 初始化监听事件
@@ -92,6 +83,8 @@ export class AdapterOneBot11 {
             this.logger('warn', `[${type}] 连接断开：${connect}`);
             /** 停止全部监听 */
             this.socket.removeAllListeners();
+            /** 注销bot */
+            this.adapter.index && listener.delBot(this.adapter.index);
             /** 正向ws需要重连 */
             if (this.adapter.sub_type === 'client') {
                 this.index++;
@@ -129,20 +122,9 @@ 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 */
-        listener.emit('bot', { type: 'websocket', bot: this });
-    }
-    /** 是否初始化 */
-    get isInit() {
-        return new Promise(resolve => {
-            const timer = setInterval(() => {
-                if (this.account.name) {
-                    const { name, version } = this.version;
-                    this.logger('info', `建立连接成功：[${name}(${version})] ${this.adapter.connect}`);
-                    clearInterval(timer);
-                    resolve(true);
-                }
-            }, 100);
-        });
+        const index = listener.addBot({ type: this.adapter.type, bot: this });
+        if (index)
+            this.adapter.index = index;
     }
     /**
      * 处理事件
@@ -151,20 +133,17 @@ export class AdapterOneBot11 {
     #event(data) {
         switch (data.post_type) {
             case 'meta_event': {
-                switch (data.meta_event_type) {
-                    case 'heartbeat':
-                        this.logger('trace', `[心跳]：${JSON.stringify(data.status)}`);
-                        break;
-                    case 'lifecycle': {
-                        const typeMap = {
-                            enable: 'OneBot启用',
-                            disable: 'OneBot停用',
-                            connect: 'WebSocket连接成功',
-                        };
-                        const sub_type = data.sub_type;
-                        this.logger('debug', `[生命周期]：${typeMap[sub_type]}`);
-                        break;
-                    }
+                if (data.meta_event_type === 'heartbeat') {
+                    this.logger('trace', `[心跳]：${JSON.stringify(data.status)}`);
+                }
+                else {
+                    const typeMap = {
+                        enable: 'OneBot启用',
+                        disable: 'OneBot停用',
+                        connect: 'WebSocket连接成功',
+                    };
+                    const sub_type = data.sub_type;
+                    this.logger('debug', `[生命周期]：${typeMap[sub_type]}`);
                 }
                 listener.emit('meta_event', data);
                 return;

package/lib/core/karin.js

@@ -11,44 +11,32 @@ export class Karin {
      */
 
   command (reg, second, options = {}) {
-    const Reg = typeof reg === 'string' ? new RegExp(reg) : reg
+    reg = typeof reg === 'string' ? new RegExp(reg) : reg
+    const fnc = typeof second === 'function'
+      ? second
+      : async (e) => {
+        const element = typeof second === 'number' ? String(second) : second
+        if ('delay' in options && options.delay) { await common.sleep(options.delay) }
+        await e.reply(element, {
+          at: ('at' in options && options.at) || false,
+          reply: ('reply' in options && options.reply) || false,
+          recallMsg: ('recallMsg' in options && Number(options.recallMsg)) || 0,
+        })
+        return !('stop' in options && !options.stop)
+      }
     const data = {
       name: options.name || 'function',
       priority: options.priority,
       rule: [
         {
-          reg: Reg,
-          fnc: second,
+          reg,
+          fnc,
           permission: options.permission || 'all',
           log: options.log ?? true,
         },
       ],
     }
-    switch (typeof second) {
-      case 'function': {
-        return PluginApp(data)
-      }
-      case 'string':
-      case 'number':
-      case 'object': {
-        const element = common.makeMessage(typeof second === 'number' ? String(second) : second)
-        const fnc = async (e) => {
-          if ('delay' in options && options.delay) { await common.sleep(options.delay) }
-          await e.reply(element, {
-            at: ('at' in options && options.at) || false,
-            reply: ('reply' in options && options.reply) || false,
-            recallMsg: ('recallMsg' in options && Number(options.recallMsg)) || 0,
-          })
-          if ('stop' in options && !options.stop) { return false }
-          return true
-        }
-        data.rule[0].fnc = fnc
-        return PluginApp(data)
-      }
-      default: {
-        throw new Error('command: second argument must be a function or string')
-      }
-    }
+    return PluginApp(data)
   }
 
   /**

package/lib/core/listener.js

@@ -31,14 +31,9 @@ class Listeners extends EventEmitter {
       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)
+      logger.info(`[适配器][注册][${data.type}]: ` + path)
       this.addAdapter(data)
     })
-    this.on('bot', data => {
-      if (!this.addBot(data)) { return }
-      logger.info(`[机器人][注册][${data.type}] ` + logger.green(`[account:${data.bot.account.uid || data.bot.account.uin}(${data.bot.account.name})]`))
-      this.emit('karin:online', data.bot.account.uid || data.bot.account.uin)
-    })
     this.on('message', data => new MessageHandler(data))
     this.on('notice', data => new NoticeHandler(data))
     this.on('request', data => new RequestHandler(data))
@@ -55,6 +50,9 @@ class Listeners extends EventEmitter {
       return false
     }
     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.emit('karin:online', data.bot.account.uid || data.bot.account.uin)
+    logger.debug('注册', this.list)
     return index
   }
 
@@ -64,6 +62,7 @@ class Listeners extends EventEmitter {
      */
   delBot (index) {
     this.list = this.list.filter(item => item.index !== index)
+    logger.debug('[机器人][卸载] ', this.list)
   }
 
   /**

package/lib/core/plugin.d.ts

@@ -4,8 +4,8 @@ import { PluginType, KarinElement, KarinNodeElement, EventType, KarinNoticeEvent
  */
 export declare class Plugin implements PluginType {
     e: EventType<this>;
-    init?: () => void;
-    accept?: (e: any) => Promise<void>;
+    init?: () => Promise<any>;
+    accept?: (e: any) => Promise<any>;
     replyCallback: PluginType['replyCallback'];
     /**
      * @param name - 插件名称

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

@@ -2,11 +2,8 @@ import chokidar from 'chokidar';
 import schedule from 'node-schedule';
 import { Plugin } from './plugin.js';
 import { PluginApps, PluginTask, dirName, fileName, AppInfo } from '../types/index.js';
-/**
- * 加载插件
- */
-export declare const pluginLoader: {
-    dir: "./plugins";
+declare class PluginLoader {
+    dir: './plugins';
     dirPath: string;
     /**
      * - 插件索引ID
@@ -42,6 +39,10 @@ export declare const pluginLoader: {
      * - 是否ts环境
      */
     isTs: boolean;
+    /**
+     * - 是否开发环境
+     */
+    isDev: boolean;
     /**
      * - 最终缓存的插件列表 通过index索引
      */
@@ -70,10 +71,11 @@ export declare const pluginLoader: {
         dir: dirName;
         name?: fileName;
     }>;
+    constructor();
     /**
      * 插件初始化
      */
-    load(): Promise<any>;
+    load(): Promise<this>;
     /**
      * 获取所有插件
      */
@@ -83,13 +85,13 @@ export declare const pluginLoader: {
      * @param path - 插件路径
      * @param lang - 语言环境
      */
-    getIndex(path: string, lang: "js" | "ts"): string | boolean;
+    getIndex(path: string, lang: 'js' | 'ts'): string | boolean;
     /**
      * 获取指定文件夹下的所有插件
      * @param dir - 插件包名称
      * @param isTs - 是否获取ts插件
      */
-    getApps(dir: dirName, isTs: boolean): void;
+    getApps(dir: dirName, isTs: boolean, isWatch?: boolean): void;
     /**
      * 排序并打印插件加兹安信息
      * @param isPrint - 是否打印
@@ -99,9 +101,33 @@ export declare const pluginLoader: {
      * 新增插件
      * @param dir - 插件包路径
      * @param name - 插件名称
-     * @param isOrderBy - 是否重新导入
+     * @param isOrderBy - 是否为动态导入 默认为静态导入
      */
     createdApp(dir: dirName, name: fileName, isOrderBy?: boolean): Promise<boolean>;
+    /**
+     * 新增rule
+     */
+    addRule(dir: dirName, name: fileName, index: number, Class: Plugin): Promise<void>;
+    /**
+     * 新增task fnc模式
+     */
+    addTaskFnc(dir: dirName, App: PluginApps): PluginTask[];
+    /**
+     * 新增task
+     */
+    addTask(dir: dirName, name: fileName, index: number, Class: Plugin, App: new () => Plugin): Promise<void>;
+    /**
+     * 新增accept、handler
+     */
+    addAccept(index: number, Class: Plugin): Promise<void>;
+    /**
+     * 新增button
+     */
+    addButton(dir: dirName, name: fileName, index: number, Class: Plugin): Promise<void>;
+    /**
+     * 执行初始化
+     */
+    addInit(Class: Plugin): Promise<void>;
     /**
      * 卸载插件
      */
@@ -114,4 +140,15 @@ export declare const pluginLoader: {
      * 监听文件夹更新
      */
     watchDir(dir: dirName): Promise<true | undefined>;
-};
+    watcAdd(dir: dirName, name: fileName): Promise<boolean | undefined>;
+    /**
+     * 传入文件名称 返回是否符合当前环境规则
+     * @param name - 文件名称
+     */
+    isApp(name: fileName): boolean;
+}
+/**
+ * 加载插件
+ */
+export declare const pluginLoader: PluginLoader;
+export {};

package/lib/core/plugin.loader.js

@@ -7,10 +7,7 @@ import { listener } from './listener.js'
 import PluginApp from './plugin.app.js'
 import { render } from '../render/index.js'
 import { common, handler, logger } from '../utils/index.js'
-/**
- * 加载插件
- */
-export const pluginLoader = new (class PluginLoader {
+class PluginLoader {
   dir
   dirPath
   /**
@@ -41,6 +38,10 @@ export const pluginLoader = new (class PluginLoader {
      * - 是否ts环境
      */
   isTs
+  /**
+     * - 是否开发环境
+     */
+  isDev
   /**
      * - 最终缓存的插件列表 通过index索引
      */
@@ -62,6 +63,7 @@ export const pluginLoader = new (class PluginLoader {
     this.dir = './plugins'
     this.dirPath = common.urlToPath(import.meta.url)
     this.isTs = process.env.karin_app_lang === 'ts'
+    this.isDev = process.env.karin_app_mode === 'dev'
     this.watcher = new Map()
     this.watchList = []
     this.FileList = []
@@ -79,7 +81,10 @@ export const pluginLoader = new (class PluginLoader {
   async load () {
     this.getPlugins()
     listener.once('plugin.watch', () => {
-      for (const v of this.watchList) { v.name ? this.watch(v.dir, v.name) : this.watchDir(v.dir) }
+      for (const v of this.watchList) {
+        v.name ? this.watch(v.dir, v.name) : this.watchDir(v.dir)
+        logger.debug(`[热更新][${v.dir}]${v.name ? `[${v.name}]` : ''} 监听中...`)
+      }
     })
     logger.info(logger.green('-----------'))
     logger.info('加载插件中..')
@@ -115,21 +120,14 @@ export const pluginLoader = new (class PluginLoader {
              */
       /** 非插件包 加载该文件夹下全部js 视语言环境加载ts */
       if (!common.isPlugin(PluginPath)) {
-        this.watchList.push({ dir })
-        const list = fs.readdirSync(`${this.dir}/${dir}`, { withFileTypes: true })
-        for (const file of list) {
-          /** 忽略不符合规则的文件 */
-          const ext = this.isTs ? ['.js', '.ts'] : ['.js']
-          if (!ext.includes(path.extname(file.name))) { continue }
-          this.FileList.push({ dir, name: file.name })
-        }
+        this.getApps(dir, this.isTs, true)
         continue
       }
       /** 入口文件 */
       const index = this.getIndex(PluginPath, process.env.karin_app_lang)
       if (index) {
-        this.watchList.push({ dir, name: index })
         this.FileList.push({ dir, name: index })
+        this.isDev && this.watchList.push({ dir, name: index })
       }
       /** 检查是否存在karin.apps */
       const pack = common.readJson(`${PluginPath}/package.json`)
@@ -181,8 +179,8 @@ export const pluginLoader = new (class PluginLoader {
      * @param dir - 插件包名称
      * @param isTs - 是否获取ts插件
      */
-  getApps (dir, isTs) {
-    this.watchList.push({ dir })
+  getApps (dir, isTs, isWatch = false) {
+    isWatch && this.watchList.push({ dir })
     const ext = isTs ? ['.js', '.ts'] : ['.js']
     const list = fs.readdirSync(`${this.dir}/${dir}`, { withFileTypes: true })
     for (const file of list) {
@@ -234,10 +232,11 @@ export const pluginLoader = new (class PluginLoader {
      * 新增插件
      * @param dir - 插件包路径
      * @param name - 插件名称
-     * @param isOrderBy - 是否重新导入
+     * @param isOrderBy - 是否为动态导入 默认为静态导入
      */
   async createdApp (dir, name, isOrderBy = false) {
     try {
+      const list = []
       let path = `${this.dirPath}plugins/${dir}/${name}`
       if (isOrderBy) { path = path + `?${Date.now()}` }
       const tmp = await import(path)
@@ -249,29 +248,9 @@ export const pluginLoader = new (class PluginLoader {
           App.file.dir = dir
           App.file.name = name
           /** handler */
-          handler.add(index + '', App)
-          const task = []
-          /** 定时任务 */
-          lodash.forEach(App.task, val => {
-            task.push({
-              name: val.name,
-              cron: val.cron,
-              fnc: val.fnc,
-              log: val.log === false ? (log) => logger.debug(log) : (log) => logger.mark(log),
-              schedule: schedule.scheduleJob(val.cron, async () => {
-                try {
-                  typeof val.log === 'function' && val.log(`[定时任务][${dir}][${val.name}] 开始执行`)
-                  if (typeof val.fnc === 'function') { await val.fnc() }
-                  typeof val.log === 'function' && val.log(`[定时任务][${dir}][${val.name}] 执行完毕`)
-                } catch (error) {
-                  logger.error(`[定时任务][${dir}][${val.name}] 执行报错`)
-                  logger.error(error)
-                }
-              }),
-            })
-          })
-          App.task = task
+          App.task = this.addTaskFnc(dir, App)
           this.PluginList[index] = App
+          handler.add(index + '', App)
           if (App.accept) { this.acceptIds.push(index) }
           return true
         }
@@ -279,72 +258,22 @@ export const pluginLoader = new (class PluginLoader {
         const Class = new App()
         if (!Class.name) { return logger.error(`[${dir}][${name}] 插件名称错误`) }
         logger.debug(`载入插件 [${name}][${Class.name}]`)
-        const info = PluginApp({
-          file: {
-            dir,
-            name,
-            type: 'class',
-            fnc: App,
-          },
+        this.PluginList[index] = PluginApp({
+          file: { dir, name, type: 'class', fnc: App },
           name: Class.name,
           event: Class.event,
           priority: Class.priority,
-          accept: Class.accept && typeof Class.accept === 'function',
-        })
-        /** 定时任务 */
-        lodash.forEach(Class.task, val => {
-          if (!val.name) { return logger.error(`[${dir}][${name}] 定时任务name错误`) }
-          if (!val.cron) { return logger.error(`[${dir}][${name}] 定时任务cron错误：${Class.name}`) }
-          info.task.push({
-            name: val.name,
-            cron: val.cron,
-            fnc: val.fnc,
-            log: val.log === false ? (log) => logger.debug(log) : (log) => logger.mark(log),
-            schedule: schedule.scheduleJob(val.cron, async () => {
-              try {
-                typeof val.log === 'function' && val.log(`[定时任务][${dir}][${val.name}] 开始执行`)
-                if (typeof val.fnc === 'function') {
-                  await val.fnc()
-                } else {
-                  const cla = new App()
-                  await cla[val.fnc]()
-                }
-                typeof val.log === 'function' && val.log(`[定时任务][${dir}][${val.name}] 执行完毕`)
-              } catch (error) {
-                logger.error(`[定时任务][${dir}][${val.name}] 执行报错`)
-                logger.error(error)
-              }
-            }),
-          })
-        })
-        /** rule */
-        lodash.forEach(Class.rule, val => {
-          if (!val.fnc) { return logger.error(`[${dir}][${name}] rule.fnc错误：${Class.name}`) }
-          info.rule.push({
-            reg: val.reg instanceof RegExp ? val.reg : new RegExp(val.reg),
-            fnc: val.fnc,
-            event: val.event,
-            permission: val.permission || 'all',
-            log: val.log === false ? (id, log) => logger.debug('mark', id, log) : (id, log) => logger.bot('mark', id, log),
-          })
-        })
-        /** button */
-        lodash.forEach(Class.button, val => {
-          if (!val.fnc) { return logger.error(`[${dir}][${name}] rule.fnc错误：${Class.name}`) }
-          info.button.push({
-            reg: val.reg instanceof RegExp ? val.reg : new RegExp(val.reg),
-            fnc: val.fnc,
-          })
+          accept: false,
         })
-        /** accept */
-        if (Class.accept && typeof Class.accept === 'function') { this.acceptIds.push(index) }
-        /** handler */
-        handler.add(index + '', Class)
-        /** 执行初始化 */
-        Class.init && Class.init()
-        this.PluginList[index] = info
+        /** 异步收集 加载速度 */
+        list.push(this.addRule(dir, name, index, Class))
+        list.push(this.addTask(dir, name, index, Class, App))
+        list.push(this.addAccept(index, Class))
+        list.push(this.addButton(dir, name, index, Class))
+        list.push(this.addInit(Class))
         return true
       })
+      await Promise.all(list)
       // rule收集并排序
       if (isOrderBy) { this.orderBy() }
       return true
@@ -366,6 +295,112 @@ export const pluginLoader = new (class PluginLoader {
     }
   }
 
+  /**
+     * 新增rule
+     */
+  async addRule (dir, name, index, Class) {
+    lodash.forEach(Class.rule, val => {
+      if (!val.fnc) { return logger.error(`[${dir}][${name}] rule.fnc错误：${Class.name}`) }
+      this.PluginList[index].rule.push({
+        reg: val.reg instanceof RegExp ? val.reg : new RegExp(val.reg),
+        fnc: val.fnc,
+        event: val.event,
+        permission: val.permission || 'all',
+        log: val.log === false ? (id, log) => logger.debug('mark', id, log) : (id, log) => logger.bot('mark', id, log),
+      })
+    })
+  }
+
+  /**
+     * 新增task fnc模式
+     */
+  addTaskFnc (dir, App) {
+    const task = []
+    lodash.forEach(App.task, val => {
+      task.push({
+        name: val.name,
+        cron: val.cron,
+        fnc: val.fnc,
+        log: val.log === false ? (log) => logger.debug(log) : (log) => logger.mark(log),
+        schedule: schedule.scheduleJob(val.cron, async () => {
+          try {
+            typeof val.log === 'function' && val.log(`[定时任务][${dir}][${val.name}] 开始执行`)
+            if (typeof val.fnc === 'function') { await val.fnc() }
+            typeof val.log === 'function' && val.log(`[定时任务][${dir}][${val.name}] 执行完毕`)
+          } catch (error) {
+            logger.error(`[定时任务][${dir}][${val.name}] 执行报错`)
+            logger.error(error)
+          }
+        }),
+      })
+      return true
+    })
+    return task
+  }
+
+  /**
+     * 新增task
+     */
+  async addTask (dir, name, index, Class, App) {
+    /** 定时任务 */
+    lodash.forEach(Class.task, val => {
+      if (!val.name) { return logger.error(`[${dir}][${name}] 定时任务name错误`) }
+      if (!val.cron) { return logger.error(`[${dir}][${name}] 定时任务cron错误：${Class.name}`) }
+      this.PluginList[index].task.push({
+        name: val.name,
+        cron: val.cron,
+        fnc: val.fnc,
+        log: val.log === false ? (log) => logger.debug(log) : (log) => logger.mark(log),
+        schedule: schedule.scheduleJob(val.cron, async () => {
+          try {
+            typeof val.log === 'function' && val.log(`[定时任务][${dir}][${val.name}] 开始执行`)
+            if (typeof val.fnc === 'function') {
+              await val.fnc()
+            } else {
+              const cla = new App()
+              await cla[val.fnc]()
+            }
+            typeof val.log === 'function' && val.log(`[定时任务][${dir}][${val.name}] 执行完毕`)
+          } catch (error) {
+            logger.error(`[定时任务][${dir}][${val.name}] 执行报错`)
+            logger.error(error)
+          }
+        }),
+      })
+    })
+  }
+
+  /**
+     * 新增accept、handler
+     */
+  async addAccept (index, Class) {
+    if (Class.accept && typeof Class.accept === 'function') {
+      this.PluginList[index].accept = true
+      this.acceptIds.push(index)
+    }
+    await handler.add(index + '', Class)
+  }
+
+  /**
+     * 新增button
+     */
+  async addButton (dir, name, index, Class) {
+    lodash.forEach(Class.button, val => {
+      if (!val.fnc) { return logger.error(`[${dir}][${name}] button.fnc错误：${Class.name}`) }
+      this.PluginList[index].button.push({
+        reg: val.reg instanceof RegExp ? val.reg : new RegExp(val.reg),
+        fnc: val.fnc,
+      })
+    })
+  }
+
+  /**
+     * 执行初始化
+     */
+  async addInit (Class) {
+    Class.init && await Class.init()
+  }
+
   /**
      * 卸载插件
      */
@@ -480,4 +515,41 @@ export const pluginLoader = new (class PluginLoader {
     this.watcher.set(dir, watcher)
     return true
   }
-})()
+
+  async watcAdd (dir, name) {
+    const file = `${this.dir}/${dir}/`
+    const filePath = `${file}/${name}`
+    logger.debug(`[热更新][新增插件] ${filePath}`)
+    if (!this.isApp(name)) {
+      logger.debug(`[热更新][新增插件] ${filePath} 文件类型错误 不符合当前环境规则 已忽略`)
+      return false
+    }
+    /** 载入插件 */
+    const res = await this.createdApp(dir, name, true)
+    if (!res) { return }
+    /** 延迟1秒 等待卸载完成 */
+    await common.sleep(1000)
+    /** 新增插件之后重新监听文件夹 */
+    this.watcher.delete(dir)
+    this.watchDir(dir)
+    logger.mark(`[新增插件][${dir}][${name}]`)
+    return true
+  }
+
+  /**
+     * 传入文件名称 返回是否符合当前环境规则
+     * @param name - 文件名称
+     */
+  isApp (name) {
+    /** 任何环境都支持js */
+    if (name.endsWith('.js')) { return true }
+    /** ts环境支持ts */
+    if (name.endsWith('.ts') && this.isTs) { return true }
+    /** 其他情况返回false */
+    return false
+  }
+}
+/**
+ * 加载插件
+ */
+export const pluginLoader = new PluginLoader()

package/lib/core/process.js

@@ -72,7 +72,7 @@ export default class Process {
          * 走到这里说明后台关闭失败
          * 根据配置文件判断是否继续
          */
-    logger.error(logger.red('后台进程关闭失败，请手动关闭'))
+    logger.error(logger.red(`后台进程关闭失败，请检查是否有进程正在占用端口${config.Server.http.port}`))
     if (!config.Config.multi_progress) {
       logger.error(logger.red('当前配置不允许多进程运行，程序即将退出'))
       await this.exit(1)

package/lib/core/server.d.ts

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

package/lib/core/server.js

@@ -7,6 +7,7 @@ import express from 'express'
 import { exec, config, logger, common } from '../utils/index.js'
 import { render, HttpRenderer, Wormhole, RenderClient } from '../render/index.js'
 import { AdapterOneBot11 } from '../adapter/onebot/onebot11.js'
+import { KritorGrpc } from '../adapter/index.js'
 export const server = new (class Server {
   reg
   list
@@ -28,8 +29,10 @@ export const server = new (class Server {
      */
   async init () {
     try {
-      // 防止多进程端口冲突 启动失败
+      /** 防止多进程端口冲突 启动失败 */
       await Process.check()
+      /** 初始化gRPC服务器 */
+      new KritorGrpc().init()
       this.WebSocketServer.on('connection', (socket, request) => {
         const path = request.url
         const headers = request.headers

package/lib/db/redis.js

@@ -37,7 +37,7 @@ class Redis {
     }
     /** 第一次连接失败尝试拉起 windows直接降级 */
     if (process.platform === 'win32') {
-      logger.error(`Redis 建立连接失败：${logger.red(data)}`)
+      // logger.info(`Redis 建立连接失败：${data}`)
       return await this.LevelDB()
     }
     this.RunCmd = 'redis-server --save 900 1 --save 300 10 --daemonize yes' + (await this.aarch64())
@@ -50,10 +50,10 @@ class Redis {
         logger.info('Redis 连接成功')
         return data
       }
-      logger.error(`Redis 二次建立连接失败：${logger.red(data)}`)
+      logger.warn(`Redis 二次建立连接失败：${logger.red(data)}`)
       return false
     } catch (error) {
-      logger.error(`Redis 启动失败：${logger.red(data)}`)
+      logger.warn(`Redis 启动失败：${logger.red(data)}`)
       return await this.LevelDB()
     }
   }
@@ -63,9 +63,8 @@ class Redis {
      */
   async LevelDB () {
     try {
-      logger.mark(logger.red('正在降级为 LevelDB 代替 Redis 只能使用基础功能'))
+      logger.info('使用LevelDB代替Redis实现基础Api')
       const redis = new RedisLevel()
-      logger.info('LevelDB 降级成功')
       return redis
     } catch (error) {
       logger.error('降级为 LevelDB 失败')

package/lib/types/adapter.d.ts

@@ -43,6 +43,10 @@ export interface KarinAdapter {
      * - 适配器信息
      */
     adapter: {
+        /**
+         * - 适配器注册之后的索引
+         */
+        index: number;
         /**
          * - 适配器ID
          */

package/lib/utils/handler.d.ts

@@ -8,7 +8,7 @@ export declare const handler: {
      * @param index 插件索引
      * @param Class 插件类
      */
-    add(index: string, Class: PluginType | PluginApps): void;
+    add(index: string, Class: PluginType | PluginApps): Promise<void>;
     /**
      * 删除事件处理器
      * 如果不传参数则删除所有处理器

package/lib/utils/handler.js

@@ -10,7 +10,7 @@ export const handler = new (class EventHandler {
      * @param index 插件索引
      * @param Class 插件类
      */
-  add (index, Class) {
+  async add (index, Class) {
     lodash.forEach(Class.handler, val => {
       if (!val.key) { logger.error(`[Handler][Add]: [${Class.name}] 缺少 key`) }
       if (!val.fnc) { logger.error(`[Handler][Add]: [${Class.name}] 缺少 fnc`) }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.6.9",
+  "version": "0.6.11",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",
@@ -36,7 +36,7 @@
   ],
   "scripts": {
     "app": "node .",
-    "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json && npm run fix && npm run cp",
+    "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json && npm run cp && npm run fix",
     "cp": "cp ./lib/modules.d.ts ./modules.d.ts && cp ./lib/modules.js ./modules.js",
     "delete": "pm2 delete ./config/config/pm2.yaml",
     "dev": "tsx ./lib/index.js --dev",