@maiyunnet/kebab 8.5.4 → 8.6.1

package/doc/kebab-rag.md

@@ -1410,7 +1410,7 @@ index/variables/VER.md
 
 # Variable: VER
 
-> `const` **VER**: `"8.5.4"` = `'8.5.4'`
+> `const` **VER**: `"8.6.1"` = `'8.6.1'`
 
 Defined in: [index.ts:10](https://github.com/maiyunnet/kebab/blob/master/index.ts#L10)
 
@@ -12771,7 +12771,7 @@ lib/session/classes/Session.md
 
 # Class: Session
 
-Defined in: [lib/session.ts:38](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L38)
+Defined in: [lib/session.ts:39](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L39)
 
 ## Constructors
 
@@ -12789,7 +12789,7 @@ Defined in: [lib/session.ts:38](https://github.com/maiyunnet/kebab/blob/master/l
 
 > **getName**(): `string`
 
-Defined in: [lib/session.ts:203](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L203)
+Defined in: [lib/session.ts:207](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L207)
 
 获取当前的 cookie 的 name 值
 
@@ -12803,7 +12803,7 @@ Defined in: [lib/session.ts:203](https://github.com/maiyunnet/kebab/blob/master/
 
 > **getToken**(): `string`
 
-Defined in: [lib/session.ts:196](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L196)
+Defined in: [lib/session.ts:200](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L200)
 
 获取当前的 token 值
 
@@ -12817,7 +12817,7 @@ Defined in: [lib/session.ts:196](https://github.com/maiyunnet/kebab/blob/master/
 
 > **init**(`ctr`, `link`, `auth?`, `opt?`): `Promise`\<`boolean`\>
 
-Defined in: [lib/session.ts:66](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L66)
+Defined in: [lib/session.ts:67](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L67)
 
 初始化函数，相当于 construct
 
@@ -12859,7 +12859,7 @@ false 表示系统错误
 
 > **update**(): `Promise`\<`void`\>
 
-Defined in: [lib/session.ts:210](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L210)
+Defined in: [lib/session.ts:214](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L214)
 
 页面整体结束时，要写入到 Kv 或 数据库
 
@@ -12933,6 +12933,14 @@ Defined in: [lib/session.ts:33](https://github.com/maiyunnet/kebab/blob/master/l
 
 ***
 
+### token?
+
+> `optional` **token**: `string`
+
+Defined in: [lib/session.ts:36](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L36)
+
+***
+
 ### ttl?
 
 > `optional` **ttl**: `number`
@@ -20051,7 +20059,7 @@ Defined in: [sys/ctr.ts:548](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_cross**(): `boolean`
 
-Defined in: [sys/ctr.ts:762](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L762)
+Defined in: [sys/ctr.ts:765](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L765)
 
 开启跨域请求
 返回 true 接续执行，返回 false 需要中断用户本次访问（options请求）
@@ -20066,7 +20074,7 @@ Defined in: [sys/ctr.ts:762](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_device**(): `"unknown"` \| `"android"` \| `"linux"` \| `"windows"` \| `"macintosh"` \| `"ipad"`
 
-Defined in: [sys/ctr.ts:587](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L587)
+Defined in: [sys/ctr.ts:590](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L590)
 
 根据用户 ua 获取当前用户的设备类型
 
@@ -20078,13 +20086,21 @@ Defined in: [sys/ctr.ts:587](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 ### \_enabledXsrf()
 
-> `protected` **\_enabledXsrf**(): `void`
+> `protected` **\_enabledXsrf**(`opt?`): `void`
 
 Defined in: [sys/ctr.ts:559](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L559)
 
 当前页面开启 XSRF 支持（主要检测 cookie 是否存在）
 如果当前页面有 CDN，请不要使用
 
+#### Parameters
+
+##### opt?
+
+###### domain?
+
+`string`
+
 #### Returns
 
 `void`
@@ -20095,7 +20111,7 @@ Defined in: [sys/ctr.ts:559](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_end**(): `void`
 
-Defined in: [sys/ctr.ts:845](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L845)
+Defined in: [sys/ctr.ts:848](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L848)
 
 主动关闭当前 socket 连接
 
@@ -20109,7 +20125,7 @@ Defined in: [sys/ctr.ts:845](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_getBasicAuth**(`user`, `pwd`): `string`
 
-Defined in: [sys/ctr.ts:580](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L580)
+Defined in: [sys/ctr.ts:583](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L583)
 
 获取 Auth 字符串，用于客户端提交
 
@@ -20137,7 +20153,7 @@ Defined in: [sys/ctr.ts:580](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_getLocale**(): `string`
 
-Defined in: [sys/ctr.ts:754](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L754)
+Defined in: [sys/ctr.ts:757](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L757)
 
 获取当前语言名
 
@@ -20151,7 +20167,7 @@ Defined in: [sys/ctr.ts:754](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_getLocaleJsonString**(): `string`
 
-Defined in: [sys/ctr.ts:742](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L742)
+Defined in: [sys/ctr.ts:745](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L745)
 
 根据当前后台语言包设置情况获取 JSON 字符串传输到前台
 
@@ -20203,7 +20219,7 @@ Defined in: [sys/ctr.ts:315](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_handleFormData**(`events?`): `Promise`\<`boolean`\>
 
-Defined in: [sys/ctr.ts:853](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L853)
+Defined in: [sys/ctr.ts:856](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L856)
 
 获取 formdata 的信息
 
@@ -20235,7 +20251,7 @@ Defined in: [sys/ctr.ts:853](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > **\_l**(`key`, `data?`): `string`
 
-Defined in: [sys/ctr.ts:780](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L780)
+Defined in: [sys/ctr.ts:783](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L783)
 
 获取语言包值
 
@@ -20261,7 +20277,7 @@ Defined in: [sys/ctr.ts:780](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_loadData**(`path`): `Promise`\<`Record`\<`string`, `string`\> \| `null`\>
 
-Defined in: [sys/ctr.ts:645](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L645)
+Defined in: [sys/ctr.ts:648](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L648)
 
 获取 data 数据
 
@@ -20283,7 +20299,7 @@ Defined in: [sys/ctr.ts:645](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_loadLocale**(`loc`, `pkg?`): `Promise`\<`boolean`\>
 
-Defined in: [sys/ctr.ts:693](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L693)
+Defined in: [sys/ctr.ts:696](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L696)
 
 设定语言并加载语言包
 
@@ -20335,7 +20351,7 @@ Defined in: [sys/ctr.ts:332](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_location**(`location`): `false`
 
-Defined in: [sys/ctr.ts:663](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L663)
+Defined in: [sys/ctr.ts:666](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L666)
 
 跳转（302临时跳转），支持相对本项目根路径的路径或绝对路径
 
@@ -20357,7 +20373,7 @@ Defined in: [sys/ctr.ts:663](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_ping**(`data?`): `boolean`
 
-Defined in: [sys/ctr.ts:830](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L830)
+Defined in: [sys/ctr.ts:833](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L833)
 
 发送 socket ping
 
@@ -20379,7 +20395,7 @@ Defined in: [sys/ctr.ts:830](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_pong**(`data?`): `boolean`
 
-Defined in: [sys/ctr.ts:838](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L838)
+Defined in: [sys/ctr.ts:841](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L841)
 
 发送 socket pong
 
@@ -20401,7 +20417,7 @@ Defined in: [sys/ctr.ts:838](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_startSession**(`link`, `auth?`, `opt?`): `Promise`\<`boolean`\>
 
-Defined in: [sys/ctr.ts:677](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L677)
+Defined in: [sys/ctr.ts:680](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L680)
 
 开启 Session
 
@@ -20423,7 +20439,7 @@ Kv 或 Db 实例
 
 [`IOptions`](../../../lib/session/interfaces/IOptions.md) = `{}`
 
-name, ttl, ssl, sqlPre
+选项
 
 #### Returns
 
@@ -20435,7 +20451,7 @@ name, ttl, ssl, sqlPre
 
 > `protected` **\_writeBinary**(`data`): `boolean`
 
-Defined in: [sys/ctr.ts:822](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L822)
+Defined in: [sys/ctr.ts:825](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L825)
 
 发送 socket 二进制
 
@@ -20457,7 +20473,7 @@ Defined in: [sys/ctr.ts:822](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_writeResult**(`data`): `boolean`
 
-Defined in: [sys/ctr.ts:814](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L814)
+Defined in: [sys/ctr.ts:817](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L817)
 
 发送结果对象文本
 
@@ -20479,7 +20495,7 @@ Defined in: [sys/ctr.ts:814](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_writeText**(`data`): `boolean`
 
-Defined in: [sys/ctr.ts:806](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L806)
+Defined in: [sys/ctr.ts:809](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L809)
 
 发送 socket 文本
 
@@ -20501,7 +20517,7 @@ Defined in: [sys/ctr.ts:806](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > **getAuthorization**(): `string` \| `false` \| \{ `pwd`: `string`; `user`: `string`; \}
 
-Defined in: [sys/ctr.ts:608](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L608)
+Defined in: [sys/ctr.ts:611](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L611)
 
 通过 header 或 _auth 获取鉴权信息或 JWT 信息（不解析）
 

package/index.d.ts

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

package/index.js

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

package/lib/session.d.ts

@@ -12,6 +12,7 @@ export interface IOptions {
     'ssl'?: boolean;
     'domain'?: string;
     'sqlPre'?: string;
+    'token'?: string;
 }
 export declare class Session {
     /** --- 数据库操作对象 --- */

package/lib/session.js

@@ -51,7 +51,10 @@ export class Session {
         this._ttl = opt.ttl ?? config.session.ttl ?? 172800;
         const tim = lTime.stamp();
         this._ctr = ctr;
-        if (auth) {
+        if (opt.token) {
+            this._token = opt.token;
+        }
+        else if (auth) {
             const a = ctr.getAuthorization();
             if (a && typeof a !== 'string' && (a.user === 'token')) {
                 this._token = a.pwd;
@@ -125,7 +128,7 @@ export class Session {
                     }
                     this._token = lCore.random(16, lCore.RANDOM_LUN);
                     ++count;
-                } while (!await this._link.set(this._name + '_' + this._token, [], this._ttl, 'nx'));
+                } while (!await this._link.set(this._name + '_' + this._token, {}, this._ttl, 'nx'));
             }
             else {
                 let count = 0;

package/package.json

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

@@ -179,7 +179,9 @@ export declare class Ctr {
      * --- 当前页面开启 XSRF 支持（主要检测 cookie 是否存在） ---
      * --- 如果当前页面有 CDN，请不要使用 ---
      */
-    protected _enabledXsrf(): void;
+    protected _enabledXsrf(opt?: {
+        'domain'?: string;
+    }): void;
     /**
      * --- 获取 Auth 字符串，用于客户端提交 ---
      * @param user 用户名
@@ -213,7 +215,7 @@ export declare class Ctr {
      * --- 开启 Session ---
      * @param link Kv 或 Db 实例
      * @param auth 设为 true 则从头 Authorization 或 post _auth 值读取 token
-     * @param opt name, ttl, ssl, sqlPre
+     * @param opt 选项
      */
     protected _startSession(link: lDb.Pool | lKv.Kv, auth?: boolean, opt?: lSession.IOptions): Promise<boolean>;
     /**

package/sys/ctr.js

@@ -440,14 +440,15 @@ export class Ctr {
      * --- 当前页面开启 XSRF 支持（主要检测 cookie 是否存在） ---
      * --- 如果当前页面有 CDN，请不要使用 ---
      */
-    _enabledXsrf() {
+    _enabledXsrf(opt) {
         // --- 设置 XSRF 值 ---
         if (this._cookie['XSRF-TOKEN'] === undefined) {
             const xsrf = lCore.random(16, lCore.RANDOM_LUN);
             this._xsrf = xsrf;
             lCore.setCookie(this, 'XSRF-TOKEN', xsrf, {
                 'path': '/',
-                'httponly': true
+                'httponly': true,
+                'domain': opt?.domain,
             });
             this._cookie['XSRF-TOKEN'] = xsrf;
         }
@@ -549,7 +550,7 @@ export class Ctr {
      * --- 开启 Session ---
      * @param link Kv 或 Db 实例
      * @param auth 设为 true 则从头 Authorization 或 post _auth 值读取 token
-     * @param opt name, ttl, ssl, sqlPre
+     * @param opt 选项
      */
     _startSession(link, auth = false, opt = {}) {
         this._sess = new lSession.Session();

package/www/example/ctr/test.d.ts

@@ -28,6 +28,7 @@ export default class extends sCtr.Ctr {
     ctrAsynctask(): any[];
     ctrTimeoutLong(): Promise<any[]>;
     ctrTimeoutShort(): Promise<any[]>;
+    ctrSessionToken(): Promise<kebab.Json[]>;
     ctr500(): Promise<void>;
     modTest(): Promise<kebab.Json[] | string | boolean>;
     modSplit(): Promise<string>;

package/www/example/ctr/test.js

@@ -115,6 +115,7 @@ export default class extends sCtr.Ctr {
             `<br><a href="${this._config.const.urlBase}test/ctr-asynctask">View "test/ctr-asynctask"</a>`,
             `<br><a href="${this._config.const.urlBase}test/ctr-timeout-long">View "test/ctr-timeout-long"</a>`,
             `<br><a href="${this._config.const.urlBase}test/ctr-timeout-short">View "test/ctr-timeout-short"</a>`,
+            `<br><a href="${this._config.const.urlBase}test/ctr-session-token">View "test/ctr-session-token"</a>`,
             `<br><a href="${this._config.const.urlBase}test/ctr-500">View "test/ctr-500"</a>`,
             '<br><br><b>Middle:</b>',
             `<br><br><a href="${this._config.const.urlBase}test/middle">View "test/middle"</a>`,
@@ -611,6 +612,14 @@ Result:<pre id="result">Nothing.</pre>` + this._getEnd();
         echo.push('5');
         return [1, { 'list': echo }];
     }
+    async ctrSessionToken() {
+        const link = lDb.get(this);
+        await this._startSession(link, false, {
+            'token': 'TEST_TOKEN_1234'
+        });
+        const currentToken = this._sess?.getToken();
+        return [1, { 'status': currentToken === 'TEST_TOKEN_1234' ? 'success' : 'failed', 'token': currentToken }];
+    }
     async ctr500() {
         await lCore.sleep(100);
         lCore.writeHead(this._res, 200);