bulltrackers-module 1.0.213 → 1.0.215

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

@@ -5,43 +5,26 @@
  */
 
 const { FieldValue } = require('@google-cloud/firestore');
-const crypto = require('crypto'); 
+const crypto         = require('crypto'); 
 
 // --- CIRCUIT BREAKER STATE ---
 let _consecutiveProxyFailures = 0;
-const MAX_PROXY_FAILURES = 3;
+const MAX_PROXY_FAILURES      = 3;
 
-function shouldTryProxy() {
-    return _consecutiveProxyFailures < MAX_PROXY_FAILURES;
-}
+function shouldTryProxy() { return _consecutiveProxyFailures < MAX_PROXY_FAILURES; }
 
 function recordProxyOutcome(success) {
-    if (success) {
-        _consecutiveProxyFailures = 0;
-    } else {
-        _consecutiveProxyFailures++;
-    }
+    if (success) { _consecutiveProxyFailures = 0;
+    } else       { _consecutiveProxyFailures++; }
 }
 
 function detectSpeculatorTargets(historyData, portfolioData) {
     if (!historyData?.PublicHistoryPositions || !portfolioData?.AggregatedPositions) return [];
-
     const leveragedAssets = new Set();
-    for (const pos of historyData.PublicHistoryPositions) {
-        if (pos.Leverage > 1 && pos.InstrumentID) {
-            leveragedAssets.add(pos.InstrumentID);
-        }
-    }
-
+    for (const pos of historyData.PublicHistoryPositions) { if (pos.Leverage > 1 && pos.InstrumentID) { leveragedAssets.add(pos.InstrumentID); } }
     if (leveragedAssets.size === 0) return [];
-
     const targets = [];
-    for (const pos of portfolioData.AggregatedPositions) {
-        if (leveragedAssets.has(pos.InstrumentID)) {
-            targets.push(pos.InstrumentID);
-        }
-    }
-    
+    for (const pos of portfolioData.AggregatedPositions) { if (leveragedAssets.has(pos.InstrumentID)) { targets.push(pos.InstrumentID); } }
     return targets;
 }
 
@@ -49,37 +32,35 @@ async function handleUpdate(task, taskId, { logger, headerManager, proxyManager,
     const { userId, instruments, instrumentId, userType } = task;
     
     const instrumentsToProcess = userType === 'speculator'  ? (instruments || [instrumentId]) : [undefined]; 
-    const today = new Date().toISOString().slice(0, 10);
-    const portfolioBlockId = `${Math.floor(parseInt(userId) / 1000000)}M`;
-    let isPrivate = false;
-    
-    let capturedHistory = null;
-    let capturedPortfolio = null;
-    let hasPortfolioErrors = false;
+    const today                = new Date().toISOString().slice(0, 10);
+    const portfolioBlockId     = `${Math.floor(parseInt(userId) / 1000000)}M`;
+    let isPrivate              = false;
+    let capturedHistory        = null;
+    let capturedPortfolio      = null;
+    let hasPortfolioErrors     = false;
 
     const scopeLog = userType === 'speculator' ? `Instruments: [${instrumentsToProcess.join(', ')}]` : 'Scope: Full Portfolio';
     logger.log('TRACE', `[handleUpdate/${userId}] Starting update task. Type: ${userType}. ${scopeLog}`);
 
     // --- 1. Process History Fetch (Sequentially) ---
-    let historyHeader = null;
-    let wasHistorySuccess = false;
+    let historyHeader       = null;
+    let wasHistorySuccess   = false;
     let proxyUsedForHistory = false;
 
     try {
         if (!batchManager.checkAndSetHistoryFetched(userId)) {
             logger.log('TRACE', `[handleUpdate/${userId}] Attempting history fetch.`);
             historyHeader = await headerManager.selectHeader();
-            if (!historyHeader) { 
-                logger.log('WARN', `[handleUpdate/${userId}] Could not select history header. Skipping history.`);
+            if (!historyHeader) {  logger.log('WARN', `[handleUpdate/${userId}] Could not select history header. Skipping history.`);
             } else {
                 
                 const d = new Date();
                 d.setFullYear(d.getFullYear() - 1);
                 const oneYearAgoStr = d.toISOString();
-                const uuid = crypto.randomUUID ? crypto.randomUUID() : '0205aca7-bd37-4884-8455-f28ce1add2de'; 
+                const uuid          = crypto.randomUUID ? crypto.randomUUID() : '0205aca7-bd37-4884-8455-f28ce1add2de'; 
 
                 const historyUrl = `https://www.etoro.com/sapi/trade-data-real/history/public/credit/flat?StartTime=${oneYearAgoStr}&PageNumber=1&ItemsPerPage=30000&PublicHistoryPortfolioFilter=&CID=${userId}&client_request_id=${uuid}`;
-                const options = { headers: historyHeader.header };
+                const options    = { headers: historyHeader.header };
                 let response;
 
                 // --- PROXY ATTEMPT ---
@@ -88,7 +69,7 @@ async function handleUpdate(task, taskId, { logger, headerManager, proxyManager,
                         logger.log('TRACE', `[handleUpdate/${userId}] Attempting history fetch via AppScript proxy...`);
                         response = await proxyManager.fetch(historyUrl, options);
                         if (!response.ok) throw new Error(`AppScript proxy failed with status ${response.status}`);
-                        wasHistorySuccess = true; 
+                        wasHistorySuccess   = true; 
                         proxyUsedForHistory = true;
                         recordProxyOutcome(true); 
 
@@ -113,9 +94,7 @@ async function handleUpdate(task, taskId, { logger, headerManager, proxyManager,
 
                 if (wasHistorySuccess) { 
                     const data = await response.json();
-                    
-                    // --- FILTER LOGIC FOR GRANULAR API ---
-                    // 0 = Manual, 1 = Stop Loss, 5 = Take Profit.
+
                     const VALID_REASONS = [0, 1, 5];
                     if (data.PublicHistoryPositions && Array.isArray(data.PublicHistoryPositions)) {
                         const originalCount = data.PublicHistoryPositions.length;
@@ -128,14 +107,9 @@ async function handleUpdate(task, taskId, { logger, headerManager, proxyManager,
                     await batchManager.addToTradingHistoryBatch(userId, portfolioBlockId, today, data, userType);  
                 }
             }
-        } else { 
-            logger.log('TRACE', `[handleUpdate/${userId}] History fetch skipped (already fetched).`); 
-        }
-    } catch (err) { 
-        logger.log('ERROR', `[handleUpdate/${userId}] Unhandled error during history processing.`, { error: err.message }); wasHistorySuccess = false; 
-    } finally { 
-        if (historyHeader && proxyUsedForHistory) { headerManager.updatePerformance(historyHeader.id, wasHistorySuccess); } 
-    } 
+        } else { logger.log('TRACE', `[handleUpdate/${userId}] History fetch skipped (already fetched).`); }
+    } catch (err) { logger.log('ERROR', `[handleUpdate/${userId}] Unhandled error during history processing.`, { error: err.message }); wasHistorySuccess = false; 
+    } finally { if (historyHeader && proxyUsedForHistory) { headerManager.updatePerformance(historyHeader.id, wasHistorySuccess); } } 
     
     // --- 2. Process Portfolio Fetches (Sequentially) ---
     logger.log('TRACE', `[handleUpdate/${userId}] Starting ${instrumentsToProcess.length} sequential portfolio fetches.`); 
@@ -154,7 +128,7 @@ async function handleUpdate(task, taskId, { logger, headerManager, proxyManager,
         const portfolioUrl = userType === 'speculator'  ? `${config.ETORO_API_POSITIONS_URL}?cid=${userId}&InstrumentID=${instId}` : `${config.ETORO_API_PORTFOLIO_URL}?cid=${userId}`;
         const options = { headers: portfolioHeader.header };
         let response;
-        let wasPortfolioSuccess = false;
+        let wasPortfolioSuccess   = false;
         let proxyUsedForPortfolio = false;
 
         if (shouldTryProxy()) {
@@ -162,7 +136,7 @@ async function handleUpdate(task, taskId, { logger, headerManager, proxyManager,
                 logger.log('TRACE', `[handleUpdate/${userId}] Attempting fetch for ${scopeName} via AppScript proxy...`);
                 response = await proxyManager.fetch(portfolioUrl, options);
                 if (!response.ok) throw new Error(`AppScript proxy failed with status ${response.status}`); 
-                wasPortfolioSuccess = true; 
+                wasPortfolioSuccess   = true; 
                 proxyUsedForPortfolio = true;
                 recordProxyOutcome(true);
 
@@ -190,13 +164,13 @@ async function handleUpdate(task, taskId, { logger, headerManager, proxyManager,
 
             try {
                 const portfolioJson = JSON.parse(body);
-                capturedPortfolio = portfolioJson; 
+                capturedPortfolio   = portfolioJson; 
                 await batchManager.addToPortfolioBatch(userId, portfolioBlockId, today, portfolioJson, userType, instId);
                 logger.log('TRACE', `[handleUpdate/${userId}] Portfolio for ${scopeName} processed successfully.`); 
 
             } catch (parseError) { 
                 wasPortfolioSuccess = false; 
-                hasPortfolioErrors = true; 
+                hasPortfolioErrors  = true; 
                 logger.log('ERROR', `[handleUpdate/${userId}] FAILED TO PARSE JSON RESPONSE for ${scopeName}.`, { url: portfolioUrl, parseErrorMessage: parseError.message }); 
             }
         } else { 
@@ -210,8 +184,7 @@ async function handleUpdate(task, taskId, { logger, headerManager, proxyManager,
     if (userType !== 'speculator' && capturedHistory && capturedPortfolio && pubsub && config.PUBSUB_TOPIC_TASK_ENGINE) {
         try {
             const speculatorAssets = detectSpeculatorTargets(capturedHistory, capturedPortfolio);
-            if (speculatorAssets.length > 0) {
-                logger.log('INFO', `[handleUpdate/${userId}] DETECTED SPECULATOR BEHAVIOR. Queuing ${speculatorAssets.length} targeted updates.`);
+            if (speculatorAssets.length > 0) { logger.log('INFO', `[handleUpdate/${userId}] DETECTED SPECULATOR BEHAVIOR. Queuing ${speculatorAssets.length} targeted updates.`);
                 
                 const newTasks = speculatorAssets.map(assetId => ({
                     type: 'update',
@@ -223,16 +196,12 @@ async function handleUpdate(task, taskId, { logger, headerManager, proxyManager,
                 const dataBuffer = Buffer.from(JSON.stringify({ tasks: newTasks }));
                 await pubsub.topic(config.PUBSUB_TOPIC_TASK_ENGINE).publishMessage({ data: dataBuffer });
             }
-        } catch (detectionError) {
-            logger.log('ERROR', `[handleUpdate/${userId}] Error during Speculator Detection.`, { error: detectionError.message });
-        }
+        } catch (detectionError) { logger.log('ERROR', `[handleUpdate/${userId}] Error during Speculator Detection.`, { error: detectionError.message }); }
     }
 
     if (isPrivate) {
         logger.log('WARN', `[handleUpdate/${userId}] Removing private user from updates.`);
-        for (const instrumentId of instrumentsToProcess) { 
-            await batchManager.deleteFromTimestampBatch(userId, userType, instrumentId); 
-        }
+        for (const instrumentId of instrumentsToProcess) { await batchManager.deleteFromTimestampBatch(userId, userType, instrumentId); }
         const blockCountsRef = db.doc(config.FIRESTORE_DOC_SPECULATOR_BLOCK_COUNTS);
         for (const instrumentId of instrumentsToProcess) {
             const incrementField = `counts.${instrumentId}_${Math.floor(userId/1e6)*1e6}`;
@@ -241,17 +210,12 @@ async function handleUpdate(task, taskId, { logger, headerManager, proxyManager,
         return; 
     }
 
-    for (const instrumentId of instrumentsToProcess) { 
-        await batchManager.updateUserTimestamp(userId, userType, instrumentId); 
-    }
+    for (const instrumentId of instrumentsToProcess) {  await batchManager.updateUserTimestamp(userId, userType, instrumentId); }
     
     if (userType === 'speculator') { await batchManager.addSpeculatorTimestampFix(userId, String(Math.floor(userId/1e6)*1e6)); }
-    
-    if (hasPortfolioErrors) {
-        logger.log('WARN', `[handleUpdate/${userId}] Update task finished with ERRORS. See logs above.`); 
-    } else {
-        logger.log('TRACE', `[handleUpdate/${userId}] Update task finished successfully.`); 
-    }
+
+    if (hasPortfolioErrors) { logger.log('WARN', `[handleUpdate/${userId}] Update task finished with ERRORS. See logs above.`); 
+    } else                  { logger.log('TRACE', `[handleUpdate/${userId}] Update task finished successfully.`);  }
 }
 
 module.exports = { handleUpdate };

package/package.json

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