echoapi-cron-scheduler-batch 1.0.20 → 1.0.22

package/index.js

@@ -149,7 +149,8 @@ class CronScheduler {
     try {
       const runners = (typeof job.runners === 'string') ? JSON5.parse(job.runners || '[]') : (job.runners || []);
       const executionId = `${job.job_id}_${Date.now()}`;
-      this.resultCollector.set(executionId, { total: runners.length, received_count: 0, job_info: job });
+      const actualStartTime = Date.now();
+      this.resultCollector.set(executionId, { total: runners.length, received_count: 0, job_info: { ...job, actualStartTime } });
 
       const workers = Object.values(cluster.workers).filter(w => w.isConnected());
       runners.forEach((runner, index) => {
@@ -187,7 +188,12 @@ class CronScheduler {
       try { cleanPayload.runners = JSON5.parse(cleanPayload.runners); } catch (e) { }
     }
 
-    const jobData = { ...cleanPayload, is_cancel: 0, create_dtime: Date.now() };
+    const jobData = {
+      ...cleanPayload, is_cancel: 0,
+      hook_ids: payload.hook_ids || [], // 新增：钩子ID数组
+      case_hook_switch: payload.case_hook_switch || -1, // 新增：钩子开关，默认开启(1)
+      create_dtime: Date.now()
+    };
     fs.writeFileSync(jobPath, JSON.stringify(jobData, null, 2), 'utf8');
     this.upsertTimer(jobData.job_id, jobData.frequency, jobData);
     return true;
@@ -428,7 +434,10 @@ class CronScheduler {
     let s = {
       http_total: 0, http_success: 0,
       assert_total: 0, assert_success: 0,
-      total_resp_time: 0
+      total_resp_time: 0,
+      // --- 新增计数器 ---
+      total_case: 0,
+      success_case: 0
     };
 
     // 1. 遍历并处理每个结果单元
@@ -440,6 +449,18 @@ class CronScheduler {
       s.assert_success += (item.assert?.success || 0);
       s.total_resp_time += (item.total_response_time || 0);
 
+      // --- 逻辑：计算 total_case ---
+      s.total_case++;
+
+      // --- 逻辑：判定 success_case ---
+      // 标准：http 全部成功 且 断言全部通过
+      const isHttpOk = (item.http?.total === item.http?.success);
+      const isAssertOk = (item.assert?.total === item.assert?.success);
+
+      if (isHttpOk && isAssertOk) {
+        s.success_case++;
+      }
+
       // 还原 item 内部字段
       return _.assign(item, {
         source: 'scheduled',
@@ -453,6 +474,7 @@ class CronScheduler {
     const assertRate = s.assert_total > 0 ? ((s.assert_success / s.assert_total) * 100).toFixed(2) : "0.00";
     const avgResp = processedResults.length > 0 ? (s.total_resp_time / processedResults.length).toFixed(0) : 0;
 
+    const currentTime = Date.now();
     // 3. 封装与之前 DB 版本完全一致的 Payload
     return {
       info: {
@@ -461,9 +483,15 @@ class CronScheduler {
         project_id: record.job_info.project_id,
         execution_id: executionId,
         // 使用任务开始时间和当前结束时间
-
-        start_at: this.formatTimeToISO(record.job_info.start_time || Date.now()),
-        end_at: this.formatTimeToISO(Date.now()),
+        // ⭐ 新增：将任务中的这两个字段塞入 info 中上报
+        hook_ids: record.job_info.hook_ids || [],
+        case_hook_switch: record.job_info.case_hook_switch ?? -1,
+
+        // 2. ⭐ 新增：用例级别统计
+        total_case: s.total_case,
+        success_case: s.success_case,
+        start_at: this.formatTimeToISO(record.job_info.actualStartTime),
+        end_at: this.formatTimeToISO(currentTime),
         http_pass_rate: `${httpRate}%`,
         assert_pass_rate: `${assertRate}%`,
         avg_response_time: `${avgResp}ms`,

package/package.json

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