@maiyunnet/kebab 3.1.1 → 3.1.3

package/index.d.ts

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

package/index.js

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

package/lib/db.js

@@ -171,7 +171,7 @@ export class Pool {
                 link.on('error', function (err) {
                     c.setLost();
                     if (err.code !== 'PROTOCOL_CONNECTION_LOST') {
-                        lCore.debug('[DB][_getConnection]', err);
+                        lCore.debug('[DB][_getConnection][error]', err);
                     }
                 }).on('end', () => {
                     // lCore.debug('[DB][_getConnection] connection end.');

package/lib/lang.d.ts

@@ -0,0 +1,10 @@
+/** --- 支持的语言缩写列表 --- */
+export declare const codes: string[];
+export declare const names: string[];
+/** --- 浏览器常用映射为本语言 --- */
+export declare const map: Record<string, string>;
+/**
+ * --- 根据常用语言字符串获取语言 code ---
+ * @param accept 常用字符串，如 zh-cn，或包含 zh-cn 的字符串
+ */
+export declare function getCodeByAccept(accept?: string): string;

package/lib/lang.js

@@ -0,0 +1,45 @@
+/** --- 支持的语言缩写列表 --- */
+export const codes = [
+    'sc', 'tc', 'ja', 'ko', 'en', 'es', 'th', 'vi',
+    'de', 'fr', 'pt', 'ru', 'ar', 'id', 'it', 'tr',
+];
+export const names = [
+    '简体中文', '繁體中文', '日本語', '한국어', 'English', 'Español', 'ไทย', 'Tiếng việt',
+    'Deutsch', 'Français', 'Português', 'Русский', 'العربية', 'Bahasa Indonesia', 'Italiano', 'Türkçe',
+];
+/** --- 浏览器常用映射为本语言 --- */
+export const map = {
+    'cn': 'sc',
+    'zh': 'tc',
+    'ja': 'ja',
+    'ko': 'ko',
+    'en': 'en',
+    'es': 'es',
+    'th': 'th',
+    'vi': 'vi',
+    'de': 'de',
+    'fr': 'fr',
+    'pt': 'pt',
+    'ru': 'ru',
+    'ar': 'ar',
+    'id': 'id',
+    'it': 'it',
+    'tr': 'tr',
+};
+/**
+ * --- 根据常用语言字符串获取语言 code ---
+ * @param accept 常用字符串，如 zh-cn，或包含 zh-cn 的字符串
+ */
+export function getCodeByAccept(accept) {
+    if (accept === '*') {
+        return 'sc';
+    }
+    const ulang = accept?.toLowerCase() ?? 'en';
+    for (const l in map) {
+        if (!ulang.includes(l)) {
+            continue;
+        }
+        return map[l];
+    }
+    return 'en';
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [
@@ -18,8 +18,8 @@
     "#*": "./*"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.891.0",
-    "@aws-sdk/lib-storage": "^3.891.0",
+    "@aws-sdk/client-s3": "^3.893.0",
+    "@aws-sdk/lib-storage": "^3.893.0",
     "@litert/http-client": "^1.1.2",
     "@litert/mime": "^0.1.3",
     "@litert/redis": "^3.0.5",
@@ -30,7 +30,7 @@
     "mysql2": "^3.15.0",
     "ssh2": "^1.17.0",
     "svg-captcha": "^1.4.0",
-    "tencentcloud-sdk-nodejs": "^4.1.118"
+    "tencentcloud-sdk-nodejs": "^4.1.119"
   },
   "devDependencies": {
     "@litert/eslint-plugin-rules": "^0.3.1",

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('');