@maiyunnet/kebab 7.1.2 → 7.2.0

package/index.d.ts

@@ -5,7 +5,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "7.1.2";
+export declare const VER = "7.2.0";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;

package/index.js

@@ -6,7 +6,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export const VER = '7.1.2';
+export const VER = '7.2.0';
 // --- 服务端用的路径 ---
 const imu = decodeURIComponent(import.meta.url).replace('file://', '').replace(/^\/(\w:)/, '$1');
 /** --- /xxx/xxx --- */

package/lib/core.d.ts

@@ -146,7 +146,9 @@ export declare function passThroughAppend(passThrough: stream.PassThrough, data:
  * --- 执行命令行 ---
  * @param command 命令字符串
  */
-export declare function exec(command: string): Promise<string | false>;
+export declare function exec(command: string, options?: {
+    'cwd'?: string;
+}): Promise<string | false>;
 /**
  * --- 向主进程（或局域网同代码机子）发送广播将进行 reload 操作，等待回传 ---
  * --- 主要作用除代码热更新以外的其他情况 ---
@@ -166,6 +168,12 @@ export type TPm2Action = 'start' | 'stop' | 'restart';
  * @param hosts 局域网列表
  */
 export declare function sendPm2(name: string, action?: TPm2Action, hosts?: string[] | 'config'): Promise<string[]>;
+/**
+ * --- 向本机或局域网 RPC 发送 npm install 操作 ---
+ * @param path 路径，如 /home/kebab/
+ * @param hosts 局域网列表
+ */
+export declare function sendNpm(path: string, hosts?: string[] | 'config'): Promise<string[]>;
 /** --- 跨进程全局变量 --- */
 export declare const global: Record<string, any>;
 /**
@@ -182,7 +190,7 @@ export declare function setGlobal(key: string, data: any, hosts?: string[] | 'co
  */
 export declare function removeGlobal(key: string, hosts?: string[]): Promise<string[]>;
 /**
- * --- 上传并覆盖代码文件，config.json、kebab.json、.js.map、.ts, .gitignore 不会被覆盖和新建 ---
+ * --- 上传并覆盖代码文件，config.json、kebab.json、.js.map、.ts, .gitignore 不会被覆盖和新创建 ---
  * @param sourcePath zip 文件
  * @param path 要更新的目标路径，无所谓是否 / 开头 / 结尾，是对方 kebab 的根据路径开始算起
  * @param hosts 局域网多机部署，不设置默认本机部署

package/lib/core.js

@@ -403,9 +403,11 @@ export async function passThroughAppend(passThrough, data, end = true) {
  * --- 执行命令行 ---
  * @param command 命令字符串
  */
-export function exec(command) {
+export function exec(command, options = {}) {
     return new Promise(function (resolve) {
-        cp.exec(command, function (err, stdout) {
+        cp.exec(command, {
+            'cwd': options.cwd,
+        }, function (err, stdout) {
             if (err) {
                 resolve(false);
                 return;
@@ -514,7 +516,7 @@ export async function sendPm2(name, action = 'restart', hosts) {
             'name': name,
             'pm2Action': action
         }), globalConfig.rpcSecret), {
-            'timeout': 10
+            'timeout': 2
         });
         const content = await res.getContent();
         if (!content) {
@@ -530,6 +532,42 @@ export async function sendPm2(name, action = 'restart', hosts) {
     }
     return rtn;
 }
+/**
+ * --- 向本机或局域网 RPC 发送 npm install 操作 ---
+ * @param path 路径，如 /home/kebab/
+ * @param hosts 局域网列表
+ */
+export async function sendNpm(path, hosts) {
+    if (hosts === 'config') {
+        hosts = globalConfig.hosts;
+    }
+    hosts ??= ['127.0.0.1'];
+    // --- 局域网模式 ---
+    const time = lTime.stamp();
+    /** --- 返回成功的 host --- */
+    const rtn = [];
+    for (const host of hosts) {
+        const res = await lNet.get('http://' + host + ':' + globalConfig.rpcPort.toString() + '/' + lCrypto.aesEncrypt(lText.stringifyJson({
+            'action': 'npm',
+            'time': time,
+            'path': path
+        }), globalConfig.rpcSecret), {
+            'timeout': 2
+        });
+        const content = await res.getContent();
+        if (!content) {
+            continue;
+        }
+        const str = content.toString();
+        if (str === 'Done') {
+            rtn.push(host);
+        }
+        else {
+            debug('[CORE][sendNpmInstall] rpc server content error:', str);
+        }
+    }
+    return rtn;
+}
 /** --- 跨进程全局变量 --- */
 export const global = {};
 /**
@@ -582,7 +620,7 @@ export async function removeGlobal(key, hosts) {
     return setGlobal(key, null, hosts);
 }
 /**
- * --- 上传并覆盖代码文件，config.json、kebab.json、.js.map、.ts, .gitignore 不会被覆盖和新建 ---
+ * --- 上传并覆盖代码文件，config.json、kebab.json、.js.map、.ts, .gitignore 不会被覆盖和新创建 ---
  * @param sourcePath zip 文件
  * @param path 要更新的目标路径，无所谓是否 / 开头 / 结尾，是对方 kebab 的根据路径开始算起
  * @param hosts 局域网多机部署，不设置默认本机部署

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "7.1.2",
+  "version": "7.2.0",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [
@@ -34,19 +34,19 @@
     "jszip": "^3.10.1",
     "mysql2": "^3.15.3",
     "node-cron": "^4.2.1",
-    "openai": "^6.9.1",
+    "openai": "^6.10.0",
     "pg": "^8.16.3",
     "ssh2": "^1.17.0",
     "svg-captcha": "^1.4.0",
-    "tencentcloud-sdk-nodejs": "^4.1.152"
+    "tencentcloud-sdk-nodejs": "^4.1.153"
   },
   "devDependencies": {
     "@litert/eslint-plugin-rules": "^0.3.1",
     "@types/ejs": "^3.1.5",
     "@types/node": "^24.10.1",
     "@types/pg": "^8.15.6",
-    "@typescript/native-preview": "^7.0.0-dev.20251203.1",
     "typedoc": "^0.28.15",
-    "typedoc-plugin-markdown": "^4.9.0"
+    "typedoc-plugin-markdown": "^4.9.0",
+    "typescript": "^5.9.3"
   }
 }

package/sys/master.js

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-5-2 21:03:42
- * Last: 2020-3-7 10:33:17, 2022-07-22 13:40:10, 2022-09-06 22:40:58, 2024-2-7 01:44:59, 2024-7-2 15:17:09, 2025-6-13 13:06:43
+ * Last: 2020-3-7 10:33:17, 2022-07-22 13:40:10, 2022-09-06 22:40:58, 2024-2-7 01:44:59, 2024-7-2 15:17:09, 2025-6-13 13:06:43, 2025-12-5 13:15:03
  */
 import * as os from 'os';
 import * as cluster from 'cluster';
@@ -161,6 +161,25 @@ function createRpcListener() {
                     }
                     break;
                 }
+                case 'npm': {
+                    // --- 执行 npm install 操作 ---
+                    if (!msg.path || typeof msg.path !== 'string') {
+                        res.end('Invalid path');
+                        return;
+                    }
+                    if (!await lFs.isDir(msg.path)) {
+                        res.end('Path not found');
+                        return;
+                    }
+                    const rtn = await lCore.exec('npm i --omit=dev --omit=optional', {
+                        'cwd': msg.path,
+                    });
+                    if (!rtn) {
+                        res.end('Exec failed');
+                        return;
+                    }
+                    break;
+                }
                 case 'code': {
                     // --- 更新 code 代码包 ---
                     const rtn = await sRoute.getFormData(req);

package/www/example/ctr/test.d.ts

@@ -48,6 +48,7 @@ export default class extends sCtr.Ctr {
     coreReload(): Promise<string>;
     coreRestart(): Promise<string>;
     corePm2(): Promise<string>;
+    coreNpm(): Promise<any>;
     coreGlobal(): Promise<string>;
     crypto(): Promise<string>;
     db(): Promise<kebab.Json>;

package/www/example/ctr/test.js

@@ -140,6 +140,7 @@ export default class extends sCtr.Ctr {
             `<br><a href="${this._config.const.urlBase}test/core-reload">View "test/core-reload"</a>`,
             `<br><a href="${this._config.const.urlBase}test/core-restart">View "test/core-restart"</a>`,
             `<br><a href="${this._config.const.urlBase}test/core-pm2?name=cron&action=restart">View "test/core-pm2"</a>`,
+            `<br><a href="${this._config.const.urlBase}test/core-npm">View "test/core-npm"</a>`,
             `<br><a href="${this._config.const.urlBase}test/core-global">View "test/core-global"</a>`,
             `<br><a href="${this._config.const.urlBase}test/core-updatecode">View "test/core-updatecode"</a>`,
             '<br><br><b>Crypto:</b>',
@@ -1288,6 +1289,21 @@ to: ${to}`
         const list = await lCore.sendPm2(name, action);
         return `PM2 ${action} request has been sent for "${name}".<br>Success hosts: ${JSON.stringify(list)}<br><br>` + this._getEnd();
     }
+    async coreNpm() {
+        // --- 创建一个临时目录 ---
+        const path = kebab.ROOT_CWD + 'temp_npm_test/';
+        await lFs.mkdir(path);
+        // --- 创建一个 package.json ---
+        await lFs.putContent(path + 'package.json', JSON.stringify({
+            'name': 'temp-npm-test',
+            'version': '1.0.0',
+            'dependencies': {
+                'is-number': '^7.0.0'
+            }
+        }));
+        const list = await lCore.sendNpm(path);
+        return `NPM request has been sent.<br>Success hosts: ${JSON.stringify(list)}<br><br>` + this._getEnd();
+    }
     async coreGlobal() {
         const ts = lTime.stamp().toString();
         const echo = [