@maiyunnet/kebab 8.4.0 → 8.5.0

package/doc/kebab-rag.md

@@ -1410,7 +1410,7 @@ index/variables/VER.md
 
 # Variable: VER
 
-> `const` **VER**: `"8.4.0"` = `'8.4.0'`
+> `const` **VER**: `"8.5.0"` = `'8.5.0'`
 
 Defined in: [index.ts:10](https://github.com/maiyunnet/kebab/blob/master/index.ts#L10)
 
@@ -11882,7 +11882,7 @@ Defined in: [lib/net/response.ts:30](https://github.com/maiyunnet/kebab/blob/mas
 
 > **getRawStream**(): `Readable` \| `null`
 
-Defined in: [lib/net/response.ts:55](https://github.com/maiyunnet/kebab/blob/master/lib/net/response.ts#L55)
+Defined in: [lib/net/response.ts:65](https://github.com/maiyunnet/kebab/blob/master/lib/net/response.ts#L65)
 
 获取原生响应读取流对象
 
@@ -11896,7 +11896,7 @@ Defined in: [lib/net/response.ts:55](https://github.com/maiyunnet/kebab/blob/mas
 
 > **getStream**(): `Readable` \| `null`
 
-Defined in: [lib/net/response.ts:48](https://github.com/maiyunnet/kebab/blob/master/lib/net/response.ts#L48)
+Defined in: [lib/net/response.ts:53](https://github.com/maiyunnet/kebab/blob/master/lib/net/response.ts#L53)
 
 获取响应读取流对象
 
@@ -11910,7 +11910,7 @@ Defined in: [lib/net/response.ts:48](https://github.com/maiyunnet/kebab/blob/mas
 
 > **setContent**(`v`): `void`
 
-Defined in: [lib/net/response.ts:41](https://github.com/maiyunnet/kebab/blob/master/lib/net/response.ts#L41)
+Defined in: [lib/net/response.ts:46](https://github.com/maiyunnet/kebab/blob/master/lib/net/response.ts#L46)
 
 用户自定义的 content 内容
 

package/index.d.ts

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

package/index.js

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

package/lib/net/response.js

@@ -16,7 +16,12 @@ export class Response {
         if (this._content) {
             return this._content;
         }
-        return this._req ? this._req.getBuffer() : null;
+        try {
+            return this._req ? await this._req.getBuffer() : null;
+        }
+        catch {
+            return null;
+        }
     }
     /**
      * --- 用户自定义的 content 内容 ---
@@ -29,12 +34,22 @@ export class Response {
      * --- 获取响应读取流对象 ---
      */
     getStream() {
-        return this._req ? this._req.getStream() : null;
+        try {
+            return this._req ? this._req.getStream() : null;
+        }
+        catch {
+            return null;
+        }
     }
     /**
      * --- 获取原生响应读取流对象 ---
      */
     getRawStream() {
-        return this._req ? this._req.getRawStream() : null;
+        try {
+            return this._req ? this._req.getRawStream() : null;
+        }
+        catch {
+            return null;
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "8.4.0",
+  "version": "8.5.0",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [

package/sys/child.js

@@ -303,7 +303,7 @@ async function requestHandler(req, res, https) {
                         'rootPath': vhost.real + now,
                         'urlBase': '/' + now,
                         'path': path.slice(1),
-                        'timer': timer
+                        'timer': timer,
                     })) {
                         return;
                     }
@@ -577,14 +577,34 @@ function getVhostReal(root) {
  * @param hostname 当前的 hostname，不带端口
  */
 async function getVhostByHostname(hostname) {
-    let vGlobal;
+    /** --- 全局泛匹配（*）的对象 --- */
+    let vGlobal = null;
+    /** --- 全局泛匹配（*）的真实路径，例如 /www/wwwroot/ --- */
     let vGlobalReal = '';
-    let vSub;
+    /** --- 通配符匹配（*.abc.com）的对象 --- */
+    let vSub = null;
+    /** --- 通配符匹配（*.abc.com）的真实路径，例如 /www/wwwroot/abc/ --- */
     let vSubReal = '';
-    for (const vhost of vhosts) {
+    /** --- 条目循环标签 --- */
+    vhostLoop: for (const vhost of vhosts) {
         for (let domain of vhost.domains) {
+            if (domain === hostname) {
+                // --- 完全匹配 ---
+                const real = getVhostReal(vhost.root);
+                if (await lFs.isDir(real)) {
+                    return { ...vhost, real };
+                }
+            }
+            if (vSub && vGlobal) {
+                // --- 意味着已经找到了更精准的子域名匹配和全局匹配，后续所有 vhost 和 domain 无需再通过正则或磁盘 IO 进行匹配判断 ---
+                break vhostLoop;
+            }
             if (domain === '*') {
                 // --- 全局泛匹配 ---
+                if (vGlobal) {
+                    // --- 已经有了全局匹配结果，无需重复赋值，跳过后续逻辑以节省性能 ---
+                    continue;
+                }
                 const real = getVhostReal(vhost.root);
                 if (await lFs.isDir(real)) {
                     vGlobal = vhost;
@@ -593,8 +613,12 @@ async function getVhostByHostname(hostname) {
             }
             else if (domain.includes('*')) {
                 // --- 通配符匹配 ---
-                domain = domain.replace(/\./g, '\\.').replace(/\*/g, '[\\w-]+?');
-                if (new RegExp(`^${domain}$`).test(hostname)) {
+                if (vSub) {
+                    // --- 已经存在子域名通配符匹配结果，按照优先级不再寻找其他通配符匹配，跳过正则计算 ---
+                    continue;
+                }
+                const pattern = domain.replace(/\./g, '\\.').replace(/\*/g, '[\\w-]+?');
+                if (new RegExp(`^${pattern}$`).test(hostname)) {
                     const real = getVhostReal(vhost.root);
                     if (await lFs.isDir(real)) {
                         vSub = vhost;
@@ -602,13 +626,6 @@ async function getVhostByHostname(hostname) {
                     }
                 }
             }
-            else if (domain === hostname) {
-                // --- 完全匹配 ---
-                const real = getVhostReal(vhost.root);
-                if (await lFs.isDir(real)) {
-                    return { ...vhost, real };
-                }
-            }
         }
     }
     if (vSub) {

package/www/example/ctr/test.js

@@ -106,8 +106,7 @@ export default class extends sCtr.Ctr {
             `<br><a href="${this._config.const.urlBase}test/json?type=9">View "test/json?type=9"</a>`,
             '<br><br><b>Ctr:</b>',
             `<br><br><a href="${this._config.const.urlBase}test/ctr-xsrf">View "test/ctr-xsrf"</a>`,
-            `<br><a href="${this._config.const.urlBase}test/ctr-checkinput">View "test/ctr-checkinput"</a>`,
-            `<br><a href="${this._config.const.urlBase}test/ctr-checkinput-schema">View "test/ctr-checkinput-schema"</a>`,
+            `<br><a href="${this._config.const.urlBase}test/ctr-checkinput">View "test/ctr-checkinput"</a> <a href="${this._config.const.urlBase}test/ctr-checkinput-schema">schema</a>`,
             `<br><a href="${this._config.const.urlBase}test/ctr-locale">View "test/ctr-locale"</a>`,
             `<br><a href="${this._config.const.urlBase}test/ctr-cachettl">View "test/ctr-cachettl"</a>`,
             `<br><a href="${this._config.const.urlBase}test/ctr-httpcode">View "test/ctr-httpcode"</a>`,