@maiyunnet/kebab 3.2.16 → 3.2.17

package/index.d.ts

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

package/index.js

@@ -6,7 +6,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export const VER = '3.2.16';
+export const VER = '3.2.17';
 // --- 服务端用的路径 ---
 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.2.16",
+  "version": "3.2.17",
   "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

@@ -89,7 +89,8 @@ async function run() {
     }, function (req, res) {
         const host = (req.headers[':authority'] ?? req.headers['host'] ?? '');
         if (!host) {
-            req.socket.destroy();
+            res.statusCode = 403;
+            res.end();
             return;
         }
         const key = host + req.url;
@@ -115,7 +116,7 @@ async function run() {
     }).on('upgrade', function (req, socket) {
         const host = (req.headers['host'] ?? '');
         if (!host) {
-            req.socket.destroy();
+            socket.destroy();
             return;
         }
         const key = host + (req.url ?? '');
@@ -140,7 +141,8 @@ async function run() {
     httpServer = http.createServer(function (req, res) {
         const host = (req.headers['host'] ?? '');
         if (!host) {
-            req.socket.destroy();
+            res.statusCode = 403;
+            res.end();
             return;
         }
         const key = host + (req.url ?? '');
@@ -164,7 +166,7 @@ async function run() {
     }).on('upgrade', function (req, socket) {
         const host = (req.headers['host'] ?? '');
         if (!host) {
-            req.socket.destroy();
+            socket.destroy();
             return;
         }
         const key = host + (req.url ?? '');
@@ -222,7 +224,7 @@ async function requestHandler(req, res, https) {
     if (host === undefined || typeof host !== 'string') {
         host = req.headers['host'];
         if (host === undefined) {
-            req.socket.destroy();
+            res.end();
             return;
         }
     }
@@ -230,7 +232,8 @@ async function requestHandler(req, res, https) {
     /** --- 当前的 vhost 配置文件 --- */
     const vhost = await getVhostByHostname(uri.hostname ?? '');
     if (!vhost) {
-        req.socket.destroy();
+        res.statusCode = 403;
+        res.end();
         return;
         /*
         const text = '<h1>Kebab: No permissions</h1>host: ' + (req.headers[':authority'] as string | undefined ?? req.headers['host'] ?? '') + '<br>url: ' + (lText.htmlescape(req.url ?? ''));

package/sys/route.js

@@ -218,7 +218,7 @@ export async function run(data) {
     headers['authorization'] ??= '';
     /** --- 开发者返回值 --- */
     let rtn;
-    if (data.socket && data.req instanceof http.IncomingMessage) {
+    if (data.socket && (data.req instanceof http.IncomingMessage)) {
         // --- socket 模式 ---
         // --- 判断真实控制器文件是否存在 ---
         let filePath = config.const.wsPath + pathLeft + '.js';
@@ -245,7 +245,7 @@ export async function run(data) {
         }
         catch (e) {
             lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
-            data.socket.destroy();
+            data.socket?.destroy();
             return true;
         }
         cctr.setPrototype('_param', param);
@@ -259,7 +259,7 @@ export async function run(data) {
         }
         catch (e) {
             lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
-            data.socket.destroy();
+            data.socket?.destroy();
             return true;
         }
         if (rtn === undefined || rtn === true) {
@@ -268,7 +268,7 @@ export async function run(data) {
             }
             catch (e) {
                 lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
-                data.socket.destroy();
+                data.socket?.destroy();
                 return true;
             }
             if (rtn === undefined || rtn === true) {