@maiyunnet/kebab 3.1.2 → 3.1.4

package/index.d.ts

@@ -8,7 +8,7 @@
  * ------------------------
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "3.1.2";
+export declare const VER = "3.1.4";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;

package/index.js

@@ -8,7 +8,7 @@
  * ------------------------
  */
 /** --- 当前系统版本号 --- */
-export const VER = '3.1.2';
+export const VER = '3.1.4';
 // --- 服务端用的路径 ---
 const imu = import.meta.url.replace('file://', '').replace(/^\/(\w:)/, '$1').replace(/\\/g, '/');
 /** --- /xxx/xxx --- */

package/lib/net.d.ts

@@ -11,7 +11,7 @@ import * as ctr from '#sys/ctr.js';
 import * as types from '#types/index.js';
 import * as fd from './net/formdata.js';
 import * as lRequest from './net/request.js';
-import * as response from './net/response.js';
+import * as lResponse from './net/response.js';
 /** --- 请求的传入参数选项 --- */
 export interface IRequestOptions {
     'method'?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'OPTIONS';
@@ -74,26 +74,26 @@ export declare function open(u: string): lRequest.Request;
  * @param u 请求的 URL
  * @param opt 参数
  */
-export declare function get(u: string, opt?: IRequestOptions): Promise<response.Response>;
+export declare function get(u: string, opt?: IRequestOptions): Promise<lResponse.Response>;
 /**
  * --- 发起一个 post 请求 ---
  * @param u 请求的 URL
  * @param data 要发送的数据
  * @param opt 参数
  */
-export declare function post(u: string, data: Record<string, types.Json> | Buffer | string | stream.Readable, opt?: IRequestOptions): Promise<response.Response>;
+export declare function post(u: string, data: Record<string, types.Json> | Buffer | string | stream.Readable, opt?: IRequestOptions): Promise<lResponse.Response>;
 /**
  * --- 发起 JSON 请求 ---
  * @param u
  * @param data
  * @param opt
  */
-export declare function postJson(u: string, data: types.Json[] | Record<string, types.Json>, opt?: IRequestOptions): Promise<response.Response>;
+export declare function postJson(u: string, data: types.Json[] | Record<string, types.Json>, opt?: IRequestOptions): Promise<lResponse.Response>;
 /**
  * --- 发起一个请求 ---
  * @param opt 配置项
  */
-export declare function request(u: string, data?: Record<string, types.Json> | Buffer | string | stream.Readable, opt?: IRequestOptions): Promise<response.Response>;
+export declare function request(u: string, data?: Record<string, types.Json> | Buffer | string | stream.Readable, opt?: IRequestOptions): Promise<lResponse.Response>;
 /**
  * --- 对 cookie 对象进行操作 ---
  * @param cookie 要操作的对象

package/lib/net.js

@@ -15,7 +15,7 @@ import * as kebab from '#index.js';
 // --- 自己 ---
 import * as fd from './net/formdata.js';
 import * as lRequest from './net/request.js';
-import * as response from './net/response.js';
+import * as lResponse from './net/response.js';
 /** --- ca 根证书内容 --- */
 let ca = '';
 /** --- 获取 CA 证书 --- */
@@ -28,7 +28,7 @@ export async function getCa() {
 }
 /** --- 复用的 hc 对象列表 --- */
 const reuses = {
-    'default': hc.createHttpClient()
+    'default': hc.createHttpClient(),
 };
 /**
  * --- 创建一个请求对象 ---
@@ -129,7 +129,7 @@ export async function request(u, data, opt = {}) {
         // --- 重定义 IP ---
         const host = (puri ? puri.hostname : uri.hostname) ?? '';
         if (!host) {
-            const res = new response.Response(null);
+            const res = new lResponse.Response(null);
             res.error = {
                 'name': 'Possible mProxy error',
                 'message': 'host not found'
@@ -137,7 +137,7 @@ export async function request(u, data, opt = {}) {
             return res;
         }
         if (hosts[host] !== undefined && !hosts[host]) {
-            const res = new response.Response(null);
+            const res = new lResponse.Response(null);
             res.error = {
                 'name': 'hosts error',
                 'message': 'hosts param error'
@@ -165,7 +165,7 @@ export async function request(u, data, opt = {}) {
         });
     }
     catch (err) {
-        const res = new response.Response(null);
+        const res = new lResponse.Response(null);
         res.error = err;
         return res;
     }
@@ -193,7 +193,7 @@ export async function request(u, data, opt = {}) {
         });
     }
     // --- 创建 Response 对象 ---
-    const res = new response.Response(req);
+    const res = new lResponse.Response(req);
     if (total) {
         res.setContent(total.toString());
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "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/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
+ * 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
  */
 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
+ * 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
  */
 import * as http from 'http';
 import * as stream from 'stream';
@@ -15,6 +15,7 @@ import * as lText from '#lib/text.js';
 import * as lTime from '#lib/time.js';
 import * as lResponse from '#lib/net/response.js';
 import * as lWs from '#lib/ws.js';
+import * as lLang from '#lib/lang.js';
 import * as sCtr from './ctr.js';
 import * as kebab from '#index.js';
 /** --- 动态层 kebab.json 缓存（文件路径: 最终合并值） --- */
@@ -116,7 +117,7 @@ export async function run(data) {
     if (lText.isFalsy(config.set.staticPathFull)) {
         config.set.staticPathFull = config.const.urlStcFull;
     }
-    // --- data.path 是安全的，不会是 ../../ 来访问到了外层，已经做过处理 ---
+    /** --- data.path 是安全的，不会是 ../../ 来访问到了外层，已经做过处理 --- */
     let path = data.path;
     // --- 如果为空则定义为 @ ---
     if (path === '') {
@@ -127,38 +128,14 @@ export async function run(data) {
     if (config.lang && data.res) {
         // --- 仅仅 res 模式支持 config.lang ---
         if (path[2] !== '/') {
-            // --- 不管是首页还是 @ 页，都会到此处 ---
-            let isDirect = false;
-            if (!path) {
-                if (config.lang.direct.includes('@')) {
-                    isDirect = true;
-                }
-            }
-            else {
-                for (const ditem of config.lang.direct) {
-                    if (!path.startsWith(ditem)) {
-                        continue;
-                    }
-                    // --- 放行 ---
-                    isDirect = true;
-                    break;
-                }
-            }
-            if (!isDirect) {
+            // --- 不管是首页还是 @ 页，都会到此处（已经有语言目录不会到这里） ---
+            if (config.lang.direct.every(item => !path.startsWith(item))) {
                 // --- 不放行 ---
-                const alang = data.req.headers['accept-language']?.toLowerCase() ?? config.lang.list[0];
+                /** --- 浏览器语种 --- */
+                const lang = lLang.getCodeByAccept(data.req.headers['accept-language']?.toLowerCase() ?? config.lang.list[0]);
+                /** --- 组合要跳转的路径 --- */
                 const apath = config.const.path + (config.const.qs ? '?' + config.const.qs : '');
-                for (const lang of config.lang.list) {
-                    let checkLang = lang;
-                    if (lang === 'sc') {
-                        checkLang = 'cn';
-                    }
-                    else if (lang === 'tc') {
-                        checkLang = 'zh';
-                    }
-                    if (!alang.includes(checkLang)) {
-                        continue;
-                    }
+                if (config.lang.list.includes(lang)) {
                     data.res.setHeader('location', config.const.urlBase + lang + '/' + apath);
                     data.res.writeHead(302);
                     data.res.end('');

package/tsconfig.json

@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "esnext",
+        "removeComments": false,
+        "preserveConstEnums": true, // 保留 const 和 enum 声明
+        "outDir": "./",
+        "sourceMap": false,
+        "target": "ES2021",
+        "strict": true,             // 严格模式
+        "declaration": true,        // d.ts
+        "declarationMap": false,    // d.ts 的 map
+        "newLine": "LF",
+        "paths": {
+            "#*": ["./*"]
+        },
+        "moduleResolution": "node",
+        "resolveJsonModule": true,
+        "esModuleInterop": true
+    },
+    "include": [
+        "./**/*.ts"
+    ],
+    "exclude": [
+        "node_modules"
+    ]
+}

package/types/index.d.ts

@@ -106,7 +106,7 @@ export interface IConfigTurnstile {
         'skey': string;
         'aid': string;
         'akey': string;
-    }
+    },
 }
 
 /** --- 动配数据库 --- */