@maiyunnet/kebab 9.1.4 → 9.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "9.1.4",
+  "version": "9.2.1",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [
@@ -52,7 +52,8 @@
     "ssh2": "^1.17.0",
     "svg-captcha": "^1.4.0",
     "tailwind-merge": "^3.5.0",
-    "tencentcloud-sdk-nodejs": "^4.1.199"
+    "tencentcloud-sdk-nodejs": "^4.1.199",
+    "undici": "^8.1.0"
   },
   "devDependencies": {
     "@litert/eslint-plugin-rules": "^0.3.1",

package/sys/master.js

@@ -546,19 +546,26 @@ function startFileWatcher() {
      * --- 监听指定目录的文件变化 ---
      * @param dir 要监听的目录路径
      */
-    const watchDir = (dir) => {
+    const watchDir = async (dir) => {
+        if (!await lFs.isDir(dir)) {
+            return;
+        }
         try {
-            fs.watch(dir, { 'recursive': true }, (eventType, filename) => {
+            const watcher = fs.watch(dir, { 'recursive': true }, (eventType, filename) => {
                 if (!filename) {
                     return;
                 }
+                const formatName = filename.replace(/\\/g, '/');
                 // --- 仅关注 .js 文件和 .json 配置文件的变更 ---
-                if (!filename.endsWith('.js') &&
-                    !filename.endsWith('.json')) {
+                if (!formatName.endsWith('.js') &&
+                    !formatName.endsWith('.json')) {
                     return;
                 }
-                // --- 忽略日志目录和临时目录 ---
-                if (filename.includes('log/') || filename.includes('ftmp/') || filename.includes('node_modules/')) {
+                // --- 忽略日志目录、临时目录、git 目录和 node_modules ---
+                if (formatName.includes('log/') ||
+                    formatName.includes('ftmp/') ||
+                    formatName.includes('node_modules/') ||
+                    formatName.includes('.git/')) {
                     return;
                 }
                 // --- 防抖：500ms 内多次变化只触发一次 ---
@@ -571,7 +578,7 @@ function startFileWatcher() {
                         return;
                     }
                     restarting = true;
-                    lCore.display(`[HMR] File changed: ${filename}, reloading workers...`);
+                    lCore.display(`[HMR] File changed: ${formatName}, reloading workers...`);
                     (async () => {
                         // --- 为所有子进程发送 stop 信息并重启 ---
                         for (const pid in workerList) {
@@ -589,20 +596,23 @@ function startFileWatcher() {
                     });
                 }, 500);
             });
+            watcher.on('error', (err) => {
+                lCore.display(`[HMR] Watcher error on ${dir}:`, err);
+            });
             lCore.display(`[HMR] Watching directory: ${dir}`);
         }
-        catch {
-            lCore.display(`[HMR] Cannot watch directory: ${dir}`);
+        catch (err) {
+            lCore.display(`[HMR] Cannot watch directory: ${dir}`, err);
         }
     };
     // --- 监听 www/ 目录（用户项目代码）---
-    watchDir(kebab.WWW_CWD);
+    watchDir(kebab.WWW_CWD).catch(() => { });
     // --- 监听 ind/ 目录（独立任务代码）---
-    watchDir(kebab.IND_CWD);
+    watchDir(kebab.IND_CWD).catch(() => { });
     // --- 监听 lib/ 目录（用户自定义库）---
-    watchDir(kebab.LIB_CWD);
+    watchDir(kebab.LIB_CWD).catch(() => { });
     // --- 监听 mod/ 目录（用户模型）---
-    watchDir(kebab.MOD_CWD);
+    watchDir(kebab.MOD_CWD).catch(() => { });
 }
 run().catch(function (e) {
     lCore.display('[master] ------ [Process fatal Error] ------');

package/sys/route.js

@@ -12,7 +12,8 @@ import * as lFs from '#kebab/lib/fs.js';
 import * as lZlib from '#kebab/lib/zlib.js';
 import * as lCore from '#kebab/lib/core.js';
 import * as lText from '#kebab/lib/text.js';
-import * as lResponse from '#kebab/lib/net/response.js';
+import * as lNetResponse from '#kebab/lib/net/response.js';
+import * as lUndiciResponse from '#kebab/lib/undici/response.js';
 import * as lWs from '#kebab/lib/ws.js';
 import * as lLang from '#kebab/lib/lang.js';
 import * as sCtr from './ctr.js';
@@ -600,7 +601,9 @@ export async function run(data) {
             }
         }
     }
-    else if (rtn instanceof stream.Readable || rtn instanceof lResponse.Response) {
+    else if (rtn instanceof stream.Readable ||
+        rtn instanceof lNetResponse.Response ||
+        rtn instanceof lUndiciResponse.Response) {
         // --- 返回的是流，那就以管道的形式输出 ---
         const stm = rtn instanceof stream.Readable ? rtn : rtn.getStream();
         if (!stm) {

package/www/example/ctr/middle.js

@@ -3,11 +3,12 @@ import * as sCtr from '#kebab/sys/ctr.js';
 export default class extends sCtr.Ctr {
     async onReqStart() {
         if (await lNet.rproxy(this, {
-            'test/net-rproxy/': 'https://cdn.jsdelivr.net/npm/deskrt@2.0.10/'
+            'test/net-rproxy/': 'https://cdn.jsdelivr.net/npm/deskrt@2.0.10/',
+            'test/undici-rproxy/': 'https://cdn.jsdelivr.net/npm/deskrt@2.0.10/'
         })) {
             return -1;
         }
-        if (this._config.const.path === 'test/net-mproxy1') {
+        if (this._config.const.path === 'test/net-mproxy1' || this._config.const.path === 'test/undici-mproxy1') {
             return 0;
         }
         return 1;

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

@@ -93,6 +93,38 @@ export default class extends sCtr.Ctr {
     netGetResponseJson(): Promise<string>;
     getResponseJson1(): any[];
     getResponseJson2(): any[];
+    undici(): Promise<string>;
+    undiciPipe(): Promise<kebab.Json>;
+    undiciPost(): Promise<kebab.Json>;
+    undiciPost1(): string;
+    undiciPostString(): Promise<string>;
+    undiciPostString1(): kebab.Json[];
+    undiciOpen(): Promise<kebab.Json>;
+    undiciFormTest(): Promise<string>;
+    undiciUpload(): Promise<string>;
+    undiciUpload1(): Promise<string>;
+    undiciCookie(): Promise<string>;
+    undiciCookie1(): string;
+    undiciCookie2(): string;
+    undiciSave(): Promise<string>;
+    undiciFollow(): Promise<string>;
+    undiciFollow1(): void;
+    undiciFollow2(): kebab.Json;
+    undiciReuse(): Promise<string>;
+    undiciError(): Promise<string>;
+    undiciHosts(): Promise<string>;
+    undiciMproxy(): Promise<string | boolean>;
+    undiciMproxy1(): Promise<string | boolean>;
+    undiciMproxy2(): any[];
+    undiciFilterheaders(): string;
+    undiciFetch(): Promise<string | boolean>;
+    undiciFetch1(): any[];
+    undiciGetResponseJson(): Promise<string>;
+    undiciGetResponseJson1(): any[];
+    undiciGetResponseJson2(): any[];
+    /** --- 测试 ProxyAgent --- */
+    private readonly _undiciProxyAgent;
+    undiciProxy(): Promise<string>;
     scan(): Promise<kebab.Json>;
     scan1(): Promise<kebab.Json>;
     scan2(): Promise<kebab.Json>;