chanjs 1.1.6 → 1.1.7

package/core/helper.js

@@ -71,3 +71,30 @@ export const loadWebToEnd = function(module=[]){
   }
   return module;
 }
+
+
+// import { z } from "zod";
+
+export const zodValidator = (schemas) => (req, res, next) => {
+  // 分别验证 headers/params/query/body
+  const sections = {
+    headers: schemas.headers,
+    params: schemas.params,
+    query: schemas.query,
+    body: schemas.body
+  };
+
+  for (const [key, schema] of Object.entries(sections)) {
+    if (!schema) continue;
+    
+    const result = schema.safeParse(req[key]);
+    if (!result.success) {
+      // 返回首个错误信息
+      const firstError = result.error.errors[0];
+      return res.status(400).json({ error: firstError.message });
+    }
+    // 将验证后的数据挂载到 req 对象
+    req[key] = result.data;
+  }
+  next();
+};

package/core/lib/cache.js

@@ -1,4 +1,4 @@
-class Cache {
+export default class Cache {
     constructor(maxSize = 1000) {
       this.cache = new Map(); // 使用 Map 存储缓存数据
       this.maxSize = maxSize; // 缓存最大容量
@@ -104,7 +104,6 @@ class Cache {
     }
 }
 
-export default new Cache();
   
 //   // 示例用法
 //   const cache = new SimpleCache(100); // 设置缓存最大容量为 100

package/core/lib/task.js

@@ -0,0 +1,140 @@
+const schedule = require('node-schedule');
+
+export default class Task {
+  constructor(config = {}) {
+    this.tasks = new Map();
+    this.config = {
+      taskPrefix: 'TASK_',
+      maxRetry: 3,
+      onError: (id, err) => console.error(`[${id}] Error: ${err.message}`),
+      ...config
+    };
+  }
+
+  /**
+   * 添加定时任务
+   * @param {string|Date|Object} rule - 调度规则（Cron/Date/RecurrenceRule）
+   * @param {Function} callback - 任务回调函数
+   * @param {boolean} [immediate=false] - 是否立即执行首次
+   * @returns {string} 任务ID
+   */
+  addTask(rule, callback, immediate = false) {
+    const taskId = `${this.config.taskPrefix}${Date.now()}_${Math.random().toString(36).slice(2, 7)}`;
+    
+    // 创建任务[2,7](@ref)
+    const job = schedule.scheduleJob(taskId, rule, async () => {
+      try {
+        await callback(taskId);
+        job.emit('success');
+      } catch (error) {
+        job.emit('error', error);
+      }
+    });
+
+    // 事件监听[5](@ref)
+    job
+      .on('scheduled', () => console.log(`[${taskId}] 任务已计划`))
+      .on('run', () => console.log(`[${taskId}] 任务执行中`))
+      .on('success', () => console.log(`[${taskId}] 执行成功`))
+      .on('error', (err) => this.config.onError(taskId, err))
+      .on('canceled', () => console.log(`[${taskId}] 已取消`));
+
+    this.tasks.set(taskId, job);
+
+    // 立即执行首次[3](@ref)
+    if (immediate) {
+      process.nextTick(() => callback(taskId));
+    }
+
+    return taskId;
+  }
+
+  /**
+   * 创建循环规则任务（简化版）
+   * @param {Object} options - 循环规则配置 { hour, minute, dayOfWeek 等 }
+   * @param {Function} callback - 任务回调
+   * @param {boolean} [immediate] - 是否立即执行
+   */
+  addRecurringTask(options, callback, immediate) {
+    const rule = new schedule.RecurrenceRule();
+    Object.assign(rule, options);
+    return this.addTask(rule, callback, immediate);
+  }
+
+  /**
+   * 取消任务
+   * @param {string} taskId - 任务ID
+   * @param {boolean} [graceful=true] - 是否等待当前执行完成
+   * @returns {boolean} 是否取消成功
+   */
+  cancelTask(taskId, graceful = true) {
+    const job = this.tasks.get(taskId);
+    if (!job) return false;
+
+    graceful ? job.cancel() : job.cancelNext();
+    this.tasks.delete(taskId);
+    return true;
+  }
+
+  /**
+   * 取消所有任务[4](@ref)
+   */
+  cancelAllTasks() {
+    this.tasks.forEach(job => job.cancel());
+    this.tasks.clear();
+    schedule.gracefulShutdown();
+  }
+
+  /**
+   * 获取任务状态
+   * @param {string} taskId - 任务ID
+   * @returns {'pending'|'running'|'canceled'} 任务状态
+   */
+  getTaskStatus(taskId) {
+    const job = this.tasks.get(taskId);
+    if (!job) return 'canceled';
+    return job.pendingInvocations.length > 0 ? 'pending' : 'running';
+  }
+
+  /**
+   * 获取所有任务ID
+   * @returns {string[]} 任务ID列表
+   */
+  getAllTaskIds() {
+    return Array.from(this.tasks.keys());
+  }
+}
+
+// ==================== 使用示例 ====================
+// const scheduler = new TaskScheduler({
+//   onError: (id, err) => console.error(`[ALERT] 任务 ${id} 失败: ${err.message}`)
+// });
+
+// // 示例1: Cron表达式任务（每分钟30秒时执行）[2](@ref)
+// const task1 = scheduler.addTask('30 * * * * *', (id) => {
+//   console.log(`[${id}] 执行时间: ${new Date().toISOString()}`);
+// });
+
+// // 示例2: 对象语法任务（每天9:30执行）[3](@ref)
+// const task2 = scheduler.addRecurringTask(
+//   { hour: 9, minute: 30 },
+//   (id) => console.log(`[${id}] 晨间任务执行`)
+// );
+
+// // 示例3: 每月1号执行（月初任务）[6](@ref)
+// const task3 = scheduler.addTask('0 0 1 * *', (id) => {
+//   console.log(`[${id}] 月初自动报表生成`);
+// });
+
+// // 示例4: 5秒后执行的一次性任务
+// const task4 = scheduler.addTask(
+//   new Date(Date.now() + 5000),
+//   (id) => console.log(`[${id}] 一次性任务完成`),
+//   true  // 立即先执行一次
+// );
+
+// // 取消任务示例
+// setTimeout(() => {
+//   scheduler.cancelTask(task1);
+//   console.log('当前活跃任务:', scheduler.getAllTaskIds());
+// }, 10000);

package/index.js

@@ -4,21 +4,22 @@ import fs from "fs";
 import cors from "cors";
 import { pathToFileURL } from 'url';  // 新增顶部导入
 import config from "./core/config.js";
-import { bindClass, createKnex, loadWebToEnd } from "./core/helper.js";
-
+import * as helper from "./core/helper.js";
 import Service from "./core/lib/service.js";
-import cache from './core/lib/cache.js';
+import Cache from './core/lib/cache.js';
+import Task from "./core/lib/task.js";
 import core from "./core/lib/index.js";
-
+const {bindClass, createKnex, loadWebToEnd} = helper;
 /**
  * @description 基于express封装的mvc框架，遵循约定优于配置原则
  */
 class Chan {
-  static helper = {};
+  static helper = helper;
   static modules = {};
   static plugins = {};
   static config = config;
-  static cache = cache;
+  static Cache = Cache;
+  static Task = Task;
   constructor() {
     this.app = express();
     this.router = express.Router();

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "chanjs",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "chanjs基于express5 纯js研发的轻量级mvc框架。",
   "main": "index.js",
   "module": "index.js",