@maiyunnet/kebab 7.3.0 → 7.4.0

package/README.md

@@ -1,11 +1,13 @@
 <p align="center"><img src="./doc/icon.png" width="64" height="64" alt="Kebab"></p>
 <p align="center">
-    <a href="https://github.com/maiyun/kebab/blob/master/LICENSE">
+    <a href="https://github.com/maiyun/kebab/blob/main/LICENSE">
         <img alt="License" src="https://img.shields.io/github/license/maiyun/kebab?color=blue" />
     </a>
+    <a href="https://www.npmjs.com/package/@maiyunnet/kebab">
+        <img alt="NPM stable version" src="https://img.shields.io/npm/v/@maiyunnet/kebab?color=brightgreen&logo=npm" />
+    </a>
     <a href="https://github.com/maiyun/kebab/releases">
         <img alt="GitHub releases" src="https://img.shields.io/github/v/release/maiyun/kebab?color=brightgreen&logo=github" />
-        <img alt="GitHub pre-releases" src="https://img.shields.io/github/v/release/maiyun/kebab?color=yellow&logo=github&include_prereleases" />
     </a>
     <a href="https://github.com/maiyun/kebab/issues">
         <img alt="GitHub issues" src="https://img.shields.io/github/issues/maiyun/kebab?color=blue&logo=github" />

package/index.d.ts

@@ -5,7 +5,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "7.3.0";
+export declare const VER = "7.4.0";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;

package/index.js

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

package/lib/s3.d.ts

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: Tang Rukun, JianSuoQiYue
  * Date: 2024-2-18 18:32:45
- * Last: 2024-2-18 18:32:47, 2024-3-16 16:42:27, 2024-5-31 21:36:26, 2024-7-8 00:28:42, 2024-7-19 11:32:43, 2025-6-10 21:45:34
+ * Last: 2024-2-18 18:32:47, 2024-3-16 16:42:27, 2024-5-31 21:36:26, 2024-7-8 00:28:42, 2024-7-19 11:32:43, 2025-6-10 21:45:34, 2025-12-5 23:42:59
  */
 import * as s3 from '@aws-sdk/client-s3';
 import * as stream from 'stream';
@@ -79,6 +79,11 @@ export declare class S3 {
      * @param bucket bucket 名
      */
     headObject(key: string, bucket?: string): Promise<s3.HeadObjectCommandOutput | false>;
+    /**
+     * --- 销毁连接，释放资源 ---
+     * --- 一般会自动垃圾回收，但高频接口也可主动调用 ---
+     */
+    destroy(): void;
 }
 /**
  * --- 创建一个对象存储对象 ---

package/lib/s3.js

@@ -1,15 +1,13 @@
 /**
  * Project: Kebab, User: Tang Rukun, JianSuoQiYue
  * Date: 2024-2-18 18:32:45
- * Last: 2024-2-18 18:32:47, 2024-3-16 16:42:27, 2024-5-31 21:36:26, 2024-7-8 00:28:42, 2024-7-19 11:32:43, 2025-6-10 21:45:34
+ * Last: 2024-2-18 18:32:47, 2024-3-16 16:42:27, 2024-5-31 21:36:26, 2024-7-8 00:28:42, 2024-7-19 11:32:43, 2025-6-10 21:45:34, 2025-12-5 23:42:59
  */
 // --- 库和定义 ---
 import * as s3 from '@aws-sdk/client-s3';
 import * as ls from '@aws-sdk/lib-storage';
 import * as lCore from '#kebab/lib/core.js';
 import * as lText from '#kebab/lib/text.js';
-/** --- s3 的连接对象 --- */
-const links = [];
 /**
  * --- s3 文档：https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/s3/ ---
  */
@@ -52,12 +50,6 @@ export class S3 {
                 endpoint = undefined;
             }
         }
-        const token = `${opt.service}-${account}-${secretId}-${region}`;
-        const link = links.find((item) => item.token === token);
-        if (link) {
-            this._link = link.link;
-            return;
-        }
         this._link = new s3.S3Client({
             'region': region,
             'credentials': {
@@ -66,10 +58,6 @@ export class S3 {
             },
             'endpoint': endpoint,
         });
-        links.push({
-            'token': token,
-            'link': this._link,
-        });
     }
     /**
      * --- 修改预定义 bucket ---
@@ -105,14 +93,14 @@ export class S3 {
                     'Body': content,
                     'ContentLength': length,
                     'ContentType': type,
-                    'ContentDisposition': disposition
+                    'ContentDisposition': disposition,
                 }
             });
             const res = await upload.done();
             return (res.Location && res.Bucket && res.Key) ? res : false;
         }
         catch (e) {
-            lCore.log(this._ctr, '[S3][putObject] ' + lText.stringifyJson(e.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr, '[LIB][S3][putObject] ' + lText.stringifyJson(e.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
     }
@@ -131,8 +119,8 @@ export class S3 {
             const r = await this._link.send(go);
             return r.Body;
         }
-        catch {
-            // await lCore.log(this._ctr, '[getObject, s3] ' + lText.stringifyJson(e.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+        catch (e) {
+            lCore.log(this._ctr, '[LIB][S3][getObject] ' + lText.stringifyJson(e.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
     }
@@ -150,8 +138,8 @@ export class S3 {
             await this._link.send(doc);
             return true;
         }
-        catch {
-            // await lCore.log(this._ctr, '[deleteObject, s3] ' + lText.stringifyJson(e.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+        catch (e) {
+            lCore.log(this._ctr, '[LIB][S3][deleteObject] ' + lText.stringifyJson(e.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
     }
@@ -172,7 +160,7 @@ export class S3 {
             return true;
         }
         catch (e) {
-            lCore.log(this._ctr, '[S3][deleteObjects] ' + lText.stringifyJson(e.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr, '[LIB][S3][deleteObjects] ' + lText.stringifyJson(e.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
     }
@@ -191,11 +179,18 @@ export class S3 {
         }
         catch (e) {
             if (e.$metadata?.httpStatusCode !== 404) {
-                lCore.log(this._ctr, '[S3][headObject] ' + lText.stringifyJson(e.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                lCore.log(this._ctr, '[LIB][S3][headObject] ' + lText.stringifyJson(e.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             }
             return false;
         }
     }
+    /**
+     * --- 销毁连接，释放资源 ---
+     * --- 一般会自动垃圾回收，但高频接口也可主动调用 ---
+     */
+    destroy() {
+        this._link.destroy();
+    }
 }
 /**
  * --- 创建一个对象存储对象 ---

package/lib/sql.d.ts

@@ -25,6 +25,8 @@ export declare class Sql {
     private readonly _alias;
     /** --- PostgreSQL 占位符计数器 --- */
     private _placeholderCounter;
+    /** --- 是否忽略错误 --- */
+    private _ignore;
     constructor(opt: {
         'service': ESERVICE;
         'ctr'?: ctr.Ctr;
@@ -35,8 +37,9 @@ export declare class Sql {
     /**
      * --- 插入数据前导 ---
      * @param table 表名
+     * @param ignore 是否忽略错误（MySQL: INSERT IGNORE, PGSQL: ON CONFLICT DO NOTHING）
      */
-    insert(table: string): this;
+    insert(table: string, ignore?: boolean): this;
     /**
      * --- 实际插入数据的数据 ---
      * @param cs [] 数据列或字段列

package/lib/sql.js

@@ -25,6 +25,8 @@ export class Sql {
     _alias = [];
     /** --- PostgreSQL 占位符计数器 --- */
     _placeholderCounter = 1;
+    /** --- 是否忽略错误 --- */
+    _ignore = false;
     // --- 实例化 ---
     constructor(opt) {
         this._ctr = opt.ctr;
@@ -41,12 +43,18 @@ export class Sql {
     /**
      * --- 插入数据前导 ---
      * @param table 表名
+     * @param ignore 是否忽略错误（MySQL: INSERT IGNORE, PGSQL: ON CONFLICT DO NOTHING）
      */
-    insert(table) {
+    insert(table, ignore = false) {
         this._data = [];
         this._placeholderCounter = 1;
         this._alias.length = 0;
-        const sql = 'INSERT INTO ' + this.field(table, this._pre);
+        this._ignore = ignore;
+        let sql = 'INSERT ';
+        if (ignore && this._service === ESERVICE.MYSQL) {
+            sql += 'IGNORE ';
+        }
+        sql += 'INTO ' + this.field(table, this._pre);
         this._sql = [sql];
         return this;
     }
@@ -99,6 +107,9 @@ export class Sql {
             sql = sql.slice(0, -2) + ') VALUES (' + values.slice(0, -2) + ')';
         }
         this._sql.push(sql);
+        if (this._ignore && this._service === ESERVICE.PGSQL) {
+            this._sql.push(' ON CONFLICT DO NOTHING');
+        }
         return this;
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "7.3.0",
+  "version": "7.4.0",
   "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/mod.d.ts

@@ -97,6 +97,7 @@ export default class Mod {
         'pre'?: string;
         'ctr'?: sCtr.Ctr;
         'index'?: string;
+        'ignore'?: boolean;
     }): Promise<boolean | null | false>;
     /**
      * --- 获取添加一个序列的模拟 SQL ---
@@ -109,6 +110,7 @@ export default class Mod {
         'pre'?: string;
         'ctr'?: sCtr.Ctr;
         'index'?: string;
+        'ignore'?: boolean;
     }): string;
     /**
      * --- 根据条件移除条目 ---

package/sys/mod.js

@@ -130,7 +130,7 @@ export default class Mod {
         });
         if (!vs) {
             // --- 单行 ---
-            sq.insert(this._$table + (opt.index ? ('_' + opt.index) : ''));
+            sq.insert(this._$table + (opt.index ? ('_' + opt.index) : ''), opt.ignore);
             sq.values(cs);
             const r = await db.execute(sq.getSql(), sq.getData());
             if (r.packet === null) {
@@ -150,7 +150,7 @@ export default class Mod {
         /** --- 总批次数量 --- */
         const batch = Math.ceil(vs.length / line);
         for (let i = 0; i < batch; ++i) {
-            sq.insert(this._$table + (opt.index ? ('_' + opt.index) : ''));
+            sq.insert(this._$table + (opt.index ? ('_' + opt.index) : ''), opt.ignore);
             sq.values(cs, vs.slice(i * line, (i + 1) * line));
             const r = await db.execute(sq.getSql(), sq.getData());
             if (r.packet === null) {
@@ -177,7 +177,7 @@ export default class Mod {
             'ctr': opt.ctr,
             'pre': opt.pre ?? this._$pre,
         });
-        sq.insert(this._$table + (opt.index ? ('_' + opt.index) : '')).values(cs, vs);
+        sq.insert(this._$table + (opt.index ? ('_' + opt.index) : ''), opt.ignore).values(cs, vs);
         return sq.format();
     }
     /**

package/www/example/ctr/test.js

@@ -2365,6 +2365,12 @@ Result:<pre id="result">Nothing.</pre>`);
                 echo.push(`<pre>sql.insert('user').values(['name', 'age'], ['Ah', '16']);</pre>
 <b>getSql() :</b> ${s}<br>
 <b>getData():</b> <pre>${JSON.stringify(sd, undefined, 4)}</pre>
+<b>format() :</b> ${sql.format(s, sd)}<hr>`);
+                s = sql.insert('user', true).values(['name', 'age'], ['Ah', '16']).getSql();
+                sd = sql.getData();
+                echo.push(`<pre>sql.insert('user', true).values(['name', 'age'], ['Ah', '16']);</pre>
+<b>getSql() :</b> ${s}<br>
+<b>getData():</b> <pre>${JSON.stringify(sd, undefined, 4)}</pre>
 <b>format() :</b> ${sql.format(s, sd)}<hr>`);
                 s = sql.insert('user').values({ 'name': 'Bob', 'age': '24' }).getSql();
                 sd = sql.getData();