bulltrackers-module 1.0.666 → 1.0.668

package/functions/computation-system/helpers/computation_dispatcher.js

@@ -14,11 +14,69 @@ const { runFinalSweepCheck } = require('../tools/FinalSweepReporter');
 // 1. IMPORT SNAPSHOT SERVICE
 const { generateDailySnapshots } = require('../services/SnapshotService');
 const crypto = require('crypto');
+// Import Google Auth Library for OAuth 2.0 authentication
+let GoogleAuth = null;
+try {
+    GoogleAuth = require('google-auth-library').GoogleAuth;
+} catch (e) {
+    // google-auth-library might not be installed, will handle gracefully
+}
 
 const BASE_SECONDS_PER_WEIGHT_UNIT = 3;
 const SESSION_CACHE_DURATION_MS = 1000 * 60 * 30; // 30 Minutes
 const STALE_LOCK_THRESHOLD_MS = 1000 * 60 * 15;
 
+/**
+ * Helper function to send an authenticated callback to Cloud Workflows
+ * Uses OAuth 2.0 access token from the default service account
+ */
+async function sendAuthenticatedCallback(callbackUrl, payload, logger, directFetch) {
+    if (!GoogleAuth) {
+        throw new Error('google-auth-library is required for authenticated callbacks. Please install: npm install google-auth-library');
+    }
+    
+    try {
+        // Get OAuth 2.0 access token using default service account credentials
+        const auth = new GoogleAuth({
+            scopes: ['https://www.googleapis.com/auth/cloud-platform']
+        });
+        const accessToken = await auth.getAccessToken();
+        
+        if (!accessToken) {
+            throw new Error('Failed to obtain OAuth 2.0 access token');
+        }
+        
+        logger.log('INFO', '[Dispatcher] ✅ Obtained OAuth 2.0 access token for callback');
+        
+        // Add timeout to prevent hanging (30 seconds should be plenty for a callback)
+        const timeoutPromise = new Promise((_, reject) => 
+            setTimeout(() => reject(new Error('Callback timeout after 30s')), 30000)
+        );
+        
+        const fetchPromise = directFetch(callbackUrl, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'Authorization': `Bearer ${accessToken}`
+            },
+            body: JSON.stringify(payload)
+        });
+        
+        const response = await Promise.race([fetchPromise, timeoutPromise]);
+        
+        if (!response.ok) {
+            const errorText = await response.text().catch(() => 'Unable to read response');
+            throw new Error(`Callback returned non-OK status: ${response.status} ${response.statusText}. Response: ${errorText.substring(0, 200)}`);
+        }
+        
+        logger.log('INFO', `[Dispatcher] ✅ Callback sent successfully (status: ${response.status})`);
+        return response;
+    } catch (err) {
+        logger.log('ERROR', `[Dispatcher] Authenticated callback failed: ${err.message}. Stack: ${err.stack?.substring(0, 300)}`);
+        throw err;
+    }
+}
+
 // ... [SHARED UTILS and SHARED ASYNC HELPERS remain exactly the same] ...
 
 function getMillis(field) {
@@ -136,6 +194,8 @@ async function handleSnapshot(config, dependencies, reqBody) {
     const targetDate = reqBody.date; // Optional: if provided, only process up to this date
     const callbackUrl = reqBody.callback_url; // Callback URL from workflow
     
+    logger.log('INFO', `[Dispatcher] 📸 Snapshot request received. Date: ${targetDate || 'all'}, Callback URL: ${callbackUrl || 'NOT PROVIDED'}`);
+    
     // Use native fetch if available (Node 18+), otherwise fall back to node-fetch
     const directFetch = typeof fetch !== 'undefined' ? fetch : require('node-fetch');
     
@@ -164,12 +224,14 @@ async function handleSnapshot(config, dependencies, reqBody) {
             
             // Send callback if provided
             if (callbackUrl) {
-                logger.log('INFO', '[Dispatcher] 📞 Calling back Workflow...');
-                await directFetch(callbackUrl, {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify(finalResult)
-                }).catch(err => logger.log('ERROR', `[Dispatcher] Callback failed: ${err.message}`));
+                logger.log('INFO', `[Dispatcher] 📞 Calling back Workflow at: ${callbackUrl}`);
+                try {
+                    await sendAuthenticatedCallback(callbackUrl, finalResult, logger, directFetch);
+                } catch (err) {
+                    logger.log('ERROR', `[Dispatcher] Callback failed: ${err.message}`);
+                }
+            } else {
+                logger.log('WARN', '[Dispatcher] No callback URL provided, workflow will not be notified');
             }
             
             return finalResult;
@@ -216,12 +278,14 @@ async function handleSnapshot(config, dependencies, reqBody) {
         
         // Send callback to workflow if provided
         if (callbackUrl) {
-            logger.log('INFO', '[Dispatcher] 📞 Calling back Workflow...');
-            await directFetch(callbackUrl, {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify(finalResult)
-            }).catch(err => logger.log('ERROR', `[Dispatcher] Callback failed: ${err.message}`));
+            logger.log('INFO', `[Dispatcher] 📞 Calling back Workflow at: ${callbackUrl}`);
+            try {
+                await sendAuthenticatedCallback(callbackUrl, finalResult, logger, directFetch);
+            } catch (err) {
+                logger.log('ERROR', `[Dispatcher] Callback failed: ${err.message}`);
+            }
+        } else {
+            logger.log('WARN', '[Dispatcher] No callback URL provided, workflow will not be notified');
         }
         
         return finalResult;
@@ -231,12 +295,14 @@ async function handleSnapshot(config, dependencies, reqBody) {
         
         // Notify workflow of failure too, otherwise it hangs!
         if (callbackUrl) {
-            logger.log('INFO', '[Dispatcher] 📞 Calling back Workflow with error...');
-            await directFetch(callbackUrl, {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify(errorResult)
-            }).catch(err => logger.log('ERROR', `[Dispatcher] Error callback failed: ${err.message}`));
+            logger.log('INFO', `[Dispatcher] 📞 Calling back Workflow with error at: ${callbackUrl}`);
+            try {
+                await sendAuthenticatedCallback(callbackUrl, errorResult, logger, directFetch);
+            } catch (err) {
+                logger.log('ERROR', `[Dispatcher] Error callback failed: ${err.message}`);
+            }
+        } else {
+            logger.log('WARN', '[Dispatcher] No callback URL provided, workflow will not be notified of error');
         }
         
         return errorResult;

package/package.json

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