node-karin 0.11.14 → 0.11.15

package/config/defSet/config.yaml

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

package/lib/cli/index.d.ts

@@ -1,4 +1,4 @@
-import { ChildProcess } from 'child_process';
+import { ChildProcess, ExecOptions } from 'child_process';
 export declare const enum Runner {
     Node = "node",
     Tsx = "tsx",
@@ -19,7 +19,7 @@ export declare class KarinCli {
     file: string;
     constructor();
     /**
-     * 获取pkg
+     * 获取pkg配置
      * @param isNpm - 是否是npm包
      */
     pkg(isNpm: boolean): any;
@@ -73,11 +73,15 @@ export declare class KarinCli {
      * @param pkg - 包管理器
      */
     getRemoteVersion(name: string, pkg: 'pnpm' | 'cnpm' | 'yarn' | 'npm'): Promise<string>;
+    /**
+     * 获取git插件列表
+     */
+    getGitPlugins(): Array<string>;
     /**
      * 封装exec
      * @param cmd - 命令
      */
-    exec(cmd: string): Promise<string>;
+    exec(cmd: string, options?: ExecOptions): Promise<string>;
     /**
      * 封装axios 超时返回false
      * @param url - 请求地址

package/lib/cli/index.js

@@ -3,8 +3,8 @@ import path from 'path';
 import yaml from 'yaml';
 import axios from 'axios';
 import { fileURLToPath } from 'url';
+import { getRegistry } from './pkg.js';
 import { exec as execCmd, spawn } from 'child_process';
-import { KarinCfgInit } from '../core/init/config.js';
 export class KarinCli {
     child;
     filename;
@@ -20,10 +20,11 @@ export class KarinCli {
         /** 入口文件(注意后缀) */
         this.file = path.join(path.dirname(this.filename), '../index.js');
         this.child = null;
+        process.env.karin_app_pkg = getRegistry();
         process.env.karin_app_version = this.pkg(true).version;
     }
     /**
-     * 获取pkg
+     * 获取pkg配置
      * @param isNpm - 是否是npm包
      */
     pkg(isNpm) {
@@ -187,9 +188,8 @@ 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 {
                 /** 检查是否已经是最新版本 */
@@ -205,11 +205,26 @@ export class KarinCli {
             }
             catch (error) {
                 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) {
+                console.error(`[依赖更新] ${item} 更新失败`);
+                console.error(error.stack || error.message || error);
+            }
+        }));
+        console.log('[依赖更新] 所有git插件已更新完成~');
     }
     /**
      * 获取指定包的本地版本
@@ -246,15 +261,28 @@ export class KarinCli {
         }
         return text.trim();
     }
+    /**
+     * 获取git插件列表
+     */
+    getGitPlugins() {
+        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 = [];
+        list.map(v => arr.push(v.name));
+        return arr;
+    }
     /**
      * 封装exec
      * @param cmd - 命令
      */
-    exec(cmd) {
+    exec(cmd, options) {
         return new Promise((resolve, reject) => {
-            execCmd(cmd, (error, stdout, stderr) => {
+            execCmd(cmd, options, (error, stdout, stderr) => {
                 if (stdout)
-                    return resolve(stdout.trim());
+                    return resolve(stdout.toString().trim());
                 if (error)
                     return reject(error);
                 return reject(stderr);

package/lib/cli/init.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { getRegistry } from './pkg.js';
 import { KarinCfgInit } from '../core/init/config.js';
 /**
  * 休眠函数
@@ -14,7 +15,7 @@ async function main() {
     const init = new KarinCfgInit();
     init.init();
     await sleep(1000);
-    const pkg = init.getRegistry();
+    const pkg = getRegistry();
     /** 结果 */
     await init.install(pkg);
 }

package/lib/cli/pkg.d.ts

@@ -0,0 +1,4 @@
+/**
+ * 获取当前的包管理器 根据锁文件判断 优先级 pnpm > yarn > npm > cnpm
+ */
+export declare const getRegistry: () => "pnpm" | "cnpm" | "yarn" | "npm";

package/lib/cli/pkg.js

@@ -0,0 +1,14 @@
+import fs from 'fs';
+/**
+ * 获取当前的包管理器 根据锁文件判断 优先级 pnpm > yarn > npm > cnpm
+ */
+export const getRegistry = () => {
+    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';
+};

package/lib/core/init/config.d.ts

@@ -40,8 +40,4 @@ export declare class KarinCfgInit {
      * @param cmd - 命令
      */
     shell(cmd: string): Promise<unknown>;
-    /**
-     * 获取当前的包管理器 根据锁文件判断
-     */
-    getRegistry(): 'pnpm' | 'cnpm' | 'yarn' | 'npm';
 }

package/lib/core/init/config.js

@@ -198,17 +198,4 @@ export class KarinCfgInit {
             });
         });
     }
-    /**
-     * 获取当前的包管理器 根据锁文件判断
-     */
-    getRegistry() {
-        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';
-    }
 }

package/lib/core/listener/listener.js

@@ -71,7 +71,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);

package/lib/core/process/process.js

@@ -74,11 +74,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;
     }
     /**

package/lib/types/config/config.d.ts

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

package/lib/utils/index.d.ts

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

package/lib/utils/index.js

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

package/lib/utils/tools/exec.d.ts

@@ -1,32 +1,20 @@
+import { ExecOptions } from 'child_process';
 /**
  * 执行 shell 命令
  * @param cmd 命令
  * @param log 是否打印日志
  * @param options 选项
  */
-export declare const exec: (cmd: string, log?: boolean, options?: {
-    cwd: string;
-    encoding: string;
-}) => Promise<{
-    /**
-     * - 执行状态
-     */
+export declare const exec: (cmd: string, log?: boolean, options?: ExecOptions) => Promise<{
     status: "ok" | "failed";
-    /**
-     * - 错误信息
-     */
     error: Error | null;
-    stdout: string | "";
-    stderr: string | "";
+    stdout: string;
+    stderr: string;
 }>;
 /**
  * 执行 shell 命令
  * @param cmd 命令
- * @param log 是否打印日志
  * @param options 选项
  */
-export declare const execs: (cmd: string, options?: {
-    cwd: string;
-    encoding: string;
-}) => Promise<string>;
+export declare const execs: (cmd: string, options?: ExecOptions) => Promise<string>;
 export default exec;

package/lib/utils/tools/exec.js

@@ -6,41 +6,43 @@ import { exec as execCmd } from 'child_process';
  * @param log 是否打印日志
  * @param options 选项
  */
-export const exec = (cmd, log = true, options = { cwd: process.cwd(), encoding: 'utf-8' }) => {
+export const exec = async (cmd, log = true, options = { cwd: process.cwd() }) => {
+    const logType = (status) => ({
+        start: '[exec][开始执行]',
+        ok: '[exec][执行成功]',
+        failed: '[exec][执行失败]',
+    })[status];
+    const logMessage = (status, details = '') => {
+        if (log) {
+            const colorFunc = {
+                start: logger.yellow,
+                ok: logger.green,
+                failed: logger.red,
+            }[status];
+            logger.info([
+                colorFunc(logType(status)),
+                `cmd: ${cmd}`,
+                `cwd: ${options.cwd}`,
+                details,
+                '--------',
+            ].join('\n'));
+        }
+    };
+    logMessage('start');
     return new Promise(resolve => {
-        const logMessage = (level, message) => {
-            if (log)
-                logger[level](message);
-        };
-        const logType = (status) => {
-            switch (status) {
-                case '开始执行':
-                    return logger.yellow('[exec][开始执行]');
-                case 'ok':
-                    return logger.green('[exec][执行成功]');
-                case 'failed':
-                    return logger.red('[exec][执行失败]');
-            }
-        };
-        const formatMessage = (status, details) => [logType(status), `cmd: ${cmd}`, `cwd: ${options.cwd || process.cwd()}`, details, '--------'].join('\n');
-        logMessage('info', formatMessage('开始执行', ''));
-        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 });
+        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, options = { cwd: process.cwd(), encoding: 'utf-8' }) => {
+export const execs = (cmd, options = { cwd: process.cwd() }) => {
     return new Promise((resolve, reject) => {
         execCmd(cmd, options, (error, stdout) => {
             if (error)

package/lib/utils/tools/ffmpeg.d.ts

@@ -7,6 +7,6 @@ export declare function ffmpeg(): Promise<false | ((cmd: string, log?: boolean,
 }) => Promise<{
     status: "ok" | "failed";
     error: Error | null;
-    stdout: string | "";
-    stderr: string | "";
+    stdout: string;
+    stderr: string;
 }>)>;

package/lib/utils/tools/restart.d.ts

@@ -0,0 +1,15 @@
+import { Contact } from '../../types/index.js';
+/**
+ * 重启Bot
+ * @param self_id - 机器人的id 传e.self_id
+ * @param contact - 事件联系人信息 也就是从哪来的这条消息 传e.contact即可
+ * @param message_id - 消息id 传e.message_id
+ * @param isFront - 是否为前台重启 默认是
+ */
+export declare const restart: (self_id: string, contact: Contact, message_id: string, isFront?: boolean) => Promise<{
+    status: string;
+    data: string;
+} | {
+    status: string;
+    data: Error | null;
+}>;

package/lib/utils/tools/restart.js

@@ -0,0 +1,39 @@
+import exec from './exec.js';
+import { level } from '../../db/index.js';
+import { config } from '../config/config.js';
+/**
+ * 重启Bot
+ * @param self_id - 机器人的id 传e.self_id
+ * @param contact - 事件联系人信息 也就是从哪来的这条消息 传e.contact即可
+ * @param message_id - 消息id 传e.message_id
+ * @param isFront - 是否为前台重启 默认是
+ */
+export const restart = async (self_id, contact, message_id, isFront = true) => {
+    const options = {
+        id: self_id,
+        contact,
+        message_id,
+        time: Date.now(),
+    };
+    const key = `karin:restart:${options.id}`;
+    await level.set(key, options);
+    if (isFront) {
+        if (!process.send)
+            return { status: 'failed', data: '前台重启失败，当前环境不支持，仅支持【npx karin start】启动的环境' };
+        process.send({ action: 'result', env: process.env });
+        process.exit();
+    }
+    if (!config.Config.pm2Restart)
+        process.exit();
+    if (process.env.pm_id) {
+        const pm2 = await exec('npx karin rs');
+        if (pm2.status === 'ok')
+            process.exit();
+        return { status: 'failed', data: pm2.error };
+    }
+    /** 调用pm2启动 */
+    const pm2 = await exec('npx karin pm2');
+    if (pm2.status === 'ok')
+        process.exit();
+    return { status: 'failed', data: pm2.error };
+};

package/lib/utils/tools/stop.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 停止Bot
+ */
+export declare const stop: () => Promise<{
+    status: string;
+    data: Error | null;
+}>;

package/lib/utils/tools/stop.js

@@ -0,0 +1,13 @@
+import exec from './exec.js';
+/**
+ * 停止Bot
+ */
+export const stop = async () => {
+    if (process.env.pm_id) {
+        const pm2 = await exec('pm2 delete ' + process.env.pm_id);
+        if (pm2.status === 'ok')
+            process.exit();
+        return { status: 'failed', data: pm2.error };
+    }
+    process.exit();
+};

package/lib/utils/tools/update.d.ts

@@ -1,75 +1,22 @@
-import fs from 'fs';
-export declare const update: {
+export declare class Updates {
     dir: string;
+    constructor();
     /**
-     * 更新框架或插件
-     * @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>}
+     * 更新npm包
+     * @param name - 包名
+     * @param timeout - 超时时间 默认120s
      */
-    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;
+    updatePkg(name: string, timeout?: number): Promise<{
+        status: boolean;
         data: string;
-        count: string | number;
     }>;
-};
-export declare const Update: {
-    dir: string;
     /**
      * 更新框架或插件
      * @param path - 插件相对路径
      * @param cmd - 更新命令 默认git pull
-     * @param time - 超时时间 默认120s
+     * @param timeout - 超时时间 默认120s
      */
-    update(path: string, cmd?: string, time?: number): Promise<{
+    update(path: string, cmd?: string, timeout?: number): Promise<{
         status: string;
         data: string;
     }>;
@@ -80,36 +27,29 @@ export declare const Update: {
     getTime(path: string): Promise<string>;
     /**
      * 获取指定仓库最后一次提交哈希值
-     * @param {string} path - 插件相对路径
-     * @param {boolean} [short] - 是否获取短哈希 默认true
-     * @returns {Promise<string>}
+     * @param path - 插件相对路径
+     * @param short - 是否获取短哈希 默认true
      */
     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;
+        /** 指令命令路径 */
+        path: string;
+        /** 获取几次提交 默认1次 */
+        count?: number;
+        /** 指定哈希 */
+        hash?: string;
+        /** 指定分支 */
+        branch?: string;
     }): Promise<string>;
     /**
      * 检查插件是否有更新
-     * @param {string} path - 插件相对路径
-     * @param {number} [time] - 超时时间 默认120s
-     * @returns {Promise<{status: 'ok'|'failed', data: string|boolean}>}
+     * @param path - 插件相对路径
+     * @param time - 超时时间 默认120s
      */
-    checkUpdate(path: fs.PathLike, time?: number): Promise<{
+    checkUpdate(path: string, time?: number): Promise<{
         status: string;
         data: string | undefined;
         count?: undefined;
@@ -120,6 +60,8 @@ export declare const Update: {
     } | {
         status: string;
         data: string;
-        count: string | number;
+        count: number;
     }>;
-};
+}
+export declare const update: Updates;
+export declare const Update: Updates;

package/lib/utils/tools/update.js

@@ -1,17 +1,39 @@
 import fs from 'fs';
 import exec from './exec.js';
-export const update = new (class Update {
+import { KarinCli } from '../../cli/index.js';
+import { getRegistry } from '../../cli/pkg.js';
+export class Updates {
     dir;
     constructor() {
         this.dir = './plugins';
     }
+    /**
+     * 更新npm包
+     * @param name - 包名
+     * @param timeout - 超时时间 默认120s
+     */
+    async updatePkg(name, timeout = 120) {
+        const pkg = getRegistry();
+        const cmd = (pkg === 'yarn' ? 'yarn upgrade' : `${pkg} update`) + `${name}@latest`;
+        /** 检查是否已经是最新版本 */
+        const tools = new KarinCli();
+        const local = await tools.getLocalVersion(name, pkg);
+        const remote = await tools.getRemoteVersion(name, pkg);
+        logger.info(`[依赖更新] ${name} 当前版本: ${local} 最新版本: ${remote}`);
+        if (local === remote)
+            return { status: true, data: `${name} 已经是最新版本~` };
+        const npm = await exec(cmd, true, { cwd: process.cwd(), timeout: timeout * 1000 });
+        if (npm.status === 'ok')
+            return { status: true, data: `${name} 更新完成~` };
+        return { status: false, data: `${name} 更新失败: ${npm.error?.message}` };
+    }
     /**
      * 更新框架或插件
      * @param path - 插件相对路径
      * @param cmd - 更新命令 默认git pull
-     * @param time - 超时时间 默认120s
+     * @param timeout - 超时时间 默认120s
      */
-    async update(path, cmd = 'git pull', time = 120) {
+    async update(path, cmd = 'git pull', timeout = 120) {
         /** 检查一下路径是否存在 */
         if (!fs.existsSync(path))
             return { status: 'failed', data: '路径不存在' };
@@ -21,7 +43,7 @@ export const update = new (class Update {
         /** 设置超时时间 */
         const timer = setTimeout(() => {
             return { status: 'failed', data: '执行超时' };
-        }, time * 1000);
+        }, timeout * 1000);
         const options = { env: process.env, cwd: path, encoding: 'utf-8' };
         /** 记录当前短哈希 */
         const hash = await this.getHash(path);
@@ -36,17 +58,17 @@ export const update = new (class Update {
                 const time = await this.getTime(path);
                 return {
                     status: 'ok',
-                    data: ['\n当前版本已是最新版本', `Hash: ${hash}`, `最后更新：${await this.getCommit({ path, count: 1 })}`, `最后提交时间：${time}`].join('\n'),
+                    data: `\n当前版本已是最新版本\n最后更新时间：${time}\n更新详情：${await this.getCommit({ path, count: 1 })}`,
                 };
             }
             const Commit = await this.getCommit({ path, hash });
             return {
                 status: 'ok',
-                data: ['\n更新成功', `当前Hash: ${newHash}`, `更新日志：\n${Commit}`].join('\n'),
+                data: `\n更新成功\n更新日志：\n${Commit}`,
             };
         }
-        const msg = ['\n更新失败', `当前Hash: ${hash}`, `错误信息：${error?.message?.toString() || error?.stack?.toString() || error?.toString()}`, '请解决错误后重试或执行【#强制更新】'];
-        return { status: 'failed', data: msg.join('\n') };
+        const data = `\n更新失败\n错误信息：${error?.stack?.toString() || error?.message?.toString() || error?.toString() || error}\n请解决错误后重试或执行【#强制更新】`;
+        return { status: 'failed', data };
     }
     /**
      * 获取指定仓库最后一次提交时间日期
@@ -54,20 +76,19 @@ export const update = new (class Update {
      */
     async getTime(path) {
         const cmd = 'git log -1 --format=%cd --date=format:"%Y-%m-%d %H:%M:%S"';
-        const data = await exec(cmd, false, { cwd: path, encoding: 'utf-8' });
+        const data = await exec(cmd, false, { cwd: path });
         if (data.status === 'failed')
             return '获取时间失败，请重试或更新Git~';
         return data.stdout.trim();
     }
     /**
      * 获取指定仓库最后一次提交哈希值
-     * @param {string} path - 插件相对路径
-     * @param {boolean} [short] - 是否获取短哈希 默认true
-     * @returns {Promise<string>}
+     * @param path - 插件相对路径
+     * @param short - 是否获取短哈希 默认true
      */
     async getHash(path, short = true) {
         const cmd = short ? 'git rev-parse --short HEAD' : 'git rev-parse HEAD';
-        const data = await exec(cmd, false, { cwd: path, encoding: 'utf-8' });
+        const data = await exec(cmd, false, { cwd: path });
         if (data.status === 'failed') {
             const text = data.error;
             throw new Error(text);
@@ -76,15 +97,6 @@ export const update = new (class Update {
     }
     /**
      * 获取指定仓库的提交记录
-     * @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>}
      */
     async getCommit(options) {
         const { path, count = 1, hash, branch } = options;
@@ -95,7 +107,7 @@ export const update = new (class Update {
         /** 指定分支 */
         if (branch)
             cmd = `git log -${count} ${branch} --format="[%ad] %s %n" --date="format:%m-%d %H:%M"`;
-        const data = await exec(cmd, false, { cwd: path, encoding: 'utf-8' });
+        const data = await exec(cmd, false, { cwd: path });
         if (data.status === 'failed') {
             const text = data.error;
             throw new Error(text);
@@ -104,9 +116,8 @@ export const update = new (class Update {
     }
     /**
      * 检查插件是否有更新
-     * @param {string} path - 插件相对路径
-     * @param {number} [time] - 超时时间 默认120s
-     * @returns {Promise<{status: 'ok'|'failed', data: string|boolean}>}
+     * @param path - 插件相对路径
+     * @param time - 超时时间 默认120s
      */
     async checkUpdate(path, time = 120) {
         /** 检查一下路径是否存在 */
@@ -131,9 +142,10 @@ export const update = new (class Update {
         if (stdout.includes('Your branch is up to date with'))
             return { status: 'ok', data: false };
         /** 获取落后几次更新 */
-        const count = stdout.match(/Your branch is behind '.*' by (\d+) commits/)?.[1] || 1;
+        const count = Number(stdout.match(/Your branch is behind '.*' by (\d+) commits/)?.[1]) || 1;
         const data = await this.getCommit({ path, count, branch: 'origin' });
         return { status: 'ok', data, count };
     }
-})();
+}
+export const update = new Updates();
 export const Update = update;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.11.14",
+  "version": "0.11.15",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",