@maiyunnet/kebab 3.1.17 → 3.1.19

package/index.d.ts

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

package/index.js

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

package/lib/net.d.ts

@@ -74,11 +74,12 @@ export declare function resetCookieSession(cookie: Record<string, ICookie>): voi
  */
 export declare function getFormData(): fd.FormData;
 /**
- * --- 剔除不代理的 header ---
+ * --- 剔除不代理的 header，返回新的 header ---
  * @param headers 剔除前的 header
  * @param res 直接设置头部而不返回，可置空
+ * @param filter 返回 true 则留下
  */
-export declare function filterProxyHeaders(headers: http.IncomingHttpHeaders | http2.IncomingHttpHeaders | THttpHeaders, res?: http2.Http2ServerResponse | http.ServerResponse): Record<string, string | string[]>;
+export declare function filterProxyHeaders(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 ---
@@ -129,6 +130,8 @@ export interface IMproxyOptions {
     'hosts'?: Record<string, string>;
     'local'?: string;
     'headers'?: THttpHeaders;
+    /** --- 过滤 header，返回 true 则留下 --- */
+    filter?: (h: string) => boolean;
     /** --- 默认为 default --- */
     'reuse'?: string;
 }
@@ -140,6 +143,8 @@ export interface IRproxyOptions {
     'hosts'?: Record<string, string>;
     'local'?: string;
     'headers'?: THttpHeaders;
+    /** --- 过滤 header，返回 true 则留下 --- */
+    filter?: (h: string) => boolean;
     /** --- 正向 mproxy 代理，url 如 https://xxx/abc --- */
     'mproxy'?: {
         'url': string;

package/lib/net.js

@@ -434,11 +434,12 @@ const proxyContinueHeaders = [
     'transfer-encoding'
 ];
 /**
- * --- 剔除不代理的 header ---
+ * --- 剔除不代理的 header，返回新的 header ---
  * @param headers 剔除前的 header
  * @param res 直接设置头部而不返回，可置空
+ * @param filter 返回 true 则留下
  */
-export function filterProxyHeaders(headers, res) {
+export function filterProxyHeaders(headers, res, filter) {
     const heads = {};
     for (const h in headers) {
         if (proxyContinueHeaders.includes(h)) {
@@ -451,6 +452,9 @@ export function filterProxyHeaders(headers, res) {
         if (v === undefined) {
             continue;
         }
+        if (filter && !filter(h)) {
+            continue;
+        }
         if (res) {
             res.setHeader(h, v);
             continue;
@@ -482,14 +486,14 @@ export async function mproxy(ctr, auth, opt = {}) {
     }
     opt.method = req.method ?? 'GET';
     opt.headers ??= {};
-    Object.assign(opt.headers, filterProxyHeaders(req.headers));
+    Object.assign(filterProxyHeaders(req.headers, undefined, opt.filter), opt.headers);
     // --- 发起请求 ---
     const rres = await request(get['url'], req, opt);
     if (rres.error) {
         return -2;
     }
     if (rres.headers) {
-        filterProxyHeaders(rres.headers, res);
+        filterProxyHeaders(rres.headers, res, opt.filter);
     }
     res.writeHead(rres.headers?.['http-code'] ?? 200);
     await new Promise((resolve) => {
@@ -539,14 +543,14 @@ export async function rproxy(ctr, route, opt = {}) {
         const lpath = path.slice(key.length);
         opt.method = req.method ?? 'GET';
         opt.headers ??= {};
-        Object.assign(opt.headers, filterProxyHeaders(req.headers));
+        Object.assign(filterProxyHeaders(req.headers, undefined, opt.filter), opt.headers);
         // --- 发起请求 ---
         const rres = await request(route[key] + lpath, req, opt);
         if (rres.error) {
             return false;
         }
         if (rres.headers) {
-            filterProxyHeaders(rres.headers, res);
+            filterProxyHeaders(rres.headers, res, opt.filter);
         }
         res.writeHead(rres.headers?.['http-code'] ?? 200);
         await new Promise((resolve) => {

package/lib/ws.d.ts

@@ -49,6 +49,8 @@ export interface IMproxyOptions {
     'hosts'?: Record<string, string>;
     'local'?: string;
     'headers'?: lNet.THttpHeaders;
+    /** --- 过滤 header，返回 true 则留下 --- */
+    filter?: (h: string) => boolean;
     /** --- 小帧模式，默认 false --- */
     'mode'?: EFrameReceiveMode;
     /** --- 加密模式，默认 true --- */
@@ -61,6 +63,8 @@ export interface IRproxyOptions {
     'hosts'?: Record<string, string>;
     'local'?: string;
     'headers'?: lNet.THttpHeaders;
+    /** --- 过滤 header，返回 true 则留下 --- */
+    filter?: (h: string) => boolean;
     /** --- 小帧模式，默认 false --- */
     'mode'?: EFrameReceiveMode;
     /** --- 加密模式，默认 true --- */

package/lib/ws.js

@@ -283,6 +283,10 @@ function bindPipe(s1, s2) {
             switch (msg.opcode) {
                 case EOpcode.TEXT:
                 case EOpcode.BINARY: {
+                    if (typeof msg.data === 'string') {
+                        s2.writeText(msg.data);
+                        break;
+                    }
                     s2.writeBinary(msg.buffer);
                     break;
                 }
@@ -312,6 +316,10 @@ function bindPipe(s1, s2) {
             switch (msg.opcode) {
                 case EOpcode.TEXT:
                 case EOpcode.BINARY: {
+                    if (typeof msg.data === 'string') {
+                        s1.writeText(msg.data);
+                        break;
+                    }
                     s1.writeBinary(msg.buffer);
                     break;
                 }
@@ -358,7 +366,7 @@ export async function mproxy(ctr, auth, opt = {}) {
         return -1;
     }
     opt.headers ??= {};
-    Object.assign(opt.headers, lNet.filterProxyHeaders(req.headers));
+    Object.assign(lNet.filterProxyHeaders(req.headers, undefined, opt.filter), opt.headers);
     // --- 发起请求 ---
     /** --- 远程端的双向 socket --- */
     const rsocket = await connect(get['url'], opt);
@@ -379,7 +387,7 @@ export async function rproxy(ctr, url, opt = {}) {
     /** --- 请求端产生的双向 socket --- */
     const socket = ctr.getPrototype('_socket');
     opt.headers ??= {};
-    Object.assign(opt.headers, lNet.filterProxyHeaders(req.headers));
+    Object.assign(lNet.filterProxyHeaders(req.headers, undefined, opt.filter), opt.headers);
     // --- 发起请求 ---
     /** --- 远程端的双向 socket --- */
     const rsocket = await connect(url, opt);

package/package.json

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

@@ -8,7 +8,7 @@ import * as tls from 'tls';
 import * as http from 'http';
 import * as crypto from 'crypto';
 // --- 库 ---
-import * as fs from '#kebab/lib/fs.js';
+import * as lFs from '#kebab/lib/fs.js';
 import * as lCore from '#kebab/lib/core.js';
 import * as lText from '#kebab/lib/text.js';
 import * as sCtr from '#kebab/sys/ctr.js';
@@ -214,7 +214,7 @@ async function requestHandler(req, res, https) {
     }
     const uri = lText.parseUrl(`http${https ? 's' : ''}://${host}${req.url ?? ''}`);
     /** --- 当前的 vhost 配置文件 --- */
-    const vhost = getVhostByHostname(uri.hostname ?? '');
+    const vhost = await getVhostByHostname(uri.hostname ?? '');
     if (!vhost) {
         req.socket.destroy();
         return;
@@ -227,12 +227,6 @@ async function requestHandler(req, res, https) {
         return;
         */
     }
-    const vhostRoot = vhost.root.replace(/\${example}/g, kebab.ROOT_PATH + 'www/example/');
-    /** --- 网站绝对根目录，末尾带 / --- */
-    let rootPath = lText.isRealPath(vhostRoot) ? vhostRoot : kebab.WWW_CWD + vhostRoot;
-    if (!rootPath.endsWith('/')) {
-        rootPath += '/';
-    }
     /** --- 请求的路径部分，前导带 / 末尾不一定，用户怎么请求就是什么 --- */
     let path = uri.pathname ?? '/';
     if (path !== '/') {
@@ -248,7 +242,7 @@ async function requestHandler(req, res, https) {
         if (item !== '') {
             // --- 判断 item 是文件还是文件夹 ---
             /** --- 'abc' / 'def.json' ---  */
-            let stat = await fs.stats(rootPath + now + item);
+            let stat = await lFs.stats(vhost.real + now + item);
             if (!stat) {
                 res.setHeader('content-type', 'text/html; charset=utf-8');
                 res.setHeader('content-length', 22);
@@ -259,7 +253,7 @@ async function requestHandler(req, res, https) {
             if (stat.isDirectory()) {
                 now += item + '/';
                 // --- 判断是不是动态层 ---
-                stat = await fs.stats(rootPath + now + 'kebab.json');
+                stat = await lFs.stats(vhost.real + now + 'kebab.json');
                 if (stat) {
                     // --- 动态层，交给 Route 处理器 ---
                     try {
@@ -267,7 +261,7 @@ async function requestHandler(req, res, https) {
                             'req': req,
                             'res': res,
                             'uri': uri,
-                            'rootPath': rootPath + now,
+                            'rootPath': vhost.real + now,
                             'urlBase': '/' + now,
                             'path': path.slice(('/' + pathList.slice(0, i).join('/')).length + 1),
                             'timer': timer
@@ -295,7 +289,7 @@ async function requestHandler(req, res, https) {
             }
             else {
                 // --- 文件，直接输出并结束 ---
-                await fs.readToResponse(rootPath + now + item, req, res, stat);
+                await lFs.readToResponse(vhost.real + now + item, req, res, stat);
                 return;
             }
         }
@@ -305,7 +299,7 @@ async function requestHandler(req, res, https) {
                 break;
             }
             // --- 本层是根，判断根是不是动态层 ---
-            const stat = await fs.stats(rootPath + now + 'kebab.json');
+            const stat = await lFs.stats(vhost.real + now + 'kebab.json');
             if (stat) {
                 // --- 动态层，交给 Route 处理器 ---
                 try {
@@ -313,7 +307,7 @@ async function requestHandler(req, res, https) {
                         'req': req,
                         'res': res,
                         'uri': uri,
-                        'rootPath': rootPath + now,
+                        'rootPath': vhost.real + now,
                         'urlBase': '/' + now,
                         'path': path.slice(1),
                         'timer': timer
@@ -335,9 +329,9 @@ async function requestHandler(req, res, https) {
     // --- 最后一层是目录，且不是动态层，判断有没有主页，有则输出，没有则 403 出错 ---
     const indexFiles = ['index.html', 'index.htm'];
     for (const indexFile of indexFiles) {
-        const stat = await fs.isFile(rootPath + now + indexFile);
+        const stat = await lFs.isFile(vhost.real + now + indexFile);
         if (stat) {
-            await fs.readToResponse(rootPath + now + indexFile, req, res, stat);
+            await lFs.readToResponse(vhost.real + now + indexFile, req, res, stat);
             return;
         }
     }
@@ -357,17 +351,11 @@ async function upgradeHandler(req, socket, https) {
     // --- 当前 uri ---
     const uri = lText.parseUrl(`ws${https ? 's' : ''}://${req.headers['host'] ?? ''}${req.url ?? ''}`);
     /** --- 当前的 vhost 配置文件 --- */
-    const vhost = getVhostByHostname(uri.hostname ?? '');
+    const vhost = await getVhostByHostname(uri.hostname ?? '');
     if (!vhost) {
         socket.destroy();
         return;
     }
-    const vhostRoot = vhost.root.replace(/\${example}/g, kebab.ROOT_PATH + 'www/example/');
-    /** --- 网站绝对根目录，末尾带 / --- */
-    let rootPath = lText.isRealPath(vhostRoot) ? vhostRoot : kebab.WWW_CWD + vhostRoot;
-    if (!rootPath.endsWith('/')) {
-        rootPath += '/';
-    }
     /** --- 请求的路径部分，前导带 / 末尾不一定，用户怎么请求就是什么 --- */
     let path = uri.pathname ?? '/';
     if (path !== '/') {
@@ -383,7 +371,7 @@ async function upgradeHandler(req, socket, https) {
         if (item !== '') {
             // --- 判断 item 是文件还是文件夹 ---
             /** --- 'abc' / 'def.json' ---  */
-            let stat = await fs.stats(rootPath + now + item);
+            let stat = await lFs.stats(vhost.real + now + item);
             if (!stat) {
                 socket.destroy();
                 return;
@@ -391,14 +379,14 @@ async function upgradeHandler(req, socket, https) {
             if (stat.isDirectory()) {
                 now += item + '/';
                 // --- 判断是不是动态层 ---
-                stat = await fs.stats(rootPath + now + 'kebab.json');
+                stat = await lFs.stats(vhost.real + now + 'kebab.json');
                 if (stat) {
                     // --- 动态层，交给 Route 处理器 ---
                     if (await sRoute.run({
                         'req': req,
                         'socket': socket,
                         'uri': uri,
-                        'rootPath': rootPath + now,
+                        'rootPath': vhost.real + now,
                         'urlBase': '/' + now,
                         'path': path.slice(('/' + pathList.slice(0, i).join('/')).length + 1)
                     })) {
@@ -418,14 +406,14 @@ async function upgradeHandler(req, socket, https) {
                 break;
             }
             // --- 判断根是不是动态层 ---
-            const stat = await fs.stats(rootPath + now + 'kebab.json');
+            const stat = await lFs.stats(vhost.real + now + 'kebab.json');
             if (stat) {
                 // --- 动态层，交给 Route 处理器 ---
                 if (await sRoute.run({
                     'req': req,
                     'socket': socket,
                     'uri': uri,
-                    'rootPath': rootPath + now,
+                    'rootPath': vhost.real + now,
                     'urlBase': '/' + now,
                     'path': path.slice(1)
                 })) {
@@ -442,7 +430,7 @@ async function upgradeHandler(req, socket, https) {
  */
 async function reload() {
     // --- 清除全局 config，并重新加载全局信息 ---
-    const configContent = await fs.getContent(kebab.CONF_CWD + 'config.json', 'utf8');
+    const configContent = await lFs.getContent(kebab.CONF_CWD + 'config.json', 'utf8');
     if (!configContent) {
         throw `File '${kebab.CONF_CWD}config.json' not found.`;
     }
@@ -454,13 +442,13 @@ async function reload() {
         lCore.globalConfig[key] = config[key];
     }
     // --- 重新加载 VHOST 信息（/conf/vhost/） ---
-    const files = await fs.readDir(kebab.VHOST_CWD);
+    const files = await lFs.readDir(kebab.VHOST_CWD);
     vhosts = [];
     for (const file of files) {
         if (!file.name.endsWith('.json')) {
             continue;
         }
-        const fstr = await fs.getContent(kebab.VHOST_CWD + file.name, 'utf8');
+        const fstr = await lFs.getContent(kebab.VHOST_CWD + file.name, 'utf8');
         if (!fstr) {
             continue;
         }
@@ -485,12 +473,12 @@ async function reloadCert() {
     certLastLoad = Date.now();
     const cl = [];
     try {
-        const certConfig = await fs.getContent(kebab.CONF_CWD + 'cert.json', 'utf8');
+        const certConfig = await lFs.getContent(kebab.CONF_CWD + 'cert.json', 'utf8');
         if (certConfig) {
             const certs = lText.parseJson(certConfig);
             for (const item of certs) {
-                const key = await fs.getContent(lText.isRealPath(item.key) ? item.key : kebab.CERT_CWD + item.key, 'utf8');
-                const cert = await fs.getContent(lText.isRealPath(item.cert) ? item.cert : kebab.CERT_CWD + item.cert, 'utf8');
+                const key = await lFs.getContent(lText.isRealPath(item.key) ? item.key : kebab.CERT_CWD + item.key, 'utf8');
+                const cert = await lFs.getContent(lText.isRealPath(item.cert) ? item.cert : kebab.CERT_CWD + item.cert, 'utf8');
                 if (!cert || !key) {
                     continue;
                 }
@@ -571,37 +559,62 @@ process.on('message', function (msg) {
         lCore.log({}, '[CHILD][process][message] ' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
     });
 });
+/**
+ * --- 获取 vhost 的真实路径 ---
+ * --- 替换 ${example} 为实际路径 ---
+ * --- 如果不是真实路径，添加 WWW_CWD 前缀 ---
+ * --- 确保路径以 / 结尾 ---
+ */
+function getVhostReal(root) {
+    let real = root.replace(/\${example}/g, kebab.ROOT_PATH + 'www/example/');
+    real = lText.isRealPath(real) ? real : kebab.WWW_CWD + real;
+    return real.endsWith('/') ? real : real + '/';
+}
 /**
  * --- 获取匹配的 vhost 对象 ---
  * --- 如果有精准匹配，以精准匹配为准，否则为通配符匹配（vSub），最后全局泛匹配（vGlobal） ---
  * @param hostname 当前的 hostname，不带端口
  */
-function getVhostByHostname(hostname) {
-    let vGlobal, vSub;
+async function getVhostByHostname(hostname) {
+    let vGlobal;
+    let vGlobalReal = '';
+    let vSub;
+    let vSubReal = '';
     for (const vhost of vhosts) {
         for (let domain of vhost.domains) {
             if (domain === '*') {
                 // --- 全局泛匹配 ---
-                vGlobal = vhost;
+                const real = getVhostReal(vhost.root);
+                if (await lFs.isDir(real)) {
+                    vGlobal = vhost;
+                    vGlobalReal = real;
+                }
             }
             else if (domain.includes('*')) {
                 // --- 通配符匹配 ---
                 domain = domain.replace(/\./g, '\\.').replace(/\*/g, '[\\w-]+?');
                 if (new RegExp(`^${domain}$`).test(hostname)) {
-                    vSub = vhost;
+                    const real = getVhostReal(vhost.root);
+                    if (await lFs.isDir(real)) {
+                        vSub = vhost;
+                        vSubReal = real;
+                    }
                 }
             }
             else if (domain === hostname) {
                 // --- 完全匹配 ---
-                return vhost;
+                const real = getVhostReal(vhost.root);
+                if (await lFs.isDir(real)) {
+                    return { ...vhost, real };
+                }
             }
         }
     }
     if (vSub) {
-        return vSub;
+        return { ...vSub, 'real': vSubReal };
     }
     if (vGlobal) {
-        return vGlobal;
+        return { ...vGlobal, 'real': vGlobalReal };
     }
     return null;
 }

package/sys/ctr.d.ts

@@ -115,11 +115,11 @@ export declare class Ctr {
      */
     onData(data: Buffer | string, opcode: lWs.EOpcode): kebab.Json;
     /**
-     * --- 包含所有 opcode 的消息，若要发送数据需自行调用 write 方法，返回 false 则不会执行默认方法 ---
+     * --- 包含所有 opcode 的消息，若要发送数据需自行调用 write 方法，data 恒定为原始 buffer，返回 false 则不会执行默认方法 ---
      * @param data 数据
      * @param opcode opcode
      */
-    onMessage(data: Buffer | string, opcode: lWs.EOpcode): undefined | boolean | Promise<undefined | boolean>;
+    onMessage(data: Buffer, opcode: lWs.EOpcode): undefined | boolean | Promise<undefined | boolean>;
     /**
      * --- WebSocket 下连接恢复可写入状态后会调用此事件，可重写此方法 ---
      */

package/sys/route.js

@@ -274,7 +274,7 @@ export async function run(data) {
                     wsSocket.on('message', async function (msg) {
                         switch (msg.opcode) {
                             case ws.EOpcode.CLOSE: {
-                                const r = await cctr['onMessage'](msg.data, msg.opcode);
+                                const r = await cctr['onMessage'](msg.buffer, msg.opcode);
                                 if (r === false) {
                                     break;
                                 }
@@ -282,7 +282,7 @@ export async function run(data) {
                                 break;
                             }
                             case ws.EOpcode.PING: {
-                                const r = await cctr['onMessage'](msg.data, msg.opcode);
+                                const r = await cctr['onMessage'](msg.buffer, msg.opcode);
                                 if (r === false) {
                                     break;
                                 }
@@ -292,7 +292,7 @@ export async function run(data) {
                             case ws.EOpcode.BINARY:
                             case ws.EOpcode.TEXT: {
                                 try {
-                                    const r = await cctr['onMessage'](msg.data, msg.opcode);
+                                    const r = await cctr['onMessage'](msg.buffer, msg.opcode);
                                     if (r === false) {
                                         break;
                                     }