@maiyunnet/kebab 3.2.25 → 3.2.27

package/index.d.ts

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

package/index.js

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

package/lib/net.d.ts

@@ -47,6 +47,19 @@ export declare function postJson(u: string, data: kebab.Json[] | Record<string,
  * @returns JSON 数据，失败时返回 null
  */
 export declare function postJsonResponseJson(u: string, data: kebab.Json[] | Record<string, kebab.Json>, opt?: IRequestOptions): Promise<any | null>;
+/**
+ * --- 发起一个原生 fetch 请求，增加了一些框架选项，注意：会抛出错误 ---
+ * @param input 请求的 URL 或 Request 对象
+ * @param init 增加 mproxy
+ */
+export declare function fetch(input: string | URL | Request, init?: RequestInit & {
+    /** --- 正向 mproxy 代理，url 如 https://xxx/abc --- */
+    'mproxy'?: {
+        'url': string;
+        'auth': string;
+        'data'?: any;
+    };
+}): Promise<Response>;
 /**
  * --- 发起一个请求 ---
  * @param opt 配置项

package/lib/net.js

@@ -88,6 +88,29 @@ export async function postJsonResponseJson(u, data, opt = {}) {
     }
     return json;
 }
+/**
+ * --- 发起一个原生 fetch 请求，增加了一些框架选项，注意：会抛出错误 ---
+ * @param input 请求的 URL 或 Request 对象
+ * @param init 增加 mproxy
+ */
+export function fetch(input, init = {}) {
+    const u = (input instanceof Request) ?
+        input.url :
+        input instanceof URL ? input.toString() : input;
+    const uri = lText.parseUrl(u);
+    /** --- 正向代理的地址 --- */
+    const puri = init.mproxy ? lText.parseUrl(init.mproxy.url) : null;
+    /** --- 定义请求 host --- */
+    const hostname = (puri ? puri.hostname : uri.hostname) ?? '';
+    if (!hostname) {
+        throw new Error('Kebab TypeError: Hostname is empty');
+    }
+    return global.fetch(init.mproxy ? init.mproxy.url + (init.mproxy.url.includes('?') ? '&' : '?') + lText.queryStringify({
+        'url': u,
+        'auth': init.mproxy.auth,
+        'data': init.mproxy.data ? lText.stringifyJson(init.mproxy.data) : '{}',
+    }) : u, init);
+}
 /**
  * --- 发起一个请求 ---
  * @param opt 配置项
@@ -149,19 +172,19 @@ export async function request(u, data, opt = {}) {
     // --- 发起请求 ---
     let req;
     try {
-        // --- 重定义 IP ---
-        const host = (puri ? puri.hostname : uri.hostname) ?? '';
-        if (!host) {
+        /** --- 定义请求 host --- */
+        const hostname = (puri ? puri.hostname : uri.hostname) ?? '';
+        if (!hostname) {
             const res = new lResponse.Response(null);
             res.error = {
                 'name': 'Possible mProxy error',
-                'message': 'host not found',
+                'message': 'hostname not found',
             };
             return res;
         }
         if (typeof hosts === 'string' ?
             !hosts :
-            (hosts[host] !== undefined && !hosts[host])) {
+            (hosts[hostname] !== undefined && !hosts[hostname])) {
             const res = new lResponse.Response(null);
             res.error = {
                 'name': 'hosts error',
@@ -185,7 +208,7 @@ export async function request(u, data, opt = {}) {
             'localAddress': local,
             'ca': ca,
             'connectionOptions': {
-                'remoteHost': typeof hosts === 'string' ? hosts : hosts[host],
+                'remoteHost': typeof hosts === 'string' ? hosts : hosts[hostname],
             },
         });
     }

package/lib/ws.d.ts

@@ -81,7 +81,7 @@ export interface IRproxyOptions {
 export declare class Socket {
     /** --- 当前的 ws 对象 --- */
     private _ws;
-    constructor(request?: http.IncomingMessage, socket?: net.Socket, options?: {
+    constructor(request?: http.IncomingMessage, socket?: net.Socket, head?: Buffer, options?: {
         'headers'?: http.OutgoingHttpHeaders;
         'timeout'?: number;
     });
@@ -142,7 +142,7 @@ export declare function connect(u: string, opt?: IConnectOptions): Promise<Socke
  * @param request Http 请求端
  * @param socket 响应双向 socket
  */
-export declare function createServer(request: http.IncomingMessage, socket: net.Socket, options?: {
+export declare function createServer(request: http.IncomingMessage, socket: net.Socket, head?: Buffer, options?: {
     'headers'?: http.OutgoingHttpHeaders;
     'timeout'?: number;
 }): Socket;

package/lib/ws.js

@@ -24,7 +24,7 @@ const liwsServer = liws.createServer({
     'frameReceiveMode': EFrameReceiveMode.SIMPLE,
 });
 export class Socket {
-    constructor(request, socket, options = {}) {
+    constructor(request, socket, head, options = {}) {
         /** --- 还未开启监听时来的数据将存在这里 --- */
         this._waitMsg = [];
         /** --- 还未开启 error 监听时产生的 error 错误对象 --- */
@@ -62,6 +62,7 @@ export class Socket {
             'socket': socket,
             'headers': options.headers,
             'timeout': options.timeout,
+            'clientEarlyDataPayload': head,
         });
         this._bindEvent();
     }
@@ -279,8 +280,8 @@ export function connect(u, opt = {}) {
  * @param request Http 请求端
  * @param socket 响应双向 socket
  */
-export function createServer(request, socket, options = {}) {
-    return new Socket(request, socket, options);
+export function createServer(request, socket, head, options = {}) {
+    return new Socket(request, socket, head, options);
 }
 /**
  * --- 绑定 socket 管道 ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "3.2.25",
+  "version": "3.2.27",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [
@@ -19,26 +19,26 @@
     "#kebab/*": "./*"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.917.0",
-    "@aws-sdk/lib-storage": "^3.917.0",
+    "@aws-sdk/client-s3": "^3.922.0",
+    "@aws-sdk/lib-storage": "^3.922.0",
     "@litert/http-client": "^1.1.2",
     "@litert/mime": "^0.1.3",
     "@litert/redis": "^3.0.5",
     "@litert/websocket": "^0.2.7",
     "@types/ssh2": "^1.15.5",
-    "@zilliz/milvus2-sdk-node": "^2.6.2",
+    "@zilliz/milvus2-sdk-node": "^2.6.3",
     "ejs": "^3.1.10",
     "jszip": "^3.10.1",
     "mysql2": "^3.15.3",
     "openai": "^6.7.0",
     "ssh2": "^1.17.0",
     "svg-captcha": "^1.4.0",
-    "tencentcloud-sdk-nodejs": "^4.1.135"
+    "tencentcloud-sdk-nodejs": "^4.1.136"
   },
   "devDependencies": {
     "@litert/eslint-plugin-rules": "^0.3.1",
     "@types/ejs": "^3.1.5",
-    "@types/node": "^24.9.1",
+    "@types/node": "^24.9.2",
     "tsc-alias": "^1.8.16",
     "typescript": "^5.9.3"
   }

package/sys/child.js

@@ -113,7 +113,7 @@ async function run() {
         });
     }).on('tlsClientError', (err, socket) => {
         socket.destroy();
-    }).on('upgrade', function (req, socket) {
+    }).on('upgrade', function (req, socket, head) {
         const host = (req.headers['host'] ?? '');
         if (!host) {
             socket.destroy();
@@ -125,7 +125,7 @@ async function run() {
                 linkCount[key] = 0;
             }
             ++linkCount[key];
-            await upgradeHandler(req, socket, true);
+            await upgradeHandler(req, socket, true, head);
             --linkCount[key];
             if (!linkCount[key]) {
                 delete linkCount[key];
@@ -164,7 +164,7 @@ async function run() {
                 delete linkCount[key];
             }
         });
-    }).on('upgrade', function (req, socket) {
+    }).on('upgrade', function (req, socket, head) {
         const host = (req.headers['host'] ?? '');
         if (!host) {
             socket.destroy();
@@ -176,7 +176,7 @@ async function run() {
                 linkCount[key] = 0;
             }
             ++linkCount[key];
-            await upgradeHandler(req, socket, false);
+            await upgradeHandler(req, socket, false, head);
             --linkCount[key];
             if (!linkCount[key]) {
                 delete linkCount[key];
@@ -373,8 +373,9 @@ async function requestHandler(req, res, https) {
  * @param req 请求对象
  * @param socket socket 对象
  * @param https 是否是 https
+ * @param head head 数据
  */
-async function upgradeHandler(req, socket, https) {
+async function upgradeHandler(req, socket, https, head) {
     socket.removeAllListeners('error');
     // --- 当前 uri ---
     const uri = lText.parseUrl(`ws${https ? 's' : ''}://${req.headers['host'] ?? ''}${req.url ?? ''}`);
@@ -413,10 +414,11 @@ async function upgradeHandler(req, socket, https) {
                     if (await sRoute.run({
                         'req': req,
                         'socket': socket,
+                        'head': head,
                         'uri': uri,
                         'rootPath': vhost.real + now,
                         'urlBase': '/' + now,
-                        'path': path.slice(('/' + pathList.slice(0, i).join('/')).length + 1)
+                        'path': path.slice(('/' + pathList.slice(0, i).join('/')).length + 1),
                     })) {
                         return;
                     }
@@ -440,6 +442,7 @@ async function upgradeHandler(req, socket, https) {
                 if (await sRoute.run({
                     'req': req,
                     'socket': socket,
+                    'head': head,
                     'uri': uri,
                     'rootPath': vhost.real + now,
                     'urlBase': '/' + now,

package/sys/route.d.ts

@@ -19,7 +19,10 @@ export declare function clearKebabConfigs(): void;
 export declare function run(data: {
     'req': http2.Http2ServerRequest | http.IncomingMessage;
     'res'?: http2.Http2ServerResponse | http.ServerResponse;
+    /** --- WebSocket 连接的 socket 对象 --- */
     'socket'?: net.Socket;
+    /** --- WebSocket 的 head 数据 --- */
+    'head'?: Buffer;
     'uri': kebab.IUrlParse;
     /** --- 虚拟主机当前动态目录的绝对根目录，末尾带 / --- */
     'rootPath': string;

package/sys/route.js

@@ -239,7 +239,7 @@ export async function run(data) {
             const options = cctr.onUpgrade();
             // --- 默认无消息发送 3 分钟 ---
             options.timeout ??= 60_000 * 3;
-            wsSocket = lWs.createServer(data.req, data.socket, options);
+            wsSocket = lWs.createServer(data.req, data.socket, data.head, options);
             cctr.setPrototype('_socket', wsSocket);
         }
         catch (e) {

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

@@ -75,6 +75,8 @@ export default class extends sCtr.Ctr {
     netMproxy1(): Promise<string | boolean>;
     netMproxy2(): any[];
     netFilterheaders(): string;
+    netFetch(): Promise<string | boolean>;
+    netFetch1(): any[];
     scan(): Promise<kebab.Json>;
     scan1(): Promise<kebab.Json>;
     scan2(): Promise<kebab.Json>;

package/www/example/ctr/test.js

@@ -166,6 +166,7 @@ export default class extends sCtr.Ctr {
             `<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><a href="${this._config.const.urlBase}test/net-fetch">View "test/net-fetch"</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>`,
@@ -1888,6 +1889,68 @@ error: <pre>${JSON.stringify(res.error, null, 4)}</pre>`);
         echo.push(`const filtered = lNet.filterHeaders(headers);<pre>${JSON.stringify(filtered, null, 4)}</pre>`);
         return echo.join('') + this._getEnd();
     }
+    async netFetch() {
+        const echo = [];
+        try {
+            const res = await lNet.fetch(this._internalUrl + 'test/net-fetch1', {
+                'method': 'POST',
+                'headers': {
+                    'content-type': 'application/json',
+                },
+                'body': JSON.stringify({ 'test': '123' }),
+            });
+            echo.push(`<pre>lNet.fetch('${this._internalUrl}test/net-fetch1', {
+    'method': 'POST',
+    'headers': {
+        'content-type': 'application/json',
+    },
+    'body': JSON.stringify({ 'test': '123' }),
+});</pre>
+            headers: <pre>${JSON.stringify(Object.fromEntries(res.headers.entries()), null, 4)}</pre>
+            content: <pre>${await res.text()}</pre>`);
+        }
+        catch (e) {
+            echo.push(`error: <pre>${JSON.stringify(e)}</pre>`);
+        }
+        echo.push(`mproxy:`);
+        try {
+            const res = await lNet.fetch(this._internalUrl + 'test/net-fetch1', {
+                'method': 'POST',
+                'headers': {
+                    'content-type': 'application/json',
+                },
+                'body': JSON.stringify({ 'test': '456' }),
+                'mproxy': {
+                    'url': this._internalUrl + 'test/net-mproxy1',
+                    'auth': '123456',
+                    'data': { 'test': '789' },
+                },
+            });
+            echo.push(`<pre>lNet.fetch('${this._internalUrl}test/net-fetch1', {
+    'method': 'POST',
+    'headers': {
+        'content-type': 'application/json',
+    },
+    'body': JSON.stringify({ 'test': '123' }),
+    'mproxy': {
+        'url': this._internalUrl + 'test/net-mproxy1',
+        'auth': '123456',
+        'data': { 'test': '789' },
+    },
+});</pre>
+            headers: <pre>${JSON.stringify(Object.fromEntries(res.headers.entries()), null, 4)}</pre>
+            content: <pre>${await res.text()}</pre>`);
+        }
+        catch (e) {
+            echo.push(`error: <pre>${JSON.stringify(e)}</pre>`);
+        }
+        return echo.join('') + '<br>' + this._getEnd();
+    }
+    netFetch1() {
+        return [1, {
+                'post': this._post,
+            }];
+    }
     async scan() {
         const link = await this._scanLink();
         if (!link) {