bulltrackers-module 1.0.163 → 1.0.164

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

@@ -11,11 +11,9 @@
  * It has removed all logic for deprecated folder structures (e.g., /historical/).
  */
 
-const { calculations }   = require('aiden-shared-calculations-unified');
 const fs                 = require('fs');
 const path               = require('path');
-const Viz                = require('viz.js');
-const { Module, render } = require('viz.js/full.render.js');
+const Viz = require('../node-graphviz'); // Uses your local module
 
 /* --------------------------------------------------
  * Pretty Console Helpers
@@ -88,9 +86,10 @@ function getDependencySet(endpoints, adjacencyList) {
 /**
  * Builds the full computation manifest.
  * @param {string[]} productLinesToRun - Array of product line categories (folder names) to build for.
+ * @param {object} calculations - The injected calculations object from the main application.
  * @returns {object[]} The final sorted manifest array.
  */
-function buildManifest(productLinesToRun = []) {
+function buildManifest(productLinesToRun = [], calculations) {
     log.divider('Building Dynamic Manifest');
     log.info(`Target Product Lines: [${productLinesToRun.join(', ')}]`);
     const manifestMap      = new Map();
@@ -134,6 +133,14 @@ function buildManifest(productLinesToRun = []) {
         adjacency.set(normalizedName, dependencies);
         inDegree.set(normalizedName, dependencies.length);
         dependencies.forEach(dep => { if (!reverseAdjacency.has(dep)) reverseAdjacency.set(dep, []); reverseAdjacency.get(dep).push(normalizedName); }); }
+    
+    // --- UPDATED ---
+    // This 'calculations' object is now the one passed in as an argument.
+    if (!calculations || typeof calculations !== 'object') {
+        log.fatal('Calculations object was not provided or is invalid.');
+        throw new Error('Manifest build failed: Invalid calculations object.');
+    }
+
     for (const category in calculations) {
         if (category === 'legacy') { log.info('Skipping "legacy" calculations package.'); continue; }
         const group = calculations[category];
@@ -219,7 +226,7 @@ function buildManifest(productLinesToRun = []) {
  */
 async function generateSvgGraph(manifest, filename = 'dependency-tree.svg') {
     log.divider(`Generating SVG Graph: ${filename}`);
-    const viz = new Viz({ Module, render });
+    const viz = new Viz({ worker: false });
     const categories = [...new Set(manifest.map(e => e.category))];
     const colors = ['#e6194b', '#3cb44b', '#ffe119', '#4363d8', '#f58231', '#911eb4', '#46f0f0', '#f032e6', '#bcf60c', '#fabebe', '#008080', '#e6beff', '#9a6324', '#fffac8', '#800000', '#aaffc3', '#808000', '#ffd8b1', '#000075', '#808080'];
     const colorMap = new Map(categories.map((cat, i) => [cat, colors[i % colors.length]]));
@@ -251,12 +258,13 @@ async function generateSvgGraph(manifest, filename = 'dependency-tree.svg') {
 /**
  * Main entry point for building and exporting the manifest.
  * @param {string[]} productLinesToRun - Array of product line categories (folder names) to build for.
+ * @param {object} calculations - The injected calculations object.
  */
-function build(productLinesToRun) {
+function build(productLinesToRun, calculations) {
     try {
         // This function MUST NOT fail or generate SVGs.
         // It has one job: build and return the manifest array.
-        const manifest = buildManifest(productLinesToRun);
+        const manifest = buildManifest(productLinesToRun, calculations);
         return manifest; // Returns the array
     } catch (error) { 
         log.error(error.message); 
@@ -266,29 +274,9 @@ function build(productLinesToRun) {
     }
 }
 
-module.exports = { build };
+// --- REMOVED ---
+// The entire 'if (require.main === module)' block has been removed
+// to prevent any local 'require' conflicts. This file is now a pure
+// module and must be called by another script.
 
-// --- MODIFIED ---
-// This block is ONLY executed when you run `node computation_manifest_builder.js`
-// This is now the ONLY place SVG generation happens.
-if (require.main === module) { 
-    (async () => { // This part remains async for the SVG generation
-        log.info('Running manifest builder in local debug mode...');
-        const allProductLines = Object.keys(calculations).filter(c => c !== 'legacy');
-        
-        try {
-            // 1. Build the full manifest
-            const fullManifest = buildManifest(allProductLines); // Sync call
-            
-            if (fullManifest) {
-                // 2. Generate the full SVG graph
-                await generateSvgGraph(fullManifest, 'dependency-tree-full.svg');
-                log.info('Local debug build and graph generation complete.');
-            } else {
-                log.fatal('Local debug build FAILED.');
-            }
-        } catch (error) {
-            log.error(error.message);
-        }
-    })(); 
-}
+module.exports = { build, generateSvgGraph }; // <-- Also exporting generateSvgGraph

package/functions/fetch-insights/helpers/handler_helpers.js

@@ -20,11 +20,25 @@ exports.fetchAndStoreInsights = async (config, dependencies) => {
         if (!selectedHeader || !selectedHeader.header) { throw new Error("Could not select a valid header for the request."); }
         logger.log('INFO', `[FetchInsightsHelpers] Using header ID: ${selectedHeader.id}`, { userAgent: selectedHeader.header['User-Agent'] });
         const fetchOptions = { headers: selectedHeader.header, timeout: 30000 };
-        const response = await proxyManager.fetch(config.etoroInsightsUrl, fetchOptions);
+        let response;
+
+        try {
+            logger.log('INFO', '[FetchInsightsHelpers] Attempting fetch via proxy manager...');
+            response = await proxyManager.fetch(config.etoroInsightsUrl, fetchOptions);
+        } catch (proxyError) {
+            logger.log('WARNING', `[FetchInsightsHelpers] Proxy manager fetch failed. Attempting fallback with node-fetch. Error: ${proxyError.message}`);
+            try {
+                response = await fetch(config.etoroInsightsUrl, fetchOptions);
+            } catch (nodeFetchError) {
+                logger.log('ERROR', `[FetchInsightsHelpers] Fallback node-fetch also failed. Error: ${nodeFetchError.message}`);
+                throw nodeFetchError; // Throw the error from the last attempt
+            }
+        }
+
         if (!response || typeof response.text !== 'function') { const responseString = JSON.stringify(response, null, 2); 
-        logger.log('ERROR', `[FetchInsightsHelpers] Invalid or incomplete response received. Response object: ${responseString}`); throw new Error(`Invalid response structure received from proxy.`); }
+        logger.log('ERROR', `[FetchInsightsHelpers] Invalid or incomplete response received. Response object: ${responseString}`); throw new Error(`Invalid response structure received.`); }
         if (!response.ok) { const errorText = await response.text(); 
-        throw new Error(`API request failed via proxy with status ${response.status}: ${errorText}`); }
+        throw new Error(`API request failed with status ${response.status}: ${errorText}`); }
         wasSuccessful = true;
         const insightsData = await response.json();
         if (!Array.isArray(insightsData) || insightsData.length === 0) { throw new Error('API returned empty or invalid data.'); }

package/functions/social-task-handler/helpers/handler_helpers.js

@@ -71,19 +71,20 @@ exports.handleSocialTask = async (message, context, config, dependencies) => {
                 if (!response.ok) throw new Error(`API error ${response.status}`);
                 wasSuccess = true;
             } catch (proxyError) {
-                logger.log('WARN', `[SocialTask/${taskId}] Proxy fetch failed for offset ${offset}: ${proxyError.message}`, { err: proxyError.message });
-                logger.log('INFO', `[SocialTask/${taskId}] Retrying fetch without proxy.`);
+                logger.log('WARN', `[SocialTask/${taskId}] Proxy fetch failed for offset ${offset}: ${proxyError.message}`, { err: proxyError.message, url } );
+                logger.log('INFO', `[SocialTask/${taskId}] Retrying fetch without proxy for.`, url);
                 try {
                     response = await fetch(url, { headers: selectedHeader.header });
-                    if (!response.ok) throw new Error(`Direct fetch API error ${response.status}`);
+                    if (!response.ok) throw new Error(`Direct fetch API error ${response.status} for ${url}`);
                 } catch (directError) {
-                    logger.log('ERROR', `[SocialTask/${taskId}] Direct fetch retry failed: ${directError.message}`, { err: directError.message });
+                    logger.log('ERROR', `[SocialTask/${taskId}] Direct fetch retry failed: ${directError.message}`, { err: directError.message , url});
                     if (selectedHeader) headerManager.updatePerformance(selectedHeader.id, false);
                     keepFetching = false;
                     continue;
                 }
             } finally {
                 if (selectedHeader) headerManager.updatePerformance(selectedHeader.id, wasSuccess);
+                    logger.log('DEBUG', 'Response succeeded for', url)
             }
             const page = await response.json();
             const discussions = page?.discussions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bulltrackers-module",
-  "version": "1.0.163",
+  "version": "1.0.164",
   "description": "Helper Functions for Bulltrackers.",
   "main": "index.js",
   "files": [
@@ -33,13 +33,15 @@
   },
   "dependencies": {
     "@google-cloud/firestore": "^7.11.3",
-    "sharedsetup": "latest",
-    "require-all": "^3.0.0",
     "@google-cloud/pubsub": "latest",
-    "express": "^4.19.2",
+    "aiden-shared-calculations-unified": "^1.0.81",
     "cors": "^2.8.5",
+    "dotenv": "latest",
+    "express": "^4.19.2",
+    "node-graphviz": "^0.1.1",
     "p-limit": "^3.1.0",
-    "dotenv": "latest"
+    "require-all": "^3.0.0",
+    "sharedsetup": "latest"
   },
   "devDependencies": {
     "bulltracker-deployer": "file:../bulltracker-deployer"