bulltrackers-module 1.0.603 → 1.0.605

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

@@ -1835,13 +1835,81 @@ 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) {
+        // Check age of request
+        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;
 };
 
 // ==========================================
@@ -1935,39 +2003,51 @@ const checkDataStatus = async (db, userId) => {
     let computationDate = null;
     let fallbackWindowExhausted = false;
     
-    // Determine which computation to check based on user type
-    let computationName = 'SignedInUserProfileMetrics';
+    // Determine which computations to check based on user type
+    // Signed-in users always have SignedInUserProfileMetrics
+    // If they're also a PI, they may have SignedInUserPIPersonalizedMetrics
+    const computationNames = ['SignedInUserProfileMetrics'];
     try {
         await fetchPopularInvestorMasterList(db, userId);
-        computationName = 'SignedInUserPIPersonalizedMetrics';
+        // User is a PI, also check for PI-specific computation
+        computationNames.push('SignedInUserPIPersonalizedMetrics');
     } catch (e) {
-        // User is not a PI, use default
+        // User is not a PI, only check SignedInUserProfileMetrics
     }
     
     // Check for computation results in the last 7 days
+    // Check all relevant computation names for this user
     for (let i = 0; i < lookbackDays; i++) {
         const checkDate = new Date(today);
         checkDate.setDate(checkDate.getDate() - i);
         const dateStr = checkDate.toISOString().split('T')[0];
         
-        try {
-            const pageRef = db.collection('unified_insights')
-                .doc(dateStr)
-                .collection('results')
-                .doc('popular-investor')
-                .collection('computations')
-                .doc(computationName)
-                .collection('pages')
-                .doc(String(userId));
-            
-            const pageSnap = await pageRef.get();
-            if (pageSnap.exists) {
-                computationDate = dateStr;
-                break;
+        // Check each computation name
+        for (const compName of computationNames) {
+            try {
+                const pageRef = db.collection('unified_insights')
+                    .doc(dateStr)
+                    .collection('results')
+                    .doc('popular-investor')
+                    .collection('computations')
+                    .doc(compName)
+                    .collection('pages')
+                    .doc(String(userId));
+                
+                const pageSnap = await pageRef.get();
+                if (pageSnap.exists) {
+                    computationDate = dateStr;
+                    break;
+                }
+            } catch (error) {
+                // Continue checking other dates/computations
+                console.error(`Error checking computation ${compName} for ${dateStr}:`, error);
             }
-        } catch (error) {
-            // Continue checking other dates
-            console.error(`Error checking computation for ${dateStr}:`, error);
+        }
+        
+        // If we found a computation date, stop checking
+        if (computationDate) {
+            break;
         }
     }
     

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

@@ -244,7 +244,12 @@ async function handleComputationTask(message, config, dependencies) {
                     computation,
                     getComputationDisplayName(computation),
                     true,
-                    null
+                    null,
+                    {
+                        collectionRegistry: dependencies.collectionRegistry,
+                        config: config,
+                        notificationType: 'userActionCompletions'
+                    }
                 );
             } catch (notifError) {
                 // Non-critical, log and continue
@@ -291,7 +296,12 @@ async function handleComputationTask(message, config, dependencies) {
                         computation,
                         getComputationDisplayName(computation),
                         false,
-                        err.message
+                        err.message,
+                        {
+                            collectionRegistry: dependencies.collectionRegistry,
+                            config: config,
+                            notificationType: 'userActionCompletions'
+                        }
                     );
                 } catch (notifError) {
                     // Non-critical, log and continue

package/package.json

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