wok-server 0.6.0 → 0.7.1

package/README.en.md

@@ -44,7 +44,7 @@ startWebServer({
 
 Visit `http://localhost:8080` to see the output.
 
-For more configuration via environment variables, see the [full documentation](https://gitee.com/tai/wok-server/blob/master/documentation/zh-cn/index.md).
+For more configuration via environment variables, see the [full documentation](https://gitee.com/tai/wok-server/blob/master/documentation/en/index.md).
 
 ### Install AI Skills
 

package/dist/http-client/index.js

@@ -36,7 +36,8 @@ function doRequest(opts) {
             method: opts.method,
             headers: opts.headers,
             timeout: opts.timeout && opts.timeout > 0 ? opts.timeout : 5000,
-            rejectUnauthorized: false
+            rejectUnauthorized: false,
+            agent: opts.agent
         }, res => {
             const chunks = [];
             res.on('error', reject);

package/dist/mysql/config.js

@@ -44,7 +44,7 @@ exports.configValidation = {
     maxIdle: [(0, validation_1.notNull)(), (0, validation_1.min)(1), (0, validation_1.max)(999)],
     idleTimeout: [(0, validation_1.notNull)(), (0, validation_1.min)(1000), (0, validation_1.max)(60000)],
     slowSqlWarn: [(0, validation_1.notNull)()],
-    slowSqlMs: [(0, validation_1.notNull)(), (0, validation_1.min)(1), (0, validation_1.max)(3600000)],
+    slowSqlMs: [(0, validation_1.notNull)(), (0, validation_1.min)(0), (0, validation_1.max)(3600000)],
     transactionTimeout: [(0, validation_1.notNull)(), (0, validation_1.min)(0), (0, validation_1.max)(60000)],
     transactionStrict: [(0, validation_1.notNull)()],
     maxOpsInStrictTx: [(0, validation_1.notNull)(), (0, validation_1.min)(1)]

package/dist/mysql/manager/base.js

@@ -147,6 +147,37 @@ class BaseMysqlManager {
     insertMany(table, list) {
         return this.queryWithConnection(conn => (0, ops_1.insertMany)(this.opts.config, conn, table, list));
     }
+    /**
+     * Upsert 单条数据
+     * 如果主键冲突则更新，否则插入
+     * @param table 表信息
+     * @param data 数据
+     * @returns
+     */
+    upsert(table, data) {
+        return this.queryWithConnection(conn => (0, ops_1.upsert)(this.opts.config, conn, table, data));
+    }
+    /**
+     * Upsert 多条数据
+     * 如果主键冲突则更新，否则插入
+     * @param table 表
+     * @param list 要插入的数据列表
+     * @returns 影响的行数
+     */
+    upsertMany(table, list) {
+        return this.queryWithConnection(conn => (0, ops_1.upsertMany)(this.opts.config, conn, table, list));
+    }
+    /**
+     * Upsert 单条数据（支持自定义更新器）
+     * 如果主键冲突则按自定义逻辑更新，否则插入
+     * @param table 表信息
+     * @param data 插入的数据
+     * @param updater 冲突时的更新器
+     * @returns
+     */
+    upsertWithUpdater(table, data, updater) {
+        return this.queryWithConnection(conn => (0, ops_1.upsertWithUpdater)(this.opts.config, conn, table, data, updater));
+    }
     /**
      * 更新
      * @param table 表信息
@@ -217,6 +248,14 @@ class BaseMysqlManager {
     paginate(opts) {
         return this.queryWithConnection(conn => (0, ops_1.paginate)(this.opts.config, conn, opts));
     }
+    /**
+     * 指定字段分页查询
+     * @param opts
+     * @returns
+     */
+    paginateSelect(opts) {
+        return this.queryWithConnection(conn => (0, ops_1.paginateSelect)(this.opts.config, conn, opts));
+    }
     /**
      * 自定义查询，指定 sql 、参数和返回值类型
      * @param sql 预编译 sql ，参数使用 ”?“（英文问号） 占位，注意查询的字段名称会与返回值类型的字段映射，如果 sql 中的字段名称很特殊（比如纯数字等），需要设置别名，避免产生映射错误

package/dist/mysql/manager/ops/criteria.js

@@ -164,6 +164,19 @@ class MysqlCriteria {
         this.criteria.push({ type: 'isNotNull', key: field });
         return this;
     }
+    /**
+     * 自定义表达式查询
+     * 如 .expr('?? * ? > ?', ['balance', 2, 50])
+     * 如 .expr('MATCH(??, ??) AGAINST(? IN BOOLEAN MODE)', ['title', 'content', keyword])
+     * 如 .expr('VECTOR_DISTANCE(??, STRING_TO_VECTOR(?)) < ?', ['content_vec', embedding, threshold])
+     * @param sql SQL 片段，使用 ?? 引用列名，? 引用参数值
+     * @param values 参数值数组，按 SQL 中占位符顺序传入
+     * @returns
+     */
+    expr(sql, values) {
+        this.criteria.push({ type: 'expr', exprSql: sql, exprValues: values || [] });
+        return this;
+    }
     /**
      * 判定是否空，未设置条件.
      * @returns
@@ -176,6 +189,12 @@ class MysqlCriteria {
      */
     check() {
         for (const criterion of this.criteria) {
+            if (criterion.type === 'expr') {
+                if (!criterion.exprSql) {
+                    throw new exception_1.MysqlException('expr clause exprSql cannot be empty');
+                }
+                continue;
+            }
             if (criterion.type === 'or' || criterion.type === 'and') {
                 if (!criterion.criteria) {
                     throw new exception_1.MysqlException(`${criterion.type} clause cannot be empty`);
@@ -303,6 +322,12 @@ class MysqlCriteria {
                     continue;
                 }
             }
+            // 自定义表达式
+            else if (criterion.type === 'expr' && criterion.exprSql) {
+                sqlFragments.push(`and ${criterion.exprSql} `);
+                values.push(...(criterion.exprValues || []));
+                continue;
+            }
         }
         if (!sqlFragments.length) {
             throw new exception_1.MysqlException('No valid query criteria have been set.');

package/dist/mysql/manager/ops/delete.js

@@ -4,6 +4,7 @@ exports.deleteMany = exports.deleteById = void 0;
 const exception_1 = require("../../exception");
 const utils_1 = require("../utils");
 const criteria_1 = require("./criteria");
+const order_by_1 = require("./order-by");
 /**
  * 按 id 删除.
  *
@@ -44,16 +45,9 @@ async function deleteMany(config, connection, opts) {
     }
     // 排序
     if (opts.orderBy && opts.orderBy.length) {
-        opts.orderBy.forEach((orderBy, idx) => {
-            const [field, sort] = orderBy;
-            if (idx == 0) {
-                sql += ` order by ?? ${sort} `;
-            }
-            else {
-                sql += ` , ?? ${sort} `;
-            }
-            values.push(field);
-        });
+        const ob = (0, order_by_1.buildOrderBy)(opts.orderBy);
+        sql += ob.sql;
+        values.push(...ob.values);
     }
     // 数量限制
     if (opts.limit) {

package/dist/mysql/manager/ops/find.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findFirst = exports.findByIdIn = exports.findSelect = exports.find = exports.findAll = exports.findById = void 0;
 const criteria_1 = require("./criteria");
 const utils_1 = require("../utils");
+const order_by_1 = require("./order-by");
 /**
  * 按 id 查询
  * @param connection
@@ -51,16 +52,9 @@ async function find(config, conn, opts) {
     }
     // 排序
     if (opts.orderBy && opts.orderBy.length) {
-        opts.orderBy.forEach((orderBy, idx) => {
-            const [field, sort] = orderBy;
-            if (idx == 0) {
-                sql += ` order by ?? ${sort} `;
-            }
-            else {
-                sql += ` , ?? ${sort} `;
-            }
-            values.push(field);
-        });
+        const ob = (0, order_by_1.buildOrderBy)(opts.orderBy);
+        sql += ob.sql;
+        values.push(...ob.values);
     }
     // 数量限制
     if (opts.limit) {
@@ -90,16 +84,9 @@ async function findSelect(config, conn, opts) {
     }
     // 排序
     if (opts.orderBy && opts.orderBy.length) {
-        opts.orderBy.forEach((orderBy, idx) => {
-            const [field, sort] = orderBy;
-            if (idx == 0) {
-                sql += ` order by ?? ${sort} `;
-            }
-            else {
-                sql += ` , ?? ${sort} `;
-            }
-            values.push(field);
-        });
+        const ob = (0, order_by_1.buildOrderBy)(opts.orderBy);
+        sql += ob.sql;
+        values.push(...ob.values);
     }
     // 数量限制
     if (opts.limit) {
@@ -150,16 +137,9 @@ orderBy) {
     }
     // 排序
     if (orderBy && orderBy.length) {
-        orderBy.forEach((orderBy, idx) => {
-            const [field, sort] = orderBy;
-            if (idx == 0) {
-                sql += ` order by ?? ${sort} `;
-            }
-            else {
-                sql += ` , ?? ${sort} `;
-            }
-            values.push(field);
-        });
+        const ob = (0, order_by_1.buildOrderBy)(orderBy);
+        sql += ob.sql;
+        values.push(...ob.values);
     }
     sql += ' limit 1';
     const res = await (0, utils_1.promiseQuery)(config, conn, sql, values);

package/dist/mysql/manager/ops/index.js

@@ -9,6 +9,8 @@ tslib_1.__exportStar(require("./exist"), exports);
 tslib_1.__exportStar(require("./find"), exports);
 tslib_1.__exportStar(require("./insert"), exports);
 tslib_1.__exportStar(require("./modify"), exports);
+tslib_1.__exportStar(require("./order-by"), exports);
+tslib_1.__exportStar(require("./upsert"), exports);
 tslib_1.__exportStar(require("./paginate"), exports);
 tslib_1.__exportStar(require("./query"), exports);
 tslib_1.__exportStar(require("./update"), exports);

package/dist/mysql/manager/ops/insert.js

@@ -1,9 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.insertMany = exports.insert = void 0;
+exports.insertMany = exports.insert = exports.processInsertValue = void 0;
 const exception_1 = require("../../exception");
 const utils_1 = require("../utils");
 const utils_2 = require("./utils");
+/**
+ * 处理 insert value，支持表达式
+ * @returns { frag: SQL 片段, values: 参数值数组 }
+ */
+function processInsertValue(value) {
+    if (Array.isArray(value)) {
+        if (value[0] === 'now') {
+            return { frag: 'NOW()', values: [] };
+        }
+        if (value[0] === 'set') {
+            return { frag: '?', values: [(0, utils_2.processColumnValue)(value[1])] };
+        }
+        if (value[0] === 'expr') {
+            return { frag: value[1], values: value[2] || [] };
+        }
+    }
+    return { frag: '?', values: [(0, utils_2.processColumnValue)(value)] };
+}
+exports.processInsertValue = processInsertValue;
 /**
  * 为表插入数据
  * @param connection
@@ -12,7 +31,6 @@ const utils_2 = require("./utils");
  * @returns
  */
 async function insert(config, connection, table, data) {
-    // 插入后的新数据
     // 列信息，使用 set 防止 columns 中重复配置 id 和更新创建时间列
     let columnsSet = new Set();
     // 判定下 id ，如果有值，才在 insert 语句中出现 id 列，否则不出现
@@ -31,15 +49,16 @@ async function insert(config, connection, table, data) {
         columnsSet.add(table.updatedDate.column);
     }
     const columns = Array.from(columnsSet);
-    // 构建 sql
-    const sql = `insert into ??(${columns.map(() => '??').join(',')}) values(${columns
-        .map(() => '?')
-        .join(',')})`;
-    const values = [
-        table.tableName,
-        ...columns,
-        ...columns.map(col => (0, utils_2.processColumnValue)(data[col]))
-    ];
+    // 构建 sql，逐列处理以支持表达式
+    const fragList = [];
+    const insertValues = [];
+    for (const col of columns) {
+        const { frag, values: vs } = processInsertValue(data[col]);
+        fragList.push(frag);
+        insertValues.push(...vs);
+    }
+    const sql = `insert into ??(${columns.map(() => '??').join(',')}) values(${fragList.join(',')})`;
+    const values = [table.tableName, ...columns, ...insertValues];
     const res = await (0, utils_1.promiseQuery)(config, connection, sql, values);
     const packet = res;
     if (packet.affectedRows !== 1) {
@@ -87,14 +106,21 @@ async function insertMany(config, connection, table, list) {
         if (idx > 0) {
             sql += ',';
         }
-        sql += `(${columns.map(() => '?').join(',')})`;
+        const fragList = [];
+        const rowValues = [];
         if (table.createdDate) {
             data[table.createdDate.column] = createdData;
         }
         if (table.updatedDate) {
             data[table.updatedDate.column] = updatedDate;
         }
-        values.push(...columns.map(col => (0, utils_2.processColumnValue)(data[col])));
+        for (const col of columns) {
+            const { frag, values: vs } = processInsertValue(data[col]);
+            fragList.push(frag);
+            rowValues.push(...vs);
+        }
+        sql += `(${fragList.join(',')})`;
+        values.push(...rowValues);
     });
     const res = await (0, utils_1.promiseQuery)(config, connection, sql, values);
     const rsh = res;

package/dist/mysql/manager/ops/order-by.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildOrderBy = void 0;
+/**
+ * 构建 ORDER BY 子句.
+ *
+ * @param orderBy 排序规则
+ * @returns { sql: SQL 片段, values: 参数值数组 }
+ */
+function buildOrderBy(orderBy) {
+    const fragments = [];
+    const values = [];
+    orderBy.forEach((item, idx) => {
+        const prefix = idx === 0 ? ' order by ' : ' , ';
+        if (item.length === 4 && item[0] === 'expr') {
+            const [, exprSql, exprValues, sort] = item;
+            fragments.push(`${prefix}${exprSql} ${sort}`);
+            values.push(...exprValues);
+        }
+        else {
+            const [field, sort] = item;
+            fragments.push(`${prefix}?? ${sort}`);
+            values.push(field);
+        }
+    });
+    return { sql: fragments.join(''), values };
+}
+exports.buildOrderBy = buildOrderBy;

package/dist/mysql/manager/ops/paginate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.paginate = void 0;
+exports.paginateSelect = exports.paginate = void 0;
 const count_1 = require("./count");
 const find_1 = require("./find");
 async function paginate(config, conn, opts) {
@@ -21,3 +21,28 @@ async function paginate(config, conn, opts) {
     };
 }
 exports.paginate = paginate;
+/**
+ * 指定字段分页查询
+ * @param config
+ * @param conn
+ * @param opts
+ */
+async function paginateSelect(config, conn, opts) {
+    const pn = opts.pn && opts.pn >= 1 ? opts.pn : 1;
+    const limit = opts.pz && opts.pz >= 1 && opts.pz <= 1000 ? opts.pz : 20;
+    const offset = (pn - 1) * limit;
+    const list = await (0, find_1.findSelect)(config, conn, {
+        table: opts.table,
+        criteria: opts.criteria,
+        offset,
+        limit,
+        orderBy: opts.orderBy,
+        select: opts.select
+    });
+    const total = await (0, count_1.count)(config, conn, opts.table, opts.criteria);
+    return {
+        total,
+        list
+    };
+}
+exports.paginateSelect = paginateSelect;

package/dist/mysql/manager/ops/update.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateMany = exports.updateOne = exports.partialUpdate = exports.update = void 0;
+exports.updateMany = exports.updateOne = exports.partialUpdate = exports.updatorToSql = exports.update = void 0;
 const exception_1 = require("../../exception");
 const criteria_1 = require("./criteria");
 const utils_1 = require("../utils");
 const utils_2 = require("./utils");
+const order_by_1 = require("./order-by");
 /**
  * 更新
  * @param config
@@ -47,44 +48,47 @@ exports.update = update;
  * 转换更新器
  * @param table
  * @param updater
+ * @param autoUpdateTime 是否自动添加更新时间
  * @returns
  */
 function updatorToSql(table, updater) {
     const values = [];
-    // 更新操作
     const updateFragList = [];
-    // 更新时间
-    if (table.updatedDate) {
-        const updatedDate = table.updatedDate.type === 'date' ? new Date() : new Date().getTime();
-        updateFragList.push(' ?? = ?');
-        values.push(table.updatedDate.column, updatedDate);
-    }
     for (const column in updater) {
-        // 过滤掉id
+        // 过滤掉 id
         if (column === table.id) {
             continue;
         }
+        // 过滤掉 createdDate / updatedDate（自动处理）
+        if ((table.createdDate && column === table.createdDate.column)
+            || (table.updatedDate && column === table.updatedDate.column)) {
+            continue;
+        }
         const val = updater[column];
-        // undefined 表示不参与更新，作用是方便编写一些特殊的逻辑，比如特定情况下不更新
+        // undefined 表示不参与更新
         if (val === undefined) {
             continue;
         }
-        // 兼容将值设置成 null 的情况，和 ['setNull’] 等同
+        // 0.7.0 版本开始，null 和 undefined 一样被忽略更新
+        // 如需设置字段为 NULL，请使用 ['setNull']
         if (val === null) {
-            updateFragList.push(' ?? = NULL ');
-            values.push(column);
             continue;
         }
         if (Array.isArray(val)) {
-            // set null
             if (val[0] === 'setNull') {
                 updateFragList.push(' ?? = NULL ');
                 values.push(column);
                 continue;
             }
             if (val[0] === 'inc') {
+                const incBy = val.length === 1 ? 1 : val[1];
                 updateFragList.push(' ?? = ?? + ? ');
-                values.push(column, column, val[1]);
+                values.push(column, column, incBy);
+                continue;
+            }
+            if (val[0] === 'now') {
+                updateFragList.push(' ?? = NOW() ');
+                values.push(column);
                 continue;
             }
             if (val[0] === 'set') {
@@ -92,12 +96,33 @@ function updatorToSql(table, updater) {
                 values.push(column, (0, utils_2.processColumnValue)(val[1]));
                 continue;
             }
+            if (val[0] === 'concat') {
+                updateFragList.push(' ?? = CONCAT(IFNULL(??, \'\'), ?) ');
+                values.push(column, column, val[1]);
+                continue;
+            }
+            if (val[0] === 'expr') {
+                updateFragList.push(' ?? = ' + val[1] + ' ');
+                values.push(column, ...(val[2] || []));
+                continue;
+            }
         }
         updateFragList.push(' ?? = ? ');
         values.push(column, (0, utils_2.processColumnValue)(val));
     }
+    // 如果没有有效更新字段，抛出异常
+    if (updateFragList.length === 0) {
+        throw new exception_1.MysqlException(`No effective fields to update (null values are ignored since v0.7.0), table: ${table.tableName}, updater: ${JSON.stringify(updater)}`);
+    }
+    // 自动添加更新时间
+    if (table.updatedDate) {
+        const updatedDate = table.updatedDate.type === 'date' ? new Date() : new Date().getTime();
+        updateFragList.push(' ?? = ?');
+        values.push(table.updatedDate.column, updatedDate);
+    }
     return { sql: updateFragList.join(','), values };
 }
+exports.updatorToSql = updatorToSql;
 /**
  * 部分更新
  * @param connection
@@ -113,9 +138,6 @@ async function partialUpdate(config, connection, table, data) {
     if (typeof id !== 'string' && typeof id !== 'number') {
         throw new exception_1.MysqlException('Primary key can only be of string or number type');
     }
-    if (Object.keys(data).length < 2) {
-        throw new exception_1.MysqlException(`Can't do a partial update, data must contain at least one column outside of the primary key，table: ${table.tableName}，column：${JSON.stringify(data)}`);
-    }
     const fieldNames = Object.keys(data);
     for (const name of fieldNames) {
         if (name !== table.id && !table.columns.some(col => col === name)) {
@@ -126,9 +148,6 @@ async function partialUpdate(config, connection, table, data) {
     const values = [table.tableName];
     // 更新操作
     const convertRes = updatorToSql(table, data);
-    if (!convertRes.sql) {
-        throw new exception_1.MysqlException('No fields were specified to be updated!');
-    }
     values.push(...convertRes.values);
     sql += ` set ${convertRes.sql} where ?? = ?`;
     values.push(table.id, id);
@@ -155,9 +174,6 @@ async function updateOne(config, connection, table, query, updater) {
     values.push(table.tableName);
     // 更新操作
     const convertRes = updatorToSql(table, updater);
-    if (!convertRes.sql) {
-        throw new exception_1.MysqlException('No fields were specified to be updated!');
-    }
     sql += ` set ${convertRes.sql} `;
     values.push(...convertRes.values);
     sql += ` where ${mysqlQuery.sql} limit 1`;
@@ -185,25 +201,15 @@ async function updateMany(config, connection, opts) {
     values.push(opts.table.tableName);
     // 更新操作
     const convertRes = updatorToSql(opts.table, opts.updater);
-    if (!convertRes.sql) {
-        throw new exception_1.MysqlException('No fields were specified to be updated!');
-    }
     sql += ` set ${convertRes.sql} `;
     values.push(...convertRes.values);
     sql += ` where ${mysqlQuery.sql} `;
     values.push(...mysqlQuery.values);
     // 排序
     if (opts.orderBy && opts.orderBy.length) {
-        opts.orderBy.forEach((orderBy, idx) => {
-            const [field, sort] = orderBy;
-            if (idx == 0) {
-                sql += ` order by ?? ${sort} `;
-            }
-            else {
-                sql += ` , ?? ${sort} `;
-            }
-            values.push(field);
-        });
+        const ob = (0, order_by_1.buildOrderBy)(opts.orderBy);
+        sql += ob.sql;
+        values.push(...ob.values);
     }
     // 数量限制
     if (opts.limit) {