@maiyunnet/kebab 9.3.10 → 9.3.12

package/doc/kebab-rag.md

@@ -1360,7 +1360,7 @@ index/variables/VER.md
 
 # Variable: VER
 
-> `const` **VER**: `"9.3.10"` = `'9.3.10'`
+> `const` **VER**: `"9.3.12"` = `'9.3.12'`
 
 Defined in: [index.ts:10](https://github.com/maiyunnet/kebab/blob/master/index.ts#L10)
 
@@ -13247,7 +13247,7 @@ lib/session/classes/Session.md
 
 # Class: Session
 
-Defined in: [lib/session.ts:39](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L39)
+Defined in: [lib/session.ts:51](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L51)
 
 ## Constructors
 
@@ -13265,7 +13265,7 @@ Defined in: [lib/session.ts:39](https://github.com/maiyunnet/kebab/blob/master/l
 
 > **getName**(): `string`
 
-Defined in: [lib/session.ts:212](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L212)
+Defined in: [lib/session.ts:224](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L224)
 
 获取当前的 cookie 的 name 值
 
@@ -13279,7 +13279,7 @@ Defined in: [lib/session.ts:212](https://github.com/maiyunnet/kebab/blob/master/
 
 > **getToken**(): `string`
 
-Defined in: [lib/session.ts:205](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L205)
+Defined in: [lib/session.ts:217](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L217)
 
 获取当前的 token 值
 
@@ -13293,7 +13293,7 @@ Defined in: [lib/session.ts:205](https://github.com/maiyunnet/kebab/blob/master/
 
 > **init**(`ctr`, `link`, `auth?`, `opt?`): `Promise`\<`boolean`\>
 
-Defined in: [lib/session.ts:67](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L67)
+Defined in: [lib/session.ts:79](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L79)
 
 初始化函数，相当于 construct
 
@@ -13335,7 +13335,7 @@ false 表示系统错误
 
 > **update**(): `Promise`\<`void`\>
 
-Defined in: [lib/session.ts:219](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L219)
+Defined in: [lib/session.ts:231](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L231)
 
 页面整体结束时，要写入到 Kv 或 数据库
 
@@ -13373,7 +13373,7 @@ lib/session/interfaces/IOptions.md
 
 # Interface: IOptions
 
-Defined in: [lib/session.ts:30](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L30)
+Defined in: [lib/session.ts:42](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L42)
 
 ## Properties
 
@@ -13381,7 +13381,7 @@ Defined in: [lib/session.ts:30](https://github.com/maiyunnet/kebab/blob/master/l
 
 > `optional` **domain?**: `string`
 
-Defined in: [lib/session.ts:34](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L34)
+Defined in: [lib/session.ts:46](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L46)
 
 ***
 
@@ -13389,7 +13389,7 @@ Defined in: [lib/session.ts:34](https://github.com/maiyunnet/kebab/blob/master/l
 
 > `optional` **name?**: `string`
 
-Defined in: [lib/session.ts:31](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L31)
+Defined in: [lib/session.ts:43](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L43)
 
 ***
 
@@ -13397,7 +13397,7 @@ Defined in: [lib/session.ts:31](https://github.com/maiyunnet/kebab/blob/master/l
 
 > `optional` **sqlPre?**: `string`
 
-Defined in: [lib/session.ts:35](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L35)
+Defined in: [lib/session.ts:47](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L47)
 
 ***
 
@@ -13405,7 +13405,7 @@ Defined in: [lib/session.ts:35](https://github.com/maiyunnet/kebab/blob/master/l
 
 > `optional` **ssl?**: `boolean`
 
-Defined in: [lib/session.ts:33](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L33)
+Defined in: [lib/session.ts:45](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L45)
 
 ***
 
@@ -13413,7 +13413,7 @@ Defined in: [lib/session.ts:33](https://github.com/maiyunnet/kebab/blob/master/l
 
 > `optional` **token?**: `string`
 
-Defined in: [lib/session.ts:36](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L36)
+Defined in: [lib/session.ts:48](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L48)
 
 ***
 
@@ -13421,7 +13421,7 @@ Defined in: [lib/session.ts:36](https://github.com/maiyunnet/kebab/blob/master/l
 
 > `optional` **ttl?**: `number`
 
-Defined in: [lib/session.ts:32](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L32)
+Defined in: [lib/session.ts:44](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L44)
 
 lib/socket/functions/rwebsocket.md
 ---

package/index.d.ts

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

package/index.js

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

package/lib/session.js

@@ -7,7 +7,7 @@
  * --- Mysql ---
 CREATE TABLE `session` (
   `id` bigint NOT NULL AUTO_INCREMENT,
-  `token` char(16) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `token` char(32) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
   `data` text NOT NULL,
   `time_update` bigint NOT NULL,
   `time_add` bigint NOT NULL,
@@ -15,6 +15,18 @@ CREATE TABLE `session` (
   UNIQUE KEY `token` (`token`),
   KEY `time_update` (`time_update`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci
+
+--- Pgsql ---
+CREATE TABLE "session" (
+  "id" BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
+  "token" char(32) NOT NULL,
+  "data" text NOT NULL,
+  "time_update" bigint NOT NULL,
+  "time_add" bigint NOT NULL,
+  PRIMARY KEY ("id")
+);
+CREATE UNIQUE INDEX "session_token" ON "session" ("token");
+CREATE INDEX "session_time_update" ON "session" ("time_update");
 */
 // --- 库和定义 ---
 import * as lCore from '#kebab/lib/core.js';
@@ -131,7 +143,7 @@ export class Session {
                     if (count === 5) {
                         return false;
                     }
-                    this._token = lCore.random(16, lCore.RANDOM_LUN);
+                    this._token = lCore.random(32, lCore.RANDOM_LUN);
                     ++count;
                 } while (!await this._link.set(this._name + '_' + this._token, {}, this._ttl, 'nx'));
             }
@@ -141,7 +153,7 @@ export class Session {
                     if (count === 5) {
                         return false;
                     }
-                    this._token = lCore.random(16, lCore.RANDOM_LUN);
+                    this._token = lCore.random(32, lCore.RANDOM_LUN);
                     this._sql.insert('session').values({
                         'token': this._token,
                         'data': '{}',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "9.3.10",
+  "version": "9.3.12",
   "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

@@ -327,6 +327,8 @@ function createRpcListener() {
                     const cgaLockedDirs = new Set();
                     /** --- 含有 kebab.json 的目录路径集合（不含开头/，含尾部/，根目录为空字符串） --- */
                     const kebabProjectDirs = new Set();
+                    /** --- 本次部署涉及到的目录路径集合（不含开头/，含尾部/，根目录为空字符串） --- */
+                    const touchedDirs = new Set();
                     for (const scanPath in ls) {
                         /** --- 带 / 开头的 zip 中文件完整路径，例如 "/www/pika/stc/index.ts" --- */
                         const scanFpath = scanPath.startsWith('/') ? scanPath : '/' + scanPath;
@@ -336,6 +338,7 @@ function createRpcListener() {
                         const scanPat = scanFpath.slice(1, scanLio + 1);
                         /** --- 纯文件名，例如 "index.ts" 或 "pika.cga" --- */
                         const scanFname = scanFpath.slice(scanLio + 1);
+                        touchedDirs.add(scanPat);
                         if (scanFname.endsWith('.cga')) {
                             // --- 记录 .cga 锁定的同级目录（去掉 .cga 后缀的名字即为被锁定的目录名）---
                             cgaLockedDirs.add(scanPat + scanFname.slice(0, -4) + '/');
@@ -345,6 +348,22 @@ function createRpcListener() {
                             kebabProjectDirs.add(scanPat);
                         }
                     }
+                    // --- 补充扫描目标目录中现存的 kebab.json，兼容压缩包未携带 kebab.json 的情况 ---
+                    for (const dir of touchedDirs) {
+                        /** --- 目录逐级向上回溯时的累积路径列表，优先检查当前目录，再检查父级目录 --- */
+                        const dirs = dir ? dir.split('/').filter(Boolean) : [];
+                        for (let i = dirs.length; i >= 0; --i) {
+                            /** --- 当前要检查的目录路径，不含开头/，含尾部/，根目录为空字符串 --- */
+                            const currentDir = i ? dirs.slice(0, i).join('/') + '/' : '';
+                            if (kebabProjectDirs.has(currentDir)) {
+                                break;
+                            }
+                            if (await lFs.isFile(`${to}${currentDir}kebab.json`)) {
+                                kebabProjectDirs.add(currentDir);
+                                break;
+                            }
+                        }
+                    }
                     /** --- kebab 子项目中仅允许部署的子文件夹名集合 --- */
                     const KEBAB_ALLOWED_DIRS = new Set(['ctr', 'data', 'stc', 'view', 'lib']);
                     /** --- 常见开发、依赖、缓存、构建产物目录不参与部署 --- */