@maiyunnet/kebab 3.2.23 → 3.2.25

package/index.d.ts

@@ -5,7 +5,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "3.2.23";
+export declare const VER = "3.2.25";
 /** --- 框架根目录，以 / 结尾  --- */
 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.23';
+export const VER = '3.2.25';
 // --- 服务端用的路径 ---
 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/kv.d.ts

@@ -301,6 +301,7 @@ export declare class Connection {
      * --- 获取字符串 ---
      * @param key
      * @param etc
+     * @returns 字符串或 null（即使存入时是 number，这个方法也只会返回字符串）
      */
     get(key: string, etc: kebab.IConfigKv): Promise<string | null>;
     /**

package/lib/kv.js

@@ -823,6 +823,7 @@ end`;
      * --- 获取字符串 ---
      * @param key
      * @param etc
+     * @returns 字符串或 null（即使存入时是 number，这个方法也只会返回字符串）
      */
     async get(key, etc) {
         this.refreshLast();

package/package.json

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

@@ -90,7 +90,7 @@ async function run() {
         const host = (req.headers[':authority'] ?? req.headers['host'] ?? '');
         if (!host) {
             lCore.writeHead(res, 403);
-            res.end();
+            res.end('403 Forbidden');
             return;
         }
         const key = host + req.url;
@@ -141,6 +141,7 @@ async function run() {
     httpServer = http.createServer(function (req, res) {
         const host = (req.headers['host'] ?? '');
         if (!host) {
+            res.setHeader('x-kebab-error', '0');
             lCore.writeHead(res, 403);
             res.end();
             return;
@@ -233,6 +234,7 @@ async function requestHandler(req, res, https) {
     /** --- 当前的 vhost 配置文件 --- */
     const vhost = await getVhostByHostname(uri.hostname ?? '');
     if (!vhost) {
+        res.setHeader('x-kebab-error', '1');
         lCore.writeHead(res, 403);
         res.end();
         return;
@@ -553,7 +555,7 @@ process.on('message', function (msg) {
                     for (const key in linkCount) {
                         str.push(key + ':' + linkCount[key].toString());
                     }
-                    lCore.display(`[CHILD] Worker ${process.pid} busy: ${str.join(',')}.`);
+                    lCore.debug(`[CHILD] Worker ${process.pid} busy: ${str.join(',')}.`);
                     lCore.log({}, `[CHILD] Worker ${process.pid} busy: ${str.join(',')}.`, '-warning');
                     await lCore.sleep(30_000);
                     waiting += 30_000;

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/sys/mod.d.ts

@@ -342,6 +342,10 @@ export default class Mod {
      * --- 根据当前条件，筛选出当前条目该有的数据条数 ---
      */
     count(): Promise<number>;
+    /**
+     * --- 获取当前条件下的 count 的 SQL 语句 ---
+     */
+    countSql(): string;
     /**
      * @param f 表名
      * @param s ON 信息

package/sys/mod.js

@@ -1184,7 +1184,7 @@ class Mod {
      * --- 根据当前条件，筛选出当前条目该有的数据条数 ---
      */
     async count() {
-        const sql = this._sql.getSql().replace(/SELECT .+? FROM/, 'SELECT COUNT(*) AS `count` FROM');
+        const sql = this._sql.getSql().replace(/SELECT .+? FROM/, 'SELECT COUNT(0) AS `count` FROM');
         const r = await this._db.query(sql, this._sql.getData());
         if (r.rows === null) {
             lCore.log(this._ctr ?? {}, '[count, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
@@ -1196,6 +1196,13 @@ class Mod {
         }
         return count;
     }
+    /**
+     * --- 获取当前条件下的 count 的 SQL 语句 ---
+     */
+    countSql() {
+        const sql = this._sql.getSql().replace(/SELECT .+? FROM/, 'SELECT COUNT(0) AS `count` FROM');
+        return this._sql.format(sql, this._sql.getData());
+    }
     /**
      * @param f 表名
      * @param s ON 信息

package/sys/route.d.ts

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-4-15 13:40
- * Last: 2020-4-14 13:52:00, 2022-09-07 01:43:31, 2023-12-29 17:24:03, 2024-2-7 00:28:50, 2024-6-6 15:15:54, 2025-6-13 19:23:53, 2025-9-22 15:48:53, 2025-9-23 11:26:50
+ * Last: 2020-4-14 13:52:00, 2022-09-07 01:43:31, 2023-12-29 17:24:03, 2024-2-7 00:28:50, 2024-6-6 15:15:54, 2025-6-13 19:23:53, 2025-9-22 15:48:53, 2025-9-23 11:26:50, 2025-10-30 17:44:41
  */
 import * as http from 'http';
 import * as http2 from 'http2';

package/sys/route.js

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-4-15 13:40
- * Last: 2020-4-14 13:52:00, 2022-09-07 01:43:31, 2023-12-29 17:24:03, 2024-2-7 00:28:50, 2024-6-6 15:15:54, 2025-6-13 19:23:53, 2025-9-22 15:48:53, 2025-9-23 11:26:50
+ * Last: 2020-4-14 13:52:00, 2022-09-07 01:43:31, 2023-12-29 17:24:03, 2024-2-7 00:28:50, 2024-6-6 15:15:54, 2025-6-13 19:23:53, 2025-9-22 15:48:53, 2025-9-23 11:26:50, 2025-10-30 17:44:41
  */
 import * as http from 'http';
 import * as stream from 'stream';
@@ -12,7 +12,6 @@ import * as lFs from '#kebab/lib/fs.js';
 import * as lZlib from '#kebab/lib/zlib.js';
 import * as lCore from '#kebab/lib/core.js';
 import * as lText from '#kebab/lib/text.js';
-import * as lTime from '#kebab/lib/time.js';
 import * as lResponse from '#kebab/lib/net/response.js';
 import * as lWs from '#kebab/lib/ws.js';
 import * as lLang from '#kebab/lib/lang.js';
@@ -567,7 +566,7 @@ export async function run(data) {
     }
     // --- 设置缓存 ---
     if (!data.res.headersSent && (cacheTTL > 0)) {
-        data.res.setHeader('expires', lTime.format(0, 'D, d M Y H:i:s', Date.now() + cacheTTL * 1000) + ' GMT');
+        data.res.setHeader('expires', new Date(Date.now() + cacheTTL * 1_000).toUTCString());
         data.res.setHeader('cache-control', 'max-age=' + cacheTTL.toString());
     }
     // --- 设置自定义 hcode ---