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

package/src/utils/webview-js-utils.ts

@@ -29,70 +29,59 @@ export type DatadogMessageFormat = {
 };
 
 /**
- * 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.
  */
-export const wrapJsCodeInTryAndCatch = (
-    javascriptCode?: string
-): string | undefined =>
-    javascriptCode
-        ? `
-    try{
-      ${javascriptCode}
+export function wrapJsCodeWithAllowedHosts(
+    javascriptCode?: string,
+    allowedHosts?: string[]
+): string | undefined {
+    let jsCode = '';
+    const hosts = formatAllowedHosts(allowedHosts);
+    if (hosts) {
+        jsCode = `// #allowedHosts=${JSON.stringify(allowedHosts)}\n`;
     }
-    catch (error) {
-      const errorMsg = error instanceof Error ? error.message : String(error);
-      window.ReactNativeWebView.postMessage(JSON.stringify({
-        source: 'DATADOG',
-        type: 'ERROR',
-        message: errorMsg
-      }));
-      true;
-    }`
+
+    return javascriptCode
+        ? `${jsCode}\n${wrapJsCodeInTryAndCatch(javascriptCode)}`
+        : jsCode.trim().length > 0
+        ? jsCode
         : 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.
- */
-export const getWebViewEventBridgingJS = (
-    allowedHosts?: string[],
-    customJavaScriptCode?: string
-): string =>
-    `
-    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;
-    }
-  `;
+export function wrapJsCodeInTryAndCatch(
+    javascriptCode: string | undefined
+): string | undefined {
+    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?: string[]): string {
+function formatAllowedHosts(allowedHosts?: string[]): string | undefined {
     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: any) {
         if (NativeDdSdk) {
             NativeDdSdk.telemetryError(
@@ -101,7 +90,10 @@ function formatAllowedHosts(allowedHosts?: string[]): string {
                 'AllowedHostsError'
             );
         }
-        return "'[]'";
+        console.warn(
+            `[@datadog/mobile-react-native-webview] Invalid 'allowedHosts' format: ${e}`
+        );
+        return undefined;
     }
 }
 

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

@@ -1,17 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isNewArchitecture = void 0;
-/*
- * 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 isNewArchitecture = () => {
-  return global?.nativeFabricUIManager !== undefined;
-};
-exports.isNewArchitecture = isNewArchitecture;
-//# sourceMappingURL=env-utils.js.map

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

@@ -1 +0,0 @@
-{"version":3,"names":["isNewArchitecture","global","nativeFabricUIManager","undefined","exports"],"sourceRoot":"../../../src","sources":["utils/env-utils.ts"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;;AAEO,MAAMA,iBAAiB,GAAGA,CAAA,KAAe;EAC5C,OAAQC,MAAM,EAAUC,qBAAqB,KAAKC,SAAS;AAC/D,CAAC;AAACC,OAAA,CAAAJ,iBAAA,GAAAA,iBAAA","ignoreList":[]}

package/lib/module/utils/env-utils.js

@@ -1,10 +0,0 @@
-/*
- * 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.
- */
-
-export const isNewArchitecture = () => {
-  return global?.nativeFabricUIManager !== undefined;
-};
-//# sourceMappingURL=env-utils.js.map

package/lib/module/utils/env-utils.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["isNewArchitecture","global","nativeFabricUIManager","undefined"],"sourceRoot":"../../../src","sources":["utils/env-utils.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA,OAAO,MAAMA,iBAAiB,GAAGA,CAAA,KAAe;EAC5C,OAAQC,MAAM,EAAUC,qBAAqB,KAAKC,SAAS;AAC/D,CAAC","ignoreList":[]}

package/lib/typescript/utils/env-utils.d.ts

@@ -1,2 +0,0 @@
-export declare const isNewArchitecture: () => boolean;
-//# sourceMappingURL=env-utils.d.ts.map

package/lib/typescript/utils/env-utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"env-utils.d.ts","sourceRoot":"","sources":["../../../src/utils/env-utils.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,iBAAiB,QAAO,OAEpC,CAAC"}

package/src/utils/env-utils.ts

@@ -1,9 +0,0 @@
-/*
- * 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.
- */
-
-export const isNewArchitecture = (): boolean => {
-    return (global as any)?.nativeFabricUIManager !== undefined;
-};