adwhale-sdk-react-native 2.7.204 → 2.7.400

package/src/AdWhaleNativeTemplateView.tsx

@@ -1,9 +1,10 @@
 // src/AdWhaleNativeTemplateView.tsx
-import React, { forwardRef, useImperativeHandle, useRef } from 'react';
-import { requireNativeComponent, UIManager, findNodeHandle } from 'react-native';
+import { forwardRef, useImperativeHandle, useState } from 'react';
+import { Platform, requireNativeComponent } from 'react-native';
 import type {
   NativeSyntheticEvent,
   StyleProp,
+  ViewProps,
   ViewStyle,
 } from 'react-native';
 
@@ -29,8 +30,8 @@ export interface AdWhaleNativeTemplateStyle {
 }
 
 export interface AdWhaleNativeTemplateError {
-  errorCode: number;
-  errorMessage: string;
+  statusCode: number;
+  message: string;
 }
 
 export interface AdWhaleNativeTemplateGcoder {
@@ -47,9 +48,24 @@ export interface AdWhaleNativeTemplateViewProps {
   template: AdWhaleNativeTemplateType;
   templateStyle?: AdWhaleNativeTemplateStyle;
 
-  onAdLoaded?: () => void;
-  onAdFailedToLoad?: (event: AdWhaleNativeTemplateError) => void;
-  onAdShowFailed?: (event: AdWhaleNativeTemplateError) => void;
+  /**
+   * Android Fabric: `ref.loadAd()` 대신 부모 state로 증가시키는 방식(권장).
+   * 지정 시 0은 무시, 1 이상이 바뀔 때마다 네이티브 load. 타입 전환 시 0으로 리셋 후 증가.
+   */
+  loadSignal?: number;
+  /** {@link loadSignal}과 동일하게 표시 트리거 */
+  showSignal?: number;
+  /**
+   * 템플릿/스타일 전환 시마다 바꿔 주는 논리 인스턴스 키(예: `adViewKey`).
+   * `loadSignal`이 다시 1이 되어도 네이티브가 이전 인스턴스와 동일 요청으로 오인해 스킵하지 않게 합니다.
+   */
+  viewSyncKey?: number;
+
+  onNativeAdLoaded?: () => void;
+  onNativeAdFailedToLoad?: (event: AdWhaleNativeTemplateError) => void;
+  onNativeAdShowFailed?: (event: AdWhaleNativeTemplateError) => void;
+  onNativeAdClicked?: () => void;
+  onNativeAdClosed?: () => void;
 }
 
 export interface AdWhaleNativeTemplateHandle {
@@ -62,10 +78,19 @@ type NativeErrorEvent = NativeSyntheticEvent<AdWhaleNativeTemplateError>;
 interface NativeProps
   extends Omit<
     AdWhaleNativeTemplateViewProps,
-    'onAdFailedToLoad' | 'onAdShowFailed'
-  > {
-  onAdFailedToLoad?: (e: NativeErrorEvent) => void;
-  onAdShowFailed?: (e: NativeErrorEvent) => void;
+    | 'onNativeAdFailedToLoad'
+    | 'onNativeAdShowFailed'
+    | 'loadSignal'
+    | 'showSignal'
+    | 'viewSyncKey'
+  >,
+    Pick<ViewProps, 'collapsable'> {
+  onNativeAdFailedToLoad?: (e: NativeErrorEvent) => void;
+  onNativeAdShowFailed?: (e: NativeErrorEvent) => void;
+  /** Android: Fabric에서 View 명령이 무시되는 경우를 피하기 위해 prop으로 전달 */
+  loadRequestId?: number;
+  showRequestId?: number;
+  viewSyncKey?: number;
 }
 
 const VIEW_MANAGER_NAME = 'RNAdWhaleMediationTemplateNativeAdView';
@@ -77,51 +102,63 @@ export const AdWhaleNativeTemplateView = forwardRef<
   AdWhaleNativeTemplateHandle,
   AdWhaleNativeTemplateViewProps
 >((props, ref) => {
-  const innerRef = useRef<React.ElementRef<typeof NativeComponent>>(null);
+  if (Platform.OS === 'ios') {
+    // iOS는 커스텀 바인딩만 지원 (템플릿 바인딩 미지원)
+    return null;
+  }
+  const {
+    loadSignal,
+    showSignal,
+    viewSyncKey,
+    onNativeAdFailedToLoad,
+    onNativeAdShowFailed,
+    ...nativeRest
+  } = props;
+
+  const [internalLoadId, setInternalLoadId] = useState(0);
+  const [internalShowId, setInternalShowId] = useState(0);
+
+  const useExternalLoad = loadSignal !== undefined;
+  const useExternalShow = showSignal !== undefined;
+  const loadRequestIdForNative = useExternalLoad ? loadSignal : internalLoadId;
+  const showRequestIdForNative = useExternalShow ? showSignal : internalShowId;
 
   useImperativeHandle(ref, () => ({
     loadAd() {
-      const handle = findNodeHandle(innerRef.current);
-      if (!handle) return;
-      const config = UIManager.getViewManagerConfig(VIEW_MANAGER_NAME) as
-        | { Commands?: { loadAd?: number; showAd?: number } }
-        | undefined;
-      if (!config?.Commands?.loadAd) return;
-      UIManager.dispatchViewManagerCommand(
-        handle,
-        config.Commands.loadAd,
-        [],
-      );
+      if (useExternalLoad) {
+        return;
+      }
+      setInternalLoadId(v => v + 1);
     },
     showAd() {
-      const handle = findNodeHandle(innerRef.current);
-      if (!handle) return;
-      const config = UIManager.getViewManagerConfig(VIEW_MANAGER_NAME) as
-        | { Commands?: { loadAd?: number; showAd?: number } }
-        | undefined;
-      if (!config?.Commands?.showAd) return;
-      UIManager.dispatchViewManagerCommand(
-        handle,
-        config.Commands.showAd,
-        [],
-      );
+      if (useExternalShow) {
+        return;
+      }
+      setInternalShowId(v => v + 1);
     },
   }));
 
-  const handleFailedToLoad: NativeProps['onAdFailedToLoad'] = e => {
-    props.onAdFailedToLoad?.(e.nativeEvent);
+  const handleFailedToLoad: NativeProps['onNativeAdFailedToLoad'] = e => {
+    onNativeAdFailedToLoad?.(e.nativeEvent);
   };
 
-  const handleShowFailed: NativeProps['onAdShowFailed'] = e => {
-    props.onAdShowFailed?.(e.nativeEvent);
+  const handleShowFailed: NativeProps['onNativeAdShowFailed'] = e => {
+    onNativeAdShowFailed?.(e.nativeEvent);
   };
 
   return (
     <NativeComponent
-      ref={innerRef}
-      {...props}
-      onAdFailedToLoad={props.onAdFailedToLoad ? handleFailedToLoad : undefined}
-      onAdShowFailed={props.onAdShowFailed ? handleShowFailed : undefined}
+      collapsable={false}
+      {...nativeRest}
+      viewSyncKey={viewSyncKey ?? -1}
+      loadRequestId={loadRequestIdForNative}
+      showRequestId={showRequestIdForNative}
+      onNativeAdFailedToLoad={
+        onNativeAdFailedToLoad ? handleFailedToLoad : undefined
+      }
+      onNativeAdShowFailed={
+        onNativeAdShowFailed ? handleShowFailed : undefined
+      }
     />
   );
 });

package/src/AdWhaleRewardAd.ts

@@ -8,8 +8,14 @@ export interface AdWhaleRewardErrorEvent {
 }
 
 export interface AdWhaleRewardUserRewardedEvent {
-  type: string;
-  amount: number;
+  /** Flutter payload key */
+  RewardType?: string;
+  /** Flutter payload key */
+  RewardAmount?: number;
+  /** 레거시 호환 */
+  type?: string;
+  /** 레거시 호환 */
+  amount?: number;
 }
 
 export interface AdWhaleRewardEvents {
@@ -27,59 +33,222 @@ export interface AdWhaleRewardGcoder {
   lng: number;
 }
 
+/**
+ * 보상형 광고 로드 시 함께 지정할 수 있는 옵션.
+ * placementName / region / gcoder 는 기존 옵션이며,
+ * userId / customData 는 보상형 SSV(서버 사이드 검증) 전용 옵션입니다.
+ */
+export interface AdWhaleRewardLoadOptions {
+  placementName?: string;
+  region?: string;
+  gcoder?: AdWhaleRewardGcoder;
+  /**
+   * 보상형 SSV(서버 사이드 검증)용 앱 사용자 id.
+   * AdMob / AdManager SSV postback 의 user_id 로 전달됩니다.
+   * (그 외 네트워크에서는 무시됩니다.)
+   */
+  userId?: string;
+  /**
+   * 보상형 SSV(서버 사이드 검증)용 커스텀 데이터.
+   * AdMob / AdManager SSV postback 의 custom_data 로 전달되며,
+   * 네이티브에서 JSON 문자열로 직렬화되어 실립니다.
+   * (그 외 네트워크에서는 무시됩니다.)
+   */
+  customData?: { [key: string]: string };
+}
+
 interface RNAdWhaleMediationRewardAdNativeModule {
-  setPlacementName(placementName: string): void;
-  setRegion(region: string): void;
-  setGcoder(gcoder: { lt: number; lng: number }): void;
-  loadAd(placementUid: string): void;
-  showAd(): void;
+  setPlacementName?(placementName: string): void;
+  setRegion?(region: string): void;
+  setGcoder?(gcoder: { lt: number; lng: number }): void;
+  setUserId?(userId: string): void;
+  setCustomData?(customData: { [key: string]: string }): void;
+  loadAd?(placementUid: string): void;
+  showAd?(): void;
+  loadRewardAd?(args: {
+    adId: number;
+    placementUid: string;
+    placementName?: string;
+    region?: string;
+    gcoder?: [number, number];
+    userId?: string;
+    customData?: { [key: string]: string };
+  }): void;
+  showAdWithoutView?(adId: number): void;
+  destroyAd?(adId: number): void;
   addListener(eventName: string): void;
   removeListeners(count: number): void;
 }
 
+const LINKING_ERROR =
+  'RNAdWhaleMediationRewardAd native module is not linked on this platform.';
+
 const { RNAdWhaleMediationRewardAd } = NativeModules as {
-  RNAdWhaleMediationRewardAd: RNAdWhaleMediationRewardAdNativeModule;
+  RNAdWhaleMediationRewardAd?: RNAdWhaleMediationRewardAdNativeModule;
 };
 
-const rewardEmitter = new NativeEventEmitter(RNAdWhaleMediationRewardAd);
+const rewardEmitter = RNAdWhaleMediationRewardAd
+  ? new NativeEventEmitter(RNAdWhaleMediationRewardAd)
+  : null;
 
 export const AdWhaleRewardAd = {
-  loadAd(
-    placementUid: string,
-    options?: {
-      placementName?: string;
-      region?: string;
-      gcoder?: AdWhaleRewardGcoder;
-    },
-  ) {
+  /**
+   * 보상형 SSV(서버 사이드 검증)용 앱 사용자 id 설정.
+   *
+   * - AdMob / AdManager 의 SSV postback `user_id` 로 전달됩니다. 그 외 네트워크에서는 무시(no-op)됩니다.
+   * - `loadAd()` 호출 전에 설정하는 것을 권장하며, `showAd()` 이전까지 호출할 수 있습니다.
+   * - 여러 번 호출하면 마지막 값이 적용됩니다.
+   *
+   * 참고: `loadAd(placementUid, { userId })` 옵션으로도 동일하게 지정할 수 있습니다.
+   */
+  setUserId(userId: string) {
+    if (!RNAdWhaleMediationRewardAd) {
+      console.warn(LINKING_ERROR);
+      return;
+    }
+    RNAdWhaleMediationRewardAd.setUserId?.(userId);
+  },
+
+  /**
+   * 보상형 SSV(서버 사이드 검증)용 커스텀 데이터 설정.
+   *
+   * - AdMob / AdManager 의 SSV postback `custom_data` 로 전달됩니다. 그 외 네트워크에서는 무시(no-op)됩니다.
+   * - 전달한 객체는 네이티브에서 JSON 문자열로 직렬화되어 단일 문자열 필드에 실립니다.
+   *   퍼블리셔 서버는 postback 의 `custom_data` 값을 JSON 으로 파싱해야 합니다.
+   * - AdMob 의 `custom_data` 는 실무상 200자 정도를 넘기면 잘릴 수 있으니 길이에 유의하세요.
+   * - `loadAd()` 호출 전에 설정하는 것을 권장하며, `showAd()` 이전까지 호출할 수 있습니다.
+   *
+   * 참고: `loadAd(placementUid, { customData })` 옵션으로도 동일하게 지정할 수 있습니다.
+   */
+  setCustomData(customData: { [key: string]: string }) {
+    if (!RNAdWhaleMediationRewardAd) {
+      console.warn(LINKING_ERROR);
+      return;
+    }
+    RNAdWhaleMediationRewardAd.setCustomData?.(customData);
+  },
+
+  loadAd(placementUid: string, options?: AdWhaleRewardLoadOptions) {
+    if (!RNAdWhaleMediationRewardAd) {
+      console.warn(LINKING_ERROR);
+      return;
+    }
     // 먼저 옵션들을 설정
     if (options?.placementName) {
-      RNAdWhaleMediationRewardAd.setPlacementName(options.placementName);
+      RNAdWhaleMediationRewardAd.setPlacementName?.(options.placementName);
     }
     if (options?.region) {
-      RNAdWhaleMediationRewardAd.setRegion(options.region);
+      RNAdWhaleMediationRewardAd.setRegion?.(options.region);
     }
     if (options?.gcoder) {
-      RNAdWhaleMediationRewardAd.setGcoder(options.gcoder);
+      RNAdWhaleMediationRewardAd.setGcoder?.(options.gcoder);
+    }
+    // 보상형 SSV(서버 사이드 검증) 옵션
+    if (options?.userId) {
+      RNAdWhaleMediationRewardAd.setUserId?.(options.userId);
+    }
+    if (options?.customData) {
+      RNAdWhaleMediationRewardAd.setCustomData?.(options.customData);
+    }
+    if (RNAdWhaleMediationRewardAd.loadAd) {
+      RNAdWhaleMediationRewardAd.loadAd(placementUid);
+      return;
     }
-    // 그 다음 loadAd 호출
-    RNAdWhaleMediationRewardAd.loadAd(placementUid);
+    if (RNAdWhaleMediationRewardAd.loadRewardAd) {
+      RNAdWhaleMediationRewardAd.loadRewardAd({
+        adId: 0,
+        placementUid,
+        placementName: options?.placementName,
+        region: options?.region,
+        gcoder: options?.gcoder
+          ? [options.gcoder.lt, options.gcoder.lng]
+          : undefined,
+        userId: options?.userId,
+        customData: options?.customData,
+      });
+      return;
+    }
+    console.warn(
+      '[AdWhaleRewardAd] Native module missing both loadAd and loadRewardAd.',
+    );
   },
 
   showAd() {
-    RNAdWhaleMediationRewardAd.showAd();
+    if (!RNAdWhaleMediationRewardAd) {
+      console.warn(LINKING_ERROR);
+      return;
+    }
+    if (RNAdWhaleMediationRewardAd.showAd) {
+      RNAdWhaleMediationRewardAd.showAd();
+      return;
+    }
+    if (RNAdWhaleMediationRewardAd.showAdWithoutView) {
+      RNAdWhaleMediationRewardAd.showAdWithoutView(0);
+      return;
+    }
+    console.warn(
+      '[AdWhaleRewardAd] Native module missing both showAd and showAdWithoutView.',
+    );
+  },
+
+  /** Flutter와 동일한 신규 API (권장) */
+  loadRewardAd(
+    adId: number,
+    placementUid: string,
+    options?: AdWhaleRewardLoadOptions,
+  ) {
+    if (!RNAdWhaleMediationRewardAd) {
+      console.warn(LINKING_ERROR);
+      return;
+    }
+    if (!RNAdWhaleMediationRewardAd.loadRewardAd) {
+      this.loadAd(placementUid, options);
+      return;
+    }
+    RNAdWhaleMediationRewardAd.loadRewardAd({
+      adId,
+      placementUid,
+      placementName: options?.placementName,
+      region: options?.region,
+      gcoder: options?.gcoder ? [options.gcoder.lt, options.gcoder.lng] : undefined,
+      userId: options?.userId,
+      customData: options?.customData,
+    });
+  },
+
+  showAdWithoutView(adId: number) {
+    if (!RNAdWhaleMediationRewardAd) {
+      console.warn(LINKING_ERROR);
+      return;
+    }
+    if (!RNAdWhaleMediationRewardAd.showAdWithoutView) {
+      this.showAd();
+      return;
+    }
+    RNAdWhaleMediationRewardAd.showAdWithoutView(adId);
+  },
+
+  destroyAd(adId: number) {
+    RNAdWhaleMediationRewardAd?.destroyAd?.(adId);
   },
 
   addEventListeners(listeners: AdWhaleRewardEvents): EmitterSubscription[] {
+    if (!rewardEmitter) {
+      console.warn(LINKING_ERROR);
+      return [];
+    }
     const subs: EmitterSubscription[] = [];
+    let directShowedReceived = false;
+    let directUserRewardedReceived = false;
 
-    if (listeners.onLoaded) {
-      subs.push(
-        rewardEmitter.addListener('onRewardAdLoaded', () => {
-          listeners.onLoaded?.();
-        }),
-      );
-    }
+    subs.push(
+      rewardEmitter.addListener('onRewardAdLoaded', () => {
+        directShowedReceived = false;
+        directUserRewardedReceived = false;
+        console.log('AdWhaleRewardAd.ts Reward onLoaded');
+        listeners.onLoaded?.();
+      }),
+    );
     if (listeners.onLoadFailed) {
       subs.push(
         rewardEmitter.addListener(
@@ -88,13 +257,13 @@ export const AdWhaleRewardAd = {
         ),
       );
     }
-    if (listeners.onShowed) {
-      subs.push(
-        rewardEmitter.addListener('onRewardAdShowed', () => {
-          listeners.onShowed?.();
-        }),
-      );
-    }
+    subs.push(
+      rewardEmitter.addListener('onRewardAdShowed', () => {
+        directShowedReceived = true;
+        console.log('AdWhaleRewardAd.ts Reward onAdShowed');
+        listeners.onShowed?.();
+      }),
+    );
     if (listeners.onShowFailed) {
       subs.push(
         rewardEmitter.addListener(
@@ -103,13 +272,14 @@ export const AdWhaleRewardAd = {
         ),
       );
     }
-    if (listeners.onDismissed) {
-      subs.push(
-        rewardEmitter.addListener('onRewardAdDismissed', () => {
-          listeners.onDismissed?.();
-        }),
-      );
-    }
+    subs.push(
+      rewardEmitter.addListener('onRewardAdDismissed', () => {
+        directShowedReceived = false;
+        directUserRewardedReceived = false;
+        console.log('AdWhaleRewardAd.ts Reward onDismissed');
+        listeners.onDismissed?.();
+      }),
+    );
     if (listeners.onClicked) {
       subs.push(
         rewardEmitter.addListener('onRewardAdClicked', () => {
@@ -117,15 +287,111 @@ export const AdWhaleRewardAd = {
         }),
       );
     }
-    if (listeners.onUserRewarded) {
+    subs.push(
+      rewardEmitter.addListener(
+        'onUserRewarded',
+        event => {
+          directUserRewardedReceived = true;
+          const rewardedEvent = event as AdWhaleRewardUserRewardedEvent;
+          const rewardAmount = rewardedEvent.amount ?? rewardedEvent.RewardAmount;
+          const rewardType = rewardedEvent.type ?? rewardedEvent.RewardType;
+          console.log(
+            `AdWhaleRewardAd.ts Reward onUserRewarded: ${String(rewardAmount)}, ${String(rewardType)}`,
+          );
+          listeners.onUserRewarded?.(rewardedEvent);
+        },
+      ),
+    );
+    subs.push(
+      rewardEmitter.addListener('onAdEvent', (payload: any) => {
+        if (payload?.eventName === 'onRewardAdShowed' && !directShowedReceived) {
+          directShowedReceived = true;
+          console.log('AdWhaleRewardAd.ts Reward onAdShowed');
+          listeners.onShowed?.();
+          return;
+        }
+
+        if (payload?.eventName === 'onUserRewarded' && !directUserRewardedReceived) {
+          directUserRewardedReceived = true;
+          const rewardAmount = payload?.amount ?? payload?.RewardAmount;
+          const rewardType = payload?.type ?? payload?.RewardType;
+          console.log(
+            `AdWhaleRewardAd.ts Reward onUserRewarded: ${String(rewardAmount)}, ${String(rewardType)}`,
+          );
+          listeners.onUserRewarded?.({
+            RewardType: payload?.RewardType,
+            RewardAmount: payload?.RewardAmount,
+            type: payload?.type,
+            amount: payload?.amount,
+          });
+        }
+      }),
+    );
+
+    return subs;
+  },
+
+  /** Flutter `onAdEvent` 스타일 (adId 필터링) */
+  addAdEventListenersById(
+    adId: number,
+    listeners: AdWhaleRewardEvents,
+  ): EmitterSubscription[] {
+    if (!rewardEmitter) {
+      console.warn(LINKING_ERROR);
+      return [];
+    }
+    const subs: EmitterSubscription[] = [];
+
+    const handle = (eventName: string, cb?: (p?: any) => void) => {
+      if (!cb) return;
       subs.push(
-        rewardEmitter.addListener(
-          'onUserRewarded',
-          event =>
-            listeners.onUserRewarded?.(event as AdWhaleRewardUserRewardedEvent),
-        ),
+        rewardEmitter.addListener('onAdEvent', (payload: any) => {
+          if (!payload || payload.adId !== adId || payload.eventName !== eventName) {
+            return;
+          }
+          cb(payload);
+        }),
       );
-    }
+    };
+
+    handle('onRewardAdLoaded', () => {
+      console.log('AdWhaleRewardAd.ts Reward onLoaded');
+      listeners.onLoaded?.();
+    });
+    handle('onRewardAdFailedToLoad', p =>
+      listeners.onLoadFailed?.({
+        statusCode: Number(p?.statusCode ?? -1),
+        message: String(p?.message ?? ''),
+      }),
+    );
+    handle('onRewardAdShowed', () => {
+      console.log('AdWhaleRewardAd.ts Reward onAdShowed');
+      listeners.onShowed?.();
+    });
+    handle('onRewardAdFailedToShow', p =>
+      listeners.onShowFailed?.({
+        statusCode: Number(p?.statusCode ?? -1),
+        message: String(p?.message ?? ''),
+      }),
+    );
+    handle('onRewardAdDismissed', () => {
+      console.log('AdWhaleRewardAd.ts Reward onDismissed');
+      listeners.onDismissed?.();
+    });
+    handle('onRewardAdClicked', () => listeners.onClicked?.());
+    handle('onUserRewarded', p => {
+      const rewardAmount = p?.amount ?? p?.RewardAmount;
+      const rewardType = p?.type ?? p?.RewardType;
+      console.log(
+        `AdWhaleRewardAd.ts Reward onUserRewarded: ${String(rewardAmount)}, ${String(rewardType)}`,
+      );
+      listeners.onUserRewarded?.({
+        RewardType: p?.RewardType,
+        RewardAmount: p?.RewardAmount,
+        type: p?.type,
+        amount: p?.amount,
+      });
+    });
 
     return subs;
   },