@maiyunnet/kebab 2.0.9 → 2.0.10

package/index.d.ts

@@ -6,7 +6,7 @@
  * --- npx tsc-alias -w ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "2.0.9";
+export declare const VER = "2.0.10";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;

package/index.js

@@ -9,7 +9,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MOD_CWD = exports.FTMP_CWD = exports.IND_CWD = exports.WWW_CWD = exports.LOG_CWD = exports.LIB_CWD = exports.VHOST_CWD = exports.CERT_CWD = exports.CONF_CWD = exports.ROOT_CWD = exports.SYS_PATH = exports.LIB_PATH = exports.ROOT_PATH = exports.VER = void 0;
 /** --- 当前系统版本号 --- */
-exports.VER = '2.0.9';
+exports.VER = '2.0.10';
 // --- 服务端用的路径 ---
 /** --- /xxx/xxx --- */
 const dirname = __dirname.replace(/\\/g, '/');

package/lib/captcha.js

@@ -42,8 +42,8 @@ exports.get = get;
  */
 const svgCaptcha = __importStar(require("svg-captcha"));
 const mime = __importStar(require("@litert/mime"));
-const core = __importStar(require("../lib/core"));
-const kebab = __importStar(require("../index"));
+const core = __importStar(require("~/lib/core"));
+const kebab = __importStar(require("~/index"));
 svgCaptcha.loadFont(kebab.LIB_PATH + 'captcha/zcool-addict-italic.ttf');
 class Captcha {
     constructor(opt) {

package/lib/consistent.js

@@ -45,7 +45,7 @@ exports.findInCircle = findInCircle;
  * Date: 2022-09-12 10:51:16
  * Last: 2022-09-12 10:51:20, 2023-3-17 10:52:04, 2023-11-15 11:45:28
  */
-const crypto = __importStar(require("../lib/crypto"));
+const crypto = __importStar(require("~/lib/crypto"));
 class Consistent {
     constructor(vcount) {
         /** --- 虚拟节点数量 --- */

package/lib/core.d.ts

@@ -1,9 +1,9 @@
 import * as http from 'http';
 import * as http2 from 'http2';
 import * as stream from 'stream';
-import * as lResponse from '../lib/net/response';
-import * as sCtr from '../sys/ctr';
-import * as types from '../types';
+import * as lResponse from '~/lib/net/response';
+import * as sCtr from '~/sys/ctr';
+import * as types from '~/types';
 /** --- 全局参数 --- */
 export declare const globalConfig: types.IConfig & {
     'httpPort': number;

package/lib/core.js

@@ -66,14 +66,14 @@ exports.display = display;
  */
 const cp = __importStar(require("child_process"));
 const stream = __importStar(require("stream"));
-const lTime = __importStar(require("../lib/time"));
-const lFs = __importStar(require("../lib/fs"));
-const lText = __importStar(require("../lib/text"));
-const lNet = __importStar(require("../lib/net"));
-const lCrypto = __importStar(require("../lib/crypto"));
-const lResponse = __importStar(require("../lib/net/response"));
-const sCtr = __importStar(require("../sys/ctr"));
-const kebab = __importStar(require("../index"));
+const lTime = __importStar(require("~/lib/time"));
+const lFs = __importStar(require("~/lib/fs"));
+const lText = __importStar(require("~/lib/text"));
+const lNet = __importStar(require("~/lib/net"));
+const lCrypto = __importStar(require("~/lib/crypto"));
+const lResponse = __importStar(require("~/lib/net/response"));
+const sCtr = __importStar(require("~/sys/ctr"));
+const kebab = __importStar(require("~/index"));
 /** --- 全局参数 --- */
 exports.globalConfig = {};
 /**

package/lib/crypto.js

@@ -61,8 +61,8 @@ exports.uuid = uuid;
  */
 const crypto = __importStar(require("crypto"));
 // --- 库和定义 ---
-const lFs = __importStar(require("../lib/fs"));
-const lCore = __importStar(require("../lib/core"));
+const lFs = __importStar(require("~/lib/fs"));
+const lCore = __importStar(require("~/lib/core"));
 // --- 非对称加密 ---
 /**
  * --- 创建非对称秘钥 ---

package/lib/db.d.ts

@@ -4,8 +4,8 @@
  * 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
  */
 import * as mysql2 from 'mysql2/promise';
-import * as ctr from '../sys/ctr';
-import * as types from '../types';
+import * as ctr from '~/sys/ctr';
+import * as types from '~/types';
 /** --- query 返回的数据 --- */
 export interface IData {
     'rows': any[] | null;

package/lib/db.js

@@ -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 core = __importStar(require("~/lib/core"));
+const text = __importStar(require("~/lib/text"));
+const ctr = __importStar(require("~/sys/ctr"));
 /** --- 连接列表池 --- */
 const connections = [];
 /**

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/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 ---

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 --- */

package/lib/sql.d.ts

@@ -3,8 +3,8 @@
  * 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
  */
-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

@@ -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 {

package/lib/ssh/sftp.js

@@ -35,8 +35,8 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Connection = void 0;
 // --- 库和定义 ---
-const core = __importStar(require("../../lib/core"));
-const text = __importStar(require("../../lib/text"));
+const core = __importStar(require("~/lib/core"));
+const text = __importStar(require("~/lib/text"));
 class Connection {
     constructor(sftp, path) {
         this._client = sftp;

package/lib/ssh/shell.js

@@ -34,7 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Connection = void 0;
-const lCore = __importStar(require("../../lib/core"));
+const lCore = __importStar(require("~/lib/core"));
 class Connection {
     constructor(stream) {
         this._client = stream;

package/lib/text.d.ts

@@ -1,4 +1,4 @@
-import * as types from '../types';
+import * as types from '~/types';
 /**
  * --- 将文件大小格式化为带单位的字符串 ---
  * @param size 文件大小

package/lib/text.js

@@ -66,7 +66,7 @@ exports.int2str = int2str;
  * Date: 2019-5-15 16:49:39
  * Last: 2020-04-06 20:51:06, 2022-9-29 15:18:16, 2022-12-29 00:01:30, 2024-3-6 17:53:14, 2024-5-31 17:29:52, 2025-6-13 15:47:02
  */
-const kebab = __importStar(require("../index"));
+const kebab = __importStar(require("~/index"));
 const fs = __importStar(require("./fs"));
 /**
  * --- 将文件大小格式化为带单位的字符串 ---

package/lib/time.d.ts

@@ -3,7 +3,7 @@
  * Date: 2019-6-6 12:04:15
  * Last: 2020-3-29 23:41:21, 2024-1-18 17:16:50, 2024-8-5 10:55:21
  */
-import * as sCtr from '../sys/ctr';
+import * as sCtr from '~/sys/ctr';
 export interface IOptions {
     /** --- 时区 --- */
     'zone'?: number;

package/lib/time.js

@@ -43,7 +43,7 @@ exports.format = format;
  * Date: 2019-6-6 12:04:15
  * Last: 2020-3-29 23:41:21, 2024-1-18 17:16:50, 2024-8-5 10:55:21
  */
-const sCtr = __importStar(require("../sys/ctr"));
+const sCtr = __importStar(require("~/sys/ctr"));
 /** --- 一小时的秒数 --- */
 exports.HOUR = 3600;
 /** --- 一天的秒数 --- */

package/lib/ws.d.ts

@@ -5,8 +5,8 @@
  */
 import * as http from 'http';
 import * as net from 'net';
-import * as types from '../types';
-import * as sCtr from '../sys/ctr';
+import * as types from '~/types';
+import * as sCtr from '~/sys/ctr';
 /** --- 一般用 SIMPLE --- */
 export declare enum EFrameReceiveMode {
     STANDARD = 0,

package/lib/ws.js

@@ -41,8 +41,8 @@ exports.rproxy = rproxy;
 // --- 第三方 ---
 const liws = __importStar(require("@litert/websocket"));
 // --- 库 ---
-const lText = __importStar(require("../lib/text"));
-const lNet = __importStar(require("../lib/net"));
+const lText = __importStar(require("~/lib/text"));
+const lNet = __importStar(require("~/lib/net"));
 /** --- 一般用 SIMPLE --- */
 var EFrameReceiveMode;
 (function (EFrameReceiveMode) {

package/lib/zip.d.ts

@@ -1,5 +1,5 @@
 import jszip from 'jszip';
-import * as types from '../types';
+import * as types from '~/types';
 /**
  * --- 本库主要用于读取 zip，请尽量不要用来写入 zip，尤其是大文件 zip ---
  */

package/lib/zip.js

@@ -40,7 +40,7 @@ exports.Zip = void 0;
 exports.get = get;
 const jszip_1 = __importDefault(require("jszip"));
 const mime = __importStar(require("@litert/mime"));
-const lText = __importStar(require("../lib/text"));
+const lText = __importStar(require("~/lib/text"));
 /**
  * --- 本库主要用于读取 zip，请尽量不要用来写入 zip，尤其是大文件 zip ---
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "keywords": [
     "kebab",

package/sys/child.js

@@ -43,13 +43,13 @@ const tls = __importStar(require("tls"));
 const http = __importStar(require("http"));
 const crypto = __importStar(require("crypto"));
 // --- 库和定义 ---
-const fs = __importStar(require("../lib/fs"));
-const lCore = __importStar(require("../lib/core"));
-const lText = __importStar(require("../lib/text"));
-const sCtr = __importStar(require("../sys/ctr"));
-const kebab = __importStar(require("../index"));
+const fs = __importStar(require("~/lib/fs"));
+const lCore = __importStar(require("~/lib/core"));
+const lText = __importStar(require("~/lib/text"));
+const sCtr = __importStar(require("~/sys/ctr"));
+const kebab = __importStar(require("~/index"));
 // --- 初始化 ---
-const sRoute = __importStar(require("../sys/route"));
+const sRoute = __importStar(require("~/sys/route"));
 /** --- 10 秒往主线程发送一次心跳的 Timer --- */
 const hbTimer = setInterval(function () {
     if (!process.connected || !process.send) {

package/sys/cmd.js

@@ -39,12 +39,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * Last: 2020-3-7 23:51:18, 2022-07-22 14:14:09, 2022-9-27 14:52:19, 2023-5-23 21:42:46, 2024-7-2 15:12:28
  */
 const http = __importStar(require("http"));
-const lFs = __importStar(require("../lib/fs"));
-const lText = __importStar(require("../lib/text"));
-const lTime = __importStar(require("../lib/time"));
-const lCore = __importStar(require("../lib/core"));
-const lCrypto = __importStar(require("../lib/crypto"));
-const kebab = __importStar(require("../index"));
+const lFs = __importStar(require("~/lib/fs"));
+const lText = __importStar(require("~/lib/text"));
+const lTime = __importStar(require("~/lib/time"));
+const lCore = __importStar(require("~/lib/core"));
+const lCrypto = __importStar(require("~/lib/crypto"));
+const kebab = __importStar(require("~/index"));
 /** --- 解析命令 --- */
 const cmds = process.argv.slice(2);
 /** --- 批量创建目录 --- */

package/sys/ctr.js

@@ -690,7 +690,7 @@ class Ctr {
         this._res.setHeader('access-control-allow-headers', '*');
         this._res.setHeader('access-control-allow-methods', '*');
         if (this._req.method === 'OPTIONS') {
-            this._res.setHeader('access-control-max-age', '600');
+            this._res.setHeader('access-control-max-age', '3600');
             return false;
         }
         return true;

package/sys/master.js

@@ -42,14 +42,14 @@ const os = __importStar(require("os"));
 const cluster = __importStar(require("cluster"));
 const http = __importStar(require("http"));
 // --- 库和定义 ---
-const kebab = __importStar(require("../index"));
-const sRoute = __importStar(require("../sys/route"));
-const lCore = __importStar(require("../lib/core"));
-const lFs = __importStar(require("../lib/fs"));
-const lText = __importStar(require("../lib/text"));
-const lCrypto = __importStar(require("../lib/crypto"));
-const lTime = __importStar(require("../lib/time"));
-const lZip = __importStar(require("../lib/zip"));
+const kebab = __importStar(require("~/index"));
+const sRoute = __importStar(require("~/sys/route"));
+const lCore = __importStar(require("~/lib/core"));
+const lFs = __importStar(require("~/lib/fs"));
+const lText = __importStar(require("~/lib/text"));
+const lCrypto = __importStar(require("~/lib/crypto"));
+const lTime = __importStar(require("~/lib/time"));
+const lZip = __importStar(require("~/lib/zip"));
 /** --- 当前运行中的子进程列表 --- */
 const workerList = {};
 /**

package/sys/mod.d.ts

@@ -3,10 +3,10 @@
  * Date: 2019-6-4 21:35
  * Last: 2020-4-14 13:33:51, 2022-07-23 16:01:34, 2022-09-06 22:59:26, 2023-5-24 19:11:37, 2023-6-13 21:47:58, 2023-7-10 18:54:03, 2023-8-23 17:03:16, 2023-12-11 15:21:22, 2023-12-20 23:12:03, 2024-3-8 16:05:29, 2024-3-20 19:58:15, 2024-8-11 21:14:54, 2024-10-5 14:00:22, 2024-12-14 19:58:34
  */
-import * as lSql from '../lib/sql';
-import * as lDb from '../lib/db';
-import * as sCtr from '../sys/ctr';
-import * as types from '../types';
+import * as lSql from '~/lib/sql';
+import * as lDb from '~/lib/db';
+import * as sCtr from '~/sys/ctr';
+import * as types from '~/types';
 /** --- 条数列表 --- */
 declare class Rows<T extends Mod> implements types.Rows<T> {
     private readonly _items;
@@ -33,6 +33,8 @@ export default class Mod {
     protected static _$primary: string;
     /** --- 设置后将由 _keyGenerator 函数生成唯一字段 --- */
     protected static _$key: string;
+    /** --- 若使用 _$key 并且有多个 unique 索引，这里指定 _$key 的索引名 --- */
+    protected static _$index: string;
     /** ---- 可开启软删软更新软新增 --- */
     protected static _$soft: boolean;
     /** --- 要 update 的内容 --- */

package/sys/mod.js

@@ -38,11 +38,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * Date: 2019-6-4 21:35
  * Last: 2020-4-14 13:33:51, 2022-07-23 16:01:34, 2022-09-06 22:59:26, 2023-5-24 19:11:37, 2023-6-13 21:47:58, 2023-7-10 18:54:03, 2023-8-23 17:03:16, 2023-12-11 15:21:22, 2023-12-20 23:12:03, 2024-3-8 16:05:29, 2024-3-20 19:58:15, 2024-8-11 21:14:54, 2024-10-5 14:00:22, 2024-12-14 19:58:34
  */
-const lSql = __importStar(require("../lib/sql"));
-const lTime = __importStar(require("../lib/time"));
-const lCore = __importStar(require("../lib/core"));
-const lText = __importStar(require("../lib/text"));
-const sCtr = __importStar(require("../sys/ctr"));
+const lSql = __importStar(require("~/lib/sql"));
+const lTime = __importStar(require("~/lib/time"));
+const lCore = __importStar(require("~/lib/core"));
+const lText = __importStar(require("~/lib/text"));
+const sCtr = __importStar(require("~/sys/ctr"));
 /** --- 条数列表 --- */
 class Rows {
     constructor(initialItems = []) {
@@ -353,8 +353,8 @@ class Mod {
         if (typeof opt.index === 'string') {
             opt.index = [opt.index];
         }
-        else if (!opt.index) {
-            opt.index = [''];
+        else {
+            opt.index ??= [''];
         }
         if (this._$soft && !opt.raw) {
             if (typeof where === 'string') {
@@ -657,9 +657,7 @@ class Mod {
         for (const k in this._updates) {
             updates[k] = this._data[k];
         }
-        if (!table) {
-            table = cstr._$table + (this._index ? ('_' + this._index[0]) : '');
-        }
+        table ??= cstr._$table + (this._index ? ('_' + this._index[0]) : '');
         let r = null;
         if ((cstr._$key !== '') && (updates[cstr._$key] === undefined)) {
             let count = 0;
@@ -682,18 +680,29 @@ class Mod {
                 if (!r.error) {
                     break;
                 }
-                if (r.error.errno !== 1062) {
-                    await lCore.log(this._ctr ?? {
-                        'path': '',
-                        'urlFull': '',
-                        'hostname': '',
-                        'req': null,
-                        'get': {},
-                        'cookie': {},
-                        'headers': {}
-                    }, '[create0, mod] [' + table + '] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
-                    return false;
+                if (r.error.errno === 1062) {
+                    // --- 与唯一键冲突 ---
+                    if (!cstr._$index) {
+                        // --- 没设置 index，那就当做是本次生成的 key 重复了 ---
+                        continue;
+                    }
+                    const match = /for key '([\w.]+)'/.exec(r.error.message);
+                    if (match?.[1].includes(cstr._$index)) {
+                        // --- 确实重复了 ---
+                        continue;
+                    }
                 }
+                // --- 未处理的错误 ---
+                await lCore.log(this._ctr ?? {
+                    'path': '',
+                    'urlFull': '',
+                    'hostname': '',
+                    'req': null,
+                    'get': {},
+                    'cookie': {},
+                    'headers': {}
+                }, '[create0, mod] [' + table + '] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                return false;
             }
         }
         else {
@@ -1603,6 +1612,8 @@ Mod._$table = '';
 Mod._$primary = 'id';
 /** --- 设置后将由 _keyGenerator 函数生成唯一字段 --- */
 Mod._$key = '';
+/** --- 若使用 _$key 并且有多个 unique 索引，这里指定 _$key 的索引名 --- */
+Mod._$index = '';
 /** ---- 可开启软删软更新软新增 --- */
 Mod._$soft = false;
 exports.default = Mod;

package/sys/route.d.ts

@@ -7,7 +7,7 @@ import * as http from 'http';
 import * as http2 from 'http2';
 import * as net from 'net';
 import * as sCtr from './ctr';
-import * as types from '../types';
+import * as types from '~/types';
 /**
  * --- 清除已经加载的虚拟主机配置文件 ---
  */

package/sys/route.js

@@ -49,15 +49,15 @@ const stream = __importStar(require("stream"));
 // --- 第三方 ---
 const ws = __importStar(require("@litert/websocket"));
 // --- 库和定义 ---
-const lFs = __importStar(require("../lib/fs"));
-const lZlib = __importStar(require("../lib/zlib"));
-const lCore = __importStar(require("../lib/core"));
-const lText = __importStar(require("../lib/text"));
-const lTime = __importStar(require("../lib/time"));
-const lResponse = __importStar(require("../lib/net/response"));
-const lWs = __importStar(require("../lib/ws"));
+const lFs = __importStar(require("~/lib/fs"));
+const lZlib = __importStar(require("~/lib/zlib"));
+const lCore = __importStar(require("~/lib/core"));
+const lText = __importStar(require("~/lib/text"));
+const lTime = __importStar(require("~/lib/time"));
+const lResponse = __importStar(require("~/lib/net/response"));
+const lWs = __importStar(require("~/lib/ws"));
 const sCtr = __importStar(require("./ctr"));
-const kebab = __importStar(require("../index"));
+const kebab = __importStar(require("~/index"));
 /** --- 动态层 kebab.json 缓存（文件路径: 最终合并值） --- */
 let kebabConfigs = {};
 /**

package/www/example/ctr/main.d.ts

@@ -1,4 +1,4 @@
-import * as ctr from '../../../sys/ctr';
+import * as ctr from '~/sys/ctr';
 export default class extends ctr.Ctr {
     index(): string;
 }

package/www/example/ctr/main.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-const ctr = __importStar(require("../../../sys/ctr"));
+const ctr = __importStar(require("~/sys/ctr"));
 class default_1 extends ctr.Ctr {
     index() {
         return `<a href="${this._config.const.urlBase}test">Hello world! Click here to visit demo.</a>`;

package/www/example/ctr/middle.d.ts

@@ -1,5 +1,5 @@
-import * as ctr from '../../../sys/ctr';
-import * as types from '../../../types';
+import * as ctr from '~/sys/ctr';
+import * as types from '~/types';
 export default class extends ctr.Ctr {
     onLoad(): string | boolean;
     onUnload(rtn: string | boolean | types.DbValue[]): string | boolean | types.DbValue[];

package/www/example/ctr/middle.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-const ctr = __importStar(require("../../../sys/ctr"));
+const ctr = __importStar(require("~/sys/ctr"));
 class default_1 extends ctr.Ctr {
     onLoad() {
         if (this._config.const.path !== 'test/middle') {

package/www/example/ctr/test.d.ts

@@ -1,6 +1,6 @@
 import * as fs from 'fs';
-import * as sCtr from '../../../sys/ctr';
-import * as types from '../../../types';
+import * as sCtr from '~/sys/ctr';
+import * as types from '~/types';
 export default class extends sCtr.Ctr {
     private _internalUrl;
     onLoad(): Array<string | number> | boolean;

package/www/example/ctr/test.js

@@ -37,27 +37,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 // --- 库和定义 ---
-const lCore = __importStar(require("../../../lib/core"));
-const lNet = __importStar(require("../../../lib/net"));
-const lDb = __importStar(require("../../../lib/db"));
-const lFs = __importStar(require("../../../lib/fs"));
-const lText = __importStar(require("../../../lib/text"));
-const lCrypto = __importStar(require("../../../lib/crypto"));
-const lKv = __importStar(require("../../../lib/kv"));
-const lCaptcha = __importStar(require("../../../lib/captcha"));
-const lTime = __importStar(require("../../../lib/time"));
-const lScan = __importStar(require("../../../lib/scan"));
-const lSql = __importStar(require("../../../lib/sql"));
-const lConsistent = __importStar(require("../../../lib/consistent"));
-const lSsh = __importStar(require("../../../lib/ssh"));
-const lJwt = __importStar(require("../../../lib/jwt"));
-const lWs = __importStar(require("../../../lib/ws"));
-const lS3 = __importStar(require("../../../lib/s3"));
-const lZip = __importStar(require("../../../lib/zip"));
-const lBuffer = __importStar(require("../../../lib/buffer"));
-const lLan = __importStar(require("../../../lib/lan"));
-const sCtr = __importStar(require("../../../sys/ctr"));
-const kebab = __importStar(require("../../../index"));
+const lCore = __importStar(require("~/lib/core"));
+const lNet = __importStar(require("~/lib/net"));
+const lDb = __importStar(require("~/lib/db"));
+const lFs = __importStar(require("~/lib/fs"));
+const lText = __importStar(require("~/lib/text"));
+const lCrypto = __importStar(require("~/lib/crypto"));
+const lKv = __importStar(require("~/lib/kv"));
+const lCaptcha = __importStar(require("~/lib/captcha"));
+const lTime = __importStar(require("~/lib/time"));
+const lScan = __importStar(require("~/lib/scan"));
+const lSql = __importStar(require("~/lib/sql"));
+const lConsistent = __importStar(require("~/lib/consistent"));
+const lSsh = __importStar(require("~/lib/ssh"));
+const lJwt = __importStar(require("~/lib/jwt"));
+const lWs = __importStar(require("~/lib/ws"));
+const lS3 = __importStar(require("~/lib/s3"));
+const lZip = __importStar(require("~/lib/zip"));
+const lBuffer = __importStar(require("~/lib/buffer"));
+const lLan = __importStar(require("~/lib/lan"));
+const sCtr = __importStar(require("~/sys/ctr"));
+const kebab = __importStar(require("~/index"));
 // --- mod ---
 const test_1 = __importDefault(require("../mod/test"));
 const testdata_1 = __importDefault(require("../mod/testdata"));
@@ -548,6 +548,7 @@ Result:<pre id="result">Nothing.</pre>` + this._getEnd();
                 'ctr': this
             });
             test.set({
+                'name': 'nam' + lCore.rand(0, 3).toString(),
                 'point': { 'x': lCore.rand(0, 99), 'y': lCore.rand(0, 99) },
                 'polygon': [
                     [
@@ -566,6 +567,7 @@ const test = mTest.getCreate<mTest>(db, {
     'ctr': this
 });
 test.set({
+    'name': 'nam' + lCore.rand(0, 4).toString(),
     'point': { 'x': lCore.rand(0, 99), 'y': lCore.rand(0, 99) },
     'polygon': [
         [
@@ -744,6 +746,7 @@ CREATE TABLE \`m_test_data_0\` (
             'ctr': this
         });
         test.set({
+            'name': lCore.random(4),
             'token': lCore.random(lCore.rand(8, 32)),
             'point': {
                 'x': 10,

package/www/example/mod/test.d.ts

@@ -1,10 +1,12 @@
-import sMod from '../../../sys/mod';
-import types from '../../../types';
+import sMod from '~/sys/mod';
+import types from '~/types';
 export default class extends sMod {
     protected static _$table: string;
     protected static _$primary: string;
     protected static _$key: string;
+    protected static _$index: string;
     id: number;
+    name: string;
     token: string;
     point: {
         'x': number;

package/www/example/mod/test.js

@@ -36,28 +36,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const lCore = __importStar(require("../../../lib/core"));
-const mod_1 = __importDefault(require("../../../sys/mod"));
+const lCore = __importStar(require("~/lib/core"));
+const mod_1 = __importDefault(require("~/sys/mod"));
 /*
-CREATE TABLE `m_test` (
-  `id` INT NOT NULL AUTO_INCREMENT,
-  `token` CHAR(16) NOT NULL COLLATE 'ascii_bin',
-  `point` POINT NOT NULL,
-  `polygon` POLYGON NULL DEFAULT NULL,
-  `json` JSON NULL DEFAULT NULL,
-  `time_add` BIGINT NOT NULL,
+CREATE TABLE `m_test`  (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `name` char(4) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `token` varchar(32) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `point` point NOT NULL,
+  `polygon` polygon NULL,
+  `json` json NULL,
+  `time_add` bigint NOT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-    UNIQUE INDEX `token` (`token`) USING BTREE,
-    INDEX `time_add` (`time_add`) USING BTREE
-) ENGINE=InnoDB COLLATE=utf8mb4_general_ci;
+  INDEX `time_add`(`time_add` ASC) USING BTREE,
+  UNIQUE INDEX `utoken`(`token` ASC) USING BTREE,
+  UNIQUE INDEX `uname`(`name` ASC) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 */
 class default_1 extends mod_1.default {
     /* eslint-enable */
     _keyGenerator() {
-        return 'test_' + lCore.rand(0, 5).toString();
+        return 'test_' + lCore.rand(0, 3).toString();
     }
 }
 default_1._$table = 'test';
 default_1._$primary = 'id';
 default_1._$key = 'token';
+default_1._$index = 'utoken';
 exports.default = default_1;

package/www/example/mod/testdata.d.ts

@@ -1,4 +1,4 @@
-import sMod from '../../../sys/mod';
+import sMod from '~/sys/mod';
 export default class extends sMod {
     protected static _$table: string;
     protected static _$primary: string;

package/www/example/mod/testdata.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const mod_1 = __importDefault(require("../../../sys/mod"));
+const mod_1 = __importDefault(require("~/sys/mod"));
 /*
 CREATE TABLE `m_test_data_0` (
     `id` bigint NOT NULL AUTO_INCREMENT,

package/www/example/ws/mproxy.d.ts

@@ -1,4 +1,4 @@
-import * as sCtr from '../../../sys/ctr';
+import * as sCtr from '~/sys/ctr';
 export default class extends sCtr.Ctr {
     onLoad(): Promise<boolean>;
 }

package/www/example/ws/mproxy.js

@@ -33,8 +33,8 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-const sCtr = __importStar(require("../../../sys/ctr"));
-const lWs = __importStar(require("../../../lib/ws"));
+const sCtr = __importStar(require("~/sys/ctr"));
+const lWs = __importStar(require("~/lib/ws"));
 class default_1 extends sCtr.Ctr {
     async onLoad() {
         console.log('WebSocket mproxy test onLoad.');

package/www/example/ws/rproxy.d.ts

@@ -1,4 +1,4 @@
-import * as sCtr from '../../../sys/ctr';
+import * as sCtr from '~/sys/ctr';
 export default class extends sCtr.Ctr {
     onLoad(): Promise<boolean>;
 }

package/www/example/ws/rproxy.js

@@ -33,8 +33,8 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-const sCtr = __importStar(require("../../../sys/ctr"));
-const lWs = __importStar(require("../../../lib/ws"));
+const sCtr = __importStar(require("~/sys/ctr"));
+const lWs = __importStar(require("~/lib/ws"));
 class default_1 extends sCtr.Ctr {
     async onLoad() {
         console.log('WebSocket rproxy test onLoad.');

package/www/example/ws/test.d.ts

@@ -1,4 +1,4 @@
-import * as sCtr from '../../../sys/ctr';
+import * as sCtr from '~/sys/ctr';
 export default class extends sCtr.Ctr {
     private _nick;
     onLoad(): boolean;

package/www/example/ws/test.js

@@ -33,8 +33,8 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-const sCtr = __importStar(require("../../../sys/ctr"));
-const lCrypto = __importStar(require("../../../lib/crypto"));
+const sCtr = __importStar(require("~/sys/ctr"));
+const lCrypto = __importStar(require("~/lib/crypto"));
 class default_1 extends sCtr.Ctr {
     constructor() {
         super(...arguments);