@tenqube/visual-reward-react-native 1.1.4 → 1.1.6

package/src/RewardWebView.tsx

@@ -15,38 +15,22 @@ import {
 } from "react-native";
 import WebView, { WebViewMessageEvent } from "react-native-webview";
 import type { WebViewNavigation } from "react-native-webview/lib/WebViewTypes";
-import DeviceInfo from "react-native-device-info";
-import AdvertisingIdAaid from "react-native-idfa-aaid";
-import NetInfo from "@react-native-community/netinfo";
-import Orientation from "react-native-orientation-locker";
 
 import type { RewardWebViewHandle, RewardWebViewProps } from "./types";
 import { isAllowedDomain, normalizeUrl } from "./utils";
 import {
   attachAdBridges,
+  getAdvertisingId,
+  getAppVersion,
+  getDeviceInfo,
+  getIDFV,
   handleIntentScheme,
   hasTrackingDescription,
+  lockPortrait,
+  requestTrackingAuthorization,
+  unlockOrientations,
 } from "./NativeVisualReward";
 
-// ─── ATT 요청 (iOS) ──────────────────────────────────────────────────────────
-// react-native-permissions로 ATT 권한 요청.
-// NSUserTrackingUsageDescription이 없으면 try/catch로 스킵.
-let requestTrackingPermission: (() => Promise<void>) | null = null;
-if (Platform.OS === "ios") {
-  try {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const { request, PERMISSIONS } = require("react-native-permissions") as {
-      request: (permission: string) => Promise<string>;
-      PERMISSIONS: { IOS: { APP_TRACKING_TRANSPARENCY: string } };
-    };
-    requestTrackingPermission = async () => {
-      await request(PERMISSIONS.IOS.APP_TRACKING_TRANSPARENCY);
-    };
-  } catch (_) {
-    requestTrackingPermission = null;
-  }
-}
-
 // ─── 폴리필 스크립트 ──────────────────────────────────────────────────────────
 /**
  * Android / iOS 양쪽 호출 방식을 통합하는 폴리필을 웹뷰에 주입합니다.
@@ -166,9 +150,9 @@ const RewardWebView = React.forwardRef<RewardWebViewHandle, RewardWebViewProps>(
 
     // ── 세로 모드 고정 ──────────────────────────────────────────────────────────
     useEffect(() => {
-      Orientation.lockToPortrait();
+      lockPortrait();
       return () => {
-        Orientation.unlockAllOrientations();
+        unlockOrientations();
       };
     }, []);
 
@@ -280,10 +264,7 @@ const RewardWebView = React.forwardRef<RewardWebViewHandle, RewardWebViewProps>(
         switch (fncName) {
           // ── getAppVersion ──────────────────────────────────────────────────
           case "getAppVersion": {
-            let version = "";
-            try {
-              version = DeviceInfo.getVersion();
-            } catch (_) {}
+            const version = await getAppVersion();
             callNativeCallback("getAppVersion", version);
             break;
           }
@@ -292,11 +273,8 @@ const RewardWebView = React.forwardRef<RewardWebViewHandle, RewardWebViewProps>(
           case "getADID": {
             let adId = "";
             if (Platform.OS === "android") {
-              try {
-                const result = await AdvertisingIdAaid.getAdvertisingInfo();
-                const id = result.id ?? "";
-                if (id !== "00000000-0000-0000-0000-000000000000") adId = id;
-              } catch (_) {}
+              // 네이티브(AdvertisingIdClient)에 위임. 제로 UUID 필터링도 네이티브에서 처리.
+              adId = await getAdvertisingId();
             }
             callNativeCallback("getADID", adId);
             break;
@@ -306,11 +284,8 @@ const RewardWebView = React.forwardRef<RewardWebViewHandle, RewardWebViewProps>(
           case "getIDFA": {
             let idfa = "";
             if (Platform.OS === "ios") {
-              try {
-                const result = await AdvertisingIdAaid.getAdvertisingInfo();
-                const id = result.id ?? "";
-                if (id !== "00000000-0000-0000-0000-000000000000") idfa = id;
-              } catch (_) {}
+              // 네이티브(ASIdentifierManager)에 위임. Swift 와 동일하게 ATT 승인 시에만 반환.
+              idfa = await getAdvertisingId();
             }
             callNativeCallback("getIDFA", idfa);
             break;
@@ -318,37 +293,17 @@ const RewardWebView = React.forwardRef<RewardWebViewHandle, RewardWebViewProps>(
 
           // ── getIDFV (iOS only) ────────────────────────────────────────────
           case "getIDFV": {
-            let idfv = "";
-            if (Platform.OS === "ios") {
-              try {
-                idfv = await DeviceInfo.getUniqueId();
-              } catch (_) {}
-            }
+            const idfv = await getIDFV();
             callNativeCallback("getIDFV", idfv);
             break;
           }
 
           // ── getDeviceInfo ─────────────────────────────────────────────────
           case "getDeviceInfo": {
-            const info: Record<string, string> = {};
-            try {
-              const netState = await NetInfo.fetch();
-              if (netState.type === "wifi") info.network = "wifi";
-              else if (netState.type === "cellular") info.network = "mobile";
-            } catch (_) {}
-            try {
-              if (Platform.OS === "android") {
-                info.model = DeviceInfo.getModel();
-                info.manufacturer = await DeviceInfo.getManufacturer();
-                info.osVersion = DeviceInfo.getSystemVersion();
-              } else {
-                // iOS: hardware id (예: "iPhone16,1")
-                info.model = await DeviceInfo.getDeviceId();
-                info.manufacturer = "Apple";
-                info.osVersion = DeviceInfo.getSystemVersion();
-              }
-            } catch (_) {}
-            callNativeCallback("getDeviceInfo", JSON.stringify(info));
+            // 네이티브에서 network/model/manufacturer/osVersion 을 JSON 문자열로 조립해 반환.
+            // 웹 콜백은 문자열을 받아 JSON.parse 하므로 rawValue=false(기본)로 감싼다.
+            const info = await getDeviceInfo();
+            callNativeCallback("getDeviceInfo", info);
             break;
           }
 
@@ -469,10 +424,11 @@ const RewardWebView = React.forwardRef<RewardWebViewHandle, RewardWebViewProps>(
     const handleLoadEnd = useCallback(async () => {
       if (attachStartedRef.current) return; // 실제 URL 로드 완료 시엔 재실행 안 함
       attachStartedRef.current = true;
-      if (Platform.OS === "ios" && requestTrackingPermission) {
+      if (Platform.OS === "ios") {
+        // 네이티브 ATTrackingManager 로 ATT 요청. NSUserTrackingUsageDescription 이 있을 때만.
         try {
           if (await hasTrackingDescription()) {
-            await requestTrackingPermission();
+            await requestTrackingAuthorization();
           }
         } catch (_) {}
       }

package/src/VisualReward.ts

@@ -5,7 +5,7 @@ import type {
   VisualRewardInitializeOptions,
   VisualRewardOpenOptions,
 } from './types';
-import { readCache, writeCache, setStorage, AsyncStorageLike } from './ConfigCache';
+import { readCache, writeCache, setStorage } from './ConfigCache';
 
 const OPEN_TIMEOUT_MS = 5_000;
 // config fetch 연결/읽기 타임아웃 (다른 플랫폼과 동일: 10초).
@@ -39,10 +39,13 @@ export class VisualReward {
   static initialize(options: VisualRewardInitializeOptions): void {
     const {
       appKey,
+      storage,
       timeoutMs = 5_000,
       onSuccess,
       onFailure,
     } = options;
+    // config 캐싱용 AsyncStorage 주입 (선택). fetchConfig가 캐시를 읽기 전에 설정한다.
+    if (storage) setStorage(storage);
     VisualReward._initGeneration++;
     const generation = VisualReward._initGeneration;
     VisualReward._openTimeoutMs = timeoutMs;
@@ -65,11 +68,6 @@ export class VisualReward {
     VisualReward._debugEnabled = enabled;
   }
 
-  /** AsyncStorage 구현체를 주입합니다. initialize() 전에 호출합니다. */
-  static setStorage(storage: AsyncStorageLike): void {
-    setStorage(storage);
-  }
-
   /** 사용자 식별자를 설정합니다. open() 전에 반드시 호출합니다. */
   static setUserId(userId: string): void {
     VisualReward._userId = userId;

package/src/VisualRewardContainer.tsx

@@ -7,11 +7,13 @@ import {
   StyleSheet,
   View,
 } from "react-native";
-import { SafeAreaProvider, SafeAreaView } from "react-native-safe-area-context";
 import RewardWebView from "./RewardWebView";
 import { VisualReward } from "./VisualReward";
+import { getSafeAreaInsets, type SafeAreaInsets } from "./NativeVisualReward";
 import type { RewardWebViewHandle, RewardWebViewProps } from "./types";
 
+const ZERO_INSETS: SafeAreaInsets = { top: 0, bottom: 0, left: 0, right: 0 };
+
 /**
  * VisualRewardContainer
  *
@@ -41,6 +43,20 @@ const VisualRewardContainer: React.FC = () => {
   const optionsRef = useRef<RewardWebViewProps | null>(null);
   optionsRef.current = options;
 
+  // safe-area inset — react-native-safe-area-context 대신 네이티브에서 조회한다.
+  // (Modal 은 별도 window 라 상/하단 inset 을 다시 적용해야 상태바·제스처바에 안 가린다.)
+  const [insets, setInsets] = useState<SafeAreaInsets>(ZERO_INSETS);
+  useEffect(() => {
+    if (!visible) return;
+    let cancelled = false;
+    getSafeAreaInsets().then((v) => {
+      if (!cancelled) setInsets(v);
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [visible]);
+
   // VisualReward 싱글톤에 핸들러 등록
   useEffect(() => {
     VisualReward._register((opts) => {
@@ -80,28 +96,36 @@ const VisualRewardContainer: React.FC = () => {
       visible={visible}
       animationType="slide"
       presentationStyle="fullScreen"
+      // Android: 상/하단 모두 edge-to-edge 로 둔다. targetSdk 35+ 는 Activity 가 edge-to-edge 로
+      // 강제되므로, Modal 하단도 네비게이션 바 아래까지 그려지게 해야(navigationBarTranslucent)
+      // 네이티브 systemBars inset 을 padding 으로 적용했을 때 이중 여백이 생기지 않는다.
+      // (navigationBarTranslucent 는 statusBarTranslucent 가 true 여야 동작)
       statusBarTranslucent={Platform.OS === "android"}
+      navigationBarTranslucent={Platform.OS === "android"}
       onRequestClose={handleBackPress}
     >
-      {/* Modal 은 별도 window 라 자체 SafeAreaProvider 로 inset 을 다시 측정한다.
+      {/* Modal 은 별도 window 라 네이티브에서 얻은 inset 을 상/하단 padding 으로 다시 적용한다.
           상단 safe-area 를 흰색으로 두고 상태바 아이콘을 dark-content(검정)로 표시한다. */}
-      <SafeAreaProvider style={styles.safeArea}>
+      <View
+        style={[
+          styles.safeArea,
+          { paddingTop: insets.top, paddingBottom: insets.bottom },
+        ]}
+      >
         <StatusBar barStyle="dark-content" backgroundColor="#ffffff" />
-        <SafeAreaView style={styles.safeArea} edges={["top", "bottom"]}>
-          <View style={styles.container}>
-            {options && (
-              <RewardWebView
-                ref={rewardWebViewRef}
-                key={options.url}
-                url={options.url}
-                allowedDomains={options.allowedDomains}
-                debugEnabled={options.debugEnabled ?? false}
-                onClose={handleClose}
-              />
-            )}
-          </View>
-        </SafeAreaView>
-      </SafeAreaProvider>
+        <View style={styles.container}>
+          {options && (
+            <RewardWebView
+              ref={rewardWebViewRef}
+              key={options.url}
+              url={options.url}
+              allowedDomains={options.allowedDomains}
+              debugEnabled={options.debugEnabled ?? false}
+              onClose={handleClose}
+            />
+          )}
+        </View>
+      </View>
     </Modal>
   );
 };

package/src/types.ts

@@ -18,9 +18,21 @@ export class VisualRewardError extends Error {
   }
 }
 
+/** AsyncStorage 호환 인터페이스 (config 캐시 저장소). */
+export interface AsyncStorageLike {
+  getItem(key: string): Promise<string | null>;
+  setItem(key: string, value: string): Promise<void>;
+  removeItem(key: string): Promise<void>;
+}
+
 export interface VisualRewardInitializeOptions {
   /** 앱 식별 키 */
   appKey: string;
+  /**
+   * config 캐싱용 AsyncStorage 구현체 (선택).
+   * 주입하지 않으면 매번 네트워크에서 config를 fetch합니다.
+   */
+  storage?: AsyncStorageLike;
   /** initialize() 완료 대기 타임아웃 (ms). 기본값 `5000`. */
   timeoutMs?: number;
   /** 초기화 성공 콜백 (선택). */