@subwallet/extension-base 1.1.60-0 → 1.1.60-1

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.60-0'
+  version: '1.1.60-1'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/price-service/index.js

@@ -8,7 +8,6 @@ var _constants = require("@subwallet/extension-base/constants");
 var _types = require("@subwallet/extension-base/services/base/types");
 var _coingecko = require("@subwallet/extension-base/services/price-service/coingecko");
 var _storage = require("@subwallet/extension-base/storage");
-var _utils = require("@subwallet/extension-base/utils");
 var _promise = require("@subwallet/extension-base/utils/promise");
 var _staticData = require("@subwallet/extension-base/utils/staticData");
 var _rxjs = require("rxjs");
@@ -43,43 +42,6 @@ class PriceService {
     this.dbService = dbService;
     this.eventService = eventService;
     this.chainService = chainService;
-    const mergeDataSubject = (0, _rxjs.merge)(this.rawPriceSubject, this.rawExchangeRateMap, this.currency);
-    const onUpdate = () => {
-      (0, _utils.addLazy)('updatePriceData', () => {
-        const priceSubjectValue = JSON.parse(JSON.stringify(this.rawPriceSubject.value));
-        const exchangeRateMapValue = JSON.parse(JSON.stringify(this.rawExchangeRateMap.value));
-        const currencyKey = this.currency.value;
-        if (Object.keys(priceSubjectValue).length === 0) {
-          return;
-        }
-        if (Object.keys(exchangeRateMapValue).length === 0) {
-          return;
-        }
-        if (currencyKey === DEFAULT_CURRENCY) {
-          this.priceSubject.next({
-            ...priceSubjectValue,
-            currency: currencyKey,
-            exchangeRateMap: exchangeRateMapValue,
-            currencyData: _staticData.staticData[_staticData.StaticKey.CURRENCY_SYMBOL][currencyKey]
-          });
-        }
-        Object.keys(priceSubjectValue.price24hMap).forEach(key => {
-          priceSubjectValue.price24hMap[key] *= exchangeRateMapValue[currencyKey].exchange;
-          priceSubjectValue.priceMap[key] *= exchangeRateMapValue[currencyKey].exchange;
-        });
-        this.priceSubject.next({
-          ...priceSubjectValue,
-          currency: currencyKey,
-          exchangeRateMap: exchangeRateMapValue,
-          currencyData: _staticData.staticData[_staticData.StaticKey.CURRENCY_SYMBOL][currencyKey || DEFAULT_CURRENCY]
-        });
-        this.dbService.updatePriceStore({
-          ...priceSubjectValue,
-          exchangeRateMap: exchangeRateMapValue
-        }).catch(console.error);
-      });
-    };
-    mergeDataSubject.subscribe(onUpdate);
     this.init().catch(console.error);
   }
   async getTokenPrice(priceIds, currency, resolve, reject) {
@@ -89,6 +51,48 @@ class PriceService {
       this.rawPriceSubject.next(priceMap);
     });
   }
+  refreshPromise = null;
+  refreshPriceMapByAction() {
+    this.refreshPromise = (async () => {
+      try {
+        await this.refreshPromise;
+        const newPriceMap = await this.calculatePriceMap();
+        if (newPriceMap) {
+          this.priceSubject.next(newPriceMap);
+        }
+      } catch (e) {
+        console.error(e);
+      } finally {
+        this.refreshPromise = null;
+      }
+    })();
+  }
+  async calculatePriceMap() {
+    const rawPrice = this.rawPriceSubject.value;
+    const exchangeRateData = this.rawExchangeRateMap.value;
+    const currencyKey = this.currency.value;
+    if (Object.keys(rawPrice).length === 0) {
+      return;
+    }
+    if (Object.keys(exchangeRateData).length === 0) {
+      return;
+    }
+    const finalPriceMap = {
+      ...JSON.parse(JSON.stringify(rawPrice)),
+      currency: currencyKey,
+      exchangeRateMap: exchangeRateData,
+      currencyData: _staticData.staticData[_staticData.StaticKey.CURRENCY_SYMBOL][currencyKey || DEFAULT_CURRENCY]
+    };
+    if (currencyKey === DEFAULT_CURRENCY) {
+      return finalPriceMap;
+    }
+    Object.keys(finalPriceMap.price24hMap).forEach(key => {
+      finalPriceMap.price24hMap[key] = rawPrice.price24hMap[key] * exchangeRateData[currencyKey].exchange;
+      finalPriceMap.priceMap[key] = rawPrice.priceMap[key] * exchangeRateData[currencyKey].exchange;
+    });
+    await this.dbService.updatePriceStore(finalPriceMap);
+    return finalPriceMap;
+  }
   async getPrice() {
     return Promise.resolve(this.priceSubject.value);
   }
@@ -110,16 +114,15 @@ class PriceService {
     _storage.SWStorage.instance.setItem(_constants.CURRENCY, newCurrencyCode);
     return true;
   }
-  refreshPriceData(priceIds, resolve, reject) {
+  refreshPriceData(priceIds) {
     clearTimeout(this.refreshTimeout);
     this.priceIds = priceIds || this.getPriceIds();
 
     // Update for tokens price
     this.getTokenPrice(this.priceIds, this.priceSubject.value.currency).then(() => {
-      resolve && resolve(true);
+      this.refreshPriceMapByAction();
     }).catch(e => {
       console.error(e);
-      reject && reject(false);
     });
     this.refreshTimeout = setTimeout(this.refreshPriceData.bind(this), _constants.CRON_REFRESH_PRICE_INTERVAL);
   }
@@ -133,9 +136,17 @@ class PriceService {
       // Compare two set newPriceIds and this.priceIds
       if (newPriceIds.size !== this.priceIds.size || !Array.from(newPriceIds).every(v => this.priceIds.has(v))) {
         this.priceIds = newPriceIds;
-        this.refreshPriceData(this.priceIds);
+        this.refreshPriceMapByAction();
       }
     };
+    this.currency.subscribe(currency => {
+      console.log('Currency changed', currency);
+      this.calculatePriceMap().then(data => {
+        if (data) {
+          this.priceSubject.next(data);
+        }
+      }).catch(console.error);
+    });
     this.status = _types.ServiceStatus.INITIALIZED;
     this.eventService.on('asset.updateState', eventHandler);
   }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.60-0",
+  "version": "1.1.60-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1875,10 +1875,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.58",
-    "@subwallet/extension-base": "^1.1.60-0",
-    "@subwallet/extension-chains": "^1.1.60-0",
-    "@subwallet/extension-dapp": "^1.1.60-0",
-    "@subwallet/extension-inject": "^1.1.60-0",
+    "@subwallet/extension-base": "^1.1.60-1",
+    "@subwallet/extension-chains": "^1.1.60-1",
+    "@subwallet/extension-dapp": "^1.1.60-1",
+    "@subwallet/extension-inject": "^1.1.60-1",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
     "@walletconnect/sign-client": "^2.8.4",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.1.60-0'
+  version: '1.1.60-1'
 };

package/services/price-service/index.d.ts

@@ -17,11 +17,14 @@ export declare class PriceService implements StoppableServiceInterface, PersistD
     private currency;
     constructor(dbService: DatabaseService, eventService: EventService, chainService: ChainService);
     private getTokenPrice;
+    private refreshPromise;
+    private refreshPriceMapByAction;
+    private calculatePriceMap;
     getPrice(): Promise<PriceJson>;
     getPriceSubject(): BehaviorSubject<PriceJson>;
     getPriceIds(): Set<string>;
     setPriceCurrency(newCurrencyCode: CurrencyType): Promise<boolean>;
-    refreshPriceData(priceIds?: Set<string>, resolve?: (rs: boolean) => void, reject?: (e: boolean) => void): void;
+    refreshPriceData(priceIds?: Set<string>): void;
     init(): Promise<void>;
     loadData(): Promise<void>;
     persistData(): Promise<void>;

package/services/price-service/index.js

@@ -5,10 +5,9 @@ import { CRON_REFRESH_PRICE_INTERVAL, CURRENCY } from '@subwallet/extension-base
 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 { addLazy } from '@subwallet/extension-base/utils';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { staticData, StaticKey } from '@subwallet/extension-base/utils/staticData';
-import { BehaviorSubject, merge } from 'rxjs';
+import { BehaviorSubject } from 'rxjs';
 const DEFAULT_CURRENCY = 'USD';
 const DEFAULT_PRICE_SUBJECT = {
   currency: DEFAULT_CURRENCY,
@@ -37,43 +36,6 @@ export class PriceService {
     this.dbService = dbService;
     this.eventService = eventService;
     this.chainService = chainService;
-    const mergeDataSubject = merge(this.rawPriceSubject, this.rawExchangeRateMap, this.currency);
-    const onUpdate = () => {
-      addLazy('updatePriceData', () => {
-        const priceSubjectValue = JSON.parse(JSON.stringify(this.rawPriceSubject.value));
-        const exchangeRateMapValue = JSON.parse(JSON.stringify(this.rawExchangeRateMap.value));
-        const currencyKey = this.currency.value;
-        if (Object.keys(priceSubjectValue).length === 0) {
-          return;
-        }
-        if (Object.keys(exchangeRateMapValue).length === 0) {
-          return;
-        }
-        if (currencyKey === DEFAULT_CURRENCY) {
-          this.priceSubject.next({
-            ...priceSubjectValue,
-            currency: currencyKey,
-            exchangeRateMap: exchangeRateMapValue,
-            currencyData: staticData[StaticKey.CURRENCY_SYMBOL][currencyKey]
-          });
-        }
-        Object.keys(priceSubjectValue.price24hMap).forEach(key => {
-          priceSubjectValue.price24hMap[key] *= exchangeRateMapValue[currencyKey].exchange;
-          priceSubjectValue.priceMap[key] *= exchangeRateMapValue[currencyKey].exchange;
-        });
-        this.priceSubject.next({
-          ...priceSubjectValue,
-          currency: currencyKey,
-          exchangeRateMap: exchangeRateMapValue,
-          currencyData: staticData[StaticKey.CURRENCY_SYMBOL][currencyKey || DEFAULT_CURRENCY]
-        });
-        this.dbService.updatePriceStore({
-          ...priceSubjectValue,
-          exchangeRateMap: exchangeRateMapValue
-        }).catch(console.error);
-      });
-    };
-    mergeDataSubject.subscribe(onUpdate);
     this.init().catch(console.error);
   }
   async getTokenPrice(priceIds, currency, resolve, reject) {
@@ -82,6 +44,48 @@ export class PriceService {
       this.rawPriceSubject.next(priceMap);
     });
   }
+  refreshPromise = null;
+  refreshPriceMapByAction() {
+    this.refreshPromise = (async () => {
+      try {
+        await this.refreshPromise;
+        const newPriceMap = await this.calculatePriceMap();
+        if (newPriceMap) {
+          this.priceSubject.next(newPriceMap);
+        }
+      } catch (e) {
+        console.error(e);
+      } finally {
+        this.refreshPromise = null;
+      }
+    })();
+  }
+  async calculatePriceMap() {
+    const rawPrice = this.rawPriceSubject.value;
+    const exchangeRateData = this.rawExchangeRateMap.value;
+    const currencyKey = this.currency.value;
+    if (Object.keys(rawPrice).length === 0) {
+      return;
+    }
+    if (Object.keys(exchangeRateData).length === 0) {
+      return;
+    }
+    const finalPriceMap = {
+      ...JSON.parse(JSON.stringify(rawPrice)),
+      currency: currencyKey,
+      exchangeRateMap: exchangeRateData,
+      currencyData: staticData[StaticKey.CURRENCY_SYMBOL][currencyKey || DEFAULT_CURRENCY]
+    };
+    if (currencyKey === DEFAULT_CURRENCY) {
+      return finalPriceMap;
+    }
+    Object.keys(finalPriceMap.price24hMap).forEach(key => {
+      finalPriceMap.price24hMap[key] = rawPrice.price24hMap[key] * exchangeRateData[currencyKey].exchange;
+      finalPriceMap.priceMap[key] = rawPrice.priceMap[key] * exchangeRateData[currencyKey].exchange;
+    });
+    await this.dbService.updatePriceStore(finalPriceMap);
+    return finalPriceMap;
+  }
   async getPrice() {
     return Promise.resolve(this.priceSubject.value);
   }
@@ -103,16 +107,15 @@ export class PriceService {
     SWStorage.instance.setItem(CURRENCY, newCurrencyCode);
     return true;
   }
-  refreshPriceData(priceIds, resolve, reject) {
+  refreshPriceData(priceIds) {
     clearTimeout(this.refreshTimeout);
     this.priceIds = priceIds || this.getPriceIds();
 
     // Update for tokens price
     this.getTokenPrice(this.priceIds, this.priceSubject.value.currency).then(() => {
-      resolve && resolve(true);
+      this.refreshPriceMapByAction();
     }).catch(e => {
       console.error(e);
-      reject && reject(false);
     });
     this.refreshTimeout = setTimeout(this.refreshPriceData.bind(this), CRON_REFRESH_PRICE_INTERVAL);
   }
@@ -126,9 +129,17 @@ export class PriceService {
       // Compare two set newPriceIds and this.priceIds
       if (newPriceIds.size !== this.priceIds.size || !Array.from(newPriceIds).every(v => this.priceIds.has(v))) {
         this.priceIds = newPriceIds;
-        this.refreshPriceData(this.priceIds);
+        this.refreshPriceMapByAction();
       }
     };
+    this.currency.subscribe(currency => {
+      console.log('Currency changed', currency);
+      this.calculatePriceMap().then(data => {
+        if (data) {
+          this.priceSubject.next(data);
+        }
+      }).catch(console.error);
+    });
     this.status = ServiceStatus.INITIALIZED;
     this.eventService.on('asset.updateState', eventHandler);
   }