feat(dapp-browser-ens)_: integrate browserBridge to BrowserLayout

friofry · friofry · commit 685396040997 · 2025-10-31T16:42:56.000+04:00
fixes #19141
diff --git a/ui/StatusQ/src/StatusQ/Core/Utils/SubscriptionBroker.qml b/ui/StatusQ/src/StatusQ/Core/Utils/SubscriptionBroker.qml
@@ -126,6 +126,14 @@ QtObject {
                 }
             }
 
+            const onDestructionHandler = () => {
+                if(!d.managedSubscriptions.hasOwnProperty(subscriptionId))
+                    return
+                
+                root.unsubscribed.disconnect(onUnsubscribedHandler) //object is destroyed, no need to listen to the signal anymore
+                unsubscribe(subscriptionId)
+            }
+
             const onUnsubscribedHandler = (subscriptionId) => {
                 if(subscriptionId !== subscription.subscriptionId)
                     return
@@ -135,14 +143,6 @@ QtObject {
                 subscription.topicChanged.disconnect(onTopicChangeHandler)
             }
 
-            const onDestructionHandler = () => {
-                if(!d.managedSubscriptions.hasOwnProperty(subscriptionId))
-                    return
-                
-                root.unsubscribed.disconnect(onUnsubscribedHandler) //object is destroyed, no need to listen to the signal anymore
-                unsubscribe(subscriptionId)
-            }
-
             subscription.Component.onDestruction.connect(onDestructionHandler)
             subscription.isReadyChanged.connect(onReadyChangeHandler)
             subscription.topicChanged.connect(onTopicChangeHandler)
diff --git a/ui/StatusQ/src/StatusQ/Core/Utils/SubscriptionBrokerCommunities.qml b/ui/StatusQ/src/StatusQ/Core/Utils/SubscriptionBrokerCommunities.qml
@@ -116,6 +116,14 @@ QtObject {
                 }
             }
 
+            const onDestructionHandler = () => {
+                if(!d.managedSubscriptions.hasOwnProperty(subscriptionId))
+                    return
+                
+                root.unsubscribed.disconnect(onUnsubscribedHandler) //object is destroyed, no need to listen to the signal anymore
+                unsubscribe(subscriptionId)
+            }
+
             const onUnsubscribedHandler = (subscriptionId) => {
                 if(subscriptionId !== subscription.subscriptionId)
                     return
@@ -125,14 +133,6 @@ QtObject {
                 subscription.topicChanged.disconnect(onTopicChangeHandler)
             }
 
-            const onDestructionHandler = () => {
-                if(!d.managedSubscriptions.hasOwnProperty(subscriptionId))
-                    return
-                
-                root.unsubscribed.disconnect(onUnsubscribedHandler) //object is destroyed, no need to listen to the signal anymore
-                unsubscribe(subscriptionId)
-            }
-
             subscription.Component.onDestruction.connect(onDestructionHandler)
             subscription.isReadyChanged.connect(onReadyChangeHandler)
             subscription.topicChanged.connect(onTopicChangeHandler)
diff --git a/ui/app/AppLayouts/Browser/BrowserLayout.qml b/ui/app/AppLayouts/Browser/BrowserLayout.qml
@@ -18,6 +18,7 @@ import shared.stores.send
 
 import AppLayouts.Browser.stores as BrowserStores
 
+import "provider/qml"
 import "popups"
 import "controls"
 import "views"
@@ -41,6 +42,7 @@ StatusSectionLayout {
     required property BrowserStores.DownloadsStore downloadsStore
     required property BrowserStores.BrowserRootStore browserRootStore
     required property BrowserStores.BrowserWalletStore browserWalletStore
+    required property var connectorController
 
     signal sendToRecipientRequested(string address)
 
@@ -49,6 +51,22 @@ StatusSectionLayout {
         tab.url = _internal.determineRealURL(url)
     }
 
+    ConnectorBridge {
+        id: connectorBridge
+
+        userUID: root.userUID
+        connectorController: root.connectorController
+        defaultAccountAddress: root.browserWalletStore.dappBrowserAccount.address
+        accountsModel: root.browserWalletStore.accounts
+        httpUserAgent: {
+            if (localAccountSensitiveSettings.compatibilityMode) {
+                // Google doesn't let you connect if the user agent is Chrome-ish and doesn't satisfy some sort of hidden requirement
+                return "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/139.0.0.0 Safari/537.36"
+            }
+            return ""
+        }
+    }
+
     QtObject {
         id: _internal
 
@@ -91,32 +109,13 @@ StatusSectionLayout {
             standardButtons: Dialog.Ok
         }
 
-        property QtObject defaultProfile: WebEngineProfile {
-            storageName: "Profile_%1".arg(root.userUID)
-            offTheRecord: false
-            httpUserAgent: {
-                if (localAccountSensitiveSettings.compatibilityMode) {
-                    // Google doesn't let you connect if the user agent is Chrome-ish and doesn't satisfy some sort of hidden requirement
-                    return "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/139.0.0.0 Safari/537.36"
-                }
-                return ""
-            }
-        }
-
-        property QtObject otrProfile: WebEngineProfile {
-            storageName: "IncognitoProfile_%1".arg(root.userUID)
-            offTheRecord: true
-            persistentCookiesPolicy: WebEngineProfile.NoPersistentCookies
-            httpUserAgent: _internal.defaultProfile.httpUserAgent
-        }
-
         function addNewDownloadTab() {
-            tabs.createDownloadTab(tabs.count !== 0 ? currentWebView.profile : defaultProfile);
+            tabs.createDownloadTab(tabs.count !== 0 ? currentWebView.profile : connectorBridge.defaultProfile);
             tabs.currentIndex = tabs.count - 1;
         }
 
         function addNewTab() {
-            var tab = tabs.createEmptyTab(tabs.count !== 0 ? currentWebView.profile : defaultProfile);
+            var tab = tabs.createEmptyTab(tabs.count !== 0 ? currentWebView.profile : connectorBridge.defaultProfile);
             browserHeader.addressBar.forceActiveFocus();
             browserHeader.addressBar.selectAll();
 
@@ -218,9 +217,9 @@ StatusSectionLayout {
             }
             onOpenNewTabTriggered: _internal.addNewTab()
             Component.onCompleted: {
-                _internal.defaultProfile.downloadRequested.connect(_internal.onDownloadRequested);
-                _internal.otrProfile.downloadRequested.connect(_internal.onDownloadRequested);
-                var tab = createEmptyTab(_internal.defaultProfile, true);
+                connectorBridge.defaultProfile.downloadRequested.connect(_internal.onDownloadRequested);
+                connectorBridge.otrProfile.downloadRequested.connect(_internal.onDownloadRequested);
+                var tab = createEmptyTab(connectorBridge.defaultProfile, true);
                 // For Devs: Uncomment the next line if you want to use the simpledapp on first load
                 // tab.url = root.browserRootStore.determineRealURL("https://simpledapp.eth");
             }
@@ -312,11 +311,11 @@ StatusSectionLayout {
             id: settingsMenu
             x: parent.width - width
             y: browserHeader.y + browserHeader.height
-            isIncognito: _internal.currentWebView && _internal.currentWebView.profile === _internal.otrProfile
+            isIncognito: _internal.currentWebView && _internal.currentWebView.profile === connectorBridge.otrProfile
             onAddNewTab: _internal.addNewTab()
             onGoIncognito: function (checked) {
                 if (_internal.currentWebView) {
-                    _internal.currentWebView.profile = checked ? _internal.otrProfile : _internal.defaultProfile;
+                    _internal.currentWebView.profile = checked ? connectorBridge.otrProfile : connectorBridge.defaultProfile;
                 }
             }
             onZoomIn: {
@@ -455,7 +454,7 @@ StatusSectionLayout {
             bookmarksStore: root.bookmarksStore
             downloadsStore: root.downloadsStore
             currentWebView: _internal.currentWebView
-            webChannel: channel
+            webChannel: connectorBridge.webChannel
             findBarComp: findBar
             favMenu: favoriteMenu
             addFavModal: addFavoriteModal
@@ -542,6 +541,11 @@ StatusSectionLayout {
         function onUrlChanged() {
             browserHeader.addressBar.text = root.browserRootStore.obtainAddress(_internal.currentWebView.url)
             root.browserRootStore.currentTabConnected = false // TODO: Will be handled by connector
+            
+            // Update ConnectorBridge with current dApp metadata
+            if (_internal.currentWebView && _internal.currentWebView.url) {
+                connectorBridge.updateDAppUrl(_internal.currentWebView.url, _internal.currentWebView.title)
+            }
         }
     }
 
diff --git a/ui/app/AppLayouts/Browser/provider/qml/ConnectorBridge.qml b/ui/app/AppLayouts/Browser/provider/qml/ConnectorBridge.qml
@@ -5,16 +5,15 @@ import QtWebChannel
 
 import StatusQ.Core.Theme
 import utils
-
 import "Utils.js" as Utils
 
 /**
  * ConnectorBridge
- * 
+ *
  * Simplified connector infrastructure for BrowserLayout.
- * Provides WebEngine profiles with script injection, WebChannel, 
+ * Provides WebEngine profiles with script injection, WebChannel,
  * ConnectorManager, and direct connection to Nim backend.
- * 
+ *
  * This component bridges the Browser UI with the Connector backend system.
  */
 Item {
@@ -29,15 +28,15 @@ Item {
     readonly property alias webChannel: channel
     readonly property alias defaultProfile: defaultProfile
     readonly property alias otrProfile: otrProfile
-    
+
     readonly property alias manager: connectorManager
-    
+
     property alias dappUrl: connectorManager.dappUrl
     property alias dappOrigin: connectorManager.dappOrigin
     property alias dappName: connectorManager.dappName
     property alias dappIconUrl: connectorManager.dappIconUrl
     property alias clientId: connectorManager.clientId
-    
+
     function hasWalletConnected(hostname, address) {
         if (!connectorController) return false
 
@@ -59,10 +58,10 @@ Item {
         if (!connectorController) return false
         return connectorController.disconnect(hostname)
     }
-    
+
     function updateDAppUrl(url, name) {
         if (!url) return
-        
+
         const urlStr = url.toString()
         connectorManager.dappUrl = urlStr
         connectorManager.dappOrigin = Utils.normalizeOrigin(urlStr)
@@ -107,7 +106,7 @@ Item {
     ConnectorManager {
         id: connectorManager
         connectorController: root.connectorController  // (shared_modules/connector/controller.nim)
-        
+
         dappUrl: ""
         dappOrigin: ""
         dappName: ""
@@ -134,16 +133,14 @@ Item {
     Eip1193ProviderAdapter {
         id: eip1193ProviderAdapter
         WebChannel.id: "ethereumProvider"
-        
+
         chainId: "0x" + connectorManager.dappChainId.toString(16)  // Convert decimal to hex
         networkVersion: connectorManager.dappChainId.toString()
         selectedAddress: connectorManager.accounts.length > 0 ? connectorManager.accounts[0] : ""
         accounts: connectorManager.accounts
         connected: connectorManager.connected
 
-        function request(args) {
-            return connectorManager.request(args)
-        }
+        onRequestInternal: (args) => connectorManager.request(args)
     }
 }
 
diff --git a/ui/app/AppLayouts/Browser/provider/qml/Eip1193ProviderAdapter.qml b/ui/app/AppLayouts/Browser/provider/qml/Eip1193ProviderAdapter.qml
@@ -2,41 +2,32 @@ import QtQuick 2.15
 
 QtObject {
     id: root
-    
-    // ============================================================================
-    // EIP-1193 PUBLIC PROPERTIES (exposed to JS via WebChannel)
-    // ============================================================================
+
+    // EIP-1193 PUBLIC PROPERTIES
     readonly property bool isStatus: true
     readonly property bool isMetaMask: false
     property string chainId: "0x1"  // hex format for EIP-1193
     property string networkVersion: "1"  // decimal format (deprecated but used by some dApps)
     property string selectedAddress: ""  // current active address
     property var accounts: []
     property bool connected: false
-    
-    // ============================================================================
+
     // EIP-1193 EVENTS (for WebChannel)
-    // ============================================================================
-    
     signal connectEvent(var info)
     signal disconnectEvent(var error)
     signal accountsChangedEvent(var accounts)
     signal chainChangedEvent(string chainId)
     signal messageEvent(var message)
     signal requestCompletedEvent(var payload)
+    signal requestInternal(var args)
 
     // Internal
     signal providerStateChanged()  // re-read State
-    
-    // ============================================================================
+
     // EIP-1193 REQUEST METHOD STUB
-    // ============================================================================
     function request(args) {
-        console.error("[Eip1193ProviderAdapter] request() not injected - should be overridden by ConnectorBridge")
-        return JSON.stringify({
-            jsonrpc: "2.0",
-            id: args && args.requestId || 0,
-            error: { code: -32603, message: "Request function not properly injected" }
-        })
+        requestInternal(args)
+        // Return immediately - async response comes via requestCompletedEvent
+        return { jsonrpc: "2.0", id: args.requestId || 0, result: null }
     }
 }
diff --git a/ui/app/AppLayouts/Browser/provider/qml/Utils.js b/ui/app/AppLayouts/Browser/provider/qml/Utils.js
@@ -1,3 +1,5 @@
+.pragma library
+
 function accountsDidChange(oldAccounts, newAccounts) {
     const a = oldAccounts || []
     const b = newAccounts || []
@@ -55,6 +57,6 @@ function extractDomainName(urlString) {
         return urlObj.hostname || "Unknown dApp"
     } catch (e) {
         return "Unknown dApp"
-    }
+}
 }
 
diff --git a/ui/app/AppLayouts/Browser/provider/qml/qmldir b/ui/app/AppLayouts/Browser/provider/qml/qmldir
@@ -0,0 +1,4 @@
+ConnectorBridge 1.0 ConnectorBridge.qml
+ConnectorManager 1.0 ConnectorManager.qml
+Eip1193ProviderAdapter 1.0 Eip1193ProviderAdapter.qml
+
diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml
