react-native-daro 1.0.12 → 1.0.15

package/src/RewardedAd.ts

@@ -1,130 +1,241 @@
-import { NativeModules } from "react-native";
-import { addEventListener, removeEventListener } from "./EventEmitter";
-import type { AdDisplayFailedInfo, AdInfo, AdLoadFailedInfo, AdRewardInfo } from "./types/AdInfo";
-import type { RewardedAdType } from "./types/RewardedAd";
+import { NativeModules } from 'react-native';
+import {
+  addEventListener,
+  removeEventListener,
+  AdEventEmitter,
+} from './EventEmitter';
+import type {
+  AdDisplayFailedInfo,
+  AdInfo,
+  AdLoadFailedInfo,
+  AdRewardInfo,
+} from './types/AdInfo';
+import {
+  AdEventType,
+  RewardedAdEventType,
+  type RewardedAdEventPayloadMap,
+} from './types/AdEvent';
 
 const { DaroMModule } = NativeModules;
 
 const {
-	ON_REWARDED_AD_LOADED_EVENT,
-	ON_REWARDED_AD_LOAD_FAILED_EVENT,
-	ON_REWARDED_AD_CLICKED_EVENT,
-	ON_REWARDED_AD_DISPLAYED_EVENT,
-	ON_REWARDED_AD_FAILED_TO_DISPLAY_EVENT,
-	ON_REWARDED_AD_HIDDEN_EVENT,
-	ON_REWARDED_AD_RECEIVED_REWARD_EVENT,
-	ON_REWARDED_AD_IMPRESSION_RECORDED,
+  ON_REWARDED_AD_LOADED_EVENT,
+  ON_REWARDED_AD_LOAD_FAILED_EVENT,
+  ON_REWARDED_AD_CLICKED_EVENT,
+  ON_REWARDED_AD_DISPLAYED_EVENT,
+  ON_REWARDED_AD_FAILED_TO_DISPLAY_EVENT,
+  ON_REWARDED_AD_HIDDEN_EVENT,
+  ON_REWARDED_AD_RECEIVED_REWARD_EVENT,
+  ON_REWARDED_AD_IMPRESSION_RECORDED,
 } = DaroMModule.getConstants();
 
-
-const isAdReady = (adUnitId: string): Promise<boolean> => {
-	return DaroMModule.isRewardedAdReady(adUnitId);
-};
-
-const loadAd = (adUnitId: string): void => {
-	DaroMModule.loadRewardedAd(adUnitId);
-};
-
-const showAd = (adUnitId: string, customData?: string | null): void => {
-	DaroMModule.showRewardedAd(adUnitId, customData ?? null);
-};
-
-const addAdLoadedEventListener = (listener: (adInfo: AdInfo) => void): void => {
-	addEventListener(ON_REWARDED_AD_LOADED_EVENT, listener);
-};
-
-const removeAdLoadedEventListener = (): void => {
-	removeEventListener(ON_REWARDED_AD_LOADED_EVENT);
-};
-
-const addAdLoadFailedEventListener = (listener: (errorInfo: AdLoadFailedInfo) => void): void => {
-	addEventListener(ON_REWARDED_AD_LOAD_FAILED_EVENT, listener);
-};
-
-const removeAdLoadFailedEventListener = (): void => {
-	removeEventListener(ON_REWARDED_AD_LOAD_FAILED_EVENT);
-};
-
-const addAdClickedEventListener = (listener: (adInfo: AdInfo) => void): void => {
-	addEventListener(ON_REWARDED_AD_CLICKED_EVENT, listener);
-};
-
-const removeAdClickedEventListener = (): void => {
-	removeEventListener(ON_REWARDED_AD_CLICKED_EVENT);
-};
-
-const addAdDisplayedEventListener = (listener: (adInfo: AdInfo) => void): void => {
-	addEventListener(ON_REWARDED_AD_DISPLAYED_EVENT, listener);
-};
-
-const removeAdDisplayedEventListener = (): void => {
-	removeEventListener(ON_REWARDED_AD_DISPLAYED_EVENT);
-};
-
-const addAdFailedToDisplayEventListener = (listener: (errorInfo: AdDisplayFailedInfo) => void): void => {
-	addEventListener(ON_REWARDED_AD_FAILED_TO_DISPLAY_EVENT, listener);
-};
-
-const removeAdFailedToDisplayEventListener = (): void => {
-	removeEventListener(ON_REWARDED_AD_FAILED_TO_DISPLAY_EVENT);
-};
-
-const addAdHiddenEventListener = (listener: (adInfo: AdInfo) => void): void => {
-	addEventListener(ON_REWARDED_AD_HIDDEN_EVENT, listener);
-};
-
-const removeAdHiddenEventListener = (): void => {
-	removeEventListener(ON_REWARDED_AD_HIDDEN_EVENT);
-};
-
-const addAdImpressionRecordedListener = (listener: (adInfo: AdInfo) => void): void => {
-	addEventListener(ON_REWARDED_AD_IMPRESSION_RECORDED, listener);
-};
-
-const removeAdImpressionRecordedListener = (): void => {
-	removeEventListener(ON_REWARDED_AD_IMPRESSION_RECORDED);
-};
-
-// Rewarded specific APIs
-
-const addAdReceivedRewardEventListener = (listener: (adInfo: AdRewardInfo) => void): void => {
-	addEventListener(ON_REWARDED_AD_RECEIVED_REWARD_EVENT, listener);
-};
-
-const removeAdReceivedRewardEventListener = (): void => {
-	removeEventListener(ON_REWARDED_AD_RECEIVED_REWARD_EVENT);
-};
-
-
-export const RewardedAd: RewardedAdType = {
-	isAdReady,
-	loadAd,
-	showAd,
-
-	addAdLoadedEventListener,
-	removeAdLoadedEventListener,
-
-	addAdLoadFailedEventListener,
-	removeAdLoadFailedEventListener,
-
-	addAdClickedEventListener,
-	removeAdClickedEventListener,
-
-	addAdDisplayedEventListener,
-	removeAdDisplayedEventListener,
-
-	addAdFailedToDisplayEventListener,
-	removeAdFailedToDisplayEventListener,
-
-	addAdHiddenEventListener,
-	removeAdHiddenEventListener,
-
-	addAdImpressionRecordedListener,
-	removeAdImpressionRecordedListener,
-
-	// Rewarded specific APIs
-	addAdReceivedRewardEventListener,
-	removeAdReceivedRewardEventListener,
-};
+const NATIVE_EVENT_BY_TYPE: Record<AdEventType | RewardedAdEventType, string> =
+  {
+    [AdEventType.LOADED]: ON_REWARDED_AD_LOADED_EVENT,
+    [AdEventType.LOAD_FAILED]: ON_REWARDED_AD_LOAD_FAILED_EVENT,
+    [AdEventType.CLICKED]: ON_REWARDED_AD_CLICKED_EVENT,
+    [AdEventType.DISPLAYED]: ON_REWARDED_AD_DISPLAYED_EVENT,
+    [AdEventType.FAILED_TO_DISPLAY]: ON_REWARDED_AD_FAILED_TO_DISPLAY_EVENT,
+    [AdEventType.HIDDEN]: ON_REWARDED_AD_HIDDEN_EVENT,
+    [AdEventType.IMPRESSION_RECORDED]: ON_REWARDED_AD_IMPRESSION_RECORDED,
+    [RewardedAdEventType.RECEIVED_REWARD]: ON_REWARDED_AD_RECEIVED_REWARD_EVENT,
+  };
+
+export class RewardedAd {
+  private static _nextRequestId = 1;
+  private static _legacyRequestIds = new Map<string, number>();
+  private static _legacyRequestIdSet = new Set<number>();
+
+  private readonly eventEmitter = new AdEventEmitter();
+
+  private constructor(
+    private readonly requestId: number,
+    private readonly adUnitId: string
+  ) {}
+
+  static createForAdRequest(adUnitId: string): RewardedAd {
+    const requestId = RewardedAd._nextRequestId++;
+    return new RewardedAd(requestId, adUnitId);
+  }
+
+  isAdReady(): Promise<boolean> {
+    return DaroMModule.isRewardedAdReady(this.requestId, this.adUnitId);
+  }
+
+  load(): void {
+    DaroMModule.loadRewardedAd(this.requestId, this.adUnitId);
+  }
+
+  show(customData?: string | null): void {
+    DaroMModule.showRewardedAd(
+      this.requestId,
+      this.adUnitId,
+      customData ?? null
+    );
+  }
+
+  addAdEventListener<T extends AdEventType | RewardedAdEventType>(
+    type: T,
+    listener: (info: RewardedAdEventPayloadMap[T]) => void
+  ): () => void {
+    const nativeEvent = NATIVE_EVENT_BY_TYPE[type];
+    const requestId = this.requestId;
+    return this.eventEmitter.addEventListener(nativeEvent, (payload: any) => {
+      if (payload?.requestId !== requestId) {
+        return;
+      }
+      listener(payload);
+    });
+  }
+
+  removeAllListeners(): void {
+    this.eventEmitter.removeAllListeners();
+  }
+
+  // ---- Deprecated static API (backward compatibility) ----
+
+  private static _getLegacyRequestId(adUnitId: string): number {
+    let requestId = RewardedAd._legacyRequestIds.get(adUnitId);
+    if (requestId === undefined) {
+      requestId = RewardedAd._nextRequestId++;
+      RewardedAd._legacyRequestIds.set(adUnitId, requestId);
+      RewardedAd._legacyRequestIdSet.add(requestId);
+    }
+    return requestId;
+  }
+
+  private static _addLegacyEventListener<T>(
+    event: string,
+    listener: (info: T) => void
+  ): void {
+    addEventListener(event, (payload: any) => {
+      if (!RewardedAd._legacyRequestIdSet.has(payload?.requestId)) {
+        return;
+      }
+      listener(payload);
+    });
+  }
+
+  /** @deprecated `RewardedAd.createForAdRequest(adUnitId)` 인스턴스의 `isAdReady()`를 사용하세요. */
+  static isAdReady(adUnitId: string): Promise<boolean> {
+    const requestId = RewardedAd._getLegacyRequestId(adUnitId);
+    return DaroMModule.isRewardedAdReady(requestId, adUnitId);
+  }
+
+  /** @deprecated `RewardedAd.createForAdRequest(adUnitId)` 인스턴스의 `load()`를 사용하세요. */
+  static loadAd(adUnitId: string): void {
+    const requestId = RewardedAd._getLegacyRequestId(adUnitId);
+    DaroMModule.loadRewardedAd(requestId, adUnitId);
+  }
+
+  /** @deprecated `RewardedAd.createForAdRequest(adUnitId)` 인스턴스의 `show()`를 사용하세요. */
+  static showAd(adUnitId: string, customData?: string | null): void {
+    const requestId = RewardedAd._getLegacyRequestId(adUnitId);
+    DaroMModule.showRewardedAd(requestId, adUnitId, customData ?? null);
+  }
+
+  /** @deprecated `addAdEventListener(AdEventType.LOADED, ...)`를 인스턴스에서 사용하세요. */
+  static addAdLoadedEventListener(listener: (adInfo: AdInfo) => void): void {
+    RewardedAd._addLegacyEventListener(ON_REWARDED_AD_LOADED_EVENT, listener);
+  }
+
+  /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
+  static removeAdLoadedEventListener(): void {
+    removeEventListener(ON_REWARDED_AD_LOADED_EVENT);
+  }
+
+  /** @deprecated `addAdEventListener(AdEventType.LOAD_FAILED, ...)`를 인스턴스에서 사용하세요. */
+  static addAdLoadFailedEventListener(
+    listener: (errorInfo: AdLoadFailedInfo) => void
+  ): void {
+    RewardedAd._addLegacyEventListener(
+      ON_REWARDED_AD_LOAD_FAILED_EVENT,
+      listener
+    );
+  }
+
+  /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
+  static removeAdLoadFailedEventListener(): void {
+    removeEventListener(ON_REWARDED_AD_LOAD_FAILED_EVENT);
+  }
+
+  /** @deprecated `addAdEventListener(AdEventType.CLICKED, ...)`를 인스턴스에서 사용하세요. */
+  static addAdClickedEventListener(listener: (adInfo: AdInfo) => void): void {
+    RewardedAd._addLegacyEventListener(ON_REWARDED_AD_CLICKED_EVENT, listener);
+  }
+
+  /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
+  static removeAdClickedEventListener(): void {
+    removeEventListener(ON_REWARDED_AD_CLICKED_EVENT);
+  }
+
+  /** @deprecated `addAdEventListener(AdEventType.DISPLAYED, ...)`를 인스턴스에서 사용하세요. */
+  static addAdDisplayedEventListener(listener: (adInfo: AdInfo) => void): void {
+    RewardedAd._addLegacyEventListener(
+      ON_REWARDED_AD_DISPLAYED_EVENT,
+      listener
+    );
+  }
+
+  /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
+  static removeAdDisplayedEventListener(): void {
+    removeEventListener(ON_REWARDED_AD_DISPLAYED_EVENT);
+  }
+
+  /** @deprecated `addAdEventListener(AdEventType.FAILED_TO_DISPLAY, ...)`를 인스턴스에서 사용하세요. */
+  static addAdFailedToDisplayEventListener(
+    listener: (errorInfo: AdDisplayFailedInfo) => void
+  ): void {
+    RewardedAd._addLegacyEventListener(
+      ON_REWARDED_AD_FAILED_TO_DISPLAY_EVENT,
+      listener
+    );
+  }
+
+  /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
+  static removeAdFailedToDisplayEventListener(): void {
+    removeEventListener(ON_REWARDED_AD_FAILED_TO_DISPLAY_EVENT);
+  }
+
+  /** @deprecated `addAdEventListener(AdEventType.HIDDEN, ...)`를 인스턴스에서 사용하세요. */
+  static addAdHiddenEventListener(listener: (adInfo: AdInfo) => void): void {
+    RewardedAd._addLegacyEventListener(ON_REWARDED_AD_HIDDEN_EVENT, listener);
+  }
+
+  /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
+  static removeAdHiddenEventListener(): void {
+    removeEventListener(ON_REWARDED_AD_HIDDEN_EVENT);
+  }
+
+  /** @deprecated `addAdEventListener(AdEventType.IMPRESSION_RECORDED, ...)`를 인스턴스에서 사용하세요. */
+  static addAdImpressionRecordedListener(
+    listener: (adInfo: AdInfo) => void
+  ): void {
+    RewardedAd._addLegacyEventListener(
+      ON_REWARDED_AD_IMPRESSION_RECORDED,
+      listener
+    );
+  }
+
+  /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
+  static removeAdImpressionRecordedListener(): void {
+    removeEventListener(ON_REWARDED_AD_IMPRESSION_RECORDED);
+  }
+
+  /** @deprecated `addAdEventListener(RewardedAdEventType.RECEIVED_REWARD, ...)`를 인스턴스에서 사용하세요. */
+  static addAdReceivedRewardEventListener(
+    listener: (adInfo: AdRewardInfo) => void
+  ): void {
+    RewardedAd._addLegacyEventListener(
+      ON_REWARDED_AD_RECEIVED_REWARD_EVENT,
+      listener
+    );
+  }
+
+  /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
+  static removeAdReceivedRewardEventListener(): void {
+    removeEventListener(ON_REWARDED_AD_RECEIVED_REWARD_EVENT);
+  }
+}
 
 export default RewardedAd;

package/src/index.tsx

@@ -1,7 +1,4 @@
-import {
-  NativeModules,
-  Platform
-} from 'react-native';
+import { NativeModules, Platform } from 'react-native';
 
 export * from './AdBannerView';
 export * from './types';
@@ -10,23 +7,34 @@ export { RewardedAd } from './RewardedAd';
 export { LightPopupAd } from './LightPopupAd';
 
 export { NativeAdView } from './nativeAd/NativeAdView';
-export { BodyView, CallToActionView, IconView, MediaView, TitleView } from './nativeAd/NativeAdViewComponents';
+export {
+  BodyView,
+  CallToActionView,
+  IconView,
+  MediaView,
+  TitleView,
+} from './nativeAd/NativeAdViewComponents';
 
 const LINKING_ERROR =
-  `The package 'react-native-daro-m' doesn't seem to be linked. Make sure: \n\n` +
+  `The native module 'DaroMModule' doesn't seem to be linked. Make sure: \n\n` +
   Platform.select({ ios: "- You have run 'pod install'\n", default: '' }) +
   '- You rebuilt the app after installing the package\n' +
   '- You are not using Expo Go\n';
 
-const DaroMModule = NativeModules.DaroMModule ? NativeModules.DaroMModule : new Proxy({}, {
-  get() {
-    throw new Error(LINKING_ERROR);
-  },
-});
+const DaroMModule = NativeModules.DaroMModule
+  ? NativeModules.DaroMModule
+  : new Proxy(
+      {},
+      {
+        get() {
+          throw new Error(LINKING_ERROR);
+        },
+      }
+    );
 
 export async function initialize() {
   await DaroMModule.initializeSdk();
-};
+}
 
 export async function showMediationDebugger() {
   await DaroMModule.showMediationDebugger();

package/src/nativeAd/NativeAdView.tsx

@@ -1,9 +1,32 @@
-import { forwardRef, useCallback, useContext, useEffect, useImperativeHandle, useRef, useState } from 'react';
-import { findNodeHandle, NativeModules, requireNativeComponent, UIManager, View, type ViewProps } from 'react-native';
+import {
+  forwardRef,
+  useCallback,
+  useContext,
+  useEffect,
+  useImperativeHandle,
+  useRef,
+  useState,
+} from 'react';
+import {
+  findNodeHandle,
+  NativeModules,
+  requireNativeComponent,
+  UIManager,
+  View,
+  type ViewProps,
+} from 'react-native';
 import type { AdNativeEvent } from '../types/AdEvent';
 import type { AdInfo, AdLoadFailedInfo } from '../types/AdInfo';
-import type { NativeAdViewHandler, NativeAdViewProps } from '../types/NativeAdViewProps';
-import { NativeAdViewContext, NativeAdViewProvider, type NativeAdViewContextType, type NativeAdViewType } from './NativeAdViewProvider';
+import type {
+  NativeAdViewHandler,
+  NativeAdViewProps,
+} from '../types/NativeAdViewProps';
+import {
+  NativeAdViewContext,
+  NativeAdViewProvider,
+  type NativeAdViewContextType,
+  type NativeAdViewType,
+} from './NativeAdViewProvider';
 
 const { DaroMModule } = NativeModules;
 
@@ -15,9 +38,14 @@ type NativeAdViewNativeEvents = {
 };
 
 const ComponentName = 'DaroMNativeAdView';
-const NativeAdViewComponent = requireNativeComponent<NativeAdViewProps & ViewProps & NativeAdViewNativeEvents>(ComponentName);
-
-export const NativeAdView = forwardRef<NativeAdViewHandler, NativeAdViewProps & ViewProps>(function NativeAdView(props, ref) {
+const NativeAdViewComponent = requireNativeComponent<
+  NativeAdViewProps & ViewProps & NativeAdViewNativeEvents
+>(ComponentName);
+
+export const NativeAdView = forwardRef<
+  NativeAdViewHandler,
+  NativeAdViewProps & ViewProps
+>(function NativeAdView(props, ref) {
   const [isInitialized, setIsInitialized] = useState<boolean>(false);
 
   useEffect(() => {
@@ -25,7 +53,9 @@ export const NativeAdView = forwardRef<NativeAdViewHandler, NativeAdViewProps &
       const result = await DaroMModule.isInitialized();
       setIsInitialized(result);
       if (!result) {
-        console.warn('NativeAdView is mounted before the initialization of the DaroM React Native module.');
+        console.warn(
+          'NativeAdView is mounted before the initialization of the DaroM React Native module.'
+        );
       }
     };
 
@@ -41,26 +71,47 @@ export const NativeAdView = forwardRef<NativeAdViewHandler, NativeAdViewProps &
     <NativeAdViewProvider>
       <NativeAdViewImpl {...props} ref={ref} />
     </NativeAdViewProvider>
-  );  
+  );
 });
 
-const NativeAdViewImpl = forwardRef<NativeAdViewHandler, NativeAdViewProps & ViewProps>(function NativeAdViewImpl(
-  { adUnitId, onAdLoaded, onAdLoadFailed, onAdClicked, onAdImpressionRecorded, children, style, loadOnMount = true, ...otherProps },
+const NativeAdViewImpl = forwardRef<
+  NativeAdViewHandler,
+  NativeAdViewProps & ViewProps
+>(function NativeAdViewImpl(
+  {
+    adUnitId,
+    onAdLoaded,
+    onAdLoadFailed,
+    onAdClicked,
+    onAdImpressionRecorded,
+    children,
+    style,
+    loadOnMount = true,
+    ...otherProps
+  },
   ref
 ) {
   // Context provides functions to manage native ad and native ad view state
-  const { setNativeAdView } = useContext(NativeAdViewContext) as NativeAdViewContextType;
+  const { setNativeAdView } = useContext(
+    NativeAdViewContext
+  ) as NativeAdViewContextType;
 
   const nativeAdViewRef = useRef<NativeAdViewType | null>(null);
 
   // Load a new ad
   const loadAd = useCallback(() => {
     if (nativeAdViewRef.current) {
+      const nodeHandle = findNodeHandle(nativeAdViewRef.current);
+
+      if (typeof nodeHandle !== 'number') {
+        return;
+      }
+
       UIManager.dispatchViewManagerCommand(
-        findNodeHandle(nativeAdViewRef.current),
+        nodeHandle,
         // @ts-ignore: Issue in RN ts defs
         UIManager.getViewManagerConfig(ComponentName).Commands.loadAd,
-        [],
+        []
       );
     }
   }, []);