fixup! Update coinrank error handling & fallback

Author: Jon-edge

src/exchangeRateRouter.ts

@@ -338,7 +338,7 @@ const getRedisMarkets = async (
 
     // Only parse if jsonString is not null/undefined
     let redisResult: CoinrankRedis | undefined
-    if (jsonString !== null && jsonString !== undefined) {
+    if (jsonString != null) {
       try {
         redisResult = JSON.parse(jsonString)
 
@@ -357,78 +357,78 @@ const getRedisMarkets = async (
       }
     }
 
+    // For USD requests, return the result immediately (could be undefined if not found)
+    if (fiatCode === defaultFiatCode) {
+      return redisResult
+    }
+
     // If we need to convert from USD (either no data or expired data)
-    if (fiatCode !== defaultFiatCode) {
-      try {
-        // Get exchange rate
-        const result = await fetch(
-          `${ratesServerAddress}/v2/exchangeRate?currency_pair=${defaultFiatCode}_${fiatCode}`
-        )
-        if (!result.ok) {
-          throw new Error(`Exchange rate API returned status ${result.status}`)
-        }
+    try {
+      // Get exchange rate
+      const result = await fetch(
+        `${ratesServerAddress}/v2/exchangeRate?currency_pair=${defaultFiatCode}_${fiatCode}`
+      )
+      if (!result.ok) {
+        throw new Error(`Exchange rate API returned status ${result.status}`)
+      }
 
-        const resultJson = await result.json()
-        const { exchangeRate } = asExchangeRateResponse(resultJson)
-        const rate = Number(exchangeRate)
+      const resultJson = await result.json()
+      const { exchangeRate } = asExchangeRateResponse(resultJson)
+      const rate = Number(exchangeRate)
 
-        // Validate the rate
-        if (rate == null || isNaN(rate) || rate <= 0) {
-          throw new Error(`Invalid exchange rate: ${exchangeRate}`)
-        }
+      // Validate the rate
+      if (rate == null || isNaN(rate) || rate <= 0) {
+        throw new Error(`Invalid exchange rate: ${exchangeRate}`)
+      }
 
-        // Get USD rankings
-        const usdJsonString = await getAsync(
-          `${REDIS_COINRANK_KEY_PREFIX}_${defaultFiatCode}`
-        )
-        if (usdJsonString == null) {
-          throw new Error(`No USD data available in Redis`)
-        }
+      // Get USD rankings
+      const usdJsonString = await getAsync(
+        `${REDIS_COINRANK_KEY_PREFIX}_${defaultFiatCode}`
+      )
+      if (usdJsonString == null) {
+        throw new Error(`No USD data available in Redis`)
+      }
 
-        const usdRedisResult = JSON.parse(usdJsonString)
-        let { markets } = usdRedisResult
-
-        // Modify fiat-related fields with the forex rate
-        markets = markets.map(m => ({
-          ...m,
-          marketCap: m.marketCap * rate,
-          price: m.price * rate,
-          volume24h: m.volume24h * rate,
-          high24h: m.high24h * rate,
-          low24h: m.low24h * rate,
-          priceChange24h: m.priceChange24h * rate,
-          marketCapChange24h: m.marketCapChange24h * rate,
-          circulatingSupply: m.circulatingSupply * rate,
-          totalSupply: m.totalSupply * rate,
-          maxSupply: m.maxSupply * rate,
-          allTimeHigh: m.allTimeHigh * rate,
-          allTimeLow: m.allTimeLow * rate
-        }))
-
-        // Update redis cache
-        const redisData: CoinrankRedis = {
-          markets,
-          lastUpdate: now.toISOString()
-        }
-        await setAsync(
-          `${REDIS_COINRANK_KEY_PREFIX}_${fiatCode}`,
-          JSON.stringify(redisData)
-        )
+      const usdRedisResult = JSON.parse(usdJsonString)
+      const { markets } = usdRedisResult
+
+      // Modify fiat-related fields with the forex rate
+      const convertedMarkets = markets.map(m => ({
+        ...m,
+        marketCap: m.marketCap * rate,
+        price: m.price * rate,
+        volume24h: m.volume24h * rate,
+        high24h: m.high24h * rate,
+        low24h: m.low24h * rate,
+        priceChange24h: m.priceChange24h * rate,
+        marketCapChange24h: m.marketCapChange24h * rate,
+        circulatingSupply: m.circulatingSupply * rate,
+        totalSupply: m.totalSupply * rate,
+        maxSupply: m.maxSupply * rate,
+        allTimeHigh: m.allTimeHigh * rate,
+        allTimeLow: m.allTimeLow * rate
+      }))
+
+      // Update redis cache
+      const redisData: CoinrankRedis = {
+        markets: convertedMarkets,
+        lastUpdate: redisResult?.lastUpdate ?? now.toISOString()
+      }
+      await setAsync(
+        `${REDIS_COINRANK_KEY_PREFIX}_${fiatCode}`,
+        JSON.stringify(redisData)
+      )
 
-        return redisData
-      } catch (e) {
-        logger(`Error converting USD data to ${fiatCode}: ${e}`)
-        // If conversion fails but we have cached data (even if expired), return that
-        if (redisResult != null) {
-          logger(`Falling back to cached data for ${fiatCode}`)
-          return redisResult
-        }
-        // Only return undefined if we have no cached data at all
-        return undefined
+      return redisData
+    } catch (e) {
+      logger(`Error converting USD data to ${fiatCode}: ${e}`)
+      // If conversion fails but we have cached data (even if expired), return that
+      if (redisResult != null) {
+        logger(`Falling back to cached data for ${fiatCode}`)
+        return redisResult
       }
-    } else {
-      // For USD requests when data is missing or expired
-      return redisResult
+      // Only return undefined if we have no cached data at all
+      return undefined
     }
   } catch (e) {
     logger(`Error in getRedisMarkets for ${fiatCode}: ${e}`)