@maiyunnet/kebab 7.3.1 → 7.4.1

package/index.d.ts

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

package/index.js

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

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.1",
+  "version": "7.4.1",
   "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/sys/route.d.ts

@@ -63,8 +63,13 @@ export declare function getPost(req: http2.Http2ServerRequest | http.IncomingMes
  * @param events 文件处理情况
  */
 export declare function getFormData(req: http2.Http2ServerRequest | http.IncomingMessage, events?: {
+    /**
+     * --- 文件开始上传时触发，返回 true 则跳过该文件的保存 ---
+     */
     onfilestart?: (name: string) => boolean | undefined;
+    /** --- 文件上传时触发，仅 start 返回 true 时触发 --- */
     onfiledata?: (chunk: Buffer) => void;
+    /** --- 文件上传结束时触发，仅 start 返回 true 时触发 --- */
     onfileend?: () => void;
 }): Promise<{
     'post': Record<string, kebab.Json>;

package/sys/route.js

@@ -867,6 +867,10 @@ export function getPost(req) {
  */
 export function getFormData(req, events = {}) {
     return new Promise(function (resolve) {
+        if (req.readableEnded) {
+            resolve({ 'post': {}, 'files': {} });
+            return;
+        }
         const ct = req.headers['content-type'] ?? '';
         if (!ct) {
             resolve({ 'post': {}, 'files': {} });
@@ -991,22 +995,20 @@ export function getFormData(req, events = {}) {
                         if (io === -1) {
                             // --- 没找到结束标语，将预留 boundary 长度之前的写入到文件 ---
                             const writeBuffer = buffer.subarray(0, -boundary.length - 4);
-                            if (ftmpName === '') {
-                                events.onfiledata?.(writeBuffer);
-                            }
-                            else {
+                            if (ftmpName) {
                                 ftmpStream.write(writeBuffer);
                                 ftmpSize += Buffer.byteLength(writeBuffer);
                             }
+                            else {
+                                // --- 跳过该文件 ---
+                                events.onfiledata?.(writeBuffer);
+                            }
                             buffer = buffer.subarray(-boundary.length - 4);
                             return;
                         }
                         // --- 找到结束标语，结束标语之前的写入文件，之后的重新放回 buffer ---
                         const writeBuffer = buffer.subarray(0, io);
-                        if (ftmpName === '') {
-                            events.onfileend?.();
-                        }
-                        else {
+                        if (ftmpName) {
                             ftmpStream.write(writeBuffer);
                             ftmpSize += Buffer.byteLength(writeBuffer);
                             ftmpStream.end(() => {
@@ -1046,6 +1048,10 @@ export function getFormData(req, events = {}) {
                                 rtn.files[name] = val;
                             }
                         }
+                        else {
+                            // --- 跳过该文件 ---
+                            events.onfileend?.();
+                        }
                         // --- 重置状态机 ---
                         state = EState.WAIT;
                         buffer = buffer.subarray(io + 4 + boundary.length);
@@ -1054,11 +1060,31 @@ export function getFormData(req, events = {}) {
                 }
             }
         });
-        req.on('error', function () {
+        req.on('error', function (e) {
+            if ((state === EState.FILE) && ftmpName) {
+                ftmpStream.destroy();
+            }
+            lCore.debug('[ROUTE][GETFORMDATA] request error before getFormData: ' + e.message);
+            lCore.log({}, '[ROUTE][GETFORMDATA] request error before getFormData: ' + (e.stack ?? ''), '-error');
             resolve(false);
         });
         req.on('end', function () {
             readEnd = true;
+            if (state === EState.FILE) {
+                if (ftmpName) {
+                    ftmpStream.end(() => {
+                        --writeFileLength;
+                        if (!writeFileLength) {
+                            // --- 文件也写完了 ---
+                            resolve(rtn);
+                        }
+                    });
+                    return;
+                }
+                // --- 跳过该文件 ---
+                events.onfileend?.();
+                --writeFileLength;
+            }
             if (writeFileLength) {
                 // --- 文件没写完 ---
                 return;

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