@maiyunnet/kebab 7.0.2 → 7.1.1

package/index.d.ts

@@ -5,7 +5,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "7.0.2";
+export declare const VER = "7.1.1";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;

package/index.js

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

package/lib/ai.js

@@ -27,6 +27,9 @@ export var ESERVICE;
 /** --- openai 的连接对象 --- */
 const links = [];
 export class Ai {
+    /** --- openai 原生对象，建议只读 --- */
+    link;
+    _ctr;
     constructor(ctrEtc, opt) {
         let configAi = null;
         if (ctrEtc instanceof sCtr.Ctr) {

package/lib/buffer.js

@@ -1,8 +1,9 @@
 /** --- 读对象 --- */
 export class Reader {
+    _buffer;
+    /** --- 当前读取位置 --- */
+    _offset = 0;
     constructor(buffer) {
-        /** --- 当前读取位置 --- */
-        this._offset = 0;
         this._buffer = buffer;
     }
     /** --- 读取一个无符号 8 位整数, BYTE --- */
@@ -73,9 +74,10 @@ export class Reader {
 }
 /** --- 写对象 --- */
 export class Writer {
+    _buffer;
+    /** --- 当前读取位置 --- */
+    _offset = 0;
     constructor(size) {
-        /** --- 当前读取位置 --- */
-        this._offset = 0;
         this._buffer = Buffer.alloc(size);
     }
     /** --- [1 字节] 写入一个无符号 8 位整数 --- */

package/lib/captcha.js

@@ -9,6 +9,7 @@ import * as core from '#kebab/lib/core.js';
 import * as kebab from '#kebab/index.js';
 svgCaptcha.loadFont(kebab.LIB_PATH + 'captcha/zcool-addict-italic.ttf');
 export class Captcha {
+    _link;
     constructor(opt) {
         this._link = svgCaptcha.create({
             'width': opt.width,

package/lib/consistent.js

@@ -5,13 +5,13 @@
  */
 import * as crypto from '#kebab/lib/crypto.js';
 export class Consistent {
+    /** --- 虚拟节点数量 --- */
+    _vcount = 300;
+    /** --- hash 环 --- */
+    _circle = {};
+    /** --- circle 的 keys --- */
+    _keys = [];
     constructor(vcount) {
-        /** --- 虚拟节点数量 --- */
-        this._vcount = 300;
-        /** --- hash 环 --- */
-        this._circle = {};
-        /** --- circle 的 keys --- */
-        this._keys = [];
         this._vcount = vcount;
     }
     /**

package/lib/core.d.ts

@@ -157,6 +157,15 @@ export declare function sendReload(hosts?: string[] | 'config'): Promise<string[
  * --- 主要用作不间断的代码热更新 ---
  */
 export declare function sendRestart(hosts?: string[] | 'config'): Promise<string[]>;
+/** --- PM2 操作类型 --- */
+export type TPm2Action = 'start' | 'stop' | 'restart';
+/**
+ * --- 向本机或局域网 RPC 发送 PM2 操作 ---
+ * @param name PM2 进程名称
+ * @param action PM2 操作类型
+ * @param hosts 局域网列表
+ */
+export declare function sendPm2(name: string, action?: TPm2Action, hosts?: string[] | 'config'): Promise<string[]>;
 /** --- 跨进程全局变量 --- */
 export declare const global: Record<string, any>;
 /**

package/lib/core.js

@@ -492,6 +492,44 @@ export async function sendRestart(hosts) {
     }
     return rtn;
 }
+/**
+ * --- 向本机或局域网 RPC 发送 PM2 操作 ---
+ * @param name PM2 进程名称
+ * @param action PM2 操作类型
+ * @param hosts 局域网列表
+ */
+export async function sendPm2(name, action = 'restart', hosts) {
+    if (hosts === 'config') {
+        hosts = globalConfig.hosts;
+    }
+    hosts ??= ['127.0.0.1'];
+    // --- 局域网模式 ---
+    const time = lTime.stamp();
+    /** --- 返回成功的 host --- */
+    const rtn = [];
+    for (const host of hosts) {
+        const res = await lNet.get('http://' + host + ':' + globalConfig.rpcPort.toString() + '/' + lCrypto.aesEncrypt(lText.stringifyJson({
+            'action': 'pm2',
+            'time': time,
+            'name': name,
+            'pm2Action': action
+        }), globalConfig.rpcSecret), {
+            'timeout': 10
+        });
+        const content = await res.getContent();
+        if (!content) {
+            continue;
+        }
+        const str = content.toString();
+        if (str === 'Done') {
+            rtn.push(host);
+        }
+        else {
+            debug('[CORE][sendPm2] rpc server content error:', str);
+        }
+    }
+    return rtn;
+}
 /** --- 跨进程全局变量 --- */
 export const global = {};
 /**
@@ -733,52 +771,29 @@ export async function ls(opt) {
  * @param obj 要克隆的对象
  */
 export function clone(obj) {
-    let newObj = {};
-    if (obj instanceof Array) {
-        newObj = [];
-        for (let i = 0; i < obj.length; ++i) {
-            if (obj[i] instanceof Date) {
-                newObj[i] = new Date(obj[i].getTime());
-            }
-            else if (obj[i] instanceof FormData) {
-                const fd = new FormData();
-                for (const item of obj[i]) {
-                    fd.append(item[0], item[1]);
-                }
-                newObj[i] = fd;
-            }
-            else if (obj[i] === null) {
-                newObj[i] = null;
-            }
-            else if (typeof obj[i] === 'object') {
-                newObj[i] = clone(obj[i]);
-            }
-            else {
-                newObj[i] = obj[i];
+    const isArray = obj instanceof Array;
+    const newObj = isArray ? [] : {};
+    const keys = isArray ? obj.keys() : Object.keys(obj);
+    for (const key of keys) {
+        const val = obj[key];
+        if (val instanceof Date) {
+            newObj[key] = new Date(val.getTime());
+        }
+        else if (val instanceof FormData) {
+            const fd = new FormData();
+            for (const item of val) {
+                fd.append(item[0], item[1]);
             }
+            newObj[key] = fd;
         }
-    }
-    else {
-        for (const key in obj) {
-            if (obj[key] instanceof Date) {
-                newObj[key] = new Date(obj[key].getTime());
-            }
-            else if (obj[key] instanceof FormData) {
-                const fd = new FormData();
-                for (const item of obj[key]) {
-                    fd.append(item[0], item[1]);
-                }
-                newObj[key] = fd;
-            }
-            else if (obj[key] === null) {
-                newObj[key] = null;
-            }
-            else if (typeof obj[key] === 'object') {
-                newObj[key] = clone(obj[key]);
-            }
-            else {
-                newObj[key] = obj[key];
-            }
+        else if (val === null) {
+            newObj[key] = null;
+        }
+        else if (typeof val === 'object') {
+            newObj[key] = clone(val);
+        }
+        else {
+            newObj[key] = val;
         }
     }
     return newObj;

package/lib/db/conn.js

@@ -28,17 +28,21 @@ pg.types.setTypeParser(pg.types.builtins.INT8, val => {
 });
 /** --- 数据库连接对象 --- */
 export class Connection {
+    /** --- 本连接最后一次使用时间 --- */
+    _last = 0;
+    /** --- 最后两次执行的 sql 完整串 --- */
+    _lastSql = [];
+    /** --- 数据库连接对象 --- */
+    _link;
+    /** --- 当前连接是否正在被独占使用 --- */
+    _using = false;
+    /** --- 当发生断开，则需从连接池移除连接 --- */
+    _lost = false;
+    /** --- 当前正在处理事务 --- */
+    _transaction = false;
+    /** --- 当前的连接配置信息 --- */
+    _etc;
     constructor(etc, link) {
-        /** --- 本连接最后一次使用时间 --- */
-        this._last = 0;
-        /** --- 最后两次执行的 sql 完整串 --- */
-        this._lastSql = [];
-        /** --- 当前连接是否正在被独占使用 --- */
-        this._using = false;
-        /** --- 当发生断开，则需从连接池移除连接 --- */
-        this._lost = false;
-        /** --- 当前正在处理事务 --- */
-        this._transaction = false;
         this._etc = etc;
         this._link = link;
         this.refreshLast();

package/lib/db/pool.js

@@ -89,9 +89,13 @@ setTimeout(function () {
 }, 10_000);
 /** --- 数据库连接池对象 --- */
 export class Pool {
+    /** --- SQL 执行次数 --- */
+    _queries = 0;
+    /** --- 当前服务商 --- */
+    _service;
+    /** --- 当前 Pool 对象的数据库连接信息 --- */
+    _etc;
     constructor(etc, opt) {
-        /** --- SQL 执行次数 --- */
-        this._queries = 0;
         this._etc = etc;
         this._service = opt.service;
     }

package/lib/db/tran.js

@@ -1,14 +1,17 @@
 import * as lCore from '#kebab/lib/core.js';
 /** --- 事务连接对象，commit 和 rollback 后将无法使用 --- */
 export class Transaction {
+    /** --- SQL 执行次数 --- */
+    _queries = 0;
+    /** --- 连接对象 --- */
+    _conn;
+    _ctr;
+    // --- 事务时长监听 timer ---
+    _timer = {
+        'warning': undefined,
+        'danger': undefined
+    };
     constructor(ctr, conn, opts = {}) {
-        /** --- SQL 执行次数 --- */
-        this._queries = 0;
-        // --- 事务时长监听 timer ---
-        this._timer = {
-            'warning': undefined,
-            'danger': undefined
-        };
         // --- 进来的连接对象直接是事务独占模式 ---
         this._ctr = ctr;
         if (ctr) {

package/lib/dns.js

@@ -63,6 +63,8 @@ const recordLine = {
     ]
 };
 export class Dns {
+    /** --- 当前选项 --- */
+    _opt;
     constructor(ctr, opt) {
         const config = ctr.getPrototype('_config');
         opt.secretId ??= config.dns?.[ESERVICE[opt.service]].sid;

package/lib/kv.d.ts

@@ -280,8 +280,9 @@ export declare class Kv {
 /**
  * --- 获取 Kv 对象 ---
  * @param ctrEtc 控制器或配置信息
+ * @param oetc 可用来覆盖 ctr 的一些选项，如 index
  */
-export declare function get(ctrEtc: sCtr.Ctr | kebab.IConfigKv): Kv;
+export declare function get(ctrEtc: sCtr.Ctr | kebab.IConfigKv, oetc?: kebab.IConfigKv): Kv;
 /** --- 连接信息 --- */
 export interface IConnectionInfo {
     'host': string;

package/lib/kv.js

@@ -23,6 +23,8 @@ const connections = [];
  * ```
  */
 export class Kv {
+    /** --- 当前的 kv 连接信息 --- */
+    _etc;
     constructor(etc) {
         this._etc = etc;
     }
@@ -814,8 +816,12 @@ end`;
 /**
  * --- 获取 Kv 对象 ---
  * @param ctrEtc 控制器或配置信息
+ * @param oetc 可用来覆盖 ctr 的一些选项，如 index
  */
-export function get(ctrEtc) {
+export function get(ctrEtc, oetc) {
     const etc = ctrEtc instanceof sCtr.Ctr ? ctrEtc.getPrototype('_config').kv : ctrEtc;
+    if (oetc) {
+        Object.assign(etc, oetc);
+    }
     return new Kv(etc);
 }

package/lib/net/formdata.js

@@ -8,23 +8,20 @@ import * as mime from '@litert/mime';
 import * as core from '#kebab/lib/core.js';
 import * as fs from '#kebab/lib/fs.js';
 export class FormData extends stream.Readable {
-    constructor() {
-        super(...arguments);
-        /** --- read 调用次数 --- */
-        this._num = 0;
-        /** --- 要编译的数据 --- */
-        this._data = [];
-        /** --- 分隔符 --- */
-        this._boundary = '----Kebab' + core.random(29, core.RANDOM_LUN);
-        /** --- 正在读取文件吗 --- */
-        this._fileReading = false;
-        /** --- 是否已经结束 --- */
-        this._close = false;
-        /** --- 总字节长度 --- */
-        this._length = 4 + this._boundary.length;
-        /** --- 已发送字节长度 --- */
-        this._sent = 0;
-    }
+    /** --- read 调用次数 --- */
+    _num = 0;
+    /** --- 要编译的数据 --- */
+    _data = [];
+    /** --- 分隔符 --- */
+    _boundary = '----Kebab' + core.random(29, core.RANDOM_LUN);
+    /** --- 正在读取文件吗 --- */
+    _fileReading = false;
+    /** --- 是否已经结束 --- */
+    _close = false;
+    /** --- 总字节长度 --- */
+    _length = 4 + this._boundary.length;
+    /** --- 已发送字节长度 --- */
+    _sent = 0;
     /**
      * --- 添加字符串 ---
      * @param key 键

package/lib/net/request.js

@@ -1,12 +1,12 @@
 import * as lNet from '#kebab/lib/net.js';
 export class Request {
+    /** --- get 或 post 的数据 --- */
+    _data = undefined;
+    /** --- 访问的 URL --- */
+    _url = '';
+    /** --- 要传递的参数 --- */
+    _opt = {};
     constructor(url) {
-        /** --- get 或 post 的数据 --- */
-        this._data = undefined;
-        /** --- 访问的 URL --- */
-        this._url = '';
-        /** --- 要传递的参数 --- */
-        this._opt = {};
         this._url = url;
     }
     /**

package/lib/net/response.js

@@ -1,12 +1,12 @@
 export class Response {
+    /** --- httpClient 请求对象 --- */
+    _req = null;
+    /** --- 返回的 headers --- */
+    headers = null;
+    error = null;
+    /** --- 用户自定义的 content 内容 --- */
+    _content = null;
     constructor(req) {
-        /** --- httpClient 请求对象 --- */
-        this._req = null;
-        /** --- 返回的 headers --- */
-        this.headers = null;
-        this.error = null;
-        /** --- 用户自定义的 content 内容 --- */
-        this._content = null;
         this._req = req;
     }
     /**

package/lib/s3.js

@@ -22,9 +22,11 @@ export var ESERVICE;
     ESERVICE[ESERVICE["CF"] = 3] = "CF";
 })(ESERVICE || (ESERVICE = {}));
 export class S3 {
+    _link;
+    /** --- bucket 名 --- */
+    _bucket = '';
+    _ctr;
     constructor(ctr, opt) {
-        /** --- bucket 名 --- */
-        this._bucket = '';
         this._ctr = ctr;
         const config = ctr.getPrototype('_config');
         const account = opt.account ?? config.s3?.[ESERVICE[opt.service]]?.account ?? '';

package/lib/scan.js

@@ -24,15 +24,14 @@ import * as lSql from '#kebab/lib/sql.js';
 import * as lTime from '#kebab/lib/time.js';
 import * as lText from '#kebab/lib/text.js';
 export class Scan {
+    _link;
+    _sql = null;
+    /** --- 表名或者 kv 里 key 的前缀 --- */
+    _name = 'scan';
+    _token = null;
+    /** --- 有效期，默认 5 分钟 --- */
+    _ttl = 60 * 5;
     constructor(link, token, opt = {}) {
-        this._sql = null;
-        /** --- 表名或者 kv 里 key 的前缀 --- */
-        this._name = 'scan';
-        this._token = null;
-        /** --- 有效期，默认 5 分钟 --- */
-        this._ttl = 60 * 5;
-        /** --- 二维码剩余有效时间 --- */
-        this._timeLeft = null;
         if (opt.ttl !== undefined) {
             this._ttl = opt.ttl;
         }
@@ -51,6 +50,8 @@ export class Scan {
             this._token = token;
         }
     }
+    /** --- 二维码剩余有效时间 --- */
+    _timeLeft = null;
     /**
      * --- 生成二维码处的轮询，检查是否被扫码、被录入数据 ---
      * @returns -3 系统错误 -2 token 不存在或已过期 -1 无操作, 0 已扫码, 其他返回为存的数据并结束轮询

package/lib/session.js

@@ -24,12 +24,18 @@ import * as kv from '#kebab/lib/kv.js';
 import * as sql from '#kebab/lib/sql.js';
 import * as text from '#kebab/lib/text.js';
 export class Session {
-    constructor() {
-        /** --- 当前 Session 的 token --- */
-        this._token = '';
-        /** --- Session 有效期 --- */
-        this._ttl = 0;
-    }
+    /** --- 数据库操作对象 --- */
+    _link;
+    /** --- Sql 对象 ---  */
+    _sql;
+    /** --- session 在前端或 Kv 中储存的名前缀 --- */
+    _name;
+    /** --- 当前 Session 的 token --- */
+    _token = '';
+    /** --- Session 有效期 --- */
+    _ttl = 0;
+    /** --- ctr 对象 --- */
+    _ctr;
     /**
      * --- 初始化函数，相当于 construct ---
      * @param ctr 模型实例

package/lib/sql.js

@@ -11,20 +11,22 @@ export var ESERVICE;
 /** --- field 用 token --- */
 let columnToken = '';
 export class Sql {
+    /** --- ctr 对象 --- */
+    _ctr;
+    /** --- 前置 --- */
+    _pre = '';
+    /** --- 服务商 --- */
+    _service;
+    /** --- 预拼装 Sql 数组 --- */
+    _sql = [];
+    /** --- 所有 data 数据 --- */
+    _data = [];
+    /** --- 表别名列表 --- */
+    _alias = [];
+    /** --- PostgreSQL 占位符计数器 --- */
+    _placeholderCounter = 1;
     // --- 实例化 ---
     constructor(opt) {
-        /** --- 前置 --- */
-        this._pre = '';
-        /** --- 预拼装 Sql 数组 --- */
-        this._sql = [];
-        /** --- 所有 data 数据 --- */
-        this._data = [];
-        /** --- 表别名列表 --- */
-        this._alias = [];
-        /** --- PostgreSQL 占位符计数器 --- */
-        this._placeholderCounter = 1;
-        /** --- where 的 data 的开始处和结束处 --- */
-        this._whereDataPosition = [0, 0];
         this._ctr = opt.ctr;
         this._pre = opt.pre ?? '';
         this._service = opt.service ?? ESERVICE.MYSQL;
@@ -364,6 +366,8 @@ export class Sql {
         }
         return this;
     }
+    /** --- where 的 data 的开始处和结束处 --- */
+    _whereDataPosition = [0, 0];
     /**
      * --- 筛选器 ---
      * --- 1. 'city': 'bj', 'type': '2' ---

package/lib/ssh/sftp.js

@@ -2,6 +2,10 @@
 import * as core from '#kebab/lib/core.js';
 import * as text from '#kebab/lib/text.js';
 export class Connection {
+    /** --- 连接对象 --- */
+    _client;
+    /** --- 当前路径，以 / 结尾 --- */
+    _path;
     constructor(sftp, path) {
         this._client = sftp;
         this._path = path;

package/lib/ssh/shell.js

@@ -1,5 +1,7 @@
 import * as lCore from '#kebab/lib/core.js';
 export class Connection {
+    /** --- 连接对象 --- */
+    _client;
     constructor(stream) {
         this._client = stream;
     }

package/lib/ssh.js

@@ -10,6 +10,10 @@ import * as shell from './ssh/shell.js';
 import * as sftp from './ssh/sftp.js';
 /** 主连接对象 */
 export class Connection {
+    /** --- SSH 对象 --- */
+    _client;
+    /** --- 中转服务器 --- */
+    _mclient;
     constructor() {
         this._client = new ssh2.Client();
     }

package/lib/text.js

@@ -334,12 +334,7 @@ export function isIdCardCN(idcard) {
     // --- 取模 ---
     const mod = total % BigInt(11);
     // --- 比较校验码 ---
-    if (verifyCode === verifyCodeList[Number(mod)]) {
-        return true;
-    }
-    else {
-        return false;
-    }
+    return verifyCode === verifyCodeList[Number(mod)];
 }
 /**
  * --- 将对象转换为 query string ---
@@ -357,7 +352,7 @@ export function queryStringify(query, encode = true) {
     }
     return Object.entries(query).map(([k, v]) => {
         if (Array.isArray(v)) {
-            return v.map((i) => `${k}=${i}}`).join('&');
+            return v.map((i) => `${k}=${i}`).join('&');
         }
         return `${k}=${v}`;
     }).join('&');

package/lib/time.js

@@ -21,13 +21,15 @@ const monthNames = [
     ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
 ];
 export class Time {
+    /** --- 当前 date --- */
+    _date;
+    /** --- 当前时区 --- */
+    _zone = 0;
     /**
      * --- 构造函数 ---
      * @param opt
      */
     constructor(ctr, opt) {
-        /** --- 当前时区 --- */
-        this._zone = 0;
         this._zone = opt.zone ?? ctr.getPrototype('_config').set.timezone ?? 0;
         if (opt.data) {
             if (typeof opt.data === 'number') {

package/lib/vector.js

@@ -9,6 +9,8 @@ import * as sCtr from '#kebab/sys/ctr.js';
 /** --- milvus 的连接对象 --- */
 const links = [];
 export class Vector {
+    /** --- 当前的 vector 连接信息 --- */
+    _etc;
     constructor(etc) {
         this._etc = etc;
     }