@maiyunnet/kebab 8.5.3 → 8.6.0

package/doc/kebab-rag.md

@@ -1410,7 +1410,7 @@ index/variables/VER.md
 
 # Variable: VER
 
-> `const` **VER**: `"8.5.3"` = `'8.5.3'`
+> `const` **VER**: `"8.6.0"` = `'8.6.0'`
 
 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`
@@ -20423,7 +20431,7 @@ Kv 或 Db 实例
 
 [`IOptions`](../../../lib/session/interfaces/IOptions.md) = `{}`
 
-name, ttl, ssl, sqlPre
+选项
 
 #### Returns
 

package/index.d.ts

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

package/index.js

@@ -6,7 +6,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export const VER = '8.5.3';
+export const VER = '8.6.0';
 // --- 服务端用的路径 ---
 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.3",
+  "version": "8.6.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/child.js

@@ -113,7 +113,12 @@ async function run() {
             cb(err);
         },
         'ciphers': 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS',
-        'allowHTTP1': true
+        'allowHTTP1': true,
+        // --- 防止 CDN 回源时 HTTP/2 流异常导致 RST_STREAM ---
+        'maxSessionMemory': 32,
+        'settings': {
+            'maxConcurrentStreams': 128,
+        }
     }, function (req, res) {
         const host = (req.headers[':authority'] ?? req.headers['host'] ?? '');
         if (!host) {
@@ -133,6 +138,8 @@ async function run() {
         }
         wrapWithLinkCount(host + (req.url ?? ''), () => upgradeHandler(req, socket, true, head), '[CHILD][http2][upgrade]', 'UPGRADE');
     }).listen(lCore.globalConfig.httpsPort);
+    // --- 增大 HTTP/2 超时，防止 CDN 预建连接被 Node.js 过早关闭 ---
+    http2Server.setTimeout(120_000);
     httpServer = http.createServer(function (req, res) {
         const host = (req.headers['host'] ?? '');
         if (!host) {
@@ -157,6 +164,9 @@ async function run() {
         }
         wrapWithLinkCount(host + (req.url ?? ''), () => upgradeHandler(req, socket, false, head), '[CHILD][http][upgrade]', 'UPGRADE');
     }).listen(lCore.globalConfig.httpPort);
+    // --- 增大超时，防止 CDN 回源 Keep-Alive 连接被 Node.js 过早关闭导致 net_exception_peer_error ---
+    httpServer.headersTimeout = 120_000;
+    httpServer.keepAliveTimeout = 65_000;
     // --- 启动性能监控 ---
     sMonitor.start();
 }

package/sys/ctr.d.ts

@@ -213,7 +213,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

@@ -549,7 +549,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);