@datadog/mobile-react-native-webview 2.13.2 → 2.14.0

package/android/build.gradle

@@ -134,7 +134,13 @@ android {
     }
 
     test {
-      java.srcDir("src/test/kotlin")
+      java.srcDir('src/test/kotlin')
+
+      if (isNewArchitectureEnabled()) {
+        java.srcDirs += ['src/testNewArch/kotlin']
+      } else {
+        java.srcDirs += ['src/testOldArch/kotlin']
+      }
     }
   }
 
@@ -208,6 +214,7 @@ dependencies {
   testImplementation "com.github.xgouchet.Elmyr:jvm:1.3.1"
   testImplementation "org.mockito.kotlin:mockito-kotlin:5.1.0"
   testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+  testImplementation 'org.json:json:20160810'
 
   detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.23.8"
   detektPlugins "io.gitlab.arturbosch.detekt:detekt-rules-libraries:1.23.8"

package/android/src/newarch/com/datadog/reactnative/webview/DdSdkReactNativeWebViewManager.kt

@@ -0,0 +1,125 @@
+/*
+* Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+* This product includes software developed at Datadog (https://www.datadoghq.com/).
+* Copyright 2016-Present Datadog, Inc.
+*/
+
+package com.datadog.reactnative.webview
+
+import android.annotation.SuppressLint
+import com.datadog.android.api.SdkCore
+import com.datadog.android.webview.WebViewTracking
+import com.datadog.reactnative.DatadogSDKWrapperStorage
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.uimanager.ThemedReactContext
+import com.reactnativecommunity.webview.RNCWebView
+import com.reactnativecommunity.webview.RNCWebViewClient
+import com.reactnativecommunity.webview.RNCWebViewManager
+import com.reactnativecommunity.webview.RNCWebViewWrapper
+import org.json.JSONArray
+
+/**
+ * The entry point to use Datadog auto-instrumented WebView feature.
+ */
+class DdSdkReactNativeWebViewManager(
+    private val reactContext: ReactContext
+) : RNCWebViewManager() {
+    // The name used to reference this custom View from React Native.
+    override fun getName(): String {
+        return VIEW_NAME
+    }
+
+    /**
+     * The instance of Datadog SDK Core.
+     */
+    @Volatile private var _datadogCore: SdkCore? = null
+    val datadogCore: SdkCore?
+        get() = _datadogCore
+
+    init {
+        DatadogSDKWrapperStorage.addOnInitializedListener { core ->
+            _datadogCore = core
+        }
+    }
+
+    /**
+     * Intercepts the WebView wrapper instance before it is returned and ensures that
+     * JavaScript is enabled on the underlying WebView. JavaScript must be enabled
+     * for Datadog WebView tracking to function correctly.
+     */
+    @SuppressLint("SetJavaScriptEnabled")
+    override fun createViewInstance(context: ThemedReactContext): RNCWebViewWrapper {
+        val viewInstance = super.createViewInstance(context)
+        viewInstance.webView.settings.javaScriptEnabled = true
+        return viewInstance
+    }
+
+    /**
+     * Intercepts the JavaScript injected before the WebView loads.
+     *
+     * In the New Architecture, WebView props from React Native are ignored,
+     * so this callback is the only reliable place to extract the
+     * `// #allowedHosts=<JSON>` configuration and apply Datadog WebView tracking.
+     */
+    override fun setInjectedJavaScriptBeforeContentLoaded(
+        view: RNCWebViewWrapper?,
+        value: String?
+    ) {
+        val allowedHosts = value?.let { extractAllowedHosts(it) }
+        val webView = view?.webView
+
+        if (allowedHosts != null && webView != null) {
+            configureWebViewTracking(webView, allowedHosts)
+        }
+
+        super.setInjectedJavaScriptBeforeContentLoaded(view, value)
+    }
+
+    private fun configureWebViewTracking(webView: RNCWebView, allowedHosts: List<String>) {
+        val datadogCore = _datadogCore
+        if (datadogCore != null) {
+            WebViewTracking.enable(
+                webView,
+                allowedHosts = allowedHosts,
+                sdkCore = datadogCore
+            )
+        } else {
+            DatadogSDKWrapperStorage.addOnInitializedListener { core ->
+                reactContext.runOnUiQueueThread {
+                    WebViewTracking.enable(
+                        webView,
+                        allowedHosts = allowedHosts,
+                        sdkCore = core
+                    )
+                }
+            }
+        }
+    }
+
+    override fun addEventEmitters(
+        reactContext: ThemedReactContext,
+        view: RNCWebViewWrapper
+    ) {
+        view.webView.webViewClient = RNCWebViewClient()
+    }
+
+    companion object {
+        // The name used to reference this custom View from React Native.
+        const val VIEW_NAME = "DdReactNativeWebView"
+
+        private fun extractAllowedHosts(input: String): List<String>? {
+            // Regex that captures everything after "// #allowedHosts="
+            val regex = Regex("""//\s*#allowedHosts\s*=\s*(.+)""")
+
+            val match = regex.find(input) ?: return null
+            val jsonString = match.groupValues[1].trim()
+
+            return try {
+                val jsonArray = JSONArray(jsonString)
+                (0 until jsonArray.length()).map { jsonArray.getString(it) }
+            } catch (e: Exception) {
+                null
+            }
+        }
+    }
+}

package/android/src/newarch/com/datadog/reactnative/webview/DdSdkReactNativeWebViewPackage.kt

@@ -3,7 +3,6 @@
 * This product includes software developed at Datadog (https://www.datadoghq.com/).
 * Copyright 2016-Present Datadog, Inc.
 */
-
 package com.datadog.reactnative.webview
 
 import com.facebook.react.TurboReactPackage
@@ -12,17 +11,18 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.model.ReactModuleInfo
 import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
-import com.reactnativecommunity.webview.RNCWebViewManager
+import com.reactnativecommunity.webview.RNCWebViewModule
+import com.reactnativecommunity.webview.RNCWebViewModuleImpl
 
 class DdSdkReactNativeWebViewPackage : TurboReactPackage() {
     override fun createViewManagers(
         reactContext: ReactApplicationContext
     ): MutableList<ViewManager<*,*>> {
         return mutableListOf(
-            RNCWebViewManager()
+            DdSdkReactNativeWebViewManager(reactContext)
         )
     }
-    
+
     override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
         return null
     }

package/android/src/oldarch/com/datadog/reactnative/webview/DdSdkReactNativeWebViewManager.kt

@@ -26,10 +26,9 @@ class DdSdkReactNativeWebViewManager(
     private val reactContext: ReactContext
 ) : RNCWebViewManager() {
     // The name used to reference this custom View from React Native.
-    companion object {
-        const val VIEW_NAME = "DdReactNativeWebView"
+    override fun getName(): String {
+        return VIEW_NAME
     }
-
     /**
      * The instance of Datadog SDK Core.
      */
@@ -37,13 +36,6 @@ class DdSdkReactNativeWebViewManager(
     val datadogCore: SdkCore?
         get() = _datadogCore
 
-    /**
-     * Whether WebView tracking has been enabled or not.
-     */
-    @Volatile private var _isWebViewTrackingEnabled: Boolean = false
-    val isWebViewTrackingEnabled: Boolean
-        get() = _isWebViewTrackingEnabled
-
     init {
         DatadogSDKWrapperStorage.addOnInitializedListener { core ->
             _datadogCore = core
@@ -92,21 +84,15 @@ class DdSdkReactNativeWebViewManager(
         sdkCore: SdkCore,
         allowedHosts: List<String>
     ) {
-        if (_isWebViewTrackingEnabled) {
-            return
-        }
-
         WebViewTracking.enable(
             webView,
             allowedHosts = allowedHosts,
             sdkCore = sdkCore
         )
-
-        _isWebViewTrackingEnabled = true
     }
 
-    // The name used to reference this custom View from React Native.
-    override fun getName(): String {
-        return VIEW_NAME
+    companion object {
+        // The name used to reference this custom View from React Native.
+        const val VIEW_NAME = "DdReactNativeWebView"
     }
 }

package/android/src/test/kotlin/{com → main/com}/datadog/reactnative/tools/unit/GenericAssert.kt

@@ -4,7 +4,7 @@
  * Copyright 2016-Present Datadog, Inc.
  */
 
-package com.datadog.reactnative.tools.unit
+package main.reactnative.tools.unit
 
 import org.assertj.core.api.AbstractAssert
 

package/android/src/test/{kotlin/com/datadog/reactnative/webview → webview}/DatadogWebViewTest.kt

@@ -10,7 +10,8 @@ import com.datadog.android.api.SdkCore
 import com.datadog.android.core.InternalSdkCore
 import com.datadog.android.webview.WebViewTracking
 import com.datadog.reactnative.DatadogSDKWrapperStorage
-import com.datadog.reactnative.tools.unit.GenericAssert.Companion.assertThat
+import com.datadog.reactnative.webview.DdSdkReactNativeWebViewManager
+import main.reactnative.tools.unit.GenericAssert.Companion.assertThat
 import com.facebook.react.bridge.JavaOnlyArray
 import com.facebook.react.uimanager.ThemedReactContext
 import com.reactnativecommunity.webview.RNCWebView
@@ -90,9 +91,6 @@ internal class DatadogWebViewTest {
         // When first initialized, the WebView manager core should be null
         assertThat(manager.datadogCore).isNull()
 
-        // When first initialized, the WebView tracking should be disabled
-        assertThat(manager.isWebViewTrackingEnabled).isEqualTo(false)
-
         // =========
         //   When
         // =========
@@ -119,8 +117,5 @@ internal class DatadogWebViewTest {
         webViewTrackingMockedStatic.verify {
             WebViewTracking.enable(rncWebView, listOf("example.com"), 100.0f, datadogCore)
         }
-
-        // At this point 'isWebViewTrackingEnabled' should be true.
-        assertThat(manager.isWebViewTrackingEnabled).isEqualTo(true)
     }
 }

package/android/src/testNewArch/kotlin/com/datadog/reactnative/webview/DatadogWebViewTest.kt

@@ -0,0 +1,122 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2016-Present Datadog, Inc.
+ */
+
+package com.datadog.reactnative.webview
+
+import com.datadog.android.api.SdkCore
+import com.datadog.android.core.InternalSdkCore
+import com.datadog.android.webview.WebViewTracking
+import com.datadog.reactnative.DatadogSDKWrapperStorage
+import main.reactnative.tools.unit.GenericAssert.Companion.assertThat
+import com.facebook.react.bridge.JavaOnlyArray
+import com.facebook.react.uimanager.ThemedReactContext
+import com.reactnativecommunity.webview.RNCWebView
+import com.reactnativecommunity.webview.RNCWebViewWrapper
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
+import org.junit.jupiter.api.extension.Extensions
+import org.mockito.Mock
+import org.mockito.MockedStatic
+import org.mockito.Mockito
+import org.mockito.Mockito.mock
+import org.mockito.junit.jupiter.MockitoExtension
+import org.mockito.junit.jupiter.MockitoSettings
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.mockito.quality.Strictness
+
+@Extensions(
+    ExtendWith(MockitoExtension::class)
+)
+@MockitoSettings(strictness = Strictness.LENIENT)
+internal class DatadogWebViewTest {
+
+    @Mock
+    lateinit var themedReactContext: ThemedReactContext
+
+    @Mock
+    lateinit var datadogCore: InternalSdkCore
+
+    private lateinit var webViewTrackingMockedStatic: MockedStatic<WebViewTracking>
+
+    @BeforeEach
+    fun `set up`() {
+        whenever(themedReactContext.runOnUiQueueThread(any())).thenAnswer { answer ->
+            answer.getArgument<Runnable>(0).run()
+            true
+        }
+
+        webViewTrackingMockedStatic = Mockito.mockStatic(WebViewTracking::class.java)
+        webViewTrackingMockedStatic.`when`<Unit> {
+            WebViewTracking.enable(
+                webView = any(), // Mock the WebView parameter
+                allowedHosts = any(), // Mock the list of allowed hosts
+                logsSampleRate = any(), // Mock the logsSampleRate parameter
+                sdkCore = any() // Mock the SdkCore parameter
+            )
+        }.then {} // Return Unit as the function has no return value
+    }
+
+    @AfterEach
+    fun `tear down`() {
+        webViewTrackingMockedStatic.close()
+    }
+
+    @Test
+    fun `Datadog Core is set once initialized`() {
+        val manager = DdSdkReactNativeWebViewManager(themedReactContext)
+        assertThat(manager.datadogCore).isNull()
+
+        DatadogSDKWrapperStorage.notifyOnInitializedListeners(datadogCore)
+
+        assertThat(manager.datadogCore).isNotNull()
+        assertThat(manager.datadogCore).isInstanceOf(SdkCore::class.java)
+    }
+
+    @Test
+    fun `Registers to SdkCore listener if the SDK is not initialized`() {
+        // =========
+        //   Given
+        // =========
+        val manager = DdSdkReactNativeWebViewManager(themedReactContext)
+
+        // When first initialized, the WebView manager core should be null
+        assertThat(manager.datadogCore).isNull()
+
+        // =========
+        //   When
+        // =========
+        val rncWebView = mock(RNCWebView::class.java)
+        val rncWebViewWrapper = mock(RNCWebViewWrapper::class.java)
+        whenever(rncWebViewWrapper.webView) doReturn rncWebView
+
+        // When JS sends allowedHosts through 'injectedJavaScriptBeforeContentLoaded' prop
+        manager.setInjectedJavaScriptBeforeContentLoaded(
+            rncWebViewWrapper,
+            "// #allowedHosts=[\"example.com\",\"test.com\"]"
+        )
+
+        // =========
+        //   Then
+        // =========
+
+        // When we notify listeners that the core is available...
+        DatadogSDKWrapperStorage.notifyOnInitializedListeners(datadogCore)
+
+        // ...the WebView should enable WebView tracking in the UI Thread.
+        verify(themedReactContext).runOnUiQueueThread(any())
+
+        // Native WebView tracking should be called
+        val arrayList = ArrayList(listOf("example.com", "test.com"))
+        webViewTrackingMockedStatic.verify {
+            WebViewTracking.enable(rncWebView, arrayList, 100.0f, datadogCore)
+        }
+    }
+}

package/lib/commonjs/index.js

@@ -9,7 +9,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _NativeDdLogs = _interopRequireDefault(require("./ext-specs/NativeDdLogs"));
 var _NativeDdSdk = require("./ext-specs/NativeDdSdk");
 var _NativeDdWebView = require("./specs/NativeDdWebView");
-var _envUtils = require("./utils/env-utils");
 var _webviewJsUtils = require("./utils/webview-js-utils");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -45,13 +44,12 @@ const WebViewComponent = (props, ref) => {
       userDefinedOnMessage?.(event);
     }
   }, [userDefinedOnMessage, props.logUserCodeErrors]);
-  const getInjectedJavascriptBeforeContentLoaded = () => {
-    if ((0, _envUtils.isNewArchitecture)()) {
-      return (0, _webviewJsUtils.getWebViewEventBridgingJS)(props.allowedHosts, props.injectedJavaScriptBeforeContentLoaded);
-    } else {
-      return (0, _webviewJsUtils.wrapJsCodeInTryAndCatch)(props.injectedJavaScriptBeforeContentLoaded);
-    }
-  };
+  const injectedJavascript = (0, _react.useMemo)(() => {
+    return (0, _webviewJsUtils.wrapJsCodeInTryAndCatch)(props.injectedJavaScript);
+  }, [props.injectedJavaScript]);
+  const injectedJavascriptBeforeContentLoaded = (0, _react.useMemo)(() => {
+    return (0, _webviewJsUtils.wrapJsCodeWithAllowedHosts)(props.injectedJavaScriptBeforeContentLoaded, props.allowedHosts);
+  }, [props.injectedJavaScriptBeforeContentLoaded, props.allowedHosts]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeWebview.WebView, {
     ...props,
     onMessage: onMessage,
@@ -61,8 +59,8 @@ const WebViewComponent = (props, ref) => {
         allowedHosts: props.allowedHosts
       }
     },
-    injectedJavaScript: (0, _webviewJsUtils.wrapJsCodeInTryAndCatch)(props.injectedJavaScript),
-    injectedJavaScriptBeforeContentLoaded: getInjectedJavascriptBeforeContentLoaded(),
+    injectedJavaScript: injectedJavascript,
+    injectedJavaScriptBeforeContentLoaded: injectedJavascriptBeforeContentLoaded,
     ref: ref
   });
 };

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeWebview","require","_react","_interopRequireWildcard","_NativeDdLogs","_interopRequireDefault","_NativeDdSdk","_NativeDdWebView","_envUtils","_webviewJsUtils","_jsxRuntime","e","__esModule","default","t","WeakMap","r","n","o","i","f","__proto__","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","WebViewComponent","props","ref","userDefinedOnMessage","onMessage","useCallback","event","handleDatadogMessage","ddMessage","type","message","logUserCodeErrors","NativeDdLogs","error","NativeDdSdk","consumeWebviewEvent","nativeEvent","data","jsonMsg","JSON","parse","source","err","getInjectedJavascriptBeforeContentLoaded","isNewArchitecture","getWebViewEventBridgingJS","allowedHosts","injectedJavaScriptBeforeContentLoaded","wrapJsCodeInTryAndCatch","jsx","WebView","nativeConfig","component","NativeDdWebView","injectedJavaScript","exports","forwardRef","_default"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNativeWebview","require","_react","_interopRequireWildcard","_NativeDdLogs","_interopRequireDefault","_NativeDdSdk","_NativeDdWebView","_webviewJsUtils","_jsxRuntime","e","__esModule","default","t","WeakMap","r","n","o","i","f","__proto__","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","WebViewComponent","props","ref","userDefinedOnMessage","onMessage","useCallback","event","handleDatadogMessage","ddMessage","type","message","logUserCodeErrors","NativeDdLogs","error","NativeDdSdk","consumeWebviewEvent","nativeEvent","data","jsonMsg","JSON","parse","source","err","injectedJavascript","useMemo","wrapJsCodeInTryAndCatch","injectedJavaScript","injectedJavascriptBeforeContentLoaded","wrapJsCodeWithAllowedHosts","injectedJavaScriptBeforeContentLoaded","allowedHosts","jsx","WebView","nativeConfig","component","NativeDdWebView","exports","forwardRef","_default"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/specs/NativeDdWebView.js

@@ -5,12 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.NativeDdWebView = void 0;
 var _reactNative = require("react-native");
-var _envUtils = require("../utils/env-utils");
 /*
  * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
  * This product includes software developed at Datadog (https://www.datadoghq.com/).
  * Copyright 2016-Present Datadog, Inc.
  */
 
-const NativeDdWebView = exports.NativeDdWebView = !(0, _envUtils.isNewArchitecture)() ? (0, _reactNative.requireNativeComponent)('DdReactNativeWebView') : undefined;
+const NativeDdWebView = exports.NativeDdWebView = (0, _reactNative.requireNativeComponent)('DdReactNativeWebView');
 //# sourceMappingURL=NativeDdWebView.js.map

package/lib/commonjs/specs/NativeDdWebView.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_envUtils","NativeDdWebView","exports","isNewArchitecture","requireNativeComponent","undefined"],"sourceRoot":"../../../src","sources":["specs/NativeDdWebView.ts"],"mappings":";;;;;;AAOA,IAAAA,YAAA,GAAAC,OAAA;AAEA,IAAAC,SAAA,GAAAD,OAAA;AATA;AACA;AACA;AACA;AACA;;AAOA,MAAME,eAAe,GAAAC,OAAA,CAAAD,eAAA,GAAG,CAAC,IAAAE,2BAAiB,EAAC,CAAC,GACtC,IAAAC,mCAAsB,EAA2B,sBAAsB,CAAC,GACxEC,SAAS","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","NativeDdWebView","exports","requireNativeComponent"],"sourceRoot":"../../../src","sources":["specs/NativeDdWebView.ts"],"mappings":";;;;;;AAOA,IAAAA,YAAA,GAAAC,OAAA;AAPA;AACA;AACA;AACA;AACA;;AAKA,MAAMC,eAAe,GAAAC,OAAA,CAAAD,eAAA,GAAG,IAAAE,mCAAsB,EAC1C,sBACJ,CAAC","ignoreList":[]}

package/lib/commonjs/utils/webview-js-utils.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.wrapJsCodeInTryAndCatch = exports.getWebViewEventBridgingJS = exports.DATADOG_MESSAGE_PREFIX = void 0;
+exports.DATADOG_MESSAGE_PREFIX = void 0;
+exports.wrapJsCodeInTryAndCatch = wrapJsCodeInTryAndCatch;
+exports.wrapJsCodeWithAllowedHosts = wrapJsCodeWithAllowedHosts;
 var _NativeDdSdk = require("../ext-specs/NativeDdSdk");
 /*
  * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
@@ -22,67 +24,49 @@ const DATADOG_MESSAGE_PREFIX = exports.DATADOG_MESSAGE_PREFIX = '[DATADOG]';
  */
 
 /**
- * Wraps the given JS Code in a try and catch block.
+ * Wraps the given JS Code in a try and catch block, including a
+ * comment with the given allowedHosts in JSON format
  * @param javascriptCode The JS Code to wrap in a try and catch block.
  * @returns the wrapped JS code.
  */
-const wrapJsCodeInTryAndCatch = javascriptCode => javascriptCode ? `
-    try{
-      ${javascriptCode}
-    }
-    catch (error) {
-      const errorMsg = error instanceof Error ? error.message : String(error);
-      window.ReactNativeWebView.postMessage(JSON.stringify({
-        source: 'DATADOG',
-        type: 'ERROR',
-        message: errorMsg
-      }));
-      true;
-    }` : undefined;
-
-/**
- * Legacy JS code for bridging the WebView events to DataDog native SDKs for consumption.
- * @param allowedHosts The list of allowed hosts.
- * @param customJavaScriptCode Custom user JS code to inject along with the Datadog bridging logic.
- * @returns The JS code block as a string.
- */
-exports.wrapJsCodeInTryAndCatch = wrapJsCodeInTryAndCatch;
-const getWebViewEventBridgingJS = (allowedHosts, customJavaScriptCode) => `
-    window.DatadogEventBridge = {
-      send(msg) {
-        window.ReactNativeWebView.postMessage(JSON.stringify({
-          source: 'DATADOG',
-          type: 'NATIVE_EVENT',
-          message: msg
-        }));
-        true;
-      },
-      getAllowedWebViewHosts() {
-        return ${formatAllowedHosts(allowedHosts)}
-      }
-    };
-    try{      
-      ${customJavaScriptCode}
-    }
-    catch (error) {
-      const errorMsg = error instanceof Error ? error.message : String(error);
-      window.ReactNativeWebView.postMessage(JSON.stringify({
-        source: 'DATADOG',
-        type: 'ERROR',
-        message: errorMsg
-      }));
-      true;
-    }
-  `;
-exports.getWebViewEventBridgingJS = getWebViewEventBridgingJS;
+function wrapJsCodeWithAllowedHosts(javascriptCode, allowedHosts) {
+  let jsCode = '';
+  const hosts = formatAllowedHosts(allowedHosts);
+  if (hosts) {
+    jsCode = `// #allowedHosts=${JSON.stringify(allowedHosts)}\n`;
+  }
+  return javascriptCode ? `${jsCode}\n${wrapJsCodeInTryAndCatch(javascriptCode)}` : jsCode.trim().length > 0 ? jsCode : undefined;
+}
+function wrapJsCodeInTryAndCatch(javascriptCode) {
+  return javascriptCode ? `try{
+  ${javascriptCode}
+}
+catch (error) {
+  const errorMsg = error instanceof Error ? error.message : String(error);
+  window.ReactNativeWebView.postMessage(JSON.stringify({
+    source: 'DATADOG',
+    type: 'ERROR',
+    message: errorMsg
+  }));
+  true;
+}` : undefined;
+}
 function formatAllowedHosts(allowedHosts) {
   try {
-    return `'${JSON.stringify(allowedHosts)}'`;
+    if (!allowedHosts) {
+      throw new Error('allowedHosts is undefined');
+    }
+    const jsonHosts = JSON.stringify(allowedHosts);
+    if (!jsonHosts) {
+      throw new Error("JSON.stringify returned 'undefined' for the given hosts");
+    }
+    return jsonHosts;
   } catch (e) {
     if (_NativeDdSdk.NativeDdSdk) {
       _NativeDdSdk.NativeDdSdk.telemetryError(getErrorMessage(e), getErrorStackTrace(e), 'AllowedHostsError');
     }
-    return "'[]'";
+    console.warn(`[@datadog/mobile-react-native-webview] Invalid 'allowedHosts' format: ${e}`);
+    return undefined;
   }
 }
 const getErrorMessage = error => {

package/lib/commonjs/utils/webview-js-utils.js.map

@@ -1 +1 @@
-{"version":3,"names":["_NativeDdSdk","require","DATADOG_MESSAGE_PREFIX","exports","wrapJsCodeInTryAndCatch","javascriptCode","undefined","getWebViewEventBridgingJS","allowedHosts","customJavaScriptCode","formatAllowedHosts","JSON","stringify","e","NativeDdSdk","telemetryError","getErrorMessage","getErrorStackTrace","error","EMPTY_MESSAGE","message","String","EMPTY_STACK_TRACE","stack","stacktrace","componentStack","sourceURL","line","column"],"sourceRoot":"../../../src","sources":["utils/webview-js-utils.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_NativeDdSdk","require","DATADOG_MESSAGE_PREFIX","exports","wrapJsCodeWithAllowedHosts","javascriptCode","allowedHosts","jsCode","hosts","formatAllowedHosts","JSON","stringify","wrapJsCodeInTryAndCatch","trim","length","undefined","Error","jsonHosts","e","NativeDdSdk","telemetryError","getErrorMessage","getErrorStackTrace","console","warn","error","EMPTY_MESSAGE","message","String","EMPTY_STACK_TRACE","stack","stacktrace","componentStack","sourceURL","line","column"],"sourceRoot":"../../../src","sources":["utils/webview-js-utils.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/index.js

@@ -5,12 +5,11 @@
  */
 
 import { WebView as RNWebView } from 'react-native-webview';
-import React, { forwardRef, useCallback } from 'react';
+import React, { forwardRef, useCallback, useMemo } from 'react';
 import NativeDdLogs from './ext-specs/NativeDdLogs';
 import { NativeDdSdk } from './ext-specs/NativeDdSdk';
 import { NativeDdWebView } from './specs/NativeDdWebView';
-import { isNewArchitecture } from './utils/env-utils';
-import { getWebViewEventBridgingJS, wrapJsCodeInTryAndCatch } from './utils/webview-js-utils';
+import { wrapJsCodeInTryAndCatch, wrapJsCodeWithAllowedHosts } from './utils/webview-js-utils';
 import { jsx as _jsx } from "react/jsx-runtime";
 const WebViewComponent = (props, ref) => {
   const userDefinedOnMessage = props.onMessage;
@@ -37,13 +36,12 @@ const WebViewComponent = (props, ref) => {
       userDefinedOnMessage?.(event);
     }
   }, [userDefinedOnMessage, props.logUserCodeErrors]);
-  const getInjectedJavascriptBeforeContentLoaded = () => {
-    if (isNewArchitecture()) {
-      return getWebViewEventBridgingJS(props.allowedHosts, props.injectedJavaScriptBeforeContentLoaded);
-    } else {
-      return wrapJsCodeInTryAndCatch(props.injectedJavaScriptBeforeContentLoaded);
-    }
-  };
+  const injectedJavascript = useMemo(() => {
+    return wrapJsCodeInTryAndCatch(props.injectedJavaScript);
+  }, [props.injectedJavaScript]);
+  const injectedJavascriptBeforeContentLoaded = useMemo(() => {
+    return wrapJsCodeWithAllowedHosts(props.injectedJavaScriptBeforeContentLoaded, props.allowedHosts);
+  }, [props.injectedJavaScriptBeforeContentLoaded, props.allowedHosts]);
   return /*#__PURE__*/_jsx(RNWebView, {
     ...props,
     onMessage: onMessage,
@@ -53,8 +51,8 @@ const WebViewComponent = (props, ref) => {
         allowedHosts: props.allowedHosts
       }
     },
-    injectedJavaScript: wrapJsCodeInTryAndCatch(props.injectedJavaScript),
-    injectedJavaScriptBeforeContentLoaded: getInjectedJavascriptBeforeContentLoaded(),
+    injectedJavaScript: injectedJavascript,
+    injectedJavaScriptBeforeContentLoaded: injectedJavascriptBeforeContentLoaded,
     ref: ref
   });
 };