@kontextso/sdk-react-native 3.0.4 → 3.0.6

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);
   };
@@ -118,7 +119,7 @@ var Format = ({ code, messageId, wrapper, onEvent, ...otherParams }) => {
   const bid = (0, import_sdk_react.useBid)({ code, messageId });
   const [height, setHeight] = (0, import_react2.useState)(0);
   const cachedContent = getCachedContent(context, bid?.bidId);
-  const iframeUrl = (0, import_sdk_react.useIframeUrl)(context, bid, code, messageId, "sdk-react-native", otherParams.theme, cachedContent);
+  const iframeUrl = (0, import_sdk_react.useIframeUrl)(bid, code, messageId, "sdk-react-native", otherParams.theme, cachedContent);
   const modalUrl = iframeUrl.replace("/api/frame/", "/api/modal/");
   const [showIframe, setShowIframe] = (0, import_react2.useState)(false);
   const [iframeLoaded, setIframeLoaded] = (0, import_react2.useState)(false);
@@ -454,16 +455,17 @@ 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.6";
+
 // src/NativeRNKontext.ts
 var import_react_native2 = require("react-native");
 var NativeRNKontext_default = import_react_native2.TurboModuleRegistry.getEnforcing("RNKontext");
 
-// package.json
-var version = "3.0.4";
-
 // src/context/AdsProvider.tsx
 var import_jsx_runtime4 = require("react/jsx-runtime");
 ErrorUtils.setGlobalHandler((error, isFatal) => {
@@ -479,6 +481,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":
@@ -496,7 +499,7 @@ var getDevice = async () => {
     return {
       hardware: {
         brand: import_react_native_device_info.default.getBrand(),
-        model: import_react_native_device_info.default.getModel(),
+        model: import_react_native_device_info.default.getDeviceId(),
         type: mapDeviceTypeToHardwareType()
         // bootTime: Not available without native module
         // sdCardAvailable: Not available without native module
@@ -508,10 +511,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 +540,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);
   };
@@ -87,7 +88,7 @@ var Format = ({ code, messageId, wrapper, onEvent, ...otherParams }) => {
   const bid = useBid({ code, messageId });
   const [height, setHeight] = useState(0);
   const cachedContent = getCachedContent(context, bid?.bidId);
-  const iframeUrl = useIframeUrl(context, bid, code, messageId, "sdk-react-native", otherParams.theme, cachedContent);
+  const iframeUrl = useIframeUrl(bid, code, messageId, "sdk-react-native", otherParams.theme, cachedContent);
   const modalUrl = iframeUrl.replace("/api/frame/", "/api/modal/");
   const [showIframe, setShowIframe] = useState(false);
   const [iframeLoaded, setIframeLoaded] = useState(false);
@@ -422,17 +423,21 @@ var InlineAd = ({ code, messageId, wrapper, ...props }) => {
 var InlineAd_default = InlineAd;
 
 // src/context/AdsProvider.tsx
-import { AdsProviderInternal, log } from "@kontextso/sdk-react";
-import { Platform, Dimensions, PixelRatio, Appearance } from "react-native";
+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.6";
+
 // src/NativeRNKontext.ts
 import { TurboModuleRegistry } from "react-native";
 var NativeRNKontext_default = TurboModuleRegistry.getEnforcing("RNKontext");
 
-// package.json
-var version = "3.0.4";
-
 // src/context/AdsProvider.tsx
 import { jsx as jsx4 } from "react/jsx-runtime";
 ErrorUtils.setGlobalHandler((error, isFatal) => {
@@ -448,6 +453,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":
@@ -465,7 +471,7 @@ var getDevice = async () => {
     return {
       hardware: {
         brand: DeviceInfo.getBrand(),
-        model: DeviceInfo.getModel(),
+        model: DeviceInfo.getDeviceId(),
         type: mapDeviceTypeToHardwareType()
         // bootTime: Not available without native module
         // sdCardAvailable: Not available without native module
@@ -477,10 +483,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 +512,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.4",
+  "version": "3.0.6",
   "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.4"
+    "@kontextso/sdk-react": "^3.0.5"
   },
   "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,9 +1,16 @@
-import type { AdsProviderProps, AppConfig, DeviceConfig, SDKConfig } from '@kontextso/sdk-react'
-import { AdsProviderInternal, log } from '@kontextso/sdk-react'
-import { Platform, Dimensions, PixelRatio, Appearance } from 'react-native'
+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 KontextSDK from '../NativeRNKontext'
 import { version } from '../../package.json'
+import KontextSDK from '../NativeRNKontext'
 
 ErrorUtils.setGlobalHandler((error, isFatal) => {
   if (!isFatal) {
@@ -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) {
@@ -38,7 +46,7 @@ const getDevice = async (): Promise<DeviceConfig> => {
     return {
       hardware: {
         brand: DeviceInfo.getBrand(),
-        model: DeviceInfo.getModel(),
+        model: DeviceInfo.getDeviceId(),
         type: mapDeviceTypeToHardwareType(),
         // bootTime: Not available without native module
         // sdCardAvailable: Not available without native module
@@ -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

@@ -52,7 +52,7 @@ const Format = ({ code, messageId, wrapper, onEvent, ...otherParams }: FormatPro
 
   const cachedContent = getCachedContent(context, bid?.bidId)
 
-  const iframeUrl = useIframeUrl(context, bid, code, messageId, 'sdk-react-native', otherParams.theme, cachedContent)
+  const iframeUrl = useIframeUrl(bid, code, messageId, 'sdk-react-native', otherParams.theme, cachedContent)
   const modalUrl = iframeUrl.replace('/api/frame/', '/api/modal/')
 
   const [showIframe, setShowIframe] = useState<boolean>(false)