@maiyunnet/kebab 3.2.0 → 3.2.2

package/index.d.ts

@@ -5,7 +5,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "3.2.0";
+export declare const VER = "3.2.2";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;
@@ -134,6 +134,8 @@ export interface IConfigConst {
     'path': string;
     /** --- 不含 ? 开头 --- */
     'qs': string;
+    /** --- 含 ? 开头 --- */
+    'qss': string;
     'startTime': bigint;
     'startMemory': number;
     'mobile': boolean;

package/index.js

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

package/lib/core.d.ts

@@ -13,6 +13,7 @@ export declare const globalConfig: kebab.IConfig & {
     'debug': boolean;
     'max': number;
     'hosts': string[];
+    'ind': string[];
 };
 /** --- Cookie 设置的选项 --- */
 export interface ICookieOptions {

package/package.json

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

@@ -45,6 +45,17 @@ const linkCount = {};
 async function run() {
     // --- 加载 全局、vhosts、sni 证书 ---
     await reload();
+    // --- 启动随带的 ind，如果独立运行 ind 则用 --ind 命令启动 ---
+    for (const ind of lCore.globalConfig.ind) {
+        if (!await lFs.isFile(kebab.IND_CWD + ind + '/index.js')) {
+            lCore.display('CHILD IND ERROR', 'IND FILE "' + ind + '" NOT FOUND.');
+            continue;
+        }
+        // --- 载入独立文件入口 ---
+        import((!kebab.IND_CWD.startsWith('/') ? '/' : '') + kebab.IND_CWD + ind + '/index.js').catch((e) => {
+            lCore.display('CHILD IND ERROR', ind, e);
+        });
+    }
     // --- 创建服务器并启动（支持 http2/https/http/websocket） ---
     http2Server = http2.createSecureServer({
         // eslint-disable-next-line @typescript-eslint/naming-convention

package/sys/cmd.js

@@ -76,6 +76,7 @@ async function run() {
         config.debug ??= true;
         config.max ??= 64;
         config.hosts ??= [];
+        config.ind ??= [];
         // --- config - set ---
         config.set ??= {};
         config.set.timezone ??= 8;

package/sys/route.js

@@ -78,6 +78,7 @@ export async function run(data) {
     config.const = {
         'path': data.path,
         'qs': data.uri.query ?? '',
+        'qss': data.uri.query ? '?' + data.uri.query : '',
         'startTime': process.hrtime.bigint(),
         'startMemory': process.memoryUsage().rss,
         // --- 环境判断 ---
@@ -216,12 +217,17 @@ export async function run(data) {
     /** --- 开发者返回值 --- */
     let rtn;
     if (data.socket && data.req instanceof http.IncomingMessage) {
-        // --- socket 模式，判断真实控制器文件是否存在 ---
-        const filePath = config.const.wsPath + pathLeft + '.js';
+        // --- socket 模式 ---
+        // --- 判断真实控制器文件是否存在 ---
+        let filePath = config.const.wsPath + pathLeft + '.js';
         if (!await lFs.isFile(filePath)) {
             // --- 指定的控制器不存在 ---
-            data.socket?.destroy();
-            return true;
+            filePath = config.const.wsPath + 'handler.js';
+            if (!await lFs.isFile(filePath)) {
+                // --- 默认 handler 也不存在 ---
+                data.socket?.destroy();
+                return true;
+            }
         }
         // --- 加载控制器文件 ---
         const ctrCtr = (await import((!filePath.startsWith('/') ? '/' : '') + filePath)).default;

package/www/example/ctr/test.js

@@ -193,6 +193,7 @@ export default class extends sCtr.Ctr {
             '<br><br><b>Ws:</b>',
             `<br><br><a href="${this._config.const.urlBase}test/ws-server">View "test/ws-server"</a>`,
             `<br><a href="${this._config.const.urlBase}test/ws-server?ac=rproxy">View ws rproxy</a>`,
+            `<br><a href="${this._config.const.urlBase}test/ws-server?ac=rproxy2">View ws rproxy2 (handler)</a>`,
             `<br><a href="${this._config.const.urlBase}test/ws-client">View "test/ws-client"</a>`,
             `<br><a href="${this._config.const.urlBase}test/ws-client?ac=mproxy">View ws mproxy</a>`,
             '<br><br><b>Ssh:</b>',
@@ -2692,6 +2693,7 @@ ${lTime.format(null, 'd|D|j|l|N|w|Y|y|F|M|m|H|h|i|s|T')}`;
     wsServer() {
         const echo = '<a href="' + this._config.const.urlBase + 'test/ws-server">Default</a> | ' +
             '<a href="' + this._config.const.urlBase + 'test/ws-server?ac=rproxy">rproxy</a> | ' +
+            '<a href="' + this._config.const.urlBase + 'test/ws-server?ac=rproxy2">rproxy2</a> | ' +
             '<a href="' + this._config.const.urlBase + 'test">Return</a><br><br>' +
             `Nick: <input id="nick"> <input id="btn" type="button" value="Enter" onclick="enter()"> <input id="stop" type="button" value="Stop" onclick="stop()" disabled>
 <div id="list" style="border: solid 1px #000; line-height: 1.5; height: 300px; overflow-y: scroll; margin-top: 10px; padding: 10px;"></div>
@@ -2724,7 +2726,7 @@ function enter() {
     nickEl.disabled = true;
     btnEl.disabled = true;
     listEl.insertAdjacentHTML('afterbegin', '<div>[' + dateStr() + '] Connecting...</div>');
-    ws = new WebSocket('ws${this._config.const.https ? 's' : ''}://${this._config.const.host}/${this._get['ac'] === 'rproxy' ? 'rproxy' : 'test'}');
+    ws = new WebSocket('ws${this._config.const.https ? 's' : ''}://${this._config.const.host}/${(this._get['ac'] === 'rproxy' || this._get['ac'] === 'rproxy2') ? this._get['ac'] : 'test'}');
     ws.onopen = function() {
         listEl.insertAdjacentHTML('afterbegin', '<div>[' + dateStr() + '] Event: onOpen.</div>');
         ws.send('Hello: ' + nick);

package/www/example/ws/handler.d.ts

@@ -0,0 +1,4 @@
+import * as sCtr from '#kebab/sys/ctr.js';
+export default class extends sCtr.Ctr {
+    onLoad(): Promise<boolean>;
+}

package/www/example/ws/handler.js

@@ -0,0 +1,12 @@
+import * as sCtr from '#kebab/sys/ctr.js';
+import * as lCore from '#kebab/lib/core.js';
+import * as lWs from '#kebab/lib/ws.js';
+export default class extends sCtr.Ctr {
+    async onLoad() {
+        lCore.debug('WebSocket handle test onLoad.');
+        if (this._config.const.path === 'rproxy2') {
+            await lWs.rproxy(this, `ws${this._config.const.https ? 's' : ''}://${this._config.const.host}/test`);
+        }
+        return false;
+    }
+}