wok-server 0.5.0 → 0.7.0

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;
+    }
+}

package/dist/mysql/table-info.js

@@ -1,8 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tableValidation = void 0;
-const validation_1 = require("../validation");
-exports.tableValidation = {
-    tableName: [(0, validation_1.notBlank)('表名不能为空')],
-    id: [(0, validation_1.notBlank)('id 不能为空')]
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tableValidation = void 0;
+const validation_1 = require("../validation");
+exports.tableValidation = {
+    tableName: [(0, validation_1.notBlank)('表名不能为空')],
+    id: [(0, validation_1.notBlank)('id 不能为空')]
+};

package/dist/task/daily.js

@@ -1,59 +1,59 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.dailyTaskDelay = exports.scheduleDailyTask = void 0;
-const validation_1 = require("../validation");
-const task_1 = require("./task");
-/**
- * 每日任务.
- * @param hours 时
- * @param minutes 分
- * @param task 要执行的任务
- * @param timeout 任务超时时间，单位毫秒
- * @returns
- */
-function scheduleDailyTask(hours, minutes, task, timeout) {
-    // 校验
-    (0, validation_1.validate)({ hours, minutes }, {
-        hours: [(0, validation_1.notNull)(), (0, validation_1.min)(0), (0, validation_1.max)(23)],
-        minutes: [(0, validation_1.notNull)(), (0, validation_1.min)(0), (0, validation_1.max)(59)]
-    });
-    const taskController = new task_1.TaskController();
-    const delay = dailyTaskDelay(hours, minutes);
-    setTimeout(() => exec(hours, minutes, task, taskController, timeout), delay);
-    return taskController;
-}
-exports.scheduleDailyTask = scheduleDailyTask;
-/**
- * 计算到下次指定时间点的延迟
- * @param hours
- * @param minutes
- */
-function dailyTaskDelay(hours, minutes) {
-    const now = new Date();
-    let todayTime = new Date();
-    todayTime.setHours(hours);
-    todayTime.setMinutes(minutes);
-    todayTime.setSeconds(0);
-    todayTime.setMilliseconds(0);
-    // 如果今天还没有到指定的点，今天就执行，否则明天执行
-    if (todayTime > now) {
-        return todayTime.getTime() - now.getTime();
-    }
-    // 明天时间
-    const oneDayMilliseconds = 1000 * 3600 * 24;
-    const tomorrowTime = todayTime.getTime() + oneDayMilliseconds;
-    return tomorrowTime - now.getTime();
-}
-exports.dailyTaskDelay = dailyTaskDelay;
-function exec(hours, minutes, task, controller, timeout) {
-    Promise.resolve()
-        .then(async () => {
-        if (controller.isStopped()) {
-            return;
-        }
-        await (0, task_1.execTask)(task, timeout);
-        const delay = dailyTaskDelay(hours, minutes);
-        setTimeout(() => exec(hours, minutes, task, controller), delay);
-    })
-        .catch(console.error);
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dailyTaskDelay = exports.scheduleDailyTask = void 0;
+const validation_1 = require("../validation");
+const task_1 = require("./task");
+/**
+ * 每日任务.
+ * @param hours 时
+ * @param minutes 分
+ * @param task 要执行的任务
+ * @param timeout 任务超时时间，单位毫秒
+ * @returns
+ */
+function scheduleDailyTask(hours, minutes, task, timeout) {
+    // 校验
+    (0, validation_1.validate)({ hours, minutes }, {
+        hours: [(0, validation_1.notNull)(), (0, validation_1.min)(0), (0, validation_1.max)(23)],
+        minutes: [(0, validation_1.notNull)(), (0, validation_1.min)(0), (0, validation_1.max)(59)]
+    });
+    const taskController = new task_1.TaskController();
+    const delay = dailyTaskDelay(hours, minutes);
+    setTimeout(() => exec(hours, minutes, task, taskController, timeout), delay);
+    return taskController;
+}
+exports.scheduleDailyTask = scheduleDailyTask;
+/**
+ * 计算到下次指定时间点的延迟
+ * @param hours
+ * @param minutes
+ */
+function dailyTaskDelay(hours, minutes) {
+    const now = new Date();
+    let todayTime = new Date();
+    todayTime.setHours(hours);
+    todayTime.setMinutes(minutes);
+    todayTime.setSeconds(0);
+    todayTime.setMilliseconds(0);
+    // 如果今天还没有到指定的点，今天就执行，否则明天执行
+    if (todayTime > now) {
+        return todayTime.getTime() - now.getTime();
+    }
+    // 明天时间
+    const oneDayMilliseconds = 1000 * 3600 * 24;
+    const tomorrowTime = todayTime.getTime() + oneDayMilliseconds;
+    return tomorrowTime - now.getTime();
+}
+exports.dailyTaskDelay = dailyTaskDelay;
+function exec(hours, minutes, task, controller, timeout) {
+    Promise.resolve()
+        .then(async () => {
+        if (controller.isStopped()) {
+            return;
+        }
+        await (0, task_1.execTask)(task, timeout);
+        const delay = dailyTaskDelay(hours, minutes);
+        setTimeout(() => exec(hours, minutes, task, controller), delay);
+    })
+        .catch(console.error);
+}

package/dist/task/fixed-delay.js

@@ -1,38 +1,38 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.scheduleWithFixedDelay = void 0;
-const log_1 = require("../log");
-const validation_1 = require("../validation");
-const task_1 = require("./task");
-/**
- * 固定延迟执行任务
- * @param initialDelay  第一次执行延迟的时间，单位秒
- * @param delay 每次的延迟时间，单位秒
- * @param task 任务
- * @param timeout 任务超时时间，单位毫秒
- */
-function scheduleWithFixedDelay(initialDelay, delay, task, timeout) {
-    (0, validation_1.validate)({ initialDelay, delay }, {
-        initialDelay: [(0, validation_1.notNull)(), (0, validation_1.min)(0), (0, validation_1.max)(3600 * 24)],
-        delay: [(0, validation_1.notNull)(), (0, validation_1.min)(1), (0, validation_1.max)(3600 * 24)]
-    });
-    const controller = new task_1.TaskController();
-    setTimeout(() => exec(delay, task, controller, timeout), initialDelay * 1000);
-    return controller;
-}
-exports.scheduleWithFixedDelay = scheduleWithFixedDelay;
-function exec(delay, task, controller, timeout) {
-    Promise.resolve()
-        .then(async () => {
-        if (controller.isStopped()) {
-            return;
-        }
-        await (0, task_1.execTask)(task, timeout);
-        // 下次执行
-        setTimeout(() => exec(delay, task, controller), delay * 1000);
-    })
-        .catch(e => {
-        (0, log_1.getLogger)().error(`EXEC TASK ERROR: ${task.name}`, e);
-    })
-        .catch(console.error);
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.scheduleWithFixedDelay = void 0;
+const log_1 = require("../log");
+const validation_1 = require("../validation");
+const task_1 = require("./task");
+/**
+ * 固定延迟执行任务
+ * @param initialDelay  第一次执行延迟的时间，单位秒
+ * @param delay 每次的延迟时间，单位秒
+ * @param task 任务
+ * @param timeout 任务超时时间，单位毫秒
+ */
+function scheduleWithFixedDelay(initialDelay, delay, task, timeout) {
+    (0, validation_1.validate)({ initialDelay, delay }, {
+        initialDelay: [(0, validation_1.notNull)(), (0, validation_1.min)(0), (0, validation_1.max)(3600 * 24)],
+        delay: [(0, validation_1.notNull)(), (0, validation_1.min)(1), (0, validation_1.max)(3600 * 24)]
+    });
+    const controller = new task_1.TaskController();
+    setTimeout(() => exec(delay, task, controller, timeout), initialDelay * 1000);
+    return controller;
+}
+exports.scheduleWithFixedDelay = scheduleWithFixedDelay;
+function exec(delay, task, controller, timeout) {
+    Promise.resolve()
+        .then(async () => {
+        if (controller.isStopped()) {
+            return;
+        }
+        await (0, task_1.execTask)(task, timeout);
+        // 下次执行
+        setTimeout(() => exec(delay, task, controller), delay * 1000);
+    })
+        .catch(e => {
+        (0, log_1.getLogger)().error(`EXEC TASK ERROR: ${task.name}`, e);
+    })
+        .catch(console.error);
+}

package/dist/task/fixed-rate.js

@@ -1,42 +1,42 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.scheduleWithFixedRate = void 0;
-const log_1 = require("../log");
-const validation_1 = require("../validation");
-const task_1 = require("./task");
-/**
- * 固定延迟执行任务
- * @param initialDelay  第一次执行延迟的时间，单位秒
- * @param period 每次的延迟时间，单位秒
- * @param task 任务
- * @param timeout 任务超时时间，单位毫秒
- */
-function scheduleWithFixedRate(initialDelay, period, task, timeout) {
-    (0, validation_1.validate)({ initialDelay, period }, {
-        initialDelay: [(0, validation_1.notNull)(), (0, validation_1.min)(0), (0, validation_1.max)(3600 * 24)],
-        period: [(0, validation_1.notNull)(), (0, validation_1.min)(1), (0, validation_1.max)(3600 * 24)]
-    });
-    const taskController = new task_1.TaskController();
-    setTimeout(() => exec(period, task, taskController, timeout), initialDelay * 1000);
-    return taskController;
-}
-exports.scheduleWithFixedRate = scheduleWithFixedRate;
-function exec(fixedDelay, task, controller, timeout) {
-    Promise.resolve()
-        .then(async () => {
-        if (controller.isStopped()) {
-            return;
-        }
-        const res = await (0, task_1.execTask)(task, timeout);
-        // 下次执行
-        let delay = res.start + fixedDelay * 1000 - new Date().getTime();
-        if (delay < 0) {
-            delay = 0;
-        }
-        setTimeout(() => exec(fixedDelay, task, controller), delay);
-    })
-        .catch(e => {
-        (0, log_1.getLogger)().error(`EXEC TASK ERROR: ${task.name}`, e);
-    })
-        .catch(console.error);
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.scheduleWithFixedRate = void 0;
+const log_1 = require("../log");
+const validation_1 = require("../validation");
+const task_1 = require("./task");
+/**
+ * 固定延迟执行任务
+ * @param initialDelay  第一次执行延迟的时间，单位秒
+ * @param period 每次的延迟时间，单位秒
+ * @param task 任务
+ * @param timeout 任务超时时间，单位毫秒
+ */
+function scheduleWithFixedRate(initialDelay, period, task, timeout) {
+    (0, validation_1.validate)({ initialDelay, period }, {
+        initialDelay: [(0, validation_1.notNull)(), (0, validation_1.min)(0), (0, validation_1.max)(3600 * 24)],
+        period: [(0, validation_1.notNull)(), (0, validation_1.min)(1), (0, validation_1.max)(3600 * 24)]
+    });
+    const taskController = new task_1.TaskController();
+    setTimeout(() => exec(period, task, taskController, timeout), initialDelay * 1000);
+    return taskController;
+}
+exports.scheduleWithFixedRate = scheduleWithFixedRate;
+function exec(fixedDelay, task, controller, timeout) {
+    Promise.resolve()
+        .then(async () => {
+        if (controller.isStopped()) {
+            return;
+        }
+        const res = await (0, task_1.execTask)(task, timeout);
+        // 下次执行
+        let delay = res.start + fixedDelay * 1000 - new Date().getTime();
+        if (delay < 0) {
+            delay = 0;
+        }
+        setTimeout(() => exec(fixedDelay, task, controller), delay);
+    })
+        .catch(e => {
+        (0, log_1.getLogger)().error(`EXEC TASK ERROR: ${task.name}`, e);
+    })
+        .catch(console.error);
+}

package/dist/task/index.js

@@ -1,9 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TaskController = void 0;
-const tslib_1 = require("tslib");
-var task_1 = require("./task");
-Object.defineProperty(exports, "TaskController", { enumerable: true, get: function () { return task_1.TaskController; } });
-tslib_1.__exportStar(require("./fixed-delay"), exports);
-tslib_1.__exportStar(require("./fixed-rate"), exports);
-tslib_1.__exportStar(require("./daily"), exports);
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TaskController = void 0;
+const tslib_1 = require("tslib");
+var task_1 = require("./task");
+Object.defineProperty(exports, "TaskController", { enumerable: true, get: function () { return task_1.TaskController; } });
+tslib_1.__exportStar(require("./fixed-delay"), exports);
+tslib_1.__exportStar(require("./fixed-rate"), exports);
+tslib_1.__exportStar(require("./daily"), exports);