fix: #124 #121

Author: sj817

CHANGELOG.md

@@ -707,7 +707,7 @@
 
 ## 0.0.3 (2024-6-19)
 
-### 新增功能
+### Features
 
 - feat: vue渲染兼容 ([4470d02](https://github.com/KarinJS/Karin/commit/4470d02b3521e6e91e7abb7c20c02a855728b1d7))
 - feat: ReactMessageWithEmojiRequest ([b92770b](https://github.com/KarinJS/Karin/commit/b92770bcaeb0d2b0966d125e7ad984f3dbe90263))
@@ -716,7 +716,7 @@
 - feat: redis 集群 触发fnc加上颜色使其更明确指令 ([d53560f](https://github.com/KarinJS/Karin/commit/d53560f3e4f852338693e2fddcd3f9c8761e3909))
 - feat: add updateVersion ([10c6446](https://github.com/KarinJS/Karin/commit/10c6446ee48ee4598b1fae336a9baf0b0a9415ca))
 
-### Bug修复
+### Bug Fixes
 
 - fix: 修正正向ws重连错误 修正getBot 失败 ([1cba613](https://github.com/KarinJS/Karin/commit/1cba6136fff9726a3cd2e2189f5c83357fd17de7))
 - fix: ob11的uid暂时全部默认为uin ([8fc3ccd](https://github.com/KarinJS/Karin/commit/8fc3ccd894d1bfd806f3882435a5e9cdd2a3f022))
@@ -735,13 +735,13 @@
 - Update Wormhole.js ([46a9797](https://github.com/KarinJS/Karin/commit/46a979734fb0ab98198129155716c983288cbede))
 
 
-## 0.0.2 (2024-6-4)
+## [0.1.1](https://github.com/KarinJS/Karin/compare/v0.0.1...v0.0.2) (2024-06-04)
 
 ### Releases
 
 - release: 0.0.2 ([5cf693a](https://github.com/KarinJS/Karin/commit/5cf693a6a9a06446654ffc65a6bdb936322401ee))
 
-### 新增功能
+### Features
 
 - feat: 添加配置文件视图 ([f567b61](https://github.com/KarinJS/Karin/commit/f567b6104a8970f86771763915aa730779368f2d))
 - feat: YamlEditor root ([a46b036](https://github.com/KarinJS/Karin/commit/a46b036b338359c0f921b5f7f97630dee63eacdb))
@@ -789,7 +789,7 @@
 - feat：完善结构、通知事件 ([933bbb9](https://github.com/KarinJS/Karin/commit/933bbb95a237ad02b26c0a8c6e8d0a23c8a7734b))
 - feat：`puppeteer` ([8928729](https://github.com/KarinJS/Karin/commit/8928729ca0d7df5e8af92e7bf6929ce840fc7b4a))
 
-### Bug修复
+### Bug Fixes
 
 - fix: 移除子模块 并屏蔽git跟踪 ([b838fd7](https://github.com/KarinJS/Karin/commit/b838fd7f72cc1048d69fc07d681d858149350576))
 - fix: 修正描述 继续挖坑 咕咕咕 ([2e18050](https://github.com/KarinJS/Karin/commit/2e1805014e0b5d1d1f9fda3eef46e22816d806cf))
@@ -872,30 +872,9 @@
 - fix：分离消息事件处理 ([2bbd5bd](https://github.com/KarinJS/Karin/commit/2bbd5bd077518e4a2d3892c683cae35ca8629bbd))
 - fix：`static` ([c6d4856](https://github.com/KarinJS/Karin/commit/c6d4856b4038036b1cfdec7f61b1a7e55cd5d342))
 
-### 文档更新
-
-- docs: add repobeats ([13a58a8](https://github.com/KarinJS/Karin/commit/13a58a820b4d5c508628c514031c44980240d865))
-- docs：更新 README.md ([a88bd8b](https://github.com/KarinJS/Karin/commit/a88bd8b64c9b57e7bf07e2871b6be4929f144f7f))
-- docs：Update README.md (#3) ([f1ab4c2](https://github.com/KarinJS/Karin/commit/f1ab4c237396a9b901f2d2858b2f4edd223f2854))
-- docs：更新 README.md ([a8a0963](https://github.com/KarinJS/Karin/commit/a8a0963ae549e2ba5120e1cfa36847331d456bc3))
 
-### 代码重构
+## [0.0.1](https://github.com/KarinJS/Karin/compare/v0.0.1) (2024-03-21)
 
-- refactor: 将proto迁移到npm ([408fedb](https://github.com/KarinJS/Karin/commit/408fedbd95954a46e351614791aea2bd2d38e7c7))
-- :art: refactor: adapter and forward ([efb86fd](https://github.com/KarinJS/Karin/commit/efb86fdf8a22dc890be2d6c76dac2de34995f092))
-- :fire: refactor: 解耦事件 完善日志 ([f02a3e2](https://github.com/KarinJS/Karin/commit/f02a3e26f6291c32017540d982feb4c046713099))
-- refactor: kritor converter and struct definition ([427b524](https://github.com/KarinJS/Karin/commit/427b524aa72768c15069d566c4a1c931b85434fe))
-
-### 其他提交
-
-- rm gitmodules ([c4c0c57](https://github.com/KarinJS/Karin/commit/c4c0c579fedef1c172c2a7fada51c5152f95d816))
-- rm eslint-plugin-import ([fae7fa3](https://github.com/KarinJS/Karin/commit/fae7fa3a1a071eefd15451084d84c426ee8c282d))
-- rm scripts.build ([45e4dac](https://github.com/KarinJS/Karin/commit/45e4dacbf9b53a09463623d00ad7058f42a9a4da))
-- rm .npmrc ([fb6448a](https://github.com/KarinJS/Karin/commit/fb6448a5de365762a2266072e1b76a4844435281))
-- Create LICENSE ([2b5b6b0](https://github.com/KarinJS/Karin/commit/2b5b6b089e23afd371ad90107344c237662f4af2))
-- :heavy_minus_sign: Update package.json ([d623748](https://github.com/KarinJS/Karin/commit/d623748f14469b7ffe59b40b54b8ceae8bff7fb1))
-- use uid (#4) ([2abe1a5](https://github.com/KarinJS/Karin/commit/2abe1a531683bdd4a34b68a9d94a7f2987ae3f61))
-
-## 0.0.1 (2024-3-21)
+### Features
 
-- :tada: 初次提交 ([9e12137](https://github.com/KarinJS/Karin/commit/9e12137b6cf0e778a28df78daaeea77d5e325f4c))
+- feat: 初次提交 ([9e12137](https://github.com/KarinJS/Karin/commit/9e12137b6cf0e778a28df78daaeea77d5e325f4c))

config/defSet/config.yaml

@@ -11,12 +11,12 @@ log4jsCfg:
   # 日志文件最大大小 MB
   maxLogSize: 30
 
-# 关闭后台进程失败后是否继续启动 继续启动会导致多进程
-multi_progress: false
-
 # 控制台触发插件日志颜色 十六进制 默认#FFFF00 不支持热更新
 log_color: "#E1D919"
 
+# 重启是否调用pm2 如果不调用则会直接关机 此配置适合有进程守护的程序
+pm2Restart: true
+
 # 私聊设置
 private:
   # 关闭私聊后回复的提示词 为空则不回复

src/cli/index.ts

@@ -3,8 +3,8 @@ import path from 'path'
 import yaml from 'yaml'
 import axios from 'axios'
 import { fileURLToPath } from 'url'
-import { exec as execCmd, spawn, ChildProcess } from 'child_process'
-import { KarinCfgInit } from '../core/init/config'
+import { getRegistry } from './pkg'
+import { exec as execCmd, spawn, ChildProcess, ExecOptions } from 'child_process'
 
 export const enum Runner {
   Node = 'node',
@@ -38,11 +38,12 @@ export class KarinCli {
     /** 入口文件(注意后缀) */
     this.file = path.join(path.dirname(this.filename), '../index.js')
     this.child = null as unknown as ChildProcess
+    process.env.karin_app_pkg = getRegistry()
     process.env.karin_app_version = this.pkg(true).version
   }
 
   /**
-   * 获取pkg
+   * 获取pkg配置
    * @param isNpm - 是否是npm包
    */
   pkg (isNpm: boolean) {
@@ -226,10 +227,9 @@ export class KarinCli {
     const list = Object.keys(this.pkg(false).dependencies).filter(key => !pkgdependencies.includes(key))
 
     /** 获取包管理器 */
-    const pkg = new KarinCfgInit().getRegistry()
+    const pkg = getRegistry()
     const cmd = pkg === 'yarn' ? 'yarn upgrade' : `${pkg} update`
 
-    /** 异步并发更新依赖 */
     await Promise.all(list.map(async item => {
       try {
         /** 检查是否已经是最新版本 */
@@ -246,12 +246,26 @@ export class KarinCli {
         console.log(`[依赖更新] ${item} 更新完成~`)
       } catch (error: any) {
         console.error(`[依赖更新] ${item} 更新失败:`)
-        console.error(`error.stack: ${error.stack}`)
-        console.error(`error.message: ${error.message}`)
+        console.error(error.stack || error.message || error)
       }
     }))
 
-    console.log('所有依赖已更新完成~')
+    console.log('[依赖更新] 所有npm依赖已更新完成~')
+    console.log('[依赖更新] 开始更新git插件...')
+    const gitList = this.getGitPlugins()
+    if (!gitList.length) return console.log('[依赖更新] 没有git插件需要更新~')
+
+    await Promise.all(gitList.map(async item => {
+      const dir = path.resolve(process.cwd(), 'plugins', item)
+      try {
+        await this.exec('git pull', { cwd: dir })
+        console.log(`[依赖更新] ${item} 更新完成~`)
+      } catch (error: any) {
+        console.error(`[依赖更新] ${item} 更新失败`)
+        console.error(error.stack || error.message || error)
+      }
+    }))
+    console.log('[依赖更新] 所有git插件已更新完成~')
   }
 
   /**
@@ -294,14 +308,28 @@ export class KarinCli {
     return text.trim()
   }
 
+  /**
+   * 获取git插件列表
+   */
+  getGitPlugins (): Array<string> {
+    const dir = path.resolve(process.cwd(), 'plugins')
+    let list = fs.readdirSync(dir, { withFileTypes: true })
+    /** 忽略非文件夹、非 karin-plugin-开头的文件夹 */
+    list = list.filter(v => v.isDirectory() && v.name.startsWith('karin-plugin-'))
+    list = list.filter(v => fs.existsSync(`${dir}/${v.name}/package.json`))
+    const arr: string[] = []
+    list.map(v => arr.push(v.name))
+    return arr
+  }
+
   /**
    * 封装exec
    * @param cmd - 命令
    */
-  exec (cmd: string): Promise<string> {
+  exec (cmd: string, options?: ExecOptions): Promise<string> {
     return new Promise((resolve, reject) => {
-      execCmd(cmd, (error, stdout, stderr) => {
-        if (stdout) return resolve(stdout.trim())
+      execCmd(cmd, options, (error, stdout, stderr) => {
+        if (stdout) return resolve(stdout.toString().trim())
         if (error) return reject(error)
         return reject(stderr)
       })

src/cli/init.ts

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+import { getRegistry } from './pkg'
 import { KarinCfgInit } from '../core/init/config'
 
 /**
@@ -20,7 +21,7 @@ async function main () {
 
   await sleep(1000)
 
-  const pkg = init.getRegistry()
+  const pkg = getRegistry()
 
   /** 结果 */
   await init.install(pkg)

src/cli/pkg.ts

@@ -0,0 +1,12 @@
+import fs from 'fs'
+
+/**
+ * 获取当前的包管理器 根据锁文件判断 优先级 pnpm > yarn > npm > cnpm
+ */
+export const getRegistry = (): 'pnpm' | 'cnpm' | 'yarn' | 'npm' => {
+  if (fs.existsSync('./pnpm-lock.yaml')) return 'pnpm'
+  if (fs.existsSync('./yarn.lock')) return 'yarn'
+  if (fs.existsSync('./package-lock.json')) return 'npm'
+  // cnpm 没有锁文件
+  return 'cnpm'
+}

src/core/init/config.ts

@@ -209,15 +209,4 @@ export class KarinCfgInit {
       })
     })
   }
-
-  /**
-   * 获取当前的包管理器 根据锁文件判断
-   */
-  getRegistry (): 'pnpm' | 'cnpm' | 'yarn' | 'npm' {
-    if (fs.existsSync('./pnpm-lock.yaml')) return 'pnpm'
-    if (fs.existsSync('./yarn.lock')) return 'yarn'
-    if (fs.existsSync('./package-lock.json')) return 'npm'
-    // cnpm 没有锁文件
-    return 'cnpm'
-  }
 }

src/core/listener/listener.ts

@@ -137,7 +137,7 @@ export class Listeners extends EventEmitter {
     }
     const element = [
       segment.reply(message_id),
-      segment.text(`Karin 重启成功：${restartTime}秒`),
+      segment.text(`\nKarin 重启成功：${restartTime}秒`),
     ]
     await this.sendMsg(id, contact, element)
     await level.del(key)

src/core/process/process.ts

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

src/types/config/config.ts

@@ -123,9 +123,9 @@ export interface Config {
    */
   log_color: string
   /**
-   * 关闭后台进程失败后是否继续启动 继续启动会导致多进程
+   * 重启是否调用pm2 如果不调用则会直接关机 此配置适合有进程守护的程序
    */
-  multi_progress: boolean
+  pm2Restart: boolean
   /**
    * ffmpeg配置
    */

src/utils/index.ts

@@ -9,3 +9,5 @@ export * from './tools/update'
 export * from './config/yamlEditor'
 export * from './core/logger'
 export * from './config/updateVersion'
+export * from './tools/restart'
+export * from './tools/stop'

src/utils/tools/exec.ts

@@ -1,68 +1,60 @@
 import logger from '../core/logger'
-import { exec as execCmd } from 'child_process'
+import { exec as execCmd, ExecOptions } from 'child_process'
 
 /**
  * 执行 shell 命令
  * @param cmd 命令
  * @param log 是否打印日志
  * @param options 选项
  */
-export const exec = (
+export const exec = async (
   cmd: string,
   log = true,
-  options = { cwd: process.cwd(), encoding: 'utf-8' }
-): Promise<{
-  /**
-   * - 执行状态
-   */
-  status: 'ok' | 'failed'
-  /**
-   * - 错误信息
-   */
-  error: Error | null
-  stdout: string | ''
-  stderr: string | ''
-}> => {
-  return new Promise(resolve => {
-    const logMessage = (level: 'trace' | 'debug' | 'mark' | 'info' | 'warn' | 'error' | 'fatal', message: string) => {
-      if (log) logger[level](message)
-    }
+  options: ExecOptions = { cwd: process.cwd() }
+): Promise<{ status: 'ok' | 'failed', error: Error | null, stdout: string, stderr: string }> => {
+  const logType = (status: 'start' | 'ok' | 'failed') => ({
+    start: '[exec][开始执行]',
+    ok: '[exec][执行成功]',
+    failed: '[exec][执行失败]',
+  })[status]
 
-    const logType = (status: string) => {
-      switch (status) {
-        case '开始执行':
-          return logger.yellow('[exec][开始执行]')
-        case 'ok':
-          return logger.green('[exec][执行成功]')
-        case 'failed':
-          return logger.red('[exec][执行失败]')
-      }
-    }
+  const logMessage = (status: 'start' | 'ok' | 'failed', details = '') => {
+    if (log) {
+      const colorFunc = {
+        start: logger.yellow,
+        ok: logger.green,
+        failed: logger.red,
+      }[status]
 
-    const formatMessage = (status: string, details: string) => [logType(status), `cmd: ${cmd}`, `cwd: ${options.cwd || process.cwd()}`, details, '--------'].join('\n')
+      logger.info([
+        colorFunc(logType(status)),
+        `cmd: ${cmd}`,
+        `cwd: ${options.cwd}`,
+        details,
+        '--------',
+      ].join('\n'))
+    }
+  }
 
-    logMessage('info', formatMessage('开始执行', ''))
+  logMessage('start')
 
-    execCmd(cmd, options, (error, stdout, stderr) => {
-      if (error) {
-        logMessage('error', formatMessage('failed', `Error: ${error.message || error.stack || error.toString()}`))
-        return resolve({ status: 'failed', error, stdout, stderr })
-      }
-      logMessage('mark', formatMessage('ok', `stdout: ${stdout}\nstderr: ${stderr}`))
-      resolve({ status: 'ok', error, stdout, stderr })
+  return new Promise(resolve => {
+    execCmd(cmd, options, (error, stdout = '', stderr = '') => {
+      const status = error ? 'failed' : 'ok'
+      logMessage(status, error ? `Error: ${error.message}` : `stdout: ${stdout}\nstderr: ${stderr}`)
+      resolve({ status, error, stdout, stderr })
     })
   })
 }
 
 /**
  * 执行 shell 命令
  * @param cmd 命令
- * @param log 是否打印日志
  * @param options 选项
  */
 export const execs = (
   cmd: string,
-  options = { cwd: process.cwd(), encoding: 'utf-8' }
+  options: ExecOptions = { cwd: process.cwd() }
 ): Promise<string> => {
   return new Promise((resolve, reject) => {
     execCmd(cmd, options, (error, stdout) => {