bulltrackers-module 1.0.452 → 1.0.454

package/functions/generic-api/user-api/helpers/user_sync_helpers.js

@@ -234,6 +234,47 @@ async function getUserSyncStatus(req, res, dependencies, config) {
             const latestRequest = requestsSnapshot.docs[0].data();
             let status = latestRequest.status || 'queued';
             
+            // Check if request is stale (stuck in processing state for too long)
+            const STALE_THRESHOLD_MS = 5 * 60 * 1000; // 5 minutes
+            const processingStates = ['processing', 'dispatched', 'indexing', 'computing', 'queued'];
+            const isProcessingState = processingStates.includes(status);
+            
+            let isStale = false;
+            if (isProcessingState) {
+                const now = Date.now();
+                const createdAt = latestRequest.createdAt?.toDate?.()?.getTime() || 
+                                 latestRequest.createdAt?.toMillis?.() || null;
+                const dispatchedAt = latestRequest.dispatchedAt?.toDate?.()?.getTime() || 
+                                    latestRequest.dispatchedAt?.toMillis?.() || null;
+                const updatedAt = latestRequest.updatedAt?.toDate?.()?.getTime() || 
+                                 latestRequest.updatedAt?.toMillis?.() || null;
+                
+                // Use the most recent timestamp to determine age
+                const referenceTime = dispatchedAt || createdAt || updatedAt;
+                
+                if (referenceTime && (now - referenceTime) > STALE_THRESHOLD_MS) {
+                    isStale = true;
+                    logger.log('WARN', `[getUserSyncStatus] Detected stale request ${latestRequest.requestId} for user ${targetCidNum}. Status: ${status}, Age: ${Math.round((now - referenceTime) / 60000)} minutes`);
+                }
+            }
+            
+            // If stale, mark as failed to stop polling
+            if (isStale) {
+                status = 'failed';
+                const requestDocRef = requestsSnapshot.docs[0].ref;
+                try {
+                    await requestDocRef.update({
+                        status: 'failed',
+                        error: 'Request timed out - task may have failed to process. Please try again.',
+                        failedAt: FieldValue.serverTimestamp(),
+                        updatedAt: FieldValue.serverTimestamp()
+                    });
+                    logger.log('INFO', `[getUserSyncStatus] Marked stale request ${latestRequest.requestId} as failed`);
+                } catch (updateErr) {
+                    logger.log('WARN', `[getUserSyncStatus] Failed to update stale request status`, updateErr);
+                }
+            }
+            
             const response = {
                 success: true,
                 status,
@@ -249,8 +290,11 @@ async function getUserSyncStatus(req, res, dependencies, config) {
             
             // Include error details if status is failed
             if (status === 'failed') {
-                response.error = latestRequest.error || 'Unknown error occurred';
-                response.failedAt = latestRequest.failedAt?.toDate?.()?.toISOString() || null;
+                response.error = isStale 
+                    ? 'Request timed out - task may have failed to process. Please try again.'
+                    : (latestRequest.error || 'Unknown error occurred');
+                response.failedAt = latestRequest.failedAt?.toDate?.()?.toISOString() || 
+                                   (isStale ? new Date().toISOString() : null);
             }
             
             // Include raw data status if processing

package/functions/task-engine/helpers/popular_investor_helpers.js

@@ -474,10 +474,19 @@ async function handlePopularInvestorUpdate(taskData, config, dependencies) {
  */
 async function handleOnDemandUserUpdate(taskData, config, dependencies) {
     const { cid, username, requestId, source } = taskData;
-    const { ETORO_API_PORTFOLIO_URL, ETORO_API_HISTORY_URL } = config;
     
-    // [FIX] Destructure headerManager
+    // [FIX] Destructure dependencies first
     const { logger, proxyManager, batchManager, headerManager, db } = dependencies;
+    
+    // Validate and set API URLs with defaults and fallbacks
+    const ETORO_API_PORTFOLIO_URL = config.ETORO_API_PORTFOLIO_URL || process.env.ETORO_API_PORTFOLIO_URL || 'https://www.etoro.com/sapi/portfolios/portfolio';
+    const ETORO_API_HISTORY_URL = config.ETORO_API_HISTORY_URL || process.env.ETORO_API_HISTORY_URL || 'https://www.etoro.com/sapi/trade-data-real/history/public/credit/flat';
+    
+    if (!ETORO_API_PORTFOLIO_URL || ETORO_API_PORTFOLIO_URL === 'undefined') {
+        const errorMsg = 'ETORO_API_PORTFOLIO_URL is not configured. Check taskEngine config.';
+        logger.log('ERROR', `[On-Demand Update] ${errorMsg}`);
+        throw new Error(errorMsg);
+    }
 
     logger.log('INFO', `[On-Demand Update] Fetching Portfolio & History for Signed-In User: ${username} (${cid})${requestId ? ` [Request: ${requestId}]` : ''}`);
     
@@ -636,8 +645,49 @@ async function handleOnDemandUserUpdate(taskData, config, dependencies) {
         }
 
         logger.log('SUCCESS', `[On-Demand Update] Complete for ${username}`);
+        
+        // Update request status to completed if this is a sync request
+        if (requestId && source === 'on_demand_sync' && db) {
+            try {
+                const requestRef = db.collection('user_sync_requests')
+                    .doc(String(cid))
+                    .collection('requests')
+                    .doc(requestId);
+                
+                await requestRef.update({
+                    status: 'completed',
+                    completedAt: require('@google-cloud/firestore').FieldValue.serverTimestamp(),
+                    updatedAt: require('@google-cloud/firestore').FieldValue.serverTimestamp()
+                });
+                logger.log('INFO', `[On-Demand Update] Updated sync request ${requestId} to completed`);
+            } catch (err) {
+                logger.log('WARN', `[On-Demand Update] Failed to update request status to completed for ${requestId}`, err);
+            }
+        }
     } catch (error) {
         logger.log('ERROR', `[On-Demand Update] Failed for ${username}`, error);
+        
+        // Update request status to failed if this is a sync request
+        if (requestId && source === 'on_demand_sync' && db) {
+            try {
+                const requestRef = db.collection('user_sync_requests')
+                    .doc(String(cid))
+                    .collection('requests')
+                    .doc(requestId);
+                
+                const errorMessage = error.message || 'Unknown error occurred';
+                await requestRef.update({
+                    status: 'failed',
+                    error: errorMessage,
+                    failedAt: require('@google-cloud/firestore').FieldValue.serverTimestamp(),
+                    updatedAt: require('@google-cloud/firestore').FieldValue.serverTimestamp()
+                });
+                logger.log('INFO', `[On-Demand Update] Updated sync request ${requestId} to failed: ${errorMessage}`);
+            } catch (err) {
+                logger.log('WARN', `[On-Demand Update] Failed to update request status to failed for ${requestId}`, err);
+            }
+        }
+        
         throw error;
     } finally {
         if (headerManager && headerId !== 'fallback') {

package/package.json

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