@maiyunnet/kebab 7.0.2 → 7.1.1

package/sys/route.js

@@ -25,6 +25,38 @@ let kebabConfigs = {};
 export function clearKebabConfigs() {
     kebabConfigs = {};
 }
+/**
+ * --- 输出 500 错误响应 ---
+ * @param res 响应对象
+ */
+function respond500(res) {
+    const content = '<h1>500 Server Error</h1><hr>Kebab';
+    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);
+}
+/**
+ * --- 输出 404 错误响应 ---
+ * @param res 响应对象
+ * @param config 配置对象（用于检查 #404 路由）
+ * @param path 请求路径
+ */
+function respond404(res, config, path) {
+    if (config?.route?.['#404']) {
+        res.setHeader('location', lText.urlResolve(config.const.urlBase, config.route['#404']));
+        lCore.writeHead(res, 302);
+        res.end('');
+        return;
+    }
+    const content = '[Error] Controller not found, path: ' + path + '.';
+    res.setHeader('content-type', 'text/html; charset=utf-8');
+    res.setHeader('content-length', Buffer.byteLength(content));
+    lCore.writeHead(res, 404);
+    res.end(content);
+}
 /**
  * --- 若为动态路径则执行此函数，此函数不进行判断 kebab.json 是否存在 ---
  * @param data 传导的数据
@@ -181,17 +213,7 @@ export async function run(data) {
     // --- 若文件名为保留的 middle 将不允许进行 ---
     if (pathLeft.startsWith('middle')) {
         if (data.res) {
-            if (config.route['#404']) {
-                data.res.setHeader('location', lText.urlResolve(config.const.urlBase, config.route['#404']));
-                lCore.writeHead(data.res, 302);
-                data.res.end('');
-                return true;
-            }
-            const content = '[Error] Controller not found, path: ' + path + '.';
-            data.res.setHeader('content-type', 'text/html; charset=utf-8');
-            data.res.setHeader('content-length', Buffer.byteLength(content));
-            lCore.writeHead(data.res, 404);
-            data.res.end(content);
+            respond404(data.res, config, path);
         }
         else {
             data.socket?.destroy();
@@ -411,11 +433,7 @@ export async function run(data) {
     }
     catch (e) {
         lCore.log(middle, '(E03)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
-        const content = '<h1>500 Server Error</h1><hr>Kebab';
-        data.res.setHeader('content-type', 'text/html; charset=utf-8');
-        data.res.setHeader('content-length', Buffer.byteLength(content));
-        lCore.writeHead(data.res, 500);
-        data.res.end(content);
+        respond500(data.res);
         return true;
     }
     let cacheTTL = middle.getPrototype('_cacheTTL');
@@ -427,11 +445,7 @@ export async function run(data) {
         }
         catch (e) {
             lCore.log(middle, '(E05)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
-            const content = '<h1>500 Server Error</h1><hr>Kebab';
-            data.res.setHeader('content-type', 'text/html; charset=utf-8');
-            data.res.setHeader('content-length', Buffer.byteLength(content));
-            lCore.writeHead(data.res, 500);
-            data.res.end(content);
+            respond500(data.res);
             return true;
         }
         cacheTTL = middle.getPrototype('_cacheTTL');
@@ -441,17 +455,7 @@ export async function run(data) {
             const filePath = config.const.ctrPath + pathLeft + '.js';
             if (!await lFs.isFile(filePath)) {
                 // --- 指定的控制器不存在 ---
-                if (config.route['#404']) {
-                    data.res.setHeader('location', lText.urlResolve(config.const.urlBase, config.route['#404']));
-                    lCore.writeHead(data.res, 302);
-                    data.res.end('');
-                    return true;
-                }
-                const content = '[Error] Controller not found, path: ' + path + '.';
-                data.res.setHeader('content-type', 'text/html; charset=utf-8');
-                data.res.setHeader('content-length', Buffer.byteLength(content));
-                lCore.writeHead(data.res, 404);
-                data.res.end(content);
+                respond404(data.res, config, path);
                 return true;
             }
             // --- 加载控制器文件 ---
@@ -488,34 +492,14 @@ export async function run(data) {
             // --- 检测 action 是否存在，以及排除内部方法 ---
             if (pathRight.startsWith('_') || pathRight === 'onUpgrade' || pathRight === 'onLoad' || pathRight === 'onData' || pathRight === 'onDrain' || pathRight === 'onEnd' || pathRight === 'onClose' || pathRight === 'setPrototype' || pathRight === 'getPrototype' || pathRight === 'getAuthorization') {
                 // --- _ 开头的 action 是内部方法，不允许访问 ---
-                if (config.route['#404']) {
-                    data.res.setHeader('location', lText.urlResolve(config.const.urlBase, config.route['#404']));
-                    lCore.writeHead(data.res, 302);
-                    data.res.end('');
-                    return true;
-                }
-                const content = '[Error] Action not found, path: ' + path + '.';
-                data.res.setHeader('content-type', 'text/html; charset=utf-8');
-                data.res.setHeader('content-length', Buffer.byteLength(content));
-                lCore.writeHead(data.res, 404);
-                data.res.end(content);
+                respond404(data.res, config, path);
                 return true;
             }
             pathRight = pathRight.replace(/-([a-zA-Z0-9])/g, function (t, t1) {
                 return t1.toUpperCase();
             });
             if ((cctr[pathRight] === undefined) || (typeof cctr[pathRight] !== 'function')) {
-                if (config.route['#404']) {
-                    data.res.setHeader('location', lText.urlResolve(config.const.urlBase, config.route['#404']));
-                    lCore.writeHead(data.res, 302);
-                    data.res.end('');
-                    return true;
-                }
-                const content = '[Error] Action not found, path: ' + path + '.';
-                data.res.setHeader('content-type', 'text/html; charset=utf-8');
-                data.res.setHeader('content-length', Buffer.byteLength(content));
-                lCore.writeHead(data.res, 404);
-                data.res.end(content);
+                respond404(data.res, config, path);
                 return true;
             }
             // --- 执行 onLoad 方法 ---
@@ -538,11 +522,7 @@ export async function run(data) {
                     }
                     catch (e) {
                         lCore.log(cctr, '(E05)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
-                        const content = '<h1>500 Server Error</h1><hr>Kebab';
-                        data.res.setHeader('content-type', 'text/html; charset=utf-8');
-                        data.res.setHeader('content-length', Buffer.byteLength(content));
-                        lCore.writeHead(data.res, 500);
-                        data.res.end(content);
+                        respond500(data.res);
                         await waitCtr(cctr);
                         return true;
                     }
@@ -553,11 +533,7 @@ export async function run(data) {
             }
             catch (e) {
                 lCore.log(cctr, '(E04)' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
-                const content = '<h1>500 Server Error</h1><hr>Kebab';
-                data.res.setHeader('content-type', 'text/html; charset=utf-8');
-                data.res.setHeader('content-length', Buffer.byteLength(content));
-                lCore.writeHead(data.res, 500);
-                data.res.end(content);
+                respond500(data.res);
                 await waitCtr(cctr);
                 return true;
             }

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

@@ -47,6 +47,7 @@ export default class extends sCtr.Ctr {
     coreUpdatecode(): Promise<string>;
     coreReload(): Promise<string>;
     coreRestart(): Promise<string>;
+    corePm2(): Promise<string>;
     coreGlobal(): Promise<string>;
     crypto(): Promise<string>;
     db(): Promise<kebab.Json>;

package/www/example/ctr/test.js

@@ -26,10 +26,7 @@ import * as sCtr from '#kebab/sys/ctr.js';
 import mTest from '../mod/test.js';
 import mTestData from '../mod/testdata.js';
 export default class extends sCtr.Ctr {
-    constructor() {
-        super(...arguments);
-        this._internalUrl = '';
-    }
+    _internalUrl = '';
     onLoad() {
         if (this._config.const.hostname !== '127.0.0.1' && this._config.const.hostname !== '172.17.0.1' &&
             this._config.const.hostname !== 'localhost' && !this._config.const.hostname.endsWith('.local.brc-app.com') &&
@@ -142,6 +139,7 @@ export default class extends sCtr.Ctr {
             `<br><a href="${this._config.const.urlBase}test/core-ls">View "test/core-ls"</a>`,
             `<br><a href="${this._config.const.urlBase}test/core-reload">View "test/core-reload"</a>`,
             `<br><a href="${this._config.const.urlBase}test/core-restart">View "test/core-restart"</a>`,
+            `<br><a href="${this._config.const.urlBase}test/core-pm2?name=cron&action=restart">View "test/core-pm2"</a>`,
             `<br><a href="${this._config.const.urlBase}test/core-global">View "test/core-global"</a>`,
             `<br><a href="${this._config.const.urlBase}test/core-updatecode">View "test/core-updatecode"</a>`,
             '<br><br><b>Crypto:</b>',
@@ -1278,6 +1276,18 @@ to: ${to}`
         await lCore.sendRestart();
         return 'The restart request has been sent, please review the console.<br><br>' + this._getEnd();
     }
+    async corePm2() {
+        const name = this._get['name'] ?? '';
+        const action = (this._get['action'] ?? 'restart');
+        if (!name) {
+            return 'Please provide the PM2 process name via ?name=xxx&action=restart<br>action: start, stop, restart (default: restart)<br><br>' + this._getEnd();
+        }
+        if (action !== 'start' && action !== 'stop' && action !== 'restart') {
+            return 'Invalid action. Must be: start, stop, restart<br><br>' + this._getEnd();
+        }
+        const list = await lCore.sendPm2(name, action);
+        return `PM2 ${action} request has been sent for "${name}".<br>Success hosts: ${JSON.stringify(list)}<br><br>` + this._getEnd();
+    }
     async coreGlobal() {
         const ts = lTime.stamp().toString();
         const echo = [

package/www/example/mod/test.js

@@ -38,10 +38,10 @@ CREATE UNIQUE INDEX "utoken" ON "m"."test" USING btree (
 );
 */
 export default class default_1 extends sMod {
-    static { this._$table = 'test'; }
-    static { this._$primary = 'id'; }
-    static { this._$key = 'token'; }
-    static { this._$index = 'utoken'; }
+    static _$table = 'test';
+    static _$primary = 'id';
+    static _$key = 'token';
+    static _$index = 'utoken';
     /* eslint-enable */
     _keyGenerator() {
         return 'test_' + lCore.rand(0, 3).toString();

package/www/example/mod/testdata.js

@@ -9,6 +9,6 @@ CREATE TABLE `m_test_data_0` (
 ) ENGINE=InnoDB DEFAULT CHARSET=ascii COLLATE=ascii_bin;
 */
 export default class default_1 extends sMod {
-    static { this._$table = 'test_data'; }
-    static { this._$primary = 'id'; }
+    static _$table = 'test_data';
+    static _$primary = 'id';
 }

package/www/example/ws/test.js

@@ -2,10 +2,7 @@ import * as sCtr from '#kebab/sys/ctr.js';
 import * as lCrypto from '#kebab/lib/crypto.js';
 import * as lCore from '#kebab/lib/core.js';
 export default class extends sCtr.Ctr {
-    constructor() {
-        super(...arguments);
-        this._nick = '';
-    }
+    _nick = '';
     onUpgrade() {
         lCore.display('[/test] WebSocket test onUpgrade.');
         return {