node-karin 0.11.13 → 0.11.15

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.13",
+  "version": "0.11.15",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",
@@ -132,12 +132,15 @@
     "plugins/**"
   ],
   "scripts": {
-    "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json && npm run fix",
+    ".": "node lib/cli/start.js .",
+    "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json",
+    "build:npm": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json",
+    "dev": "node lib/cli/start.js dev",
     "fix": "eslint lib/**/*.js --fix",
     "fix:all": "eslint lib/**/*.js --fix && eslint lib/**/*.d.ts --fix",
     "pub": "npm publish --access public",
     "sort": "npx sort-package-json && sort-json tsconfig.json",
-    "dev": "node lib/cli/dev.js"
+    "start": "node lib/cli/start.js start"
   },
   "dependencies": {
     "art-template": "4.13.2",

package/lib/cli/dev.js

@@ -1,3 +0,0 @@
-import { KarinCli } from './index.js'
-const karin = new KarinCli()
-karin.start('dev' /* Mode.Dev */, 'js' /* Lang.Js */, 'node' /* Runner.Node */)