@maiyunnet/kebab 9.15.6 → 9.16.1

package/sys/route.js

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-4-15 13:40
- * Last: 2020-4-14 13:52:00, 2022-09-07 01:43:31, 2023-12-29 17:24:03, 2024-2-7 00:28:50, 2024-6-6 15:15:54, 2025-6-13 19:23:53, 2025-9-22 15:48:53, 2025-9-23 11:26:50, 2025-10-30 17:44:41
+ * Last: 2020-4-14 13:52:00, 2022-09-07 01:43:31, 2023-12-29 17:24:03, 2024-2-7 00:28:50, 2024-6-6 15:15:54, 2025-6-13 19:23:53, 2025-9-22 15:48:53, 2025-9-23 11:26:50, 2025-10-30 17:44:41, 2026-8-22
  */
 import * as http from 'http';
 import * as stream from 'stream';
@@ -300,7 +300,7 @@ export async function run(data) {
             cctr.setPrototype('_socket', wsSocket);
         }
         catch (e) {
-            lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+            lCore.log(cctr, lText.stringifyError(e), '-error');
             data.socket?.destroy();
             return true;
         }
@@ -314,7 +314,7 @@ export async function run(data) {
             rtn = await cctr.onLoad();
         }
         catch (e) {
-            lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+            lCore.log(cctr, lText.stringifyError(e), '-error');
             data.socket?.destroy();
             return true;
         }
@@ -323,7 +323,7 @@ export async function run(data) {
                 rtn = await cctr.onReady();
             }
             catch (e) {
-                lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                lCore.log(cctr, lText.stringifyError(e), '-error');
                 data.socket?.destroy();
                 return true;
             }
@@ -380,7 +380,7 @@ export async function run(data) {
                                     }
                                 }
                                 catch (e) {
-                                    lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                                    lCore.log(cctr, lText.stringifyError(e), '-error');
                                 }
                                 break;
                             }
@@ -393,23 +393,23 @@ export async function run(data) {
                             await cctr['onDrain']();
                         }
                         catch (e) {
-                            lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                            lCore.log(cctr, lText.stringifyError(e), '-error');
                         }
                     }).on('error', (e) => {
-                        lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                        lCore.log(cctr, lText.stringifyError(e), '-error');
                     }).on('end', async () => {
                         try {
                             await cctr['onEnd']();
                         }
                         catch (e) {
-                            lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                            lCore.log(cctr, lText.stringifyError(e), '-error');
                         }
                     }).on('close', async () => {
                         try {
                             await cctr['onClose']();
                         }
                         catch (e) {
-                            lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                            lCore.log(cctr, lText.stringifyError(e), '-error');
                         }
                         resolve();
                     });
@@ -467,7 +467,7 @@ export async function run(data) {
         rtn = await middle.onLoad();
     }
     catch (e) {
-        lCore.log(middle, '(E03)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+        lCore.log(middle, '(E03)' + lText.stringifyError(e), '-error');
         respond500(data.res);
         return true;
     }
@@ -479,7 +479,7 @@ export async function run(data) {
             rtn = await middle.onReady();
         }
         catch (e) {
-            lCore.log(middle, '(E05)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+            lCore.log(middle, '(E05)' + lText.stringifyError(e), '-error');
             respond500(data.res);
             return true;
         }
@@ -556,7 +556,7 @@ export async function run(data) {
                         }
                     }
                     catch (e) {
-                        lCore.log(cctr, '(E05)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                        lCore.log(cctr, '(E05)' + lText.stringifyError(e), '-error');
                         respond500(data.res);
                         await waitCtr(cctr);
                         return true;
@@ -567,7 +567,7 @@ export async function run(data) {
                 httpCode = cctr.getPrototype('_httpCode');
             }
             catch (e) {
-                lCore.log(cctr, '(E04)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                lCore.log(cctr, '(E04)' + lText.stringifyError(e), '-error');
                 respond500(data.res);
                 await waitCtr(cctr);
                 return true;
@@ -1291,7 +1291,7 @@ export function getFormData(req, events = {}, limits = {}) {
             clearTimer();
             cleanupActiveFile();
             lCore.debug('[ROUTE][GETFORMDATA] request error before getFormData: ' + e.message);
-            lCore.log({}, '[ROUTE][GETFORMDATA] request error before getFormData: ' + (e.stack ?? ''), '-error');
+            lCore.log({}, '[ROUTE][GETFORMDATA] request error before getFormData: ' + lText.stringifyError(e), '-error');
             cleanupFiles();
             resolve(false);
         });

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

@@ -87,6 +87,8 @@ export default class extends sCtr.Ctr {
     undiciFollow2(): kebab.Json;
     undiciReuse(): Promise<string>;
     undiciError(): Promise<string>;
+    undiciRetry(): Promise<string>;
+    undiciRetrySource(): Promise<string | boolean>;
     undiciHosts(): Promise<string>;
     undiciMproxy(): Promise<string | boolean>;
     undiciMproxy1(): Promise<string | boolean>;

package/www/example/ctr/test.js

@@ -186,6 +186,7 @@ export default class extends sCtr.Ctr {
             `<br><a href="${this._config.const.urlBase}test/undici-follow">View "test/undici-follow"</a>`,
             `<br><a href="${this._config.const.urlBase}test/undici-reuse">View "test/undici-reuse"</a>`,
             `<br><a href="${this._config.const.urlBase}test/undici-error">View "test/undici-error"</a>`,
+            `<br><a href="${this._config.const.urlBase}test/undici-retry">View "test/undici-retry"</a>`,
             `<br><a href="${this._config.const.urlBase}test/undici-hosts">View "test/undici-hosts"</a>`,
             `<br><a href="${this._config.const.urlBase}test/undici-rproxy/dist/core.js">View "test/undici-rproxy/dist/core.js"</a> <a href="${this._config.const.urlBase}test/undici-rproxy/package.json">View "package.json"</a>`,
             `<br><a href="${this._config.const.urlBase}test/undici-mproxy">View "test/undici-mproxy"</a>`,
@@ -2212,6 +2213,46 @@ content: <pre>${(await res.getContent())?.toString() ?? 'null'}</pre>
 error: <pre>${JSON.stringify(res.error, null, 4)}</pre>`);
         return echo.join('') + this._getEnd();
     }
+    async undiciRetry() {
+        const url = `${this._internalUrl}test/undici-retry-source`;
+        const time = Date.now();
+        const res = await lUndici.get(url, {
+            'retry': 1,
+            'log': false,
+        });
+        const content = await res.getContent();
+        return `<pre>const res = await lUndici.get('${url}', {
+    'retry': 1,
+    'log': false,
+});
+const content = await res.getContent();</pre>
+time: ${Date.now() - time}ms
+headers: <pre>${lText.htmlescape(lText.stringifyJson(res.headers))}</pre>
+content: <pre>${lText.htmlescape(content?.toString() ?? 'null')}</pre>
+error: <pre>${lText.htmlescape(res.error ? lText.stringifyError(res.error) : 'null')}</pre>` + this._getEnd();
+    }
+    async undiciRetrySource() {
+        const etag = '"undici-retry"';
+        if ((this._headers['range'] === 'bytes=1-1') && (this._headers['if-match'] === etag)) {
+            this._httpCode = 206;
+            this._res.setHeader('content-length', '1');
+            this._res.setHeader('content-range', 'bytes 1-1/2');
+            this._res.setHeader('etag', etag);
+            return 'K';
+        }
+        lCore.writeHead(this._res, 200, {
+            'content-length': '2',
+            etag,
+        });
+        lCore.write(this._res, 'O');
+        await new Promise(resolve => {
+            setImmediate(() => {
+                this._res.destroy();
+                resolve();
+            });
+        });
+        return false;
+    }
     async undiciHosts() {
         const echo = [];
         const res = await lUndici.get('http://nodejs.org:' + this._config.const.hostport.toString() + this._config.const.urlBase + 'test', {
@@ -4083,7 +4124,7 @@ send.addEventListener('click', async () => {
             '<b>Monitor Snapshot</b>',
             '<hr>',
             `<b>PID:</b> ${snapshot.pid}`,
-            `<br><b>Process CPU (single core):</b> ${snapshot.cpuProcess}%`,
+            `<br><b>Process CPU (100% per core):</b> ${snapshot.cpuProcess}%`,
             `<br><b>System CPU (total):</b> ${snapshot.cpuOs}%`,
             `<br><b>Event Loop Lag:</b> ${snapshot.eloopLag}ms`,
             '<br><br><b>Memory:</b>',
@@ -4102,7 +4143,7 @@ send.addEventListener('click', async () => {
             `<br><br><b>Active Requests:</b> ${snapshot.activeCount}`,
         ];
         for (const req of snapshot.activeRequests) {
-            echo.push(`<br>[${req.method}] ${lText.htmlescape(req.url)} - ${req.duration}ms, CPU: ${req.cpuUser + req.cpuSystem}us, MEM_DELTA: ${lText.sizeFormat(req.memDelta)}`);
+            echo.push(`<br>[${req.method}] ${lText.htmlescape(req.url)} - ${req.duration}ms, PROCESS_CPU_DELTA: ${req.cpuUser + req.cpuSystem}us, PROCESS_MEM_DELTA: ${lText.sizeFormat(req.memDelta)}`);
         }
         echo.push('<br><br>' + this._getEnd());
         return echo.join('');
@@ -4156,7 +4197,7 @@ send.addEventListener('click', async () => {
             `System CPU ${after.cpuOs}%, ` +
             `RSS ${lText.sizeFormat(after.mem.rss)}, ` +
             `Iterations: ${count}`);
-        echo.push('<br><br>Check <code>log/monitor/{pid}/</code> for' +
+        echo.push('<br><br>Check <code>log/monitor/YYYY/MM/DD/HHmmss-pid-{pid}/</code> for' +
             ' diagnostic files.');
         echo.push('<br><br>' + this._getEnd());
         return echo.join('');