bulltrackers-module 1.0.42 → 1.0.44

package/functions/core/utils/firestore_utils.js

@@ -44,34 +44,39 @@ async function getLatestNormalUserPortfolios(normalUserCollectionName, snapshots
     return allPortfolios;
 }
 
+const { FieldValue } = require('@google-cloud/firestore'); // Ensure FieldValue is imported
 
 /**
- * Resets the isLocked status for all proxies.
+ * Resets the proxy locks map in the performance document.
  * @async
- * @param {string} proxiesCollectionName - e.g., 'Proxies'.
+ * @param {string} proxyPerformanceDocPath - e.g., 'system_state/proxy_performance'.
  * @returns {Promise<void>}
  */
-async function resetProxyLocks(proxiesCollectionName) {
+async function resetProxyLocks(proxyPerformanceDocPath) {
     logger.log('INFO','[Core Utils] Resetting proxy locks...');
     try {
-        const proxiesRef = db.collection(proxiesCollectionName);
-        const snapshot = await proxiesRef.where('status', '==', 1).get(); // Only fetch locked ones
-
-        if (snapshot.empty) {
-            logger.log('INFO','[Core Utils] No proxies found in a locked state.');
+        if (!proxyPerformanceDocPath) {
+            logger.log('ERROR', '[Core Utils] Missing proxyPerformanceDocPath. Cannot reset locks.');
             return;
         }
+        
+        const perfDocRef = db.doc(proxyPerformanceDocPath);
 
-        const batch = db.batch();
-        snapshot.docs.forEach(doc => {
-            batch.update(doc.ref, { status: 0 }); // Use 0 for unlocked
+        // Atomically delete the 'locks' map.
+        // This instantly unlocks all proxies for the IntelligentProxyManager.
+        await perfDocRef.update({
+            locks: FieldValue.delete() 
         });
 
-        await batch.commit();
-        logger.log('INFO',`[Core Utils] Proxy locks reset for ${snapshot.size} proxies.`);
+        logger.log('INFO',`[Core Utils] Proxy locks map reset in ${proxyPerformanceDocPath}.`);
     } catch (error) {
-        logger.log('ERROR','[Core Utils] Error resetting proxy locks', { errorMessage: error.message });
-        throw error;
+        // Log an error if the document or field doesn't exist, but don't fail the orchestrator
+        if (error.code === 5) { // 5 = NOT_FOUND
+             logger.log('WARN',`[Core Utils] Proxy performance doc or 'locks' field not found at ${proxyPerformanceDocPath}. No locks to reset.`);
+        } else {
+            logger.log('ERROR','[Core Utils] Error resetting proxy locks', { errorMessage: error.message, path: proxyPerformanceDocPath });
+            // Do not re-throw, allow orchestration to continue
+        }
     }
 }
 

package/functions/etoro-price-fetcher/helpers/handler_helpers.js

@@ -63,10 +63,15 @@ exports.fetchAndStorePrices = async (firestore, logger, headerManager, proxyMana
         const  response  = await proxyManager.fetch(config.etoroApiUrl, fetchOptions);
 
         if (!response || typeof response.text !== 'function') {
-             logger.log('ERROR', `[PriceFetcherHelpers] Invalid or incomplete response received`, { response });
-             throw new Error(`Invalid response structure received from proxy.`);
+            // Force the response object into the string using JSON.stringify
+            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.`);
         }
 
+        
+
         if (!response.ok) {
             const errorBody = await response.text();
             throw new Error(`API returned status ${response.status}: ${errorBody}`);

package/functions/orchestrator/index.js

@@ -97,7 +97,7 @@ function createDiscoveryOrchestrator(config) {
   return async (req, res) => {
     logger.log('INFO', '🚀 Discovery Orchestrator triggered via module...');
     try {
-      await firestoreUtils.resetProxyLocks(config.proxiesCollectionName);
+      await firestoreUtils.resetProxyLocks(config.proxyPerformanceDocPath);
       await runDiscovery('normal', config.discoveryConfig.normal, config);
       await runDiscovery('speculator', config.discoveryConfig.speculator, config);
       res.status(200).send('Discovery orchestration complete.');
@@ -118,7 +118,7 @@ function createUpdateOrchestrator(config) {
   return async (req, res) => {
     logger.log('INFO', '🚀 Update Orchestrator triggered via module...');
     try {
-      await firestoreUtils.resetProxyLocks(config.proxiesCollectionName);
+      await firestoreUtils.resetProxyLocks(config.proxyPerformanceDocPath);
       await runUpdates('normal', config.updateConfig, config);
       await runUpdates('speculator', config.updateConfig, config);
       res.status(200).send('Update orchestration complete.');

package/package.json

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