@maiyunnet/kebab 4.0.2 → 4.1.0

package/index.d.ts

@@ -5,7 +5,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "4.0.2";
+export declare const VER = "4.1.0";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;

package/index.js

@@ -6,7 +6,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export const VER = '4.0.2';
+export const VER = '4.1.0';
 // --- 服务端用的路径 ---
 const imu = decodeURIComponent(import.meta.url).replace('file://', '').replace(/^\/(\w:)/, '$1');
 /** --- /xxx/xxx --- */

package/lib/cron.d.ts

@@ -3,32 +3,17 @@ export declare function getRegulars(): IRegularData[];
 /**
  * --- 创建定时执行的计划任务 ---
  * @param task 计划任务对象
- * @param immediate 如果传入的时间小于当前时间且没有执行过则立即执行一次（格式：YmdHi）
+ * @param immediate 如果传入的时间小于当前时间且[没有执行过]则立即执行一次（格式：YmdHi，系统时区）
  */
 export declare function regular(task: IRegular, immediate?: string): Promise<boolean>;
-/**
- * --- 执行定时任务 ---
- */
-export declare function run(): void;
 /** --- 定时任务 --- */
 export interface IRegular {
     /** --- 任务名称，只能小写字母、数字、短横线、下划线，长度 1-32 --- */
     'name': string;
-    /** --- 任务日期对象（系统时区） --- */
-    'date': {
-        /** --- -1, 1 - 12 --- */
-        'month': number;
-        /** --- -1, 1 - 31 --- */
-        'day': number;
-        /** --- -1, 0 - 23 --- */
-        'hour': number;
-        /** --- -1, 0 - 59 --- */
-        'minute': number;
-        /** --- -1, 0 - 6 --- */
-        'week': number;
-    };
+    /** --- 规则，分、时、日、月、星期，与 linux 的 cron 相同（不支持秒） --- */
+    'rule': string;
     /** --- 任务函数 --- */
-    callback: (date: string) => void | Promise<void>;
+    callback: (date: string, immediate: boolean) => void | Promise<void>;
 }
 export interface IRegularData extends IRegular {
     /** --- 上次执行时间字符串，格式：YmdHi（系统时区） --- */

package/lib/cron.js

@@ -4,6 +4,7 @@
  * Last: 2025-9-20 19:46:32
  */
 import * as kebab from '#kebab/index.js';
+import * as nodeCron from 'node-cron';
 import * as lFs from '#kebab/lib/fs.js';
 import * as lCore from '#kebab/lib/core.js';
 import * as lText from '#kebab/lib/text.js';
@@ -17,7 +18,7 @@ export function getRegulars() {
 /**
  * --- 创建定时执行的计划任务 ---
  * @param task 计划任务对象
- * @param immediate 如果传入的时间小于当前时间且没有执行过则立即执行一次（格式：YmdHi）
+ * @param immediate 如果传入的时间小于当前时间且[没有执行过]则立即执行一次（格式：YmdHi，系统时区）
  */
 export async function regular(task, immediate = '') {
     if (!/^[a-z0-9-_]{1,32}$/.test(task.name)) {
@@ -47,12 +48,24 @@ export async function regular(task, immediate = '') {
         obj.count = json.count;
     }
     await lFs.putContent(kebab.LOG_CWD + `cron/${obj.name}.json`, JSON.stringify(obj));
+    // --- 好，先注册 ---
+    nodeCron.schedule(task.rule, () => {
+        /** --- 当前日期字符串 --- */
+        const date = lTime.format(null, 'YmdHi');
+        obj.callback(date, false);
+        // --- 设置执行后的数据 ---
+        obj.last = date;
+        ++obj.count;
+        ++obj.rcount;
+        lFs.putContent(kebab.LOG_CWD + `cron/${obj.name}.json`, JSON.stringify(obj)).catch(() => { });
+    });
     // --- 检查是否需要立即执行 ---
     /** --- 当前日期字符串 --- */
     const date = lTime.format(null, 'YmdHi');
-    if (immediate && (immediate < date)) {
+    if ((immediate && (immediate <= date) && (obj.last < immediate))) {
+        // --- 理应执行的时间早于当前，或要执行的时间就是现在 ---
         try {
-            obj.callback(date);
+            obj.callback(date, true);
         }
         catch (e) {
             const msg = `[CRON][${obj.name}] ${lText.stringifyJson(e.message ?? '').slice(1, -1).replace(/"/g, '""')}`;
@@ -68,59 +81,3 @@ export async function regular(task, immediate = '') {
     regulars.push(obj);
     return true;
 }
-/**
- * --- 执行定时任务 ---
- */
-export function run() {
-    /** --- 当前日期字符串 --- */
-    const date = lTime.format(null, 'YmdHi');
-    /** --- 当前时间 --- */
-    const now = new Date();
-    /** --- 当前月份 --- */
-    const month = now.getMonth() + 1;
-    /** --- 当前日期 --- */
-    const day = now.getDate();
-    /** --- 当前小时 --- */
-    const hour = now.getHours();
-    /** --- 当前分钟 --- */
-    const minute = now.getMinutes();
-    /** --- 当前星期几 --- */
-    const week = now.getDay();
-    // --- 检查定时任务是否需要执行 ---
-    for (const task of regulars) {
-        if ((task.date.minute !== -1) && (task.date.minute !== minute)) {
-            continue;
-        }
-        if ((task.date.hour !== -1) && (task.date.hour !== hour)) {
-            continue;
-        }
-        if ((task.date.week !== -1) && (task.date.week !== week)) {
-            continue;
-        }
-        if ((task.date.day !== -1) && (task.date.day !== day)) {
-            continue;
-        }
-        if ((task.date.month !== -1) && (task.date.month !== month)) {
-            continue;
-        }
-        if (task.last === date) {
-            continue;
-        }
-        // --- 执行回调 ---
-        try {
-            task.callback(date);
-        }
-        catch (e) {
-            const msg = `[CRON][${task.name}] ${lText.stringifyJson(e.message ?? '').slice(1, -1).replace(/"/g, '""')}`;
-            lCore.debug(msg);
-            lCore.log({}, msg, '-error');
-        }
-        // --- 设置执行后的数据 ---
-        task.last = date;
-        ++task.count;
-        ++task.rcount;
-        lFs.putContent(kebab.LOG_CWD + `cron/${task.name}.json`, JSON.stringify(task)).catch(() => { });
-    }
-}
-// --- 每15秒检查一次 ---
-setInterval(run, 15_000);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "4.0.2",
+  "version": "4.1.0",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [
@@ -19,8 +19,8 @@
     "#kebab/*": "./*"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.922.0",
-    "@aws-sdk/lib-storage": "^3.922.0",
+    "@aws-sdk/client-s3": "^3.925.0",
+    "@aws-sdk/lib-storage": "^3.925.0",
     "@litert/http-client": "^1.1.2",
     "@litert/mime": "^0.1.3",
     "@litert/redis": "^3.0.5",
@@ -30,10 +30,11 @@
     "ejs": "^3.1.10",
     "jszip": "^3.10.1",
     "mysql2": "^3.15.3",
-    "openai": "^6.8.0",
+    "node-cron": "^4.2.1",
+    "openai": "^6.8.1",
     "ssh2": "^1.17.0",
     "svg-captcha": "^1.4.0",
-    "tencentcloud-sdk-nodejs": "^4.1.136"
+    "tencentcloud-sdk-nodejs": "^4.1.138"
   },
   "devDependencies": {
     "@litert/eslint-plugin-rules": "^0.3.1",

package/www/example/ctr/test.js

@@ -3088,17 +3088,11 @@ rtn.push(reader.readBCDString());</pre>${JSON.stringify(rtn)}`);
         const echo = [];
         let rtn = await lCron.regular({
             'name': 'test',
-            'date': {
-                'month': -1,
-                'day': -1,
-                'hour': -1,
-                'minute': -1,
-                'week': -1,
+            'rule': '40 * * * *',
+            'callback': (date, immediate) => {
+                lCore.debug(`[${date}] test task run, immediate: ${immediate}`);
             },
-            'callback': (date) => {
-                lCore.debug(`[${date}] test task run`);
-            },
-        });
+        }, '202511062305');
         echo.push(`<pre>await lCron.regular({
     'name': 'test',
     'date': {