bulltrackers-module 1.0.48 → 1.0.50

package/functions/dispatcher/index.js

@@ -2,7 +2,13 @@
  * @fileoverview Main entry point for the Dispatcher function.
  * REFACTORED: This file now contains the main pipe function 'handleRequest'.
  */
-const { pipe } = require('../../index');
+
+// --- 1. REMOVE the circular require ---
+// const { pipe } = require('../../index'); // <<< REMOVE THIS LINE
+
+// --- 2. ADD direct require for the specific sub-pipe needed ---
+const { dispatchTasksInBatches } = require('./helpers/dispatch_helpers');
+
 
 /**
  * Main pipe: pipe.dispatcher.handleRequest
@@ -32,8 +38,9 @@ async function handleRequest(message, context, config, dependencies) {
             throw new Error("Dispatcher module received invalid configuration.");
         }
 
-        // Call the sub-pipe
-        await pipe.dispatcher.dispatchTasksInBatches(tasks, dependencies, config);
+        // --- 3. Use the directly required function ---
+        // Call the sub-pipe -> becomes dispatchTasksInBatches
+        await dispatchTasksInBatches(tasks, dependencies, config); // <<< USE DIRECTLY
 
     } catch (error) {
         logger.log('ERROR', '[Module Dispatcher] FATAL error processing message', { errorMessage: error.message, errorStack: error.stack });
@@ -43,4 +50,4 @@ async function handleRequest(message, context, config, dependencies) {
 
 module.exports = {
     handleRequest,
-};
+};

package/functions/orchestrator/index.js

@@ -4,7 +4,14 @@
  * that are called by the Cloud Function entry points.
  * They receive all dependencies.
  */
-const { pipe } = require('../../index'); // Get the pipe object
+
+// --- 1. REMOVE the circular require ---
+// const { pipe } = require('../../index'); // Get the pipe object // <<< REMOVE THIS LINE
+
+// --- 2. ADD direct requires for the specific sub-pipes needed ---
+const { checkDiscoveryNeed, getDiscoveryCandidates, dispatchDiscovery } = require('./helpers/discovery_helpers');
+const { getUpdateTargets, dispatchUpdates } = require('./helpers/update_helpers');
+
 
 /**
  * Main pipe for running the complete discovery orchestration process.
@@ -16,13 +23,14 @@ const { pipe } = require('../../index'); // Get the pipe object
 async function runDiscoveryOrchestrator(config, dependencies) {
     const { logger, firestoreUtils } = dependencies;
     logger.log('INFO', '🚀 Discovery Orchestrator triggered via module...');
-    
+
     // Call sub-pipe from core
     await firestoreUtils.resetProxyLocks(dependencies, config);
 
     // Call sub-pipe for 'normal'
+    // Pass the directly required sub-pipe functions implicitly via runDiscovery call context
     await runDiscovery('normal', config.discoveryConfig.normal, config, dependencies);
-    
+
     // Call sub-pipe for 'speculator'
     await runDiscovery('speculator', config.discoveryConfig.speculator, config, dependencies);
 }
@@ -37,13 +45,13 @@ async function runDiscoveryOrchestrator(config, dependencies) {
 async function runUpdateOrchestrator(config, dependencies) {
     const { logger, firestoreUtils } = dependencies;
     logger.log('INFO', '🚀 Update Orchestrator triggered via module...');
-    
+
     // Call sub-pipe from core
     await firestoreUtils.resetProxyLocks(dependencies, config);
 
     // Call sub-pipe for 'normal'
     await runUpdates('normal', config.updateConfig, config, dependencies);
-    
+
     // Call sub-pipe for 'speculator'
     await runUpdates('speculator', config.updateConfig, config, dependencies);
 }
@@ -62,8 +70,9 @@ async function runDiscovery(userType, userTypeConfig, globalConfig, dependencies
     const { logger } = dependencies;
     logger.log('INFO', `[Module Orchestrator] Starting discovery for ${userType} users...`);
 
-    // 1. pipe.orchestrator.checkDiscoveryNeed
-    const { needsDiscovery, blocksToFill } = await pipe.orchestrator.checkDiscoveryNeed(
+    // --- 3. Use the directly required functions ---
+    // 1. pipe.orchestrator.checkDiscoveryNeed -> becomes checkDiscoveryNeed
+    const { needsDiscovery, blocksToFill } = await checkDiscoveryNeed(
         userType,
         userTypeConfig,
         dependencies
@@ -74,16 +83,16 @@ async function runDiscovery(userType, userTypeConfig, globalConfig, dependencies
         return;
     }
 
-    // 2. pipe.orchestrator.getDiscoveryCandidates
-    const candidates = await pipe.orchestrator.getDiscoveryCandidates(
+    // 2. pipe.orchestrator.getDiscoveryCandidates -> becomes getDiscoveryCandidates
+    const candidates = await getDiscoveryCandidates(
         userType,
         blocksToFill,
         userTypeConfig,
         dependencies
     );
 
-    // 3. pipe.orchestrator.dispatchDiscovery
-    await pipe.orchestrator.dispatchDiscovery(
+    // 3. pipe.orchestrator.dispatchDiscovery -> becomes dispatchDiscovery
+    await dispatchDiscovery(
         userType,
         candidates,
         userTypeConfig,
@@ -114,16 +123,17 @@ async function runUpdates(userType, updateConfig, globalConfig, dependencies) {
         gracePeriodThreshold: sevenDaysAgoUTC
     };
 
-    // 1. pipe.orchestrator.getUpdateTargets
-    const targets = await pipe.orchestrator.getUpdateTargets(
+    // --- 4. Use the directly required functions ---
+    // 1. pipe.orchestrator.getUpdateTargets -> becomes getUpdateTargets
+    const targets = await getUpdateTargets(
         userType,
         thresholds,
         updateConfig,
         dependencies
     );
 
-    // 2. pipe.orchestrator.dispatchUpdates
-    await pipe.orchestrator.dispatchUpdates(
+    // 2. pipe.orchestrator.dispatchUpdates -> becomes dispatchUpdates
+    await dispatchUpdates(
         targets,
         userType,
         updateConfig,
@@ -139,4 +149,4 @@ module.exports = {
   // Exporting these internal helpers so the main index.js can map them
   runDiscovery,
   runUpdates
-};
+};

package/functions/task-engine/handler_creator.js

@@ -3,7 +3,14 @@
  * REFACTORED: This file is now 'handler_creator.js' in name only.
  * It exports the main 'handleRequest' pipe function.
  */
-const { pipe } = require('../../index'); // Get the pipe object
+
+// --- 1. REMOVE the circular require ---
+// const { pipe } = require('../../index'); // <<< REMOVE THIS LINE
+
+// --- 2. ADD direct requires for the specific sub-pipes needed ---
+const { handleDiscover } = require('./helpers/discover_helpers');
+const { handleVerify } = require('./helpers/verify_helpers');
+const { handleUpdate } = require('./helpers/update_helpers');
 
 /**
  * Main pipe: pipe.taskEngine.handleRequest
@@ -35,11 +42,12 @@ async function handleRequest(message, context, config, dependencies) {
     try {
         await new Promise(resolve => setTimeout(resolve, Math.random() * 500 + 250));
 
+        // --- 3. Use the directly required functions ---
         // Route to the correct sub-pipe
         const handlerFunction = {
-            discover: pipe.taskEngine.handleDiscover,
-            verify: pipe.taskEngine.handleVerify,
-            update: pipe.taskEngine.handleUpdate
+            discover: handleDiscover, // <<< USE DIRECTLY
+            verify: handleVerify,     // <<< USE DIRECTLY
+            update: handleUpdate      // <<< USE DIRECTLY
         }[task.type];
 
         if (handlerFunction) {
@@ -51,7 +59,7 @@ async function handleRequest(message, context, config, dependencies) {
         }
     } catch (error) {
         logger.log('ERROR', `[TaskEngine/${taskId}] Failed.`, { errorMessage: error.message, errorStack: error.stack });
-        
+
         // If a header was used, ensure its failure is recorded even on a crash
         // This is a simplistic way; ideally, the sub-pipes manage this.
         // Let's rely on sub-pipes' finally blocks.
@@ -69,4 +77,4 @@ async function handleRequest(message, context, config, dependencies) {
 
 module.exports = {
     handleRequest,
-};
+};

package/package.json

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