node-karin 0.6.21 → 0.6.23

package/lib/core/plugin.app.js

@@ -1,4 +1,3 @@
-import { EventType } from '../types/index.js'
 export default function PluginApp (options) {
   return {
     file: {
@@ -8,7 +7,7 @@ export default function PluginApp (options) {
       Fnc: options?.file?.fnc || '',
     },
     name: options.name || '',
-    event: options.event || EventType.Message,
+    event: options.event || 'message' /* EventType.Message */,
     priority: options.priority || 10000,
     accept: options.accept ?? false,
     rule: options.rule || [],

package/lib/core/plugin.js

@@ -1,4 +1,3 @@
-import { EventType } from '../types/index.js'
 /**
  * 插件基类
  */
@@ -48,7 +47,7 @@ export class Plugin {
      * @param timeout - 上下文超时
      */
   timeout
-  constructor ({ name, dsc = name, desc = name, event = EventType.Message, priority = 10000, task = [], rule = [], handler = [], button = [] }) {
+  constructor ({ name, dsc = name, desc = name, event = 'message' /* EventType.Message */, priority = 10000, task = [], rule = [], handler = [], button = [] }) {
     this.name = name
     this.dsc = dsc
     this.desc = desc

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

@@ -71,6 +71,12 @@ declare class PluginLoader {
         dir: dirName;
         name?: fileName;
     }>;
+    /**
+     * - 所有插件包package.json
+     */
+    pkgJson: {
+        [key: string]: any;
+    };
     constructor();
     /**
      * 插件初始化
@@ -79,16 +85,7 @@ declare class PluginLoader {
     /**
      * 获取所有插件
      */
-    getPlugins(): void;
-    /**
-     * 传入路径 语言环境 返回加载index.ts 还是 index.js
-     * @param path - 插件路径
-     * @param lang - 语言环境
-     */
-    getIndex(path: string, dir: dirName, lang: 'js' | 'ts'): {
-        dir: dirName;
-        name: fileName;
-    } | false;
+    getPlugins(): `karin-plugin-${string}`[];
     /**
      * 获取指定文件夹下的所有插件
      * @param dir - 插件包名称
@@ -143,12 +140,6 @@ declare class PluginLoader {
      * 监听文件夹更新
      */
     watchDir(dir: dirName): Promise<true | undefined>;
-    watcAdd(dir: dirName, name: fileName): Promise<boolean | undefined>;
-    /**
-     * 传入文件名称 返回是否符合当前环境规则
-     * @param name - 文件名称
-     */
-    isApp(name: fileName): boolean;
 }
 /**
  * 加载插件

package/lib/core/plugin.loader.js

@@ -7,7 +7,6 @@ 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'
-import { Permission } from '../types/index.js'
 class PluginLoader {
   dir
   dirPath
@@ -59,6 +58,10 @@ class PluginLoader {
      * - 热更新列表
      */
   watchList
+  /**
+     * - 所有插件包package.json
+     */
+  pkgJson
   constructor () {
     this.index = 0
     this.dir = './plugins'
@@ -74,6 +77,7 @@ class PluginLoader {
     this.acceptIds = []
     this.buttonIds = []
     this.handlerIds = {}
+    this.pkgJson = {}
   }
 
   /**
@@ -125,67 +129,63 @@ class PluginLoader {
         continue
       }
       /** package */
-      const pack = common.readJson(`${PluginPath}/package.json`)
-      /** 旧版本入口文件 */
-      const index = this.getIndex(PluginPath, dir, process.env.karin_app_lang)
-      if (index) {
-        this.FileList.push({ dir: index.dir, name: index.name })
-        this.isDev && this.watchList.push({ dir: index.dir, name: index.name })
-      }
-      /** 新版本入口 */
-      if (pack.main) {
-        const { dir: dirName, pop } = common.splitPath(pack.main)
+      const pkg = common.readJson(`${PluginPath}/package.json`)
+      /** 缓存package.json */
+      this.pkgJson[dir] = pkg
+      /** 入口文件 */
+      if (pkg.main) {
+        const { dir: dirName, pop } = common.splitPath(pkg.main)
         const dirPath = `${dir}/${dirName}`
-        this.FileList.push({ dir: dirPath, name: pop })
-        this.isDev && this.watchList.push({ dir: dirPath, name: pop })
-      }
-      /** 检查是否存在karin.apps */
-      const outDir = (pack?.karin?.outDir || 'dist')
-      if (pack && pack?.karin?.apps) {
-        const cfg = pack.karin.apps
-        if (Array.isArray(cfg)) {
-          cfg.forEach((apps) => {
-            /** 路径不存在跳过 */
-            if (!common.isDir(`${PluginPath}/${apps}`)) { return }
-            this.getApps((`${dir}/${apps}`), this.isTs)
-          })
+        if (common.exists(`${this.dir}/${dirPath}/${pop}`)) {
+          this.FileList.push({ dir: dirPath, name: pop })
+          this.isDev && this.watchList.push({ dir: dirPath, name: pop })
+        } else {
+          logger.debug(`[插件收集][${pkg.main}] 入口文件不存在，已忽略`)
+        }
+      } else {
+        /** 没有配置入口默认为index.js */
+        if (common.exists(`${PluginPath}/index.js`)) {
+          this.FileList.push({ dir, name: 'index.js' })
+          this.isDev && this.watchList.push({ dir, name: 'index.js' })
         }
       }
-      /** ts环境 全部加载  如果存在编译产物 则不加载ts */
-      if (this.isTs) {
-        /** 编译产物 存在不加载ts */
-        if (common.exists(`${PluginPath}/${outDir}/apps`)) {
-          this.getApps((`${dir}/${outDir}/apps`), false)
+      /** 全部apps路径 */
+      const apps = ['apps']
+      if (pkg?.karin?.apps && Array.isArray(pkg.karin.apps)) { apps.push(...pkg.karin.apps) }
+      /** js环境 或 ts环境、js插件 */
+      if (!this.isTs || !common.exists(`${PluginPath}/tsconfig.json`)) {
+        apps.forEach((apps) => {
+          /** 路径存在才加载 */
+          if (common.isDir(`${PluginPath}/${apps}`)) {
+            this.getApps((`${dir}/${apps}`), false, this.isDev)
+          } else {
+            logger.debug(`[插件收集][${dir}/${apps}] 路径不存在，已忽略`)
+          }
+        })
+        continue
+      }
+      /** ts环境 ts插件 */
+      const outDir = pkg?.karin?.outDir || 'lib'
+      const rootDir = pkg?.karin?.rootDir || 'src'
+      /** 编译产物存在 */
+      if (common.exists(`${PluginPath}/${outDir}/apps`)) {
+        this.getApps((`${dir}/${outDir}/apps`), true, this.isDev)
+        continue
+      } else {
+        /** 入口文件 */
+        if (common.exists(`${PluginPath}/${rootDir}/index.ts`)) {
+          this.FileList.push({ dir, name: 'index.ts' })
+          this.isDev && this.watchList.push({ dir, name: 'index.ts' })
           continue
         }
-        /** ts */
-        if (common.exists(`${PluginPath}/src/apps`)) {
-          this.getApps((`${dir}/src/apps`), true)
+        /** ts源码 */
+        if (common.exists(`${PluginPath}/${rootDir}/apps`)) {
+          this.getApps((`${dir}/${rootDir}/apps`), true, this.isDev)
           continue
         }
       }
-      /** js环境 */
-      if (common.isDir(`${PluginPath}/apps`)) { this.getApps(`${dir}/apps`, false) }
-      /** 这里需要判断下 不然ts环境下会重复加载 */
-      if (!this.isTs && common.isDir(`${PluginPath}/${outDir}/apps`)) { this.getApps(`${dir}/${outDir}/apps`, false) }
     }
-  }
-
-  /**
-     * 传入路径 语言环境 返回加载index.ts 还是 index.js
-     * @param path - 插件路径
-     * @param lang - 语言环境
-     */
-  getIndex (path, dir, lang) {
-    const isJS = common.exists(`${path}/index.js`)
-    if (isJS && lang === 'js') {
-      return { dir, name: 'index.js' }
-    }
-    const isTS = common.exists(`${path}/src/index.ts`)
-    if (isTS && lang === 'ts') {
-      return { dir: `${dir}/src`, name: 'index.ts' }
-    }
-    return false
+    return plugins
   }
 
   /**
@@ -258,7 +258,10 @@ class PluginLoader {
         const index = this.index
         this.index++
         if (typeof App === 'object' && App?.file?.type === 'function') {
-          if (!App?.name) { return logger.error(`[${dir}][${name}] 插件名称错误`) }
+          if (!App?.name) {
+            logger.error(`[${dir}][${name}] 插件名称错误`)
+            return false
+          }
           App.file.dir = dir
           App.file.name = name
           App.rule.forEach((v, index) => {
@@ -271,9 +274,12 @@ class PluginLoader {
           if (App.accept) { this.acceptIds.push(index) }
           return true
         }
-        if (typeof App !== 'function' || !App?.prototype?.constructor) { return }
+        if (typeof App !== 'function' || !App?.prototype?.constructor) { return false }
         const Class = new App()
-        if (!Class.name) { return logger.error(`[${dir}][${name}] 插件名称错误`) }
+        if (!Class.name) {
+          logger.error(`[${dir}][${name}] 插件名称错误`)
+          return false
+        }
         logger.debug(`载入插件 [${name}][${Class.name}]`)
         this.PluginList[index] = PluginApp({
           file: { dir, name, type: 'class', fnc: App },
@@ -291,7 +297,7 @@ class PluginLoader {
         return true
       })
       await Promise.all(list)
-      // rule收集并排序
+      /** 建立对应的规则索引并排序 */
       if (isOrderBy) { this.orderBy() }
       return true
     } catch (error) {
@@ -322,7 +328,7 @@ class PluginLoader {
         reg: val.reg instanceof RegExp ? val.reg : new RegExp(val.reg),
         fnc: val.fnc,
         event: val.event,
-        permission: val.permission || Permission.All,
+        permission: val.permission || 'all' /* Permission.All */,
         log: val.log === false ? (id, log) => logger.debug('mark', id, log) : (id, log) => logger.bot('mark', id, log),
       })
     })
@@ -450,8 +456,7 @@ class PluginLoader {
       /** 卸载 */
       this.uninstallApp(dir, name)
       /** 载入插件 */
-      const res = await this.createdApp(dir, name, true)
-      if (!res) { return }
+      await this.createdApp(dir, name, true)
       logger.mark(`[修改插件][${dir}][${name}]`)
     })
     /** 监听删除 */
@@ -460,6 +465,8 @@ class PluginLoader {
       this.uninstallApp(dir, name)
       this.watcher.delete(`${dir}.${name}`)
       logger.mark(`[卸载插件][${dir}][${name}]`)
+      /** 卸载之后停止监听 */
+      watcher.close()
     })
     this.watcher.set(`${dir}.${name}`, watcher)
   }
@@ -471,60 +478,40 @@ class PluginLoader {
     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)
+    await common.sleep(1000)
+    watcher.on('add', async (_path) => {
+      /** 排除掉不符合规则文件新增 */
+      const ext = this.isTs ? ['.js', '.ts'] : ['.js']
+      if (!ext.some(ext => _path.endsWith(ext))) { return }
+      const name = path.basename(_path)
+      await this.createdApp(dir, name, true)
+      logger.mark(`[新增插件][${dir}][${name}]`)
+      return true
+    })
+    watcher.on('change', async (_path) => {
+      /** 排除掉不符合规则文件新增 */
+      const ext = this.isTs ? ['.js', '.ts'] : ['.js']
+      if (!ext.some(ext => _path.endsWith(ext))) { return }
+      const name = path.basename(_path)
+      /** 卸载 */
+      this.uninstallApp(dir, name)
+      /** 载入插件 */
+      await this.createdApp(dir, name, true)
+      logger.mark(`[修改插件][${dir}][${name}]`)
+      return true
+    })
+    watcher.on('unlink', async (_path) => {
+      /** 排除掉不符合规则文件新增 */
+      const ext = this.isTs ? ['.js', '.ts'] : ['.js']
+      if (!ext.some(ext => _path.endsWith(ext))) { return }
+      const name = path.basename(_path)
+      /** 卸载 */
+      this.uninstallApp(dir, name)
+      logger.mark(`[卸载插件][${dir}][${name}]`)
+      return true
+    })
     /** 这里需要检查一下是否已经存在，已经存在就关掉之前的监听 */
+    const isExist = this.watcher.get(dir)
     if (isExist) {
       isExist.close()
       this.watcher.delete(dir)
@@ -532,39 +519,6 @@ 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
-  }
 }
 /**
  * 加载插件

package/lib/core/process.js

@@ -51,17 +51,17 @@ export default class Process {
      * 检查后台进程
      */
   static async check () {
-    const host = `http://localhost:${config.Server.http.port}/api`
+    const host = `http://127.0.0.1:${config.Server.http.port}/api`
     /**
          * 使用api来检查后台
          */
-    const res = await common.axios(host + '/info', 'get', { timeout: 100 })
+    const res = await common.axios(host + '/pm2', 'get', { timeout: 100 })
     if (!res) { return this }
     logger.mark(logger.red('检测到后台进程 正在关闭'))
     /** 发退出信号 */
     await common.axios(host + '/exit', 'get', { timeout: 10 })
     for (let i = 0; i < 50; i++) {
-      const res = await common.axios(host + '/info', 'get', { timeout: 100 })
+      const res = await common.axios(host + '/pm2', 'get', { timeout: 100 })
       /** 请求成功继续循环 */
       if (res) { continue }
       /** 请求异常即代表后台进程已关闭 */

package/lib/core/server.js

@@ -53,14 +53,11 @@ export const server = new (class Server {
         }
       })
       /** GET接口 - 获取当前启动信息 */
-      this.app.get('/api/info', (req, res) => {
+      this.app.get('/api/pm2', (req, res) => {
         /** 只允许本机ip访问 */
         if (req.hostname === 'localhost' || req.hostname === '127.0.0.1') {
           const data = {
-            start: process.env.pm_id ? 'pm2' : 'node',
-            start_time: process.uptime().toFixed(2),
-            memory: (process.memoryUsage().heapUsed / 1024 / 1024).toFixed(2),
-            time: Date.now(),
+            pm2_id: process.env.pm_id || '',
           }
           res.json(data)
         }

package/lib/event/notice.handler.js

@@ -1,7 +1,6 @@
 import { review } from './review.handler.js'
 import EventHandler from './event.handler.js'
 import { logger, config } from '../utils/index.js'
-import { NoticeSubType } from '../types/index.js'
 import { pluginLoader } from '../core/index.js'
 /**
  * 通知事件
@@ -85,48 +84,48 @@ export default class NoticeHandler extends EventHandler {
   raw_message () {
     switch (this.e.sub_event) {
       /** 好友头像戳一戳 */
-      case NoticeSubType.PrivatePoke: {
+      case 'private_poke' /* NoticeSubType.PrivatePoke */: {
         this.e.raw_message = '[好友戳一戳]: 戳了你一下'
         break
       }
       /** 好友消息撤回 */
-      case NoticeSubType.PrivateRecall: {
+      case 'private_recall' /* NoticeSubType.PrivateRecall */: {
         this.e.raw_message = `[好友消息撤回]: ${this.e.content.message_id}`
         break
       }
       /** 私聊文件上传 */
-      case NoticeSubType.PrivateFileUploaded: {
+      case 'private_file_uploaded' /* NoticeSubType.PrivateFileUploaded */: {
         const content = this.e.content
         const { file_url } = content
         this.e.raw_message = `[私聊文件上传]: ${file_url}`
         break
       }
       /** 群头像戳一戳 */
-      case NoticeSubType.GroupPoke: {
+      case 'group_poke' /* NoticeSubType.GroupPoke */: {
         const { operator_uid, operator_uin, target_uid, target_uin } = this.e.content
         this.e.raw_message = `[群戳一戳]: ${operator_uid || operator_uin} 戳了戳 ${target_uid || target_uin}`
         break
       }
       /** 群消息撤回 */
-      case NoticeSubType.GroupRecall: {
+      case 'group_recall' /* NoticeSubType.GroupRecall */: {
         const { operator_uid, operator_uin, message_id } = this.e.content
         this.e.raw_message = `[群消息撤回]: ${operator_uid || operator_uin} 撤回了一条消息 ${message_id}`
         break
       }
       /** 群文件上传 */
-      case NoticeSubType.GroupFileUploaded: {
+      case 'group_file_uploaded' /* NoticeSubType.GroupFileUploaded */: {
         const { file_url, operator_uid, operator_uin } = this.e.content
         this.e.raw_message = `[群文件上传]: ${operator_uid || operator_uin} 上传了 ${file_url}`
         break
       }
       /** 群成员增加 */
-      case NoticeSubType.GroupMemberIncrease: {
+      case 'group_member_increase' /* NoticeSubType.GroupMemberIncrease */: {
         const { operator_uid, operator_uin, target_uid, target_uin, type } = this.e.content
         this.e.raw_message = `[群成员新增]: ${operator_uid || operator_uin} ${type === 'invite' ? '邀请' : '同意'}  ${target_uid || target_uin} 加入群聊`
         break
       }
       /** 群成员减少 */
-      case NoticeSubType.GroupMemberDecrease: {
+      case 'group_member_decrease' /* NoticeSubType.GroupMemberDecrease */: {
         switch (this.e.content.type) {
           case 'leave': {
             const { target_uid, target_uin } = this.e.content
@@ -149,49 +148,49 @@ export default class NoticeHandler extends EventHandler {
         break
       }
       /** 群管理员变动 */
-      case NoticeSubType.GroupAdminChanged: {
+      case 'group_admin_changed' /* NoticeSubType.GroupAdminChanged */: {
         const { target_uid, target_uin, is_admin } = this.e.content
         this.e.raw_message = `[群管理员变动]: ${target_uid || target_uin} 被${is_admin ? '设置' : '取消'}群管理员`
         break
       }
       /** 群成员被禁言 */
-      case NoticeSubType.GroupMemberBan: {
+      case 'group_member_ban' /* NoticeSubType.GroupMemberBan */: {
         const { operator_uid, operator_uin, target_uid, target_uin, type } = this.e.content
         this.e.raw_message = `[群成员禁言]: ${operator_uid || operator_uin} ${type === 'ban' ? '禁言' : '解禁'}了 ${target_uid || target_uin}`
         break
       }
       /** 群签到 */
-      case NoticeSubType.GroupSignIn: {
+      case 'group_sign_in' /* NoticeSubType.GroupSignIn */: {
         const { target_uid, target_uin } = this.e.content
         this.e.raw_message = `[群签到]: ${target_uid || target_uin}`
         break
       }
       /** 群全员禁言 */
-      case NoticeSubType.GroupWholeBan: {
+      case 'group_whole_ban' /* NoticeSubType.GroupWholeBan */: {
         const { operator_uid, operator_uin, is_ban } = this.e.content
         this.e.raw_message = `[群全员禁言]: ${operator_uid || operator_uin} ${is_ban ? '开启全员禁言' : '解除全员禁言'}`
         break
       }
       /** 群名片改变 */
-      case NoticeSubType.GroupCardChanged: {
+      case 'group_card_changed' /* NoticeSubType.GroupCardChanged */: {
         const { operator_uid, operator_uin, target_uid, target_uin, new_card } = this.e.content
         this.e.raw_message = `[群名片改变]: ${operator_uid || operator_uin} 修改了 ${target_uid || target_uin} 的名片为 ${new_card}`
         break
       }
       /** 群成员专属头衔改变 */
-      case NoticeSubType.GroupMemberUniqueTitleChanged: {
+      case 'group_member_unique_title_changed' /* NoticeSubType.GroupMemberUniqueTitleChanged */: {
         const { target_uid, target_uin, title } = this.e.content
         this.e.raw_message = `[群头衔更改]: ${target_uid || target_uin} 的专属头衔改变为 ${title}`
         break
       }
       /** 群精华消息改变 */
-      case NoticeSubType.GroupEssenceChanged: {
+      case 'group_essence_changed' /* NoticeSubType.GroupEssenceChanged */: {
         const { operator_uid, operator_uin, target_uid, target_uin, message_id, is_set } = this.e.content
         this.e.raw_message = `[群精华消息]: ${operator_uid || operator_uin} ${is_set ? `将${target_uid || target_uin}的消息${message_id}设置为精华消息` : `取消了${target_uid || target_uin}精华消息 ${message_id}`}`
         break
       }
       /** 群表情回应 */
-      case NoticeSubType.GroupMessageReaction: {
+      case 'group_message_reaction' /* NoticeSubType.GroupMessageReaction */: {
         const { message_id, face_id } = this.e.content
         this.e.raw_message = `[群表情回应]: ${this.e.user_id} 给消息 ${message_id} 回应了一个${face_id}的表情`
         break

package/lib/event/request.handler.js

@@ -1,7 +1,6 @@
 import { review } from './review.handler.js'
 import EventHandler from './event.handler.js'
 import { logger, config } from '../utils/index.js'
-import { RequestSubType } from '../types/index.js'
 import { pluginLoader } from '../core/index.js'
 /**
  * 请求事件
@@ -85,19 +84,19 @@ export default class RequestHandler extends EventHandler {
   raw_message () {
     switch (this.e.sub_event) {
       /** 好友申请 */
-      case RequestSubType.PrivateApply: {
+      case 'private_apply' /* RequestSubType.PrivateApply */: {
         const { applier_uid, applier_uin, message } = this.e.content
         this.e.raw_message = `[好友申请]: ${applier_uid || applier_uin} 申请理由: ${message}`
         break
       }
       /** 群申请 */
-      case RequestSubType.GroupApply: {
+      case 'group_apply' /* RequestSubType.GroupApply */: {
         const { group_id, applier_uid, applier_uin, inviter_uid, inviter_uin, reason } = this.e.content
         this.e.raw_message = `[群申请]: ${group_id} 申请人: ${applier_uid || applier_uin} 邀请人: ${inviter_uid || inviter_uin} 理由: ${reason}`
         break
       }
       /** 邀请入群 */
-      case RequestSubType.InvitedGroup: {
+      case 'invited_group' /* RequestSubType.InvitedGroup */: {
         const { group_id, inviter_uid, inviter_uin } = this.e.content
         this.e.raw_message = `[邀请入群]: ${group_id} 邀请人: ${inviter_uid || inviter_uin}`
         break

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

@@ -1,7 +1,7 @@
 /**
  * - 事件来源枚举
  */
-export declare enum Scene {
+export declare const enum Scene {
     Group = "group",
     Private = "friend",
     Guild = "guild",

package/lib/types/event/contact.js

@@ -1,13 +1 @@
-/* eslint-disable no-unused-vars */
-/**
- * - 事件来源枚举
- */
-export var Scene;
-(function (Scene) {
-    Scene["Group"] = "group";
-    Scene["Private"] = "friend";
-    Scene["Guild"] = "guild";
-    Scene["Nearby"] = "nearby";
-    Scene["Stranger"] = "stranger";
-    Scene["StrangerFromGroup"] = "stranger_from_group";
-})(Scene || (Scene = {}));
+export {};