aiden-shared-calculations-unified 1.0.64 → 1.0.66

package/utils/price_data_provider.js

@@ -1,142 +1,142 @@
-const { Firestore } = require('@google-cloud/firestore');
-const firestore = new Firestore();
-
-// Config
-const PRICE_COLLECTION = 'asset_prices';
-const CACHE_DURATION_MS = 3600000; // 1 hour
-
-// Cache
-let cache = {
-  timestamp: null,
-  priceMap: null, // Will be { instrumentId: { "YYYY-MM-DD": price, ... } }
-};
-
-// In-progress fetch promise
-let fetchPromise = null;
-
-/**
- * Finds the most recent available price on or before a given date.
- * @param {object} priceHistory - The map of { "YYYY-MM-DD": price }
- * @param {string} dateStr - The target date string to start searching from.
- * @param {number} [maxLookback=5] - Max days to look back (to skip weekends/holidays).
- * @returns {number|null} The price, or null if not found.
- */
-function _findPreviousAvailablePrice(priceHistory, dateStr, maxLookback = 5) {
-    if (!priceHistory) return null;
-
-    let checkDate = new Date(dateStr + 'T00:00:00Z');
-    
-    for (let i = 0; i < maxLookback; i++) {
-        const checkDateStr = checkDate.toISOString().slice(0, 10);
-        const price = priceHistory[checkDateStr];
-        
-        if (price !== undefined && price !== null && price > 0) {
-            return price; // Found it
-        }
-        
-        // If not found, look back one more day
-        checkDate.setUTCDate(checkDate.getUTCDate() - 1);
-    }
-    
-    // console.warn(`No price found for instrument within ${maxLookback} days of ${dateStr}`);
-    return null; // No price found within lookback
-}
-
-/**
- * Loads all sharded price data from the `asset_prices` collection.
- * This is a heavy operation and should be cached.
- */
-async function loadAllPriceData() {
-  const now = Date.now();
-  if (cache.timestamp && (now - cache.timestamp < CACHE_DURATION_MS)) {
-    return cache.priceMap;
-  }
-
-  if (fetchPromise) {
-    return fetchPromise;
-  }
-
-  fetchPromise = (async () => {
-    console.log('Fetching and caching all asset price data...');
-    const masterPriceMap = {};
-    
-    try {
-      const snapshot = await firestore.collection(PRICE_COLLECTION).get();
-      
-      if (snapshot.empty) {
-        throw new Error(`Price collection '${PRICE_COLLECTION}' is empty.`);
-      }
-
-      // Loop through each shard document (e.g., "shard_0", "shard_1")
-      snapshot.forEach(doc => {
-        const shardData = doc.data();
-        
-        // Loop through each instrumentId in the shard
-        for (const instrumentId in shardData) {
-          // Check if it's a valid instrument entry
-          if (shardData[instrumentId] && shardData[instrumentId].prices) {
-            masterPriceMap[instrumentId] = shardData[instrumentId].prices;
-          }
-        }
-      });
-
-      cache = {
-        timestamp: now,
-        priceMap: masterPriceMap,
-      };
-      
-      console.log(`Successfully cached prices for ${Object.keys(masterPriceMap).length} instruments.`);
-      return masterPriceMap;
-
-    } catch (err) {
-      console.error('CRITICAL: Error loading price data:', err);
-      // On error, return an empty map but don't cache, so a future call can retry.
-      return {};
-    } finally {
-      // Clear the promise so the next call (if cache is stale) triggers a new fetch
-      fetchPromise = null;
-    }
-  })();
-
-  return fetchPromise;
-}
-
-/**
- * A helper to safely get the price change percentage between two dates.
- * --- THIS IS THE MODIFIED FUNCTION ---
- * @param {string} instrumentId - The instrument ID.
- * @param {string} yesterdayStr - YYYY-MM-DD date string for yesterday.
- * @param {string} todayStr - YYYY-MM-DD date string for today.
- * @param {object} priceMap - The master price map from loadAllPriceData().
- * @returns {number|null} The percentage change (e.g., 0.10 for +10%), or null if data is missing.
- */
-function getDailyPriceChange(instrumentId, yesterdayStr, todayStr, priceMap) {
-    if (!priceMap || !priceMap[instrumentId]) {
-        return null; // No price data for this instrument
-    }
-    
-    const instrumentPrices = priceMap[instrumentId];
-
-    // Find the most recent available price *on or before* the target dates
-    const priceDay1 = _findPreviousAvailablePrice(instrumentPrices, yesterdayStr, 5);
-    const priceDay2 = _findPreviousAvailablePrice(instrumentPrices, todayStr, 5);
-
-    if (priceDay1 && priceDay2) {
-        // We found prices, now check if they are the *same* price
-        // (e.g., if today is Sunday, priceDay2 would be Friday's price.
-        // If yesterday was Saturday, priceDay1 would *also* be Friday's price).
-        if (priceDay1 === priceDay2) {
-            return 0.0; // No change between the two most recent *available* dates
-        }
-        return (priceDay2 - priceDay1) / priceDay1;
-    }
-    
-    return null; // Missing one or both dates, even after lookback
-}
-
-
-module.exports = {
-    loadAllPriceData,
-    getDailyPriceChange
-    // Add the helper to exports if you want, but it's not required
-};
+const { Firestore } = require('@google-cloud/firestore');
+const firestore = new Firestore();
+
+// Config
+const PRICE_COLLECTION = 'asset_prices';
+const CACHE_DURATION_MS = 3600000; // 1 hour
+
+// Cache
+let cache = {
+  timestamp: null,
+  priceMap: null, // Will be { instrumentId: { "YYYY-MM-DD": price, ... } }
+};
+
+// In-progress fetch promise
+let fetchPromise = null;
+
+/**
+ * Finds the most recent available price on or before a given date.
+ * @param {object} priceHistory - The map of { "YYYY-MM-DD": price }
+ * @param {string} dateStr - The target date string to start searching from.
+ * @param {number} [maxLookback=5] - Max days to look back (to skip weekends/holidays).
+ * @returns {number|null} The price, or null if not found.
+ */
+function _findPreviousAvailablePrice(priceHistory, dateStr, maxLookback = 5) {
+    if (!priceHistory) return null;
+
+    let checkDate = new Date(dateStr + 'T00:00:00Z');
+    
+    for (let i = 0; i < maxLookback; i++) {
+        const checkDateStr = checkDate.toISOString().slice(0, 10);
+        const price = priceHistory[checkDateStr];
+        
+        if (price !== undefined && price !== null && price > 0) {
+            return price; // Found it
+        }
+        
+        // If not found, look back one more day
+        checkDate.setUTCDate(checkDate.getUTCDate() - 1);
+    }
+    
+    // console.warn(`No price found for instrument within ${maxLookback} days of ${dateStr}`);
+    return null; // No price found within lookback
+}
+
+/**
+ * Loads all sharded price data from the `asset_prices` collection.
+ * This is a heavy operation and should be cached.
+ */
+async function loadAllPriceData() {
+  const now = Date.now();
+  if (cache.timestamp && (now - cache.timestamp < CACHE_DURATION_MS)) {
+    return cache.priceMap;
+  }
+
+  if (fetchPromise) {
+    return fetchPromise;
+  }
+
+  fetchPromise = (async () => {
+    console.log('Fetching and caching all asset price data...');
+    const masterPriceMap = {};
+    
+    try {
+      const snapshot = await firestore.collection(PRICE_COLLECTION).get();
+      
+      if (snapshot.empty) {
+        throw new Error(`Price collection '${PRICE_COLLECTION}' is empty.`);
+      }
+
+      // Loop through each shard document (e.g., "shard_0", "shard_1")
+      snapshot.forEach(doc => {
+        const shardData = doc.data();
+        
+        // Loop through each instrumentId in the shard
+        for (const instrumentId in shardData) {
+          // Check if it's a valid instrument entry
+          if (shardData[instrumentId] && shardData[instrumentId].prices) {
+            masterPriceMap[instrumentId] = shardData[instrumentId].prices;
+          }
+        }
+      });
+
+      cache = {
+        timestamp: now,
+        priceMap: masterPriceMap,
+      };
+      
+      console.log(`Successfully cached prices for ${Object.keys(masterPriceMap).length} instruments.`);
+      return masterPriceMap;
+
+    } catch (err) {
+      console.error('CRITICAL: Error loading price data:', err);
+      // On error, return an empty map but don't cache, so a future call can retry.
+      return {};
+    } finally {
+      // Clear the promise so the next call (if cache is stale) triggers a new fetch
+      fetchPromise = null;
+    }
+  })();
+
+  return fetchPromise;
+}
+
+/**
+ * A helper to safely get the price change percentage between two dates.
+ * --- THIS IS THE MODIFIED FUNCTION ---
+ * @param {string} instrumentId - The instrument ID.
+ * @param {string} yesterdayStr - YYYY-MM-DD date string for yesterday.
+ * @param {string} todayStr - YYYY-MM-DD date string for today.
+ * @param {object} priceMap - The master price map from loadAllPriceData().
+ * @returns {number|null} The percentage change (e.g., 0.10 for +10%), or null if data is missing.
+ */
+function getDailyPriceChange(instrumentId, yesterdayStr, todayStr, priceMap) {
+    if (!priceMap || !priceMap[instrumentId]) {
+        return null; // No price data for this instrument
+    }
+    
+    const instrumentPrices = priceMap[instrumentId];
+
+    // Find the most recent available price *on or before* the target dates
+    const priceDay1 = _findPreviousAvailablePrice(instrumentPrices, yesterdayStr, 5);
+    const priceDay2 = _findPreviousAvailablePrice(instrumentPrices, todayStr, 5);
+
+    if (priceDay1 && priceDay2) {
+        // We found prices, now check if they are the *same* price
+        // (e.g., if today is Sunday, priceDay2 would be Friday's price.
+        // If yesterday was Saturday, priceDay1 would *also* be Friday's price).
+        if (priceDay1 === priceDay2) {
+            return 0.0; // No change between the two most recent *available* dates
+        }
+        return (priceDay2 - priceDay1) / priceDay1;
+    }
+    
+    return null; // Missing one or both dates, even after lookback
+}
+
+
+module.exports = {
+    loadAllPriceData,
+    getDailyPriceChange
+    // Add the helper to exports if you want, but it's not required
+};

package/utils/sector_mapping_provider.js

@@ -1,75 +1,75 @@
-const { Firestore } = require('@google-cloud/firestore');
-const firestore = new Firestore();
-
-let cache = {
-  timestamp: null,
-  instrumentToSector: null,
-  instrumentToTicker: null,
-};
-
-// This variable will hold the promise for the in-progress fetch operation.
-let fetchPromise = null;
-
-async function loadInstrumentMappings() {
-  const now = Date.now();
-  // If the cache is recent, return it immediately.
-  if (cache.timestamp && (now - cache.timestamp < 3600000)) {
-    return cache;
-  }
-
-  // If a fetch is not already in progress, start one.
-  if (!fetchPromise) {
-    fetchPromise = (async () => {
-      try {
-        console.log('Fetching instrument mappings...');
-        const [tickerToIdDoc, tickerToSectorDoc] = await Promise.all([
-          firestore.collection('instrument_mappings').doc('etoro_to_ticker').get(),
-          firestore.collection('instrument_sector_mappings').doc('sector_mappings').get()
-        ]);
-
-        if (!tickerToIdDoc.exists || !tickerToSectorDoc.exists) {
-          throw new Error('Instrument mapping documents missing.');
-        }
-
-        const tickerToId = tickerToIdDoc.data();
-        const tickerToSector = tickerToSectorDoc.data();
-
-        const idToTicker = Object.fromEntries(Object.entries(tickerToId).map(([id, ticker]) => [id, ticker]));
-
-        const idToSector = Object.fromEntries(
-          Object.entries(idToTicker).map(([id, ticker]) => [id, tickerToSector[ticker] || 'N/A'])
-        );
-
-        // Update the cache with the new data.
-        cache = {
-          timestamp: now,
-          instrumentToTicker: idToTicker,
-          instrumentToSector: idToSector,
-        };
-
-        console.log('Mappings cached successfully.');
-        return cache;
-
-      } catch (err) {
-        console.error('Error loading instrument mappings:', err);
-        // On error, don't cache, so a future call can retry.
-        return { instrumentToTicker: {}, instrumentToSector: {} };
-      } finally {
-        // IMPORTANT: Reset the promise so that if the cache expires,
-        // a new fetch can be initiated later.
-        fetchPromise = null;
-      }
-    })();
-  }
-
-  // Return the promise for the in-progress fetch.
-  // Subsequent calls will wait for this single promise to resolve.
-  return fetchPromise;
-}
-
-async function getInstrumentSectorMap() {
-  const mappings = await loadInstrumentMappings();
-  return mappings.instrumentToSector;
-}
-
+const { Firestore } = require('@google-cloud/firestore');
+const firestore = new Firestore();
+
+let cache = {
+  timestamp: null,
+  instrumentToSector: null,
+  instrumentToTicker: null,
+};
+
+// This variable will hold the promise for the in-progress fetch operation.
+let fetchPromise = null;
+
+async function loadInstrumentMappings() {
+  const now = Date.now();
+  // If the cache is recent, return it immediately.
+  if (cache.timestamp && (now - cache.timestamp < 3600000)) {
+    return cache;
+  }
+
+  // If a fetch is not already in progress, start one.
+  if (!fetchPromise) {
+    fetchPromise = (async () => {
+      try {
+        console.log('Fetching instrument mappings...');
+        const [tickerToIdDoc, tickerToSectorDoc] = await Promise.all([
+          firestore.collection('instrument_mappings').doc('etoro_to_ticker').get(),
+          firestore.collection('instrument_sector_mappings').doc('sector_mappings').get()
+        ]);
+
+        if (!tickerToIdDoc.exists || !tickerToSectorDoc.exists) {
+          throw new Error('Instrument mapping documents missing.');
+        }
+
+        const tickerToId = tickerToIdDoc.data();
+        const tickerToSector = tickerToSectorDoc.data();
+
+        const idToTicker = Object.fromEntries(Object.entries(tickerToId).map(([id, ticker]) => [id, ticker]));
+
+        const idToSector = Object.fromEntries(
+          Object.entries(idToTicker).map(([id, ticker]) => [id, tickerToSector[ticker] || 'N/A'])
+        );
+
+        // Update the cache with the new data.
+        cache = {
+          timestamp: now,
+          instrumentToTicker: idToTicker,
+          instrumentToSector: idToSector,
+        };
+
+        console.log('Mappings cached successfully.');
+        return cache;
+
+      } catch (err) {
+        console.error('Error loading instrument mappings:', err);
+        // On error, don't cache, so a future call can retry.
+        return { instrumentToTicker: {}, instrumentToSector: {} };
+      } finally {
+        // IMPORTANT: Reset the promise so that if the cache expires,
+        // a new fetch can be initiated later.
+        fetchPromise = null;
+      }
+    })();
+  }
+
+  // Return the promise for the in-progress fetch.
+  // Subsequent calls will wait for this single promise to resolve.
+  return fetchPromise;
+}
+
+async function getInstrumentSectorMap() {
+  const mappings = await loadInstrumentMappings();
+  return mappings.instrumentToSector;
+}
+
 module.exports = { loadInstrumentMappings, getInstrumentSectorMap };