bulltrackers-module 1.0.12 → 1.0.13

package/functions/orchestrator/index.js

@@ -1,11 +1,136 @@
 /**
- * @fileoverview Exports modules related to the Orchestrator function.
+ * @fileoverview Main orchestration logic for Discovery and Updates.
  */
+const { logger } = require("sharedsetup")(__filename); // Assuming sharedsetup is available in module context
+const coreUtils = require('../../core/utils');
+const { firestore: firestoreUtils } = coreUtils;
+const { discovery, updates } = require('./helpers'); // Import local helpers
 
-const helpers = require('./helpers');
-// const utils = require('./utils'); // If function-specific utils are needed
+/**
+ * Runs the complete discovery orchestration process for a given user type.
+ * @param {string} userType - 'normal' or 'speculator'.
+ * @param {object} config - The specific discovery config slice for the user type.
+ * @param {object} globalConfig - Global config like proxiesCollectionName.
+ */
+async function runDiscovery(userType, config, globalConfig) {
+    logger.log('INFO', `[Module Orchestrator] Starting discovery for ${userType} users...`);
+
+    // Reset locks happens once per entry point, keep it there.
+
+    // 1. Check Need
+    const { needsDiscovery, blocksToFill } = await discovery.checkDiscoveryNeed(
+        userType,
+        config.targetUsersPerBlock,
+        config // Pass the whole config slice down
+    );
+
+    if (!needsDiscovery) {
+        logger.log('INFO', `[Module Orchestrator] No discovery needed for ${userType}.`);
+        return;
+    }
+
+    // 2. Get Candidates
+    const candidates = await discovery.getDiscoveryCandidates(
+        userType,
+        blocksToFill,
+        config // Pass the whole config slice down
+    );
+
+    // 3. Dispatch
+    await discovery.dispatchDiscovery(
+        userType,
+        candidates,
+        config // Pass the whole config slice down
+    );
+
+    logger.log('SUCCESS', `[Module Orchestrator] Dispatched discovery tasks for ${userType}.`);
+}
+
+/**
+ * Runs the complete update orchestration process for a given user type.
+ * @param {string} userType - 'normal' or 'speculator'.
+ * @param {object} config - The update configuration object.
+ * @param {object} globalConfig - Global config like dispatcherTopicName.
+ */
+async function runUpdates(userType, config, globalConfig) {
+    logger.log('INFO', `[Module Orchestrator] Collecting users for daily update (${userType})...`);
+
+    // Reset locks happens once per entry point, keep it there.
+
+    // 1. Define Thresholds (Remains the same logic as before)
+    const now = new Date();
+    const startOfTodayUTC = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate()));
+    const sevenDaysAgoUTC = new Date(Date.now() - 7 * 24 * 60 * 60 * 1000); // Speculator grace period
+
+    const thresholds = {
+        dateThreshold: startOfTodayUTC,
+        gracePeriodThreshold: sevenDaysAgoUTC
+    };
+
+    // 2. Get Targets
+    const targets = await updates.getUpdateTargets(
+        userType,
+        thresholds,
+        config // Pass the whole update config down
+    );
+
+    // 3. Dispatch
+    await updates.dispatchUpdates(
+        targets,
+        userType,
+        config.dispatcherTopicName, // Use topic name from config
+        config.taskBatchSize,
+        config.pubsubBatchSize
+    );
+
+    logger.log('SUCCESS', `[Module Orchestrator] Dispatched update tasks for ${userType}.`);
+}
+
+
+/**
+ * Creates the higher-level discovery orchestrator function.
+ * This is the function the Cloud Function entry point will call.
+ * @param {object} config - The full orchestratorConfig object loaded from config.js.
+ * @returns {Function} The async function handler for the Cloud Function.
+ */
+function createDiscoveryOrchestrator(config) {
+  return async (req, res) => {
+    logger.log('INFO', '🚀 Discovery Orchestrator triggered via module...');
+    try {
+      await firestoreUtils.resetProxyLocks(config.proxiesCollectionName);
+      await runDiscovery('normal', config.discoveryConfig.normal, config);
+      await runDiscovery('speculator', config.discoveryConfig.speculator, config);
+      res.status(200).send('Discovery orchestration complete.');
+    } catch (error) {
+      logger.log('ERROR', 'FATAL Error in Discovery Orchestrator (Module)', { errorMessage: error.message, errorStack: error.stack });
+      res.status(500).send("An internal discovery error occurred.");
+    }
+  };
+}
+
+/**
+ * Creates the higher-level update orchestrator function.
+ * This is the function the Cloud Function entry point will call.
+ * @param {object} config - The full orchestratorConfig object loaded from config.js.
+ * @returns {Function} The async function handler for the Cloud Function.
+ */
+function createUpdateOrchestrator(config) {
+  return async (req, res) => {
+    logger.log('INFO', '🚀 Update Orchestrator triggered via module...');
+    try {
+      await firestoreUtils.resetProxyLocks(config.proxiesCollectionName);
+      await runUpdates('normal', config.updateConfig, config);
+      await runUpdates('speculator', config.updateConfig, config);
+      res.status(200).send('Update orchestration complete.');
+    } catch (error) {
+      logger.log('ERROR', 'FATAL Error in Update Orchestrator (Module)', { errorMessage: error.message, errorStack: error.stack });
+      res.status(500).send("An internal update error occurred.");
+    }
+  };
+}
 
 module.exports = {
-  helpers,
-  // utils,
+  createDiscoveryOrchestrator,
+  createUpdateOrchestrator,
+  helpers: { discovery, updates } // Keep exporting helpers if needed elsewhere
 };

package/package.json

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