bulltrackers-module 1.0.358 → 1.0.359

package/functions/task-engine/handler_creator.js

@@ -1,19 +1,14 @@
 /**
  * @fileoverview Main entry point for the Task Engine Cloud Function.
- * Routes incoming Pub/Sub messages to the appropriate helper functions.
  */
 const { handleDiscover } = require('./helpers/discover_helpers');
 const { handleVerify } = require('./helpers/verify_helpers');
-const { handleUpdate } = require('./helpers/update_helpers'); // Existing logic for "Speculators"
+const { handleUpdate } = require('./helpers/update_helpers');
 const { handlePopularInvestorUpdate, handleOnDemandUserUpdate } = require('./helpers/popular_investor_helpers');
 
-/**
- * Handles the incoming request from Pub/Sub or Direct HTTP.
- * @param {object} message - The Pub/Sub message object (or req.body).
- * @param {object} context - The event context.
- * @param {object} config - The Task Engine configuration.
- * @param {object} dependencies - Injected dependencies (db, logger, proxyManager, etc.).
- */
+// IMPORT THE UTILS TO HANDLE BATCHES
+const { executeTasks, prepareTaskBatches } = require('./utils/task_engine_utils'); 
+
 async function handleRequest(message, context, config, dependencies) {
     const { logger } = dependencies;
     
@@ -27,12 +22,27 @@ async function handleRequest(message, context, config, dependencies) {
         return;
     }
 
+    // --- FIX START: Handle Batch vs Single ---
+    
+    // CASE A: Payload is a Batch (from Dispatcher)
+    if (payload.tasks && Array.isArray(payload.tasks)) {
+        logger.log('INFO', `[TaskEngine] Received BATCH of ${payload.tasks.length} tasks.`);
+        const taskId = context.eventId || 'batch-' + Date.now();
+        
+        // Use existing utils to execute the batch
+        const { tasksToRun, otherTasks } = await prepareTaskBatches(payload.tasks, null, logger);
+        await executeTasks(tasksToRun, otherTasks, dependencies, config, taskId);
+        return;
+    }
+
+    // CASE B: Payload is a Single Task (from Cron/On-Demand)
     const { type, data } = payload;
     
     if (!type) {
         logger.log('WARN', '[TaskEngine] Received message with no type.', payload);
         return;
     }
+    // --- FIX END ---
 
     logger.log('INFO', `[TaskEngine] Processing Task: ${type}`, { dataSummary: JSON.stringify(data).substring(0, 100) });
 
@@ -40,23 +50,18 @@ async function handleRequest(message, context, config, dependencies) {
     try {
         switch (type) {
             case 'DISCOVER':
-                await handleDiscover(data, config, dependencies);
+                await handleDiscover(data, 'single-discover', dependencies, config); // Added taskId arg
                 break;
             case 'VERIFY':
-                await handleVerify(data, config, dependencies);
+                await handleVerify(data, 'single-verify', dependencies, config); // Added taskId arg
                 break;
             case 'UPDATE': 
-                // Existing logic for "Speculator" updates (high volume, low fidelity)
-                await handleUpdate(data, config, dependencies);
+                await handleUpdate(data, 'single-update', dependencies, config); // Added taskId arg
                 break;
             case 'POPULAR_INVESTOR_UPDATE':
-                // New logic for Popular Investors (daily cron, high fidelity)
-                // data should contain { cid, username }
                 await handlePopularInvestorUpdate(data, config, dependencies);
                 break;
             case 'ON_DEMAND_USER_UPDATE':
-                // New logic for Signed-In Users (immediate trigger, cost optimized)
-                // data should contain { cid, username }
                 await handleOnDemandUserUpdate(data, config, dependencies);
                 break;
             default:
@@ -64,8 +69,6 @@ async function handleRequest(message, context, config, dependencies) {
         }
     } catch (err) {
         logger.log('ERROR', `[TaskEngine] Error processing task ${type}`, err);
-        // We might want to throw here to trigger Pub/Sub retry, depending on the error nature
-        // For now, logging error is sufficient as the sub-handlers perform their own try/catch blocks
     }
 }
 

package/package.json

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