@maiyunnet/kebab 3.1.19 → 3.2.0

package/index.d.ts

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

package/index.js

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

package/lib/net.d.ts

@@ -79,7 +79,7 @@ export declare function getFormData(): fd.FormData;
  * @param res 直接设置头部而不返回，可置空
  * @param filter 返回 true 则留下
  */
-export declare function filterProxyHeaders(headers: http.IncomingHttpHeaders | http2.IncomingHttpHeaders | THttpHeaders, res?: http2.Http2ServerResponse | http.ServerResponse, filter?: (h: string) => boolean): Record<string, string | string[]>;
+export declare function filterHeaders(headers: http.IncomingHttpHeaders | http2.IncomingHttpHeaders | THttpHeaders, res?: http2.Http2ServerResponse | http.ServerResponse, filter?: (h: string) => boolean): Record<string, string | string[]>;
 /**
  * --- 正向 mproxy 代理，注意提前处理不要自动处理 post 数据，读取 get 的 url 为实际请求地址 ---
  * --- get: url, auth ---
@@ -107,7 +107,8 @@ export interface IRequestOptions {
     /** --- 秒数 --- */
     'timeout'?: number;
     'follow'?: number;
-    'hosts'?: Record<string, string>;
+    /** --- 自定义 host 映射，如 {'www.maiyun.net': '127.0.0.1'}，或全部映射到一个 host --- */
+    'hosts'?: Record<string, string> | string;
     'save'?: string;
     'local'?: string;
     'headers'?: THttpHeaders;
@@ -127,7 +128,8 @@ export interface IMproxyOptions {
     /** --- 秒数 --- */
     'timeout'?: number;
     'follow'?: number;
-    'hosts'?: Record<string, string>;
+    /** --- 自定义 host 映射，如 {'www.maiyun.net': '127.0.0.1'}，或全部映射到一个 host --- */
+    'hosts'?: Record<string, string> | string;
     'local'?: string;
     'headers'?: THttpHeaders;
     /** --- 过滤 header，返回 true 则留下 --- */
@@ -140,7 +142,8 @@ export interface IRproxyOptions {
     /** --- 秒数 --- */
     'timeout'?: number;
     'follow'?: number;
-    'hosts'?: Record<string, string>;
+    /** --- 自定义 host 映射，如 {'www.maiyun.net': '127.0.0.1'}，或全部映射到一个 host --- */
+    'hosts'?: Record<string, string> | string;
     'local'?: string;
     'headers'?: THttpHeaders;
     /** --- 过滤 header，返回 true 则留下 --- */

package/lib/net.js

@@ -136,7 +136,9 @@ export async function request(u, data, opt = {}) {
             };
             return res;
         }
-        if (hosts[host] !== undefined && !hosts[host]) {
+        if (typeof hosts === 'string' ?
+            !hosts :
+            (hosts[host] !== undefined && !hosts[host])) {
             const res = new lResponse.Response(null);
             res.error = {
                 'name': 'hosts error',
@@ -160,7 +162,7 @@ export async function request(u, data, opt = {}) {
             'localAddress': local,
             'ca': ca,
             'connectionOptions': {
-                'remoteHost': hosts[host],
+                'remoteHost': typeof hosts === 'string' ? hosts : hosts[host],
             },
         });
     }
@@ -439,7 +441,7 @@ const proxyContinueHeaders = [
  * @param res 直接设置头部而不返回，可置空
  * @param filter 返回 true 则留下
  */
-export function filterProxyHeaders(headers, res, filter) {
+export function filterHeaders(headers, res, filter) {
     const heads = {};
     for (const h in headers) {
         if (proxyContinueHeaders.includes(h)) {
@@ -486,14 +488,17 @@ export async function mproxy(ctr, auth, opt = {}) {
     }
     opt.method = req.method ?? 'GET';
     opt.headers ??= {};
-    Object.assign(filterProxyHeaders(req.headers, undefined, opt.filter), opt.headers);
+    const headers = Object.assign(filterHeaders(req.headers, undefined, opt.filter), opt.headers);
     // --- 发起请求 ---
-    const rres = await request(get['url'], req, opt);
+    const rres = await request(get['url'], req, {
+        ...opt,
+        headers
+    });
     if (rres.error) {
         return -2;
     }
     if (rres.headers) {
-        filterProxyHeaders(rres.headers, res, opt.filter);
+        filterHeaders(rres.headers, res, opt.filter);
     }
     res.writeHead(rres.headers?.['http-code'] ?? 200);
     await new Promise((resolve) => {
@@ -543,14 +548,17 @@ export async function rproxy(ctr, route, opt = {}) {
         const lpath = path.slice(key.length);
         opt.method = req.method ?? 'GET';
         opt.headers ??= {};
-        Object.assign(filterProxyHeaders(req.headers, undefined, opt.filter), opt.headers);
+        const headers = Object.assign(filterHeaders(req.headers, undefined, opt.filter), opt.headers);
         // --- 发起请求 ---
-        const rres = await request(route[key] + lpath, req, opt);
+        const rres = await request(route[key] + lpath, req, {
+            ...opt,
+            headers
+        });
         if (rres.error) {
             return false;
         }
         if (rres.headers) {
-            filterProxyHeaders(rres.headers, res, opt.filter);
+            filterHeaders(rres.headers, res, opt.filter);
         }
         res.writeHead(rres.headers?.['http-code'] ?? 200);
         await new Promise((resolve) => {

package/lib/ws.d.ts

@@ -27,7 +27,8 @@ export declare enum EOpcode {
 export interface IConnectOptions {
     /** --- 秒数 --- */
     'timeout'?: number;
-    'hosts'?: Record<string, string>;
+    /** --- 自定义 host 映射，如 {'www.maiyun.net': '127.0.0.1'}，或全部映射到一个 host --- */
+    'hosts'?: Record<string, string> | string;
     'local'?: string;
     'headers'?: lNet.THttpHeaders;
     /** --- cookie 托管对象 --- */
@@ -46,7 +47,8 @@ export interface IConnectOptions {
 export interface IMproxyOptions {
     /** --- 秒数 --- */
     'timeout'?: number;
-    'hosts'?: Record<string, string>;
+    /** --- 自定义 host 映射，如 {'www.maiyun.net': '127.0.0.1'}，或全部映射到一个 host --- */
+    'hosts'?: Record<string, string> | string;
     'local'?: string;
     'headers'?: lNet.THttpHeaders;
     /** --- 过滤 header，返回 true 则留下 --- */
@@ -60,7 +62,8 @@ export interface IMproxyOptions {
 export interface IRproxyOptions {
     /** --- 秒数 --- */
     'timeout'?: number;
-    'hosts'?: Record<string, string>;
+    /** --- 自定义 host 映射，如 {'www.maiyun.net': '127.0.0.1'}，或全部映射到一个 host --- */
+    'hosts'?: Record<string, string> | string;
     'local'?: string;
     'headers'?: lNet.THttpHeaders;
     /** --- 过滤 header，返回 true 则留下 --- */

package/lib/ws.js

@@ -92,7 +92,7 @@ export class Socket {
         const ca = puri ?
             puri.protocol === 'wss:' ? await lNet.getCa() : null :
             uri.protocol === 'wss:' ? await lNet.getCa() : null;
-        if (!ca && hosts[uri.hostname]) {
+        if (!ca && (typeof hosts === 'string' ? hosts : hosts[uri.hostname])) {
             // --- 没有 ca，但是要设置 额外的 host ---
             headers['host'] = uri.hostname + (uri.port ? ':' + uri.port : '');
         }
@@ -106,7 +106,7 @@ export class Socket {
             }) : uri.path;
             const cli = ca ?
                 await liws.wssConnect({
-                    'hostname': hosts[host] ?? host,
+                    'hostname': (typeof hosts === 'string' ? hosts : hosts[host]) || host,
                     'port': port,
                     'path': path,
                     'servername': host,
@@ -117,7 +117,7 @@ export class Socket {
                     'ca': ca
                 }) :
                 await liws.wsConnect({
-                    'hostname': hosts[host] ?? host,
+                    'hostname': (typeof hosts === 'string' ? hosts : hosts[host]) || host,
                     'port': port,
                     'path': path,
                     'headers': headers,
@@ -366,10 +366,13 @@ export async function mproxy(ctr, auth, opt = {}) {
         return -1;
     }
     opt.headers ??= {};
-    Object.assign(lNet.filterProxyHeaders(req.headers, undefined, opt.filter), opt.headers);
+    const headers = Object.assign(lNet.filterHeaders(req.headers, undefined, opt.filter), opt.headers);
     // --- 发起请求 ---
     /** --- 远程端的双向 socket --- */
-    const rsocket = await connect(get['url'], opt);
+    const rsocket = await connect(get['url'], {
+        ...opt,
+        headers
+    });
     if (!rsocket) {
         return -2;
     }
@@ -387,10 +390,13 @@ export async function rproxy(ctr, url, opt = {}) {
     /** --- 请求端产生的双向 socket --- */
     const socket = ctr.getPrototype('_socket');
     opt.headers ??= {};
-    Object.assign(lNet.filterProxyHeaders(req.headers, undefined, opt.filter), opt.headers);
+    const headers = Object.assign(lNet.filterHeaders(req.headers, undefined, opt.filter), opt.headers);
     // --- 发起请求 ---
     /** --- 远程端的双向 socket --- */
-    const rsocket = await connect(url, opt);
+    const rsocket = await connect(url, {
+        ...opt,
+        headers
+    });
     if (!rsocket) {
         return false;
     }

package/package.json

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

@@ -203,6 +203,8 @@ async function requestHandler(req, res, https) {
     timer.timer = setTimeout(timer.callback, timer.timeout);
     // --- 设置服务器名版本 ---
     res.setHeader('Server', 'Kebab/' + kebab.VER);
+    res.setHeader('expires', 'Mon, 26 Jul 1994 05:00:00 GMT');
+    res.setHeader('cache-control', 'no-store');
     // --- 当前 uri ---
     let host = req.headers[':authority'];
     if (host === undefined || typeof host !== 'string') {

package/sys/ctr.d.ts

@@ -128,8 +128,8 @@ export declare class Ctr {
      * --- WebSocket 下连接被终止后会自动被调用的事件，可重写此方法 ---
      */
     onClose(): void | Promise<void>;
-    /** --- 请求发送开始时调用，返回 false 则框架不会自动获取任何 post 内容（仅会在 middle 内触发） --- */
-    onReqStart(): boolean | Promise<boolean>;
+    /** --- 请求发送开始时调用，返回 -1-流程中断，一般用于代理/反代,0-框架不会自动处理 post,1-自动处理(默认)（仅会在 middle 内触发） --- */
+    onReqStart(): number | Promise<number>;
     /**
      * --- 获取截止当前时间的总运行时间 ---
      * @param ms 为 true 为毫秒，否则为秒

package/sys/ctr.js

@@ -169,9 +169,9 @@ export class Ctr {
     onClose() {
         return;
     }
-    /** --- 请求发送开始时调用，返回 false 则框架不会自动获取任何 post 内容（仅会在 middle 内触发） --- */
+    /** --- 请求发送开始时调用，返回 -1-流程中断，一般用于代理/反代,0-框架不会自动处理 post,1-自动处理(默认)（仅会在 middle 内触发） --- */
     onReqStart() {
-        return true;
+        return 1;
     }
     /**
      * --- 获取截止当前时间的总运行时间 ---

package/sys/route.js

@@ -31,15 +31,6 @@ export function clearKebabConfigs() {
  * @param data 传导的数据
  */
 export async function run(data) {
-    // --- 检测 path 是否是静态文件 ---
-    if (/^(stc\/.*|favicon.\w+?\??.*|apple[\w-]+?\.png\??.*|[\w-]+?\.txt\??.*|[\w-]+?\.html\??.*)/.test(data.path)) {
-        return false;
-    }
-    // --- 根据 res 还是 socket 进行初始化设置 ---
-    if (data.res) {
-        data.res.setHeader('expires', 'Mon, 26 Jul 1994 05:00:00 GMT');
-        data.res.setHeader('cache-control', 'no-store');
-    }
     // --- 判断 kebab config 是否已经读取过 ---
     if (!kebabConfigs[data.rootPath + 'kebab.json']) {
         const configContent = await lFs.getContent(data.rootPath + 'kebab.json', 'utf8');
@@ -80,6 +71,7 @@ export async function run(data) {
     // --- 加载 kebab config ---
     const config = {};
     const configData = kebabConfigs[data.rootPath + 'kebab.json'];
+    // --- 合并 configData 到 config ---
     for (const name in configData) {
         config[name] = configData[name];
     }
@@ -123,9 +115,11 @@ export async function run(data) {
     if (path === '') {
         path = '@';
     }
+    /** --- 不做语言跳转、不进入动态处理流程的路径 --- */
+    const stcPaths = /^(stc\/.*|favicon.\w+?\??.*|apple[\w-]+?\.png\??.*|[\w-]+?\.txt\??.*|[\w-]+?\.html\??.*)/;
     // --- 检测是否托管语言页面 ---
     const param = [];
-    if (config.lang && data.res) {
+    if (config.lang && data.res && !stcPaths.test(path)) {
         // --- 仅仅 res 模式支持 config.lang ---
         if (path[2] !== '/') {
             // --- 不管是首页还是 @ 页，都会到此处（已经有语言目录不会到这里） ---
@@ -375,9 +369,19 @@ export async function run(data) {
     middle.setPrototype('_action', pathRight);
     middle.setPrototype('_headers', headers);
     middle.setPrototype('_get', get);
-    /** --- 是否让框架自动获取 post，true 为自动（默认） --- */
+    /** --- 是否让框架自动获取 post，1 为自动（默认） --- */
     const reqStartRtn = await middle.onReqStart();
-    if (reqStartRtn) {
+    if (reqStartRtn === -1) {
+        // --- 代理/反代了，什么也不管 ---
+        return true;
+    }
+    // --- 检测 path 是否是静态文件 ---
+    // --- 只能在这里做，因为 onReqStart 里面可能有反代，反代不能让 stc 等路径直连 ---
+    // --- 也得同时给反代走，所以 onReqStart 之后才能走到这一步判断 ---
+    if (stcPaths.test(data.path)) {
+        return false;
+    }
+    if (reqStartRtn === 1) {
         const rawPost = await getPost(data.req);
         // --- 原始 POST ---
         middle.setPrototype('_rawPost', rawPost.raw);

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

@@ -1,7 +1,7 @@
 import * as kebab from '#kebab/index.js';
 import * as sCtr from '#kebab/sys/ctr.js';
 export default class extends sCtr.Ctr {
-    onReqStart(): boolean;
+    onReqStart(): Promise<number>;
     onLoad(): string | boolean;
     onUnload(rtn: string | boolean | kebab.DbValue[]): string | boolean | kebab.DbValue[];
 }

package/www/example/ctr/middle.js

@@ -1,13 +1,16 @@
+import * as lNet from '#kebab/lib/net.js';
 import * as sCtr from '#kebab/sys/ctr.js';
 export default class extends sCtr.Ctr {
-    onReqStart() {
-        if (this._config.const.path === 'test/net-mproxy1') {
-            return false;
+    async onReqStart() {
+        if (await lNet.rproxy(this, {
+            'test/net-rproxy/': 'https://cdn.jsdelivr.net/npm/deskrt@2.0.10/'
+        })) {
+            return -1;
         }
-        if (this._config.const.path.startsWith('test/net-rproxy/')) {
-            return false;
+        if (this._config.const.path === 'test/net-mproxy1') {
+            return 0;
         }
-        return true;
+        return 1;
     }
     onLoad() {
         if (this._config.const.path !== 'test/middle') {

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

@@ -68,9 +68,9 @@ export default class extends sCtr.Ctr {
     netReuse(): Promise<string>;
     netError(): Promise<string>;
     netHosts(): Promise<string>;
-    netRproxy(): Promise<string | boolean>;
     netMproxy(): Promise<string | boolean>;
     netMproxy1(): Promise<string | boolean>;
+    netFilterheaders(): string;
     scan(): Promise<kebab.Json>;
     scan1(): Promise<kebab.Json>;
     scan2(): Promise<kebab.Json>;

package/www/example/ctr/test.js

@@ -46,7 +46,6 @@ export default class extends sCtr.Ctr {
         return true;
     }
     onReady() {
-        lCore.display('onReady');
         return true;
     }
     onUnload(rtn) {
@@ -160,6 +159,7 @@ export default class extends sCtr.Ctr {
             `<br><a href="${this._config.const.urlBase}test/net-hosts">View "test/net-hosts"</a>`,
             `<br><a href="${this._config.const.urlBase}test/net-rproxy/dist/core.js">View "test/net-rproxy/dist/core.js"</a> <a href="${this._config.const.urlBase}test/net-rproxy/package.json">View "package.json"</a>`,
             `<br><a href="${this._config.const.urlBase}test/net-mproxy">View "test/net-mproxy"</a>`,
+            `<br><a href="${this._config.const.urlBase}test/net-filterheaders">View "test/net-filterheaders"</a>`,
             '<br><br><b>Scan:</b>',
             `<br><br><a href="${this._config.const.urlBase}test/scan?s=db">View "test/scan?s=db"</a>`,
             `<br><a href="${this._config.const.urlBase}test/scan?s=kv">View "test/scan?s=kv"</a>`,
@@ -1775,14 +1775,6 @@ content: <pre>${lText.htmlescape((await res.getContent())?.toString() ?? '')}</p
 error: <pre>${JSON.stringify(res.error, null, 4)}</pre>`);
         return echo.join('') + this._getEnd();
     }
-    async netRproxy() {
-        if (await lNet.rproxy(this, {
-            'test/net-rproxy/': 'https://cdn.jsdelivr.net/npm/deskrt@2.0.10/'
-        })) {
-            return false;
-        }
-        return 'Nothing';
-    }
     async netMproxy() {
         const echo = [];
         const res = await lNet.get('https://cdn.jsdelivr.net/npm/deskrt@2.0.10/package.json', {
@@ -1813,6 +1805,40 @@ error: <pre>${JSON.stringify(res.error, null, 4)}</pre>`);
         }
         return 'Nothing(' + rtn + ')';
     }
+    netFilterheaders() {
+        const echo = [];
+        const headers = {
+            'host': 'www.maiyun.net',
+            'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/180.0.0.0 Safari/537.36',
+            'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
+            'accept-encoding': 'gzip, deflate',
+            'accept-language': 'zh-CN,zh;q=0.9,en;q=0.8',
+            'cache-control': 'no-cache',
+            'cdn-loop': 'TencentEdgeOne; loops=2',
+            'eo-connecting-ip': 'xx:xx:xx:xx:xx',
+            'eo-log-uuid': '102780998859203995',
+            'pragma': 'no-cache',
+            'priority': 'u=0, i',
+            'sec-ch-ua': '"Chromium";v="140", "Not=A?Brand";v="24", "Google Chrome";v="180"',
+            'sec-ch-ua-mobile': '?0',
+            'sec-ch-ua-platform': '"Windows"',
+            'sec-fetch-dest': 'document',
+            'sec-fetch-mode': 'navigate',
+            'sec-fetch-site': 'none',
+            'sec-fetch-user': '?1',
+            'upgrade-insecure-requests': '1',
+            'x-forwarded-for': '127.1.2.3',
+            'x-forwarded-host': 'www.maiyun.net',
+            'x-forwarded-proto': 'http',
+            'authorization': ''
+        };
+        echo.push(`origin:<pre>${JSON.stringify(headers, null, 4)}</pre>`);
+        const filtered = lNet.filterHeaders(headers, undefined, h => {
+            return !['x-', 'eo-'].some(i => h.startsWith(i));
+        });
+        echo.push(`const filtered = lNet.filterHeaders(headers);<pre>${JSON.stringify(filtered, null, 4)}</pre>`);
+        return echo.join('') + this._getEnd();
+    }
     async scan() {
         const link = await this._scanLink();
         if (!link) {