@subwallet/extension-base 1.0.10-0 → 1.0.11-0

package/koni/background/cron.js

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, CRON_GET_API_MAP_STATUS, CRON_REFRESH_CHAIN_STAKING_METADATA, CRON_REFRESH_NFT_INTERVAL, CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL, CRON_REFRESH_STAKING_REWARD_INTERVAL } from '@subwallet/extension-base/constants';
+import { CRON_REFRESH_CHAIN_STAKING_METADATA, CRON_REFRESH_NFT_INTERVAL, CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL, CRON_REFRESH_STAKING_REWARD_INTERVAL } from '@subwallet/extension-base/constants';
 import { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportSubstrateStaking, _isChainSupportWasmNft } from '@subwallet/extension-base/services/chain-service/utils';
 import { waitTimeout } from '@subwallet/extension-base/utils';
 import { Subject } from 'rxjs';
@@ -49,10 +49,11 @@ export class KoniCron {
       delete this.cronMap[key];
     });
   };
-  start = () => {
+  start = async () => {
     if (this.status === 'running') {
       return;
     }
+    await Promise.all([this.state.eventService.waitKeyringReady, this.state.eventService.waitAssetReady]);
     const currentAccountInfo = this.state.keyringService.currentAccount;
     const commonReloadEvents = ['account.add', 'account.remove', 'account.updateCurrent', 'chain.add', 'asset.updateState'];
     this.eventHandler = (events, eventTypes) => {
@@ -92,13 +93,9 @@ export class KoniCron {
       needUpdateStaking && this.removeCron('updateChainStakingMetadata');
 
       // Chains
-      chainUpdated && this.removeCron('checkStatusApiMap');
-      chainUpdated && this.removeCron('recoverApiMap');
       if (this.checkNetworkAvailable(serviceInfo)) {
         // only add cron job if there's at least 1 active network
         (commonReload || needUpdateNft) && this.addCron('refreshNft', this.refreshNft(address, serviceInfo.chainApiMap, this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), CRON_REFRESH_NFT_INTERVAL);
-        chainUpdated && this.addCron('checkStatusApiMap', this.updateApiMapStatus, CRON_GET_API_MAP_STATUS, false);
-        chainUpdated && this.addCron('recoverApiMap', this.recoverApiMap, CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, false);
         (commonReload || needUpdateStaking || stakingSubmitted) && this.addCron('refreshStakingReward', this.refreshStakingReward(address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
         (commonReload || needUpdateStaking || stakingSubmitted) && this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
         needUpdateStaking && this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), CRON_REFRESH_CHAIN_STAKING_METADATA);
@@ -113,8 +110,6 @@ export class KoniCron {
     if (Object.keys(this.state.getSubstrateApiMap()).length !== 0 || Object.keys(this.state.getEvmApiMap()).length !== 0) {
       this.resetNft(currentAccountInfo.address);
       this.addCron('refreshNft', this.refreshNft(currentAccountInfo.address, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), CRON_REFRESH_NFT_INTERVAL);
-      this.addCron('checkStatusApiMap', this.updateApiMapStatus, CRON_GET_API_MAP_STATUS);
-      this.addCron('recoverApiMap', this.recoverApiMap, CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, false);
       this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
       this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
       this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), CRON_REFRESH_CHAIN_STAKING_METADATA);
@@ -123,7 +118,7 @@ export class KoniCron {
     }
     this.status = 'running';
   };
-  stop = () => {
+  stop = async () => {
     if (this.status === 'stopped') {
       return;
     }
@@ -139,27 +134,7 @@ export class KoniCron {
     }
     this.removeAllCrons();
     this.status = 'stopped';
-  };
-  updateApiMapStatus = () => {
-    this.state.chainService.updateApiMapStatus().catch(console.error);
-  };
-  recoverApiMap = () => {
-    var _this$subscriptions;
-    const apiMap = this.state.getApiMap();
-    for (const [networkKey, apiProp] of Object.entries(apiMap.substrate)) {
-      if (!apiProp.isApiConnected) {
-        this.state.refreshSubstrateApi(networkKey);
-      }
-    }
-    for (const [key, evmApi] of Object.entries(apiMap.evm)) {
-      evmApi.api.eth.net.isListening().catch(() => {
-        this.state.refreshWeb3Api(key);
-      });
-    }
-    const {
-      address
-    } = this.state.keyringService.currentAccount;
-    ((_this$subscriptions = this.subscriptions) === null || _this$subscriptions === void 0 ? void 0 : _this$subscriptions.subscribeBalancesAndCrowdloans) && this.subscriptions.subscribeBalancesAndCrowdloans(address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
+    return Promise.resolve();
   };
   refreshNft = (address, apiMap, smartContractNfts, chainInfoMap) => {
     return () => {

package/koni/background/handlers/State.d.ts

@@ -50,7 +50,6 @@ export default class KoniState {
     private cron;
     private subscription;
     private logger;
-    private ready;
     readonly settingService: SettingService;
     readonly requestService: RequestService;
     readonly transactionService: TransactionService;
@@ -59,6 +58,9 @@ export default class KoniState {
     readonly balanceService: BalanceService;
     readonly migrationService: MigrationService;
     readonly subscanService: SubscanService;
+    private generalStatus;
+    private waitSleeping;
+    private waitStarting;
     constructor(providers?: Providers);
     get knownMetadata(): MetadataDef[];
     injectMetadata(url: string, request: MetadataDef): Promise<boolean>;
@@ -77,7 +79,6 @@ export default class KoniState {
     init(): Promise<void>;
     private startSubscription;
     onReady(): void;
-    isReady(): boolean;
     updateKeyringState(isReady?: boolean, callback?: () => void): void;
     private lazyNext;
     getAuthRequestV2(id: string): AuthRequestV2;
@@ -182,10 +183,10 @@ export default class KoniState {
     disableChain(chainSlug: string): Promise<boolean>;
     enableChain(chainSlug: string, enableTokens?: boolean): Promise<boolean>;
     resetDefaultChains(): boolean;
-    getSubstrateApiMap(): Record<string, import("@subwallet/extension-base/services/chain-service/types")._SubstrateApi>;
-    getSubstrateApi(networkKey: string): import("@subwallet/extension-base/services/chain-service/types")._SubstrateApi;
-    getEvmApiMap(): Record<string, import("@subwallet/extension-base/services/chain-service/types")._EvmApi>;
-    getEvmApi(networkKey: string): import("@subwallet/extension-base/services/chain-service/types")._EvmApi;
+    getSubstrateApiMap(): Record<string, import("../../../services/chain-service/handler/SubstrateApi").SubstrateApi>;
+    getSubstrateApi(networkKey: string): import("../../../services/chain-service/handler/SubstrateApi").SubstrateApi;
+    getEvmApiMap(): Record<string, import("../../../services/chain-service/handler/EvmApi").EvmApi>;
+    getEvmApi(networkKey: string): import("../../../services/chain-service/handler/EvmApi").EvmApi;
     getApiMap(): ApiMap;
     refreshSubstrateApi(key: string): boolean;
     refreshWeb3Api(key: string): void;
@@ -195,8 +196,8 @@ export default class KoniState {
     getExternalRequest(id: string): ExternalRequestPromise;
     updateExternalRequest(id: string, value: Partial<ExternalRequestPromise>): void;
     cleanExternalRequest(): void;
-    pauseAllNetworks(code?: number, reason?: string): Promise<void[]>;
-    resumeAllNetworks(): Promise<void[]>;
+    pauseAllNetworks(code?: number, reason?: string): Promise<void>;
+    resumeAllNetworks(): Promise<void>;
     private publishBalance;
     private publishCrowdloan;
     findNetworkKeyByGenesisHash(genesisHash?: string | null): [string | undefined, _ChainInfo | undefined];
@@ -214,6 +215,7 @@ export default class KoniState {
     get activeNetworks(): Record<string, _ChainInfo>;
     get activeChainSlugs(): string[];
     sleep(): Promise<void>;
+    private _start;
     wakeup(): Promise<void>;
     cancelSubscription(id: string): boolean;
     createUnsubscriptionHandle(id: string, unsubscribe: () => void): void;

package/koni/background/handlers/State.js

@@ -8,6 +8,7 @@ import { isSubscriptionRunning, unsubscribe } from '@subwallet/extension-base/ba
 import { APIItemState, BasicTxErrorType, ChainType, EvmProviderErrorType, ExternalRequestPromiseStatus, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH } from '@subwallet/extension-base/constants';
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
+import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { _PREDEFINED_SINGLE_MODES } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getEvmChainId, _getSubstrateGenesisHash, _isAssetFungibleToken, _isChainEnabled, _isChainTestNet, _isSubstrateParaChain, _parseMetadataForSmartContractAsset } from '@subwallet/extension-base/services/chain-service/utils';
@@ -25,6 +26,7 @@ import { SUBSCAN_CHAIN_MAP_REVERSE } from '@subwallet/extension-base/services/su
 import TransactionService from '@subwallet/extension-base/services/transaction-service';
 import AccountRefStore from '@subwallet/extension-base/stores/AccountRef';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
+import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { decodePair } from '@subwallet/keyring/pair/decode';
 import { keyring } from '@subwallet/ui-keyring';
 import SimpleKeyring from 'eth-simple-keyring';
@@ -72,13 +74,16 @@ export default class KoniState {
     data: {}
   };
   lazyMap = {};
-  ready = false;
+  // Handle the general status of the extension
+  generalStatus = ServiceStatus.INITIALIZING;
+  waitSleeping = null;
+  waitStarting = null;
   constructor(providers = {}) {
     this.providers = providers;
-    this.dbService = new DatabaseService();
     this.eventService = new EventService();
-    this.subscanService = new SubscanService();
+    this.dbService = new DatabaseService(this.eventService);
     this.keyringService = new KeyringService(this.eventService);
+    this.subscanService = new SubscanService();
     this.notificationService = new NotificationService();
     this.chainService = new ChainService(this.dbService, this.eventService);
     this.settingService = new SettingService();
@@ -190,6 +195,7 @@ export default class KoniState {
     return balanceMap;
   }
   async init() {
+    await this.eventService.waitCryptoReady;
     await this.chainService.init();
     await this.migrationService.run();
     this.eventService.emit('chain.ready', true);
@@ -213,14 +219,9 @@ export default class KoniState {
     });
   }
   onReady() {
-    this.subscription.start();
-    this.cron.start();
-    this.historyService.start().catch(console.error);
-    this.priceService.start().catch(console.error);
-    this.ready = true;
-  }
-  isReady() {
-    return this.ready;
+    // Todo: Need optimize in the future to, only run important services onetime to save resources
+    // Todo: If optimize must check activity of web-runner of mobile
+    this._start().catch(console.error);
   }
   updateKeyringState(isReady = true, callback) {
     this.keyringService.updateKeyringState(isReady);
@@ -836,7 +837,7 @@ export default class KoniState {
     return this.chainService.getActiveChainInfoMap();
   }
   async upsertChainInfo(data) {
-    const newNativeTokenSlug = this.chainService.upsertChain(data);
+    const newNativeTokenSlug = await this.chainService.upsertChain(data);
     if (newNativeTokenSlug) {
       await this.chainService.updateAssetSetting(newNativeTokenSlug, {
         visible: true
@@ -1334,19 +1335,68 @@ export default class KoniState {
     });
   }
   async sleep() {
-    this.cron.stop();
-    this.subscription.stop();
+    // Wait starting finish before sleep to avoid conflict
+    this.generalStatus === ServiceStatus.STARTING && this.waitStarting && (await this.waitStarting);
+    this.eventService.emit('general.sleep', true);
+
+    // Avoid sleep multiple times
+    if (this.generalStatus === ServiceStatus.STOPPED) {
+      return;
+    }
+
+    // Continue wait existed stopping process
+    if (this.generalStatus === ServiceStatus.STOPPING) {
+      await this.waitSleeping;
+      return;
+    }
+    const sleeping = createPromiseHandler();
+    this.generalStatus = ServiceStatus.STOPPING;
+    this.waitSleeping = sleeping.promise;
+
+    // Stopping services
+    await Promise.all([this.cron.stop(), this.subscription.stop()]);
     await this.pauseAllNetworks(undefined, 'IDLE mode');
-    await this.historyService.stop();
-    await this.priceService.stop();
+    await Promise.all([this.historyService.stop(), this.priceService.stop()]);
+
+    // Complete sleeping
+    sleeping.resolve();
+    this.generalStatus = ServiceStatus.STOPPED;
+    this.waitSleeping = null;
+  }
+  async _start(isWakeup = false) {
+    // Wait sleep finish before start to avoid conflict
+    this.generalStatus === ServiceStatus.STOPPING && this.waitSleeping && (await this.waitSleeping);
+
+    // Avoid start multiple times
+    if (this.generalStatus === ServiceStatus.STARTED) {
+      return;
+    }
+
+    // Continue wait existed starting process
+    if (this.generalStatus === ServiceStatus.STARTING) {
+      await this.waitStarting;
+      return;
+    }
+    const starting = createPromiseHandler();
+    this.generalStatus = ServiceStatus.STARTING;
+    this.waitStarting = starting.promise;
+
+    // Resume all networks if wakeup from sleep
+    if (isWakeup) {
+      await this.resumeAllNetworks();
+      this.eventService.emit('general.wakeup', true);
+    }
+
+    // Start services
+    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start()]);
+
+    // Complete starting
+    starting.resolve();
+    this.waitStarting = null;
+    this.generalStatus = ServiceStatus.STARTED;
   }
   async wakeup() {
-    await this.eventService.waitChainReady;
-    await this.resumeAllNetworks();
-    this.cron.start();
-    this.subscription.start();
-    await this.historyService.start();
-    await this.priceService.start();
+    await this._start(true);
   }
   cancelSubscription(id) {
     if (isSubscriptionRunning(id)) {
@@ -1406,7 +1456,7 @@ export default class KoniState {
       });
     });
     if (needActiveTokens.length) {
-      this.chainService.enableChains(needEnableChains);
+      await this.chainService.enableChains(needEnableChains);
       this.chainService.setAssetSettings({
         ...currentAssetSettings
       });

package/koni/background/subscription.d.ts

@@ -15,8 +15,8 @@ export declare class KoniSubscription {
     getSubscription(name: SubscriptionName): (() => void) | undefined;
     updateSubscription(name: SubscriptionName, func: (() => void) | undefined): void;
     stopAllSubscription(): void;
-    start(): void;
-    stop(): void;
+    start(): Promise<void>;
+    stop(): Promise<void>;
     subscribeBalancesAndCrowdloans(address: string, chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>, web3ApiMap: Record<string, _EvmApi>, onlyRunOnFirstTime?: boolean): void;
     subscribeStakingOnChain(address: string, substrateApiMap: Record<string, _SubstrateApi>, onlyRunOnFirstTime?: boolean): void;
     initStakingOnChainSubscription(addresses: string[], substrateApiMap: Record<string, _SubstrateApi>, onlyRunOnFirstTime?: boolean): (() => void) | undefined;

package/koni/background/subscription.js

@@ -52,8 +52,9 @@ export class KoniSubscription {
       delete this.subscriptionMap.stakingOnChain;
     }
   }
-  start() {
+  async start() {
     var _this$state$keyringSe;
+    await Promise.all([this.state.eventService.waitKeyringReady, this.state.eventService.waitAssetReady]);
     const currentAddress = (_this$state$keyringSe = this.state.keyringService.currentAccount) === null || _this$state$keyringSe === void 0 ? void 0 : _this$state$keyringSe.address;
     if (currentAddress) {
       this.subscribeBalancesAndCrowdloans(currentAddress, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
@@ -75,12 +76,13 @@ export class KoniSubscription {
     };
     this.state.eventService.onLazy(this.eventHandler);
   }
-  stop() {
+  async stop() {
     if (this.eventHandler) {
       this.state.eventService.offLazy(this.eventHandler);
       this.eventHandler = undefined;
     }
     this.stopAllSubscription();
+    return Promise.resolve();
   }
   subscribeBalancesAndCrowdloans(address, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime) {
     this.state.handleSwitchAccount(address).then(() => {