fix: change sub to detect

Conflux-Chain · Nov 11, 2024 · faddf0a · faddf0a
1 parent df17d4b
commit faddf0a
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 43 deletions.
diff --git a/core/base/src/chains/conflux/Fluent/index.ts b/core/base/src/chains/conflux/Fluent/index.ts
@@ -2,10 +2,12 @@ import Emitter from '../../../emitter';
 import detectProvider from '../../../detect';
 import { ConfluxRPCMethod } from '../index';
 import type { Provider } from '../type';
+import type { CustomDetectConfig } from '../../../emitter/RPCMethod';
 
 class FluentRPCMethod extends ConfluxRPCMethod {
     sessionKey = 'conflux-isFluent';
-    detectProvider = () => detectProvider<Provider>({ injectFlag: this.injectFlag, walletFlag: 'isFluent' });
+
+    detectProvider = (config: CustomDetectConfig = {}) => detectProvider<Provider>({ injectFlag: this.injectFlag, walletFlag: 'isFluent', ...config });
 
     getAccounts = () =>
         this.provider!.request({

diff --git a/core/base/src/chains/conflux/Portal/index.ts b/core/base/src/chains/conflux/Portal/index.ts
@@ -2,10 +2,11 @@ import Emitter from '../../../emitter';
 import detectProvider from '../../../detect';
 import { ConfluxRPCMethod } from '../index';
 import type { Provider } from '../type';
+import type { CustomDetectConfig } from '../../../emitter/RPCMethod';
 
 class PortalRPCMethod extends ConfluxRPCMethod {
     sessionKey = 'conflux-isConfluxPortal';
-    detectProvider = () => detectProvider<Provider>({ injectFlag: this.injectFlag, walletFlag: 'isConfluxPortal' });
+    detectProvider = (config: CustomDetectConfig = {}) => detectProvider<Provider>({ injectFlag: this.injectFlag, walletFlag: 'isConfluxPortal', ...config });
 }
 
 export default new Emitter(new PortalRPCMethod());
diff --git a/core/base/src/chains/conflux/index.ts b/core/base/src/chains/conflux/index.ts
@@ -1,5 +1,5 @@
 import Emitter from '../../emitter';
-import RPCMethod from '../../emitter/RPCMethod';
+import RPCMethod, { type CustomDetectConfig } from '../../emitter/RPCMethod';
 import detectProvider from '../../detect';
 import type { Provider, TransactionParameters, AddChainParameter, WatchAssetParams, TypedSignParams } from './type';
 
@@ -8,8 +8,8 @@ export class ConfluxRPCMethod extends RPCMethod {
     injectFlag = 'conflux';
     declare provider: Provider;
 
-    detectProvider = () => {
-        const p = detectProvider<Provider>({ injectFlag: this.injectFlag });
+    detectProvider = (config: CustomDetectConfig = {}) => {
+        const p = detectProvider<Provider>({ injectFlag: this.injectFlag, ...config });
 
         // Conflux Portal Wallet support
         p.then((provider) => {

diff --git a/core/base/src/chains/ethereum/Coinbase/index.ts b/core/base/src/chains/ethereum/Coinbase/index.ts
@@ -2,10 +2,11 @@ import Emitter from '../../../emitter';
 import detectProvider from '../../../detect';
 import { EthereumRPCMethod } from '../index';
 import type { Provider } from '../type';
+import type { CustomDetectConfig } from '../../../emitter/RPCMethod';
 
 class CoinbaseRPCMethod extends EthereumRPCMethod {
     sessionKey = 'ethereum-isCoinbaseWallet';
-    detectProvider = () => detectProvider<Provider>({ injectFlag: this.injectFlag, walletFlag: 'isCoinbaseWallet' });
+    detectProvider = (config: CustomDetectConfig = {}) => detectProvider<Provider>({ injectFlag: this.injectFlag, walletFlag: 'isCoinbaseWallet', ...config });
 }
 
 export default new Emitter(new CoinbaseRPCMethod());
diff --git a/core/base/src/chains/ethereum/Fluent/index.ts b/core/base/src/chains/ethereum/Fluent/index.ts
@@ -2,11 +2,12 @@ import Emitter from '../../../emitter';
 import detectProvider from '../../../detect';
 import { EthereumRPCMethod } from '../index';
 import type { Provider } from '../type';
+import type { CustomDetectConfig } from '../../../emitter/RPCMethod';
 
 class FluentRPCMethod extends EthereumRPCMethod {
     sessionKey = 'fluent-isFluent';
     injectFlag = 'fluent';
-    detectProvider = () => detectProvider<Provider>({ injectFlag: this.injectFlag, walletFlag: 'isFluent' });
+    detectProvider = (config: CustomDetectConfig = {}) => detectProvider<Provider>({ injectFlag: this.injectFlag, walletFlag: 'isFluent', ...config });
 
     requestCrossNetworkPermission = () =>
         this.provider!.request({

diff --git a/core/base/src/chains/ethereum/Halo/index.ts b/core/base/src/chains/ethereum/Halo/index.ts
@@ -2,11 +2,12 @@ import Emitter from '../../../emitter';
 import detectProvider from '../../../detect';
 import { EthereumRPCMethod } from '../index';
 import type { Provider } from '../type';
+import type { CustomDetectConfig } from '../../../emitter/RPCMethod';
 
 class HaloRPCMethod extends EthereumRPCMethod {
     sessionKey = 'haloEthereum';
     injectFlag = 'haloEthereum';
-    detectProvider = () => detectProvider<Provider>({ injectFlag: this.injectFlag });
+    detectProvider = (config: CustomDetectConfig = {}) => detectProvider<Provider>({ injectFlag: this.injectFlag, ...config });
 }
 
 export default new Emitter(new HaloRPCMethod());
diff --git a/core/base/src/chains/ethereum/MetaMask/index.ts b/core/base/src/chains/ethereum/MetaMask/index.ts
@@ -2,10 +2,12 @@ import Emitter from '../../../emitter';
 import detectProvider from '../../../detect';
 import { EthereumRPCMethod } from '../index';
 import type { Provider } from '../type';
+import type { CustomDetectConfig } from '../../../emitter/RPCMethod';
 
 class MetaMaskRPCMethod extends EthereumRPCMethod {
     sessionKey = 'ethereum-isMetaMask';
-    detectProvider = () => detectProvider<Provider>({ injectFlag: this.injectFlag, walletFlag: 'isMetaMask', isSingleWalletFlag: true });
+    detectProvider = (config: CustomDetectConfig = {}) =>
+        detectProvider<Provider>({ injectFlag: this.injectFlag, walletFlag: 'isMetaMask', isSingleWalletFlag: true, ...config });
 }
 
 export default new Emitter(new MetaMaskRPCMethod());
diff --git a/core/base/src/chains/ethereum/OKX/index.ts b/core/base/src/chains/ethereum/OKX/index.ts
@@ -2,11 +2,12 @@ import Emitter from '../../../emitter';
 import detectProvider from '../../../detect';
 import { EthereumRPCMethod } from '../index';
 import type { Provider } from '../type';
+import type { CustomDetectConfig } from '../../../emitter/RPCMethod';
 
 class OKXRPCMethod extends EthereumRPCMethod {
     sessionKey = 'okxwallet-isOkxWallet';
     injectFlag = 'okxwallet';
-    detectProvider = () => detectProvider<Provider>({ injectFlag: this.injectFlag, walletFlag: 'isOkxWallet' });
+    detectProvider = (config: CustomDetectConfig = {}) => detectProvider<Provider>({ injectFlag: this.injectFlag, walletFlag: 'isOkxWallet', ...config });
 }
 
 export default new Emitter(new OKXRPCMethod());
diff --git a/core/base/src/chains/ethereum/TokenPocket/index.ts b/core/base/src/chains/ethereum/TokenPocket/index.ts
@@ -2,10 +2,11 @@ import Emitter from '../../../emitter';
 import detectProvider from '../../../detect';
 import { EthereumRPCMethod } from '../index';
 import type { Provider } from '../type';
+import type { CustomDetectConfig } from '../../../emitter/RPCMethod';
 
 class TokenPocketRPCMethod extends EthereumRPCMethod {
     sessionKey = 'ethereum-isTokenPocket';
-    detectProvider = () => detectProvider<Provider>({ injectFlag: this.injectFlag, walletFlag: 'isTokenPocket' });
+    detectProvider = (config: CustomDetectConfig = {}) => detectProvider<Provider>({ injectFlag: this.injectFlag, walletFlag: 'isTokenPocket', ...config });
 }
 
 export default new Emitter(new TokenPocketRPCMethod());
diff --git a/core/base/src/chains/ethereum/index.ts b/core/base/src/chains/ethereum/index.ts
@@ -1,5 +1,5 @@
 import Emitter from '../../emitter';
-import RPCMethod from '../../emitter/RPCMethod';
+import RPCMethod, { type CustomDetectConfig } from '../../emitter/RPCMethod';
 import detectProvider from '../../detect';
 import type { Provider, TransactionParameters, AddChainParameter, WatchAssetParams, TypedSignParams } from './type';
 
@@ -8,7 +8,7 @@ export class EthereumRPCMethod extends RPCMethod {
     injectFlag = 'ethereum';
     declare provider: Provider;
 
-    detectProvider = () => detectProvider<Provider>({ injectFlag: this.injectFlag, defaultWalletFlag: 'isMetaMask' });
+    detectProvider = (config: CustomDetectConfig = {}) => detectProvider<Provider>({ injectFlag: this.injectFlag, defaultWalletFlag: 'isMetaMask', ...config });
 
     requestAccounts = () => this.provider!.request({ method: 'eth_requestAccounts' });
 

diff --git a/core/base/src/detect/index.ts b/core/base/src/detect/index.ts
@@ -11,6 +11,16 @@ export class NotMatchError extends Error {
     }
 }
 
+export interface DetectProviderConfig {
+    silent?: boolean;
+    interval?: number;
+    timeout?: number;
+    walletFlag?: string;
+    isSingleWalletFlag?: boolean;
+    injectFlag: string;
+    defaultWalletFlag?: string;
+}
+
 export default function detectProvider<T extends Object>({
     silent = false,
     interval = 10,
@@ -19,15 +29,7 @@ export default function detectProvider<T extends Object>({
     isSingleWalletFlag,
     injectFlag = 'ethereum',
     defaultWalletFlag,
-}: {
-    silent?: boolean;
-    interval?: number;
-    timeout?: number;
-    walletFlag?: string;
-    isSingleWalletFlag?: boolean;
-    injectFlag: string;
-    defaultWalletFlag?: string;
-}): Promise<T> {
+}: DetectProviderConfig): Promise<T> {
     return new Promise((resolve, reject) => {
         async function handleEthereum() {
             let provider = (await getProvider(injectFlag, interval, timeout)) as T;

diff --git a/core/base/src/emitter/RPCMethod.ts b/core/base/src/emitter/RPCMethod.ts
@@ -1,9 +1,13 @@
+import type { DetectProviderConfig } from '../detect';
+
+export type CustomDetectConfig = Omit<DetectProviderConfig, 'walletFlag' | 'isSingleWalletFlag' | 'injectFlag' | 'defaultWalletFlag'>;
+
 abstract class RPCMethod {
     abstract sessionKey: string;
     abstract injectFlag: string;
     abstract provider: any;
     account!: string;
-    abstract detectProvider(): Promise<any>;
+    abstract detectProvider(config?: CustomDetectConfig): Promise<any>;
     abstract requestAccounts(): Promise<Array<string>>;
     abstract getAccounts(): Promise<Array<string>>;
     abstract getChainId(): Promise<string>;
@@ -21,32 +25,19 @@ abstract class RPCMethod {
     crossNetworkChain?: string;
     retryLimit = 2;
     detectTimeout = 1500;
+    subTimeout = 1000;
+    subInterval = 100;
 
-    detectAndSetProvider = () => {
-        const p = this.detectProvider();
+    detectAndSetProvider = (config?: CustomDetectConfig) => {
+        const p = this.detectProvider(config);
         p.then((provider) => (this.provider = provider)).catch((err) => console.warn(err));
         return p;
     };
 
     subProvider = () => {
-        if (this.provider) return Promise.resolve(this.provider);
-        return new Promise((resolve, reject) => {
-            let hasValue = false;
-            let value = window[this.injectFlag as any] as any;
-            Object.defineProperty(window, this.injectFlag, {
-                get: () => value,
-                set: (provider: any) => {
-                    value = provider;
-                    if (this.provider || hasValue) {
-                        reject();
-                        return;
-                    }
-                    if (value) {
-                        hasValue = true;
-                        this.detectAndSetProvider().then(resolve, reject);
-                    }
-                },
-            });
+        return this.detectAndSetProvider({
+            timeout: this.subTimeout,
+            interval: this.subInterval,
         });
     };