@maiyunnet/kebab 9.3.6 → 9.3.8

package/doc/kebab-rag.md

@@ -1360,7 +1360,7 @@ index/variables/VER.md
 
 # Variable: VER
 
-> `const` **VER**: `"9.3.6"` = `'9.3.6'`
+> `const` **VER**: `"9.3.8"` = `'9.3.8'`
 
 Defined in: [index.ts:10](https://github.com/maiyunnet/kebab/blob/master/index.ts#L10)
 
@@ -3258,7 +3258,7 @@ lib/core/functions/clone.md
 
 > **clone**\<`T`\>(`obj`): `T`
 
-Defined in: [lib/core.ts:1060](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1060)
+Defined in: [lib/core.ts:1102](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1102)
 
 完整的克隆一份数组/对象
 
@@ -3322,7 +3322,7 @@ lib/core/functions/debug.md
 
 > **debug**(`message?`, ...`optionalParams`): `void`
 
-Defined in: [lib/core.ts:1094](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1094)
+Defined in: [lib/core.ts:1136](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1136)
 
 打印调试信息，线上环境不会打印
 
@@ -3357,7 +3357,7 @@ lib/core/functions/display.md
 
 > **display**(`message?`, ...`optionalParams`): `void`
 
-Defined in: [lib/core.ts:1107](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1107)
+Defined in: [lib/core.ts:1149](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1149)
 
 向控制台直接显示内容，一般情况下禁止使用
 
@@ -3462,7 +3462,7 @@ lib/core/functions/getLog.md
 
 > **getLog**(`opt`): `Promise`\<`false` \| `string`[][] \| `null`\>
 
-Defined in: [lib/core.ts:967](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L967)
+Defined in: [lib/core.ts:1009](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1009)
 
 获取日志内容为一个数组
 
@@ -3568,7 +3568,7 @@ lib/core/functions/loadEnv.md
 
 > **loadEnv**(`dir`): `Promise`\<`void`\>
 
-Defined in: [lib/core.ts:1159](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1159)
+Defined in: [lib/core.ts:1201](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1201)
 
 加载 .env 文件到 process.env，若文件不存在则跳过
 
@@ -3597,7 +3597,7 @@ lib/core/functions/log.md
 
 > **log**(`opt`, `msg`, `fend?`): `void`
 
-Defined in: [lib/core.ts:861](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L861)
+Defined in: [lib/core.ts:903](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L903)
 
 写入文件日志
 
@@ -3638,7 +3638,7 @@ lib/core/functions/ls.md
 
 > **ls**(`opt`): `Promise`\<`object`[]\>
 
-Defined in: [lib/core.ts:1021](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1021)
+Defined in: [lib/core.ts:1063](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1063)
 
 获取目录内文件/文件夹列表
 
@@ -3999,7 +3999,7 @@ lib/core/functions/resolveEnvVars.md
 
 > **resolveEnvVars**(`obj`): `void`
 
-Defined in: [lib/core.ts:1189](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1189)
+Defined in: [lib/core.ts:1231](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1231)
 
 将配置对象中的 ${ENV_VAR} 占位符替换为 process.env 的值
 
@@ -4050,6 +4050,41 @@ Defined in: [lib/core.ts:649](https://github.com/maiyunnet/kebab/blob/master/lib
 
 `Promise`\<`string`[]\>
 
+lib/core/functions/sendPackage.md
+---
+
+[**Documents for @maiyunnet/kebab**](../../../index.md)
+
+***
+
+[Documents for @maiyunnet/kebab](../../../index.md) / [lib/core](../index.md) / sendPackage
+
+# Function: sendPackage()
+
+> **sendPackage**(`content`, `hosts?`): `Promise`\<`string`[]\>
+
+Defined in: [lib/core.ts:848](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L848)
+
+向本机或局域网 RPC 发送 package.json 更新操作
+
+## Parameters
+
+### content
+
+`string`
+
+package.json 文件内容
+
+### hosts?
+
+`string`[] \| `"config"`
+
+局域网列表
+
+## Returns
+
+`Promise`\<`string`[]\>
+
 lib/core/functions/sendPm2.md
 ---
 
@@ -4406,7 +4441,7 @@ lib/core/functions/writeEventStreamHead.md
 
 > **writeEventStreamHead**(`res`): `void`
 
-Defined in: [lib/core.ts:1129](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1129)
+Defined in: [lib/core.ts:1171](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1171)
 
 ## Parameters
 
@@ -4431,7 +4466,7 @@ lib/core/functions/writeHead.md
 
 > **writeHead**(`res`, `statusCode`, `headers?`): `void`
 
-Defined in: [lib/core.ts:1118](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1118)
+Defined in: [lib/core.ts:1160](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1160)
 
 让 res 发送头部（前提是头部没有被发送才能调用本方法
 
@@ -4472,7 +4507,7 @@ lib/core/functions/write.md
 
 > **write**(`res`, `data`): `void`
 
-Defined in: [lib/core.ts:1141](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1141)
+Defined in: [lib/core.ts:1183](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L1183)
 
 向 res 发送数据
 
@@ -4555,6 +4590,7 @@ lib/core/index.md
 - [removeGlobal](functions/removeGlobal.md)
 - [resolveEnvVars](functions/resolveEnvVars.md)
 - [sendNpm](functions/sendNpm.md)
+- [sendPackage](functions/sendPackage.md)
 - [sendPm2](functions/sendPm2.md)
 - [sendProject](functions/sendProject.md)
 - [sendReload](functions/sendReload.md)
@@ -4642,7 +4678,7 @@ lib/core/interfaces/ILogOptions.md
 
 # Interface: ILogOptions
 
-Defined in: [lib/core.ts:844](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L844)
+Defined in: [lib/core.ts:886](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L886)
 
 log 设置的选项
 
@@ -4652,7 +4688,7 @@ log 设置的选项
 
 > `optional` **cookie?**: `Record`\<`string`, `string`\>
 
-Defined in: [lib/core.ts:850](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L850)
+Defined in: [lib/core.ts:892](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L892)
 
 ***
 
@@ -4660,7 +4696,7 @@ Defined in: [lib/core.ts:850](https://github.com/maiyunnet/kebab/blob/master/lib
 
 > `optional` **get?**: `Record`\<`string`, `any`\>
 
-Defined in: [lib/core.ts:849](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L849)
+Defined in: [lib/core.ts:891](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L891)
 
 ***
 
@@ -4668,7 +4704,7 @@ Defined in: [lib/core.ts:849](https://github.com/maiyunnet/kebab/blob/master/lib
 
 > `optional` **headers?**: `IncomingHttpHeaders`
 
-Defined in: [lib/core.ts:852](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L852)
+Defined in: [lib/core.ts:894](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L894)
 
 ***
 
@@ -4676,7 +4712,7 @@ Defined in: [lib/core.ts:852](https://github.com/maiyunnet/kebab/blob/master/lib
 
 > `optional` **hostname?**: `string`
 
-Defined in: [lib/core.ts:847](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L847)
+Defined in: [lib/core.ts:889](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L889)
 
 ***
 
@@ -4684,7 +4720,7 @@ Defined in: [lib/core.ts:847](https://github.com/maiyunnet/kebab/blob/master/lib
 
 > `optional` **path?**: `string`
 
-Defined in: [lib/core.ts:845](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L845)
+Defined in: [lib/core.ts:887](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L887)
 
 ***
 
@@ -4692,7 +4728,7 @@ Defined in: [lib/core.ts:845](https://github.com/maiyunnet/kebab/blob/master/lib
 
 > `optional` **req?**: `IncomingMessage` \| `Http2ServerRequest` \| `null`
 
-Defined in: [lib/core.ts:848](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L848)
+Defined in: [lib/core.ts:890](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L890)
 
 ***
 
@@ -4700,7 +4736,7 @@ Defined in: [lib/core.ts:848](https://github.com/maiyunnet/kebab/blob/master/lib
 
 > `optional` **session?**: `Record`\<`string`, `any`\>
 
-Defined in: [lib/core.ts:851](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L851)
+Defined in: [lib/core.ts:893](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L893)
 
 ***
 
@@ -4708,7 +4744,7 @@ Defined in: [lib/core.ts:851](https://github.com/maiyunnet/kebab/blob/master/lib
 
 > `optional` **urlFull?**: `string`
 
-Defined in: [lib/core.ts:846](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L846)
+Defined in: [lib/core.ts:888](https://github.com/maiyunnet/kebab/blob/master/lib/core.ts#L888)
 
 lib/core/type-aliases/TPm2Action.md
 ---

package/index.d.ts

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

package/index.js

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

package/lib/core.d.ts

@@ -218,6 +218,12 @@ export declare function updateCode(sourcePath: string, path: string, hosts?: str
  * @param hosts 局域网列表
  */
 export declare function sendProject(path: string, key: string, value: string, hosts?: string[] | 'config'): Promise<string[]>;
+/**
+ * --- 向本机或局域网 RPC 发送 package.json 更新操作 ---
+ * @param content package.json 文件内容
+ * @param hosts 局域网列表
+ */
+export declare function sendPackage(content: string, hosts?: string[] | 'config'): Promise<string[]>;
 /** --- log 设置的选项 --- */
 export interface ILogOptions {
     'path'?: string;

package/lib/core.js

@@ -743,6 +743,45 @@ export async function sendProject(path, key, value, hosts) {
     }
     return rtn;
 }
+/**
+ * --- 向本机或局域网 RPC 发送 package.json 更新操作 ---
+ * @param content package.json 文件内容
+ * @param hosts 局域网列表
+ */
+export async function sendPackage(content, hosts) {
+    if (hosts === 'config') {
+        hosts = globalConfig.hosts;
+    }
+    // --- 未传或 config 展开后为空数组，均回退到本机 ---
+    if (!hosts?.length) {
+        hosts = ['127.0.0.1'];
+    }
+    // --- 局域网模式 ---
+    const time = lTime.stamp();
+    /** --- 返回成功的 host --- */
+    const rtn = [];
+    for (const host of hosts) {
+        const res = await lUndici.get('http://' + host + ':' + globalConfig.rpcPort.toString() + '/' + lCrypto.aesEncrypt(lText.stringifyJson({
+            'action': 'package',
+            'time': time,
+            'content': content
+        }), globalConfig.rpcSecret), {
+            'timeout': 2
+        });
+        const resContent = await res.getContent();
+        if (!resContent) {
+            continue;
+        }
+        const str = resContent.toString();
+        if (str === 'Done') {
+            rtn.push(host);
+        }
+        else {
+            debug('[CORE][sendPackage] rpc server content error:', str);
+        }
+    }
+    return rtn;
+}
 /**
  * --- 写入文件日志 ---
  * @param opt 选项

package/lib/turnstile.js

@@ -3,7 +3,7 @@
  * Date: 2025-6-11
  * Last: 2025-6-11 21:50:31
  */
-import * as tc from 'tencentcloud-sdk-nodejs';
+import * as tcc from 'tencentcloud-sdk-nodejs';
 // --- 库和定义 ---
 import * as lUndici from '#kebab/lib/undici.js';
 import * as lText from '#kebab/lib/text.js';
@@ -40,7 +40,7 @@ export async function verify(ctr, opt) {
         }
         case EFACTORY.TENCENT: {
             // --- 腾讯云验证 ---
-            const client = new tc.captcha.v20190722.Client({
+            const client = new tcc.captcha.v20190722.Client({
                 'credential': {
                     'secretId': config.turnstile['TENCENT'].sid,
                     'secretKey': config.turnstile['TENCENT'].skey,

package/lib/undici/response.d.ts

@@ -31,7 +31,7 @@ export declare class Response {
     /**
      * --- 获取响应读取流对象 ---
      */
-    getStream(): (import("undici/types/readable").default & undici.Dispatcher.BodyMixin) | zlib.Gunzip | zlib.Inflate | zlib.BrotliDecompress | null;
+    getStream(): zlib.BrotliDecompress | zlib.Gunzip | zlib.Inflate | (import("undici/types/readable").default & undici.Dispatcher.BodyMixin) | null;
     /**
      * --- 获取原生响应读取流对象 ---
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "9.3.6",
+  "version": "9.3.8",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [
@@ -22,8 +22,8 @@
     "#kebab/*": "./*"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.1045.0",
-    "@aws-sdk/lib-storage": "^3.1045.0",
+    "@aws-sdk/client-s3": "^3.1047.0",
+    "@aws-sdk/lib-storage": "^3.1047.0",
     "@litert/http-client": "^1.1.2",
     "@litert/mime": "^0.1.3",
     "@litert/redis": "^3.2.1",
@@ -48,17 +48,17 @@
     "pg": "^8.20.0",
     "react": "^19.2.6",
     "react-dom": "^19.2.6",
-    "react-router-dom": "^7.15.0",
+    "react-router-dom": "^7.15.1",
     "ssh2": "^1.17.0",
     "svg-captcha": "^1.4.0",
-    "tailwind-merge": "^3.5.0",
-    "tencentcloud-sdk-nodejs": "^4.1.227",
-    "undici": "^8.2.0"
+    "tailwind-merge": "^3.6.0",
+    "tencentcloud-sdk-nodejs": "^4.1.232",
+    "undici": "^8.3.0"
   },
   "devDependencies": {
     "@litert/eslint-plugin-rules": "^0.3.1",
     "@types/ejs": "^3.1.5",
-    "@types/node": "^25.6.2",
+    "@types/node": "^25.8.0",
     "@types/pg": "^8.20.0",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",

package/sys/master.js

@@ -186,10 +186,16 @@ function createRpcListener() {
                         res.end('Path not found');
                         return;
                     }
-                    const rtn = await lCore.exec('npm i --omit=dev --omit=optional', {
+                    let rtn = await lCore.exec('npm i --omit=dev --omit=optional', {
                         'cwd': msg.path,
                     });
-                    if (!rtn) {
+                    if (rtn === false) {
+                        // --- 部分项目可能存在 peerDependencies 冲突，失败后降级为 legacy-peer-deps 再试一次 ---
+                        rtn = await lCore.exec('npm i --omit=dev --omit=optional --legacy-peer-deps', {
+                            'cwd': msg.path,
+                        });
+                    }
+                    if (rtn === false) {
                         res.end('Exec failed');
                         return;
                     }
@@ -252,6 +258,24 @@ function createRpcListener() {
                     }
                     break;
                 }
+                case 'package': {
+                    // --- 将用户的 package.json 的内容替换掉项目根的 package.json ---
+                    if (!msg.content || typeof msg.content !== 'string') {
+                        res.end('Invalid content');
+                        return;
+                    }
+                    const packageFile = kebab.ROOT_CWD + 'package.json';
+                    if (!await lFs.isFile(packageFile)) {
+                        res.end('package.json not found');
+                        return;
+                    }
+                    const wrtn = await lFs.putContent(packageFile, msg.content);
+                    if (!wrtn) {
+                        res.end('Failed to write package.json');
+                        return;
+                    }
+                    break;
+                }
                 case 'code': {
                     // --- 更新 code 代码包 ---
                     const rtn = await sRoute.getFormData(req);
@@ -323,6 +347,27 @@ function createRpcListener() {
                     }
                     /** --- kebab 子项目中仅允许部署的子文件夹名集合 --- */
                     const KEBAB_ALLOWED_DIRS = new Set(['ctr', 'data', 'stc', 'view', 'lib']);
+                    /** --- 常见开发、依赖、缓存、构建产物目录不参与部署 --- */
+                    const DEPLOY_EXCLUDE_DIRS = new Set([
+                        '.git',
+                        '.svn',
+                        '.hg',
+                        '.vscode',
+                        '.idea',
+                        '.history',
+                        'node_modules',
+                        'bower_components',
+                        '.cache',
+                        '.parcel-cache',
+                        '.turbo',
+                        '.next',
+                        '.nuxt',
+                        '.vite',
+                        'coverage',
+                        '.nyc_output',
+                        'tmp',
+                        'temp',
+                    ]);
                     for (const path in ls) {
                         /** --- 带 / 开头的 zip 中文件完整路径，例如 "/www/pika/ctr/api.js" --- */
                         const fpath = path.startsWith('/') ? path : '/' + path;
@@ -332,6 +377,10 @@ function createRpcListener() {
                         const pat = fpath.slice(1, lio + 1);
                         /** --- 纯文件名，例如 "api.js" --- */
                         const fname = fpath.slice(lio + 1);
+                        if (fpath.slice(1).split('/').slice(0, -1).some(seg => DEPLOY_EXCLUDE_DIRS.has(seg))) {
+                            // --- 开发、依赖、缓存、构建产物目录不覆盖 ---
+                            continue;
+                        }
                         if ((pat === 'conf/' && fname === 'config.json') || fname === 'kebab.json') {
                             // --- 特殊文件不能覆盖 ---
                             continue;