Merge pull request #21 from Conflux-Chain/fix/detect-wallet

fix: detect error
Conflux-Chain · Nov 12, 2024 · 182a005 · 182a005
2 parents 5163ca1 + 24375a2
commit 182a005
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 18 deletions.
diff --git a/core/base/src/chains/conflux/index.ts b/core/base/src/chains/conflux/index.ts
@@ -7,6 +7,7 @@ export class ConfluxRPCMethod extends RPCMethod {
     sessionKey = 'conflux';
     injectFlag = 'conflux';
     declare provider: Provider;
+    subTimeout = 5000;
 
     detectProvider = (config: CustomDetectConfig = {}) => {
         const p = detectProvider<Provider>({ injectFlag: this.injectFlag, ...config });

diff --git a/core/base/src/chains/ethereum/Fluent/index.ts b/core/base/src/chains/ethereum/Fluent/index.ts
@@ -7,6 +7,7 @@ import type { CustomDetectConfig } from '../../../emitter/RPCMethod';
 class FluentRPCMethod extends EthereumRPCMethod {
     sessionKey = 'fluent-isFluent';
     injectFlag = 'fluent';
+    subTimeout = 5000;
     detectProvider = (config: CustomDetectConfig = {}) => detectProvider<Provider>({ injectFlag: this.injectFlag, walletFlag: 'isFluent', ...config });
 
     requestCrossNetworkPermission = () =>

diff --git a/core/base/src/detect/index.ts b/core/base/src/detect/index.ts
@@ -1,16 +1,3 @@
-export class NotDetectedError extends Error {
-    constructor(public message: string) {
-        super(message);
-        this.message = message;
-    }
-}
-export class NotMatchError extends Error {
-    constructor(public message: string) {
-        super(message);
-        this.message = message;
-    }
-}
-
 export interface DetectProviderConfig {
     silent?: boolean;
     interval?: number;
@@ -35,7 +22,7 @@ export default function detectProvider<T extends Object>({
             let provider = (await getProvider(injectFlag, interval, timeout)) as T;
 
             if (!provider) {
-                return reject(new NotDetectedError(`Unable to detect window.${injectFlag}.`));
+                return reject(`Unable to detect window.${injectFlag}.`);
             }
 
             let mustBeSpecifiedWallet = false;
@@ -63,7 +50,7 @@ export default function detectProvider<T extends Object>({
             } else {
                 const message = `Non-${walletFlag} Wallet detected.`;
                 !silent && console.error('detect-provider:', message);
-                reject(new NotMatchError(message));
+                reject(message);
             }
         }
         handleEthereum();

diff --git a/core/base/src/emitter/RPCMethod.ts b/core/base/src/emitter/RPCMethod.ts
@@ -30,11 +30,12 @@ abstract class RPCMethod {
 
     detectAndSetProvider = (config?: CustomDetectConfig) => {
         const p = this.detectProvider(config);
-        p.then((provider) => (this.provider = provider)).catch((err) => console.warn(err));
+        p.then((provider) => (this.provider = provider)).catch((err) => console.warn(err, Date.now()));
         return p;
     };
 
     subProvider = () => {
+        if (this.provider) return Promise.resolve(this.provider);
         return this.detectAndSetProvider({
             timeout: this.subTimeout,
             interval: this.subInterval,

diff --git a/core/base/src/emitter/index.ts b/core/base/src/emitter/index.ts
@@ -1,7 +1,6 @@
 import mitt from 'mitt';
 import Unit from '../unit';
 import type RPCMethod from './RPCMethod';
-import { NotDetectedError } from '../detect';
 
 export type State = {
     status: 'in-detecting' | 'not-installed' | 'not-active' | 'in-activating' | 'active';
@@ -42,7 +41,7 @@ class Emitter<T extends RPCMethod> {
             .catch((e) => {
                 this.handleStatusChanged('not-installed');
                 this.resolveDetect();
-                if (e instanceof NotDetectedError) {
+                if (typeof e === 'string' && e.startsWith('Unable to detect window.')) {
                     this.RPCMethod.subProvider().then(this.setProvider);
                 }
             });