bulltrackers-module 1.0.105 → 1.0.107

package/functions/task-engine/handler_creator.js

@@ -1,79 +1,79 @@
-/**
- * @fileoverview Main pipe for the Task Engine.
- * REFACTORED: This file is now 'handler_creator.js' in name only.
- * It exports the main 'handleRequest' pipe function.
- * OPTIMIZED: Removed 'batchManager.flushBatches()' from 'finally' block
- * to enable true asynchronous batching.
- */
-
-const { handleDiscover } = require('./helpers/discover_helpers');
-const { handleVerify   } = require('./helpers/verify_helpers');
-const { handleUpdate   } = require('./helpers/update_helpers');
-
-/**
- * Main pipe: pipe.taskEngine.handleRequest
- * This is the Pub/Sub triggered handler.
- * @param {object} message - The Pub/Sub message.
- * @param {object} context - The message context.
- * @param {object} config - The task-engine-specific config.
- * @param {object} dependencies - Contains all clients: db, pubsub, logger, headerManager, proxyManager, batchManager.
- */
-async function handleRequest(message, context, config, dependencies) {
-    // --- OPTIMIZATION: Destructure headerManager here ---
-    const { logger, batchManager, headerManager } = dependencies;
-
-    if (!message || !message.data) {
-        logger.log('ERROR', '[TaskEngine Module] Received invalid message structure.', { message });
-        return;
-    }
-
-    let task;
-    try {
-        task = JSON.parse(Buffer.from(message.data, 'base64').toString('utf-8'));
-    } catch (e) {
-        logger.log('ERROR', '[TaskEngine Module] Failed to parse Pub/Sub message data.', { error: e.message, data: message.data });
-        return;
-    }
-
-    const taskId = `${task.type || 'unknown'}-${task.userType || 'unknown'}-${task.userId || task.cids?.[0] || 'batch'}-${Date.now()}`;
-    logger.log('INFO', `[TaskEngine/${taskId}] Received.`);
-
-    try {
-        await new Promise(resolve => setTimeout(resolve, Math.random() * 500 + 250));
-
-        // --- 3. Use the directly required functions ---
-        // Route to the correct sub-pipe
-        const handlerFunction = {
-            discover: handleDiscover, 
-            verify: handleVerify,    
-            update: handleUpdate     
-        }[task.type];
-
-        if (handlerFunction) {
-            // Pass the dependencies object to the sub-pipe
-            await handlerFunction(task, taskId, dependencies, config);
-            logger.log('SUCCESS', `[TaskEngine/${taskId}] Done.`);
-        } else {
-            logger.log('ERROR', `[TaskEngine/${taskId}] Unknown task type received: ${task.type}`);
-        }
-    } catch (error) {
-        logger.log('ERROR', `[TaskEngine/${taskId}] Failed.`, { errorMessage: error.message, errorStack: error.stack });
-
-    } finally {
-         try {
-             // --- OPTIMIZATION START ---
-             // The FirestoreBatchManager will flush itself on its own timer.
-             // We no longer call `await batchManager.flushBatches()` here.
-             // We *only* need to flush the header performance updates at the end of the task.
-             await headerManager.flushPerformanceUpdates();
-             logger.log('INFO', `[TaskEngine/${taskId}] Final header performance flush complete.`);
-             // --- OPTIMIZATION END ---
-         } catch (flushError) {
-             logger.log('ERROR', `[TaskEngine/${taskId}] Error during final flush attempt.`, { error: flushError.message });
-         }
-    }
-}
-
-module.exports = {
-    handleRequest,
+/**
+ * @fileoverview Main pipe for the Task Engine.
+ * REFACTORED: This file is now 'handler_creator.js' in name only.
+ * It exports the main 'handleRequest' pipe function.
+ * OPTIMIZED: Removed 'batchManager.flushBatches()' from 'finally' block
+ * to enable true asynchronous batching.
+ */
+
+const { handleDiscover } = require('./helpers/discover_helpers');
+const { handleVerify   } = require('./helpers/verify_helpers');
+const { handleUpdate   } = require('./helpers/update_helpers');
+
+/**
+ * Main pipe: pipe.taskEngine.handleRequest
+ * This is the Pub/Sub triggered handler.
+ * @param {object} message - The Pub/Sub message.
+ * @param {object} context - The message context.
+ * @param {object} config - The task-engine-specific config.
+ * @param {object} dependencies - Contains all clients: db, pubsub, logger, headerManager, proxyManager, batchManager.
+ */
+async function handleRequest(message, context, config, dependencies) {
+    // --- OPTIMIZATION: Destructure headerManager here ---
+    const { logger, batchManager, headerManager } = dependencies;
+
+    if (!message || !message.data) {
+        logger.log('ERROR', '[TaskEngine Module] Received invalid message structure.', { message });
+        return;
+    }
+
+    let task;
+    try {
+        task = JSON.parse(Buffer.from(message.data, 'base64').toString('utf-8'));
+    } catch (e) {
+        logger.log('ERROR', '[TaskEngine Module] Failed to parse Pub/Sub message data.', { error: e.message, data: message.data });
+        return;
+    }
+
+    const taskId = `${task.type || 'unknown'}-${task.userType || 'unknown'}-${task.userId || task.cids?.[0] || 'batch'}-${Date.now()}`;
+    logger.log('INFO', `[TaskEngine/${taskId}] Received.`);
+
+    try {
+        await new Promise(resolve => setTimeout(resolve, Math.random() * 500 + 250));
+
+        // --- 3. Use the directly required functions ---
+        // Route to the correct sub-pipe
+        const handlerFunction = {
+            discover: handleDiscover, 
+            verify: handleVerify,    
+            update: handleUpdate     
+        }[task.type];
+
+        if (handlerFunction) {
+            // Pass the dependencies object to the sub-pipe
+            await handlerFunction(task, taskId, dependencies, config);
+            logger.log('SUCCESS', `[TaskEngine/${taskId}] Done.`);
+        } else {
+            logger.log('ERROR', `[TaskEngine/${taskId}] Unknown task type received: ${task.type}`);
+        }
+    } catch (error) {
+        logger.log('ERROR', `[TaskEngine/${taskId}] Failed.`, { errorMessage: error.message, errorStack: error.stack });
+
+    } finally {
+         try {
+             // --- OPTIMIZATION START ---
+             // The FirestoreBatchManager will flush itself on its own timer.
+             // We no longer call `await batchManager.flushBatches()` here.
+             // We *only* need to flush the header performance updates at the end of the task.
+             await headerManager.flushPerformanceUpdates();
+             logger.log('INFO', `[TaskEngine/${taskId}] Final header performance flush complete.`);
+             // --- OPTIMIZATION END ---
+         } catch (flushError) {
+             logger.log('ERROR', `[TaskEngine/${taskId}] Error during final flush attempt.`, { error: flushError.message });
+         }
+    }
+}
+
+module.exports = {
+    handleRequest,
 };

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

@@ -1,125 +1,125 @@
-/**
- * @fileoverview Sub-pipe: pipe.taskEngine.handleDiscover
- * REFACTORED: Now stateless and receives dependencies.
- */
-
-/**
- * Sub-pipe: pipe.taskEngine.handleDiscover
- * @param {object} task The Pub/Sub task payload.
- * @param {string} taskId A unique ID for logging.
- * @param {object} dependencies - Contains db, pubsub, logger, headerManager, proxyManager, batchManager.
- * @param {object} config The configuration object.
- */
-async function handleDiscover(task, taskId, dependencies, config) {
-    const { logger, headerManager, proxyManager, pubsub, batchManager } = dependencies;
-    const { cids, blockId, instrument, userType } = task;
-    
-    const url = `${config.ETORO_API_RANKINGS_URL}?Period=LastTwoYears`;
-    const selectedHeader = await headerManager.selectHeader();
-    if (!selectedHeader) throw new Error("Could not select a header.");
-
-    let wasSuccess = false;
-    try {
-        if (userType === 'speculator') {
-            // Use the batchManager from dependencies
-            batchManager.addProcessedSpeculatorCids(cids);
-            logger.log('INFO', `[DISCOVER] Added ${cids.length} speculator CIDs to the in-memory set to be flushed.`);
-        }
-        
-        // Use the proxyManager from dependencies
-        const response = await proxyManager.fetch(url, {
-            method: 'POST',
-            headers: { ...selectedHeader.header, 'Content-Type': 'application/json' },
-            body: JSON.stringify(cids),
-        });
-        if (!response.ok) {
-            throw new Error(`API status ${response.status}`);
-        }
-        wasSuccess = true;
-
-        const publicUsers = await response.json();
-        if (!Array.isArray(publicUsers)) return;
-
-        const oneMonthAgo = new Date();
-        oneMonthAgo.setMonth(oneMonthAgo.getMonth() - 1);
-
-        const preliminaryActiveUsers = publicUsers.filter(user => 
-            new Date(user.Value.LastActivity) > oneMonthAgo &&
-            user.Value.DailyGain !== 0 &&
-            user.Value.Exposure !== 0 &&
-            user.Value.RiskScore !== 0
-        );
-        
-        let finalActiveUsers = [];
-        const invalidCidsToLog = [];
-
-        if (userType === 'speculator') {
-            const publicUserCids = new Set(publicUsers.map(u => u.CID));
-            
-            if (publicUserCids.size > 0 && publicUserCids.size < cids.length) {
-                const privateUserCids = cids.filter(cid => !publicUserCids.has(cid));
-                invalidCidsToLog.push(...privateUserCids);
-            }
-
-            const activeUserCids = new Set(preliminaryActiveUsers.map(u => u.CID));
-            const inactiveUserCids = publicUsers
-                .filter(u => !activeUserCids.has(u.CID))
-                .map(u => u.CID);
-            invalidCidsToLog.push(...inactiveUserCids);
-
-            logger.log('INFO', `[DISCOVER] Applying new speculator pre-filter to ${preliminaryActiveUsers.length} active users.`);
-            const nonSpeculatorCids = [];
-            
-            for (const user of preliminaryActiveUsers) {
-                const v = user.Value;
-                const totalLeverage = (v.MediumLeveragePct || 0) + (v.HighLeveragePct || 0);
-
-                const isLikelySpeculator = (
-                    (v.Trades || 0) > 500 ||
-                    (v.TotalTradedInstruments || 0) > 50 ||
-                    totalLeverage > 50 ||
-                    (v.WeeklyDD || 0) < -25
-                );
-
-                if (isLikelySpeculator) {
-                    finalActiveUsers.push(user);
-                } else {
-                    nonSpeculatorCids.push(user.CID);
-                }
-            }
-            
-            invalidCidsToLog.push(...nonSpeculatorCids);
-            logger.log('INFO', `[DISCOVER] Pre-filter complete. ${finalActiveUsers.length} users passed. ${nonSpeculatorCids.length} users failed heuristic.`);
-            
-            if (invalidCidsToLog.length > 0) {
-                // Use pubsub from dependencies
-                await pubsub.topic(config.PUBSUB_TOPIC_INVALID_SPECULATOR_LOG)
-                                  .publishMessage({ json: { invalidCids: invalidCidsToLog } });
-                logger.log('INFO', `[DISCOVER] Reported ${invalidCidsToLog.length} invalid (private, inactive, or failed heuristic) speculator IDs.`);
-            }
-
-        } else { // 'normal' users
-            finalActiveUsers = preliminaryActiveUsers;
-        }
-
-        if (finalActiveUsers.length > 0) {
-            const verificationTask = {
-                type: 'verify',
-                users: finalActiveUsers.map(u => ({ cid: u.CID, isBronze: u.Value.IsBronze })),
-                blockId,
-                instrument,
-                userType
-            };
-            // Use pubsub from dependencies
-            await pubsub.topic(config.PUBSUB_TOPIC_USER_FETCH)
-                               .publishMessage({ json: verificationTask });
-            logger.log('INFO', `[DISCOVER] Verification message published was : ${JSON.stringify(verificationTask)} `);
-            logger.log('INFO', `[DISCOVER] Chaining to 'verify' task for ${finalActiveUsers.length} active users.`);
-        }
-        
-    } finally {
-        if (selectedHeader) headerManager.updatePerformance(selectedHeader.id, wasSuccess);
-    }
-}
-
-module.exports = { handleDiscover };
+/**
+ * @fileoverview Sub-pipe: pipe.taskEngine.handleDiscover
+ * REFACTORED: Now stateless and receives dependencies.
+ */
+
+/**
+ * Sub-pipe: pipe.taskEngine.handleDiscover
+ * @param {object} task The Pub/Sub task payload.
+ * @param {string} taskId A unique ID for logging.
+ * @param {object} dependencies - Contains db, pubsub, logger, headerManager, proxyManager, batchManager.
+ * @param {object} config The configuration object.
+ */
+async function handleDiscover(task, taskId, dependencies, config) {
+    const { logger, headerManager, proxyManager, pubsub, batchManager } = dependencies;
+    const { cids, blockId, instrument, userType } = task;
+    
+    const url = `${config.ETORO_API_RANKINGS_URL}?Period=LastTwoYears`;
+    const selectedHeader = await headerManager.selectHeader();
+    if (!selectedHeader) throw new Error("Could not select a header.");
+
+    let wasSuccess = false;
+    try {
+        if (userType === 'speculator') {
+            // Use the batchManager from dependencies
+            batchManager.addProcessedSpeculatorCids(cids);
+            logger.log('INFO', `[DISCOVER] Added ${cids.length} speculator CIDs to the in-memory set to be flushed.`);
+        }
+        
+        // Use the proxyManager from dependencies
+        const response = await proxyManager.fetch(url, {
+            method: 'POST',
+            headers: { ...selectedHeader.header, 'Content-Type': 'application/json' },
+            body: JSON.stringify(cids),
+        });
+        if (!response.ok) {
+            throw new Error(`API status ${response.status}`);
+        }
+        wasSuccess = true;
+
+        const publicUsers = await response.json();
+        if (!Array.isArray(publicUsers)) return;
+
+        const oneMonthAgo = new Date();
+        oneMonthAgo.setMonth(oneMonthAgo.getMonth() - 1);
+
+        const preliminaryActiveUsers = publicUsers.filter(user => 
+            new Date(user.Value.LastActivity) > oneMonthAgo &&
+            user.Value.DailyGain !== 0 &&
+            user.Value.Exposure !== 0 &&
+            user.Value.RiskScore !== 0
+        );
+        
+        let finalActiveUsers = [];
+        const invalidCidsToLog = [];
+
+        if (userType === 'speculator') {
+            const publicUserCids = new Set(publicUsers.map(u => u.CID));
+            
+            if (publicUserCids.size > 0 && publicUserCids.size < cids.length) {
+                const privateUserCids = cids.filter(cid => !publicUserCids.has(cid));
+                invalidCidsToLog.push(...privateUserCids);
+            }
+
+            const activeUserCids = new Set(preliminaryActiveUsers.map(u => u.CID));
+            const inactiveUserCids = publicUsers
+                .filter(u => !activeUserCids.has(u.CID))
+                .map(u => u.CID);
+            invalidCidsToLog.push(...inactiveUserCids);
+
+            logger.log('INFO', `[DISCOVER] Applying new speculator pre-filter to ${preliminaryActiveUsers.length} active users.`);
+            const nonSpeculatorCids = [];
+            
+            for (const user of preliminaryActiveUsers) {
+                const v = user.Value;
+                const totalLeverage = (v.MediumLeveragePct || 0) + (v.HighLeveragePct || 0);
+
+                const isLikelySpeculator = (
+                    (v.Trades || 0) > 500 ||
+                    (v.TotalTradedInstruments || 0) > 50 ||
+                    totalLeverage > 50 ||
+                    (v.WeeklyDD || 0) < -25
+                );
+
+                if (isLikelySpeculator) {
+                    finalActiveUsers.push(user);
+                } else {
+                    nonSpeculatorCids.push(user.CID);
+                }
+            }
+            
+            invalidCidsToLog.push(...nonSpeculatorCids);
+            logger.log('INFO', `[DISCOVER] Pre-filter complete. ${finalActiveUsers.length} users passed. ${nonSpeculatorCids.length} users failed heuristic.`);
+            
+            if (invalidCidsToLog.length > 0) {
+                // Use pubsub from dependencies
+                await pubsub.topic(config.PUBSUB_TOPIC_INVALID_SPECULATOR_LOG)
+                                  .publishMessage({ json: { invalidCids: invalidCidsToLog } });
+                logger.log('INFO', `[DISCOVER] Reported ${invalidCidsToLog.length} invalid (private, inactive, or failed heuristic) speculator IDs.`);
+            }
+
+        } else { // 'normal' users
+            finalActiveUsers = preliminaryActiveUsers;
+        }
+
+        if (finalActiveUsers.length > 0) {
+            const verificationTask = {
+                type: 'verify',
+                users: finalActiveUsers.map(u => ({ cid: u.CID, isBronze: u.Value.IsBronze })),
+                blockId,
+                instrument,
+                userType
+            };
+            // Use pubsub from dependencies
+            await pubsub.topic(config.PUBSUB_TOPIC_USER_FETCH)
+                               .publishMessage({ json: verificationTask });
+            logger.log('INFO', `[DISCOVER] Verification message published was : ${JSON.stringify(verificationTask)} `);
+            logger.log('INFO', `[DISCOVER] Chaining to 'verify' task for ${finalActiveUsers.length} active users.`);
+        }
+        
+    } finally {
+        if (selectedHeader) headerManager.updatePerformance(selectedHeader.id, wasSuccess);
+    }
+}
+
+module.exports = { handleDiscover };

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

@@ -1,119 +1,119 @@
-/**
- * @fileoverview Sub-pipe: pipe.taskEngine.handleUpdate
- * REFACTORED: Now stateless and receives dependencies.
- * OPTIMIZED: Removed immediate batch commit for speculator timestamp fix.
- */
-const { FieldValue } = require('@google-cloud/firestore');
-
-/**
- * Sub-pipe: pipe.taskEngine.handleUpdate
- * @param {object} task The Pub/Sub task payload.
- * @param {string} taskId A unique ID for logging.
- * @param {object} dependencies - Contains db, pubsub, logger, headerManager, proxyManager, batchManager.
- * @param {object} config The configuration object.
- */
-async function handleUpdate(task, taskId, dependencies, config) {
-    const { logger, headerManager, proxyManager, db, batchManager } = dependencies;
-    const { userId, instrumentId, userType } = task;
-    
-    const selectedHeader = await headerManager.selectHeader();
-    if (!selectedHeader) throw new Error("Could not select a header.");
-
-    let wasSuccess = false;
-    try {
-        const url = userType === 'speculator' 
-            ? `${config.ETORO_API_POSITIONS_URL}?cid=${userId}&InstrumentID=${instrumentId}` 
-            : `${config.ETORO_API_PORTFOLIO_URL}?cid=${userId}`;
-        
-        logger.log('INFO', `[UPDATE] Fetching portfolio for user ${userId} (${userType} with url ${url})`);
-        
-        // Use proxyManager from dependencies
-        const response  = await proxyManager.fetch(url, { headers: selectedHeader.header });
-
-        if (!response || typeof response.text !== 'function') {
-            logger.log('ERROR', `[UPDATE] Invalid or incomplete response received for user ${userId}`, { response });
-            throw new Error(`Invalid response structure received from proxy for user ${userId}.`);
-        }
-
-        const responseBody = await response.text();
-
-        if (responseBody.includes("user is PRIVATE")) {
-            logger.log('WARN', `User ${userId} is private. Removing from future updates and decrementing block count.`);
-            
-            // Use batchManager from dependencies
-            batchManager.deleteFromTimestampBatch(userId, userType, instrumentId);
-
-            // <<< START FIX for private user blockId format >>>
-            // The blockId format for Speculator Blocks is numeric (e.g., "1000000")
-            let blockId;
-            let incrementField;
-
-            if (userType === 'speculator') {
-                blockId = String(Math.floor(parseInt(userId) / 1000000) * 1000000);
-                incrementField = `counts.${instrumentId}_${blockId}`;
-            } else {
-                
-                // <<< START FIX for Normal User Block ID >>>
-                // BUG: This was calculating '19M', which is wrong for the counter.
-                // blockId = `${Math.floor(parseInt(userId) / 1000000)}M`; 
-                
-                // FIX: Use the numeric '19000000' format, just like the orchestrator.
-                blockId = String(Math.floor(parseInt(userId) / 1000000) * 1000000);
-                // <<< END FIX for Normal User Block ID >>>
-
-                incrementField = `counts.${blockId}`;
-            }
-            
-            // Use db from dependencies
-            const blockCountsRef = db.doc(userType === 'speculator' 
-                ? config.FIRESTORE_DOC_SPECULATOR_BLOCK_COUNTS 
-                : config.FIRESTORE_DOC_BLOCK_COUNTS);
-            // <<< END FIX for private user blockId format >>>
-                
-            // This is a single, immediate write, which is fine for this rare case.
-            await blockCountsRef.set({ [incrementField]: FieldValue.increment(-1) }, { merge: true });
-
-            return;
-        }
-        
-        if (!response.ok) {
-            throw new Error(`API Error: Status ${response.status}`);
-        }
-        wasSuccess = true;
-        const portfolioData = JSON.parse(responseBody);
-
-        const today = new Date().toISOString().slice(0, 10);
-        
-        // <<< START OPTIMIZATION / FULL CODE FIX >>>
-
-        // BUG 1: The blockId format is different for portfolio storage ('1M') 
-        // vs. orchestrator logic ('1000000').
-        const portfolioStorageBlockId = `${Math.floor(parseInt(userId) / 1000000)}M`;
-        
-        // This call is correct for storing portfolio data (which uses the 'M' format)
-        await batchManager.addToPortfolioBatch(userId, portfolioStorageBlockId, today, portfolioData, userType, instrumentId);
-        
-        // This call is correct for 'normal' users.
-        await batchManager.updateUserTimestamp(userId, userType, instrumentId);
-
-        // BUG 2 (The Main Problem): We must *also* update the 'SpeculatorBlocks'
-        // collection, which is what the orchestrator *does* read.
-        if (userType === 'speculator') {
-            const orchestratorBlockId = String(Math.floor(parseInt(userId) / 1000000) * 1000000);
-
-            logger.log('INFO', `[UPDATE] Applying speculator timestamp fix for user ${userId} in block ${orchestratorBlockId}`);
-            
-            // --- OPTIMIZATION: Use the batch manager instead of committing immediately ---
-            // This queues the write and allows the function to return,
-            // instead of blocking on `await fixBatch.commit()`.
-            await batchManager.addSpeculatorTimestampFix(userId, orchestratorBlockId);
-            logger.log('INFO', `[UPDATE] Speculator timestamp fix for user ${userId} queued.`);
-        }
-        // <<< END OPTIMIZATION / FULL CODE FIX >>>
-
-    } finally {
-        if (selectedHeader) headerManager.updatePerformance(selectedHeader.id, wasSuccess);
-    }
-}
-
+/**
+ * @fileoverview Sub-pipe: pipe.taskEngine.handleUpdate
+ * REFACTORED: Now stateless and receives dependencies.
+ * OPTIMIZED: Removed immediate batch commit for speculator timestamp fix.
+ */
+const { FieldValue } = require('@google-cloud/firestore');
+
+/**
+ * Sub-pipe: pipe.taskEngine.handleUpdate
+ * @param {object} task The Pub/Sub task payload.
+ * @param {string} taskId A unique ID for logging.
+ * @param {object} dependencies - Contains db, pubsub, logger, headerManager, proxyManager, batchManager.
+ * @param {object} config The configuration object.
+ */
+async function handleUpdate(task, taskId, dependencies, config) {
+    const { logger, headerManager, proxyManager, db, batchManager } = dependencies;
+    const { userId, instrumentId, userType } = task;
+    
+    const selectedHeader = await headerManager.selectHeader();
+    if (!selectedHeader) throw new Error("Could not select a header.");
+
+    let wasSuccess = false;
+    try {
+        const url = userType === 'speculator' 
+            ? `${config.ETORO_API_POSITIONS_URL}?cid=${userId}&InstrumentID=${instrumentId}` 
+            : `${config.ETORO_API_PORTFOLIO_URL}?cid=${userId}`;
+        
+        logger.log('INFO', `[UPDATE] Fetching portfolio for user ${userId} (${userType} with url ${url})`);
+        
+        // Use proxyManager from dependencies
+        const response  = await proxyManager.fetch(url, { headers: selectedHeader.header });
+
+        if (!response || typeof response.text !== 'function') {
+            logger.log('ERROR', `[UPDATE] Invalid or incomplete response received for user ${userId}`, { response });
+            throw new Error(`Invalid response structure received from proxy for user ${userId}.`);
+        }
+
+        const responseBody = await response.text();
+
+        if (responseBody.includes("user is PRIVATE")) {
+            logger.log('WARN', `User ${userId} is private. Removing from future updates and decrementing block count.`);
+            
+            // Use batchManager from dependencies
+            batchManager.deleteFromTimestampBatch(userId, userType, instrumentId);
+
+            // <<< START FIX for private user blockId format >>>
+            // The blockId format for Speculator Blocks is numeric (e.g., "1000000")
+            let blockId;
+            let incrementField;
+
+            if (userType === 'speculator') {
+                blockId = String(Math.floor(parseInt(userId) / 1000000) * 1000000);
+                incrementField = `counts.${instrumentId}_${blockId}`;
+            } else {
+                
+                // <<< START FIX for Normal User Block ID >>>
+                // BUG: This was calculating '19M', which is wrong for the counter.
+                // blockId = `${Math.floor(parseInt(userId) / 1000000)}M`; 
+                
+                // FIX: Use the numeric '19000000' format, just like the orchestrator.
+                blockId = String(Math.floor(parseInt(userId) / 1000000) * 1000000);
+                // <<< END FIX for Normal User Block ID >>>
+
+                incrementField = `counts.${blockId}`;
+            }
+            
+            // Use db from dependencies
+            const blockCountsRef = db.doc(userType === 'speculator' 
+                ? config.FIRESTORE_DOC_SPECULATOR_BLOCK_COUNTS 
+                : config.FIRESTORE_DOC_BLOCK_COUNTS);
+            // <<< END FIX for private user blockId format >>>
+                
+            // This is a single, immediate write, which is fine for this rare case.
+            await blockCountsRef.set({ [incrementField]: FieldValue.increment(-1) }, { merge: true });
+
+            return;
+        }
+        
+        if (!response.ok) {
+            throw new Error(`API Error: Status ${response.status}`);
+        }
+        wasSuccess = true;
+        const portfolioData = JSON.parse(responseBody);
+
+        const today = new Date().toISOString().slice(0, 10);
+        
+        // <<< START OPTIMIZATION / FULL CODE FIX >>>
+
+        // BUG 1: The blockId format is different for portfolio storage ('1M') 
+        // vs. orchestrator logic ('1000000').
+        const portfolioStorageBlockId = `${Math.floor(parseInt(userId) / 1000000)}M`;
+        
+        // This call is correct for storing portfolio data (which uses the 'M' format)
+        await batchManager.addToPortfolioBatch(userId, portfolioStorageBlockId, today, portfolioData, userType, instrumentId);
+        
+        // This call is correct for 'normal' users.
+        await batchManager.updateUserTimestamp(userId, userType, instrumentId);
+
+        // BUG 2 (The Main Problem): We must *also* update the 'SpeculatorBlocks'
+        // collection, which is what the orchestrator *does* read.
+        if (userType === 'speculator') {
+            const orchestratorBlockId = String(Math.floor(parseInt(userId) / 1000000) * 1000000);
+
+            logger.log('INFO', `[UPDATE] Applying speculator timestamp fix for user ${userId} in block ${orchestratorBlockId}`);
+            
+            // --- OPTIMIZATION: Use the batch manager instead of committing immediately ---
+            // This queues the write and allows the function to return,
+            // instead of blocking on `await fixBatch.commit()`.
+            await batchManager.addSpeculatorTimestampFix(userId, orchestratorBlockId);
+            logger.log('INFO', `[UPDATE] Speculator timestamp fix for user ${userId} queued.`);
+        }
+        // <<< END OPTIMIZATION / FULL CODE FIX >>>
+
+    } finally {
+        if (selectedHeader) headerManager.updatePerformance(selectedHeader.id, wasSuccess);
+    }
+}
+
 module.exports = { handleUpdate };