@maiyunnet/kebab 2.0.2 → 2.0.4

package/index.js

@@ -1,7 +1,7 @@
 "use strict";
 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.2';
+exports.VER = '2.0.4';
 const dirname = __dirname.replace(/\\/g, '/');
 exports.ROOT_PATH = dirname + '/';
 exports.LIB_PATH = exports.ROOT_PATH + 'lib/';

package/lib/sql.js

@@ -477,9 +477,7 @@ class Sql {
         return this;
     }
     _whereSub(s, data) {
-        if (!data) {
-            data = this._data;
-        }
+        data ??= this._data;
         s = aoMix(s);
         let sql = '';
         for (const k in s) {

package/lib/text.js

@@ -57,6 +57,7 @@ exports.stringifyResult = stringifyResult;
 exports.parseJson = parseJson;
 exports.stringifyJson = stringifyJson;
 exports.isFalsy = isFalsy;
+exports.logicalOr = logicalOr;
 exports.str2int = str2int;
 exports.int2str = int2str;
 const kebab = __importStar(require("~/index"));
@@ -429,7 +430,10 @@ function stringifyJson(obj, space) {
     }, space).replace(/"-mybigint-([-+0-9]+?)"/g, '$1');
 }
 function isFalsy(val) {
-    return (val === null || val === undefined || val === '' || val === false || val === 0) ? true : false;
+    return (val === null) || (val === undefined) || (val === '') || (val === false) || (val === 0);
+}
+function logicalOr(v1, v2) {
+    return (isFalsy(v1) ? v2 : v1);
 }
 function str2int(str, digits = 3) {
     const num = parseFloat(str);

package/package.json

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

package/tsconfig.json

@@ -7,7 +7,7 @@
         "sourceMap": false,
         "target": "ES2021",
         "strict": true,             // 严格模式
-        "declaration": false,       // d.ts
+        "declaration": true,       // d.ts
         "declarationMap": false,    // d.ts 的 map
         "newLine": "LF",
         "paths": {

package/index.ts

@@ -1,33 +0,0 @@
-/**
- * Project: Kebab, User: JianSuoQiYue
- * Date: 2019-3-30 12:46:41
- * Last: 2020-3-8 21:04:24, 2022-07-22 14:20:34, 2023-5-24 01:34:57, 2025-6-13 14:49:27
- * --- 本文件用来定义每个目录实体地址的常量 ---
- */
-
-/** --- 当前系统版本号 --- */
-export const VER = '2.0.2';
-
-// --- 服务端用的路径 ---
-
-/** --- /xxx/xxx --- */
-const dirname = __dirname.replace(/\\/g, '/');
-
-/** --- 框架根目录，以 / 结尾  --- */
-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, '/');
-
-/** --- 执行根目录，以 / 结尾 --- */
-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.ts

@@ -1,152 +0,0 @@
-/** --- 读对象 --- */
-export class Reader {
-
-    private readonly _buffer: Buffer;
-
-    /** --- 当前读取位置 --- */
-    private _offset: number = 0;
-
-    public constructor(buffer: Buffer) {
-        this._buffer = buffer;
-    }
-
-    /** --- 读取一个无符号8位整数, BYTE --- */
-    public readUInt8(): number {
-        const value = this._buffer.readUInt8(this._offset);
-        this._offset += 1;
-        return value;
-    }
-
-    /** --- 读取一个无符号16位整数（大端模式），WORD --- */
-    public readUInt16BE(): number {
-        const value = this._buffer.readUInt16BE(this._offset);
-        this._offset += 2;
-        return value;
-    }
-
-    /** --- 读取一个无符号32位整数（大端模式）, DWORD --- */
-    public readUInt32BE(): number {
-        const value = this._buffer.readUInt32BE(this._offset);
-        this._offset += 4;
-        return value;
-    }
-
-    /** --- 读取一个 BCD 编码的字符串（每个字节表示两个数字）--- */
-    public readBCDString(length?: number): string {
-        if (length === undefined) {
-            length = this._buffer.length - this._offset;
-        }
-        let str = '';
-        for (let i = 0; i < length; i++) {
-            const byte = this._buffer.readUInt8(this._offset + i);
-            str += (byte >> 4).toString(16).toUpperCase(); // --- 高四位表示第一个数字 ---
-            str += (byte & 0x0f).toString(16).toUpperCase(); // --- 低四位表示第二个数字 ---
-        }
-        this._offset += length;
-        return str;
-    }
-
-    /** --- 读取普通 string --- */
-    public readString(length?: number, encoding: BufferEncoding = 'utf8'): string {
-        if (length === undefined) {
-            length = this._buffer.length - this._offset;
-        }
-        const buf: number[] = [];
-        for (let i = 0; i < length; i++) {
-            const byte = this._buffer.readUInt8(this._offset + i);
-            if (byte === 0x00) {
-                continue;
-            }
-            buf.push(byte);
-        }
-        this._offset += length;
-        return Buffer.from(buf).toString(encoding);
-    }
-
-    /** --- 读取 Buffer --- */
-    public readBuffer(length?: number): Buffer {
-        if (length === undefined) {
-            length = this._buffer.length - this._offset;
-        }
-        return this._buffer.subarray(this._offset, this._offset += length);
-    }
-
-    /** --- 获取完整的 buffer 长度 --- */
-    public length(): number {
-        return this._buffer.length;
-    }
-
-}
-
-/** --- 写对象 --- */
-export class Writer {
-
-    private readonly _buffer: Buffer;
-
-    /** --- 当前读取位置 --- */
-    private _offset: number = 0;
-
-    public constructor(size: number) {
-        this._buffer = Buffer.alloc(size);
-    }
-
-    /** --- [1 字节] 写入一个无符号 8 位整数 --- */
-    public writeUInt8(value: number): void {
-        this._buffer.writeUInt8(value, this._offset);
-        this._offset += 1;
-    }
-
-    /** --- [2 字节] 写入一个无符号 16 位整数（大端模式） --- */
-    public writeUInt16BE(value: number): void {
-        this._buffer.writeUInt16BE(value, this._offset);
-        this._offset += 2;
-    }
-
-    /** --- [4 字节] 写入一个无符号 32 位整数（大端模式） --- */
-    public writeUInt32BE(value: number): void {
-        this._buffer.writeUint32BE(value, this._offset);
-        this._offset += 4;
-    }
-
-    /** --- [每字节 2 数字] 写入一个 BCD 编码的字符串（仅支持数字） --- */
-    public writeBCDString(value: string): void {
-        for (let i = 0; i < value.length; i += 2) {
-            const high = parseInt(value[i], 10); // --- 取十位 ---
-            const low = parseInt(value[i + 1], 10); // --- 取个位 ---
-            const byte = (high << 4) | low; // --- 拼接为一个字节 ---
-            this.writeUInt8(byte);
-        }
-    }
-
-    /** --- 写入普通字符串，返回写入的长度 --- */
-    public writeString(value: string, encoding: BufferEncoding = 'utf8'): number {
-        const bytes = Buffer.from(value, encoding);
-        for (const byte of bytes) {
-            this.writeUInt8(byte);
-        }
-        this._offset += bytes.length;
-        return bytes.length;
-    }
-
-    /** --- 返回 Buffer 对象 --- */
-    public get(): Buffer {
-        return this._buffer.subarray(0, this._offset);
-    }
-
-}
-
-/**
- * --- Buffer Reader 对象 ---
- * @param buffer 要读取的 buffer
- */
-export function getReader(buffer: Buffer): Reader {
-    return new Reader(buffer);
-}
-
-/**
- * --- Buffer Writer 对象 ---
- * @param buffer 要读取的 buffer
- */
-export function getWriter(size: number): Writer {
-    return new Writer(size);
-}

package/lib/captcha.ts

@@ -1,63 +0,0 @@
-/**
- * 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
- */
-import * as svgCaptcha from 'svg-captcha';
-import * as mime from '@litert/mime';
-import * as core from '~/lib/core';
-import * as kebab from '~/index';
-
-svgCaptcha.loadFont(kebab.LIB_PATH + 'captcha/zcool-addict-italic.ttf');
-
-export class Captcha {
-
-    private readonly _link: svgCaptcha.CaptchaObj;
-
-    public constructor(opt: { 'width': number; 'height': number; 'length': number; }) {
-        this._link = svgCaptcha.create({
-            'width': opt.width,
-            'height': opt.height,
-            'size': opt.length,
-            'noise': 15,
-            'background': '#fff',
-            'charPreset': core.RANDOM_V
-        });
-    }
-
-    /**
-     * --- 获取图片 Buffer ---
-     */
-    public getBuffer(): string {
-        return this._link.data.replace('<rect width="100%" height="100%" fill="#fff"/>', '');
-    }
-
-    /**
-     * --- 获取 base64 格式图片 ---
-     */
-    public getBase64(): string {
-        return `data:${mime.getMime('svg')};base64,` + Buffer.from(this._link.data.replace('<rect width="100%" height="100%" fill="#fff"/>', '')).toString('base64');
-    }
-
-    /**
-     * --- 获取当前随机码 ---
-     */
-    public getPhrase(): string {
-        return this._link.text;
-    }
-
-}
-
-/**
- * --- 获取验证码对象 ---
- * @param width 宽度
- * @param height 高度
- * @param length 字符个数
- */
-export function get(width: number, height: number, length: number = 4): Captcha {
-    return new Captcha({
-        'width': width,
-        'height': height,
-        'length': length
-    });
-}

package/lib/consistent.ts

@@ -1,219 +0,0 @@
-/**
- * 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
- */
-import * as crypto from '~/lib/crypto';
-
-export class Consistent {
-
-    /** --- 虚拟节点数量 --- */
-    private readonly _vcount: number = 300;
-
-    /** --- hash 环 --- */
-    private readonly _circle: Record<string, string> = {};
-
-    /** --- circle 的 keys --- */
-    private _keys: string[] = [];
-
-    public constructor(vcount: number) {
-        this._vcount = vcount;
-    }
-
-    /**
-     * --- 获取当前的虚拟节点数量 ---
-     */
-    public getVcount(): number {
-        return this._vcount;
-    }
-
-    /**
-     * 添加节点
-     * @param node node 节点名一个或多个
-     */
-    public add(node: string | string[]): void {
-        addToCircle(this._circle, node, this._vcount);
-        this._keys = [];
-    }
-
-    /**
-     * 移除节点
-     * @param node node 节点名
-     */
-    public remove(node: string | string[]): void {
-        if (typeof node === 'string') {
-            node = [node];
-        }
-        for (const v of node) {
-            for (let i = 0; i < this._vcount; i++) {
-                delete this._circle[hash(v + i.toString())];
-            }
-        }
-        this._keys = [];
-    }
-
-    /**
-     * 获得一个最近的顺时针节点
-     * @param key 为给定键取 Hash，取得顺时针方向上最近的一个虚拟节点对应的实际节点
-     */
-    public find(key: string | number): string | null {
-        if (this._keys.length === 0) {
-            this._keys = Object.keys(this._circle);
-            this._keys.sort((a, b) => {
-                return parseFloat(a) - parseFloat(b);
-            });
-        }
-        return findInCircle(this._circle, key, this._keys);
-    }
-
-    /**
-     * --- 原数据迁移到新地址 ---
-     * @param keys 原始数据 key 集
-     * @param node 新增的节点一个或多个
-     */
-    public migration(keys: string | number | Array<string | number>, node: string | string[]): Record<string, {
-        'old': string;
-        'new': string;
-    }> {
-        const rtn: Record<string, {
-            'old': string;
-            'new': string;
-        }> = {};
-        if (!Array.isArray(keys)) {
-            keys = [keys];
-        }
-        // --- 获取老的 key 对应的 node ---
-        const mapOld: Record<string, string> = {};
-        for (const key of keys) {
-            const oldNode = this.find(key);
-            if (!oldNode) {
-                continue;
-            }
-            mapOld[key] = oldNode;
-        }
-        this.add(node);
-        // --- 再逐一检测老的和新的的 node 是否一致 ---
-        for (const key of keys) {
-            const newNode = this.find(key);
-            if (!newNode) {
-                continue;
-            }
-            if (mapOld[key] === newNode) {
-                continue;
-            }
-            rtn[key] = {
-                'old': mapOld[key],
-                'new': newNode
-            };
-        }
-        return rtn;
-    }
-
-}
-
-export function get(vcount = 300): Consistent {
-    return new Consistent(vcount);
-}
-
-/**
- *--- 快速查找一个 key 属于哪个 node ---
- * @param key 要查找的key
- * @param nodes node 列表
- * @param vcount 虚拟节点数量
- */
-export function fast(key: string | number, nodes: string | string[], vcount = 300): string | null {
-    const circle: Record<string, string> = {};
-    addToCircle(circle, nodes, vcount);
-    return findInCircle(circle, key);
-}
-
-/**
- * --- hash 函数 ---
- * @param val 要 hash 的值
- */
-export function hash(val: string | number): number {
-    if (typeof val === 'number') {
-        val = val.toString();
-    }
-    const bKey = crypto.hashHmac('md5', val);
-
-    const res = ((bKey.charCodeAt(3) & 0xFF) << 24) |
-        ((bKey.charCodeAt(2) & 0xFF) << 16) |
-        ((bKey.charCodeAt(1) & 0xFF) << 8) |
-        (bKey.charCodeAt(0) & 0xFF);
-    return res & 0xffffffff;
-}
-
-/**
- * --- 获取区间节点系列 ---
- * @param min 最小值（含）
- * @param max 最大值（含）
- * @param pre 前导
- */
-export function getRange(min: number, max: number, pre: string = ''): string[] {
-    const ls: string[] = [];
-    for (let i = min; i <= max; ++i) {
-        ls.push(pre + i.toString());
-    }
-    return ls;
-}
-
-/**
- * --- 添加到圆环 ---
- * @param circle 圆环
- * @param node node 节点名一个或多个
- * @param vcount 虚拟节点数量
- */
-export function addToCircle(
-    circle: Record<string, string>,
-    node: string | string[],
-    vcount: number = 300
-): void {
-    if (typeof node === 'string') {
-        node = [node];
-    }
-    for (const v of node) {
-        for (let i = 0; i < vcount; i++) {
-            circle[hash(v + i.toString())] = v;
-        }
-    }
-}
-
-/**
- * --- 获得一个最近的顺时针节点 ---
- * @param circle 圆环
- * @param key 为给定键取 Hash，取得顺时针方向上最近的一个虚拟节点对应的实际节点
- * @param keys keys，留空则自动从 circle 上取
- */
-export function findInCircle(
-    circle: Record<string, string>,
-    key: string | number,
-    keys: string[] = []
-): string | null {
-    let count = keys.length;
-    if (keys.length === 0) {
-        keys = Object.keys(circle);
-        count = keys.length;
-        keys.sort((a, b) => {
-            return parseFloat(a) - parseFloat(b);
-        });
-    }
-    if (count === 0) {
-        return null;
-    }
-    if (count === 1) {
-        return circle[keys[0]];
-    }
-    const hashv = hash(key);
-    if (circle[hashv] !== undefined) {
-        return circle[hashv];
-    }
-    for (const v of keys) {
-        if (parseFloat(v) < hashv) {
-            continue;
-        }
-        return circle[v];
-    }
-    // --- 没找到 ---
-    return circle[keys[0]];
-}