@subwallet/extension-base 1.2.14-0 → 1.2.15-0

package/services/price-service/coingecko.js

@@ -2,12 +2,22 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { staticData, StaticKey } from '@subwallet/extension-base/utils/staticData';
+import { isArray } from '@polkadot/util';
 const DEFAULT_CURRENCY = 'USD';
 let useBackupApi = false;
 export const getExchangeRateMap = async () => {
+  let response;
   try {
-    const response = await fetch('https://api-cache.subwallet.app/exchange-rate');
-    const responseDataExchangeRate = (await response.json()) || {};
+    var _response, _response2;
+    try {
+      response = await fetch('https://api-cache.subwallet.app/exchange-rate');
+    } catch (e) {}
+    if (((_response = response) === null || _response === void 0 ? void 0 : _response.status) !== 200) {
+      try {
+        response = await fetch('https://static-cache.subwallet.app/exchange-rate/data.json');
+      } catch (e) {}
+    }
+    const responseDataExchangeRate = (await ((_response2 = response) === null || _response2 === void 0 ? void 0 : _response2.json())) || {};
     const exchangeRateMap = Object.keys(responseDataExchangeRate.conversion_rates).reduce((map, exchangeKey) => {
       if (!staticData[StaticKey.CURRENCY_SYMBOL][exchangeKey]) {
         return map;
@@ -20,42 +30,54 @@ export const getExchangeRateMap = async () => {
     }, {});
     return exchangeRateMap;
   } catch (e) {
-    console.warn('Failed to get exchange rate');
     return {};
   }
 };
 export const getPriceMap = async (priceIds, currency = 'USD') => {
-  var _rs, _rs2;
   const idStr = Array.from(priceIds).join(',');
-  let rs;
-  if (!useBackupApi) {
-    try {
-      rs = await fetch(`https://api.coingecko.com/api/v3/coins/markets?vs_currency=${currency.toLowerCase()}&per_page=250&ids=${idStr}`);
-    } catch (err) {
+  let response;
+  try {
+    var _response3, _response5;
+    if (!useBackupApi) {
+      try {
+        response = await fetch(`https://api.coingecko.com/api/v3/coins/markets?vs_currency=${currency.toLowerCase()}&per_page=250&ids=${idStr}`);
+      } catch (err) {
+        useBackupApi = true;
+      }
+    }
+    if (useBackupApi || ((_response3 = response) === null || _response3 === void 0 ? void 0 : _response3.status) !== 200) {
+      var _response4;
       useBackupApi = true;
+      try {
+        response = await fetch(`https://api-cache.subwallet.app/api/price/get?ids=${idStr}`);
+      } catch (e) {}
+      if (((_response4 = response) === null || _response4 === void 0 ? void 0 : _response4.status) !== 200) {
+        try {
+          response = await fetch('https://static-cache.subwallet.app/price/data.json');
+        } catch (e) {}
+      }
     }
+    const generateDataPriceRaw = (await ((_response5 = response) === null || _response5 === void 0 ? void 0 : _response5.json())) || [];
+    const responseDataPrice = isArray(generateDataPriceRaw) ? generateDataPriceRaw : Object.entries(generateDataPriceRaw).map(([id, value]) => ({
+      ...value,
+      id
+    }));
+    const currencyData = staticData[StaticKey.CURRENCY_SYMBOL][currency || DEFAULT_CURRENCY];
+    const priceMap = {};
+    const price24hMap = {};
+    responseDataPrice.forEach(val => {
+      const currentPrice = val.current_price || 0;
+      const price24h = currentPrice - (val.price_change_24h || 0);
+      priceMap[val.id] = currentPrice;
+      price24hMap[val.id] = price24h;
+    });
+    return {
+      currency,
+      currencyData,
+      priceMap,
+      price24hMap
+    };
+  } catch (e) {
+    return {};
   }
-  if (useBackupApi || ((_rs = rs) === null || _rs === void 0 ? void 0 : _rs.status) !== 200) {
-    useBackupApi = true;
-    rs = await fetch(`https://chain-data.subwallet.app/api/price/get?ids=${idStr}`);
-  }
-  if (((_rs2 = rs) === null || _rs2 === void 0 ? void 0 : _rs2.status) !== 200) {
-    console.warn('Failed to get token price');
-  }
-  const responseDataPrice = (await rs.json()) || [];
-  const currencyData = staticData[StaticKey.CURRENCY_SYMBOL][currency || DEFAULT_CURRENCY];
-  const priceMap = {};
-  const price24hMap = {};
-  responseDataPrice.forEach(val => {
-    const currentPrice = val.current_price || 0;
-    const price24h = currentPrice - (val.price_change_24h || 0);
-    priceMap[val.id] = currentPrice;
-    price24hMap[val.id] = price24h;
-  });
-  return {
-    currency,
-    currencyData,
-    priceMap,
-    price24hMap
-  };
 };

package/services/price-service/index.js

@@ -6,9 +6,10 @@ import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
 import { getExchangeRateMap, getPriceMap } from '@subwallet/extension-base/services/price-service/coingecko';
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { CurrentCurrencyStore } from '@subwallet/extension-base/stores';
+import { wait } from '@subwallet/extension-base/utils';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { staticData, StaticKey } from '@subwallet/extension-base/utils/staticData';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, combineLatest } from 'rxjs';
 const DEFAULT_CURRENCY = 'USD';
 const DEFAULT_PRICE_SUBJECT = {
   currency: DEFAULT_CURRENCY,
@@ -22,6 +23,9 @@ const DEFAULT_PRICE_SUBJECT = {
   price24hMap: {},
   exchangeRateMap: {}
 };
+const checkFetchSuccess = (obj1, obj2) => {
+  return Object.keys(obj1).length > 0 && Object.keys(obj2).length > 0;
+};
 export class PriceService {
   priceIds = new Set();
   currency = new CurrentCurrencyStore();
@@ -43,10 +47,15 @@ export class PriceService {
     this.init().then(() => this.getCurrentCurrency(updateCurrency)).catch(console.error);
   }
   async getTokenPrice(priceIds, currency, resolve, reject) {
-    await Promise.all([getExchangeRateMap(), getPriceMap(priceIds, currency)]).then(([exchangeRateMap, priceMap]) => {
-      this.rawExchangeRateMap.next(exchangeRateMap);
-      this.rawPriceSubject.next(priceMap);
-    });
+    const getPriceData = async () => {
+      await Promise.all([getExchangeRateMap(), getPriceMap(priceIds, currency)]).then(([exchangeRateMap, priceMap]) => {
+        if (checkFetchSuccess(priceMap, exchangeRateMap)) {
+          this.rawExchangeRateMap.next(exchangeRateMap);
+          this.rawPriceSubject.next(priceMap);
+        }
+      });
+    };
+    await Promise.race([getPriceData(), wait(10 * 1000)]);
   }
   getCurrentCurrencySubject() {
     return this.currency.getSubject();
@@ -82,17 +91,27 @@ export class PriceService {
     })();
   }
   async calculatePriceMap(currency) {
-    const {
+    let {
       price24hMap,
       priceMap
     } = this.rawPriceSubject.value;
-    const exchangeRateData = this.rawExchangeRateMap.value;
+    let exchangeRateData = this.rawExchangeRateMap.value;
+    const priceStored = await this.dbService.getPriceStore(currency);
     const currencyKey = currency || DEFAULT_CURRENCY;
     if (Object.keys(this.rawPriceSubject.value).length === 0) {
-      return;
+      if (priceStored !== null && priceStored !== void 0 && priceStored.exchangeRateMap) {
+        exchangeRateData = priceStored.exchangeRateMap;
+      }
     }
     if (Object.keys(exchangeRateData).length === 0) {
-      return;
+      if (priceStored !== null && priceStored !== void 0 && priceStored.price24hMap) {
+        price24hMap = {
+          ...priceStored.price24hMap
+        };
+        priceMap = {
+          ...priceStored.priceMap
+        };
+      }
     }
     const finalPriceMap = {
       priceMap: {
@@ -158,8 +177,7 @@ export class PriceService {
         this.refreshPriceMapByAction();
       }
     };
-    this.getCurrentCurrencySubject().subscribe(currency => {
-      console.log('Currency changed', currency);
+    combineLatest([this.getCurrentCurrencySubject(), this.rawPriceSubject, this.rawExchangeRateMap]).subscribe(([currency]) => {
       this.calculatePriceMap(currency).then(data => {
         if (data) {
           this.priceSubject.next(data);