@tronweb3/tronwallet-adapter-tokenpocket 1.0.5 → 1.0.6

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.6",
+  "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,8 @@ import {
     WalletDisconnectedError,
     WalletSignTransactionError,
     WalletGetNetworkError,
+    WalletConnectionError,
+    isInMobileBrowser,
 } from '@tronweb3/tronwallet-abstract-adapter';
 import type {
     Transaction,
@@ -18,7 +20,11 @@ import type {
     TronWeb,
 } from '@tronweb3/tronwallet-abstract-adapter';
 import { getNetworkInfoByTronWeb } from '@tronweb3/tronwallet-adapter-tronlink';
-import type { Tron } from '@tronweb3/tronwallet-adapter-tronlink';
+import type {
+    Tron,
+    TronAccountsChangedCallback,
+    TronChainChangedCallback,
+} from '@tronweb3/tronwallet-adapter-tronlink';
 import { openTokenPocket, supportTokenPocket } from './utils.js';
 
 export interface TokenPocketAdapterConfig extends BaseAdapterConfig {
@@ -140,10 +146,14 @@ export class TokenPocketAdapter extends Adapter {
             const wallet = this._wallet as TokenPocketWallet;
 
             const res = await wallet.tron.request({ method: 'eth_requestAccounts' });
+            if (!res?.[0]) {
+                throw new WalletConnectionError('Request connect error.');
+            }
             const address = res[0];
 
             this.setAddress(address);
             this.setState(AdapterState.Connected);
+            this.listenTronEvent();
             this.emit('connect', this.address || '');
         } catch (error: any) {
             this.emit('error', error);
@@ -220,6 +230,48 @@ export class TokenPocketAdapter extends Adapter {
         }
     }
 
+    private onChainChanged: TronChainChangedCallback = (data) => {
+        this.emit('chainChanged', data);
+    };
+    private onAccountsChanged: TronAccountsChangedCallback = () => {
+        const preAddr = this.address || '';
+        const curAddr = (this._wallet?.tronWeb && this._wallet?.tronWeb.defaultAddress?.base58) || '';
+        if (!curAddr) {
+            this.setAddress(null);
+            this.setState(AdapterState.Disconnect);
+        } else {
+            const address = curAddr as string;
+            this.setAddress(address);
+            this.setState(AdapterState.Connected);
+        }
+        this.emit('accountsChanged', this.address || '', preAddr);
+        if (!preAddr && this.address) {
+            this.emit('connect', this.address);
+        } else if (preAddr && !this.address) {
+            this.emit('disconnect');
+        }
+    };
+    private listenTronEvent() {
+        if (isInMobileBrowser()) {
+            return;
+        }
+        this.stopListenTronEvent();
+        const wallet = this._wallet;
+        if (!wallet || !wallet.tron) return;
+        wallet.tron.on('chainChanged', this.onChainChanged);
+        wallet.tron.on('accountsChanged', this.onAccountsChanged);
+    }
+
+    private stopListenTronEvent() {
+        if (isInMobileBrowser()) {
+            return;
+        }
+        const wallet = this._wallet;
+        if (!wallet || !wallet.tron) return;
+        wallet.tron.removeListener('chainChanged', this.onChainChanged);
+        wallet.tron.removeListener('accountsChanged', this.onAccountsChanged);
+    }
+
     private async checkAndGetWallet() {
         this.checkIfOpenApp();
         await this._checkWallet();
@@ -246,7 +298,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 +351,22 @@ 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;
+            this.listenTronEvent();
+            if (!address) {
                 this.checkForWalletReady();
             }
         } else {