@maiyunnet/kebab 3.2.24 → 3.2.26

package/index.d.ts

@@ -5,7 +5,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "3.2.24";
+export declare const VER = "3.2.26";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;
@@ -84,6 +84,8 @@ export interface IConfigS3 {
 }
 /** --- AI --- */
 export interface IConfigAi {
+    /** --- 目前只有微软 Azure 有 --- */
+    'endpoint'?: string;
     'skey': string;
 }
 /** --- 向量数据库 --- */

package/index.js

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

package/lib/ai.d.ts

@@ -14,14 +14,20 @@ export declare enum ESERVICE {
     /** --- 阿里中国大陆区 --- */
     'ALICN' = 0,
     /** --- 阿里国际区 --- */
-    'ALIAS' = 1
+    'ALIAS' = 1,
+    /** --- 微软 Azure --- */
+    'AZURE' = 2
 }
 /** --- 选项 --- */
 export interface IOptions {
     /** --- 服务商 ---- */
     'service': ESERVICE;
-    /** --- 密钥值 --- */
+    /** --- 接入点 --- */
+    'endpoint'?: string;
+    /** --- 密钥 --- */
     'secretKey'?: string;
+    /** --- 自定义 fetch 函数 --- */
+    'fetch'?: (input: string | URL | Request, init?: RequestInit) => Promise<Response>;
 }
 export declare class Ai {
     /** --- openai 原生对象，建议只读 --- */

package/lib/ai.js

@@ -15,6 +15,8 @@ export var ESERVICE;
     ESERVICE[ESERVICE["ALICN"] = 0] = "ALICN";
     /** --- 阿里国际区 --- */
     ESERVICE[ESERVICE["ALIAS"] = 1] = "ALIAS";
+    /** --- 微软 Azure --- */
+    ESERVICE[ESERVICE["AZURE"] = 2] = "AZURE";
 })(ESERVICE || (ESERVICE = {}));
 /** --- openai 的连接对象 --- */
 const links = [];
@@ -25,11 +27,15 @@ export class Ai {
         let endpoint;
         switch (opt.service) {
             case ESERVICE.ALICN: {
-                endpoint = `https://dashscope.aliyuncs.com/compatible-mode/v1`;
+                endpoint = opt.endpoint ?? `https://dashscope.aliyuncs.com/compatible-mode/v1`;
                 break;
             }
             case ESERVICE.ALIAS: {
-                endpoint = `https://dashscope-intl.aliyuncs.com/compatible-mode/v1`;
+                endpoint = opt.endpoint ?? `https://dashscope-intl.aliyuncs.com/compatible-mode/v1`;
+                break;
+            }
+            case ESERVICE.AZURE: {
+                endpoint = opt.endpoint ?? config.ai?.[ESERVICE[opt.service]]?.endpoint ?? '';
                 break;
             }
             default: {
@@ -45,6 +51,7 @@ export class Ai {
         this.link = new openai.OpenAI({
             'apiKey': secretKey,
             'baseURL': endpoint,
+            'fetch': opt.fetch,
         });
         links.push({
             'token': token,

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "3.2.24",
+  "version": "3.2.26",
   "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/cmd.js

@@ -152,6 +152,9 @@ async function run() {
         config.ai['ALICN'].skey ??= '';
         config.ai['ALIAS'] ??= {};
         config.ai['ALIAS'].skey ??= '';
+        config.ai['AZURE'] ??= {};
+        config.ai['AZURE'].endpoint ??= '';
+        config.ai['AZURE'].skey ??= '';
         // --- config - vector ---
         config.vector ??= {};
         config.vector.host ??= '127.0.0.1';

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) {