bulltrackers-module 1.0.743 → 1.0.745

package/functions/computation-system-v2/framework/storage/StorageManager.js

@@ -43,6 +43,35 @@ class StorageManager {
         }
         return this._firestore;
     }
+
+    /**
+     * Updates the heartbeat of a zombie to "hide" it from detection 
+     * while the recovery task is being queued.
+     */
+    async claimZombie(checkpointId) {
+        if (!checkpointId) return;
+        
+        // FIX: Access projectId and dataset from the config object
+        const { projectId, dataset } = this.config.bigquery; //
+
+        const query = `
+            UPDATE \`${projectId}.${dataset}.computation_checkpoints\`
+            SET last_updated = CURRENT_TIMESTAMP()
+            WHERE checkpoint_id = @checkpointId
+        `;
+        
+        try {
+            await this.bigquery.query({
+                query,
+                params: { checkpointId }
+            });
+        } catch (e) {
+            // Ignore errors here, it's an optimization, not critical
+            console.warn(`[Storage] Failed to claim zombie ${checkpointId}: ${e.message}`);
+        }
+    }
+
+    
     
     // =========================================================================
     // RESULT COMMITTING (Batch -> GCS Buffer)
@@ -696,6 +725,7 @@ class StorageManager {
         
         this._log('ERROR', `${context}: ${details}`);
     }
+    
 }
 
 module.exports = { StorageManager };

package/functions/computation-system-v2/handlers/dispatcher.js

@@ -10,16 +10,21 @@
  * the Scheduler and the Worker.
  */
 
-const system = require('../index');
+// REMOVED: const system = require('../index'); 
+// We will lazy-load this inside the handler to prevent circular dependency cycles.
 
 exports.dispatcherHandler = async (req, res) => {
     const startTime = Date.now();
     
     try {
+        // LAZY LOAD: Require index.js here to ensure it is fully initialized
+        // This fixes the "Accessing non-existent property inside circular dependency" error
+        const system = require('../index');
+
         const {
             computationName,
             targetDate,
-            source = 'scheduled',    // 'scheduled' | 'on-demand'
+            source = 'scheduled',    // 'scheduled' | 'on-demand' | 'zombie-recovery'
             entityIds,               // Optional: specific entities
             dryRun = false,
             force = false            // Optional: run even if hash matches
@@ -36,6 +41,11 @@ exports.dispatcherHandler = async (req, res) => {
         
         const date = targetDate || new Date().toISOString().split('T')[0];
         console.log(`[Dispatcher] Received ${source} request: ${computationName} for ${date}`);
+
+        // Safety check to ensure system is loaded correctly
+        if (!system || typeof system.runComputation !== 'function') {
+            throw new Error('System not fully initialized (runComputation is missing). Check index.js exports.');
+        }
         
         // 2. DELEGATE TO ORCHESTRATOR
         // The Orchestrator calls RunAnalyzer internally to check:
@@ -74,7 +84,7 @@ exports.dispatcherHandler = async (req, res) => {
             
             // Scheduled tasks need 503 to trigger retry
             // On-demand users need 200 to see the error message immediately
-            const httpStatus = source === 'scheduled' ? 503 : 200;
+            const httpStatus = source === 'scheduled' || source === 'zombie-recovery' ? 503 : 200;
             
             return res.status(httpStatus).json({
                 status: result.status,

package/functions/computation-system-v2/handlers/scheduler.js

@@ -51,14 +51,21 @@ async function schedulerHandler(req, res) {
         const dueComputations = findDueComputations(now);
         
         // 2. ZOMBIE DETECTION
-        // Find tasks marked 'running' that haven't heartbeated in X mins
         let zombies = [];
         try {
             zombies = await storageManager.findZombies(ZOMBIE_THRESHOLD_MINUTES);
-            // New Code
+            
             if (zombies.length > 0) {
                 const zombieDetails = zombies.map(z => `${z.name} [${z.date}]`).join(', ');
                 console.log(`[Scheduler] DETECTED ${zombies.length} ZOMBIES: ${zombieDetails}`);
+
+                // --- NEW FIX: CLAIM ZOMBIES ---
+                // "Touch" these rows in the DB so they don't look like zombies for another 15 mins.
+                // This prevents re-dispatching the same task 15 times if the queue is slow.
+                await Promise.all(zombies.map(z => 
+                    storageManager.claimZombie(z.checkpointId) 
+                ));
+                // ------------------------------
             }
         } catch (e) {
             console.error(`[Scheduler] Zombie check failed: ${e.message}`);

package/package.json

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