@maiyunnet/kebab 9.3.1 → 9.3.3

package/doc/kebab-rag.md

@@ -1360,7 +1360,7 @@ index/variables/VER.md
 
 # Variable: VER
 
-> `const` **VER**: `"9.3.1"` = `'9.3.1'`
+> `const` **VER**: `"9.3.3"` = `'9.3.3'`
 
 Defined in: [index.ts:10](https://github.com/maiyunnet/kebab/blob/master/index.ts#L10)
 
@@ -22208,7 +22208,7 @@ Defined in: [sys/ctr.ts:173](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_checkInput**(`input`, `rule`, `rtn`): `boolean`
 
-Defined in: [sys/ctr.ts:568](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L568)
+Defined in: [sys/ctr.ts:571](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L571)
 
 检测提交的数据类型
 
@@ -22242,7 +22242,7 @@ Defined in: [sys/ctr.ts:568](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_checkXInput**(`input`, `rule`, `rtn`): `boolean`
 
-Defined in: [sys/ctr.ts:746](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L746)
+Defined in: [sys/ctr.ts:749](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L749)
 
 检测提交的数据类型（会检测 XSRF）
 
@@ -22276,7 +22276,7 @@ Defined in: [sys/ctr.ts:746](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_cross**(`opt?`): `boolean`
 
-Defined in: [sys/ctr.ts:975](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L975)
+Defined in: [sys/ctr.ts:978](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L978)
 
 开启跨域请求
 
@@ -22321,7 +22321,7 @@ Defined in: [sys/ctr.ts:975](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_device**(): `"unknown"` \| `"android"` \| `"linux"` \| `"windows"` \| `"macintosh"` \| `"ipad"`
 
-Defined in: [sys/ctr.ts:788](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L788)
+Defined in: [sys/ctr.ts:791](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L791)
 
 根据用户 ua 获取当前用户的设备类型
 
@@ -22335,7 +22335,7 @@ Defined in: [sys/ctr.ts:788](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_enabledXsrf**(`opt?`): `void`
 
-Defined in: [sys/ctr.ts:757](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L757)
+Defined in: [sys/ctr.ts:760](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L760)
 
 当前页面开启 XSRF 支持（主要检测 cookie 是否存在）
 如果当前页面有 CDN，请不要使用
@@ -22358,7 +22358,7 @@ Defined in: [sys/ctr.ts:757](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_end**(): `void`
 
-Defined in: [sys/ctr.ts:1083](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L1083)
+Defined in: [sys/ctr.ts:1086](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L1086)
 
 主动关闭当前 socket 连接
 
@@ -22372,7 +22372,7 @@ Defined in: [sys/ctr.ts:1083](https://github.com/maiyunnet/kebab/blob/master/sys
 
 > `protected` **\_getBasicAuth**(`user`, `pwd`): `string`
 
-Defined in: [sys/ctr.ts:781](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L781)
+Defined in: [sys/ctr.ts:784](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L784)
 
 获取 Auth 字符串，用于客户端提交
 
@@ -22400,7 +22400,7 @@ Defined in: [sys/ctr.ts:781](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_getLocale**(): `string`
 
-Defined in: [sys/ctr.ts:966](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L966)
+Defined in: [sys/ctr.ts:969](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L969)
 
 获取当前语言名
 
@@ -22414,7 +22414,7 @@ Defined in: [sys/ctr.ts:966](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_getLocaleJsonString**(): `string`
 
-Defined in: [sys/ctr.ts:954](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L954)
+Defined in: [sys/ctr.ts:957](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L957)
 
 根据当前后台语言包设置情况获取 JSON 字符串传输到前台
 
@@ -22466,7 +22466,7 @@ Defined in: [sys/ctr.ts:315](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_handleFormData**(`events?`, `limits?`): `Promise`\<`boolean`\>
 
-Defined in: [sys/ctr.ts:1092](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L1092)
+Defined in: [sys/ctr.ts:1095](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L1095)
 
 获取 formdata 的信息
 
@@ -22514,7 +22514,7 @@ Defined in: [sys/ctr.ts:1092](https://github.com/maiyunnet/kebab/blob/master/sys
 
 > **\_l**(`key`, `data?`): `string`
 
-Defined in: [sys/ctr.ts:1018](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L1018)
+Defined in: [sys/ctr.ts:1021](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L1021)
 
 获取语言包值
 
@@ -22540,7 +22540,7 @@ Defined in: [sys/ctr.ts:1018](https://github.com/maiyunnet/kebab/blob/master/sys
 
 > `protected` **\_loadData**(`path`): `Promise`\<`Record`\<`string`, `string`\> \| `null`\>
 
-Defined in: [sys/ctr.ts:857](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L857)
+Defined in: [sys/ctr.ts:860](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L860)
 
 获取 data 数据
 
@@ -22562,7 +22562,7 @@ Defined in: [sys/ctr.ts:857](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_loadLocale**(`loc`, `pkg?`): `Promise`\<`boolean`\>
 
-Defined in: [sys/ctr.ts:905](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L905)
+Defined in: [sys/ctr.ts:908](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L908)
 
 设定语言并加载语言包
 
@@ -22683,7 +22683,7 @@ Defined in: [sys/ctr.ts:332](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_location**(`location`): `false`
 
-Defined in: [sys/ctr.ts:875](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L875)
+Defined in: [sys/ctr.ts:878](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L878)
 
 跳转（302临时跳转），支持相对本项目根路径的路径或绝对路径
 
@@ -22705,7 +22705,7 @@ Defined in: [sys/ctr.ts:875](https://github.com/maiyunnet/kebab/blob/master/sys/
 
 > `protected` **\_ping**(`data?`): `boolean`
 
-Defined in: [sys/ctr.ts:1068](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L1068)
+Defined in: [sys/ctr.ts:1071](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L1071)
 
 发送 socket ping
 
@@ -22727,7 +22727,7 @@ Defined in: [sys/ctr.ts:1068](https://github.com/maiyunnet/kebab/blob/master/sys
 
 > `protected` **\_pong**(`data?`): `boolean`
 
-Defined in: [sys/ctr.ts:1076](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L1076)
+Defined in: [sys/ctr.ts:1079](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L1079)
 
 发送 socket pong
 
@@ -22749,7 +22749,7 @@ Defined in: [sys/ctr.ts:1076](https://github.com/maiyunnet/kebab/blob/master/sys
 
 > `protected` **\_startSession**(`link`, `auth?`, `opt?`): `Promise`\<`boolean`\>
 
-Defined in: [sys/ctr.ts:889](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L889)
+Defined in: [sys/ctr.ts:892](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L892)
 
 开启 Session
 
@@ -22783,7 +22783,7 @@ Kv 或 Db 实例
 
 > `protected` **\_writeBinary**(`data`): `boolean`
 
-Defined in: [sys/ctr.ts:1060](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L1060)
+Defined in: [sys/ctr.ts:1063](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L1063)
 
 发送 socket 二进制
 
@@ -22805,7 +22805,7 @@ Defined in: [sys/ctr.ts:1060](https://github.com/maiyunnet/kebab/blob/master/sys
 
 > `protected` **\_writeResult**(`data`): `boolean`
 
-Defined in: [sys/ctr.ts:1052](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L1052)
+Defined in: [sys/ctr.ts:1055](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L1055)
 
 发送结果对象文本
 
@@ -22827,7 +22827,7 @@ Defined in: [sys/ctr.ts:1052](https://github.com/maiyunnet/kebab/blob/master/sys
 
 > `protected` **\_writeText**(`data`): `boolean`
 
-Defined in: [sys/ctr.ts:1044](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L1044)
+Defined in: [sys/ctr.ts:1047](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L1047)
 
 发送 socket 文本
 
@@ -22849,7 +22849,7 @@ Defined in: [sys/ctr.ts:1044](https://github.com/maiyunnet/kebab/blob/master/sys
 
 > **getAuthorization**(): `false` \| \{ `pwd`: `string`; `type`: `"basic"`; `user`: `string`; \} \| \{ `token`: `string`; `type`: `"bearer"`; \}
 
-Defined in: [sys/ctr.ts:809](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L809)
+Defined in: [sys/ctr.ts:812](https://github.com/maiyunnet/kebab/blob/master/sys/ctr.ts#L812)
 
 通过 header 或 _auth 获取鉴权信息，支持 Basic Auth 和 Bearer Token
 

package/index.d.ts

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

package/index.js

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

package/lib/undici/response.d.ts

@@ -31,7 +31,7 @@ export declare class Response {
     /**
      * --- 获取响应读取流对象 ---
      */
-    getStream(): (import("undici/types/readable").default & undici.Dispatcher.BodyMixin) | zlib.Gunzip | zlib.Inflate | zlib.BrotliDecompress | null;
+    getStream(): zlib.BrotliDecompress | zlib.Gunzip | zlib.Inflate | (import("undici/types/readable").default & undici.Dispatcher.BodyMixin) | null;
     /**
      * --- 获取原生响应读取流对象 ---
      */

package/package.json

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

@@ -26,9 +26,12 @@ const hbTimer = setInterval(function () {
         pid: process.pid
     });
 }, 10_000);
-/** --- 加载的证书列表（path: { sc, cert }） --- */
-let certList = [];
-/** --- server: index --- */
+/**
+ * --- 证书持久化 Map，key 为 keyPath|certPath ---
+ * --- 防止 reload 时证书文件处于更新空隙期（旧文件已删、新文件未写入）导致证书丢失 ---
+ */
+const certList = new Map();
+/** --- servername → certList mapKey 索引缓存 --- */
 let certHostIndex = {};
 /** --- 默认证书 --- */
 let defaultSc;
@@ -83,25 +86,26 @@ async function run() {
     http2Server = http2.createSecureServer({
         // eslint-disable-next-line @typescript-eslint/naming-convention
         'SNICallback': (servername, cb) => {
+            // --- 每 24 小时自动重新加载一次证书，确保证书更新后能被及时加载到内存中 ---
             if (Date.now() - certLastLoad > 60_000 * 60 * 24) {
                 // --- 不能用异步，不要干扰 SNI 进程 ---
                 reloadCert().catch(e => {
                     lCore.display('[CHILD][run] reloadCert error', e);
                 });
             }
-            const i = certHostIndex[servername];
-            if (i !== undefined) {
-                cb(null, certList[i].sc);
+            const cachedKey = certHostIndex[servername];
+            if (cachedKey !== undefined) {
+                cb(null, certList.get(cachedKey).sc);
                 return;
             }
             // --- 查找 servername ---
-            for (let i = 0; i < certList.length; ++i) {
-                if (!certList[i].cert.checkHost(servername)) {
+            for (const [mapKey, item] of certList) {
+                if (!item.cert.checkHost(servername)) {
                     continue;
                 }
                 // --- 找到 ---
-                cb(null, certList[i].sc);
-                certHostIndex[servername] = i;
+                cb(null, item.sc);
+                certHostIndex[servername] = mapKey;
                 return;
             }
             if (defaultSc) {
@@ -488,18 +492,28 @@ async function reload() {
 }
 /**
  * --- 重新加载证书对 ---
+ * --- 采用增量更新策略：新证书加载成功则覆盖旧值，加载失败（文件更新空隙期）则保留旧证书 ---
  */
 async function reloadCert() {
     certLastLoad = Date.now();
-    const cl = [];
+    /** --- 本次配置中出现的 mapKey 集合，用于事后清理已下线的证书 --- */
+    const newKeys = new Set();
+    /** --- 配置文件是否成功加载，未成功则不清理 Map，防止误删全部证书 --- */
+    let configLoaded = false;
     try {
         const certConfig = await lFs.getContent(kebab.CONF_CWD + 'cert.json', 'utf8');
         if (certConfig) {
             const certs = lText.parseJson(certConfig);
+            configLoaded = true;
             for (const item of certs) {
-                const key = await lFs.getContent(lText.isRealPath(item.key) ? item.key : kebab.CERT_CWD + item.key, 'utf8');
-                const cert = await lFs.getContent(lText.isRealPath(item.cert) ? item.cert : kebab.CERT_CWD + item.cert, 'utf8');
+                const keyPath = lText.isRealPath(item.key) ? item.key : kebab.CERT_CWD + item.key;
+                const certPath = lText.isRealPath(item.cert) ? item.cert : kebab.CERT_CWD + item.cert;
+                const mapKey = keyPath + '|' + certPath;
+                newKeys.add(mapKey);
+                const key = await lFs.getContent(keyPath, 'utf8');
+                const cert = await lFs.getContent(certPath, 'utf8');
                 if (!cert || !key) {
+                    // --- 文件不存在（可能正在更新），保留旧证书（如果有） ---
                     continue;
                 }
                 const certo = new crypto.X509Certificate(cert);
@@ -507,18 +521,22 @@ async function reloadCert() {
                     'key': key,
                     'cert': cert
                 });
-                cl.push({
-                    'cert': certo,
-                    'sc': sc
-                });
+                certList.set(mapKey, { 'cert': certo, 'sc': sc });
             }
         }
     }
     catch {
         // --- NOTHING ---
     }
-    certList = cl;
-    defaultSc = cl.length > 0 ? cl[0].sc : undefined;
+    // --- 仅在配置文件加载成功时，移除已从配置中下线的证书 ---
+    if (configLoaded) {
+        for (const key of certList.keys()) {
+            if (!newKeys.has(key)) {
+                certList.delete(key);
+            }
+        }
+    }
+    defaultSc = certList.size > 0 ? certList.values().next().value.sc : undefined;
     certHostIndex = {};
 }
 // --- 接收主进程回传信号，主要用来 reload，restart ---

package/sys/ctr.js

@@ -253,6 +253,8 @@ export class Ctr {
         // --- 组件 JS 从 stc 目录读取，浏览器同样通过 staticPath（支持 CDN）下载 ---
         const componentPath = this._config.const.rootPath + 'stc/' + path + '.page.js';
         if (!await lFs.isFile(componentPath)) {
+            lCore.debug(`[CTR][_loadReactPage] componentPath ${componentPath} is not a file`);
+            lCore.log(this, `[CTR][_loadReactPage] componentPath ${componentPath} is not a file`, '-error');
             return '';
         }
         try {
@@ -365,6 +367,7 @@ export class Ctr {
         }
         catch (e) {
             lCore.debug(`[CTR][_loadReactPage] ${e.message ?? ''}`);
+            lCore.log(this, '[CTR][_loadReactPage] ' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
             return '';
         }
     }