@maiyunnet/kebab 2.0.9 → 2.0.11

package/index.d.ts

@@ -3,10 +3,12 @@
  * Date: 2019-3-30 12:46:41
  * Last: 2020-3-8 21:04:24, 2022-07-22 14:20:34, 2023-5-24 01:34:57, 2025-6-13 14:49:27
  * --- 本文件用来定义每个目录实体地址的常量 ---
+ * ------------------------
  * --- npx tsc-alias -w ---
+ * ------------------------
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "2.0.9";
+export declare const VER = "2.0.11";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;

package/index.js

@@ -4,12 +4,14 @@
  * Date: 2019-3-30 12:46:41
  * Last: 2020-3-8 21:04:24, 2022-07-22 14:20:34, 2023-5-24 01:34:57, 2025-6-13 14:49:27
  * --- 本文件用来定义每个目录实体地址的常量 ---
+ * ------------------------
  * --- npx tsc-alias -w ---
+ * ------------------------
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MOD_CWD = exports.FTMP_CWD = exports.IND_CWD = exports.WWW_CWD = exports.LOG_CWD = exports.LIB_CWD = exports.VHOST_CWD = exports.CERT_CWD = exports.CONF_CWD = exports.ROOT_CWD = exports.SYS_PATH = exports.LIB_PATH = exports.ROOT_PATH = exports.VER = void 0;
 /** --- 当前系统版本号 --- */
-exports.VER = '2.0.9';
+exports.VER = '2.0.11';
 // --- 服务端用的路径 ---
 /** --- /xxx/xxx --- */
 const dirname = __dirname.replace(/\\/g, '/');

package/lib/turnstile.d.ts

@@ -0,0 +1,15 @@
+import * as sCtr from '../sys/ctr';
+/**
+ * 0. CloudFlare：https://developers.cloudflare.com/turnstile/get-started/server-side-validation/
+ * 1. 腾讯云：https://cloud.tencent.com/document/product/1110/36926
+ */
+/** --- 厂家 --- */
+export declare enum EFACTORY {
+    'CLOUDFLARE' = 0,
+    'TENCENT' = 1
+}
+export declare function verify(ctr: sCtr.Ctr, opt: {
+    'factory': EFACTORY;
+    'token': string;
+    'ip': string;
+}): Promise<boolean>;

package/lib/turnstile.js

@@ -0,0 +1,108 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EFACTORY = void 0;
+exports.verify = verify;
+/**
+ * Project: Kebab, User: JianSuoQiYue
+ * Date: 2025-6-11
+ * Last: 2025-6-11 21:50:31
+ */
+const tc = __importStar(require("tencentcloud-sdk-nodejs"));
+// --- 库和定义 ---
+const lNet = __importStar(require("../lib/net"));
+const lText = __importStar(require("../lib/text"));
+/**
+ * 0. CloudFlare：https://developers.cloudflare.com/turnstile/get-started/server-side-validation/
+ * 1. 腾讯云：https://cloud.tencent.com/document/product/1110/36926
+ */
+/** --- 厂家 --- */
+var EFACTORY;
+(function (EFACTORY) {
+    EFACTORY[EFACTORY["CLOUDFLARE"] = 0] = "CLOUDFLARE";
+    EFACTORY[EFACTORY["TENCENT"] = 1] = "TENCENT";
+})(EFACTORY || (exports.EFACTORY = EFACTORY = {}));
+async function verify(ctr, opt) {
+    const config = ctr.getPrototype('_config');
+    switch (opt.factory) {
+        case EFACTORY.CLOUDFLARE: {
+            // --- CloudFlare 验证 ---
+            const res = await lNet.postJson('https://challenges.cloudflare.com/turnstile/v0/siteverify', {
+                'secret': config.turnstile['CF'].skey,
+                'response': opt.token,
+                'remoteip': opt.ip,
+            });
+            const content = await res.getContent();
+            if (!content) {
+                return false;
+            }
+            const str = content.toString();
+            const json = lText.parseJson(str);
+            if (!json) {
+                return false;
+            }
+            return json.success;
+        }
+        case EFACTORY.TENCENT: {
+            // --- 腾讯云验证 ---
+            const client = new tc.captcha.v20190722.Client({
+                'credential': {
+                    'secretId': config.turnstile['TENCENT'].sid,
+                    'secretKey': config.turnstile['TENCENT'].skey,
+                },
+                'profile': {
+                    'signMethod': 'HmacSHA256', // 签名方法
+                    'httpProfile': {
+                        'reqMethod': 'POST', // 请求方法
+                        'reqTimeout': 30, // 请求超时时间，默认60s
+                    }
+                }
+            });
+            const io = opt.token.indexOf('|');
+            if (io === -1) {
+                return false;
+            }
+            const res = await client.DescribeCaptchaResult({
+                'CaptchaType': 9,
+                'Ticket': opt.token.slice(0, io),
+                'UserIp': opt.ip,
+                'Randstr': opt.token.slice(io + 1),
+                'CaptchaAppId': parseInt(config.turnstile['TENCENT'].aid), // --- 防止后期又不是 number 了还要改config，这样只需要更新代码无损升级 ---
+                'AppSecretKey': config.turnstile['TENCENT'].akey,
+            });
+            return res.CaptchaCode === 1;
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "keywords": [
     "kebab",

package/sys/cmd.js

@@ -169,6 +169,16 @@ async function run() {
         config.s3['TENCENT'].skey = '';
         config.s3['TENCENT'].region = '';
         config.s3['TENCENT'].bucket = '';
+        // --- config - turnstile ---
+        config.turnstile ??= {};
+        config.turnstile['CF'] ??= {};
+        config.turnstile['CF'].sid ??= '';
+        config.turnstile['CF'].skey ??= '';
+        config.turnstile['TENCENT'] ??= {};
+        config.turnstile['TENCENT'].sid ??= '';
+        config.turnstile['TENCENT'].skey ??= '';
+        config.turnstile['TENCENT'].aid ??= '';
+        config.turnstile['TENCENT'].akey ??= '';
         // --- 保存 config.json ---
         if (!await lFs.putContent(kebab.CONF_CWD + 'config.json', lText.stringifyJson(config, 4))) {
             lCore.display('KEBAB', 'CREATE', 'FILE', kebab.CONF_CWD + 'config.json', '[FAILED]');

package/sys/ctr.js

@@ -690,7 +690,7 @@ class Ctr {
         this._res.setHeader('access-control-allow-headers', '*');
         this._res.setHeader('access-control-allow-methods', '*');
         if (this._req.method === 'OPTIONS') {
-            this._res.setHeader('access-control-max-age', '600');
+            this._res.setHeader('access-control-max-age', '3600');
             return false;
         }
         return true;

package/sys/mod.d.ts

@@ -33,6 +33,8 @@ export default class Mod {
     protected static _$primary: string;
     /** --- 设置后将由 _keyGenerator 函数生成唯一字段 --- */
     protected static _$key: string;
+    /** --- 若使用 _$key 并且有多个 unique 索引，这里指定 _$key 的索引名 --- */
+    protected static _$index: string;
     /** ---- 可开启软删软更新软新增 --- */
     protected static _$soft: boolean;
     /** --- 要 update 的内容 --- */

package/sys/mod.js

@@ -353,8 +353,8 @@ class Mod {
         if (typeof opt.index === 'string') {
             opt.index = [opt.index];
         }
-        else if (!opt.index) {
-            opt.index = [''];
+        else {
+            opt.index ??= [''];
         }
         if (this._$soft && !opt.raw) {
             if (typeof where === 'string') {
@@ -657,9 +657,7 @@ class Mod {
         for (const k in this._updates) {
             updates[k] = this._data[k];
         }
-        if (!table) {
-            table = cstr._$table + (this._index ? ('_' + this._index[0]) : '');
-        }
+        table ??= cstr._$table + (this._index ? ('_' + this._index[0]) : '');
         let r = null;
         if ((cstr._$key !== '') && (updates[cstr._$key] === undefined)) {
             let count = 0;
@@ -682,18 +680,29 @@ class Mod {
                 if (!r.error) {
                     break;
                 }
-                if (r.error.errno !== 1062) {
-                    await lCore.log(this._ctr ?? {
-                        'path': '',
-                        'urlFull': '',
-                        'hostname': '',
-                        'req': null,
-                        'get': {},
-                        'cookie': {},
-                        'headers': {}
-                    }, '[create0, mod] [' + table + '] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
-                    return false;
+                if (r.error.errno === 1062) {
+                    // --- 与唯一键冲突 ---
+                    if (!cstr._$index) {
+                        // --- 没设置 index，那就当做是本次生成的 key 重复了 ---
+                        continue;
+                    }
+                    const match = /for key '([\w.]+)'/.exec(r.error.message);
+                    if (match?.[1].includes(cstr._$index)) {
+                        // --- 确实重复了 ---
+                        continue;
+                    }
                 }
+                // --- 未处理的错误 ---
+                await lCore.log(this._ctr ?? {
+                    'path': '',
+                    'urlFull': '',
+                    'hostname': '',
+                    'req': null,
+                    'get': {},
+                    'cookie': {},
+                    'headers': {}
+                }, '[create0, mod] [' + table + '] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                return false;
             }
         }
         else {
@@ -1603,6 +1612,8 @@ Mod._$table = '';
 Mod._$primary = 'id';
 /** --- 设置后将由 _keyGenerator 函数生成唯一字段 --- */
 Mod._$key = '';
+/** --- 若使用 _$key 并且有多个 unique 索引，这里指定 _$key 的索引名 --- */
+Mod._$index = '';
 /** ---- 可开启软删软更新软新增 --- */
 Mod._$soft = false;
 exports.default = Mod;

package/www/example/ctr/test.js

@@ -548,6 +548,7 @@ Result:<pre id="result">Nothing.</pre>` + this._getEnd();
                 'ctr': this
             });
             test.set({
+                'name': 'nam' + lCore.rand(0, 3).toString(),
                 'point': { 'x': lCore.rand(0, 99), 'y': lCore.rand(0, 99) },
                 'polygon': [
                     [
@@ -566,6 +567,7 @@ const test = mTest.getCreate<mTest>(db, {
     'ctr': this
 });
 test.set({
+    'name': 'nam' + lCore.rand(0, 4).toString(),
     'point': { 'x': lCore.rand(0, 99), 'y': lCore.rand(0, 99) },
     'polygon': [
         [
@@ -744,6 +746,7 @@ CREATE TABLE \`m_test_data_0\` (
             'ctr': this
         });
         test.set({
+            'name': lCore.random(4),
             'token': lCore.random(lCore.rand(8, 32)),
             'point': {
                 'x': 10,

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

@@ -4,7 +4,9 @@ export default class extends sMod {
     protected static _$table: string;
     protected static _$primary: string;
     protected static _$key: string;
+    protected static _$index: string;
     id: number;
+    name: string;
     token: string;
     point: {
         'x': number;

package/www/example/mod/test.js

@@ -39,25 +39,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const lCore = __importStar(require("../../../lib/core"));
 const mod_1 = __importDefault(require("../../../sys/mod"));
 /*
-CREATE TABLE `m_test` (
-  `id` INT NOT NULL AUTO_INCREMENT,
-  `token` CHAR(16) NOT NULL COLLATE 'ascii_bin',
-  `point` POINT NOT NULL,
-  `polygon` POLYGON NULL DEFAULT NULL,
-  `json` JSON NULL DEFAULT NULL,
-  `time_add` BIGINT NOT NULL,
+CREATE TABLE `m_test`  (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `name` char(4) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `token` varchar(32) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `point` point NOT NULL,
+  `polygon` polygon NULL,
+  `json` json NULL,
+  `time_add` bigint NOT NULL,
   PRIMARY KEY (`id`) USING BTREE,
-    UNIQUE INDEX `token` (`token`) USING BTREE,
-    INDEX `time_add` (`time_add`) USING BTREE
-) ENGINE=InnoDB COLLATE=utf8mb4_general_ci;
+  INDEX `time_add`(`time_add` ASC) USING BTREE,
+  UNIQUE INDEX `utoken`(`token` ASC) USING BTREE,
+  UNIQUE INDEX `uname`(`name` ASC) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 */
 class default_1 extends mod_1.default {
     /* eslint-enable */
     _keyGenerator() {
-        return 'test_' + lCore.rand(0, 5).toString();
+        return 'test_' + lCore.rand(0, 3).toString();
     }
 }
 default_1._$table = 'test';
 default_1._$primary = 'id';
 default_1._$key = 'token';
+default_1._$index = 'utoken';
 exports.default = default_1;