@onekeyfe/react-native-chart-webview 3.0.73 → 3.0.75

package/android/src/main/java/com/margelo/nitro/chartwebview/PooledChartWebView.kt

@@ -109,21 +109,28 @@ class PooledChartWebView private constructor(
   // trusted origins we load. allowedOriginRules of setOf("*") would leak the
   // privileged bridge into every cross-origin subframe; here we pass only the
   // offline asset origin and (in online mode) the configured chart origin.
-  private fun registerBridgeForOrigins(origins: Set<String>) {
-    if (outboundBridgeJs.isEmpty() || origins.isEmpty()) return
-    if (!WebViewFeature.isFeatureSupported(WebViewFeature.DOCUMENT_START_SCRIPT)) return
+  private fun registerBridgeForOrigins(origins: Set<String>): Boolean {
+    if (outboundBridgeJs.isEmpty() || origins.isEmpty()) return false
+    if (!WebViewFeature.isFeatureSupported(WebViewFeature.DOCUMENT_START_SCRIPT)) {
+      android.util.Log.e(
+        TAG,
+        "Document-start JavaScript is not supported; refusing to load chart without bridge",
+      )
+      return false
+    }
     // No-op if nothing changed (same script + same origin set already registered).
     if (bridgeScriptHandler != null &&
       registeredBridgeJs == outboundBridgeJs &&
       registeredOrigins == origins
     ) {
-      return
+      return true
     }
     bridgeScriptHandler?.remove()
     bridgeScriptHandler =
       WebViewCompat.addDocumentStartJavaScript(webView, outboundBridgeJs, origins)
     registeredBridgeJs = outboundBridgeJs
     registeredOrigins = origins
+    return true
   }
 
   // The trusted origin set for the current source: the offline asset origin
@@ -575,7 +582,12 @@ class PooledChartWebView private constructor(
     // uses (offline asset origin, plus the online `uri` origin when present) before
     // navigating, so the page boots with the bridge but cross-origin subframes /
     // untrusted pages don't receive it.
-    registerBridgeForOrigins(trustedOriginsFor(uri))
+    if (!registerBridgeForOrigins(trustedOriginsFor(uri))) {
+      (owner ?: warmDriver)?.dispatchError(
+        "Document-start JavaScript is not supported; chart bridge was not installed",
+      )
+      return
+    }
     val target = computeTargetUrl(uri, localBundle, entry, paramsJson) ?: return
     if (target == lastLoadedUrl) return
     lastLoadedUrl = target

package/lib/module/bridge.js

@@ -26,5 +26,6 @@ export const CHART_BRIDGE_JS = `(function(){
   window.addEventListener('message', function(e){
     try { var d = e && e.data; if (d && d.scope === '$private') fwd(d); } catch (err) {}
   });
+  fwd({scope:'$private',method:'onekey_chartBridgeReady',data:{version:1,href:String(window.location && window.location.href || '')}});
 })();`;
 //# sourceMappingURL=bridge.js.map

package/lib/module/bridge.js.map

@@ -1 +1 @@
-{"version":3,"names":["CHART_BRIDGE_JS"],"sourceRoot":"../../src","sources":["bridge.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,eAAe,GAAG;AAC/B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAM","ignoreList":[]}
+{"version":3,"names":["CHART_BRIDGE_JS"],"sourceRoot":"../../src","sources":["bridge.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,eAAe,GAAG;AAC/B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAM","ignoreList":[]}

package/lib/typescript/src/bridge.d.ts

@@ -1,2 +1,2 @@
-export declare const CHART_BRIDGE_JS = "(function(){\n  if (window.__onekeyChartBridge) return; window.__onekeyChartBridge = true;\n  var fwd = function(m){\n    try { window.__chartNativePost(typeof m === 'string' ? m : JSON.stringify(m)); } catch (e) {}\n  };\n  window.$onekey = window.$onekey || {};\n  window.$onekey.$private = window.$onekey.$private || {};\n  window.$onekey.$private.request = function(m){ fwd(m); };\n  window.ReactNativeWebView = window.ReactNativeWebView || {};\n  window.ReactNativeWebView.postMessage = function(s){ fwd(String(s)); };\n  window.addEventListener('message', function(e){\n    try { var d = e && e.data; if (d && d.scope === '$private') fwd(d); } catch (err) {}\n  });\n})();";
+export declare const CHART_BRIDGE_JS = "(function(){\n  if (window.__onekeyChartBridge) return; window.__onekeyChartBridge = true;\n  var fwd = function(m){\n    try { window.__chartNativePost(typeof m === 'string' ? m : JSON.stringify(m)); } catch (e) {}\n  };\n  window.$onekey = window.$onekey || {};\n  window.$onekey.$private = window.$onekey.$private || {};\n  window.$onekey.$private.request = function(m){ fwd(m); };\n  window.ReactNativeWebView = window.ReactNativeWebView || {};\n  window.ReactNativeWebView.postMessage = function(s){ fwd(String(s)); };\n  window.addEventListener('message', function(e){\n    try { var d = e && e.data; if (d && d.scope === '$private') fwd(d); } catch (err) {}\n  });\n  fwd({scope:'$private',method:'onekey_chartBridgeReady',data:{version:1,href:String(window.location && window.location.href || '')}});\n})();";
 //# sourceMappingURL=bridge.d.ts.map

package/lib/typescript/src/bridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["../../../src/bridge.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,eAAe,2qBAatB,CAAC"}
+{"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["../../../src/bridge.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,eAAe,ozBActB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-chart-webview",
-  "version": "3.0.73",
+  "version": "3.0.75",
   "description": "react-native-chart-webview",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/bridge.ts

@@ -24,4 +24,5 @@ export const CHART_BRIDGE_JS = `(function(){
   window.addEventListener('message', function(e){
     try { var d = e && e.data; if (d && d.scope === '$private') fwd(d); } catch (err) {}
   });
+  fwd({scope:'$private',method:'onekey_chartBridgeReady',data:{version:1,href:String(window.location && window.location.href || '')}});
 })();`;