fix: Track dApp url (#237)

* feat: Record last focus url * chore: update version * fix: iframe * chore: update version
OneKeyHQ · Sep 13, 2024 · dd6a7ac · dd6a7ac
1 parent 40fd9b6
commit dd6a7ac
Show file tree

Hide file tree

Showing 33 changed files with 167 additions and 167 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-core",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -29,9 +29,9 @@
     "build-version-info": "node ./scripts/buildVersionInfo.js"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-errors": "2.1.8",
-    "@onekeyfe/cross-inpage-provider-events": "2.1.8",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.8",
+    "@onekeyfe/cross-inpage-provider-errors": "2.1.9",
+    "@onekeyfe/cross-inpage-provider-events": "2.1.9",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.9",
     "events": "^3.3.0",
     "lodash-es": "^4.17.21",
     "ms": "^2.1.3"

diff --git a/packages/desktop/desktop-bridge-injected/package.json b/packages/desktop/desktop-bridge-injected/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/desktop-bridge-injected",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -34,7 +34,7 @@
     "electron": "^17.2.0"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.8",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.8"
+    "@onekeyfe/cross-inpage-provider-core": "2.1.9",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.9"
   }
 }
diff --git a/packages/empty/package.json b/packages/empty/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-empty",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "keywords": [
     "cross-inpage-provider"
   ],

diff --git a/packages/errors/package.json b/packages/errors/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-errors",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "keywords": [
     "cross-inpage-provider"
   ],

diff --git a/packages/events/package.json b/packages/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-events",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "keywords": [
     "cross-inpage-provider"
   ],

diff --git a/packages/example/package.json b/packages/example/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-example",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "private": true,
   "scripts": {
     "postinstall": "patch-package",
@@ -21,17 +21,17 @@
     "@metamask/eth-sig-util": "^7.0.2",
     "@metamask/onboarding": "^1.0.1",
     "@mysten/dapp-kit": "0.13.2",
-    "@onekeyfe/cross-inpage-provider-core": "2.1.8",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.8",
-    "@onekeyfe/onekey-aptos-provider": "2.1.8",
-    "@onekeyfe/onekey-cardano-provider": "2.1.8",
-    "@onekeyfe/onekey-conflux-provider": "2.1.8",
-    "@onekeyfe/onekey-cosmos-provider": "2.1.8",
-    "@onekeyfe/onekey-near-provider": "2.1.8",
-    "@onekeyfe/onekey-solana-provider": "2.1.8",
-    "@onekeyfe/onekey-sui-provider": "2.1.8",
-    "@onekeyfe/onekey-tron-provider": "2.1.8",
-    "@onekeyfe/onekey-webln-provider": "2.1.8",
+    "@onekeyfe/cross-inpage-provider-core": "2.1.9",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.9",
+    "@onekeyfe/onekey-aptos-provider": "2.1.9",
+    "@onekeyfe/onekey-cardano-provider": "2.1.9",
+    "@onekeyfe/onekey-conflux-provider": "2.1.9",
+    "@onekeyfe/onekey-cosmos-provider": "2.1.9",
+    "@onekeyfe/onekey-near-provider": "2.1.9",
+    "@onekeyfe/onekey-solana-provider": "2.1.9",
+    "@onekeyfe/onekey-sui-provider": "2.1.9",
+    "@onekeyfe/onekey-tron-provider": "2.1.9",
+    "@onekeyfe/onekey-webln-provider": "2.1.9",
     "@polkadot/api": "^9.11.3",
     "@polkadot/extension-dapp": "^0.47.5",
     "@radix-ui/react-checkbox": "^1.1.0",

diff --git a/packages/extension/extension-bridge-hosted/package.json b/packages/extension/extension-bridge-hosted/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/extension-bridge-hosted",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,8 +28,8 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.8",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.8",
+    "@onekeyfe/cross-inpage-provider-core": "2.1.9",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.9",
     "uuid": "^8.3.2"
   },
   "devDependencies": {

diff --git a/packages/extension/extension-bridge-injected/package.json b/packages/extension/extension-bridge-injected/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/extension-bridge-injected",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,7 +28,7 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.8",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.8"
+    "@onekeyfe/cross-inpage-provider-core": "2.1.9",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.9"
   }
 }
diff --git a/packages/injected/package.json b/packages/injected/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-injected",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -42,12 +42,12 @@
     "electron": "*"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.8",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.8",
-    "@onekeyfe/desktop-bridge-injected": "2.1.8",
-    "@onekeyfe/extension-bridge-injected": "2.1.8",
-    "@onekeyfe/inpage-providers-hub": "2.1.8",
-    "@onekeyfe/native-bridge-injected": "2.1.8",
+    "@onekeyfe/cross-inpage-provider-core": "2.1.9",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.9",
+    "@onekeyfe/desktop-bridge-injected": "2.1.9",
+    "@onekeyfe/extension-bridge-injected": "2.1.9",
+    "@onekeyfe/inpage-providers-hub": "2.1.9",
+    "@onekeyfe/native-bridge-injected": "2.1.9",
     "buffer": "^6.0.3",
     "crypto-browserify": "^3.12.0"
   }

diff --git a/packages/native/native-bridge-injected/package.json b/packages/native/native-bridge-injected/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/native-bridge-injected",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,7 +28,7 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.8",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.8"
+    "@onekeyfe/cross-inpage-provider-core": "2.1.9",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.9"
   }
 }
diff --git a/packages/providers/inpage-providers-hub/package.json b/packages/providers/inpage-providers-hub/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/inpage-providers-hub",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -30,26 +30,26 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.8",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.8",
-    "@onekeyfe/onekey-algo-provider": "2.1.8",
-    "@onekeyfe/onekey-alph-provider": "2.1.8",
-    "@onekeyfe/onekey-aptos-provider": "2.1.8",
-    "@onekeyfe/onekey-btc-provider": "2.1.8",
-    "@onekeyfe/onekey-cardano-provider": "2.1.8",
-    "@onekeyfe/onekey-conflux-provider": "2.1.8",
-    "@onekeyfe/onekey-cosmos-provider": "2.1.8",
-    "@onekeyfe/onekey-eth-provider": "2.1.8",
-    "@onekeyfe/onekey-nostr-provider": "2.1.8",
-    "@onekeyfe/onekey-polkadot-provider": "2.1.8",
-    "@onekeyfe/onekey-private-external-account-provider": "2.1.8",
-    "@onekeyfe/onekey-private-provider": "2.1.8",
-    "@onekeyfe/onekey-scdo-provider": "2.1.8",
-    "@onekeyfe/onekey-solana-provider": "2.1.8",
-    "@onekeyfe/onekey-sui-provider": "2.1.8",
-    "@onekeyfe/onekey-ton-provider": "2.1.8",
-    "@onekeyfe/onekey-tron-provider": "2.1.8",
-    "@onekeyfe/onekey-webln-provider": "2.1.8",
+    "@onekeyfe/cross-inpage-provider-core": "2.1.9",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.9",
+    "@onekeyfe/onekey-algo-provider": "2.1.9",
+    "@onekeyfe/onekey-alph-provider": "2.1.9",
+    "@onekeyfe/onekey-aptos-provider": "2.1.9",
+    "@onekeyfe/onekey-btc-provider": "2.1.9",
+    "@onekeyfe/onekey-cardano-provider": "2.1.9",
+    "@onekeyfe/onekey-conflux-provider": "2.1.9",
+    "@onekeyfe/onekey-cosmos-provider": "2.1.9",
+    "@onekeyfe/onekey-eth-provider": "2.1.9",
+    "@onekeyfe/onekey-nostr-provider": "2.1.9",
+    "@onekeyfe/onekey-polkadot-provider": "2.1.9",
+    "@onekeyfe/onekey-private-external-account-provider": "2.1.9",
+    "@onekeyfe/onekey-private-provider": "2.1.9",
+    "@onekeyfe/onekey-scdo-provider": "2.1.9",
+    "@onekeyfe/onekey-solana-provider": "2.1.9",
+    "@onekeyfe/onekey-sui-provider": "2.1.9",
+    "@onekeyfe/onekey-ton-provider": "2.1.9",
+    "@onekeyfe/onekey-tron-provider": "2.1.9",
+    "@onekeyfe/onekey-webln-provider": "2.1.9",
     "web3": "^1.7.3"
   },
   "devDependencies": {

diff --git a/packages/providers/inpage-providers-hub/src/detectRiskWebsite/index.ts b/packages/providers/inpage-providers-hub/src/detectRiskWebsite/index.ts
@@ -179,27 +179,27 @@ export async function detectWebsiteRiskLevel() {
 
 export function listenPageFocus() {
   // Notify the frontend of the last focused URL when the function is called
-  try {
+  const notifyToBackground = () => {
+    if (window.top !== window.self) {
+      return;
+    }
     void window.$onekey.$private.request({
       method: "wallet_lastFocusUrl",
     });
+  };
+
+  try {
+    notifyToBackground();
   } catch {
     // ignore
   }
 
   // Add a focus event listener to the window
   window.addEventListener('focus', () => {
     try {
-      if (isInSameOriginIframe()) {
-        return
-      }
-      void window.$onekey.$private.request({
-        method: "wallet_lastFocusUrl",
-      });
+      notifyToBackground();
     } catch (error) {
       console.error('Error notifying frontend of page focus:', error);
     }
   });
 }
-
-
diff --git a/packages/providers/onekey-algo-provider/package.json b/packages/providers/onekey-algo-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-algo-provider",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,9 +28,9 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.8",
-    "@onekeyfe/cross-inpage-provider-errors": "2.1.8",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.8",
-    "@onekeyfe/extension-bridge-injected": "2.1.8"
+    "@onekeyfe/cross-inpage-provider-core": "2.1.9",
+    "@onekeyfe/cross-inpage-provider-errors": "2.1.9",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.9",
+    "@onekeyfe/extension-bridge-injected": "2.1.9"
   }
 }
diff --git a/packages/providers/onekey-alph-provider/package.json b/packages/providers/onekey-alph-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-alph-provider",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -31,9 +31,9 @@
     "@alephium/get-extension-wallet": "^1.5.2",
     "@alephium/walletconnect-provider": "^1.5.2",
     "@alephium/web3": "^1.5.2",
-    "@onekeyfe/cross-inpage-provider-core": "2.1.8",
-    "@onekeyfe/cross-inpage-provider-errors": "2.1.8",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.8",
-    "@onekeyfe/extension-bridge-injected": "2.1.8"
+    "@onekeyfe/cross-inpage-provider-core": "2.1.9",
+    "@onekeyfe/cross-inpage-provider-errors": "2.1.9",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.9",
+    "@onekeyfe/extension-bridge-injected": "2.1.9"
   }
 }
diff --git a/packages/providers/onekey-aptos-provider/package.json b/packages/providers/onekey-aptos-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-aptos-provider",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,10 +28,10 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.8",
-    "@onekeyfe/cross-inpage-provider-errors": "2.1.8",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.8",
-    "@onekeyfe/extension-bridge-injected": "2.1.8",
+    "@onekeyfe/cross-inpage-provider-core": "2.1.9",
+    "@onekeyfe/cross-inpage-provider-errors": "2.1.9",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.9",
+    "@onekeyfe/extension-bridge-injected": "2.1.9",
     "aptos": "^1.3.17",
     "eth-rpc-errors": "^4.0.3"
   }

diff --git a/packages/providers/onekey-btc-provider/package.json b/packages/providers/onekey-btc-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-btc-provider",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,9 +28,9 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.8",
-    "@onekeyfe/cross-inpage-provider-errors": "2.1.8",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.8",
-    "@onekeyfe/extension-bridge-injected": "2.1.8"
+    "@onekeyfe/cross-inpage-provider-core": "2.1.9",
+    "@onekeyfe/cross-inpage-provider-errors": "2.1.9",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.9",
+    "@onekeyfe/extension-bridge-injected": "2.1.9"
   }
 }
diff --git a/packages/providers/onekey-cardano-provider/package.json b/packages/providers/onekey-cardano-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-cardano-provider",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "keywords": [
     "cross-inpage-provider",
     "cardano"
@@ -29,9 +29,9 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.8",
-    "@onekeyfe/cross-inpage-provider-errors": "2.1.8",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.8",
-    "@onekeyfe/extension-bridge-injected": "2.1.8"
+    "@onekeyfe/cross-inpage-provider-core": "2.1.9",
+    "@onekeyfe/cross-inpage-provider-errors": "2.1.9",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.9",
+    "@onekeyfe/extension-bridge-injected": "2.1.9"
   }
 }