@exodus/market-history 10.2.0 → 10.2.2

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [10.2.2](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/market-history@10.2.1...@exodus/market-history@10.2.2) (2025-05-26)
+
+### Bug Fixes
+
+- fix: potential race condition (#12678)
+
+## [10.2.1](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/market-history@10.2.0...@exodus/market-history@10.2.1) (2025-05-18)
+
+### Bug Fixes
+
+- fix: market-history stop (#12548)
+
 ## [10.2.0](https://github.com/ExodusMovement/exodus-hydra/compare/@exodus/market-history@10.1.3...@exodus/market-history@10.2.0) (2025-05-08)
 
 ### Features

package/module/index.js

@@ -62,7 +62,8 @@ const filterMapAssetDataFromServer = (data) =>
     .filter((piece) => piece.close !== 0)
     .map((piece) => [piece.time * 1000, { close: piece.close }])
 
-const delayWithJitter = (ms, jitter = 0) => delay(Math.floor(ms + Math.random() * jitter))
+const delayWithJitter = (ms, jitter = 0, signal) =>
+  delay(Math.floor(ms + Math.random() * jitter), { signal })
 
 const setupPriceFetchInterval = async ({
   func,
@@ -75,7 +76,13 @@ const setupPriceFetchInterval = async ({
   while (abortController ? !abortController.signal.aborted : true) {
     const now = getCurrentTime()
     const untilEndOfPeriod = dayjs.utc(now).endOf(granularity).valueOf() - now
-    await delayWithJitter(untilEndOfPeriod + delay, getJitter())
+
+    try {
+      await delayWithJitter(untilEndOfPeriod + delay, getJitter(), abortController?.signal)
+    } catch {
+      // aborted
+      break
+    }
 
     try {
       await func()
@@ -141,7 +148,7 @@ class MarketHistoryMonitor {
     this.#synchronizedTime = synchronizedTime
   }
 
-  #started = false
+  #isActive = false
 
   #setCache = async ({ currency, granularity, pricesByAssetName }) => {
     let hasChanges = false
@@ -265,7 +272,7 @@ class MarketHistoryMonitor {
   }
 
   updateAll = async () => {
-    if (!this.#started) {
+    if (!this.#isActive) {
       const e = new Error('market-history updateAll cannot be called before module started')
       this.#errorTracking.track({
         error: e,
@@ -320,6 +327,10 @@ class MarketHistoryMonitor {
   }
 
   #updateAssets = async (assetNames, granularities) => {
+    if (!this.#isActive) {
+      return
+    }
+
     const currency = this.#currency
     const promises = granularities.map((granularity) =>
       this.#fetchPricesByGranularity({ granularity, assetNames, currency })
@@ -327,6 +338,10 @@ class MarketHistoryMonitor {
 
     const results = await Promise.all(promises)
 
+    if (!this.#isActive) {
+      return
+    }
+
     await this.#marketHistoryAtom.set((current) => {
       const detectHasChanges = (result, parsedGranularity) => {
         if (!current || !current.data) return true
@@ -392,6 +407,11 @@ class MarketHistoryMonitor {
       difference(this.#remoteConfigClearCacheAtom).observe(({ current, previous }) => {
         const clear = async () => {
           await this.#invalidateStorage({ remoteConfigClearCacheVersion: current })
+
+          if (!this.#isActive) {
+            return
+          }
+
           await this.updateAll()
         }
 
@@ -452,6 +472,10 @@ class MarketHistoryMonitor {
             },
           }
         })
+        if (!this.#isActive) {
+          return
+        }
+
         this.updateAll()
       }
     })
@@ -490,39 +514,55 @@ class MarketHistoryMonitor {
 
   start = makeConcurrent(
     async () => {
-      if (this.#started) return
+      if (this.#isActive) return
       this.#logger.info('market history start')
-      this.#started = true
+      this.#isActive = true
       this.#abortController = new AbortController()
 
       const remoteConfigClearCacheVersion = await this.#remoteConfigClearCacheAtom.get()
       await this.#invalidateStorage({ remoteConfigClearCacheVersion })
 
+      if (!this.#isActive) {
+        return
+      }
+
       this.#currency = await this.#currencyAtom.get()
       this.#previouslyEnabledAssets = await this.#enabledAssetsAtom.get()
 
+      if (!this.#isActive) {
+        return
+      }
+
       // Initialize atom if necessary
       await this.#initMarketHistoryAtom()
 
+      if (!this.#isActive) {
+        return
+      }
+
       this.#setupTimers()
       this.#listenRemoteConfigClearCacheVersionChanges()
       this.#listenCurrencyChanges()
       this.#listenEnabledAssetsChanges()
 
+      if (!this.#isActive) {
+        return
+      }
+
       await this.updateAll()
     },
     { concurrency: 1 }
   )
 
   stop = () => {
-    if (!this.#started) {
+    if (!this.#isActive) {
       return
     }
 
     this.#logger.info('market history stops')
     this.#atomListeners.forEach((unsubscribe) => unsubscribe())
     this.#atomListeners = []
-    this.#started = false
+    this.#isActive = false
     this.#abortController.abort()
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/market-history",
-  "version": "10.2.0",
+  "version": "10.2.2",
   "description": "Fetches historical prices for assets",
   "author": "Exodus Movement, Inc.",
   "license": "MIT",
@@ -29,7 +29,7 @@
     "@exodus/dayjs": "^1.0.2",
     "@exodus/price-api": "^4.1.1",
     "@exodus/remote-config-atoms": "^1.1.0",
-    "delay": "^1.3.1",
+    "delay": "^5.0.0",
     "make-concurrent": "^5.4.0",
     "ms": "^0.7.1",
     "reselect": "^3.0.1"
@@ -37,12 +37,12 @@
   "devDependencies": {
     "@exodus/assets": "^11.0.0",
     "@exodus/assets-base": "^10.0.0",
-    "@exodus/assets-feature": "^7.4.0",
+    "@exodus/assets-feature": "^8.1.1",
     "@exodus/bitcoin-meta": "^2.0.0",
     "@exodus/ethereum-meta": "^2.4.1",
     "@exodus/locale": "^2.5.0",
     "@exodus/logger": "^1.2.3",
-    "@exodus/rates-monitor": "^4.14.0",
+    "@exodus/rates-monitor": "^4.14.2",
     "@exodus/redux-dependency-injection": "^4.1.1",
     "@exodus/storage-memory": "^2.2.2",
     "events": "^3.3.0",
@@ -59,5 +59,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f74c439e4584cdfffe88e19fc3acfafc918a29dc"
+  "gitHead": "c46def8fc6822d459f0a7c4cb00ac66fb5a2580c"
 }

package/plugin/index.js

@@ -54,6 +54,7 @@ const createMarketHistoryLifecyclePlugin = ({
   const onStop = () => {
     observer.unregister()
     unobserve?.()
+    marketHistoryMonitor.stop()
   }
 
   return { onUnlock, onLoad, onStop }