node-karin 0.2.1 → 0.3.0

package/lib/core/plugin.loader.js

@@ -1,21 +1,43 @@
 import fs from 'fs'
 import path from 'path'
 import lodash from 'lodash'
+import chokidar from 'chokidar'
 import schedule from 'node-schedule'
 import { listener } from './listener.js'
 import PluginApp from './plugin.app.js'
-import { render } from '../renderer/index.js'
-import { button, common, handler, logger } from '../utils/index.js'
+import { render } from '../render/index.js'
+import { common, handler, logger } from '../utils/index.js'
 /**
  * 加载插件
  */
-export const PluginLoader = new (class PluginLoader {
+export const pluginLoader = new (class PluginLoader {
   dir
   dirPath
+  /**
+     * - 插件索引ID
+     */
+  index
+  /**
+     * - 命令插件索引列表
+     */
+  ruleIds
+  buttonIds
+  /**
+     * - handler
+     */
+  handlerIds
   /**
      * - 插件列表
      */
-  Apps
+  FileList
+  /**
+     * - 是否ts环境
+     */
+  isTs
+  /**
+     * - 最终缓存的插件列表 通过index索引
+     */
+  PluginList
   /**
      * - 定时任务
      */
@@ -28,59 +50,40 @@ export const PluginLoader = new (class PluginLoader {
      * - 热更新列表
      */
   watchList
-  /**
-     * - 插件索引ID
-     */
-  index
-  /**
-     * - 命令插件索引列表
-     */
-  rule
-  PluginList
   constructor () {
+    this.index = 0
     this.dir = './plugins'
     this.dirPath = common.urlToPath(import.meta.url)
-    this.Apps = []
-    this.task = []
+    this.isTs = process.env.karin_app_lang === 'ts'
     this.watcher = new Map()
-    /** 热更新收集 */
     this.watchList = []
-    this.rule = []
-    this.index = 0
+    this.FileList = []
     this.PluginList = {}
+    this.task = []
+    this.ruleIds = []
+    this.buttonIds = []
+    this.handlerIds = {}
   }
 
   /**
      * 插件初始化
      */
   async load () {
-    const files = this.getPlugins()
-    listener.once('plugin.loader', () => {
-      for (const v of this.watchList) {
-        v.name ? this.watch(v.dir, v.name) : this.watchDir(v.dir)
-      }
+    this.getPlugins()
+    listener.once('plugin.watch', () => {
+      for (const v of this.watchList) { v.name ? this.watch(v.dir, v.name) : this.watchDir(v.dir) }
     })
     logger.info(logger.green('-----------'))
     logger.info('加载插件中..')
     /** 载入插件 */
-    const promises = files.map(async ({ dir, name }) => await this.createdApp(dir, name, false))
+    const promises = this.FileList.map(async ({ dir, name }) => await this.createdApp(dir, name, false))
     /** 等待所有插件加载完成 */
     await Promise.all(promises)
-    const handlerKeys = Object.keys(handler.events)
-    let handlerCount = 0
-    handlerKeys.forEach((key) => {
-      handlerCount += handler.events[key].length
-    })
-    logger.info(`[按钮][${button.Apps.length}个] 加载完成`)
-    logger.info(`[插件][${this.Apps.length}个] 加载完成`)
-    logger.info(`[渲染器][${render.Apps.length}个] 加载完成`)
-    logger.info(`[定时任务][${this.task.length}个] 加载完成`)
-    logger.info(`[Handler][Key:${handlerKeys.length}个][fnc:${handlerCount}个] 加载完成`)
-    logger.info(logger.green('-----------'))
-    logger.info(`Karin启动完成：耗时 ${logger.green(process.uptime().toFixed(2))} 秒...`)
-    /** 优先级排序 */
-    this.orderBy()
-    listener.emit('plugin.loader')
+    /** 释放缓存 */
+    this.FileList = []
+    /** 优先级排序并打印插件信息 */
+    this.orderBy(true)
+    listener.emit('plugin.watch')
     return this
   }
 
@@ -88,51 +91,69 @@ export const PluginLoader = new (class PluginLoader {
      * 获取所有插件
      */
   getPlugins () {
-    const Apps = []
     /** 获取所有插件包 */
     const plugins = common.getPlugins()
-    const isTs = process.env.karin_app_lang === 'ts'
     for (const dir of plugins) {
       /**
              * - 插件包路径
              * - 例如: ./plugins/karin-plugin-example
              */
       const PluginPath = `${this.dir}/${dir}`
-      // 非插件包
+      /**
+             * 一共3种模式
+             * 1. npm run dev 开发模式  直接加载ts，js文件，对于同时存在编译产物、源代码的情况，优先加载编译产物而不加载源代码
+             * 2. node . 生产模式  只加载js文件
+             * 3. npm run debug 调试模式 在2的基础上，对apps进行热更新
+             */
+      /** 非插件包 加载该文件夹下全部js 视语言环境加载ts */
       if (!common.isPlugin(PluginPath)) {
-        const list = fs.readdirSync(`${this.dir}/${dir}`, {
-          withFileTypes: true,
-        })
+        this.watchList.push({ dir })
+        const list = fs.readdirSync(`${this.dir}/${dir}`, { withFileTypes: true })
         for (const file of list) {
           /** 忽略不符合规则的文件 */
-          const ext = isTs ? ['.js', '.ts'] : ['.js']
+          const ext = this.isTs ? ['.js', '.ts'] : ['.js']
           if (!ext.includes(path.extname(file.name))) { continue }
-          Apps.push({ dir, name: file.name })
+          this.FileList.push({ dir, name: file.name })
         }
+        continue
       }
-      /** js环境 */
-      if (common.exists(`${PluginPath}/index.js`)) {
-        Apps.push({ dir, name: 'index.js' })
+      /** 入口文件 */
+      const index = this.getIndex(PluginPath, process.env.karin_app_lang)
+      if (index) {
+        this.watchList.push({ dir, name: index })
+        this.FileList.push({ dir, name: index })
       }
-      const appList = ['apps', 'dist/apps']
-      appList.forEach(app => {
-        if (common.isDir(`${PluginPath}/${app}`)) {
-          const result = this.getApps((`${dir}/${app}`))
-          Apps.push(...result)
-        }
-      })
-      /** ts环境 */
-      if (isTs) {
-        if (common.exists(`${PluginPath}/index.ts`)) {
-          Apps.push({ dir, name: 'index.ts' })
+      /** ts环境 全部加载  如果存在编译产物 则不加载ts */
+      if (this.isTs) {
+        /** 编译产物 存在不加载ts */
+        if (common.exists(`${PluginPath}/dist/apps`)) {
+          this.getApps((`${dir}/dist/apps`), false)
+          continue
         }
-        if (common.isDir(`${PluginPath}/src/apps`)) {
-          const result = this.getApps((`${dir}/src/apps`), true)
-          Apps.push(...result)
+        /** ts */
+        if (common.exists(`${PluginPath}/src/apps`)) {
+          this.getApps((`${dir}/src/apps`), true)
+          continue
         }
       }
+      /** js环境 */
+      if (common.isDir(`${PluginPath}/apps`)) { this.getApps(`${dir}/apps`, false) }
+      /** 这里需要判断下 不然ts环境下会重复加载 */
+      if (!this.isTs && common.isDir(`${PluginPath}/dist/apps`)) { this.getApps(`${dir}/dist/apps`, false) }
     }
-    return Apps
+  }
+
+  /**
+     * 传入路径 语言环境 返回加载index.ts 还是 index.js
+     * @param path - 插件路径
+     * @param lang - 语言环境
+     */
+  getIndex (path, lang) {
+    const isJS = common.exists(`${path}/index.js`)
+    if (isJS && lang === 'js') { return 'index.js' }
+    const isTS = common.exists(`${path}/index.ts`)
+    if (isTS && lang === 'ts') { return 'index.ts' }
+    return false
   }
 
   /**
@@ -140,66 +161,49 @@ export const PluginLoader = new (class PluginLoader {
      * @param dir - 插件包名称
      * @param isTs - 是否获取ts插件
      */
-  getApps (dir, isTs = false) {
-    const info = []
+  getApps (dir, isTs) {
+    this.watchList.push({ dir })
     const ext = isTs ? ['.js', '.ts'] : ['.js']
     const list = fs.readdirSync(`${this.dir}/${dir}`, { withFileTypes: true })
     for (const file of list) {
-      // 获取后缀
       const extname = path.extname(file.name)
       if (!ext.includes(extname)) { continue }
-      info.push({ dir, name: file.name })
+      this.FileList.push({ dir, name: file.name })
     }
-    return info
   }
 
   /**
-     * 构建插件信息
-     */
-  App (
-    /**
-     * - 插件Class 未实例化
-     */
-    App,
-    /**
-     * - 插件实例化后的Class
-     */
-    Class,
-    /**
-     * - 插件文件信息
+     * 排序并打印插件加兹安信息
+     * @param isPrint - 是否打印
      */
-    file) {
-    const info = {
-      App,
-      /** 插件文件信息 */
-      file,
-      name: Class.name,
-      desc: Class.dsc || Class.desc || Class.name,
-      event: Class.event || 'message',
-      priority: Class.priority ?? 5000,
-      accept: typeof Class.accept === 'function',
-      rule: Class.rule || [],
-      type: typeof App === 'function' ? 'function' : 'class',
-      task: Class.task || [],
-      handler: Class.handler || [],
-      button: Class.button || [],
-    }
-    /** 进一步处理rule */
-    info.rule.forEach((val, index) => {
-      info.rule[index].reg = new RegExp(val.reg)
-      info.rule[index].log = val.log === false ? (id, log) => logger.debug('mark', id, log) : (id, log) => logger.bot('mark', id, log)
-    })
-    return info
-  }
-
-  /** 排序 */
-  orderBy () {
-    const list = []
+  orderBy (isPrint = false) {
+    let taskCount = 0
+    let handlerCount = 0
+    const rule = []
+    const button = []
     Object.keys(this.PluginList).forEach(key => {
-      list.push({ key, val: this.PluginList[key].priority })
+      taskCount += this.PluginList[key].task.length
+      if (this.PluginList[key].rule.length) { rule.push({ key, val: this.PluginList[key].priority }) }
+      if (this.PluginList[key].button.length) { button.push({ key, val: this.PluginList[key].priority }) }
     })
-    this.rule = lodash.orderBy(list, ['val'], ['asc']).map((v) => Number(v.key))
+    this.ruleIds = lodash.orderBy(rule, ['val'], ['asc']).map((v) => Number(v.key))
     logger.debug('rule排序完成...')
+    this.buttonIds = lodash.orderBy(button, ['val'], ['asc']).map((v) => Number(v.key))
+    logger.debug('button排序完成...')
+    if (!isPrint) { return }
+    const PluginListKeys = Object.keys(this.PluginList)
+    const handlerKeys = Object.keys(this.handlerIds)
+    handlerKeys.forEach((key) => {
+      handlerCount += this.handlerIds[key].length
+    })
+    logger.info(`[插件][${PluginListKeys.length}个] 加载完成`)
+    logger.info(`[渲染器][${render.Apps.length}个] 加载完成`)
+    logger.info(`[rule][${this.ruleIds.length}个] 加载完成`)
+    logger.info(`[button][${this.buttonIds.length}个] 加载完成`)
+    logger.info(`[定时任务][${taskCount}个] 加载完成`)
+    logger.info(`[Handler][Key:${handlerKeys.length}个][fnc:${handlerCount}个] 加载完成`)
+    logger.info(logger.green('-----------'))
+    logger.info(`Karin启动完成：耗时 ${logger.green(process.uptime().toFixed(2))} 秒...`)
   }
 
   /**
@@ -240,7 +244,7 @@ export const PluginLoader = new (class PluginLoader {
           accept: Class.accept && typeof Class.accept === 'function',
         })
         /** 定时任务 */
-        lodash.forEach(Class.task, (val) => {
+        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({
@@ -266,7 +270,7 @@ export const PluginLoader = new (class PluginLoader {
           })
         })
         /** rule */
-        lodash.forEach(Class.rule, (val) => {
+        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),
@@ -276,6 +280,16 @@ export const PluginLoader = new (class PluginLoader {
             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,
+          })
+        })
+        /** handler */
+        handler.add(index + '', Class)
         /** 执行初始化 */
         Class.init && Class.init()
         this.PluginList[index] = info
@@ -284,9 +298,6 @@ export const PluginLoader = new (class PluginLoader {
         // if (!lodash.isEmpty(Class.handler)) handler.add({ name, dir, App, Class })
         /** 注册按钮 */
         // if (!lodash.isEmpty(Class.button)) button.add({ name, dir, App, Class })
-        /** 收集插件 */
-        // const res = this.App(App, Class, { name, dir, path: `${dir}/${name}` })
-        // this.Apps.push(res)
         return true
       })
       // rule收集并排序
@@ -314,45 +325,15 @@ export const PluginLoader = new (class PluginLoader {
      * 卸载插件
      */
   uninstallApp (dir, name) {
-    this.Apps = this.Apps.filter((v) => !(v.file.dir === dir && v.file.name === name))
-    this.uninstallTask(dir, name)
-    button.del(dir, name)
-    handler.del({ dir, name, key: '' })
-  }
-
-  /** 创建定时任务 */
-  async creatTask () {
-    this.task.forEach((val, index) => {
-      if (val.schedule) { return }
-      val.log = val.log === false ? (log) => logger.debug(log) : (log) => logger.mark(log)
-      val.schedule = schedule.scheduleJob(val.cron, async () => {
-        try {
-          typeof val.log === 'function' && val.log(`[定时任务][${val.file.dir}][${val.name}] 开始执行`)
-          const App = new val.App()
-          await App[val.fnc]()
-          typeof val.log === 'function' && val.log(`[定时任务][${val.file.dir}][${val.name}] 执行完毕`)
-        } catch (error) {
-          logger.error(`[定时任务][${val.file.dir}][${val.name}] 执行报错`)
-          logger.error(error)
-        }
-      })
-      this.task[index] = val
-    })
-  }
-
-  /**
-     * 卸载定时任务
-     */
-  uninstallTask (dir, name) {
-    this.task = this.task.filter((task) => {
-      if (task.file.dir === dir && task.file.name === name) {
-        /** 停止定时任务 */
-        task.schedule && task.schedule.cancel()
-        /** 移除定时任务 */
-        return false
-      }
-      /** 保留定时任务 */
-      return true
+    // this.Apps = this.Apps.filter((v) => !(v.file.dir === dir && v.file.name === name))
+    // this.uninstallTask(dir, name)
+    // button.del(dir, name)
+    // handler.del({ dir, name, key: '' })
+    Object.keys(this.PluginList).forEach(key => {
+      const info = this.PluginList[key]
+      /** 停止定时任务 */
+      info.task.forEach(val => val.schedule?.cancel())
+      info.file.dir === dir && info.file.name === name && delete this.PluginList[key]
     })
   }
 
@@ -360,99 +341,94 @@ export const PluginLoader = new (class PluginLoader {
      * 监听单个文件热更新
      */
   watch (dir, name) {
-    // if (this.watcher.get(`${dir}.${name}`)) return
-    // const file = `./plugins/${dir}/${name}`
-    // const watcher = chokidar.watch(file)
-    // /** 监听修改 */
-    // watcher.on('change', async () => {
-    //   /** 卸载 */
-    //   this.uninstallApp(dir, name)
-    //   /** 载入插件 */
-    //   const res = await this.createdApp(dir, name, true)
-    //   if (!res) return
-    //   logger.mark(`[修改插件][${dir}][${name}]`)
-    // })
+    if (this.watcher.get(`${dir}.${name}`)) { return }
+    const file = `./plugins/${dir}/${name}`
+    const watcher = chokidar.watch(file)
+    /** 监听修改 */
+    watcher.on('change', async () => {
+      /** 卸载 */
+      this.uninstallApp(dir, name)
+      /** 载入插件 */
+      const res = await this.createdApp(dir, name, true)
+      if (!res) { return }
+      logger.mark(`[修改插件][${dir}][${name}]`)
+    })
     /** 监听删除 */
-    // watcher.on('unlink', async () => {
-    //   /** 卸载 */
-    //   this.uninstallApp(dir, name)
-    //   this.watcher.delete(`${dir}.${name}`)
-    //   logger.mark(`[卸载插件][${dir}][${name}]`)
-    // })
-    // this.watcher.set(`${dir}.${name}`, watcher)
+    watcher.on('unlink', async () => {
+      /** 卸载 */
+      this.uninstallApp(dir, name)
+      this.watcher.delete(`${dir}.${name}`)
+      logger.mark(`[卸载插件][${dir}][${name}]`)
+    })
+    this.watcher.set(`${dir}.${name}`, watcher)
   }
 
   /**
      * 监听文件夹更新
      */
-  watchDir (dir) {
-    // if (dir) return
-    //   if (this.watcher.get(dir)) return
-    //   const file = `${this.dir}/${dir}/`
-    //   const watcher = chokidar.watch(file)
-    //   /** 热更新 */
-    //   setTimeout(() => {
-    //     /** 新增文件 */
-    //     watcher.on('add', async filePath => {
-    //       logger.debug(`[热更新][新增插件] ${filePath}`)
-    //       const name = path.basename(filePath) as fileName
-    //       if (!name.endsWith('')) return
-    //       if (!fs.existsSync(`${file}/${name}`)) return
-    //       /** 载入插件 */
-    //       const res = await this.createdApp(dir, name, true)
-    //       if (!res) return
-    //       /** 延迟1秒 等待卸载完成 */
-    //       Common.sleep(1000)
-    //         .then(() => {
-    //           /** 停止整个文件夹监听 */
-    //           watcher.close()
-    //           /** 新增插件之后重新监听文件夹 */
-    //           this.watcher.delete(dir)
-    //           this.watchDir(dir)
-    //           logger.mark(`[新增插件][${dir}][${name}]`)
-    //           return true
-    //         })
-    //         .catch(error => logger.error(error))
-    //     })
-    //     /** 监听修改 */
-    //     watcher.on('change', async PluPath => {
-    //       const name = path.basename(PluPath) as fileName
-    //       if (!name.endsWith('')) return
-    //       if (!fs.existsSync(`${this.dir}/${dir}/${name}`)) return
-    //       /** 卸载 */
-    //       this.uninstallApp(dir, name)
-    //       /** 载入插件 */
-    //       const res = await this.createdApp(dir, name, true)
-    //       if (!res) return
-    //       logger.mark(`[修改插件][${dir}][${name}]`)
-    //     })
-    //     /** 监听删除 */
-    //     watcher.on('unlink', async PluPath => {
-    //       const name = path.basename(PluPath) as fileName
-    //       if (!name.endsWith('')) return
-    //       /** 卸载 */
-    //       this.uninstallApp(dir, name)
-    //       /** 停止监听 */
-    //       watcher.close()
-    //       /** 重新监听文件夹 */
-    //       this.watcher.delete(dir)
-    //       this.watchDir(dir)
-    //       logger.mark(`[卸载插件][${dir}][${name}]`)
-    //     })
-    //   }, 500)
-    //   /** 生成随机数0.5-2秒 */
-    //   const random = Math.floor(Math.random() * 1000) + 500
-    //   Common.sleep(random)
-    //     .then(() => {
-    //       const isExist = this.watcher.get(dir)
-    //       /** 这里需要检查一下是否已经存在，已经存在就关掉之前的监听 */
-    //       if (isExist) {
-    //         isExist.close()
-    //         this.watcher.delete(dir)
-    //       }
-    //       this.watcher.set(dir, watcher)
-    //       return true
-    //     })
-    //     .catch(() => {})
+  async watchDir (dir) {
+    if (this.watcher.get(dir)) { return }
+    const file = `${this.dir}/${dir}/`
+    const watcher = chokidar.watch(file)
+    /** 热更新 */
+    setTimeout(() => {
+      /** 新增文件 */
+      watcher.on('add', async (filePath) => {
+        logger.debug(`[热更新][新增插件] ${filePath}`)
+        const name = path.basename(filePath)
+        /** js环境仅接受js ts接受两者 */
+        if (!this.isTs && !name.endsWith('.js')) { return }
+        if (this.isTs && !name.endsWith('.ts') && !name.endsWith('.js')) { return }
+        if (!fs.existsSync(`${file}/${name}`)) { return }
+        /** 载入插件 */
+        const res = await this.createdApp(dir, name, true)
+        if (!res) { return }
+        /** 延迟1秒 等待卸载完成 */
+        await common.sleep(1000)
+        /** 停止整个文件夹监听 */
+        watcher.close()
+        /** 新增插件之后重新监听文件夹 */
+        this.watcher.delete(dir)
+        this.watchDir(dir)
+        logger.mark(`[新增插件][${dir}][${name}]`)
+        return true
+      })
+      /** 监听修改 */
+      watcher.on('change', async (PluPath) => {
+        const name = path.basename(PluPath)
+        if (!name.endsWith('')) { return }
+        if (!fs.existsSync(`${this.dir}/${dir}/${name}`)) { return }
+        /** 卸载 */
+        this.uninstallApp(dir, name)
+        /** 载入插件 */
+        const res = await this.createdApp(dir, name, true)
+        if (!res) { return }
+        logger.mark(`[修改插件][${dir}][${name}]`)
+      })
+      /** 监听删除 */
+      watcher.on('unlink', async (PluPath) => {
+        const name = path.basename(PluPath)
+        if (!name.endsWith('')) { return }
+        /** 卸载 */
+        this.uninstallApp(dir, name)
+        /** 停止监听 */
+        watcher.close()
+        /** 重新监听文件夹 */
+        this.watcher.delete(dir)
+        this.watchDir(dir)
+        logger.mark(`[卸载插件][${dir}][${name}]`)
+      })
+    }, 500)
+    /** 生成随机数0.5-2秒 */
+    const random = Math.floor(Math.random() * 1000) + 500
+    await common.sleep(random)
+    const isExist = this.watcher.get(dir)
+    /** 这里需要检查一下是否已经存在，已经存在就关掉之前的监听 */
+    if (isExist) {
+      isExist.close()
+      this.watcher.delete(dir)
+    }
+    this.watcher.set(dir, watcher)
+    return true
   }
 })()

package/lib/core/server.js

@@ -5,7 +5,7 @@ import { WebSocketServer } from 'ws'
 import { createServer } from 'http'
 import express from 'express'
 import { exec, config, logger, common } from '../utils/index.js'
-import { render, HttpRenderer, Wormhole } from '../renderer/index.js'
+import { render, HttpRenderer, Wormhole } from '../render/index.js'
 export const server = new (class Server {
   reg
   list

package/lib/db/level.d.ts

@@ -14,5 +14,5 @@ export default class LevelDB extends Level {
      * @param {string} key 键
      * @param {object|string} value 值
      */
-    set(key: string, value: string): Promise<void>;
+    set(key: string, value: string | object): Promise<void>;
 }

package/lib/event/message.handler.js

@@ -2,7 +2,7 @@ import lodash from 'lodash'
 import { review } from './review.handler.js'
 import EventHandler from './event.handler.js'
 import { logger, config } from '../utils/index.js'
-import { listener, stateArr, PluginLoader } from '../core/index.js'
+import { listener, stateArr, pluginLoader } from '../core/index.js'
 /**
  * 消息事件
  */
@@ -39,8 +39,8 @@ export class MessageHandler extends EventHandler {
     /** 上下文 */
     if (await this.context()) { return }
     /* eslint-disable no-labels */
-    a: for (const index of PluginLoader.rule) {
-      const app = PluginLoader.PluginList[index]
+    a: for (const index of pluginLoader.ruleIds) {
+      const app = pluginLoader.PluginList[index]
       /** 判断事件 */
       if (app.event && !this.filtEvent(app.event)) { continue }
       /** 正则匹配 */

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

@@ -1,5 +1,5 @@
 import { KarinMessage } from '../event/index.js';
-import { E, PluginApps, GroupCfg } from '../types/index.js';
+import { EType, PluginApps, GroupCfg } from '../types/index.js';
 /**
  * 事件拦截器
  * 利用可执行函数的特性，热更新所有拦截器
@@ -14,12 +14,12 @@ export declare const review: {
     };
     App: import("../types/index.js").App;
     Config: import("../types/index.js").Config;
-    CD: (e: E, config: GroupCfg) => boolean;
+    CD: (e: EType, config: GroupCfg) => boolean;
     mode: (e: KarinMessage, config: GroupCfg) => boolean;
     alias: (e: KarinMessage, config: GroupCfg) => boolean;
-    GroupEnable: (e: E) => boolean;
-    UserEnable: (e: E) => boolean;
-    GroupMsgPrint: (e: E) => boolean;
+    GroupEnable: (e: EType) => boolean;
+    UserEnable: (e: EType) => boolean;
+    GroupMsgPrint: (e: EType) => boolean;
     PluginEnable: (app: PluginApps, config: GroupCfg) => boolean;
     main(): void;
     /**