@maiyunnet/kebab 2.0.15 → 3.0.0

package/README.md

@@ -1,4 +1,4 @@
-<p align="center"><img src="./doc/icon.svg" width="68" height="68" alt="Kebab"></p>
+<p align="center"><img src="./doc/icon.png" width="64" height="64" alt="Kebab"></p>
 <p align="center">
     <a href="https://github.com/maiyun/kebab/blob/master/LICENSE">
         <img alt="License" src="https://img.shields.io/github/license/maiyun/kebab?color=blue" />
@@ -192,10 +192,6 @@ See: /test/ctr-checkinput
 
 You can visit /test/ to see more examples.
 
-## Changelog
-
-[Changelog](./doc/CHANGELOG.md)
-
 ## License
 
 This library is published under [Apache-2.0](./LICENSE) license.

package/index.d.ts

@@ -8,7 +8,7 @@
  * ------------------------
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "2.0.15";
+export declare const VER = "3.0.0";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;

package/index.js

@@ -1,4 +1,3 @@
-"use strict";
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-3-30 12:46:41
@@ -8,26 +7,25 @@
  * --- npx tsc-alias -w ---
  * ------------------------
  */
-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.15';
+export const VER = '3.0.0';
 // --- 服务端用的路径 ---
+const imu = import.meta.url.replace('file://', '').replace(/^\/(\w:)/, '$1').replace(/\\/g, '/');
 /** --- /xxx/xxx --- */
-const dirname = __dirname.replace(/\\/g, '/');
+const dirname = imu.slice(0, imu.lastIndexOf('/'));
 /** --- 框架根目录，以 / 结尾  --- */
-exports.ROOT_PATH = dirname + '/';
-exports.LIB_PATH = exports.ROOT_PATH + 'lib/';
-exports.SYS_PATH = exports.ROOT_PATH + 'sys/';
+export const ROOT_PATH = dirname + '/';
+export const LIB_PATH = ROOT_PATH + 'lib/';
+export const SYS_PATH = ROOT_PATH + 'sys/';
 const cwd = process.cwd().replace(/\\/g, '/');
 /** --- 执行根目录，以 / 结尾 --- */
-exports.ROOT_CWD = cwd + '/';
-exports.CONF_CWD = exports.ROOT_CWD + 'conf/';
-exports.CERT_CWD = exports.CONF_CWD + 'cert/';
-exports.VHOST_CWD = exports.CONF_CWD + 'vhost/';
-exports.LIB_CWD = exports.ROOT_CWD + 'lib/';
-exports.LOG_CWD = exports.ROOT_CWD + 'log/';
-exports.WWW_CWD = exports.ROOT_CWD + 'www/';
-exports.IND_CWD = exports.ROOT_CWD + 'ind/';
-exports.FTMP_CWD = exports.ROOT_CWD + 'ftmp/';
-exports.MOD_CWD = exports.ROOT_CWD + 'mod/';
+export const ROOT_CWD = cwd + '/';
+export const CONF_CWD = ROOT_CWD + 'conf/';
+export const CERT_CWD = CONF_CWD + 'cert/';
+export const VHOST_CWD = CONF_CWD + 'vhost/';
+export const LIB_CWD = ROOT_CWD + 'lib/';
+export const LOG_CWD = ROOT_CWD + 'log/';
+export const WWW_CWD = ROOT_CWD + 'www/';
+export const IND_CWD = ROOT_CWD + 'ind/';
+export const FTMP_CWD = ROOT_CWD + 'ftmp/';
+export const MOD_CWD = ROOT_CWD + 'mod/';

package/lib/buffer.js

@@ -1,10 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Writer = exports.Reader = void 0;
-exports.getReader = getReader;
-exports.getWriter = getWriter;
 /** --- 读对象 --- */
-class Reader {
+export class Reader {
     constructor(buffer) {
         /** --- 当前读取位置 --- */
         this._offset = 0;
@@ -30,9 +25,7 @@ class Reader {
     }
     /** --- 读取一个 BCD 编码的字符串（每个字节表示两个数字）--- */
     readBCDString(length) {
-        if (length === undefined) {
-            length = this._buffer.length - this._offset;
-        }
+        length ??= this._buffer.length - this._offset;
         let str = '';
         for (let i = 0; i < length; i++) {
             const byte = this._buffer.readUInt8(this._offset + i);
@@ -44,9 +37,7 @@ class Reader {
     }
     /** --- 读取普通 string --- */
     readString(length, encoding = 'utf8') {
-        if (length === undefined) {
-            length = this._buffer.length - this._offset;
-        }
+        length ??= this._buffer.length - this._offset;
         const buf = [];
         for (let i = 0; i < length; i++) {
             const byte = this._buffer.readUInt8(this._offset + i);
@@ -60,9 +51,7 @@ class Reader {
     }
     /** --- 读取 Buffer --- */
     readBuffer(length) {
-        if (length === undefined) {
-            length = this._buffer.length - this._offset;
-        }
+        length ??= this._buffer.length - this._offset;
         return this._buffer.subarray(this._offset, this._offset += length);
     }
     /** --- 获取完整的 buffer 长度 --- */
@@ -70,9 +59,8 @@ class Reader {
         return this._buffer.length;
     }
 }
-exports.Reader = Reader;
 /** --- 写对象 --- */
-class Writer {
+export class Writer {
     constructor(size) {
         /** --- 当前读取位置 --- */
         this._offset = 0;
@@ -116,18 +104,17 @@ class Writer {
         return this._buffer.subarray(0, this._offset);
     }
 }
-exports.Writer = Writer;
 /**
  * --- Buffer Reader 对象 ---
  * @param buffer 要读取的 buffer
  */
-function getReader(buffer) {
+export function getReader(buffer) {
     return new Reader(buffer);
 }
 /**
  * --- Buffer Writer 对象 ---
  * @param buffer 要读取的 buffer
  */
-function getWriter(size) {
+export function getWriter(size) {
     return new Writer(size);
 }

package/lib/captcha.js

@@ -1,51 +1,14 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Captcha = void 0;
-exports.get = get;
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-6-7 12:14:31
  * Last: 2020-3-11 23:33:19, 2022-09-12 10:38:24, 2022-12-29 01:16:26, 2024-4-1 16:40:42, 2025-6-13 19:45:30
  */
-const svgCaptcha = __importStar(require("svg-captcha"));
-const mime = __importStar(require("@litert/mime"));
-const core = __importStar(require("~/lib/core"));
-const kebab = __importStar(require("~/index"));
+import * as svgCaptcha from 'svg-captcha';
+import * as mime from '@litert/mime';
+import * as core from '../lib/core.js';
+import * as kebab from '../index.js';
 svgCaptcha.loadFont(kebab.LIB_PATH + 'captcha/zcool-addict-italic.ttf');
-class Captcha {
+export class Captcha {
     constructor(opt) {
         this._link = svgCaptcha.create({
             'width': opt.width,
@@ -75,14 +38,13 @@ class Captcha {
         return this._link.text;
     }
 }
-exports.Captcha = Captcha;
 /**
  * --- 获取验证码对象 ---
  * @param width 宽度
  * @param height 高度
  * @param length 字符个数
  */
-function get(width, height, length = 4) {
+export function get(width, height, length = 4) {
     return new Captcha({
         'width': width,
         'height': height,

package/lib/consistent.js

@@ -1,52 +1,10 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Consistent = void 0;
-exports.get = get;
-exports.fast = fast;
-exports.hash = hash;
-exports.getRange = getRange;
-exports.addToCircle = addToCircle;
-exports.findInCircle = findInCircle;
 /**
  * Project: Kebab, User: JianSuoQiYue
  * 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"));
-class Consistent {
+import * as crypto from '../lib/crypto.js';
+export class Consistent {
     constructor(vcount) {
         /** --- 虚拟节点数量 --- */
         this._vcount = 300;
@@ -135,8 +93,7 @@ class Consistent {
         return rtn;
     }
 }
-exports.Consistent = Consistent;
-function get(vcount = 300) {
+export function get(vcount = 300) {
     return new Consistent(vcount);
 }
 /**
@@ -145,7 +102,7 @@ function get(vcount = 300) {
  * @param nodes node 列表
  * @param vcount 虚拟节点数量
  */
-function fast(key, nodes, vcount = 300) {
+export function fast(key, nodes, vcount = 300) {
     const circle = {};
     addToCircle(circle, nodes, vcount);
     return findInCircle(circle, key);
@@ -154,7 +111,7 @@ function fast(key, nodes, vcount = 300) {
  * --- hash 函数 ---
  * @param val 要 hash 的值
  */
-function hash(val) {
+export function hash(val) {
     if (typeof val === 'number') {
         val = val.toString();
     }
@@ -171,7 +128,7 @@ function hash(val) {
  * @param max 最大值（含）
  * @param pre 前导
  */
-function getRange(min, max, pre = '') {
+export function getRange(min, max, pre = '') {
     const ls = [];
     for (let i = min; i <= max; ++i) {
         ls.push(pre + i.toString());
@@ -184,7 +141,7 @@ function getRange(min, max, pre = '') {
  * @param node node 节点名一个或多个
  * @param vcount 虚拟节点数量
  */
-function addToCircle(circle, node, vcount = 300) {
+export function addToCircle(circle, node, vcount = 300) {
     if (typeof node === 'string') {
         node = [node];
     }
@@ -200,7 +157,7 @@ function addToCircle(circle, node, vcount = 300) {
  * @param key 为给定键取 Hash，取得顺时针方向上最近的一个虚拟节点对应的实际节点
  * @param keys keys，留空则自动从 circle 上取
  */
-function findInCircle(circle, key, keys = []) {
+export function findInCircle(circle, key, keys = []) {
     let count = keys.length;
     if (keys.length === 0) {
         keys = Object.keys(circle);

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.js';
+import * as sCtr from '../sys/ctr.js';
+import * as types from '../types/index.js';
 /** --- 全局参数 --- */
 export declare const globalConfig: types.IConfig & {
     'httpPort': number;
@@ -228,7 +228,7 @@ export declare function ls(opt: {
  * --- 完整的克隆一份数组/对象，Kebab: yes, Mutton: no ---
  * @param obj 要克隆的对象
  */
-export declare function clone(obj: Record<string, any> | any[]): any[] | any;
+export declare function clone<T>(obj: T): T;
 /**
  * --- 打印调试信息，线上环境不会打印 ---
  * @param message 参数