@tronweb3/tronwallet-adapter-tokenpocket 1.0.5 → 1.0.7

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@tronweb3/tronwallet-adapter-tokenpocket",
-  "version": "1.0.5",
-  "description": "Wallet adapter for TokenPocket Wallet app.",
+  "version": "1.0.7",
+  "description": "Wallet adapter for TokenPocket Extension and App wallet.",
   "keywords": [
     "TRON",
     "TronWeb",
     "TokenPocket"
   ],
-  "author": "web3-geek",
+  "author": "tronweb3",
   "repository": {
     "type": "git",
-    "url": "https://github.com/web3-geek/tronwallet-adapter"
+    "url": "https://github.com/tronweb3/tronwallet-adapter"
   },
   "license": "MIT",
   "type": "module",
@@ -36,8 +36,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@tronweb3/tronwallet-abstract-adapter": "^1.1.8",
-    "@tronweb3/tronwallet-adapter-tronlink": "^1.1.11"
+    "@tronweb3/tronwallet-abstract-adapter": "^1.1.9",
+    "@tronweb3/tronwallet-adapter-tronlink": "^1.1.12"
   },
   "devDependencies": {
     "@testing-library/dom": "^8.20.0",

package/src/adapter.ts

@@ -8,6 +8,9 @@ import {
     WalletDisconnectedError,
     WalletSignTransactionError,
     WalletGetNetworkError,
+    WalletConnectionError,
+    isInMobileBrowser,
+    WalletError,
 } from '@tronweb3/tronwallet-abstract-adapter';
 import type {
     Transaction,
@@ -138,13 +141,23 @@ export class TokenPocketAdapter extends Adapter {
             if (!this._wallet) return;
             this._connecting = true;
             const wallet = this._wallet as TokenPocketWallet;
+            try {
+                const res = await wallet.tron.request({ method: 'eth_requestAccounts' });
+                if (!res?.[0]) {
+                    throw new WalletConnectionError('Request connect error.');
+                }
+                const address = res[0];
 
-            const res = await wallet.tron.request({ method: 'eth_requestAccounts' });
-            const address = res[0];
-
-            this.setAddress(address);
-            this.setState(AdapterState.Connected);
-            this.emit('connect', this.address || '');
+                this.setAddress(address);
+                this.setState(AdapterState.Connected);
+                this.emit('connect', this.address || '');
+            } catch (e: any) {
+                if (e instanceof WalletError) {
+                    throw e;
+                } else {
+                    throw new WalletConnectionError(e?.message, e);
+                }
+            }
         } catch (error: any) {
             this.emit('error', error);
             throw error;
@@ -168,10 +181,12 @@ export class TokenPocketAdapter extends Adapter {
             try {
                 return await wallet.tronWeb.trx.sign(transaction, privateKey);
             } catch (error: any) {
-                if (error instanceof Error) {
+                if (error instanceof Error || (typeof error === 'object' && error.message)) {
                     throw new WalletSignTransactionError(error.message, error);
-                } else {
+                } else if (typeof error === 'string') {
                     throw new WalletSignTransactionError(error, new Error(error));
+                } else {
+                    throw new WalletSignTransactionError('Unknown error', error);
                 }
             }
         } catch (error: any) {
@@ -190,10 +205,12 @@ export class TokenPocketAdapter extends Adapter {
             try {
                 return await wallet.tronWeb.trx.multiSign(transaction, privateKey, permissionId);
             } catch (error: any) {
-                if (error instanceof Error) {
+                if (error instanceof Error || (typeof error === 'object' && error.message)) {
                     throw new WalletSignTransactionError(error.message, error);
-                } else {
+                } else if (typeof error === 'string') {
                     throw new WalletSignTransactionError(error, new Error(error));
+                } else {
+                    throw new WalletSignTransactionError('Unknown error', error);
                 }
             }
         } catch (error: any) {
@@ -208,10 +225,12 @@ export class TokenPocketAdapter extends Adapter {
             try {
                 return await wallet.tronWeb.trx.signMessageV2(message, privateKey);
             } catch (error: any) {
-                if (error instanceof Error) {
+                if (error instanceof Error || (typeof error === 'object' && error.message)) {
                     throw new WalletSignMessageError(error.message, error);
-                } else {
+                } else if (typeof error === 'string') {
                     throw new WalletSignMessageError(error, new Error(error));
+                } else {
+                    throw new WalletSignMessageError('Unknown error', error);
                 }
             }
         } catch (error: any) {
@@ -246,7 +265,7 @@ export class TokenPocketAdapter extends Adapter {
         let times = 0;
         const maxTimes = Math.floor(this.config.checkTimeout / 200);
         const check = () => {
-            if (window?.tronWeb?.ready) {
+            if (isInMobileBrowser() ? window.tronWeb?.ready : this._wallet?.ready) {
                 this.checkReadyInterval && clearInterval(this.checkReadyInterval);
                 this.checkReadyInterval = null;
                 this._updateWallet();
@@ -299,14 +318,21 @@ export class TokenPocketAdapter extends Adapter {
         let state = this.state;
         let address = this.address;
         if (supportTokenPocket()) {
-            this._wallet = {
-                tron: window.tokenpocket?.tron,
-                ready: window.tronWeb?.ready,
-                tronWeb: window.tokenpocket?.tronWeb,
-            } as TokenPocketWallet;
+            const tron = window.tokenpocket?.tron as Tron;
+            this._wallet = isInMobileBrowser()
+                ? ({
+                      tron,
+                      ready: window.tronWeb?.ready,
+                      tronWeb: window.tokenpocket?.tronWeb,
+                  } as TokenPocketWallet)
+                : {
+                      tron,
+                      ready: !!(tron?.tronWeb as TronWeb).defaultAddress?.base58 || false,
+                      tronWeb: tron?.tronWeb as TronWeb,
+                  };
             address = this._wallet.tronWeb.defaultAddress?.base58 || null;
-            state = window.tronWeb?.ready ? AdapterState.Connected : AdapterState.Disconnect;
-            if (!window.tronWeb?.ready) {
+            state = address ? AdapterState.Connected : AdapterState.Disconnect;
+            if (!address) {
                 this.checkForWalletReady();
             }
         } else {