Fix engines to properly loop w/o recursion

Author: paullinator

src/coinrankEngine.ts

@@ -64,7 +64,7 @@ export const coinrankEngine = async (): Promise<void> => {
         JSON.stringify(data)
       )
     } catch (e) {
-    const err: any = e // Weird TS issue causing :any to get removed from above line
+      const err: any = e // Weird TS issue causing :any to get removed from above line
       const message = `coinrankEngine failure: ${err.message}`
       slackMessage(message).catch(e => logger(e))
       logger(message)

src/ratesEngine.ts

@@ -56,48 +56,50 @@ const getCurrencyCodeList = async (): Promise<string[]> => {
 
 export const ratesEngine = async (): Promise<void> => {
   const { ratesOffsetSeconds, ratesIntervalSeconds } = config
-  const delay = getDelay({
-    now: new Date(),
-    offsetSeconds: ratesOffsetSeconds,
-    intervalSeconds: ratesIntervalSeconds
-  })
-  logger(`**** RATES ENGINE SNOOZING ${delay / 1000}s`)
-  await snooze(delay)
+  while (true) {
+    const delay = getDelay({
+      now: new Date(),
+      offsetSeconds: ratesOffsetSeconds,
+      intervalSeconds: ratesIntervalSeconds
+    })
+    logger(`**** RATES ENGINE SNOOZING ${delay / 1000}s`)
+    await snooze(delay)
 
-  try {
-    const currentDate = normalizeDate(new Date().toISOString())
-    const allCurrencies = await getCurrencyCodeList()
+    try {
+      const currentDate = normalizeDate(new Date().toISOString())
+      const allCurrencies = await getCurrencyCodeList()
 
-    const data: ExchangeRateReq[] = [
-      ...preferredCryptoFiatPairs.map(currency_pair => ({
-        currency_pair,
-        date: currentDate
-      }))
-    ]
-    for (const currencyCode of allCurrencies) {
-      data.push({
-        currency_pair: `${currencyCode}_${bridgeCurrency}`,
-        date: currentDate
-      })
-    }
-    const promises: Array<Promise<any>> = []
-    while (data.length > 0) {
-      promises.push(
-        fetch(endPoint, {
-          headers: {
-            'Content-Type': 'application/json'
-          },
-          method: 'POST',
-          body: JSON.stringify({ data: data.splice(0, 100) })
-        }).catch(e => logger('ratesEngine query error', e))
-      )
+      const data: ExchangeRateReq[] = [
+        ...preferredCryptoFiatPairs.map(currency_pair => ({
+          currency_pair,
+          date: currentDate
+        }))
+      ]
+      for (const currencyCode of allCurrencies) {
+        data.push({
+          currency_pair: `${currencyCode}_${bridgeCurrency}`,
+          date: currentDate
+        })
+      }
+      const promises: Array<Promise<any>> = []
+      while (data.length > 0) {
+        promises.push(
+          fetch(endPoint, {
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            method: 'POST',
+            body: JSON.stringify({ data: data.splice(0, 100) })
+          }).catch(e => logger('ratesEngine query error', e))
+        )
+      }
+      await Promise.all(promises)
+    } catch (e) {
+      const message = `ratesEngine failure: ${e}`
+      slackMessage(message).catch(e => logger(e))
+      logger(message)
+    } finally {
+      logger('ratesEngine loop complete')
     }
-    await Promise.all(promises)
-  } catch (e) {
-    const message = `ratesEngine failure: ${e}`
-    slackMessage(message).catch(e => logger(e))
-    logger(message)
-  } finally {
-    ratesEngine().catch(e => logger(e))
   }
 }

src/uidEngine.ts

@@ -7,43 +7,49 @@ import {
   wrappedGetFromDb,
   wrappedSaveToDb
 } from './utils/dbUtils'
-import { logger } from './utils/utils'
+import { logger, snooze } from './utils/utils'
 
 const providerAssets = {
   // coincap: coincapAssets, // Disabled because ZEC rates are bad. Can re-enable once we can blacklist IDs.
   coinMarketCap: coinMarketCapAssets,
   coingecko: coingeckoAssets
 }
 
+const DEFAULT_WAIT_MS = 60 * 60 * 1000 // 1 hour
+
 export const uidEngine = async (): Promise<void> => {
-  logger('Updating UID Cache')
-  try {
-    const edgeDoc = (await wrappedGetFromDb(['currencyCodeMaps']))[0]
-    const promises = Object.keys(providerAssets).map(provider =>
-      providerAssets[provider]()
-        .then(newMap => {
-          // Combine the new UID map with existing UID map
-          const assetMap = { ...edgeDoc[provider], ...newMap }
+  while (true) {
+    logger('Updating UID Cache')
+    try {
+      const edgeDoc = (await wrappedGetFromDb(['currencyCodeMaps']))[0]
+      const promises = Object.keys(providerAssets).map(provider =>
+        providerAssets[provider]()
+          .then(newMap => {
+            // Combine the new UID map with existing UID map
+            const assetMap = { ...edgeDoc[provider], ...newMap }
 
-          // Remove the UIDs for the currency codes we've hardcoded
-          for (let i = 0; i < edgeDoc.allEdgeCurrencies.length; i++) {
-            delete assetMap[edgeDoc.allEdgeCurrencies[i]]
-          }
+            // Remove the UIDs for the currency codes we've hardcoded
+            for (let i = 0; i < edgeDoc.allEdgeCurrencies.length; i++) {
+              delete assetMap[edgeDoc.allEdgeCurrencies[i]]
+            }
 
-          // Combine our codes with the new ones
-          edgeDoc[provider] = {
-            ...assetMap,
-            ...currencyCodeMaps[provider]
-          }
-        })
-        .catch(e => logger(`Failed to update ${provider}`, e))
-        .finally(logger(`${provider} provider updated`))
-    )
-    await Promise.allSettled(promises)
-    wrappedSaveToDb([edgeDoc])
-  } catch (e) {
-    const message = `ratesEngine failure: ${e}`
-    slackMessage(message).catch(e => logger(e))
-    logger(message)
+            // Combine our codes with the new ones
+            edgeDoc[provider] = {
+              ...assetMap,
+              ...currencyCodeMaps[provider]
+            }
+          })
+          .catch(e => logger(`Failed to update ${provider}`, e))
+          .finally(logger(`${provider} provider updated`))
+      )
+      await Promise.allSettled(promises)
+      wrappedSaveToDb([edgeDoc])
+    } catch (e) {
+      const message = `ratesEngine failure: ${e}`
+      slackMessage(message).catch(e => logger(e))
+      logger(message)
+    }
+    logger('UID Cache updated. Snoozing for 1 hour')
+    await snooze(DEFAULT_WAIT_MS)
   }
 }