echoapi-cron-scheduler-batch 1.0.17 → 1.0.20

package/index.js

@@ -137,11 +137,13 @@ class CronScheduler {
     try { if (fs.existsSync(lockFile)) fs.unlinkSync(lockFile); } catch (e) { }
   }
 
-  _dispatch(job) {
+  _dispatch(job, skipLock = false) {
     console.log(`🎯 [Master] 准备分发: ${job.job_id} (${job.name || 'Task'})`);
-    if (!this._tryAcquireLock(job.job_id)) {
+
+    // 如果不跳过锁检查，且抢锁失败，则退出
+    if (!skipLock && !this._tryAcquireLock(job.job_id)) {
       console.warn(`🔒 [Lock] 抢锁失败，跳过执行: ${job.job_id}`);
-      return;
+      return false; // 返回 false 表示未成功分发
     }
 
     try {
@@ -167,6 +169,7 @@ class CronScheduler {
       console.error(`💥 [Master] 分发崩溃:`, e.message);
       this._releaseLock(job.job_id);
     }
+    return true;
   }
 
   // ==========================================
@@ -276,6 +279,46 @@ class CronScheduler {
     }
   }
 
+  /**
+   * 🚀 立即手动执行指定任务
+   * @param {string} job_id 任务ID
+   */
+  async triggerJobNow(job_id) {
+    console.log(`⚡ [Manual] 收到立即执行指令: ${job_id}`);
+
+    // 1. 只有主进程负责分发
+    if (!cluster.isPrimary) {
+      console.warn(`⚠️ [Manual] 非主进程，跳过手动触发`);
+      return { success: false, message: 'Only Primary process can trigger jobs.' };
+    }
+
+    const jobPath = path.join(this.paths.jobs, `${job_id}.json`);
+
+    // 2. 检查任务是否存在
+    if (!fs.existsSync(jobPath)) {
+      console.error(`❌ [Manual] 触发失败：任务文件不存在 ${job_id}`);
+      return { success: false, message: 'Job not found.' };
+    }
+
+    try {
+      // 3. 读取最新的任务内容
+      const job = JSON.parse(fs.readFileSync(jobPath, 'utf8'));
+
+      // 4. 执行分发逻辑
+      // 注意：这里会进入 _dispatch，内部会尝试 _tryAcquireLock
+      // 关键改动：传入 true 强制执行，或者根据返回值判断
+      const dispatched = this._dispatch(job, true);
+
+      if (dispatched) {
+        return { success: true, message: 'Job triggered successfully.' };
+      } else {
+        return { success: false, message: 'Job is already running on another node.' };
+      }
+    } catch (e) {
+      console.error(`💥 [Manual] 触发崩溃:`, e.message);
+      return { success: false, message: e.message };
+    }
+  }
   // ==========================================
   // 上报与 Worker 执行
   // ==========================================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "echoapi-cron-scheduler-batch",
-  "version": "1.0.17",
+  "version": "1.0.20",
   "description": "",
   "main": "index.js",
   "scripts": {