@maiyunnet/kebab 3.2.8 → 3.2.10

package/index.d.ts

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

package/index.js

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

package/lib/db.js

@@ -9,7 +9,6 @@ import * as mysql2 from 'mysql2/promise';
 import * as lTime from '#kebab/lib/time.js';
 import * as lSql from '#kebab/lib/sql.js';
 import * as lCore from '#kebab/lib/core.js';
-import * as lText from '#kebab/lib/text.js';
 import * as sCtr from '#kebab/sys/ctr.js';
 /** --- 连接列表池 --- */
 const connections = [];
@@ -170,7 +169,7 @@ export class Pool {
                 link.on('error', function (err) {
                     c.setLost();
                     if (err.code !== 'PROTOCOL_CONNECTION_LOST') {
-                        lCore.debug('[DB][_getConnection][error]', err);
+                        lCore.debug('[DB][_getConnection][error]', err.message);
                     }
                 }).on('end', () => {
                     // lCore.debug('[DB][_getConnection] connection end.');
@@ -182,7 +181,7 @@ export class Pool {
                 connections.push(conn);
             }
             catch (e) {
-                const msg = '[DB][_getConnection] ' + lText.stringifyJson(e.stack).slice(1, -1);
+                const msg = '[DB][_getConnection] ' + e.message;
                 lCore.debug(msg);
                 lCore.log({}, msg, '-error');
             }

package/lib/fs.js

@@ -426,9 +426,10 @@ export function createWriteStream(path, options) {
 export async function readToResponse(path, req, res, stat) {
     stat ??= await stats(path);
     if (!stat) {
-        res.setHeader('content-length', 22);
+        const content = '<h1>404 Not found</h1><hr>Kebab';
+        res.setHeader('content-length', Buffer.byteLength(content));
         res.writeHead(404);
-        res.end('<h1>404 Not found</h1><hr>Kebab');
+        res.end(content);
         return;
     }
     // --- 判断缓存以及 MIME 和编码 ---

package/lib/kv.js

@@ -618,7 +618,7 @@ export class Pool {
             link.on('error', function (err) {
                 conn.setLost();
                 // console.log(`--- redis [${conn._etc.host}:${conn._etc.port}] error ---`);
-                lCore.debug('[KV][ERROR]', err);
+                lCore.debug('[KV][ERROR]', err.message);
             }).on('end', () => {
                 conn.setLost();
             }).on('close', () => {

package/lib/socket.js

@@ -4,6 +4,7 @@
  * Last: 2025-9-25 16:49:48
  */
 import net from 'net';
+import * as lTime from '#kebab/lib/time.js';
 import * as lWs from '#kebab/lib/ws.js';
 import * as lCore from '#kebab/lib/core.js';
 /**
@@ -17,7 +18,7 @@ export function rwebsocket(port, url, opt = {}) {
     const server = net.createServer(socket => {
         (async () => {
             // --- 每次进一个新连接都反代到一个新 WebSocket ---
-            lCore.display('New client: ' + socket.remoteAddress + ':' + socket.remotePort);
+            lCore.display('[' + lTime.format(null, 'Y-m-d H:i:s') + '] New client: ' + socket.remoteAddress + ':' + socket.remotePort);
             /** --- 远程端的双向 websocket --- */
             const rws = await lWs.connect(url, opt);
             if (!rws) {
@@ -52,13 +53,13 @@ export function rwebsocket(port, url, opt = {}) {
                 rws.writeBinary(data);
             }).on('end', () => {
                 rws.end();
-                lCore.display('Client disconnected: ' + socket.remoteAddress + ':' + socket.remotePort);
+                lCore.display('[' + lTime.format(null, 'Y-m-d H:i:s') + '] Client disconnected: ' + socket.remoteAddress + ':' + socket.remotePort);
             }).on('error', err => {
-                lCore.display('Client error: ' + socket.remoteAddress + ':' + socket.remotePort + ', ' + err.message);
+                lCore.display('[' + lTime.format(null, 'Y-m-d H:i:s') + '] Client error: ' + socket.remoteAddress + ':' + socket.remotePort + ', ' + err.message);
             });
         })().catch(() => { });
     }).listen(port, () => {
-        lCore.display('Listening:' + port);
+        lCore.display('[' + lTime.format(null, 'Y-m-d H:i:s') + '] Listening: ' + port);
     });
     return server;
 }

package/package.json

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

@@ -206,9 +206,10 @@ async function requestHandler(req, res, https) {
                 // --- 已经开始输出的，需要用户自行处理 ---
                 return;
             }
-            res.setHeader('content-length', 37);
+            const content = '<h1>504 Gateway Timeout</h1><hr>Kebab';
+            res.setHeader('content-length', Buffer.byteLength(content));
             res.writeHead(504);
-            res.end('<h1>504 Gateway Timeout</h1><hr>Kebab');
+            res.end(content);
         }
     };
     timer.timer = setTimeout(timer.callback, timer.timeout);
@@ -257,10 +258,11 @@ async function requestHandler(req, res, https) {
             /** --- 'abc' / 'def.json' ---  */
             let stat = await lFs.stats(vhost.real + now + item);
             if (!stat) {
+                const content = '<h1>404 Not found</h1><hr>Kebab';
                 res.setHeader('content-type', 'text/html; charset=utf-8');
-                res.setHeader('content-length', 22);
+                res.setHeader('content-length', Buffer.byteLength(content));
                 res.writeHead(404);
-                res.end('<h1>404 Not found</h1><hr>Kebab');
+                res.end(content);
                 return;
             }
             if (stat.isDirectory()) {
@@ -292,10 +294,11 @@ async function requestHandler(req, res, https) {
                             'cookie': {},
                             'headers': {}
                         }, '[CHILD][requestHandler][E0]' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                        const content = '<h1>500 Server Error</h1><hr>Kebabb';
                         res.setHeader('content-type', 'text/html; charset=utf-8');
-                        res.setHeader('content-length', 25);
+                        res.setHeader('content-length', Buffer.byteLength(content));
                         res.writeHead(500);
-                        res.end('<h1>500 Server Error</h1><hr>Kebab');
+                        res.end(content);
                         return;
                     }
                 }
@@ -330,10 +333,11 @@ async function requestHandler(req, res, https) {
                 }
                 catch (e) {
                     lCore.log({}, '[CHILD][requestHandler][E1]' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                    const content = '<h1>500 Server Error</h1><hr>Kebabb';
                     res.setHeader('content-type', 'text/html; charset=utf-8');
-                    res.setHeader('content-length', 25);
+                    res.setHeader('content-length', Buffer.byteLength(content));
                     res.writeHead(500);
-                    res.end('<h1>500 Server Error</h1><hr>Kebab');
+                    res.end(content);
                     return;
                 }
             }
@@ -348,10 +352,11 @@ async function requestHandler(req, res, https) {
             return;
         }
     }
+    const content = '<h1>403 Forbidden</h1><hr>Kebab';
     res.setHeader('content-type', 'text/html; charset=utf-8');
-    res.setHeader('content-length', 22);
+    res.setHeader('content-length', Buffer.byteLength(content));
     res.writeHead(403);
-    res.end('<h1>403 Forbidden</h1><hr>Kebab');
+    res.end(content);
 }
 /**
  * --- WebSocket 响应 handler ---

package/sys/ctr.d.ts

@@ -253,12 +253,12 @@ export declare class Ctr {
      * --- 发送 socket ping ---
      * @param data 要发送的信息
      */
-    protected _ping(): boolean;
+    protected _ping(data?: Buffer | string): boolean;
     /**
      * --- 发送 socket pong ---
      * @param data 要发送的信息
      */
-    protected _pong(): boolean;
+    protected _pong(data?: Buffer | string): boolean;
     /**
      * --- 主动关闭当前 socket 连接 ---
      */

package/sys/ctr.js

@@ -725,15 +725,15 @@ export class Ctr {
      * --- 发送 socket ping ---
      * @param data 要发送的信息
      */
-    _ping() {
-        return this._socket.ping();
+    _ping(data) {
+        return this._socket.ping(data);
     }
     /**
      * --- 发送 socket pong ---
      * @param data 要发送的信息
      */
-    _pong() {
-        return this._socket.pong();
+    _pong(data) {
+        return this._socket.pong(data);
     }
     /**
      * --- 主动关闭当前 socket 连接 ---

package/sys/route.js

@@ -36,9 +36,11 @@ export async function run(data) {
         const configContent = await lFs.getContent(data.rootPath + 'kebab.json', 'utf8');
         if (!configContent) {
             if (data.res) {
-                data.res.setHeader('content-length', 53);
+                const content = '<h1>500 File kebab.json can not be read</h1><hr>Kebab';
+                data.res.setHeader('content-type', 'text/html; charset=utf-8');
+                data.res.setHeader('content-length', Buffer.byteLength(content));
                 data.res.writeHead(500);
-                data.res.end('<h1>500 File kebab.json can not be read</h1><hr>Kebab');
+                data.res.end(content);
             }
             else {
                 data.socket?.destroy();
@@ -179,7 +181,6 @@ export async function run(data) {
     }
     // --- 若文件名为保留的 middle 将不允许进行 ---
     if (pathLeft.startsWith('middle')) {
-        const text = '[Error] Controller not found, path: ' + path + '.';
         if (data.res) {
             if (config.route['#404']) {
                 data.res.setHeader('location', lText.urlResolve(config.const.urlBase, config.route['#404']));
@@ -187,10 +188,11 @@ export async function run(data) {
                 data.res.end('');
                 return true;
             }
+            const content = '[Error] Controller not found, path: ' + path + '.';
             data.res.setHeader('content-type', 'text/html; charset=utf-8');
-            data.res.setHeader('content-length', Buffer.byteLength(text));
+            data.res.setHeader('content-length', Buffer.byteLength(content));
             data.res.writeHead(404);
-            data.res.end(text);
+            data.res.end(content);
         }
         else {
             data.socket?.destroy();
@@ -235,7 +237,7 @@ export async function run(data) {
         // --- 先处理 web socket 的情况 ---
         let wsSocket;
         try {
-            const options = await cctr.onUpgrade();
+            const options = cctr.onUpgrade();
             // --- 默认无消息发送 3 分钟 ---
             options.timeout ??= 60_000 * 3;
             wsSocket = lWs.createServer(data.req, data.socket, options);
@@ -410,10 +412,11 @@ export async function run(data) {
     }
     catch (e) {
         lCore.log(middle, '(E03)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+        const content = '<h1>500 Server Error</h1><hr>Kebab';
         data.res.setHeader('content-type', 'text/html; charset=utf-8');
-        data.res.setHeader('content-length', 25);
+        data.res.setHeader('content-length', Buffer.byteLength(content));
         data.res.writeHead(500);
-        data.res.end('<h1>500 Server Error</h1><hr>Kebab');
+        data.res.end(content);
         return true;
     }
     let cacheTTL = middle.getPrototype('_cacheTTL');
@@ -425,10 +428,11 @@ export async function run(data) {
         }
         catch (e) {
             lCore.log(middle, '(E05)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+            const content = '<h1>500 Server Error</h1><hr>Kebab';
             data.res.setHeader('content-type', 'text/html; charset=utf-8');
-            data.res.setHeader('content-length', 25);
+            data.res.setHeader('content-length', Buffer.byteLength(content));
             data.res.writeHead(500);
-            data.res.end('<h1>500 Server Error</h1><hr>Kebab');
+            data.res.end(content);
             return true;
         }
         cacheTTL = middle.getPrototype('_cacheTTL');
@@ -438,17 +442,17 @@ export async function run(data) {
             const filePath = config.const.ctrPath + pathLeft + '.js';
             if (!await lFs.isFile(filePath)) {
                 // --- 指定的控制器不存在 ---
-                const text = '[Error] Controller not found, path: ' + path + '.';
                 if (config.route['#404']) {
                     data.res.setHeader('location', lText.urlResolve(config.const.urlBase, config.route['#404']));
                     data.res.writeHead(302);
                     data.res.end('');
                     return true;
                 }
+                const content = '[Error] Controller not found, path: ' + path + '.';
                 data.res.setHeader('content-type', 'text/html; charset=utf-8');
-                data.res.setHeader('content-length', Buffer.byteLength(text));
+                data.res.setHeader('content-length', Buffer.byteLength(content));
                 data.res.writeHead(404);
-                data.res.end(text);
+                data.res.end(content);
                 return true;
             }
             // --- 加载控制器文件 ---
@@ -491,11 +495,11 @@ export async function run(data) {
                     data.res.end('');
                     return true;
                 }
-                const text = '[Error] Action not found, path: ' + path + '.';
+                const content = '[Error] Action not found, path: ' + path + '.';
                 data.res.setHeader('content-type', 'text/html; charset=utf-8');
-                data.res.setHeader('content-length', Buffer.byteLength(text));
+                data.res.setHeader('content-length', Buffer.byteLength(content));
                 data.res.writeHead(404);
-                data.res.end(text);
+                data.res.end(content);
                 return true;
             }
             pathRight = pathRight.replace(/-([a-zA-Z0-9])/g, function (t, t1) {
@@ -508,11 +512,11 @@ export async function run(data) {
                     data.res.end('');
                     return true;
                 }
-                const text = '[Error] Action not found, path: ' + path + '.';
+                const content = '[Error] Action not found, path: ' + path + '.';
                 data.res.setHeader('content-type', 'text/html; charset=utf-8');
-                data.res.setHeader('content-length', Buffer.byteLength(text));
+                data.res.setHeader('content-length', Buffer.byteLength(content));
                 data.res.writeHead(404);
-                data.res.end(text);
+                data.res.end(content);
                 return true;
             }
             // --- 执行 onLoad 方法 ---
@@ -535,10 +539,11 @@ export async function run(data) {
                     }
                     catch (e) {
                         lCore.log(cctr, '(E05)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                        const content = '<h1>500 Server Error</h1><hr>Kebab';
                         data.res.setHeader('content-type', 'text/html; charset=utf-8');
-                        data.res.setHeader('content-length', 25);
+                        data.res.setHeader('content-length', Buffer.byteLength(content));
                         data.res.writeHead(500);
-                        data.res.end('<h1>500 Server Error</h1><hr>Kebab');
+                        data.res.end(content);
                         await waitCtr(cctr);
                         return true;
                     }
@@ -549,10 +554,11 @@ export async function run(data) {
             }
             catch (e) {
                 lCore.log(cctr, '(E04)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                const content = '<h1>500 Server Error</h1><hr>Kebab';
                 data.res.setHeader('content-type', 'text/html; charset=utf-8');
-                data.res.setHeader('content-length', 25);
+                data.res.setHeader('content-length', Buffer.byteLength(content));
                 data.res.writeHead(500);
-                data.res.end('<h1>500 Server Error</h1><hr>Kebab');
+                data.res.end(content);
                 await waitCtr(cctr);
                 return true;
             }

package/www/example/ctr/test.js

@@ -31,7 +31,7 @@ export default class extends sCtr.Ctr {
     }
     onLoad() {
         if (this._config.const.hostname !== '127.0.0.1' && this._config.const.hostname !== '172.17.0.1' &&
-            this._config.const.hostname !== 'localhost' && this._config.const.hostname !== 'local-test.brc-app.com' &&
+            this._config.const.hostname !== 'localhost' && !this._config.const.hostname.endsWith('.local.brc-app.com') &&
             !this._config.const.hostname.startsWith('192.168.')) {
             return [0, 'Please use 127.0.0.1 or local to access the file (' + this._config.const.host + ').'];
         }