wok-server 0.5.0 → 0.6.0

package/dist/mysql/manager/tx-strict.js

@@ -1,103 +1,103 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlStrictTxSession = void 0;
-const tx_1 = require("./tx");
-const exception_1 = require("../exception");
-/**
- * 严格 mysql 事务会话，会禁用一些操作.
- */
-class MysqlStrictTxSession extends tx_1.MysqlTxSession {
-    config;
-    #opsCount = 0;
-    constructor(config, conn) {
-        super(config, conn);
-        this.config = config;
-    }
-    /**
-     * 为操作计数，检查是否操作次数过多.
-     */
-    #checkAndAddOpsCount() {
-        if (this.#opsCount >= this.config.maxOpsInStrictTx) {
-            throw new exception_1.MysqlException('Too many operations in a strict transaction.');
-        }
-        this.#opsCount++;
-    }
-    findById(table, id) {
-        this.#checkAndAddOpsCount();
-        return super.findById(table, id);
-    }
-    findByIdIn(table, ids) {
-        if (ids.length > 100) {
-            throw new exception_1.MysqlException(`The augument ids length(${ids.length}) passed to findByIdIn in a strict transaction is too large .`);
-        }
-        this.#checkAndAddOpsCount();
-        return super.findByIdIn(table, ids);
-    }
-    existsBy(table, criteria) {
-        this.#checkAndAddOpsCount();
-        return super.existsBy(table, criteria);
-    }
-    existsById(table, id) {
-        this.#checkAndAddOpsCount();
-        return super.existsById(table, id);
-    }
-    deleteById(table, id) {
-        this.#checkAndAddOpsCount();
-        return super.deleteById(table, id);
-    }
-    deleteOne(table, criteria) {
-        this.#checkAndAddOpsCount();
-        return super.deleteOne(table, criteria);
-    }
-    deleteMany(opts) {
-        throw new exception_1.MysqlException('Prohibited to use deleteBy in a strict transaction.');
-    }
-    findAll(table) {
-        throw new exception_1.MysqlException('Prohibited to use findAll in a strict transaction.');
-    }
-    findFirst(table, criteria) {
-        this.#checkAndAddOpsCount();
-        return super.findFirst(table, criteria);
-    }
-    insert(table, data) {
-        this.#checkAndAddOpsCount();
-        return super.insert(table, data);
-    }
-    insertMany(table, list) {
-        throw new exception_1.MysqlException('Prohibited to use insertMany in a strict transaction.');
-    }
-    update(table, data) {
-        this.#checkAndAddOpsCount();
-        return super.update(table, data);
-    }
-    updateMany(opts) {
-        throw new exception_1.MysqlException('Prohibited to use updateMany in a strict transaction.');
-    }
-    updateOne(table, query, updater) {
-        this.#checkAndAddOpsCount();
-        return super.updateOne(table, query, updater);
-    }
-    partialUpdate(table, data) {
-        this.#checkAndAddOpsCount();
-        return super.partialUpdate(table, data);
-    }
-    find(opts) {
-        throw new exception_1.MysqlException('Prohibited to use find in a strict transaction.');
-    }
-    findSelect(opts) {
-        throw new exception_1.MysqlException('Prohibited to use findSelect in a strict transaction.');
-    }
-    count(table, criteria) {
-        throw new exception_1.MysqlException('Prohibited to use count in a strict transaction.');
-    }
-    paginate(opts) {
-        throw new exception_1.MysqlException('Prohibited to use paginate in a strict transaction.');
-    }
-    query(sql, values) {
-        throw new exception_1.MysqlException('Prohibited to use query in a strict transaction.');
-    }
-    modify(sql, values) {
-        throw new exception_1.MysqlException('Prohibited to use modify in a strict transaction.');
-    }
-}
-exports.MysqlStrictTxSession = MysqlStrictTxSession;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MysqlStrictTxSession = void 0;
+const tx_1 = require("./tx");
+const exception_1 = require("../exception");
+/**
+ * 严格 mysql 事务会话，会禁用一些操作.
+ */
+class MysqlStrictTxSession extends tx_1.MysqlTxSession {
+    config;
+    #opsCount = 0;
+    constructor(config, conn) {
+        super(config, conn);
+        this.config = config;
+    }
+    /**
+     * 为操作计数，检查是否操作次数过多.
+     */
+    #checkAndAddOpsCount() {
+        if (this.#opsCount >= this.config.maxOpsInStrictTx) {
+            throw new exception_1.MysqlException('Too many operations in a strict transaction.');
+        }
+        this.#opsCount++;
+    }
+    findById(table, id) {
+        this.#checkAndAddOpsCount();
+        return super.findById(table, id);
+    }
+    findByIdIn(table, ids) {
+        if (ids.length > 100) {
+            throw new exception_1.MysqlException(`The augument ids length(${ids.length}) passed to findByIdIn in a strict transaction is too large .`);
+        }
+        this.#checkAndAddOpsCount();
+        return super.findByIdIn(table, ids);
+    }
+    existsBy(table, criteria) {
+        this.#checkAndAddOpsCount();
+        return super.existsBy(table, criteria);
+    }
+    existsById(table, id) {
+        this.#checkAndAddOpsCount();
+        return super.existsById(table, id);
+    }
+    deleteById(table, id) {
+        this.#checkAndAddOpsCount();
+        return super.deleteById(table, id);
+    }
+    deleteOne(table, criteria) {
+        this.#checkAndAddOpsCount();
+        return super.deleteOne(table, criteria);
+    }
+    deleteMany(opts) {
+        throw new exception_1.MysqlException('Prohibited to use deleteBy in a strict transaction.');
+    }
+    findAll(table) {
+        throw new exception_1.MysqlException('Prohibited to use findAll in a strict transaction.');
+    }
+    findFirst(table, criteria) {
+        this.#checkAndAddOpsCount();
+        return super.findFirst(table, criteria);
+    }
+    insert(table, data) {
+        this.#checkAndAddOpsCount();
+        return super.insert(table, data);
+    }
+    insertMany(table, list) {
+        throw new exception_1.MysqlException('Prohibited to use insertMany in a strict transaction.');
+    }
+    update(table, data) {
+        this.#checkAndAddOpsCount();
+        return super.update(table, data);
+    }
+    updateMany(opts) {
+        throw new exception_1.MysqlException('Prohibited to use updateMany in a strict transaction.');
+    }
+    updateOne(table, query, updater) {
+        this.#checkAndAddOpsCount();
+        return super.updateOne(table, query, updater);
+    }
+    partialUpdate(table, data) {
+        this.#checkAndAddOpsCount();
+        return super.partialUpdate(table, data);
+    }
+    find(opts) {
+        throw new exception_1.MysqlException('Prohibited to use find in a strict transaction.');
+    }
+    findSelect(opts) {
+        throw new exception_1.MysqlException('Prohibited to use findSelect in a strict transaction.');
+    }
+    count(table, criteria) {
+        throw new exception_1.MysqlException('Prohibited to use count in a strict transaction.');
+    }
+    paginate(opts) {
+        throw new exception_1.MysqlException('Prohibited to use paginate in a strict transaction.');
+    }
+    query(sql, values) {
+        throw new exception_1.MysqlException('Prohibited to use query in a strict transaction.');
+    }
+    modify(sql, values) {
+        throw new exception_1.MysqlException('Prohibited to use modify in a strict transaction.');
+    }
+}
+exports.MysqlStrictTxSession = MysqlStrictTxSession;

package/dist/mysql/manager/tx.js

@@ -1,30 +1,30 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlTxSession = void 0;
-const base_1 = require("./base");
-const exception_1 = require("../exception");
-/**
- * mysql 事务会话.
- */
-class MysqlTxSession extends base_1.BaseMysqlManager {
-    /**
-     * 中止标识
-     */
-    #aborted = false;
-    constructor(config, conn) {
-        super({ config, connection: conn });
-    }
-    queryWithConnection(queryFn) {
-        if (this.#aborted) {
-            throw new exception_1.MysqlException('Session has been aborted!');
-        }
-        return super.queryWithConnection(queryFn);
-    }
-    /**
-     * 中止，被中止后的会话不能再进行任何操作
-     */
-    abort() {
-        this.#aborted = true;
-    }
-}
-exports.MysqlTxSession = MysqlTxSession;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MysqlTxSession = void 0;
+const base_1 = require("./base");
+const exception_1 = require("../exception");
+/**
+ * mysql 事务会话.
+ */
+class MysqlTxSession extends base_1.BaseMysqlManager {
+    /**
+     * 中止标识
+     */
+    #aborted = false;
+    constructor(config, conn) {
+        super({ config, connection: conn });
+    }
+    queryWithConnection(queryFn) {
+        if (this.#aborted) {
+            throw new exception_1.MysqlException('Session has been aborted!');
+        }
+        return super.queryWithConnection(queryFn);
+    }
+    /**
+     * 中止，被中止后的会话不能再进行任何操作
+     */
+    abort() {
+        this.#aborted = true;
+    }
+}
+exports.MysqlTxSession = MysqlTxSession;

package/dist/mysql/manager/utils.js

@@ -1,56 +1,56 @@
-"use strict";
-// 工具集，将一些驱动的方法进行 promise 封装，方便操作
-// 程序中没有使用 mysql2/promise ，主要是在测试中发现 mysql2/promise 不是很可靠
-// mysql2/promise 在查询方便处理的不是很好
-// query 查询在没有记录的情况下仍然会返回列表，里面会包含列定义信息，不符合预期
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.promiseGetConnection = exports.promiseQuery = void 0;
-const mysql2_1 = require("mysql2");
-const log_1 = require("../../log");
-/**
- * 查询，适用于各种 sql 的执行
- * @param config
- * @param conn
- * @param sql
- * @param values
- * @returns
- */
-function promiseQuery(config, conn, sql, values = []) {
-    return new Promise((res, rej) => {
-        const start = new Date().getTime();
-        conn.query(sql, values, (err, result) => {
-            if (config.slowSqlWarn) {
-                const cost = new Date().getTime() - start;
-                // 慢 sql 警告
-                if (cost > config.slowSqlMs) {
-                    (0, log_1.getLogger)().warn(`[mysql slow sql] ${cost}ms ${(0, mysql2_1.format)(sql, values)}`);
-                }
-            }
-            if (err) {
-                rej(err);
-            }
-            else {
-                res(result);
-            }
-        });
-    });
-}
-exports.promiseQuery = promiseQuery;
-/**
- * 获取连接
- * @param pool
- * @returns
- */
-function promiseGetConnection(pool) {
-    return new Promise((res, rej) => {
-        pool.getConnection((err, conn) => {
-            if (err) {
-                rej(err);
-            }
-            else {
-                res(conn);
-            }
-        });
-    });
-}
-exports.promiseGetConnection = promiseGetConnection;
+"use strict";
+// 工具集，将一些驱动的方法进行 promise 封装，方便操作
+// 程序中没有使用 mysql2/promise ，主要是在测试中发现 mysql2/promise 不是很可靠
+// mysql2/promise 在查询方便处理的不是很好
+// query 查询在没有记录的情况下仍然会返回列表，里面会包含列定义信息，不符合预期
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.promiseGetConnection = exports.promiseQuery = void 0;
+const mysql2_1 = require("mysql2");
+const log_1 = require("../../log");
+/**
+ * 查询，适用于各种 sql 的执行
+ * @param config
+ * @param conn
+ * @param sql
+ * @param values
+ * @returns
+ */
+function promiseQuery(config, conn, sql, values = []) {
+    return new Promise((res, rej) => {
+        const start = new Date().getTime();
+        conn.query(sql, values, (err, result) => {
+            if (config.slowSqlWarn) {
+                const cost = new Date().getTime() - start;
+                // 慢 sql 警告
+                if (cost > config.slowSqlMs) {
+                    (0, log_1.getLogger)().warn(`[mysql slow sql] ${cost}ms ${(0, mysql2_1.format)(sql, values)}`);
+                }
+            }
+            if (err) {
+                rej(err);
+            }
+            else {
+                res(result);
+            }
+        });
+    });
+}
+exports.promiseQuery = promiseQuery;
+/**
+ * 获取连接
+ * @param pool
+ * @returns
+ */
+function promiseGetConnection(pool) {
+    return new Promise((res, rej) => {
+        pool.getConnection((err, conn) => {
+            if (err) {
+                rej(err);
+            }
+            else {
+                res(conn);
+            }
+        });
+    });
+}
+exports.promiseGetConnection = promiseGetConnection;

package/dist/mysql/migration.js

@@ -1,136 +1,136 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.migrate = void 0;
-const fs_1 = require("fs");
-const path_1 = require("path");
-const log_1 = require("../log");
-const exception_1 = require("./exception");
-const utils_1 = require("./manager/utils");
-/**
- * 迁移.
- * @param config
- * @param conn
- */
-async function migrate(config, conn) {
-    const versionDir = config.versionControlDir;
-    // 查找文件
-    const dir = (0, path_1.isAbsolute)(versionDir) ? versionDir : (0, path_1.resolve)(process.cwd(), versionDir);
-    if (!(0, fs_1.existsSync)(dir)) {
-        throw new Error(`Directory ${versionDir} does not exist`);
-    }
-    const versions = [];
-    // 忽略隐藏文件
-    const files = (0, fs_1.readdirSync)(dir).filter(file => !file.startsWith('.'));
-    for (const file of files) {
-        const filePath = (0, path_1.resolve)(dir, file);
-        const stat = (0, fs_1.statSync)(filePath);
-        if (!stat.isFile()) {
-            continue;
-        }
-        if (!file.endsWith('.sql')) {
-            throw new Error(`版本文件名没有以 .sql 为后缀：${file}`);
-        }
-        const version = parseInt(file.substring(0, file.length - 4));
-        if (isNaN(version)) {
-            throw new Error(`Version file is not named with a number：${file}`);
-        }
-        versions.push({ version, filePath });
-    }
-    // 排序，判定顺序
-    versions.sort((o1, o2) => o1.version - o2.version);
-    for (let i = 0; i < versions.length; i++) {
-        const version = versions[i];
-        if (version.version !== i + 1) {
-            throw new Error(`The SQL version number must start from 1 and increment one by one，error version：${version.version}`);
-        }
-    }
-    await createVersionTableIfNotExist(config, conn);
-    // 在事务中执行版本管理，主要目的是为了通过锁来协调多个进程同时启动的情况
-    // 事务不能保存一个版本处理成功就完整回退，如有错误，仍然需要手动调整后再操作
-    await (0, utils_1.promiseQuery)(config, conn, `SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED`);
-    await new Promise((resolve, reject) => {
-        conn.beginTransaction(err => {
-            if (err) {
-                reject(err);
-            }
-            else {
-                resolve();
-            }
-        });
-    });
-    try {
-        // 执行 sql, 判定当前版本
-        let currentVersion = await getCurrentVersion(config, conn);
-        if (typeof currentVersion !== 'number') {
-            // 插入初始版本号
-            await (0, utils_1.promiseQuery)(config, conn, 'insert `db_version`(`version`) values (0)');
-        }
-        const filnalCurrentVersion = currentVersion || 0;
-        const pendingVersions = versions.filter(ver => ver.version > filnalCurrentVersion);
-        if (!pendingVersions.length) {
-            (0, log_1.getLogger)().info('The SQL version is already the latest.');
-            return;
-        }
-        const nextVersion = filnalCurrentVersion + 1;
-        if (pendingVersions[0].version !== nextVersion) {
-            throw new exception_1.MysqlException(`MySQL migration error, the next version should be ${nextVersion}，but current is ${pendingVersions[0].version}`);
-        }
-        for (const verion of pendingVersions) {
-            (0, log_1.getLogger)().info(`Mysql migrating, version: ${verion.version}`);
-            let sql = (0, fs_1.readFileSync)(verion.filePath, { encoding: 'utf-8' });
-            await (0, utils_1.promiseQuery)(config, conn, sql);
-            // 版本号
-            await (0, utils_1.promiseQuery)(config, conn, `UPDATE db_version SET version=${verion.version};`);
-        }
-        // 提交
-        await new Promise((resolve, reject) => {
-            conn.commit(err => {
-                if (err) {
-                    reject(err);
-                }
-                else {
-                    resolve();
-                }
-            });
-        });
-        (0, log_1.getLogger)().info('Mysql migration finished.');
-    }
-    catch (e) {
-        // 异常回退，仅能回退 dml 操作，对 ddl 无效
-        await new Promise((resolve, reject) => {
-            conn.rollback(err => {
-                if (err) {
-                    reject(err);
-                }
-                else {
-                    resolve();
-                }
-            });
-        });
-        throw e;
-    }
-}
-exports.migrate = migrate;
-async function createVersionTableIfNotExist(config, conn) {
-    await (0, utils_1.promiseQuery)(config, conn, 'CREATE TABLE IF NOT EXISTS `db_version` (' +
-        '  `version` int NOT NULL,' +
-        '  PRIMARY KEY (`version`)' +
-        ') ENGINE = innodb DEFAULT CHARACTER SET = "utf8mb4" ' +
-        'COLLATE = "utf8mb4_unicode_ci";');
-}
-/**
- * 获取当前版本，使用 for update 加锁，用于协调多进程并发场景
- * @param config
- * @param conn
- * @returns
- */
-async function getCurrentVersion(config, conn) {
-    const res = await (0, utils_1.promiseQuery)(config, conn, 'select version from `db_version` for update');
-    const rows = res;
-    if (rows.length >= 1) {
-        return rows[0].version;
-    }
-    else {
-        return null;
-    }
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.migrate = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const log_1 = require("../log");
+const exception_1 = require("./exception");
+const utils_1 = require("./manager/utils");
+/**
+ * 迁移.
+ * @param config
+ * @param conn
+ */
+async function migrate(config, conn) {
+    const versionDir = config.versionControlDir;
+    // 查找文件
+    const dir = (0, path_1.isAbsolute)(versionDir) ? versionDir : (0, path_1.resolve)(process.cwd(), versionDir);
+    if (!(0, fs_1.existsSync)(dir)) {
+        throw new Error(`Directory ${versionDir} does not exist`);
+    }
+    const versions = [];
+    // 忽略隐藏文件
+    const files = (0, fs_1.readdirSync)(dir).filter(file => !file.startsWith('.'));
+    for (const file of files) {
+        const filePath = (0, path_1.resolve)(dir, file);
+        const stat = (0, fs_1.statSync)(filePath);
+        if (!stat.isFile()) {
+            continue;
+        }
+        if (!file.endsWith('.sql')) {
+            throw new Error(`版本文件名没有以 .sql 为后缀：${file}`);
+        }
+        const version = parseInt(file.substring(0, file.length - 4));
+        if (isNaN(version)) {
+            throw new Error(`Version file is not named with a number：${file}`);
+        }
+        versions.push({ version, filePath });
+    }
+    // 排序，判定顺序
+    versions.sort((o1, o2) => o1.version - o2.version);
+    for (let i = 0; i < versions.length; i++) {
+        const version = versions[i];
+        if (version.version !== i + 1) {
+            throw new Error(`The SQL version number must start from 1 and increment one by one，error version：${version.version}`);
+        }
+    }
+    await createVersionTableIfNotExist(config, conn);
+    // 在事务中执行版本管理，主要目的是为了通过锁来协调多个进程同时启动的情况
+    // 事务不能保存一个版本处理成功就完整回退，如有错误，仍然需要手动调整后再操作
+    await (0, utils_1.promiseQuery)(config, conn, `SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED`);
+    await new Promise((resolve, reject) => {
+        conn.beginTransaction(err => {
+            if (err) {
+                reject(err);
+            }
+            else {
+                resolve();
+            }
+        });
+    });
+    try {
+        // 执行 sql, 判定当前版本
+        let currentVersion = await getCurrentVersion(config, conn);
+        if (typeof currentVersion !== 'number') {
+            // 插入初始版本号
+            await (0, utils_1.promiseQuery)(config, conn, 'insert `db_version`(`version`) values (0)');
+        }
+        const filnalCurrentVersion = currentVersion || 0;
+        const pendingVersions = versions.filter(ver => ver.version > filnalCurrentVersion);
+        if (!pendingVersions.length) {
+            (0, log_1.getLogger)().info('The SQL version is already the latest.');
+            return;
+        }
+        const nextVersion = filnalCurrentVersion + 1;
+        if (pendingVersions[0].version !== nextVersion) {
+            throw new exception_1.MysqlException(`MySQL migration error, the next version should be ${nextVersion}，but current is ${pendingVersions[0].version}`);
+        }
+        for (const verion of pendingVersions) {
+            (0, log_1.getLogger)().info(`Mysql migrating, version: ${verion.version}`);
+            let sql = (0, fs_1.readFileSync)(verion.filePath, { encoding: 'utf-8' });
+            await (0, utils_1.promiseQuery)(config, conn, sql);
+            // 版本号
+            await (0, utils_1.promiseQuery)(config, conn, `UPDATE db_version SET version=${verion.version};`);
+        }
+        // 提交
+        await new Promise((resolve, reject) => {
+            conn.commit(err => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve();
+                }
+            });
+        });
+        (0, log_1.getLogger)().info('Mysql migration finished.');
+    }
+    catch (e) {
+        // 异常回退，仅能回退 dml 操作，对 ddl 无效
+        await new Promise((resolve, reject) => {
+            conn.rollback(err => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve();
+                }
+            });
+        });
+        throw e;
+    }
+}
+exports.migrate = migrate;
+async function createVersionTableIfNotExist(config, conn) {
+    await (0, utils_1.promiseQuery)(config, conn, 'CREATE TABLE IF NOT EXISTS `db_version` (' +
+        '  `version` int NOT NULL,' +
+        '  PRIMARY KEY (`version`)' +
+        ') ENGINE = innodb DEFAULT CHARACTER SET = "utf8mb4" ' +
+        'COLLATE = "utf8mb4_unicode_ci";');
+}
+/**
+ * 获取当前版本，使用 for update 加锁，用于协调多进程并发场景
+ * @param config
+ * @param conn
+ * @returns
+ */
+async function getCurrentVersion(config, conn) {
+    const res = await (0, utils_1.promiseQuery)(config, conn, 'select version from `db_version` for update');
+    const rows = res;
+    if (rows.length >= 1) {
+        return rows[0].version;
+    }
+    else {
+        return null;
+    }
+}