@maiyunnet/kebab 3.1.10 → 3.1.12

package/index.d.ts

@@ -8,7 +8,7 @@
  * ------------------------
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "3.1.10";
+export declare const VER = "3.1.12";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;

package/index.js

@@ -9,7 +9,7 @@
  * ------------------------
  */
 /** --- 当前系统版本号 --- */
-export const VER = '3.1.10';
+export const VER = '3.1.12';
 // --- 服务端用的路径 ---
 const imu = decodeURIComponent(import.meta.url).replace('file://', '').replace(/^\/(\w:)/, '$1');
 /** --- /xxx/xxx --- */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "3.1.10",
+  "version": "3.1.12",
   "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

@@ -573,7 +573,7 @@ process.on('message', function (msg) {
 });
 /**
  * --- 获取匹配的 vhost 对象 ---
- * --- 如果有精准匹配，以精准匹配为准，否则为 2 级泛匹配（vSub），最后全局泛匹配（vGlobal） ---
+ * --- 如果有精准匹配，以精准匹配为准，否则为通配符匹配（vSub），最后全局泛匹配（vGlobal） ---
  * @param hostname 当前的 hostname，不带端口
  */
 function getVhostByHostname(hostname) {
@@ -585,9 +585,9 @@ function getVhostByHostname(hostname) {
                 vGlobal = vhost;
             }
             else if (domain.includes('*')) {
-                // --- 2 级泛匹配 ---
-                domain = domain.replace(/\*/, '^.+?').replace(/\./, '\\.');
-                if (new RegExp(domain + '$').test(hostname)) {
+                // --- 通配符匹配 ---
+                domain = domain.replace(/\*/, '.+?').replace(/\./, '\\.');
+                if (new RegExp(`^${domain}$`).test(hostname)) {
                     vSub = vhost;
                 }
             }

package/sys/route.js

@@ -223,7 +223,7 @@ export async function run(data) {
     let rtn;
     if (data.socket && data.req instanceof http.IncomingMessage) {
         // --- socket 模式，判断真实控制器文件是否存在 ---
-        const filePath = config.const.wsPath + pathLeft + '.js';
+        const filePath = config.const.wsPath + (pathLeft || 'root') + '.js';
         if (!await lFs.isFile(filePath)) {
             // --- 指定的控制器不存在 ---
             data.socket?.destroy();