bulltrackers-module 1.0.176 → 1.0.177

package/functions/computation-system/controllers/computation_controller.js

@@ -147,28 +147,17 @@ class ComputationExecutor {
      */
     async executePerUser(calcInstance, metadata, dateStr, portfolioData, yesterdayPortfolioData, historyData, computedDeps, prevDeps) {
         const { logger } = this.deps;
-        
-        // Fix for the 'all' userType discrepancy:
-        const targetUserType = metadata.userType; // 'all', 'normal', or 'speculator'
-
+        const targetUserType = metadata.userType; 
         const mappings = await this.loader.loadMappings();
         const insights = metadata.rootDataDependencies?.includes('insights') ? { today: await this.loader.loadInsights(dateStr) } : null;
-
         for (const [userId, todayPortfolio] of Object.entries(portfolioData)) {
-            // 1. Get Yesterday's Portfolio (if available)
             const yesterdayPortfolio = yesterdayPortfolioData ? yesterdayPortfolioData[userId] : null;
-            
-            // 2. Get Today's Trading History (if available)
             const todayHistory = historyData ? historyData[userId] : null;
-
             const actualUserType = todayPortfolio.PublicPositions ? SCHEMAS.USER_TYPES.SPECULATOR : SCHEMAS.USER_TYPES.NORMAL;
-            
-            // Filtering Logic
             if (targetUserType !== 'all') {
                  const mappedTarget = (targetUserType === 'speculator') ? SCHEMAS.USER_TYPES.SPECULATOR : SCHEMAS.USER_TYPES.NORMAL;
                  if (mappedTarget !== actualUserType) continue;
             }
-
             const context = ContextBuilder.buildPerUserContext({
                 todayPortfolio, yesterdayPortfolio,
                 todayHistory, 
@@ -177,7 +166,6 @@ class ComputationExecutor {
                 previousComputedDependencies: prevDeps,
                 config: this.config, deps: this.deps
             });
-
             try { await calcInstance.process(context); } 
             catch (e) { logger.log('WARN', `Calc ${metadata.name} failed for user ${userId}: ${e.message}`); }
         }
@@ -187,14 +175,12 @@ class ComputationExecutor {
         const mappings = await this.loader.loadMappings();
         const insights = metadata.rootDataDependencies?.includes('insights') ? { today: await this.loader.loadInsights(dateStr) } : null;
         const social = metadata.rootDataDependencies?.includes('social') ? { today: await this.loader.loadSocial(dateStr) } : null;
-
         const context = ContextBuilder.buildMetaContext({
             dateStr, metadata, mappings, insights, socialData: social,
             computedDependencies: computedDeps,
             previousComputedDependencies: prevDeps,
             config: this.config, deps: this.deps
         });
-
         return await calcInstance.process(context);
     }
 }

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

@@ -11,15 +11,6 @@
  * It has removed all logic for deprecated folder structures (e.g., /historical/).
  */
 
-const fs                 = require('fs');
-//Hacky solution to force tmp writes TODO : This Tmp write is really dodgy, not ideal but works, consider less hacky solutions to writing to filesystem
-process.env.TMPDIR = '/tmp';
-process.env.TMP    = '/tmp';
-process.env.TEMP   = '/tmp';
-const os           = require('os');
-
- const path = require('path');
-
 /* --------------------------------------------------
  * Pretty Console Helpers
  * -------------------------------------------------- */
@@ -54,7 +45,7 @@ function suggestClosest(name, candidates, n = 3) {
         return dp[m][n];
     };
     const scores = candidates.map(c => [c, levenshtein(name, c)]);
-    scores.sort((a, b) => a[1] - b[1]);
+    scores.sort((a, b)              => a[1] - b[1]);
     return scores.slice(0, n).map(s => s[0]);
 }
 
@@ -206,17 +197,20 @@ function buildManifest(productLinesToRun = [], calculations) {
     const sortedManifest = [];
     const queue          = [];
     let maxPass          = 0;
+
     for (const [name, degree] of filteredInDegree) { if (degree === 0) { queue.push(name); filteredManifestMap.get(name).pass = 1; maxPass = 1; } }
     queue.sort();
     while (queue.length) {
         const currentName = queue.shift();
         const currentEntry = filteredManifestMap.get(currentName);
         sortedManifest.push(currentEntry);
+        
         for (const neighborName of (filteredReverseAdjacency.get(currentName) || [])) { const newDegree = filteredInDegree.get(neighborName) - 1; filteredInDegree.set(neighborName, newDegree);
             const neighborEntry = filteredManifestMap.get(neighborName);
             if (neighborEntry.pass <= currentEntry.pass) { neighborEntry.pass = currentEntry.pass + 1; if (neighborEntry.pass > maxPass) maxPass = neighborEntry.pass; }
             if (newDegree === 0) { queue.push(neighborName); } }
         queue.sort(); }
+
     if (sortedManifest.length !== filteredManifestMap.size) {
         log.divider('Circular Dependency Detected');
         const cycles = findCycles(filteredManifestMap, adjacency);

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

@@ -62,8 +62,6 @@ async function runComputationPass(config, dependencies, computationManifest) {
     // Process a single date and RETURN updates (do not write)
     const processDate = async (dateStr) => {
         const dateToProcess = new Date(dateStr + 'T00:00:00Z');
-
-        // Filter using in-memory status
         const standardToRun = standardCalcs.filter(c => shouldRun(c, dateStr));
         const metaToRun     = metaCalcs.filter(c => shouldRun(c, dateStr));
         
@@ -84,21 +82,17 @@ async function runComputationPass(config, dependencies, computationManifest) {
         try {
             const calcsRunning = [...finalStandardToRun, ...finalMetaToRun];
             const existingResults = await fetchExistingResults(dateStr, calcsRunning, computationManifest, config, dependencies, false);
-            
-            const prevDate = new Date(dateToProcess); prevDate.setUTCDate(prevDate.getUTCDate() - 1);
-            const prevDateStr = prevDate.toISOString().slice(0, 10);
+            const prevDate        = new Date(dateToProcess); prevDate.setUTCDate(prevDate.getUTCDate() - 1);
+            const prevDateStr     = prevDate.toISOString().slice(0, 10);
             const previousResults = await fetchExistingResults(prevDateStr, calcsRunning, computationManifest, config, dependencies, true);
-
             if (finalStandardToRun.length) {
                 const updates = await runStandardComputationPass(dateToProcess, finalStandardToRun, `Pass ${passToRun} (Std)`, config, dependencies, rootData, existingResults, previousResults, true); // skipStatusWrite=true
                 Object.assign(dateUpdates, updates);
             }
-            
             if (finalMetaToRun.length) {
                 const updates = await runMetaComputationPass(dateToProcess, finalMetaToRun, `Pass ${passToRun} (Meta)`, config, dependencies, existingResults, previousResults, rootData, true); // skipStatusWrite=true
                 Object.assign(dateUpdates, updates);
             }
-            
         } catch (err) { 
             logger.log('ERROR', `[PassRunner] FAILED Pass ${passToRun} for ${dateStr}`, { errorMessage: err.message });
             // Mark failures

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

@@ -3,6 +3,7 @@
  * (REFACTORED: Removed all concurrency from `handleUpdate` and `lookupUsernames`)
  * (REFACTORED: Added node-fetch fallback for all API calls)
  * (REFACTORED: Added verbose, user-centric logging for all operations)
+ * (FIXED: Corrected variable name 'instId' to 'instrumentId' in final timestamp loops)
  */
 
 const { FieldValue } = require('@google-cloud/firestore');
@@ -174,9 +175,12 @@ async function handleUpdate(task, taskId, { logger, headerManager, proxyManager,
     } 
 
     // --- 5. Handle Private Users & Timestamps ---
+    // FIXED: Corrected variable naming here from 'instId' to 'instrumentId'
     if (isPrivate) {
         logger.log('WARN', `[handleUpdate/${userId}] Removing private user from updates.`);
-        for (const instrumentId of instrumentsToProcess) { await batchManager.deleteFromTimestampBatch(userId, userType, instId); }
+        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}`;
@@ -186,7 +190,11 @@ async function handleUpdate(task, taskId, { logger, headerManager, proxyManager,
     }
 
     // If not private, update all timestamps
-    for (const instrumentId of instrumentsToProcess) { await batchManager.updateUserTimestamp(userId, userType, instId); }
+    // FIXED: Corrected variable naming here from 'instId' to '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)); }
     
     logger.log('INFO', `[handleUpdate/${userId}] Update task finished successfully.`);

package/package.json

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