@maiyunnet/kebab 3.2.34 → 3.2.36

package/index.d.ts

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

package/index.js

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

package/lib/core.d.ts

@@ -193,7 +193,7 @@ export declare function log(opt: sCtr.Ctr | ILogOptions, msg: string, fend?: str
  * @param opt 参数
  */
 export declare function getLog(opt: {
-    /** --- 如 127.0.0.1 --- */
+    /** --- 要查询的头，如 127.0.0.1、system、www.maiyun.net 等 --- */
     'hostname': string;
     /** --- 如 2024/08/01/22 --- */
     'path': string;

package/lib/core.js

@@ -681,11 +681,15 @@ export async function getLog(opt) {
     });
     const content = await res.getContent();
     if (!content) {
+        // --- 连接失败，系统错误 ---
+        debug('[CORE][getLog] rpc server error');
         return false;
     }
     const str = content.toString();
     const j = lText.parseJson(str);
     if (!j) {
+        // --- 解析失败，系统错误 ---
+        debug('[CORE][getLog] rpc server content error');
         return false;
     }
     return j.data;

package/lib/cron.d.ts

@@ -12,7 +12,7 @@ export declare function regular(task: IRegular, immediate?: string): Promise<boo
 export declare function run(): void;
 /** --- 定时任务 --- */
 export interface IRegular {
-    /** --- 任务名称 --- */
+    /** --- 任务名称，只能小写字母、数字、短横线、下划线，长度 1-32 --- */
     'name': string;
     /** --- 任务日期对象（系统时区） --- */
     'date': {

package/package.json

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

package/sys/master.js

@@ -233,7 +233,7 @@ function createRpcListener() {
                     if (!await lFs.isFile(path)) {
                         res.end(lText.stringifyJson({
                             'result': 1,
-                            'data': false,
+                            'data': null,
                         }));
                         return;
                     }
@@ -241,7 +241,7 @@ function createRpcListener() {
                     let limit = msg.limit ?? 100;
                     /** --- 剩余 offset --- */
                     let offset = msg.offset ?? 0;
-                    const rtn = await new Promise((resolve) => {
+                    const rtn = await new Promise(resolve => {
                         const list = [];
                         /** --- 当前行号 --- */
                         let line = 0;

package/sys/mod.d.ts

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * 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, 2025-9-23 11:01:36
+ * 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, 2025-9-23 11:01:36, 2025-11-5 16:34:31
  */
 import * as lSql from '#kebab/lib/sql.js';
 import * as lDb from '#kebab/lib/db.js';
@@ -217,7 +217,7 @@ export default class Mod {
         'index'?: string;
     }): T;
     /**
-     * --- 根据主键获取对象 ---
+     * --- 根据主键（或 key 字段）获取对象 ---
      * @param db 数据库对象
      * @param val 主键值
      * @param lock 是否加锁
@@ -229,6 +229,8 @@ export default class Mod {
         'raw'?: boolean;
         'pre'?: string;
         'index'?: string | string[];
+        /** --- 通过 key 字段获取，默认为 false，即从主键获取 --- */
+        'key'?: boolean;
     }): Promise<false | null | (T & Record<string, any>)>;
     static one(db: lDb.Pool | lDb.Transaction, s: string | kebab.Json, opt: {
         'ctr'?: sCtr.Ctr;

package/sys/mod.js

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * 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, 2025-9-23 11:01:36
+ * 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, 2025-9-23 11:01:36, 2025-11-5 16:34:31
  */
 import * as lSql from '#kebab/lib/sql.js';
 import * as lTime from '#kebab/lib/time.js';
@@ -418,19 +418,23 @@ export default class Mod {
         });
     }
     /**
-     * --- 根据主键获取对象 ---
+     * --- 根据主键（或 key 字段）获取对象 ---
      * @param db 数据库对象
      * @param val 主键值
      * @param lock 是否加锁
      * @param opt 选项
      */
-    static find(db, val, opt = {}) {
+    static async find(db, val, opt = {}) {
+        if (opt.key && !this._$key) {
+            lCore.debug('[MOD][find] key not found');
+            return false;
+        }
         return new this({
             'db': db,
             'ctr': opt.ctr,
             'pre': opt.pre,
             'where': [{
-                    [this._$primary]: val
+                    [opt.key ? this._$key : this._$primary]: val,
                 }],
             'raw': opt.raw,
             'index': opt.index,