@maiyunnet/kebab 9.3.1 → 9.3.2

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.2"` = `'9.3.2'`
 
 Defined in: [index.ts:10](https://github.com/maiyunnet/kebab/blob/master/index.ts#L10)
 

package/index.d.ts

@@ -5,7 +5,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "9.3.1";
+export declare const VER = "9.3.2";
 /** --- 框架根目录，以 / 结尾  --- */
 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.2';
 // --- 服务端用的路径 ---
 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.2",
   "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 ---