bulltrackers-module 1.0.604 → 1.0.606

package/functions/api-v2/helpers/data-fetchers/firestore.js

@@ -1835,13 +1835,158 @@ const getSyncStatus = async (db, targetId) => {
     
     if (snap.empty) return { status: 'never_requested' };
     
-    const data = snap.docs[0].data();
-    return {
-        requestId: data.requestId,
-        status: data.status, // queued, dispatched, processing, completed, failed
-        updatedAt: data.updatedAt,
+    const doc = snap.docs[0];
+    const data = doc.data();
+    const requestId = data.requestId;
+    const currentStatus = data.status;
+    
+    // Server-side timeout: Check if request is stale (older than 2 minutes and still processing)
+    const STALE_THRESHOLD_MS = 2 * 60 * 1000; // 2 minutes
+    const processingStates = ['queued', 'dispatched', 'processing', 'indexing', 'computing'];
+    const isProcessingState = processingStates.includes(currentStatus);
+    
+    if (isProcessingState) {
+        // First, check if computation results exist (computation may have completed but status wasn't updated)
+        // This is especially important for "computing" status
+        if (currentStatus === 'computing' || currentStatus === 'indexing') {
+            try {
+                const today = new Date().toISOString().split('T')[0];
+                const userType = data.userType || 'SIGNED_IN_USER';
+                
+                // Determine which computation to check based on user type
+                let computationNames = [];
+                if (userType === 'POPULAR_INVESTOR') {
+                    computationNames = ['PopularInvestorProfileMetrics'];
+                    // Check if also a signed-in user
+                    try {
+                        await isSignedInUser(db, targetId);
+                        computationNames.push('SignedInUserPIPersonalizedMetrics');
+                    } catch (e) {
+                        // Not a signed-in user
+                    }
+                } else {
+                    computationNames = ['SignedInUserProfileMetrics'];
+                    // Check if also a PI
+                    try {
+                        await fetchPopularInvestorMasterList(db, String(targetId));
+                        computationNames.push('SignedInUserPIPersonalizedMetrics', 'PopularInvestorProfileMetrics');
+                    } catch (e) {
+                        // Not a PI
+                    }
+                }
+                
+                // Check if any computation results exist for today
+                let computationFound = false;
+                for (const compName of computationNames) {
+                    try {
+                        const pageRef = db.collection('unified_insights')
+                            .doc(today)
+                            .collection('results')
+                            .doc('popular-investor')
+                            .collection('computations')
+                            .doc(compName)
+                            .collection('pages')
+                            .doc(String(targetId));
+                        
+                        const pageSnap = await pageRef.get();
+                        if (pageSnap.exists) {
+                            computationFound = true;
+                            break;
+                        }
+                    } catch (error) {
+                        // Continue checking other computations
+                        console.error(`Error checking computation ${compName} for ${today}:`, error);
+                    }
+                }
+                
+                // If computation results exist, mark as completed
+                if (computationFound) {
+                    await doc.ref.update({
+                        status: 'completed',
+                        completedAt: new Date(),
+                        updatedAt: new Date()
+                    });
+                    
+                    return {
+                        requestId: requestId,
+                        status: 'completed',
+                        type: data.userType,
+                        createdAt: data.createdAt ? (data.createdAt.toDate ? data.createdAt.toDate().toISOString() : (data.createdAt.toISOString ? data.createdAt.toISOString() : data.createdAt)) : null,
+                        updatedAt: new Date().toISOString(),
+                        completedAt: new Date().toISOString(),
+                        canRequest: true
+                    };
+                }
+            } catch (error) {
+                // If error checking computation results, continue with timeout check
+                console.error(`[getSyncStatus] Error checking computation results:`, error);
+            }
+        }
+        
+        // Check age of request for timeout
+        const createdAt = data.createdAt;
+        const updatedAt = data.updatedAt;
+        
+        // Use updatedAt if available, otherwise createdAt
+        const checkTime = updatedAt || createdAt;
+        if (checkTime) {
+            const checkTimestamp = checkTime.toMillis ? checkTime.toMillis() : (checkTime.getTime ? checkTime.getTime() : new Date(checkTime).getTime());
+            const age = Date.now() - checkTimestamp;
+            
+            if (age > STALE_THRESHOLD_MS) {
+                // Mark as failed due to timeout
+                const errorMessage = `Sync request timed out after ${Math.round(age / 1000 / 60)} minutes. The task may have failed.`;
+                await doc.ref.update({
+                    status: 'failed',
+                    error: errorMessage,
+                    failedAt: new Date(),
+                    updatedAt: new Date()
+                });
+                
+                return {
+                    requestId: requestId,
+                    status: 'failed',
+                    error: errorMessage,
+                    updatedAt: new Date(),
+                    type: data.userType,
+                    createdAt: createdAt,
+                    failedAt: new Date()
+                };
+            }
+        }
+    }
+    
+    // Return current status with timestamps
+    const result = {
+        requestId: requestId,
+        status: currentStatus,
         type: data.userType
     };
+    
+    // Add timestamps if available
+    if (data.createdAt) {
+        result.createdAt = data.createdAt.toDate ? data.createdAt.toDate().toISOString() : (data.createdAt.toISOString ? data.createdAt.toISOString() : data.createdAt);
+    }
+    if (data.updatedAt) {
+        result.updatedAt = data.updatedAt.toDate ? data.updatedAt.toDate().toISOString() : (data.updatedAt.toISOString ? data.updatedAt.toISOString() : data.updatedAt);
+    }
+    if (data.dispatchedAt) {
+        result.dispatchedAt = data.dispatchedAt.toDate ? data.dispatchedAt.toDate().toISOString() : (data.dispatchedAt.toISOString ? data.dispatchedAt.toISOString() : data.dispatchedAt);
+    }
+    if (data.completedAt) {
+        result.completedAt = data.completedAt.toDate ? data.completedAt.toDate().toISOString() : (data.completedAt.toISOString ? data.completedAt.toISOString() : data.completedAt);
+    }
+    if (data.failedAt) {
+        result.failedAt = data.failedAt.toDate ? data.failedAt.toDate().toISOString() : (data.failedAt.toISOString ? data.failedAt.toISOString() : data.failedAt);
+    }
+    if (data.error) {
+        result.error = data.error;
+    }
+    
+    // Add canRequest flag (true if not in processing state or failed)
+    result.canRequest = !isProcessingState && currentStatus !== 'failed';
+    
+    return result;
 };
 
 // ==========================================

package/package.json

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