@maiyunnet/kebab 8.0.1 → 8.0.3

package/doc/kebab-rag.md

@@ -576,9 +576,9 @@ Defined in: [index.ts:149](https://github.com/maiyunnet/kebab/blob/master/index.
 
 ***
 
-### name
+### name?
 
-> **name**: `string`
+> `optional` **name**: `string`
 
 Defined in: [index.ts:152](https://github.com/maiyunnet/kebab/blob/master/index.ts#L152)
 
@@ -1385,7 +1385,7 @@ index/variables/VER.md
 
 # Variable: VER
 
-> `const` **VER**: `"8.0.1"` = `'8.0.1'`
+> `const` **VER**: `"8.0.3"` = `'8.0.3'`
 
 Defined in: [index.ts:10](https://github.com/maiyunnet/kebab/blob/master/index.ts#L10)
 
@@ -6838,9 +6838,9 @@ Defined in: [lib/db/pool.ts:27](https://github.com/maiyunnet/kebab/blob/master/l
 
 ***
 
-### name
+### name?
 
-> **name**: `string`
+> `optional` **name**: `string`
 
 Defined in: [lib/db/pool.ts:24](https://github.com/maiyunnet/kebab/blob/master/lib/db/pool.ts#L24)
 

package/index.d.ts

@@ -5,7 +5,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "8.0.1";
+export declare const VER = "8.0.3";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;
@@ -118,7 +118,7 @@ export interface IConfigDb {
     'host': string;
     'port': number;
     'charset': string;
-    'name': string;
+    'name'?: string;
     'user': string;
     'pwd': string;
 }

package/index.js

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

package/lib/db/pool.d.ts

@@ -9,7 +9,7 @@ export interface IConnectionInfo {
     'last': number;
     'host': string;
     'port': number;
-    'name': string;
+    'name'?: string;
     'user': string;
     'lost': boolean;
     'using': boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "8.0.1",
+  "version": "8.0.3",
   "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/mod.js

@@ -134,7 +134,7 @@ export default class Mod {
             sq.values(cs);
             const r = await db.execute(sq.getSql(), sq.getData());
             if (r.packet === null) {
-                lCore.log(opt.ctr ?? {}, '[MOD][insert] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1), '-error');
+                lCore.log(opt.ctr ?? {}, '[MOD][insert] ' + (lText.stringifyJson(r.error?.message ?? '').slice(1, -1) + '-' + sq.format()).replaceAll('"', '""'), '-error');
                 return false;
             }
             return r.packet.affected ? true : null;
@@ -154,7 +154,7 @@ export default class Mod {
             sq.values(cs, vs.slice(i * line, (i + 1) * line));
             const r = await db.execute(sq.getSql(), sq.getData());
             if (r.packet === null) {
-                lCore.log(opt.ctr ?? {}, '[MOD][insert] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1), '-error');
+                lCore.log(opt.ctr ?? {}, '[MOD][insert] ' + (lText.stringifyJson(r.error?.message ?? '').slice(1, -1) + '-' + sq.format()).replaceAll('"', '""'), '-error');
                 return false;
             }
             if (r.packet.affected) {
@@ -204,7 +204,7 @@ export default class Mod {
             }
             const r = await db.execute(sq.getSql(), sq.getData());
             if (r.packet === null) {
-                lCore.log(opt.ctr ?? {}, '[MOD][removeByWhere] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                lCore.log(opt.ctr ?? {}, '[MOD][removeByWhere] ' + (lText.stringifyJson(r.error?.message ?? '').slice(1, -1) + '-' + sq.format()).replaceAll('"', '""'), '-error');
                 return false;
             }
             if (r.packet.affected) {
@@ -259,7 +259,7 @@ export default class Mod {
             }
             const r = await db.execute(sq.getSql(), sq.getData());
             if (r.packet === null) {
-                lCore.log(opt.ctr ?? {}, '[MOD][updateByWhere] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                lCore.log(opt.ctr ?? {}, '[MOD][updateByWhere] ' + (lText.stringifyJson(r.error?.message ?? '').slice(1, -1) + '-' + sq.format()).replaceAll('"', '""'), '-error');
                 return false;
             }
             if (r.packet.affected) {
@@ -358,7 +358,7 @@ export default class Mod {
                 .where({ [key]: keys });
             const r = await db.execute(sq.getSql(), sq.getData());
             if (r.packet === null) {
-                lCore.log(opt.ctr ?? {}, '[MOD][updateList] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                lCore.log(opt.ctr ?? {}, '[MOD][updateList] ' + (lText.stringifyJson(r.error?.message ?? '').slice(1, -1) + ' - ' + sq.format()).replaceAll('"', '""'), '-error');
                 return false;
             }
         }
@@ -502,7 +502,7 @@ export default class Mod {
         sq.select(this._$primary, this._$table + (opt.index ? ('_' + opt.index) : '')).where(where);
         const r = await db.query(sq.getSql(), sq.getData());
         if (r.rows === null) {
-            lCore.log(opt.ctr ?? {}, '[primarys, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(opt.ctr ?? {}, '[MOD][PRIMARYS] ' + (lText.stringifyJson(r.error?.message ?? '').slice(1, -1) + ' - ' + sq.format()).replaceAll('"', '""'), '-error');
             return false;
         }
         const primarys = [];
@@ -615,7 +615,7 @@ export default class Mod {
                 }
                 // --- 未处理的错误 ---
                 const service = this._db.getService();
-                lCore.log(this._ctr ?? {}, '[MOD][create0][' + cstr._$table + '] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                lCore.log(this._ctr ?? {}, '[MOD][create0][' + cstr._$table + '] ' + (lText.stringifyJson(r.error?.message ?? '').slice(1, -1) + ' - ' + this._sql.format()).replaceAll('"', '""'), '-error');
                 if (lCore.globalConfig.debug) {
                     lCore.debug('[MOD][create0][' + cstr._$table + ']', service !== null ? lDb.ESERVICE[service] : 'NONE', r);
                     lCore.debug(this._sql.format());
@@ -629,7 +629,7 @@ export default class Mod {
             r = await this._db.execute(this._sql.getSql(), this._sql.getData());
             if (r.error) {
                 if (r.error.errno !== 1062) {
-                    lCore.log(this._ctr ?? {}, '[MOD][create1][' + cstr._$table + '] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                    lCore.log(this._ctr ?? {}, '[MOD][create1][' + cstr._$table + '] ' + (lText.stringifyJson(r.error?.message ?? '').slice(1, -1) + ' - ' + this._sql.format()).replaceAll('"', '""'), '-error');
                     if (lCore.globalConfig.debug) {
                         lCore.debug('[MOD][create1][' + cstr._$table + ']', r);
                         lCore.debug(this._sql.format());
@@ -692,7 +692,7 @@ export default class Mod {
         }
         const r = await this._db.query(this._sql.getSql(), this._sql.getData());
         if (r.rows === null) {
-            lCore.log(this._ctr ?? {}, '[MOD][refresh] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[MOD][refresh] ' + (lText.stringifyJson(r.error?.message ?? '').slice(1, -1) + ' - ' + this._sql.format()).replace(/"/g, '""'), '-error');
             return false;
         }
         if (r.rows.length === 0) {
@@ -723,7 +723,7 @@ export default class Mod {
         });
         const r = await this._db.execute(this._sql.getSql(), this._sql.getData());
         if (r.packet === null) {
-            lCore.log(this._ctr ?? {}, '[MOD][save] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[MOD][save] ' + (lText.stringifyJson(r.error?.message ?? '').slice(1, -1) + ' - ' + this._sql.format()).replaceAll('"', '""'), '-error');
             return false;
         }
         if (r.packet.affected) {
@@ -744,7 +744,7 @@ export default class Mod {
             }]);
         const r = await this._db.execute(this._sql.getSql(), this._sql.getData());
         if (r.packet === null) {
-            lCore.log(this._ctr ?? {}, '[remove, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[MOD][remove] ' + (lText.stringifyJson(r.error?.message ?? '').slice(1, -1) + ' - ' + this._sql.format()).replaceAll('"', '""'), '-error');
             return false;
         }
         if (r.packet.affected) {
@@ -766,7 +766,7 @@ export default class Mod {
         }
         const r = await this._db.query(this._sql.getSql(), this._sql.getData());
         if (r.rows === null) {
-            lCore.log(this._ctr ?? {}, '[first, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[MOD][first] ' + (lText.stringifyJson(r.error?.message ?? '').slice(1, -1) + ' - ' + this._sql.format()).replaceAll('"', '""'), '-error');
             return false;
         }
         if (r.rows.length === 0) {
@@ -897,7 +897,7 @@ export default class Mod {
                 const lsql = sql.replace(/ LIMIT [0-9 ,]+(OFFSET [0-9]+)?/g, ` LIMIT ${remain} OFFSET ${cz}`);
                 const r = await this._db.query(lsql, this._sql.getData());
                 if (r.rows === null) {
-                    lCore.log(this._ctr ?? {}, '[MOD][all] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                    lCore.log(this._ctr ?? {}, '[MOD][all] ' + (lText.stringifyJson(r.error?.message ?? '').slice(1, -1) + ' - ' + this._sql.format()).replaceAll('"', '""'), '-error');
                     return false;
                 }
                 if (key) {
@@ -934,7 +934,7 @@ export default class Mod {
         const contain = this._contain ? lCore.clone(this._contain.list) : null;
         const r = await this._db.query(this._sql.getSql(), this._sql.getData());
         if (r.rows === null) {
-            lCore.log(this._ctr ?? {}, '[MOD][all] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[MOD][all] ' + (lText.stringifyJson(r.error?.message ?? '').slice(1, -1) + ' - ' + this._sql.format()).replaceAll('"', '""'), '-error');
             return false;
         }
         // --- 检查没被查到的必包含项 ---
@@ -1059,7 +1059,7 @@ export default class Mod {
                 const lsql = sql.replace(/ LIMIT [0-9 ,]+(OFFSET [0-9]+)?/g, ` LIMIT ${remain} OFFSET ${cz}`);
                 const r = await this._db.query(lsql, this._sql.getData());
                 if (r.rows === null) {
-                    lCore.log(this._ctr ?? {}, '[MOD][allArray] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                    lCore.log(this._ctr ?? {}, '[MOD][allArray] ' + (lText.stringifyJson(r.error?.message ?? '').slice(1, -1) + ' - ' + this._sql.format()).replaceAll('"', '""'), '-error');
                     return false;
                 }
                 if (key) {
@@ -1081,7 +1081,7 @@ export default class Mod {
         const contain = this._contain ? lCore.clone(this._contain.list) : null;
         const r = await this._db.query(this._sql.getSql(), this._sql.getData());
         if (r.rows === null) {
-            lCore.log(this._ctr ?? {}, '[MOD][allArray] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[MOD][allArray] ' + (lText.stringifyJson(r.error?.message ?? '').slice(1, -1) + ' - ' + this._sql.format()).replaceAll('"', '""'), '-error');
             return false;
         }
         // --- 检查没被查到的必包含项 ---
@@ -1130,7 +1130,7 @@ export default class Mod {
     async explain(all = false) {
         const r = await this._db.query('EXPLAIN ' + this._sql.getSql(), this._sql.getData());
         if (r.rows === null) {
-            lCore.log(this._ctr ?? {}, '[MOD][explain] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[MOD][explain] ' + (lText.stringifyJson(r.error?.message ?? '').slice(1, -1) + ' - ' + this._sql.format()).replaceAll('"', '""'), '-error');
             return false;
         }
         if (!r.rows[0]) {
@@ -1173,7 +1173,7 @@ export default class Mod {
         const sql = this._formatTotal(this._sql.getSql(), f);
         const r = await this._db.query(sql, this._sql.getData());
         if (r.rows === null) {
-            lCore.log(this._ctr ?? {}, '[MOD][total] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[MOD][total] ' + (lText.stringifyJson(r.error?.message ?? '').slice(1, -1) + ' - ' + this._sql.format()).replaceAll('"', '""'), '-error');
             return 0;
         }
         let count = 0;
@@ -1191,7 +1191,7 @@ export default class Mod {
             'SELECT COUNT(0) AS "count" FROM');
         const r = await this._db.query(sql, this._sql.getData());
         if (r.rows === null) {
-            lCore.log(this._ctr ?? {}, '[MOD][count] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[MOD][count] ' + (lText.stringifyJson(r.error?.message ?? '').slice(1, -1) + ' - ' + this._sql.format()).replaceAll('"', '""'), '-error');
             return 0;
         }
         let count = 0;

package/sys/monitor/watchdog.js

@@ -84,6 +84,12 @@ function captureDiag(blockSec) {
     const pauseTimeout = setTimeout(() => {
         if (!didPause) {
             timedOut = true;
+            try {
+                session.post('Debugger.resume');
+            }
+            catch {
+                // --- 忽略 ---
+            }
             try {
                 session.post('Debugger.disable');
             }
@@ -171,10 +177,6 @@ function captureDiag(blockSec) {
             }
             return;
         }
-        if (timedOut) {
-            clearTimeout(pauseTimeout);
-            return;
-        }
         try {
             session.post('Debugger.pause', (err2) => {
                 if (err2 || timedOut) {
@@ -249,6 +251,10 @@ setInterval(() => {
     if (lastHb <= 0 || now - lastHb < data.threshold) {
         return;
     }
+    // --- 调试模式下跳过阻塞检测，避免干扰 IDE 调试器 ---
+    if (Atomics.load(view, 1) === 1) {
+        return;
+    }
     if (now - lastAlertTime < data.cooldown) {
         return;
     }

package/sys/monitor.js

@@ -49,6 +49,12 @@ let requestCounter = 0;
 let lastDiagnosticTime = 0;
 /** --- 是否正在进行 CPU Profile 采集 --- */
 let profiling = false;
+/**
+ * --- 检测当前是否处于调试模式（以 --inspect 启动或 IDE 调试器已连接） ---
+ */
+function isDebugMode() {
+    return !!inspector.url();
+}
 // --- 看门狗相关 ---
 /** --- 看门狗 Worker 实例 --- */
 let watchdog = null;
@@ -85,10 +91,11 @@ export function start(opt) {
     lastOsCpus = os.cpus();
     spikeCounter = 0;
     lastDiagnosticTime = 0;
-    // --- 初始化心跳共享内存 ---
-    heartbeatBuffer = new SharedArrayBuffer(4);
+    // --- 初始化心跳共享内存（索引 0: 秒级时间戳, 索引 1: 调试模式标志） ---
+    heartbeatBuffer = new SharedArrayBuffer(8);
     heartbeatView = new Int32Array(heartbeatBuffer);
     Atomics.store(heartbeatView, 0, Math.floor(Date.now() / 1000));
+    Atomics.store(heartbeatView, 1, isDebugMode() ? 1 : 0);
     // --- 启用事件循环延迟直方图 ---
     eloopHistogram = perfHooks.monitorEventLoopDelay({ 'resolution': 20 });
     eloopHistogram.enable();
@@ -259,6 +266,8 @@ function check() {
     // --- 更新心跳时间戳，让看门狗线程知道主线程还活着 ---
     if (heartbeatView) {
         Atomics.store(heartbeatView, 0, Math.floor(now / 1000));
+        // --- 更新调试模式标志，让看门狗线程知道当前是否在调试 ---
+        Atomics.store(heartbeatView, 1, isDebugMode() ? 1 : 0);
     }
     /** --- 计算本周期进程 CPU 使用率（单核基准） --- */
     let cpuPercent = 0;
@@ -284,6 +293,11 @@ function check() {
     }
     // --- 检测事件循环阻塞：实际间隔远大于预期说明事件循环曾被阻塞 ---
     if (actualElapsed > INTERVAL * 3) {
+        // --- 调试模式下断点暂停会导致计时差异，跳过阻塞检测 ---
+        if (isDebugMode()) {
+            spikeCounter = 0;
+            return;
+        }
         const blockMs = actualElapsed - INTERVAL;
         const alerts = [
             `ELOOP_BLOCKED ${Math.round(blockMs)}ms`