bulltrackers-module 1.0.809 → 1.0.810

package/functions/computation-system-v3/framework/scheduling/TaskScheduler.js

@@ -6,6 +6,7 @@
  * - FIX: Enforces UTC date arithmetic.
  * - FIX: T-1 Scheduling Logic.
  * - FIX: Handles 'blocked' status properly.
+ * - FIX: Deduplication Key Mismatch (SOLVED ALREADY_EXISTS SPAM).
  */
 
 const { ScheduleValidator } = require('./ScheduleValidator');
@@ -43,7 +44,6 @@ class TaskScheduler {
 
         this.logger.log(`[Planner] Reconciling: ${windowStart.toISOString()} to ${windowEnd.toISOString()}`);
 
-        // [FIX] Use Date Generator that respects MAX_DATE_OFFSET
         const targetDates = this._generateDateRange(windowStart, windowEnd);
         const tasksToSchedule = new Map();
         const stats = { checked: 0, missing: 0, mismatched: 0, scheduled: 0, exists: 0, deleted: 0 };
@@ -65,9 +65,8 @@ class TaskScheduler {
 
                 let reason = null;
 
-                // [FIX] Logic to handle 'blocked' status.
-                // If it is 'blocked', we generally treat it as handled (do nothing).
-                // It will only be retried if it is truly missing or failed.
+                // [FIX] Handle 'blocked' status (Treat as pending/retry only if configured, otherwise ignore)
+                // Assuming we treat blocked as "handled" to prevent spam, unless it's genuinely missing.
                 
                 if (!statusEntry || status === 'pending') {
                     reason = 'MISSING_RUN';
@@ -77,23 +76,21 @@ class TaskScheduler {
                     reason = 'RETRY_FAILED';
                     stats.missing++;
                 }
-                // Check mismatch only if not running and not blocked (blocked means we are waiting for something else)
                 else if (lastRunHash !== entry.hash && status !== 'running' && status !== 'blocked') {
                     reason = 'HASH_MISMATCH';
                     stats.mismatched++;
                 }
 
                 if (reason) {
-                    const taskKey = `root-${entry.name}-${dateStr}-${entry.hash}`;
+                    // [CRITICAL FIX] Normalize Key to match CloudTasks Adapter logic
+                    // CloudTasks uses: root-{normalizedName}-{date}-{shortHash}
+                    const normalizedName = entry.name.toLowerCase().replace(/[^a-z0-9]/g, '');
+                    const hashSuffix = entry.hash ? entry.hash.substring(0, 8) : 'noHash';
+                    const taskKey = `root-${normalizedName}-${dateStr}-${hashSuffix}`;
                     
                     if (!tasksToSchedule.has(taskKey)) {
-                        // 1. Calculate Base Window
                         const baseRunAt = this._getNextRunWindow(effectiveSchedule, dateObj);
-                        
-                        // 2. Calculate Topological Delay
                         const passDelay = (entry.pass - 1) * this.PASS_DELAY_SECONDS;
-                        
-                        // 3. Determine Final Execution Time
                         const nowSeconds = Math.floor(Date.now() / 1000);
                         const effectiveBase = baseRunAt === 0 ? nowSeconds : baseRunAt;
                         const runAtSeconds = effectiveBase + passDelay;
@@ -123,6 +120,7 @@ class TaskScheduler {
         // --- PHASE 3: DEDUPLICATION & DISPATCH ---
         const finalTasks = [];
         for (const [key, task] of tasksToSchedule) {
+            // [FIX] Now 'key' matches the format in 'activeTaskKeys' so this check works
             if (activeTaskKeys.has(key)) {
                 stats.exists++;
             } else {
@@ -154,7 +152,6 @@ class TaskScheduler {
 
         this.logger.log(`[Watchdog] Found ${recoverable.length} zombies.`);
 
-        // [ADD] Diagnostic Phase
         const diagnostics = await Promise.all(recoverable.map(async z => {
             try {
                 const progress = await this.stateRepo.getCheckpointProgress(z.checkpointId);
@@ -190,7 +187,7 @@ class TaskScheduler {
         await Promise.all(recoverable.map(z => this.stateRepo.claimZombie(z.checkpointId)));
 
         const recoveryTasks = recoverable.map(z => {
-            // [FIX] Enforce T-1 Rule on Zombies too to avoid resurrecting future tasks
+            // [FIX] Enforce T-1 Rule on Zombies too
             const zDate = new Date(z.date);
             const now = new Date();
             const maxAllowed = new Date(now);
@@ -226,7 +223,6 @@ class TaskScheduler {
         const dates = [];
         let cur = new Date(start);
         
-        // [FIX] Cap the scheduling window based on config (Default T-1)
         const now = new Date();
         const maxAllowed = new Date(now);
         maxAllowed.setUTCDate(now.getUTCDate() + this.MAX_DATE_OFFSET);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bulltrackers-module",
-  "version": "1.0.809",
+  "version": "1.0.810",
   "description": "Helper Functions for Bulltrackers.",
   "main": "index.js",
   "files": [