node-karin 0.6.28 → 0.7.1

package/README.md

@@ -1,3 +1,5 @@
+![karin](https://socialify.git.ci/karinjs/karin/image?description=1&font=Bitter&forks=1&issues=1&language=1&logo=https%3A%2F%2Favatars.githubusercontent.com%2Fu%2F162426977%3Fs%3D400%26u%3D8ae82fa0321857b24c7ed33a3d0d0d51323d3cfc%26v%3D4&name=1&owner=1&pattern=Plus&pulls=1&stargazers=1&theme=Light)
+
 [![neostandard javascript style](https://img.shields.io/badge/code_style-neostandard-brightgreen?style=flat)](https://github.com/neostandard/neostandard)
 
 [文档](https://karinjs.github.io/Karin/)

package/config/defSet/pm2.yaml

@@ -4,7 +4,7 @@ lines: 1000
 apps:
   - name: "Karin"
     # 入口
-    script: "./lib/index.js"
+    script: "./node_modules/node-karin/lib/index.js"
     # 进程守护
     autorestart: true
     # 每分钟最大重启数量

package/lib/cli/karin.js

@@ -0,0 +1,208 @@
+#!/usr/bin/env node
+import fs from 'fs'
+import path from 'path'
+import yaml from 'yaml'
+import axios from 'axios'
+import { fileURLToPath } from 'url'
+import { program } from 'commander'
+import { exec as execCmd, spawn } from 'child_process'
+class KarinCli {
+  child
+  filename
+  karinDir
+  file
+  constructor () {
+    process.env.karin_app_start_count = '0'
+    /** 当前文件绝对路径 */
+    this.filename = fileURLToPath(import.meta.url)
+    /** karin目录 */
+    this.karinDir = path.join(path.dirname(this.filename), '../..')
+    /** 入口文件(注意后缀) */
+    this.file = path.join(path.dirname(this.filename), '../index')
+    this.child = null
+  }
+
+  /**
+     * 获取pkg
+     */
+  get pkg () {
+    const filePath = path.join(this.karinDir, 'package.json')
+    const data = JSON.parse(fs.readFileSync(filePath, 'utf-8'))
+    return data
+  }
+
+  /**
+     * 获取配置文件路径
+     * @param name - 配置文件名
+     */
+  getConfigPath (name) {
+    const filePath = `./config/config/${name}.yaml`
+    if (!fs.existsSync(filePath)) { return `${this.karinDir}/config/config/${name}.yaml` }
+    return filePath
+  }
+
+  /**
+     * 获取pm2配置
+     * @param name - 配置文件名
+     */
+  getConfigData (name) {
+    const _path = this.getConfigPath(name)
+    const data = yaml.parse(fs.readFileSync(_path, 'utf-8'))
+    return data
+  }
+
+  /**
+     * 启动
+     * @param mode - 模式
+     * @param lang - 语言环境
+     * @param runner - 运行器
+     */
+  start (mode, lang, runner) {
+    process.env.karin_app_mode = mode
+    process.env.karin_app_lang = lang
+    process.env.karin_app_runner = runner
+    let cmd
+    switch (runner) {
+      case 'node' /* Runner.Node */:
+        cmd = [this.file + '.js']
+        break
+      case 'tsx' /* Runner.Tsx */:
+        cmd = [this.file + '.ts']
+        break
+      case 'pm2' /* Runner.Pm2 */: {
+        this.pm2()
+        return
+      }
+    }
+    /** 启动 */
+    this.child = spawn(runner, cmd, { stdio: ['inherit', 'inherit', 'inherit', 'ipc'], cwd: process.cwd(), env: process.env })
+    /** 监听退出 */
+    this.child.once('exit', (code) => process.exit(code))
+    /** 监听子进程消息 */
+    this.child.on('message', (data) => {
+      /** pm2重启 */
+      if (data.env.pm_id) { return this.restart() }
+      try {
+        /** 先结束进程 */
+        this.child.kill('SIGINT')
+        /** 停止监听 */
+        this.child.removeAllListeners()
+        /** 重启次数+1 */
+        const count = Number(process.env.karin_app_start_count) || 0
+        process.env.karin_app_start_count = String(count + 1)
+      } catch { }
+      return this.start(mode, lang, runner)
+    })
+  }
+
+  /**
+     * pm2重启
+     */
+  async restart () {
+    const pm2Cfg = this.getConfigData('pm2')
+    const serverCfg = this.getConfigData('server')
+    /** 尝试获取pm2的进程id */
+    const port = serverCfg?.http?.port || 7000
+    const res = await this.Axios(`http://127.0.0.1:${port}/api/ping`, 1000)
+    if (res) {
+      await this.exec(`pm2 restart ${res.pm2_id}`)
+    } else {
+      await this.exec(`pm2 restart ${pm2Cfg?.apps[0]?.name || 'Karin'}`)
+    }
+    console.log('pm2服务已重启')
+    process.exit(0)
+  }
+
+  /**
+     * pm2启动
+     */
+  async pm2 () {
+    console.log('pm2启动中...')
+    const filePath = this.getConfigPath('pm2')
+    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'
+      if (data.apps[0].script !== script) {
+        data.apps[0].script = script
+        fs.writeFileSync(filePath, yaml.stringify(data))
+      }
+    }
+    const cmd = `pm2 start ${filePath} --env ${JSON.stringify(process.env)}`
+    await this.exec(cmd)
+    console.log('pm2服务已启动 可执行 【npx karin log】 查看日志')
+    process.exit(0)
+  }
+
+  /**
+     * pm2结束进程
+     */
+  async stop () {
+    console.log('pm2服务停止中...')
+    const pm2Cfg = this.getConfigData('pm2')
+    const serverCfg = this.getConfigData('server')
+    const port = serverCfg?.http?.port || 7000
+    const res = await this.Axios(`http://127.0.0.1:${port}/api/ping`, 1000)
+    if (res) {
+      await this.exec(`pm2 delete ${res.pm2_id}`)
+    } else {
+      await this.exec(`pm2 delete ${pm2Cfg?.apps[0]?.name || 'Karin'}`)
+    }
+    console.log('pm2服务已停止')
+    process.exit(0)
+  }
+
+  /**
+     * pm2查看日志
+     */
+  async log () {
+    const pm2Cfg = this.getConfigData('pm2')
+    const serverCfg = this.getConfigData('server')
+    const port = serverCfg?.http?.port || 7000
+    const res = await this.Axios(`http://127.0.0.1:${port}/api/ping`, 1000)
+    const lines = pm2Cfg?.lines || 1000
+    const cmd = process.platform === 'win32' ? 'pm2.cmd' : 'pm2'
+    const type = res ? res.pm_id : pm2Cfg?.apps[0]?.name || 'Karin'
+    spawn(cmd, ['logs', type, '--lines', lines], { stdio: 'inherit', shell: true, cwd: process.cwd() })
+  }
+
+  /**
+     * 封装exec
+     * @param cmd - 命令
+     */
+  exec (cmd) {
+    return new Promise((resolve, reject) => {
+      execCmd(cmd, (error, stdout, stderr) => {
+        if (stdout) { return resolve(stdout) }
+        if (error) { return reject(error) }
+        return reject(stderr)
+      })
+    })
+  }
+
+  /**
+     * 封装axios 超时返回false
+     * @param url - 请求地址
+     * @param timeout - 超时时间
+     * @returns - 请求结果
+     */
+  async Axios (url, timeout) {
+    try {
+      const res = await axios.get(url, { timeout })
+      return res.data
+    } catch {
+      return false
+    }
+  }
+}
+const cli = new KarinCli()
+program.version(cli.pkg.version, '-v, --version', '显示版本号')
+program.command('.').description('启动karin').action(() => cli.start('prod' /* Mode.Prod */, 'js' /* Lang.Js */, 'node' /* Runner.Node */))
+program.command('start').description('启动karin').action(() => cli.start('prod' /* Mode.Prod */, 'js' /* Lang.Js */, 'node' /* Runner.Node */))
+program.command('pm2').description('后台运行karin').action(() => cli.start('prod' /* Mode.Prod */, 'js' /* Lang.Js */, 'pm2' /* Runner.Pm2 */))
+program.command('stop').description('停止后台运行').action(() => cli.stop())
+program.command('rs').description('重启pm2服务').action(() => cli.restart())
+program.command('dev').description('TypeScript开发模式').action(() => cli.start('dev' /* Mode.Dev */, 'ts' /* Lang.Ts */, 'tsx' /* Runner.Tsx */))
+program.command('debug').description('JavaScript调试模式').action(() => cli.start('dev' /* Mode.Dev */, 'js' /* Lang.Js */, 'node' /* Runner.Node */))
+program.command('log').description('查看日志').action(() => cli.log())
+program.parse(process.argv)

package/lib/cli/up.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/lib/cli/up.js

@@ -1 +1,35 @@
-'use strict'
+#!/usr/bin/env node
+import { exec } from 'child_process'
+import { KarinInit } from '../utils/init.js'
+/** 获取包管理器 */
+const pkg = new KarinInit().getRegistry()
+let cmd = ''
+/** 更新所有依赖到最新版本 */
+switch (pkg) {
+  case 'pnpm': {
+    cmd = 'pnpm update --latest'
+    break
+  }
+  case 'yarn': {
+    cmd = 'yarn upgrade --latest'
+    break
+  }
+  case 'npm': {
+    cmd = 'npm update --latest'
+    break
+  }
+  case 'cnpm': {
+    cmd = 'cnpm update --latest'
+    break
+  }
+}
+exec(cmd, (error, stdout, stderr) => {
+  if (error) {
+    console.error('[更新依赖] 发送错误:')
+    console.error(`error.stack: ${error.stack}`)
+    console.error(`error.message: ${error.message}`)
+    return
+  }
+  console.log(`[更新依赖] 更新完成: ${stdout}`)
+  console.log(`[更新依赖] 更新错误: ${stderr}`)
+})

package/lib/core/init.js

@@ -12,19 +12,31 @@ process.title = 'Karin'
  * 设置时区
  */
 process.env.TZ = 'Asia/Shanghai'
-/**
- * 设置应用模式
- */
-process.env.karin_app_mode = process.argv[2]?.includes('dev') ? 'dev' : 'prod'
-/**
- * 设置语言环境
- */
-process.env.karin_app_lang = JSON.stringify(process.execArgv).includes('tsx@') ? 'ts' : 'js'
-if (process.env.karin_app_lang === 'ts') {
-  process.env.karin_app_mode = 'dev'
-  logger.mark(`当前为 ${logger.green('TypeScript')} 开发模式`)
-}
-if (process.env.npm_lifecycle_event === 'npx' && process.env.npm_lifecycle_script === 'debug') {
-  process.env.karin_app_mode = 'dev'
-  logger.mark(`当前为 ${logger.green('JavaScript')} 开发模式`)
+const init = () => {
+  if (!process.env.karin_app_lang) { process.env.karin_app_lang = 'js' }
+  if (!process.env.karin_app_mode) { process.env.karin_app_mode = 'prod' }
+  if (!process.env.karin_app_runner) { process.env.karin_app_runner = 'node' }
+  if (!process.env.karin_app_start_count) { process.env.karin_app_start_count = '0' }
+  /** 正常启动 */
+  if (process.env.karin_app_runner === 'node' && process.env.karin_app_lang === 'js' && process.env.karin_app_mode === 'prod') {
+    logger.debug('当前为 JavaScript 生产模式')
+    return
+  }
+  /** pm2 */
+  if (process.env.karin_app_runner === 'pm2') {
+    logger.info('当前为 PM2 模式')
+    return
+  }
+  /** js开发模式 */
+  if (process.env.karin_app_lang === 'js' && process.env.karin_app_mode === 'dev') {
+    logger.info('当前为 JavaScript 开发模式')
+    return
+  }
+  /** ts开发模式 */
+  if (process.env.karin_app_lang === 'ts' && process.env.karin_app_mode === 'dev') {
+    logger.info('当前为 TypeScript 开发模式')
+    return
+  }
+  logger.error('未知的启动模式')
 }
+init()

package/lib/core/karin.d.ts

@@ -49,6 +49,8 @@ export interface OptionsElement extends OptionsCommand {
     stop?: boolean;
 }
 export declare class Karin {
+    start: boolean;
+    constructor();
     /**
     * @param reg - 正则表达式
     * @param fnc - 函数
@@ -140,5 +142,7 @@ export declare class Karin {
          */
         replyMsg?: string;
     }): Promise<KarinMessage>;
+    run(): void;
 }
-export {};
+export declare const karin: Karin;
+export default karin;

package/lib/core/karin.js

@@ -1,9 +1,17 @@
+import { server } from './server.js'
+import { stateArr } from './plugin.js'
 import PluginApp from './plugin.app.js'
 import { common } from '../utils/index.js'
-import { render } from '../render/index.js'
-import { stateArr } from './plugin.js'
 import { listener } from './listener.js'
+import onebot11 from '../adapter/onebot/11/index.js'
+import { render, RenderServer } from '../render/index.js'
 export class Karin {
+  start
+  constructor () {
+    this.start = false
+    this.run()
+  }
+
   /**
      * - 快速构建命令
      * @param reg - 正则表达式
@@ -141,4 +149,15 @@ export class Karin {
       listener.once(`ctx:${key}`, (e) => resolve(e))
     })
   }
+
+  run () {
+    if (this.start) { return }
+    this.start = true
+    server.init()
+    listener.emit('load.plugin')
+    listener.emit('adapter', RenderServer)
+    listener.emit('adapter', onebot11)
+  }
 }
+export const karin = new Karin()
+export default karin

package/lib/core/plugin.d.ts

@@ -168,3 +168,7 @@ export declare const stateArr: stateArrType;
 export interface ExtendedPlugin extends Plugin {
     accept: (e: KarinNoticeType | KarinRequestType) => Promise<void>;
 }
+/**
+ * @description 即将废弃，请使用 `Plugin`
+*/
+export declare const plugin: typeof Plugin;

package/lib/core/plugin.js

@@ -139,3 +139,7 @@ export class Plugin {
  * 上下文状态
  */
 export const stateArr = {}
+/**
+ * @description 即将废弃，请使用 `Plugin`
+*/
+export const plugin = Plugin

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

@@ -77,6 +77,16 @@ declare class PluginLoader {
     pkgJson: {
         [key: string]: any;
     };
+    /**
+     * - 依赖缺失收集
+     */
+    dependErr: {
+        [key: string]: {
+            dir: dirName;
+            name: fileName;
+            depend: string;
+        };
+    };
     constructor();
     /**
      * 插件初始化
@@ -106,6 +116,10 @@ declare class PluginLoader {
      * @param isMain - 是否为主入口文件
      */
     createdApp(dir: dirName, name: fileName, isOrderBy?: boolean, isNpm?: boolean, isMain?: boolean): Promise<boolean>;
+    /**
+     * 打印依赖缺失
+     */
+    printDependErr(): void;
     /**
      * 新增rule
      */

package/lib/core/plugin.loader.js

@@ -62,6 +62,10 @@ class PluginLoader {
      * - 所有插件包package.json
      */
   pkgJson
+  /**
+     * - 依赖缺失收集
+     */
+  dependErr
   constructor () {
     this.index = 0
     this.dir = './plugins'
@@ -78,6 +82,7 @@ class PluginLoader {
     this.buttonIds = []
     this.handlerIds = {}
     this.pkgJson = {}
+    this.dependErr = {}
   }
 
   /**
@@ -101,6 +106,8 @@ class PluginLoader {
     promises.push(...npm.map(async ({ dir, name, isMain }) => await this.createdApp(dir, name, false, true, isMain)))
     /** 等待所有插件加载完成 */
     await Promise.all(promises)
+    /** 打印依赖缺失 */
+    this.printDependErr()
     /** 释放缓存 */
     this.FileList = []
     /** 优先级排序并打印插件信息 */
@@ -310,14 +317,13 @@ class PluginLoader {
       return true
     } catch (error) {
       if (/Cannot find package '(.+?)'/.exec(error)?.[1]) {
-        const pack = /Cannot find package '(.+?)'/.exec(error)?.[1] || ''
-        logger.error(logger.red('--------插件载入错误--------'))
-        logger.mark(`错误: [${dir}][${name}] 缺少必要的依赖项: ${logger.red(pack)}`)
-        logger.mark(`操作：请尝试在命令终端中执行 ${logger.red('pnpm i -P')} 命令安装依赖项`)
-        logger.mark('提示：如安装后仍未解决，可选择以下方案')
-        logger.mark(`      1.手工安装依赖: ${logger.red('pnpm i ' + pack)}`)
-        logger.mark(`      2.联系插件作者：联系插件作者将 ${logger.red(pack)} 依赖项添加至插件的packageon文件中的dependencies字段中`)
-        logger.error(logger.red('-----------------------------'))
+        const key = `${dir}.${name}`
+        if (this.dependErr[key]) { return false }
+        this.dependErr[key] = {
+          dir,
+          name,
+          depend: /Cannot find package '(.+?)'/.exec(error)?.[1] || '',
+        }
       } else {
         logger.error(`载入插件错误：${logger.red(`${dir}/${name}`)}`)
         logger.error(error)
@@ -326,6 +332,28 @@ class PluginLoader {
     }
   }
 
+  /**
+     * 打印依赖缺失
+     */
+  printDependErr () {
+    try {
+      const keys = Object.keys(this.dependErr)
+      if (!keys.length) { return }
+      const msg = [
+        '-----依赖缺失----',
+      ]
+      keys.forEach(key => {
+        const { dir, name, depend } = this.dependErr[key]
+        msg.push(`[${dir}][${name}] 缺少依赖：${logger.red(depend)}`)
+      })
+      msg.push('-------------------')
+      logger.error(msg.join('\n'))
+    } finally {
+      /** 回收缓存 */
+      this.dependErr = {}
+    }
+  }
+
   /**
      * 新增rule
      */

package/lib/core/process.js

@@ -55,13 +55,13 @@ export default class Process {
     /**
          * 使用api来检查后台
          */
-    const res = await common.axios(host + '/pm2', 'get', { timeout: 100 })
+    const res = await common.axios(host + '/ping', '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 + '/pm2', 'get', { timeout: 100 })
+      const res = await common.axios(host + '/ping', 'get', { timeout: 100 })
       /** 请求成功继续循环 */
       if (res) { continue }
       /** 请求异常即代表后台进程已关闭 */

package/lib/core/server.js

@@ -53,13 +53,20 @@ export const server = new (class Server {
         }
       })
       /** GET接口 - 获取当前启动信息 */
-      this.app.get('/api/pm2', (req, res) => {
+      this.app.get('/api/ping', (req, res) => {
         /** 只允许本机ip访问 */
         if (req.hostname === 'localhost' || req.hostname === '127.0.0.1') {
           const data = {
             pm2_id: process.env.pm_id || '',
+            uptime: process.uptime(),
+            karin_app_mode: process.env.karin_app_mode,
+            karin_app_lang: process.env.karin_app_lang,
+            karin_app_runner: process.env.karin_app_runner,
+            karin_app_start_count: process.env.karin_app_start_count,
           }
           res.json(data)
+        } else {
+          res.status(403).json({ error: '禁止访问', message: '无效的请求' })
         }
       })
       /** GET接口 - 退出当前进程 */

package/lib/db/redis_level.d.ts

@@ -10,25 +10,21 @@ export default class RedisLevel {
     get(key: string): Promise<string | null>;
     /**
      * set 设置数据
-     * @param {string} key 键
-     * @param {string} value 值
-     * @param {object} [options] 选项
-     * @param [options.EX] 过期时间 单位秒
-     * @returns {Promise<void>|Error}
+     * @param key 键
+     * @param value 值
+     * @param options 选项
      */
     set(key: string, value: string, options?: {
         EX: number;
     } | undefined): Promise<void>;
     /**
      * del 删除数据
-     * @param {string} key 键
-     * @returns {Promise<void>|Error}
+     * @param key 键
      */
     del(key: string): Promise<void>;
     /**
      * keys 获取所有键
-     * @param {string} [prefix] 前缀
-     * @returns {Promise<string[]>|Error} 键列表
+     * @param prefix 前缀
      */
     keys(prefix?: string): Promise<string[]>;
     /**

package/lib/db/redis_level.js

@@ -89,11 +89,9 @@ export default class RedisLevel {
 
   /**
      * set 设置数据
-     * @param {string} key 键
-     * @param {string} value 值
-     * @param {object} [options] 选项
-     * @param [options.EX] 过期时间 单位秒
-     * @returns {Promise<void>|Error}
+     * @param key 键
+     * @param value 值
+     * @param options 选项
      */
   async set (key, value, options) {
     if (options && options.EX) {
@@ -104,8 +102,7 @@ export default class RedisLevel {
 
   /**
      * del 删除数据
-     * @param {string} key 键
-     * @returns {Promise<void>|Error}
+     * @param key 键
      */
   async del (key) {
     this.#expireMap.delete(key)
@@ -114,22 +111,28 @@ export default class RedisLevel {
 
   /**
      * keys 获取所有键
-     * @param {string} [prefix] 前缀
-     * @returns {Promise<string[]>|Error} 键列表
+     * @param prefix 前缀
      */
   async keys (prefix = '') {
-    const keys = []
-    for await (const key of this.#level.keys({ gte: prefix, lt: prefix + '\xFF' })) {
-      // Check if the key has expired
+    /** 去掉末尾的* */
+    prefix = prefix.replace(/\*$/, '')
+    const list = await this.#level.keys({ gte: prefix, lt: `${prefix}\xFF` }).all()
+    this.#checkKeys(list)
+    return list
+  }
+
+  /**
+     * 给一个kyes 检查是否过期
+     * @param keys 键数组
+     */
+  async #checkKeys (keys) {
+    for (const key of keys) {
       const expire = this.#expireMap.get(key)
       if (expire && expire < Date.now()) {
         await this.#level.del(key)
         this.#expireMap.delete(key)
-      } else {
-        keys.push(key)
       }
     }
-    return keys
   }
 
   /**

package/lib/index.d.ts

@@ -6,83 +6,4 @@ export * from './render/index.js';
 export * from './utils/index.js';
 export * from './types/index.js';
 export * from './adapter/index.js';
-import { Karin, Plugin } from './core/index.js';
-/**
- * @description 即将废弃，请使用 `Plugin`
-*/
-export declare const plugin: typeof Plugin;
-/**
- * @description 即将废弃，请使用 `render`
-*/
-export declare const Renderer: {
-    index: number;
-    Apps: Array<import("./types/index.js").KarinRenderApp>;
-    app(data: {
-        id: string;
-        type?: "image" | string;
-        render: import("./types/index.js").KarinRender["render"];
-    }): number;
-    unapp(index: number): boolean;
-    App(id?: string): import("./types/index.js").KarinRenderApp;
-    render(options: import("./types/index.js").KarinRenderType, id?: string): Promise<string | string[]>;
-    renderHtml(data: string): Promise<string | string[]>;
-};
-export declare const Cfg: {
-    projPath: string;
-    projConfigPath: string;
-    pkgPath: string;
-    pkgConfigPath: string;
-    change: Map<string, any>;
-    watcher: Map<string, any>;
-    review: boolean;
-    logger: import("log4js").Logger;
-    initCfg(): Promise<void>;
-    getPlugins(): Promise<string[]>;
-    mkdir(dirname: string): boolean;
-    dirPath(_path: string, plugins: string[]): Promise<void>;
-    timeout(type?: "ws" | "grpc"): number;
-    readonly redis: import("./types/index.js").Redis;
-    readonly master: string[];
-    readonly admin: string[];
-    readonly App: import("./types/index.js").App;
-    readonly Config: import("./types/index.js").Config;
-    readonly Server: import("./types/index.js").Server;
-    readonly package: import("./types/index.js").Package;
-    group(group_id?: string): import("./types/index.js").GroupCfg;
-    getYaml(type: "defSet" | "config", name: string, isWatch?: boolean): any;
-    watch(type: "defSet" | "config", name: string, file: string): Promise<true | undefined>;
-    change_App(): Promise<void>;
-    change_config(): Promise<void>;
-    change_group(): Promise<void>;
-    "__#2@#review"(): Promise<void>;
-};
-export declare const Update: {
-    dir: string;
-    update(path: string, cmd?: string, time?: number): Promise<{
-        status: string;
-        data: string;
-    }>;
-    getTime(path: string): Promise<string>;
-    getHash(path: string, short?: boolean): Promise<string>;
-    getCommit(options: {
-        path: any;
-        count?: any;
-        hash?: any;
-        branch?: any;
-    }): Promise<string>;
-    checkUpdate(path: import("fs").PathLike, time?: number): Promise<{
-        status: string;
-        data: string | undefined;
-        count?: undefined;
-    } | {
-        status: string;
-        data: boolean;
-        count?: undefined;
-    } | {
-        status: string;
-        data: string;
-        count: string | number;
-    }>;
-};
-export declare const karin: Karin;
-export default karin;
+export { karin as default } from './core/index.js';

package/lib/index.js

@@ -1,4 +1,3 @@
-// 基本模块
 export * from 'kritor-proto';
 export * from './core/index.js';
 export * from './event/index.js';
@@ -7,25 +6,4 @@ export * from './render/index.js';
 export * from './utils/index.js';
 export * from './types/index.js';
 export * from './adapter/index.js';
-import { config, update } from './utils/index.js';
-import { render } from './render/index.js';
-import { RenderServer } from './render/index.js';
-import OneBot11 from './adapter/onebot/11/index.js';
-import { server, Karin, listener, Plugin } from './core/index.js';
-// 初始化
-server.init();
-listener.emit('load.plugin');
-listener.emit('adapter', RenderServer);
-listener.emit('adapter', OneBot11);
-/**
- * @description 即将废弃，请使用 `Plugin`
-*/
-export const plugin = Plugin;
-/**
- * @description 即将废弃，请使用 `render`
-*/
-export const Renderer = render;
-export const Cfg = config;
-export const Update = update;
-export const karin = new Karin();
-export default karin;
+export { karin as default } from './core/index.js';

package/lib/render/app.d.ts

@@ -1,5 +1,5 @@
 import { KarinRender, KarinRenderApp, KarinRenderType } from '../types/index.js';
-declare class Renderer {
+declare class Renderers {
     index: number;
     Apps: Array<KarinRenderApp>;
     constructor();
@@ -42,5 +42,9 @@ declare class Renderer {
 /**
  * 渲染器管理器
  */
-export declare const render: Renderer;
+export declare const render: Renderers;
+/**
+ * @description 即将废弃，请使用 `render`
+*/
+export declare const Renderer: Renderers;
 export {};

package/lib/render/app.js

@@ -1,5 +1,5 @@
 import { logger } from '../utils/index.js'
-class Renderer {
+class Renderers {
   index
   Apps
   constructor () {
@@ -91,4 +91,8 @@ class Renderer {
 /**
  * 渲染器管理器
  */
-export const render = new Renderer()
+export const render = new Renderers()
+/**
+ * @description 即将废弃，请使用 `render`
+*/
+export const Renderer = render

package/lib/utils/config.d.ts

@@ -88,3 +88,88 @@ export declare const config: {
     change_group(): Promise<void>;
     "__#2@#review"(): Promise<void>;
 };
+export declare const Cfg: {
+    /**
+     * 根项目绝对路径
+     */
+    projPath: string;
+    /**
+     * 根项目配置文件夹路径
+     */
+    projConfigPath: string;
+    /**
+     * npm包路径
+     */
+    pkgPath: string;
+    /**
+     * karin包配置文件夹路径
+     */
+    pkgConfigPath: string;
+    change: Map<string, any>;
+    watcher: Map<string, any>;
+    review: boolean;
+    logger: Logger;
+    /** 初始化配置 */
+    initCfg(): Promise<void>;
+    getPlugins(): Promise<string[]>;
+    /**
+     * 递归创建目录
+     * @param dirname - 要创建的文件夹路径
+     */
+    mkdir(dirname: string): boolean;
+    /**
+     * 为每一个插件建立对应的文件夹
+     */
+    dirPath(_path: string, plugins: string[]): Promise<void>;
+    /**
+     * 超时时间
+     */
+    timeout(type?: "ws" | "grpc"): number;
+    /**
+     * Redis 配置
+     * 采用实时读取优化性能
+     */
+    readonly redis: Redis;
+    /**
+     * 主人列表
+     */
+    readonly master: string[];
+    /**
+     * 管理员列表
+     */
+    readonly admin: string[];
+    /** App管理 */
+    readonly App: App;
+    /**
+     * 基本配置
+     */
+    readonly Config: Config;
+    /**
+     * Server 配置文档
+     */
+    readonly Server: Server;
+    /**
+     * packageon
+     * 实时获取packageon文件
+     */
+    readonly package: Package;
+    /**
+     * 获取群配置
+     */
+    group(group_id?: string): GroupCfg;
+    /**
+     * 获取配置yaml
+     */
+    getYaml(type: "defSet" | "config", name: string, isWatch?: boolean): any;
+    /**
+     * 监听配置文件
+     * @param {'defSet'|'config'} type 类型
+     * @param {string} name 文件名称 不带后缀
+     * @param {string} file 文件路径
+     */
+    watch(type: "defSet" | "config", name: string, file: string): Promise<true | undefined>;
+    change_App(): Promise<void>;
+    change_config(): Promise<void>;
+    change_group(): Promise<void>;
+    "__#2@#review"(): Promise<void>;
+};

package/lib/utils/config.js

@@ -309,3 +309,4 @@ export const config = new (class Cfg {
     this.review = false
   }
 })()
+export const Cfg = config

package/lib/utils/update.d.ts

@@ -61,3 +61,65 @@ export declare const update: {
         count: string | number;
     }>;
 };
+export declare const Update: {
+    dir: string;
+    /**
+     * 更新框架或插件
+     * @param path - 插件相对路径
+     * @param cmd - 更新命令 默认git pull
+     * @param time - 超时时间 默认120s
+     */
+    update(path: string, cmd?: string, time?: number): Promise<{
+        status: string;
+        data: string;
+    }>;
+    /**
+     * 获取指定仓库最后一次提交时间日期
+     * @param path - 插件相对路径
+     */
+    getTime(path: string): Promise<string>;
+    /**
+     * 获取指定仓库最后一次提交哈希值
+     * @param {string} path - 插件相对路径
+     * @param {boolean} [short] - 是否获取短哈希 默认true
+     * @returns {Promise<string>}
+     */
+    getHash(path: string, short?: boolean): Promise<string>;
+    /**
+     * 获取指定仓库的提交记录
+     * @param {{
+     *  path: string,
+     *  count?: number,
+     *  hash?: string
+     * }} options - 参数
+     * @param {string} options.path - 插件相对路径
+     * @param {number} [options.count] - 获取日志条数 默认1条
+     * @param {string} [options.hash] - 指定HEAD
+     * @returns {Promise<string>}
+     */
+    getCommit(options: {
+        path: any;
+        count?: any;
+        hash?: any;
+        branch?: any;
+    }): Promise<string>;
+    /**
+     * 检查插件是否有更新
+     * @param {string} path - 插件相对路径
+     * @param {number} [time] - 超时时间 默认120s
+     * @returns {Promise<{status: 'ok'|'failed', data: string|boolean}>}
+     */
+    checkUpdate(path: fs.PathLike, time?: number): Promise<{
+        status: string;
+        data: string | undefined;
+        count?: undefined;
+    } | {
+        status: string;
+        data: boolean;
+        count?: undefined;
+    } | {
+        status: string;
+        data: string;
+        count: string | number;
+    }>;
+};

package/lib/utils/update.js

@@ -132,3 +132,4 @@ export const update = new (class Update {
     return { status: 'ok', data, count }
   }
 })()
+export const Update = update

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.6.28",
+  "version": "0.7.1",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",
@@ -17,14 +17,8 @@
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "bin": {
-    "app": "lib/index.js",
-    "debug": "lib/index.js",
-    "dev": "lib/index.js",
     "init": "lib/cli/init.js",
-    "log": "lib/cli/log.js",
-    "rs": "lib/cli/restart.js",
-    "start": "lib/cli/start.js",
-    "stop": "lib/cli/stop.js"
+    "karin": "lib/cli/karin.js"
   },
   "files": [
     "/lib/**/*.js",
@@ -49,35 +43,36 @@
     "sort": "npx sort-package-json"
   },
   "dependencies": {
-    "@grpc/grpc-js": "1.10.11",
+    "@grpc/grpc-js": "1.11.1",
     "@grpc/proto-loader": "0.7.13",
     "art-template": "4.13.2",
     "axios": "1.7.2",
     "chalk": "5.3.0",
     "chokidar": "3.6.0",
+    "commander": "^12.1.0",
     "express": "4.19.2",
-    "kritor-proto": "latest",
+    "kritor-proto": "^1.0.2",
     "level": "8.0.1",
     "lodash": "4.17.21",
     "log4js": "6.9.1",
     "moment": "2.30.1",
     "node-schedule": "2.1.1",
-    "redis": "4.6.14",
+    "redis": "4.6.15",
     "ws": "8.18.0",
     "yaml": "2.4.5"
   },
   "devDependencies": {
-    "@types/express": "latest",
-    "@types/lodash": "latest",
-    "@types/node": "latest",
-    "@types/node-schedule": "latest",
-    "@types/ws": "latest",
-    "eslint": "latest",
-    "neostandard": "latest",
-    "sort-package-json": "latest",
-    "tsc-alias": "latest",
-    "tsx": "latest",
-    "typescript": "latest"
+    "@types/express": "^4.17.21",
+    "@types/lodash": "^4.17.7",
+    "@types/node": "^20.14.11",
+    "@types/node-schedule": "^2.1.7",
+    "@types/ws": "^8.5.11",
+    "eslint": "^9.7.0",
+    "neostandard": "^0.11.1",
+    "sort-package-json": "^2.10.0",
+    "tsc-alias": "^1.8.10",
+    "tsx": "^4.16.2",
+    "typescript": "^5.5.3"
   },
   "engines": {
     "node": ">=18"

package/lib/cli/log.js

@@ -1,12 +0,0 @@
-#!/usr/bin/env node
-import fs from 'fs'
-import yaml from 'yaml'
-import path from 'path'
-import { spawn } from 'child_process'
-const cwd = process.cwd()
-const _path = path.resolve(cwd + '/config/config/pm2.yaml')
-const data = yaml.parse(fs.readFileSync(_path, 'utf8'))
-const name = data.apps[0].name
-const lines = data.lines || 1000
-const cmd = process.platform === 'win32' ? 'pm2.cmd' : 'pm2'
-spawn(cmd, ['logs', '--lines', lines, name], { stdio: 'inherit', shell: true, cwd })

package/lib/cli/restart.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/lib/cli/restart.js

@@ -1,10 +0,0 @@
-#!/usr/bin/env node
-import fs from 'fs'
-import { execSync } from 'child_process'
-import { karinDir } from '../core/dir.js'
-let config = process.cwd() + '/config/config/pm2.yaml'
-if (!fs.existsSync(config)) {
-  config = `${karinDir}/config/config/pm2.yaml`
-}
-const cmd = `pm2 restart ${config}`
-execSync(cmd, { stdio: 'inherit', cwd: process.cwd(), env: process.env })

package/lib/cli/start.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/lib/cli/start.js

@@ -1,10 +0,0 @@
-#!/usr/bin/env node
-import fs from 'fs'
-import { execSync } from 'child_process'
-import { karinDir } from '../core/dir.js'
-let config = process.cwd() + '/config/config/pm2.yaml'
-if (!fs.existsSync(config)) {
-  config = `${karinDir}/config/config/pm2.yaml`
-}
-const cmd = `pm2 start ${config}`
-execSync(cmd, { stdio: 'inherit', cwd: process.cwd(), env: process.env })

package/lib/cli/stop.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/lib/cli/stop.js

@@ -1,10 +0,0 @@
-#!/usr/bin/env node
-import fs from 'fs'
-import { execSync } from 'child_process'
-import { karinDir } from '../core/dir.js'
-let config = process.cwd() + '/config/config/pm2.yaml'
-if (!fs.existsSync(config)) {
-  config = `${karinDir}/config/config/pm2.yaml`
-}
-const cmd = `pm2 delete ${config}`
-execSync(cmd, { stdio: 'inherit', cwd: process.cwd(), env: process.env })