bulltrackers-module 1.0.733 → 1.0.734

package/functions/orchestrator/index.js

@@ -1,7 +1,6 @@
 /**
  * @fileoverview Main orchestration logic.
  * REFACTORED: Implements 'Active Scheduling' via Cloud Tasks to enforce 1-hour gaps.
- * This allows the Workflow to finish immediately while Cloud Tasks manages the pacing.
  */
 const { checkDiscoveryNeed, getDiscoveryCandidates, dispatchDiscovery } = require('./helpers/discovery_helpers');
 const { getUpdateTargets, dispatchUpdates } = require('./helpers/update_helpers');
@@ -11,14 +10,11 @@ const { CloudTasksClient } = require('@google-cloud/tasks');
 // Initialize Cloud Tasks Client
 const cloudTasksClient = new CloudTasksClient();
 
-// --- HARDCODED CONFIGURATION ---
-const CONFIG = {
-    projectId: 'stocks-12345',
-    location: 'us-central1',
-    queueName: 'task-engine-queue',
-    // Default Dispatcher URL (can be overridden by environment variable)
-    dispatcherUrl: process.env.DISPATCHER_URL || 'https://us-central1-stocks-12345.cloudfunctions.net/dispatcher'
-};
+// --- CONFIGURATION (Now via Env Vars) ---
+// These are injected by deploy.mjs based on config.mjs
+const QUEUE_NAME = process.env.ORCHESTRATOR_QUEUE || 'task-engine-queue';
+const LOCATION = process.env.GCP_REGION || 'europe-west1'; 
+const PROJECT = process.env.GCP_PROJECT_ID;
 
 /**
  * ENTRY POINT: HTTP Handler for Workflow Interaction
@@ -38,9 +34,10 @@ async function handleOrchestratorHttp(req, res, dependencies, config) {
             }
             
             // Determine self-URL for callback (Cloud Task needs to call this function back)
-            // We use the hardcoded location/project unless overridden
+            // We use the env var passed by GCF (FUNCTION_URI) or construct it manually
             const orchestratorUrl = orchestratorUrlOverride || 
-                `https://${CONFIG.location}-${CONFIG.projectId}.cloudfunctions.net/orchestrator-http`;
+                process.env.FUNCTION_URI || 
+                `https://${LOCATION}-${PROJECT}.cloudfunctions.net/${process.env.K_SERVICE || 'orchestrator-http'}`;
             
             const result = await planDailyUpdates(userType, date, windows || 10, config, dependencies, orchestratorUrl);
             res.status(200).send(result);
@@ -68,16 +65,12 @@ async function handleOrchestratorHttp(req, res, dependencies, config) {
 
 /**
  * LOGIC: Plan the updates (Split into windows AND Schedule Execution)
- * 1. Fetches all users needing updates.
- * 2. Shuffles them.
- * 3. Splits them into 'n' windows.
- * 4. Schedules Cloud Tasks for each window with a 1-hour delay between them.
  */
 async function planDailyUpdates(userType, date, numberOfWindows, config, deps, orchestratorUrl) {
     const { logger, db } = deps;
     
-    // Use Hardcoded Cloud Tasks Config
-    const parentQueue = cloudTasksClient.queuePath(CONFIG.projectId, CONFIG.location, CONFIG.queueName);
+    // Use Configured Queue
+    const parentQueue = cloudTasksClient.queuePath(PROJECT, LOCATION, QUEUE_NAME);
 
     // 1. Get ALL targets
     const now = new Date();
@@ -105,7 +98,6 @@ async function planDailyUpdates(userType, date, numberOfWindows, config, deps, o
     const planId = `plan_${userType}_${date}`;
     const batchWriter = db.batch();
     
-    // We collect task creation promises to await them at the end
     const tasksToCreate = [];
 
     for (let i = 0; i < numberOfWindows; i++) {
@@ -150,7 +142,7 @@ async function planDailyUpdates(userType, date, numberOfWindows, config, deps, o
                         url: orchestratorUrl,
                         headers: { 'Content-Type': 'application/json' },
                         body: Buffer.from(JSON.stringify(taskPayload)).toString('base64'),
-                        // Use OIDC if service account is available in env, otherwise skip
+                        // Use OIDC if service account is available in env
                         oidcToken: process.env.GCP_SERVICE_ACCOUNT_EMAIL 
                             ? { serviceAccountEmail: process.env.GCP_SERVICE_ACCOUNT_EMAIL }
                             : undefined
@@ -165,18 +157,21 @@ async function planDailyUpdates(userType, date, numberOfWindows, config, deps, o
         }
     }
 
-    // Commit Firestore Writes First (Essential so tasks don't fail looking for data)
+    // Commit Firestore Writes First
     await batchWriter.commit();
     logger.log('SUCCESS', `[Orchestrator Plan] Plan ${planId} saved to Firestore.`);
 
     // Dispatch Cloud Tasks
-    logger.log('INFO', `[Orchestrator Plan] Scheduling ${tasksToCreate.length} tasks for ${userType}...`);
+    logger.log('INFO', `[Orchestrator Plan] Scheduling ${tasksToCreate.length} tasks for ${userType} to queue ${QUEUE_NAME}...`);
     
     const scheduleResults = await Promise.allSettled(tasksToCreate.map(req => cloudTasksClient.createTask(req)));
     
     const failedCount = scheduleResults.filter(r => r.status === 'rejected').length;
     if (failedCount > 0) {
         logger.log('ERROR', `[Orchestrator Plan] Failed to schedule ${failedCount} tasks.`);
+        scheduleResults.forEach((r, idx) => {
+            if (r.status === 'rejected') logger.log('ERROR', `Task ${idx} error:`, r.reason);
+        });
     }
 
     return {
@@ -190,7 +185,6 @@ async function planDailyUpdates(userType, date, numberOfWindows, config, deps, o
 
 /**
  * LOGIC: Execute a specific window
- * Triggered by Cloud Tasks when the schedule time arrives.
  */
 async function executeUpdateWindow(planId, windowId, userType, config, deps) {
     const { logger, db } = deps;
@@ -205,7 +199,7 @@ async function executeUpdateWindow(planId, windowId, userType, config, deps) {
 
     const data = windowDoc.data();
     
-    // Idempotency: Don't run if already done
+    // Idempotency
     if (data.status === 'completed') {
         logger.log('WARN', `[Orchestrator Execute] Window ${windowId} already completed. Skipping.`);
         return { dispatchedCount: 0, status: 'already_completed' };
@@ -228,8 +222,7 @@ async function executeUpdateWindow(planId, windowId, userType, config, deps) {
     return { dispatchedCount: targets.length, status: 'success' };
 }
 
-// --- Legacy / Helper Wrappers (Preserved for compatibility) ---
-
+// --- Legacy Wrappers ---
 async function runDiscoveryOrchestrator(config, deps) {
     const { logger, firestoreUtils } = deps;
     logger.log('INFO', '🚀 Discovery Orchestrator triggered...');
@@ -257,7 +250,6 @@ async function runUpdateOrchestrator(config, deps) {
 }
 
 async function runDiscovery(userType, userConfig, globalConfig, deps) {
-    const { logger } = deps;
     const { needsDiscovery, blocksToFill } = await checkDiscoveryNeed(userType, userConfig, deps);
     if (!needsDiscovery) return;
     const candidates = await getDiscoveryCandidates(userType, blocksToFill, userConfig, deps);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bulltrackers-module",
-  "version": "1.0.733",
+  "version": "1.0.734",
   "description": "Helper Functions for Bulltrackers.",
   "main": "index.js",
   "files": [
@@ -28,7 +28,8 @@
     "functions/maintenance/backfill-pi-alert-history",
     "functions/maintenance/backfill-pi-page-views",
     "functions/maintenance/backfill-pi-ratings",
-    "functions/maintenance/backfill-watchlist-membership"
+    "functions/maintenance/backfill-watchlist-membership",
+    "functions/computation-system-v2/"
   ],
   "keywords": [
     "bulltrackers",