@maiyunnet/kebab 3.2.35 → 4.0.0

package/lib/scan.d.ts

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * 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
+ * Last: 2022-09-24 15:23:25, 2022-9-26 12:37:01, 2022-12-29 00:11:16, 2025-11-6 16:32:05
  */
 import * as lDb from '#kebab/lib/db.js';
 import * as lKv from '#kebab/lib/kv.js';
@@ -25,7 +25,7 @@ export declare class Scan {
     private _token;
     /** --- 有效期，默认 5 分钟 --- */
     private _ttl;
-    constructor(link: lDb.Pool | lKv.Pool, token?: string, opt?: IOptions);
+    constructor(link: lDb.Pool | lKv.Kv, token?: string, opt?: IOptions);
     /** --- 二维码剩余有效时间 --- */
     private _timeLeft;
     /**
@@ -65,14 +65,14 @@ export declare class Scan {
  * @param token Token
  * @param opt
  */
-export declare function get(link: lDb.Pool | lKv.Pool, token?: string, opt?: IOptions): Promise<Scan>;
+export declare function get(link: lDb.Pool | lKv.Kv, token?: string, opt?: IOptions): Promise<Scan>;
 /**
  * --- 对 token 执行访问操作，通常用户扫码后展示的网页所调用，代表已扫码 ---
  * @param link
  * @patam token 必填
  * @param opt
  */
-export declare function scanned(link: lDb.Pool | lKv.Pool, token: string, opt?: IStaticOptions): Promise<boolean>;
+export declare function scanned(link: lDb.Pool | lKv.Kv, token: string, opt?: IStaticOptions): Promise<boolean>;
 /**
  * --- 将数据写入 token，通常在客户的逻辑下去写，服务器会 poll 到 ---
  * @param link
@@ -80,4 +80,4 @@ export declare function scanned(link: lDb.Pool | lKv.Pool, token: string, opt?:
  * @param data
  * @param opt
  */
-export declare function setData(link: lDb.Pool | lKv.Pool, token: string, data: Record<string, any> | string | number, opt?: IStaticOptions): Promise<boolean>;
+export declare function setData(link: lDb.Pool | lKv.Kv, token: string, data: Record<string, any> | string | number, opt?: IStaticOptions): Promise<boolean>;

package/lib/scan.js

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * 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
+ * Last: 2022-09-24 15:23:25, 2022-9-26 12:37:01, 2022-12-29 00:11:16, 2025-11-6 16:32:05
  */
 /*
 CREATE TABLE IF NOT EXISTS `scan` (
@@ -191,7 +191,7 @@ export class Scan {
      * --- 根据情况清空 Db 状态下的 scan 表垃圾数据 ---
      */
     async _gc() {
-        if (this._link instanceof lKv.Pool) {
+        if (this._link instanceof lKv.Kv) {
             return;
         }
         if (lCore.rand(0, 10) !== 5) {

package/lib/session.d.ts

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * 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
+ * Last: 2020-3-30 00:11:15, 2022-12-29 00:10:28, 2023-5-24 18:59:27, 2025-11-6 16:32:11
  */
 import * as db from '#kebab/lib/db.js';
 import * as kv from '#kebab/lib/kv.js';
@@ -33,7 +33,7 @@ export declare class Session {
      * @param opt 选项
      * @returns false 表示系统错误
      */
-    init(ctr: ctr.Ctr, link: db.Pool | kv.Pool, auth?: boolean, opt?: IOptions): Promise<boolean>;
+    init(ctr: ctr.Ctr, link: db.Pool | kv.Kv, auth?: boolean, opt?: IOptions): Promise<boolean>;
     /**
      * --- 获取当前的 token 值 ---
      */

package/lib/session.js

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * 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
+ * Last: 2020-3-30 00:11:15, 2022-12-29 00:10:28, 2023-5-24 18:59:27, 2025-11-6 16:32:11
  */
 /*
  * --- Mysql ---
@@ -67,7 +67,7 @@ export class Session {
         // --- 有 token 则查看 token 的信息是否存在
         if (this._token !== '') {
             // --- 如果启用了内存加速则在内存找 ---
-            if (this._link instanceof kv.Pool) {
+            if (this._link instanceof kv.Kv) {
                 // --- Kv ---
                 const data = await this._link.getJson(this._name + '_' + this._token);
                 if (data === null) {
@@ -108,7 +108,7 @@ export class Session {
         // --- 数据库的 Session 已经过期加新 Session ---
         // --- 如果不存在不允许加新则返回错误 ---
         if (needInsert) {
-            if (this._link instanceof kv.Pool) {
+            if (this._link instanceof kv.Kv) {
                 let count = 0;
                 do {
                     if (count === 5) {
@@ -166,7 +166,7 @@ export class Session {
      * --- 页面整体结束时，要写入到 Kv 或 数据库 ---
      */
     async update() {
-        if (this._link instanceof kv.Pool) {
+        if (this._link instanceof kv.Kv) {
             await this._link.set(this._name + '_' + this._token, this._ctr.getPrototype('_session'), this._ttl);
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "3.2.35",
+  "version": "4.0.0",
   "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/ctr.d.ts

@@ -206,7 +206,7 @@ export declare class Ctr {
      * @param auth 设为 true 则从头 Authorization 或 post _auth 值读取 token
      * @param opt name, ttl, ssl, sqlPre
      */
-    protected _startSession(link: lDb.Pool | lKv.Pool, auth?: boolean, opt?: lSession.IOptions): Promise<boolean>;
+    protected _startSession(link: lDb.Pool | lKv.Kv, auth?: boolean, opt?: lSession.IOptions): Promise<boolean>;
     /**
      * --- 设定语言并加载语言包 ---
      * @param loc 要加载的目标语言

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/www/example/ctr/test.js

@@ -1357,14 +1357,14 @@ exec: ${JSON.stringify(exec)}<br><br>`);
         return echo.join('') + '<br>' + this._getEnd();
     }
     async kv() {
-        const kv = lKv.get(this);
-        if (!await kv.ping()) {
+        const kv = await lKv.get(this);
+        if (!kv) {
             return [0, 'Failed.'];
         }
         const value = this._get['value'] ?? '';
         const ac = this._get['ac'] ?? '';
-        const echo = [`<pre>const kv = lKv.get(this);
-if (!await kv.ping()) {
+        const echo = [`<pre>const kv = await lKv.get(this);
+if (!kv) {
     return [0, 'Failed.'];
 }
 JSON.stringify(await kv.ping());</pre>${JSON.stringify(await kv.ping())}`];
@@ -2103,8 +2103,8 @@ function confirm() {
             link = db;
         }
         else {
-            const kv = lKv.get(this);
-            if (!await kv.ping()) {
+            const kv = await lKv.get(this);
+            if (!kv) {
                 return false;
             }
             link = kv;
@@ -2127,11 +2127,11 @@ function confirm() {
             echo.push('link = lDb.get(this);\n');
         }
         else {
-            link = lKv.get(this);
-            if (!await link.ping()) {
+            link = await lKv.get(this);
+            if (!link) {
                 return [0, 'Failed, Redis can not be connected.'];
             }
-            echo.push('link = lKv.get(this);\n');
+            echo.push('link = await lKv.get(this);\n');
         }
         if (this._get['auth'] === '') {
             const r = await this._startSession(link, false, { 'ttl': 60 });
@@ -2181,8 +2181,11 @@ Result:<pre id="result">Nothing.</pre>`);
         const echo = ['<pre>'];
         let link = undefined;
         if (this._get['type'] === 'kv') {
-            link = lKv.get(this);
-            echo.push('link = lKv.get(this);\n');
+            link = await lKv.get(this);
+            if (!link) {
+                return [0, 'Failed, Redis can not be connected.'];
+            }
+            echo.push('link = await lKv.get(this);\n');
         }
         const origin = lJwt.getOrigin(this);
         echo.push(`const origin = lJwt.getOrigin(this);