@kontextso/sdk-react-native 3.0.5 → 3.0.7-rc.1

package/dist/index.js

@@ -44,10 +44,11 @@ function makeIframeMessage(type, opts) {
 function handleIframeMessage(handler, opts) {
   const { origin, code, component } = opts;
   return (event) => {
+    var _a, _b;
     if (origin && event.origin !== origin) return;
-    const eventCode = event.data.data?.code;
+    const eventCode = (_a = event.data.data) == null ? void 0 : _a.code;
     if (eventCode && code && eventCode !== code) return;
-    const eventComponent = event.data.data?.component;
+    const eventComponent = (_b = event.data.data) == null ? void 0 : _b.component;
     if (eventComponent && component && eventComponent !== component) return;
     handler(event.data);
   };
@@ -146,7 +147,9 @@ var Format = ({ code, messageId, wrapper, onEvent, ...otherParams }) => {
     context?.captureError(new Error("Processing iframe error"));
   };
   const resetModal = () => {
+    debugModal("Format:resetModal");
     if (modalInitTimeoutRef.current) {
+      debugModal("Format:resetModalTimeout");
       clearTimeout(modalInitTimeoutRef.current);
       modalInitTimeoutRef.current = null;
     }
@@ -183,19 +186,27 @@ var Format = ({ code, messageId, wrapper, onEvent, ...otherParams }) => {
       ...data
     });
   };
-  debug("format-update-state");
+  debug("Format:updateState");
   const onMessage = (event) => {
     try {
       const data = JSON.parse(event.nativeEvent.data);
-      debug("iframe-message", {
-        message: data
+      debug("Format:iframeMessage", {
+        message: data,
+        params: { data }
       });
       const messageHandler = handleIframeMessage(
         (message) => {
           switch (message.type) {
             case "init-iframe":
               setIframeLoaded(true);
-              debug("iframe-post-message");
+              debug("Format:iframePostMessage", {
+                params: {
+                  messages: context?.messages,
+                  sdk: "sdk-react-native",
+                  otherParams,
+                  messageId
+                }
+              });
               sendMessage(webViewRef, "update-iframe", code, {
                 messages: context?.messages,
                 sdk: "sdk-react-native",
@@ -255,7 +266,8 @@ var Format = ({ code, messageId, wrapper, onEvent, ...otherParams }) => {
       );
       messageHandler({ data });
     } catch (e) {
-      debug("iframe-message-error", {
+      debug("Format:iframeMessageError", {
+        params: { error: e },
         error: e
       });
       console.error("error parsing message from webview", e);
@@ -265,7 +277,8 @@ var Format = ({ code, messageId, wrapper, onEvent, ...otherParams }) => {
   const onModalMessage = (event) => {
     try {
       const data = JSON.parse(event.nativeEvent.data);
-      debugModal("modal-iframe-message", {
+      debugModal("Format:modalIframeMessage", {
+        params: { data },
         message: data
       });
       const messageHandler = handleIframeMessage(
@@ -308,7 +321,8 @@ var Format = ({ code, messageId, wrapper, onEvent, ...otherParams }) => {
       );
       messageHandler({ data });
     } catch (e) {
-      debugModal("modal-iframe-message-error", {
+      debugModal("Format:modalIframeMessageError", {
+        params: { error: e },
         error: e
       });
       console.error("error parsing message from webview", e);
@@ -318,16 +332,36 @@ var Format = ({ code, messageId, wrapper, onEvent, ...otherParams }) => {
   const paramsString = (0, import_sdk_react.convertParamsToString)(otherParams);
   (0, import_react2.useEffect)(() => {
     if (!iframeLoaded || !context?.adServerUrl || !bid || !webViewRef.current) {
+      debug("Format:iframePostMessageNotLoaded", {
+        params: {
+          iframeLoaded,
+          contextAdServerUrl: context?.adServerUrl,
+          bid
+        }
+      });
       return;
     }
-    debug("iframe-post-message");
+    debug("Format:iframePostMessage", {
+      params: {
+        otherParams
+      }
+    });
     sendMessage(webViewRef, "update-iframe", code, {
       data: { otherParams },
       code
     });
   }, [paramsString, iframeLoaded, context?.adServerUrl, bid, code]);
   const checkIfInViewport = () => {
-    if (!containerRef.current) return;
+    if (!containerRef.current) {
+      debug("Format:checkIfInViewportNoContainer");
+      return;
+    }
+    debug("Format:checkIfInViewportMeasure", {
+      params: {
+        windowWidth,
+        windowHeight
+      }
+    });
     containerRef.current.measureInWindow((containerX, containerY, containerWidth, containerHeight) => {
       sendMessage(webViewRef, "update-dimensions-iframe", code, {
         windowWidth,
@@ -338,29 +372,60 @@ var Format = ({ code, messageId, wrapper, onEvent, ...otherParams }) => {
         containerY,
         keyboardHeight: keyboardHeightRef.current
       });
+      debug("Format:checkIfInViewportMeasureSend", {
+        params: {
+          windowWidth,
+          windowHeight,
+          containerWidth,
+          containerHeight,
+          containerX,
+          containerY,
+          keyboardHeight: keyboardHeightRef.current
+        }
+      });
     });
   };
   (0, import_react2.useEffect)(() => {
-    if (!isAdViewVisible) return;
+    if (!isAdViewVisible) {
+      debug("Format:checkIfInViewportNotVisible");
+      return;
+    }
     const interval = setInterval(() => {
       checkIfInViewport();
     }, 250);
-    return () => clearInterval(interval);
+    return () => {
+      clearInterval(interval);
+      debug("Format:checkIfInViewportCleanup");
+    };
   }, [isAdViewVisible]);
   (0, import_react2.useEffect)(() => {
     const showSubscription = import_react_native.Keyboard.addListener("keyboardDidShow", (e) => {
+      debug("Format:keyboardDidShow", {
+        params: {
+          keyboardHeight: e?.endCoordinates?.height ?? 0
+        }
+      });
       keyboardHeightRef.current = e?.endCoordinates?.height ?? 0;
     });
     const hideSubscription = import_react_native.Keyboard.addListener("keyboardDidHide", () => {
+      debug("Format:keyboardDidHide");
       keyboardHeightRef.current = 0;
     });
     return () => {
       showSubscription.remove();
       hideSubscription.remove();
       keyboardHeightRef.current = 0;
+      debug("Format:keyboardEffectCleanup");
     };
   }, []);
   if (!context || !bid || !iframeUrl) {
+    debug("Format:noContextOrBidOrIframeUrl", {
+      params: {
+        context,
+        bid,
+        iframeUrl
+      }
+    });
     return null;
   }
   const inlineContent = /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
@@ -377,11 +442,11 @@ var Format = ({ code, messageId, wrapper, onEvent, ...otherParams }) => {
         ...iframeStyles
       },
       onError: () => {
-        debug("iframe-error");
+        debug("Format:iframeError");
         reset();
       },
       onLoad: () => {
-        debug("iframe-load");
+        debug("Format:iframeLoad");
       }
     }
   );
@@ -414,11 +479,11 @@ var Format = ({ code, messageId, wrapper, onEvent, ...otherParams }) => {
                 borderWidth: 0
               },
               onError: () => {
-                debug("modal-error");
+                debug("Format:modalError");
                 resetModal();
               },
               onLoad: () => {
-                debug("modal-load");
+                debug("Format:modalLoad");
                 setModalLoaded(true);
               }
             }
@@ -454,11 +519,12 @@ var InlineAd_default = InlineAd;
 
 // src/context/AdsProvider.tsx
 var import_sdk_react2 = require("@kontextso/sdk-react");
+var import_netinfo = require("@react-native-community/netinfo");
 var import_react_native3 = require("react-native");
 var import_react_native_device_info = __toESM(require("react-native-device-info"));
 
 // package.json
-var version = "3.0.5";
+var version = "3.0.7-rc.1";
 
 // src/NativeRNKontext.ts
 var import_react_native2 = require("react-native");
@@ -479,6 +545,7 @@ var getDevice = async () => {
     const deviceType = import_react_native_device_info.default.getDeviceType();
     const soundOn = await NativeRNKontext_default.isSoundOn();
     const screen = import_react_native3.Dimensions.get("screen");
+    const networkInfo = await (0, import_netinfo.fetch)();
     const mapDeviceTypeToHardwareType = () => {
       switch (deviceType) {
         case "Handset":
@@ -508,10 +575,10 @@ var getDevice = async () => {
         // outputType: Not available without native module
       },
       network: {
-        // carrier: await DeviceInfo.getCarrier(), not supported in react-native-device-info v10.0.0
-        userAgent: await import_react_native_device_info.default.getUserAgent()
-        // detail: Requires @react-native-community/netinfo
-        // type: Requires @react-native-community/netinfo
+        carrier: networkInfo.type === import_netinfo.NetInfoStateType.cellular && networkInfo.details.carrier || void 0,
+        userAgent: await import_react_native_device_info.default.getUserAgent(),
+        type: [import_netinfo.NetInfoStateType.wifi, import_netinfo.NetInfoStateType.cellular, import_netinfo.NetInfoStateType.ethernet].includes(networkInfo.type) ? networkInfo.type : import_netinfo.NetInfoStateType.other,
+        detail: networkInfo.type === import_netinfo.NetInfoStateType.cellular && networkInfo.details.cellularGeneration || void 0
       },
       os: {
         name: import_react_native3.Platform.OS,
@@ -537,14 +604,21 @@ var getDevice = async () => {
     return {};
   }
 };
-var getApp = async () => ({
-  bundleId: import_react_native_device_info.default.getBundleId(),
-  // not supported in react-native-device-info v10.0.0
-  // firstInstallTime: await DeviceInfo.getFirstInstallTime(),
-  // lastUpdateTime: await DeviceInfo.getLastUpdateTime(),
-  // startTime: await DeviceInfo.getStartupTime(),
-  version: import_react_native_device_info.default.getVersion()
-});
+var getApp = async () => {
+  try {
+    return {
+      bundleId: import_react_native_device_info.default.getBundleId(),
+      firstInstallTime: await import_react_native_device_info.default.getFirstInstallTime(),
+      lastUpdateTime: await import_react_native_device_info.default.getLastUpdateTime(),
+      version: import_react_native_device_info.default.getVersion()
+      // Not supported in react-native-device-info v10
+      // startTime: await DeviceInfo.getStartupTime(),
+    };
+  } catch (error) {
+    console.error(error);
+    return {};
+  }
+};
 var getSdk = async () => ({
   name: "sdk-react-native",
   platform: import_react_native3.Platform.OS === "ios" ? "ios" : "android",

package/dist/index.mjs

@@ -7,10 +7,11 @@ function makeIframeMessage(type, opts) {
 function handleIframeMessage(handler, opts) {
   const { origin, code, component } = opts;
   return (event) => {
+    var _a, _b;
     if (origin && event.origin !== origin) return;
-    const eventCode = event.data.data?.code;
+    const eventCode = (_a = event.data.data) == null ? void 0 : _a.code;
     if (eventCode && code && eventCode !== code) return;
-    const eventComponent = event.data.data?.component;
+    const eventComponent = (_b = event.data.data) == null ? void 0 : _b.component;
     if (eventComponent && component && eventComponent !== component) return;
     handler(event.data);
   };
@@ -115,7 +116,9 @@ var Format = ({ code, messageId, wrapper, onEvent, ...otherParams }) => {
     context?.captureError(new Error("Processing iframe error"));
   };
   const resetModal = () => {
+    debugModal("Format:resetModal");
     if (modalInitTimeoutRef.current) {
+      debugModal("Format:resetModalTimeout");
       clearTimeout(modalInitTimeoutRef.current);
       modalInitTimeoutRef.current = null;
     }
@@ -152,19 +155,27 @@ var Format = ({ code, messageId, wrapper, onEvent, ...otherParams }) => {
       ...data
     });
   };
-  debug("format-update-state");
+  debug("Format:updateState");
   const onMessage = (event) => {
     try {
       const data = JSON.parse(event.nativeEvent.data);
-      debug("iframe-message", {
-        message: data
+      debug("Format:iframeMessage", {
+        message: data,
+        params: { data }
       });
       const messageHandler = handleIframeMessage(
         (message) => {
           switch (message.type) {
             case "init-iframe":
               setIframeLoaded(true);
-              debug("iframe-post-message");
+              debug("Format:iframePostMessage", {
+                params: {
+                  messages: context?.messages,
+                  sdk: "sdk-react-native",
+                  otherParams,
+                  messageId
+                }
+              });
               sendMessage(webViewRef, "update-iframe", code, {
                 messages: context?.messages,
                 sdk: "sdk-react-native",
@@ -224,7 +235,8 @@ var Format = ({ code, messageId, wrapper, onEvent, ...otherParams }) => {
       );
       messageHandler({ data });
     } catch (e) {
-      debug("iframe-message-error", {
+      debug("Format:iframeMessageError", {
+        params: { error: e },
         error: e
       });
       console.error("error parsing message from webview", e);
@@ -234,7 +246,8 @@ var Format = ({ code, messageId, wrapper, onEvent, ...otherParams }) => {
   const onModalMessage = (event) => {
     try {
       const data = JSON.parse(event.nativeEvent.data);
-      debugModal("modal-iframe-message", {
+      debugModal("Format:modalIframeMessage", {
+        params: { data },
         message: data
       });
       const messageHandler = handleIframeMessage(
@@ -277,7 +290,8 @@ var Format = ({ code, messageId, wrapper, onEvent, ...otherParams }) => {
       );
       messageHandler({ data });
     } catch (e) {
-      debugModal("modal-iframe-message-error", {
+      debugModal("Format:modalIframeMessageError", {
+        params: { error: e },
         error: e
       });
       console.error("error parsing message from webview", e);
@@ -287,16 +301,36 @@ var Format = ({ code, messageId, wrapper, onEvent, ...otherParams }) => {
   const paramsString = convertParamsToString(otherParams);
   useEffect(() => {
     if (!iframeLoaded || !context?.adServerUrl || !bid || !webViewRef.current) {
+      debug("Format:iframePostMessageNotLoaded", {
+        params: {
+          iframeLoaded,
+          contextAdServerUrl: context?.adServerUrl,
+          bid
+        }
+      });
       return;
     }
-    debug("iframe-post-message");
+    debug("Format:iframePostMessage", {
+      params: {
+        otherParams
+      }
+    });
     sendMessage(webViewRef, "update-iframe", code, {
       data: { otherParams },
       code
     });
   }, [paramsString, iframeLoaded, context?.adServerUrl, bid, code]);
   const checkIfInViewport = () => {
-    if (!containerRef.current) return;
+    if (!containerRef.current) {
+      debug("Format:checkIfInViewportNoContainer");
+      return;
+    }
+    debug("Format:checkIfInViewportMeasure", {
+      params: {
+        windowWidth,
+        windowHeight
+      }
+    });
     containerRef.current.measureInWindow((containerX, containerY, containerWidth, containerHeight) => {
       sendMessage(webViewRef, "update-dimensions-iframe", code, {
         windowWidth,
@@ -307,29 +341,60 @@ var Format = ({ code, messageId, wrapper, onEvent, ...otherParams }) => {
         containerY,
         keyboardHeight: keyboardHeightRef.current
       });
+      debug("Format:checkIfInViewportMeasureSend", {
+        params: {
+          windowWidth,
+          windowHeight,
+          containerWidth,
+          containerHeight,
+          containerX,
+          containerY,
+          keyboardHeight: keyboardHeightRef.current
+        }
+      });
     });
   };
   useEffect(() => {
-    if (!isAdViewVisible) return;
+    if (!isAdViewVisible) {
+      debug("Format:checkIfInViewportNotVisible");
+      return;
+    }
     const interval = setInterval(() => {
       checkIfInViewport();
     }, 250);
-    return () => clearInterval(interval);
+    return () => {
+      clearInterval(interval);
+      debug("Format:checkIfInViewportCleanup");
+    };
   }, [isAdViewVisible]);
   useEffect(() => {
     const showSubscription = Keyboard.addListener("keyboardDidShow", (e) => {
+      debug("Format:keyboardDidShow", {
+        params: {
+          keyboardHeight: e?.endCoordinates?.height ?? 0
+        }
+      });
       keyboardHeightRef.current = e?.endCoordinates?.height ?? 0;
     });
     const hideSubscription = Keyboard.addListener("keyboardDidHide", () => {
+      debug("Format:keyboardDidHide");
       keyboardHeightRef.current = 0;
     });
     return () => {
       showSubscription.remove();
       hideSubscription.remove();
       keyboardHeightRef.current = 0;
+      debug("Format:keyboardEffectCleanup");
     };
   }, []);
   if (!context || !bid || !iframeUrl) {
+    debug("Format:noContextOrBidOrIframeUrl", {
+      params: {
+        context,
+        bid,
+        iframeUrl
+      }
+    });
     return null;
   }
   const inlineContent = /* @__PURE__ */ jsx2(
@@ -346,11 +411,11 @@ var Format = ({ code, messageId, wrapper, onEvent, ...otherParams }) => {
         ...iframeStyles
       },
       onError: () => {
-        debug("iframe-error");
+        debug("Format:iframeError");
         reset();
       },
       onLoad: () => {
-        debug("iframe-load");
+        debug("Format:iframeLoad");
       }
     }
   );
@@ -383,11 +448,11 @@ var Format = ({ code, messageId, wrapper, onEvent, ...otherParams }) => {
                 borderWidth: 0
               },
               onError: () => {
-                debug("modal-error");
+                debug("Format:modalError");
                 resetModal();
               },
               onLoad: () => {
-                debug("modal-load");
+                debug("Format:modalLoad");
                 setModalLoaded(true);
               }
             }
@@ -422,12 +487,16 @@ var InlineAd = ({ code, messageId, wrapper, ...props }) => {
 var InlineAd_default = InlineAd;
 
 // src/context/AdsProvider.tsx
-import { AdsProviderInternal, log } from "@kontextso/sdk-react";
+import {
+  AdsProviderInternal,
+  log
+} from "@kontextso/sdk-react";
+import { fetch as fetchNetworkInfo, NetInfoStateType } from "@react-native-community/netinfo";
 import { Appearance, Dimensions, PixelRatio, Platform } from "react-native";
 import DeviceInfo from "react-native-device-info";
 
 // package.json
-var version = "3.0.5";
+var version = "3.0.7-rc.1";
 
 // src/NativeRNKontext.ts
 import { TurboModuleRegistry } from "react-native";
@@ -448,6 +517,7 @@ var getDevice = async () => {
     const deviceType = DeviceInfo.getDeviceType();
     const soundOn = await NativeRNKontext_default.isSoundOn();
     const screen = Dimensions.get("screen");
+    const networkInfo = await fetchNetworkInfo();
     const mapDeviceTypeToHardwareType = () => {
       switch (deviceType) {
         case "Handset":
@@ -477,10 +547,10 @@ var getDevice = async () => {
         // outputType: Not available without native module
       },
       network: {
-        // carrier: await DeviceInfo.getCarrier(), not supported in react-native-device-info v10.0.0
-        userAgent: await DeviceInfo.getUserAgent()
-        // detail: Requires @react-native-community/netinfo
-        // type: Requires @react-native-community/netinfo
+        carrier: networkInfo.type === NetInfoStateType.cellular && networkInfo.details.carrier || void 0,
+        userAgent: await DeviceInfo.getUserAgent(),
+        type: [NetInfoStateType.wifi, NetInfoStateType.cellular, NetInfoStateType.ethernet].includes(networkInfo.type) ? networkInfo.type : NetInfoStateType.other,
+        detail: networkInfo.type === NetInfoStateType.cellular && networkInfo.details.cellularGeneration || void 0
       },
       os: {
         name: Platform.OS,
@@ -506,14 +576,21 @@ var getDevice = async () => {
     return {};
   }
 };
-var getApp = async () => ({
-  bundleId: DeviceInfo.getBundleId(),
-  // not supported in react-native-device-info v10.0.0
-  // firstInstallTime: await DeviceInfo.getFirstInstallTime(),
-  // lastUpdateTime: await DeviceInfo.getLastUpdateTime(),
-  // startTime: await DeviceInfo.getStartupTime(),
-  version: DeviceInfo.getVersion()
-});
+var getApp = async () => {
+  try {
+    return {
+      bundleId: DeviceInfo.getBundleId(),
+      firstInstallTime: await DeviceInfo.getFirstInstallTime(),
+      lastUpdateTime: await DeviceInfo.getLastUpdateTime(),
+      version: DeviceInfo.getVersion()
+      // Not supported in react-native-device-info v10
+      // startTime: await DeviceInfo.getStartupTime(),
+    };
+  } catch (error) {
+    console.error(error);
+    return {};
+  }
+};
 var getSdk = async () => ({
   name: "sdk-react-native",
   platform: Platform.OS === "ios" ? "ios" : "android",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontextso/sdk-react-native",
-  "version": "3.0.5",
+  "version": "3.0.7-rc.1",
   "description": "Kontext SDK for React Native",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -14,13 +14,15 @@
     "dev": "npm-run-all2 dev:js",
     "build:js": "tsup",
     "build": "npm run build:js && cross-env NODE_ENV=development npm run test:run",
-    "test": "",
-    "test:run": "",
+    "test:run": "vitest --run",
+    "test": "vitest --run",
+    "test:watch": "vitest --watch",
     "format": "biome format --write ."
   },
   "devDependencies": {
-    "@kontextso/sdk-common": "^0.2.0",
+    "@kontextso/sdk-common": "^1.0.0",
     "@kontextso/typescript-config": "*",
+    "@react-native-community/netinfo": "11.3.1",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.4.6",
     "@testing-library/react": "^16.0.0",
@@ -37,7 +39,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-native": "^0.80.1",
-    "react-native-device-info": ">=12.0.0",
+    "react-native-device-info": "10.14.0",
     "react-native-webview": "^13.15.0",
     "react-test-renderer": "^18.3.1",
     "tsup": "^8.0.2",
@@ -45,13 +47,14 @@
     "vitest": "^2.1.2"
   },
   "peerDependencies": {
+    "@react-native-community/netinfo": "^11.0",
     "react": ">=18.0.0",
     "react-native": ">=0.73.0",
     "react-native-device-info": ">=10.0.0 <15.0.0",
     "react-native-webview": "^13.10.0"
   },
   "dependencies": {
-    "@kontextso/sdk-react": "^3.0.5"
+    "@kontextso/sdk-react": "^3.0.7-rc.1"
   },
   "files": [
     "dist/*",

package/src/__tests__/util.test.ts

@@ -0,0 +1,9 @@
+import { describe, expect, test } from 'vitest'
+
+describe('utils', () => {
+  describe('test', () => {
+    test('test', () => {
+      expect(1).toBe(1)
+    })
+  })
+})

package/src/context/AdsProvider.tsx

@@ -1,5 +1,12 @@
-import type { AdsProviderProps, AppConfig, DeviceConfig, SDKConfig } from '@kontextso/sdk-react'
-import { AdsProviderInternal, log } from '@kontextso/sdk-react'
+import {
+  AdsProviderInternal,
+  type AdsProviderProps,
+  type AppConfig,
+  type DeviceConfig,
+  log,
+  type SDKConfig,
+} from '@kontextso/sdk-react'
+import { fetch as fetchNetworkInfo, NetInfoStateType } from '@react-native-community/netinfo'
 import { Appearance, Dimensions, PixelRatio, Platform } from 'react-native'
 import DeviceInfo, { type DeviceType } from 'react-native-device-info'
 import { version } from '../../package.json'
@@ -19,6 +26,7 @@ const getDevice = async (): Promise<DeviceConfig> => {
     const deviceType = DeviceInfo.getDeviceType() as DeviceType
     const soundOn = await KontextSDK.isSoundOn()
     const screen = Dimensions.get('screen')
+    const networkInfo = await fetchNetworkInfo()
 
     const mapDeviceTypeToHardwareType = (): DeviceConfig['hardware']['type'] => {
       switch (deviceType) {
@@ -50,10 +58,12 @@ const getDevice = async (): Promise<DeviceConfig> => {
         // outputType: Not available without native module
       },
       network: {
-        // carrier: await DeviceInfo.getCarrier(), not supported in react-native-device-info v10.0.0
+        carrier: (networkInfo.type === NetInfoStateType.cellular && networkInfo.details.carrier) || undefined,
         userAgent: await DeviceInfo.getUserAgent(),
-        // detail: Requires @react-native-community/netinfo
-        // type: Requires @react-native-community/netinfo
+        type: [NetInfoStateType.wifi, NetInfoStateType.cellular, NetInfoStateType.ethernet].includes(networkInfo.type)
+          ? (networkInfo.type as NetInfoStateType.wifi | NetInfoStateType.cellular | NetInfoStateType.ethernet)
+          : NetInfoStateType.other,
+        detail: (networkInfo.type === NetInfoStateType.cellular && networkInfo.details.cellularGeneration) || undefined,
       },
       os: {
         name: Platform.OS,
@@ -81,16 +91,22 @@ const getDevice = async (): Promise<DeviceConfig> => {
   }
 }
 
-const getApp = async (): Promise<AppConfig> => ({
-  bundleId: DeviceInfo.getBundleId(),
-
-  // not supported in react-native-device-info v10.0.0
-  // firstInstallTime: await DeviceInfo.getFirstInstallTime(),
-  // lastUpdateTime: await DeviceInfo.getLastUpdateTime(),
-  // startTime: await DeviceInfo.getStartupTime(),
-
-  version: DeviceInfo.getVersion(),
-})
+const getApp = async (): Promise<AppConfig> => {
+  try {
+    return {
+      bundleId: DeviceInfo.getBundleId(),
+      firstInstallTime: await DeviceInfo.getFirstInstallTime(),
+      lastUpdateTime: await DeviceInfo.getLastUpdateTime(),
+      version: DeviceInfo.getVersion(),
+      // Not supported in react-native-device-info v10
+      // startTime: await DeviceInfo.getStartupTime(),
+    }
+  } catch (error) {
+    console.error(error)
+    // @ts-expect-error
+    return {}
+  }
+}
 
 const getSdk = async (): Promise<SDKConfig> => ({
   name: 'sdk-react-native',

package/src/formats/Format.tsx

@@ -89,7 +89,9 @@ const Format = ({ code, messageId, wrapper, onEvent, ...otherParams }: FormatPro
   }
 
   const resetModal = () => {
+    debugModal('Format:resetModal')
     if (modalInitTimeoutRef.current) {
+      debugModal('Format:resetModalTimeout')
       clearTimeout(modalInitTimeoutRef.current)
       modalInitTimeoutRef.current = null
     }
@@ -130,14 +132,15 @@ const Format = ({ code, messageId, wrapper, onEvent, ...otherParams }: FormatPro
     })
   }
 
-  debug('format-update-state')
+  debug('Format:updateState')
 
   const onMessage = (event: WebViewMessageEvent) => {
     try {
       const data = JSON.parse(event.nativeEvent.data) as IframeMessage
 
-      debug('iframe-message', {
+      debug('Format:iframeMessage', {
         message: data,
+        params: { data }
       })
 
       const messageHandler = handleIframeMessage(
@@ -145,7 +148,14 @@ const Format = ({ code, messageId, wrapper, onEvent, ...otherParams }: FormatPro
           switch (message.type) {
             case 'init-iframe':
               setIframeLoaded(true)
-              debug('iframe-post-message')
+              debug('Format:iframePostMessage', {
+                params: {
+                  messages: context?.messages,
+                  sdk: 'sdk-react-native',
+                  otherParams,
+                  messageId,
+                }
+              })
               sendMessage(webViewRef, 'update-iframe', code, {
                 messages: context?.messages,
                 sdk: 'sdk-react-native',
@@ -216,7 +226,8 @@ const Format = ({ code, messageId, wrapper, onEvent, ...otherParams }: FormatPro
       )
       messageHandler({ data } as IframeMessageEvent)
     } catch (e) {
-      debug('iframe-message-error', {
+      debug('Format:iframeMessageError', {
+        params: { error: e },
         error: e,
       })
       console.error('error parsing message from webview', e)
@@ -228,7 +239,8 @@ const Format = ({ code, messageId, wrapper, onEvent, ...otherParams }: FormatPro
     try {
       const data = JSON.parse(event.nativeEvent.data) as IframeMessage
 
-      debugModal('modal-iframe-message', {
+      debugModal('Format:modalIframeMessage', {
+        params: { data },
         message: data,
       })
 
@@ -279,7 +291,8 @@ const Format = ({ code, messageId, wrapper, onEvent, ...otherParams }: FormatPro
       )
       messageHandler({ data } as IframeMessageEvent)
     } catch (e) {
-      debugModal('modal-iframe-message-error', {
+      debugModal('Format:modalIframeMessageError', {
+        params: { error: e },
         error: e,
       })
       console.error('error parsing message from webview', e)
@@ -291,9 +304,20 @@ const Format = ({ code, messageId, wrapper, onEvent, ...otherParams }: FormatPro
 
   useEffect(() => {
     if (!iframeLoaded || !context?.adServerUrl || !bid || !webViewRef.current) {
+      debug('Format:iframePostMessageNotLoaded', {
+        params: {
+          iframeLoaded,
+          contextAdServerUrl: context?.adServerUrl,
+          bid,
+        }
+      })
       return
     }
-    debug('iframe-post-message')
+    debug('Format:iframePostMessage', {
+      params: {
+        otherParams
+      }
+    })
     sendMessage(webViewRef, 'update-iframe', code, {
       data: { otherParams },
       code,
@@ -302,7 +326,17 @@ const Format = ({ code, messageId, wrapper, onEvent, ...otherParams }: FormatPro
   }, [paramsString, iframeLoaded, context?.adServerUrl, bid, code])
 
   const checkIfInViewport = () => {
-    if (!containerRef.current) return
+    if (!containerRef.current) {
+      debug('Format:checkIfInViewportNoContainer')
+      return
+    }
+
+    debug('Format:checkIfInViewportMeasure', {
+      params: {
+        windowWidth,
+        windowHeight,
+      }
+    })
 
     containerRef.current.measureInWindow((containerX, containerY, containerWidth, containerHeight) => {
       sendMessage(webViewRef, 'update-dimensions-iframe', code, {
@@ -314,24 +348,47 @@ const Format = ({ code, messageId, wrapper, onEvent, ...otherParams }: FormatPro
         containerY,
         keyboardHeight: keyboardHeightRef.current,
       })
+      debug('Format:checkIfInViewportMeasureSend', {
+        params: {
+          windowWidth,
+          windowHeight,
+          containerWidth,
+          containerHeight,
+          containerX,
+          containerY,
+          keyboardHeight: keyboardHeightRef.current,
+        }
+      })
     })
   }
 
   useEffect(() => {
-    if (!isAdViewVisible) return
+    if (!isAdViewVisible) {
+      debug('Format:checkIfInViewportNotVisible')
+      return
+    }
 
     const interval = setInterval(() => {
       checkIfInViewport()
     }, 250)
 
-    return () => clearInterval(interval)
+    return () => {
+      clearInterval(interval)
+      debug('Format:checkIfInViewportCleanup')
+    }
   }, [isAdViewVisible])
 
   useEffect(() => {
     const showSubscription = Keyboard.addListener('keyboardDidShow', (e) => {
+      debug('Format:keyboardDidShow', {
+        params: {
+          keyboardHeight: e?.endCoordinates?.height ?? 0,
+        }
+      })
       keyboardHeightRef.current = e?.endCoordinates?.height ?? 0
     })
     const hideSubscription = Keyboard.addListener('keyboardDidHide', () => {
+      debug('Format:keyboardDidHide')
       keyboardHeightRef.current = 0
     })
 
@@ -339,10 +396,18 @@ const Format = ({ code, messageId, wrapper, onEvent, ...otherParams }: FormatPro
       showSubscription.remove()
       hideSubscription.remove()
       keyboardHeightRef.current = 0
+      debug('Format:keyboardEffectCleanup')
     }
   }, [])
 
   if (!context || !bid || !iframeUrl) {
+    debug('Format:noContextOrBidOrIframeUrl', {
+      params: {
+        context,
+        bid,
+        iframeUrl,
+      }
+    })
     return null
   }
 
@@ -359,11 +424,11 @@ const Format = ({ code, messageId, wrapper, onEvent, ...otherParams }: FormatPro
         ...iframeStyles,
       }}
       onError={() => {
-        debug('iframe-error')
+        debug('Format:iframeError')
         reset()
       }}
       onLoad={() => {
-        debug('iframe-load')
+        debug('Format:iframeLoad')
       }}
     />
   )
@@ -394,11 +459,11 @@ const Format = ({ code, messageId, wrapper, onEvent, ...otherParams }: FormatPro
             borderWidth: 0,
           }}
           onError={() => {
-            debug('modal-error')
+            debug('Format:modalError')
             resetModal()
           }}
           onLoad={() => {
-            debug('modal-load')
+            debug('Format:modalLoad')
             setModalLoaded(true)
           }}
         />