@maiyunnet/kebab 3.1.18 → 3.1.19

package/index.d.ts

@@ -5,7 +5,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "3.1.18";
+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.18';
+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

@@ -366,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);
@@ -387,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.18",
+  "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": [