@maiyunnet/kebab 2.0.14 → 2.0.15

package/lib/db.js

@@ -2,7 +2,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-4-15 13:40
- * Last: 2020-4-13 15:34:45, 2022-09-12 13:10:34, 2023-5-24 18:29:38, 2024-7-11 14:37:54, 2024-8-25 00:32:53, 2024-9-22 17:30:47
+ * Last: 2020-4-13 15:34:45, 2022-09-12 13:10:34, 2023-5-24 18:29:38, 2024-7-11 14:37:54, 2024-8-25 00:32:53, 2024-9-22 17:30:47, 2025-8-3 20:24:03
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -45,11 +45,11 @@ exports.getConnectionList = getConnectionList;
 // --- 第三方 ---
 const mysql2 = __importStar(require("mysql2/promise"));
 // --- 库和定义 ---
-const time = __importStar(require("../lib/time"));
-const lSql = __importStar(require("../lib/sql"));
-const core = __importStar(require("../lib/core"));
-const text = __importStar(require("../lib/text"));
-const ctr = __importStar(require("../sys/ctr"));
+const time = __importStar(require("~/lib/time"));
+const lSql = __importStar(require("~/lib/sql"));
+const lCore = __importStar(require("~/lib/core"));
+const lText = __importStar(require("~/lib/text"));
+const ctr = __importStar(require("~/sys/ctr"));
 /** --- 连接列表池 --- */
 const connections = [];
 /**
@@ -71,23 +71,14 @@ async function checkConnection() {
             if (connection.getLast() <= now - 60) {
                 // --- 1 分钟之前开始的 ---
                 const ls = connection.getLastSql();
-                const sql = ls[1] ?? ls[0];
-                console.log(`[child] [db] [error] There is a transactional connection[${i}] that is not closed, last sql: ${sql?.sql ?? 'undefined'}.`);
                 const newarr = ls.map(item => {
                     if (!item.values) {
                         return item.sql;
                     }
                     return lSql.format(item.sql, item.values);
                 });
-                await core.log({
-                    'path': '',
-                    'urlFull': '',
-                    'hostname': '',
-                    'req': null,
-                    'get': {},
-                    'cookie': {},
-                    'headers': {}
-                }, `(db.checkConnection)There is a transactional connection[${i}] that is not closed, last sql: ${newarr.join(', ')}.`, '-error');
+                lCore.display(`[DB][error] There is a transactional connection[${i}] that is not closed, last sql: ${newarr.join(', ')}.`);
+                lCore.log({}, `[DB][checkConnection] There is a transactional connection[${i}] that is not closed, last sql: ${newarr.join(', ')}.`, '-error');
                 await connection.rollback();
             }
             continue;
@@ -103,12 +94,12 @@ async function checkConnection() {
         --i;
     }
     setTimeout(function () {
-        checkConnection().catch(e => { console.log('[DB]', e); });
-    }, 30000);
+        checkConnection().catch(e => { lCore.display('[DB][checkConnection]', e); });
+    }, 30_000);
 }
 setTimeout(function () {
-    checkConnection().catch(e => { console.log('[DB]', e); });
-}, 30000);
+    checkConnection().catch(e => { lCore.display('[DB][checkConnection]', e); });
+}, 30_000);
 /** --- 数据库连接池对象 --- */
 class Pool {
     constructor(etc) {
@@ -209,7 +200,7 @@ class Pool {
                 c.using();
                 link.on('error', function (err) {
                     if (err.code !== 'PROTOCOL_CONNECTION_LOST') {
-                        console.log(err);
+                        lCore.display('[DB][_getConnection]', err);
                     }
                     c.setLost();
                 }).on('end', function () {
@@ -219,15 +210,7 @@ class Pool {
                 connections.push(conn);
             }
             catch (e) {
-                await core.log({
-                    'path': '',
-                    'urlFull': '',
-                    'hostname': '',
-                    'req': null,
-                    'get': {},
-                    'cookie': {},
-                    'headers': {}
-                }, '(db._getConnection)' + text.stringifyJson(e.stack).slice(1, -1), '-error');
+                lCore.log({}, '[DB][Pool][_getConnection]' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
             }
         }
         return conn;
@@ -260,12 +243,12 @@ class Transaction {
         const warning = opts.warning ?? 1_500;
         this._timer.warning = setTimeout(() => {
             this._timer.warning = undefined;
-            console.log('[WARNING][DB][Transaction] time too long, ms:', warning, this._ctr?.getPrototype('_config').const.path ?? 'no ctr');
+            lCore.display('[WARNING][DB][Transaction] time too long, ms: ' + warning + ' ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr'));
         }, warning);
         const danger = opts.danger ?? 5_000;
         this._timer.danger = setTimeout(() => {
             this._timer.danger = undefined;
-            console.log('[DANGER][DB][Transaction] time too long, ms:', danger, this._ctr?.getPrototype('_config').const.path ?? 'no ctr');
+            lCore.display('[DANGER][DB][Transaction] time too long, ms:', danger, this._ctr?.getPrototype('_config').const.path ?? 'no ctr');
         }, danger);
     }
     /**
@@ -276,16 +259,8 @@ class Transaction {
     async query(sql, values) {
         if (!this._conn) {
             // --- 当前连接已不可用 ---
-            console.log('[ERROR][DB][Transaction.query] has been closed.', this._ctr?.getPrototype('_config').const.path ?? 'no ctr', sql);
-            await core.log({
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': null,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '(db.Transaction.query) has been closed, ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr') + ': ' + sql, '-error');
+            lCore.display('[DB][Transaction][query] has been closed ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr') + ': ' + sql);
+            lCore.log({}, '[DB][Transaction][query] has been closed ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr') + ': ' + sql, '-error');
             return {
                 'rows': null,
                 'fields': [],
@@ -306,16 +281,8 @@ class Transaction {
     async execute(sql, values) {
         if (!this._conn) {
             // --- 当前连接已不可用 ---
-            console.log('[ERROR][DB][Transaction.execute] has been closed.', this._ctr?.getPrototype('_config').const.path ?? 'no ctr', sql);
-            await core.log({
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': null,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '(db.Transaction.execute) has been closed, ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr') + ': ' + sql, '-error');
+            lCore.display('[DB][Transaction][execute] has been closed ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr') + ': ' + sql);
+            lCore.log({}, '(db.Transaction.execute) has been closed ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr') + ': ' + sql, '-error');
             return {
                 'packet': null,
                 'fields': [],
@@ -331,16 +298,8 @@ class Transaction {
     async commit() {
         if (!this._conn) {
             // --- 当前连接已不可用 ---
-            console.log('[ERROR][DB][Transaction.commit] has been closed.', this._ctr?.getPrototype('_config').const.path ?? 'no ctr');
-            await core.log({
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': null,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '(db.Transaction.commit) has been closed: ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr'), '-error');
+            lCore.display('[DB][Transaction][commit] has been closed ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr'));
+            lCore.log({}, '[DB][Transaction][commit] has been closed ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr'), '-error');
             return false;
         }
         const r = await this._conn.commit();
@@ -360,16 +319,8 @@ class Transaction {
     async rollback() {
         if (!this._conn) {
             // --- 当前连接已不可用 ---
-            console.log('[ERROR][DB][Transaction.rollback] has been closed.', this._ctr?.getPrototype('_config').const.path ?? 'no ctr');
-            await core.log({
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': null,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '(db.Transaction.rollback) has been closed: ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr'), '-error');
+            lCore.display('[DB][Transaction][rollback] has been closed: ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr'));
+            lCore.log({}, '[DB][Transaction][rollback] has been closed: ' + (this._ctr?.getPrototype('_config').const.path ?? 'no ctr'), '-error');
             return false;
         }
         const r = await this._conn.rollback();
@@ -501,7 +452,11 @@ class Connection {
                 'sql': sql,
                 'values': values
             });
+            const time = Date.now();
             res = await this._link.query(sql, values);
+            if (Date.now() - time > 200) {
+                lCore.log({}, '[WARNING][DB][Connection][query] slow sql 200ms: ' + sql, '-warning');
+            }
         }
         catch (e) {
             if (!this._transaction) {
@@ -539,7 +494,11 @@ class Connection {
                 'sql': sql,
                 'values': values
             });
+            const time = Date.now();
             res = await this._link.execute(sql, values);
+            if (Date.now() - time > 200) {
+                lCore.log({}, '[WARNING][DB][Connection][execute] slow sql 200ms: ' + sql, '-warning');
+            }
         }
         catch (e) {
             if (!this._transaction) {

package/lib/dns.d.ts

@@ -3,7 +3,7 @@
  * Date: 2019-6-19
  * Last: 2022-09-12 20:58:07, 2024-2-21 17:55:54, 2025-6-13 19:08:56
  */
-import * as ctr from '../sys/ctr';
+import * as ctr from '~/sys/ctr';
 /**
  * 0.DNSPod：https://www.dnspod.cn/docs/index.html（腾讯云也请使用 DNSPod 的 API）
  * 1.阿里云：https://help.aliyun.com/document_detail/29745.html

package/lib/dns.js

@@ -41,11 +41,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Dns = exports.ERecordLine = exports.RECORD_TYPE = exports.ESERVICE = void 0;
 exports.get = get;
 // --- 库和定义 ---
-const net = __importStar(require("../lib/net"));
-const core = __importStar(require("../lib/core"));
-const text = __importStar(require("../lib/text"));
-const crypto = __importStar(require("../lib/crypto"));
-const response = __importStar(require("../lib/net/response"));
+const net = __importStar(require("~/lib/net"));
+const core = __importStar(require("~/lib/core"));
+const text = __importStar(require("~/lib/text"));
+const crypto = __importStar(require("~/lib/crypto"));
+const response = __importStar(require("~/lib/net/response"));
 /**
  * 0.DNSPod：https://www.dnspod.cn/docs/index.html（腾讯云也请使用 DNSPod 的 API）
  * 1.阿里云：https://help.aliyun.com/document_detail/29745.html

package/lib/fs.js

@@ -75,8 +75,8 @@ async function getContent(path, options) {
             'encoding': options
         };
     }
-    else if (!options) {
-        options = {};
+    else {
+        options ??= {};
     }
     const encoding = options.encoding;
     const start = options.start;
@@ -337,6 +337,16 @@ async function readDir(path, encoding) {
             }
             list.push(item);
         }
+        // --- 将 list 根据先目录后文件排序，如果是同是目录或文件，则以名称排序 ---
+        list.sort((a, b) => {
+            // --- 目录排在文件前面 ---
+            if (a.isDirectory() && !b.isDirectory())
+                return -1;
+            if (!a.isDirectory() && b.isDirectory())
+                return 1;
+            // --- 同类型按名称排序 ---
+            return a.name.localeCompare(b.name);
+        });
         return list;
     }
     catch {
@@ -413,8 +423,8 @@ function createReadStream(path, options) {
             'encoding': options
         };
     }
-    else if (!options) {
-        options = {};
+    else {
+        options ??= {};
     }
     return fs.createReadStream(path, {
         'flags': options.flags,
@@ -450,8 +460,8 @@ function createWriteStream(path, options) {
             'encoding': options
         };
     }
-    else if (!options) {
-        options = {};
+    else {
+        options ??= {};
     }
     return fs.createWriteStream(path, {
         'flags': options.flags,
@@ -469,9 +479,7 @@ function createWriteStream(path, options) {
  * @param stat 文件的 stat（如果有）
  */
 async function readToResponse(path, req, res, stat) {
-    if (!stat) {
-        stat = await stats(path);
-    }
+    stat ??= await stats(path);
     if (!stat) {
         res.setHeader('content-length', 22);
         res.writeHead(404);

package/lib/jwt.d.ts

@@ -3,9 +3,9 @@
  * Date: 2023-1-31 20:34:47
  * Last: 2023-1-31 20:34:47, 2023-12-8 13:55:09
  */
-import * as kv from '../lib/kv';
-import * as ctr from '../sys/ctr';
-import * as types from '../types';
+import * as kv from '~/lib/kv';
+import * as ctr from '~/sys/ctr';
+import * as types from '~/types';
 export interface IOptions {
     'name'?: string;
     'ttl'?: number;

package/lib/jwt.js

@@ -44,10 +44,10 @@ exports.decode = decode;
 exports.block = block;
 exports.get = get;
 // --- 库和定义 ---
-const lCore = __importStar(require("../lib/core"));
-const lTime = __importStar(require("../lib/time"));
-const lText = __importStar(require("../lib/text"));
-const lCrypto = __importStar(require("../lib/crypto"));
+const lCore = __importStar(require("~/lib/core"));
+const lTime = __importStar(require("~/lib/time"));
+const lText = __importStar(require("~/lib/text"));
+const lCrypto = __importStar(require("~/lib/crypto"));
 class Jwt {
     /**
      * --- 初始化函数，相当于 construct ---
@@ -98,7 +98,7 @@ class Jwt {
     renew() {
         const time = lTime.stamp();
         const data = this._ctr.getPrototype('_jwt');
-        const token = data['token'] ? data['token'] : lCore.random(16, lCore.RANDOM_LUN);
+        const token = lText.isFalsy(data['token']) ? lCore.random(16, lCore.RANDOM_LUN) : data['token'];
         data['exp'] = time + this._ttl;
         data['token'] = token;
         // --- 拼装 ---

package/lib/kv.d.ts

@@ -4,8 +4,8 @@
  * Last: 2020-3-28 18:54:04, 2022-09-12 23:24:45, 2022-09-22 01:06:22, 2024-2-21 13:32:56, 2024-8-21 16:59:57
  */
 import * as redis from '@litert/redis';
-import * as ctr from '../sys/ctr';
-import * as types from '../types';
+import * as ctr from '~/sys/ctr';
+import * as types from '~/types';
 /** --- 连接信息 --- */
 export interface IConnectionInfo {
     'id': number;

package/lib/kv.js

@@ -46,8 +46,8 @@ exports.getConnectionList = getConnectionList;
 // --- 第三方 ---
 const redis = __importStar(require("@litert/redis"));
 // --- 库和定义 ---
-const time = __importStar(require("../lib/time"));
-const text = __importStar(require("../lib/text"));
+const time = __importStar(require("~/lib/time"));
+const text = __importStar(require("~/lib/text"));
 /** --- 连接列表（同一个 host、port、index、auth 只有一个连接） --- */
 const connections = [];
 /**

package/lib/lan.js

@@ -36,7 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.card = card;
 exports.scan = scan;
 const os = __importStar(require("os"));
-const lCore = __importStar(require("../lib/core"));
+const lCore = __importStar(require("~/lib/core"));
 /**
  * --- 获取当前网卡的 IP、MAC 信息 ---
  */

package/lib/net/formdata.js

@@ -41,8 +41,8 @@ exports.FormData = void 0;
  */
 const stream = __importStar(require("stream"));
 const mime = __importStar(require("@litert/mime"));
-const core = __importStar(require("../../lib/core"));
-const fs = __importStar(require("../../lib/fs"));
+const core = __importStar(require("~/lib/core"));
+const fs = __importStar(require("~/lib/fs"));
 class FormData extends stream.Readable {
     constructor() {
         super(...arguments);

package/lib/net/request.d.ts

@@ -5,7 +5,7 @@
  */
 import * as stream from 'stream';
 import * as response from './response';
-import * as types from '../../types';
+import * as types from '~/types';
 export declare class Request {
     /** --- get 或 post 的数据 --- */
     private _data;

package/lib/net/request.js

@@ -34,7 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Request = void 0;
-const net = __importStar(require("../../lib/net"));
+const net = __importStar(require("~/lib/net"));
 class Request {
     constructor(url) {
         /** --- get 或 post 的数据 --- */

package/lib/net/response.d.ts

@@ -5,7 +5,7 @@
  */
 import * as hc from '@litert/http-client';
 import * as nStream from 'stream';
-import * as types from '../../types';
+import * as types from '~/types';
 export declare class Response {
     /** --- httpClient 请求对象 --- */
     private readonly _req;

package/lib/net.d.ts

@@ -7,8 +7,8 @@
 import * as stream from 'stream';
 import * as http from 'http';
 import * as http2 from 'http2';
-import * as ctr from '../sys/ctr';
-import * as types from '../types';
+import * as ctr from '~/sys/ctr';
+import * as types from '~/types';
 import * as fd from './net/formdata';
 import * as lRequest from './net/request';
 import * as response from './net/response';

package/lib/net.js

@@ -57,10 +57,10 @@ const stream = __importStar(require("stream"));
 // --- 第三方 ---
 const hc = __importStar(require("@litert/http-client"));
 // --- 库和定义 ---
-const fs = __importStar(require("../lib/fs"));
-const text = __importStar(require("../lib/text"));
-const time = __importStar(require("../lib/time"));
-const kebab = __importStar(require("../index"));
+const fs = __importStar(require("~/lib/fs"));
+const text = __importStar(require("~/lib/text"));
+const time = __importStar(require("~/lib/time"));
+const kebab = __importStar(require("~/index"));
 // --- 自己 ---
 const fd = __importStar(require("./net/formdata"));
 const lRequest = __importStar(require("./net/request"));

package/lib/s3.d.ts

@@ -5,7 +5,7 @@
  */
 import * as s3 from '@aws-sdk/client-s3';
 import * as stream from 'stream';
-import * as sCtr from '../sys/ctr';
+import * as sCtr from '~/sys/ctr';
 /**
  * s3 文档：https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/s3/
  */

package/lib/s3.js

@@ -43,8 +43,8 @@ exports.get = get;
 // --- 库和定义 ---
 const s3 = __importStar(require("@aws-sdk/client-s3"));
 const ls = __importStar(require("@aws-sdk/lib-storage"));
-const lCore = __importStar(require("../lib/core"));
-const lText = __importStar(require("../lib/text"));
+const lCore = __importStar(require("~/lib/core"));
+const lText = __importStar(require("~/lib/text"));
 /**
  * s3 文档：https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/s3/
  */

package/lib/scan.d.ts

@@ -3,9 +3,9 @@
  * Date: 2022-09-24 15:23:25
  * Last: 2022-09-24 15:23:25, 2022-9-26 12:37:01, 2022-12-29 00:11:16
  */
-import * as lDb from '../lib/db';
-import * as lKv from '../lib/kv';
-import * as sCtr from '../sys/ctr';
+import * as lDb from '~/lib/db';
+import * as lKv from '~/lib/kv';
+import * as sCtr from '~/sys/ctr';
 /** --- Scan 设置的选项 --- */
 export interface IOptions {
     'ttl'?: number;

package/lib/scan.js

@@ -56,12 +56,12 @@ CREATE TABLE IF NOT EXISTS `scan` (
     KEY `time_exp` (`time_exp`)
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci
 */
-const lCore = __importStar(require("../lib/core"));
-const lDb = __importStar(require("../lib/db"));
-const lKv = __importStar(require("../lib/kv"));
-const lSql = __importStar(require("../lib/sql"));
-const lTime = __importStar(require("../lib/time"));
-const lText = __importStar(require("../lib/text"));
+const lCore = __importStar(require("~/lib/core"));
+const lDb = __importStar(require("~/lib/db"));
+const lKv = __importStar(require("~/lib/kv"));
+const lSql = __importStar(require("~/lib/sql"));
+const lTime = __importStar(require("~/lib/time"));
+const lText = __importStar(require("~/lib/text"));
 class Scan {
     constructor(link, token, opt = {}) {
         this._sql = null;

package/lib/session.d.ts

@@ -3,9 +3,9 @@
  * Date: 2019-6-5 22:01:40
  * Last: 2020-3-30 00:11:15, 2022-12-29 00:10:28, 2023-5-24 18:59:27
  */
-import * as db from '../lib/db';
-import * as kv from '../lib/kv';
-import * as ctr from '../sys/ctr';
+import * as db from '~/lib/db';
+import * as kv from '~/lib/kv';
+import * as ctr from '~/sys/ctr';
 export interface IOptions {
     'name'?: string;
     'ttl'?: number;

package/lib/session.js

@@ -53,12 +53,12 @@ CREATE TABLE `session` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci
 */
 // --- 库和定义 ---
-const core = __importStar(require("../lib/core"));
-const time = __importStar(require("../lib/time"));
-const db = __importStar(require("../lib/db"));
-const kv = __importStar(require("../lib/kv"));
-const sql = __importStar(require("../lib/sql"));
-const text = __importStar(require("../lib/text"));
+const core = __importStar(require("~/lib/core"));
+const time = __importStar(require("~/lib/time"));
+const db = __importStar(require("~/lib/db"));
+const kv = __importStar(require("~/lib/kv"));
+const sql = __importStar(require("~/lib/sql"));
+const text = __importStar(require("~/lib/text"));
 class Session {
     constructor() {
         /** --- 当前 Session 的 token --- */
@@ -93,7 +93,7 @@ class Session {
         }
         this._link = link;
         if (link instanceof db.Pool) {
-            this._sql = sql.get(pre ? pre : ctr);
+            this._sql = sql.get(pre ?? ctr);
             await this._gc(); // --- 执行 gc ---
         }
         // --- 初始化 Session 数组 ---

package/lib/sql.d.ts

@@ -1,10 +1,10 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-5-27 20:18:50
- * Last: 2020-3-29 19:37:25, 2022-07-24 22:38:11, 2023-5-24 18:49:18, 2023-6-13 22:20:21, 2023-12-11 13:58:54, 2023-12-14 13:14:40, 2023-12-21 00:04:40, 2024-4-11 19:29:29, 2024-9-2 17:15:28
+ * Last: 2020-3-29 19:37:25, 2022-07-24 22:38:11, 2023-5-24 18:49:18, 2023-6-13 22:20:21, 2023-12-11 13:58:54, 2023-12-14 13:14:40, 2023-12-21 00:04:40, 2024-4-11 19:29:29, 2024-9-2 17:15:28, 2025-8-3 21:28:18
  */
-import * as ctr from '../sys/ctr';
-import * as types from '../types';
+import * as ctr from '~/sys/ctr';
+import * as types from '~/types';
 export declare class Sql {
     /** --- 前置 --- */
     private readonly _pre;

package/lib/sql.js

@@ -2,7 +2,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-5-27 20:18:50
- * Last: 2020-3-29 19:37:25, 2022-07-24 22:38:11, 2023-5-24 18:49:18, 2023-6-13 22:20:21, 2023-12-11 13:58:54, 2023-12-14 13:14:40, 2023-12-21 00:04:40, 2024-4-11 19:29:29, 2024-9-2 17:15:28
+ * Last: 2020-3-29 19:37:25, 2022-07-24 22:38:11, 2023-5-24 18:49:18, 2023-6-13 22:20:21, 2023-12-11 13:58:54, 2023-12-14 13:14:40, 2023-12-21 00:04:40, 2024-4-11 19:29:29, 2024-9-2 17:15:28, 2025-8-3 21:28:18
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -43,12 +43,12 @@ exports.get = get;
 exports.format = format;
 exports.aoMix = aoMix;
 exports.column = column;
-const lText = __importStar(require("../lib/text"));
-const lCore = __importStar(require("../lib/core"));
+const lText = __importStar(require("~/lib/text"));
+const lCore = __importStar(require("~/lib/core"));
 // --- 第三方 ---
 const mysql2 = __importStar(require("mysql2/promise"));
 // --- 库和定义 ---
-const ctr = __importStar(require("../sys/ctr"));
+const ctr = __importStar(require("~/sys/ctr"));
 /** --- filed 用 token --- */
 let columnToken = '';
 class Sql {
@@ -116,17 +116,7 @@ class Sql {
                     // --- v1 是项目值，如 {'x': 1, 'y': 2}, 'string', 0 ---
                     if (v1 === undefined || Number.isNaN(v1)) {
                         // --- 异常情况 ---
-                        lCore.log({
-                            'path': '',
-                            'urlFull': '',
-                            'hostname': '',
-                            'req': null,
-                            'get': {},
-                            'cookie': {},
-                            'headers': {}
-                        }, '(sql.values) value error', '-error').catch(() => {
-                            //
-                        });
+                        lCore.log({}, '[SQL][values] value error', '-error');
                         sql += `'', `;
                     }
                     else if (v1 === null) {
@@ -200,17 +190,7 @@ class Sql {
                 sql += this.field(k) + ', ';
                 if (v === undefined || Number.isNaN(v)) {
                     // --- 异常情况 ---
-                    lCore.log({
-                        'path': '',
-                        'urlFull': '',
-                        'hostname': '',
-                        'req': null,
-                        'get': {},
-                        'cookie': {},
-                        'headers': {}
-                    }, '(sql.values) value error', '-error').catch(() => {
-                        //
-                    });
+                    lCore.log({}, '[SQL][values] value error', '-error');
                     values += `'', `;
                 }
                 else if (v === null) {
@@ -413,17 +393,7 @@ class Sql {
                 sql += this.field(k) + ' = ';
                 if (v === undefined || Number.isNaN(v)) {
                     // --- 异常情况 ---
-                    lCore.log({
-                        'path': '',
-                        'urlFull': '',
-                        'hostname': '',
-                        'req': null,
-                        'get': {},
-                        'cookie': {},
-                        'headers': {}
-                    }, '(sql._updateSub) value error, key: ' + k, '-error').catch(() => {
-                        //
-                    });
+                    lCore.log({}, '[SQL][_updateSub] value error, key: ' + k, '-error');
                     sql += '"", ';
                 }
                 else if (v === null) {