@maiyunnet/kebab 3.2.19 → 3.2.21

package/index.d.ts

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

package/index.js

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

package/lib/net.d.ts

@@ -114,6 +114,7 @@ export interface IRequestOptions {
     'type'?: 'form' | 'json';
     /** --- 秒数 --- */
     'timeout'?: number;
+    /** --- 追踪 location 次数，0 为不追踪，默认为 0 --- */
     'follow'?: number;
     /** --- 自定义 host 映射，如 {'www.maiyun.net': '127.0.0.1'}，或全部映射到一个 host --- */
     'hosts'?: Record<string, string> | string;

package/lib/net.js

@@ -99,6 +99,7 @@ export async function request(u, data, opt = {}) {
     const method = opt.method ?? 'GET';
     const type = opt.type ?? 'form';
     const timeout = opt.timeout ?? 10;
+    /** --- 追踪 location 次数，0 为不追踪，默认为 0 --- */
     const follow = opt.follow ?? 0;
     const hosts = opt.hosts ?? {};
     const save = opt.save;

package/lib/s3.js

@@ -27,11 +27,11 @@ export class S3 {
         this._bucket = '';
         this._ctr = ctr;
         const config = ctr.getPrototype('_config');
-        const account = config.s3?.[ESERVICE[opt.service]]?.account ?? '';
-        const secretId = config.s3?.[ESERVICE[opt.service]]?.sid ?? '';
-        const secretKey = config.s3?.[ESERVICE[opt.service]]?.skey ?? '';
-        const region = config.s3?.[ESERVICE[opt.service]]?.region ?? '';
-        this._bucket = config.s3?.[ESERVICE[opt.service]]?.bucket ?? '';
+        const account = opt.account ?? config.s3?.[ESERVICE[opt.service]]?.account ?? '';
+        const secretId = opt.secretId ?? config.s3?.[ESERVICE[opt.service]]?.sid ?? '';
+        const secretKey = opt.secretKey ?? config.s3?.[ESERVICE[opt.service]]?.skey ?? '';
+        const region = opt.region ?? config.s3?.[ESERVICE[opt.service]]?.region ?? '';
+        this._bucket = opt.bucket ?? config.s3?.[ESERVICE[opt.service]]?.bucket ?? '';
         let endpoint;
         switch (opt.service) {
             case ESERVICE.TENCENT: {

package/package.json

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

@@ -202,6 +202,7 @@ async function requestHandler(req, res, https) {
         'timeout': 30_000,
         'callback': () => {
             if (!req.socket.writable) {
+                // --- 用户连接已中断 ---
                 return;
             }
             if (res.headersSent) {
@@ -298,9 +299,11 @@ async function requestHandler(req, res, https) {
                             'headers': {}
                         }, '[CHILD][requestHandler][E0]' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
                         const content = '<h1>500 Server Error</h1><hr>Kebab';
-                        res.setHeader('content-type', 'text/html; charset=utf-8');
-                        res.setHeader('content-length', Buffer.byteLength(content));
-                        lCore.writeHead(res, 500);
+                        if (!res.headersSent) {
+                            res.setHeader('content-type', 'text/html; charset=utf-8');
+                            res.setHeader('content-length', Buffer.byteLength(content));
+                            lCore.writeHead(res, 500);
+                        }
                         res.end(content);
                         return;
                     }
@@ -337,9 +340,11 @@ async function requestHandler(req, res, https) {
                 catch (e) {
                     lCore.log({}, '[CHILD][requestHandler][E1]' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
                     const content = '<h1>500 Server Error</h1><hr>Kebab';
-                    res.setHeader('content-type', 'text/html; charset=utf-8');
-                    res.setHeader('content-length', Buffer.byteLength(content));
-                    lCore.writeHead(res, 500);
+                    if (!res.headersSent) {
+                        res.setHeader('content-type', 'text/html; charset=utf-8');
+                        res.setHeader('content-length', Buffer.byteLength(content));
+                        lCore.writeHead(res, 500);
+                    }
                     res.end(content);
                     return;
                 }

package/sys/ctr.js

@@ -684,6 +684,7 @@ export class Ctr {
         this._res.setHeader('access-control-allow-methods', '*');
         if (this._req.method === 'OPTIONS') {
             this._res.setHeader('access-control-max-age', '3600');
+            this._httpCode = 204;
             return false;
         }
         return true;

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

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

package/www/example/ctr/test.js

@@ -76,6 +76,7 @@ export default class extends sCtr.Ctr {
             '<br>QS: ' + this._config.const.qs,
             '<br>HTTPS: ' + (this._config.const.https ? 'true' : 'false'),
             '<br>MOBILE: ' + (this._config.const.mobile ? 'true' : 'false'),
+            '<br>MINIPROGRAM: ' + (this._config.const.miniprogram) + ' (' + typeof this._config.const.miniprogram + ')',
             '<br>Real IP: ' + lCore.ip(this),
             '<br>Client IP: ' + lCore.realIP(this),
             '<br><br>URL_BASE: ' + this._config.const.urlBase,
@@ -114,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-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>`,
             '<br><br><b>Model test:</b>',
@@ -536,6 +538,11 @@ Result:<pre id="result">Nothing.</pre>` + this._getEnd();
         echo.push('5');
         return [1, { 'list': echo }];
     }
+    async ctr500() {
+        await lCore.sleep(100);
+        lCore.writeHead(this._res, 200);
+        lCore.debug('DEBUG', this._res.abc.def);
+    }
     async modTest() {
         const retur = [];
         if (!(this._checkInput(this._get, {