wok-server 0.4.10 → 0.4.12

package/dist/mysql/manager/base.js

@@ -171,9 +171,6 @@ class BaseMysqlManager {
      * @returns 更新是否成功
      */
     updateOne(table, criteria, updater) {
-        if (!Object.keys(criteria).length) {
-            throw new exception_1.MysqlException('criteria cannot be empty !');
-        }
         if (!Object.keys(updater).length) {
             throw new exception_1.MysqlException('updater cannot be empty !');
         }

package/dist/task/daily.js

@@ -8,9 +8,10 @@ const task_1 = require("./task");
  * @param hours 时
  * @param minutes 分
  * @param task 要执行的任务
+ * @param timeout 任务超时时间，单位毫秒
  * @returns
  */
-function scheduleDailyTask(hours, minutes, task) {
+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)],
@@ -18,7 +19,7 @@ function scheduleDailyTask(hours, minutes, task) {
     });
     const taskController = new task_1.TaskController();
     const delay = dailyTaskDelay(hours, minutes);
-    setTimeout(() => exec(hours, minutes, task, taskController), delay);
+    setTimeout(() => exec(hours, minutes, task, taskController, timeout), delay);
     return taskController;
 }
 exports.scheduleDailyTask = scheduleDailyTask;
@@ -44,13 +45,13 @@ function dailyTaskDelay(hours, minutes) {
     return tomorrowTime - now.getTime();
 }
 exports.dailyTaskDelay = dailyTaskDelay;
-function exec(hours, minutes, task, controller) {
+function exec(hours, minutes, task, controller, timeout) {
     Promise.resolve()
         .then(async () => {
         if (controller.isStopped()) {
             return;
         }
-        await (0, task_1.execTask)(task);
+        await (0, task_1.execTask)(task, timeout);
         const delay = dailyTaskDelay(hours, minutes);
         setTimeout(() => exec(hours, minutes, task, controller), delay);
     })

package/dist/task/fixed-delay.js

@@ -9,24 +9,25 @@ const task_1 = require("./task");
  * @param initialDelay  第一次执行延迟的时间，单位秒
  * @param delay 每次的延迟时间，单位秒
  * @param task 任务
+ * @param timeout 任务超时时间，单位毫秒
  */
-function scheduleWithFixedDelay(initialDelay, delay, task) {
+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), initialDelay * 1000);
+    setTimeout(() => exec(delay, task, controller, timeout), initialDelay * 1000);
     return controller;
 }
 exports.scheduleWithFixedDelay = scheduleWithFixedDelay;
-function exec(delay, task, controller) {
+function exec(delay, task, controller, timeout) {
     Promise.resolve()
         .then(async () => {
         if (controller.isStopped()) {
             return;
         }
-        await (0, task_1.execTask)(task);
+        await (0, task_1.execTask)(task, timeout);
         // 下次执行
         setTimeout(() => exec(delay, task, controller), delay * 1000);
     })

package/dist/task/fixed-rate.js

@@ -9,24 +9,25 @@ const task_1 = require("./task");
  * @param initialDelay  第一次执行延迟的时间，单位秒
  * @param period 每次的延迟时间，单位秒
  * @param task 任务
+ * @param timeout 任务超时时间，单位毫秒
  */
-function scheduleWithFixedRate(initialDelay, period, task) {
+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), initialDelay * 1000);
+    setTimeout(() => exec(period, task, taskController, timeout), initialDelay * 1000);
     return taskController;
 }
 exports.scheduleWithFixedRate = scheduleWithFixedRate;
-function exec(fixedDelay, task, controller) {
+function exec(fixedDelay, task, controller, timeout) {
     Promise.resolve()
         .then(async () => {
         if (controller.isStopped()) {
             return;
         }
-        const res = await (0, task_1.execTask)(task);
+        const res = await (0, task_1.execTask)(task, timeout);
         // 下次执行
         let delay = res.start + fixedDelay * 1000 - new Date().getTime();
         if (delay < 0) {

package/dist/task/task.js

@@ -18,13 +18,27 @@ exports.TaskController = TaskController;
 /**
  * 任务执行，封装任务执行过程中的一些通用信息输出和异常控制.
  * @param task
+ * @param timeout 任务超时时间，单位毫秒
  * @returns
  */
-async function execTask(task) {
+async function execTask(task, timeout) {
     const start = new Date().getTime();
     try {
         (0, log_1.getLogger)().debug(`START TASK：${task.name}`);
-        await task.run();
+        // 支持任务超时设置
+        if (timeout && timeout > 0) {
+            await Promise.race([
+                task.run(),
+                new Promise((_, reject) => {
+                    setTimeout(() => {
+                        reject('The task has timed out.');
+                    }, timeout);
+                })
+            ]);
+        }
+        else {
+            await task.run();
+        }
     }
     catch (e) {
         (0, log_1.getLogger)().error(`TASK ERROR: ${task.name}`, e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wok-server",
-  "version": "0.4.10",
+  "version": "0.4.12",
   "packageManager": "pnpm@8.9.0",
   "description": "一个基于 NodeJs 和 TypeScript 的后端框架，轻量级、克制、简洁。A lightweight, restrained, and concise backend framework based on Node.js and TypeScript.",
   "scripts": {

package/types/mysql/manager/base.d.ts

@@ -116,7 +116,7 @@ export declare abstract class BaseMysqlManager {
      * @param updater
      * @returns 更新是否成功
      */
-    updateOne<T>(table: Table<T>, criteria: Partial<T>, updater: Updater<T>): Promise<boolean>;
+    updateOne<T>(table: Table<T>, criteria: MixCriteria<T>, updater: Updater<T>): Promise<boolean>;
     /**
      * 部分更新
      * @param table 表信息

package/types/mysql/manager/ops/update.d.ts

@@ -39,7 +39,7 @@ export declare function partialUpdate<T>(config: MysqlConfig, connection: PoolCo
  * @param query
  * @param data
  */
-export declare function updateOne<T>(config: MysqlConfig, connection: PoolConnection, table: Table<T>, query: Partial<T>, updater: Updater<T>): Promise<boolean>;
+export declare function updateOne<T>(config: MysqlConfig, connection: PoolConnection, table: Table<T>, query: MixCriteria<T>, updater: Updater<T>): Promise<boolean>;
 /**
  * 更新选项
  */

package/types/task/daily.d.ts

@@ -4,9 +4,10 @@ import { Task, TaskController } from './task';
  * @param hours 时
  * @param minutes 分
  * @param task 要执行的任务
+ * @param timeout 任务超时时间，单位毫秒
  * @returns
  */
-export declare function scheduleDailyTask(hours: number, minutes: number, task: Task): TaskController;
+export declare function scheduleDailyTask(hours: number, minutes: number, task: Task, timeout?: number): TaskController;
 /**
  * 计算到下次指定时间点的延迟
  * @param hours

package/types/task/fixed-delay.d.ts

@@ -4,5 +4,6 @@ import { Task, TaskController } from './task';
  * @param initialDelay  第一次执行延迟的时间，单位秒
  * @param delay 每次的延迟时间，单位秒
  * @param task 任务
+ * @param timeout 任务超时时间，单位毫秒
  */
-export declare function scheduleWithFixedDelay(initialDelay: number, delay: number, task: Task): TaskController;
+export declare function scheduleWithFixedDelay(initialDelay: number, delay: number, task: Task, timeout?: number): TaskController;

package/types/task/fixed-rate.d.ts

@@ -4,5 +4,6 @@ import { Task, TaskController } from './task';
  * @param initialDelay  第一次执行延迟的时间，单位秒
  * @param period 每次的延迟时间，单位秒
  * @param task 任务
+ * @param timeout 任务超时时间，单位毫秒
  */
-export declare function scheduleWithFixedRate(initialDelay: number, period: number, task: Task): TaskController;
+export declare function scheduleWithFixedRate(initialDelay: number, period: number, task: Task, timeout?: number): TaskController;

package/types/task/task.d.ts

@@ -24,9 +24,10 @@ export declare class TaskController {
 /**
  * 任务执行，封装任务执行过程中的一些通用信息输出和异常控制.
  * @param task
+ * @param timeout 任务超时时间，单位毫秒
  * @returns
  */
-export declare function execTask(task: Task): Promise<{
+export declare function execTask(task: Task, timeout?: number): Promise<{
     start: number;
     cost: number;
     end: number;