@maiyunnet/kebab 9.1.3 → 9.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "9.1.3",
+  "version": "9.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": [
@@ -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/cmd.js

@@ -506,7 +506,10 @@ async function run() {
                 const tmpCss = entry + '.__tw__.css';
                 await lFs.putContent(tmpCss, `@import "tailwindcss";\n@source "./**/*.tsx";\n`);
                 try {
-                    const twJs = fileURLToPath(new URL('../node_modules/@tailwindcss/cli/dist/index.mjs', import.meta.url));
+                    // --- 优先从用户项目根目录查找，找不到则 fallback 到 kebab 包自身目录（用于 kebab 开发模式）---
+                    const twJsUser = kebab.ROOT_CWD + 'node_modules/@tailwindcss/cli/dist/index.mjs';
+                    const twJsSelf = fileURLToPath(new URL('../node_modules/@tailwindcss/cli/dist/index.mjs', import.meta.url));
+                    const twJs = await lFs.isFile(twJsUser) ? twJsUser : twJsSelf;
                     await new Promise((resolve, reject) => {
                         const proc = childProcess.spawn(process.execPath, [twJs, '-i', tmpCss, '-o', cssOut, '--minify'], { 'shell': false });
                         const errLines = [];

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>;