react-native-daro 1.0.12 → 1.0.15

package/src/AppOpenAd.ts

@@ -1,113 +1,225 @@
 import { NativeModules } from 'react-native';
-import { addEventListener, removeEventListener } from './EventEmitter';
-import type { AdDisplayFailedInfo, AdInfo, AdLoadFailedInfo } from './types/AdInfo';
-import type { AppOpenAdType } from './types/AppOpenAd';
+import {
+  addEventListener,
+  removeEventListener,
+  AdEventEmitter,
+} from './EventEmitter';
+import type {
+  AdDisplayFailedInfo,
+  AdInfo,
+  AdLoadFailedInfo,
+} from './types/AdInfo';
+import { AdEventType, type AdEventPayloadMap } from './types/AdEvent';
 
 const { DaroMModule } = NativeModules;
 
 const {
-	ON_APPOPEN_AD_LOADED_EVENT,
-	ON_APPOPEN_AD_LOAD_FAILED_EVENT,
-	ON_APPOPEN_AD_CLICKED_EVENT,
-	ON_APPOPEN_AD_DISPLAYED_EVENT,
-	ON_APPOPEN_AD_FAILED_TO_DISPLAY_EVENT,
-	ON_APPOPEN_AD_HIDDEN_EVENT,
-	ON_APPOPEN_AD_IMPRESSION_RECORDED,
+  ON_APPOPEN_AD_LOADED_EVENT,
+  ON_APPOPEN_AD_LOAD_FAILED_EVENT,
+  ON_APPOPEN_AD_CLICKED_EVENT,
+  ON_APPOPEN_AD_DISPLAYED_EVENT,
+  ON_APPOPEN_AD_FAILED_TO_DISPLAY_EVENT,
+  ON_APPOPEN_AD_HIDDEN_EVENT,
+  ON_APPOPEN_AD_IMPRESSION_RECORDED,
 } = DaroMModule.getConstants();
 
-const isAdReady = (adUnitId: string): Promise<boolean> => {
-	return DaroMModule.isAppOpenAdReady(adUnitId);
-};
-
-const loadAd = (adUnitId: string): void => {
-	DaroMModule.loadAppOpenAd(adUnitId);
-};
-
-const showAd = (adUnitId: string, placement?: string | null, customData?: string | null): void => {
-	DaroMModule.showAppOpenAd(adUnitId, placement ?? undefined, customData ?? undefined);
-};
-
-const addAdLoadedEventListener = (listener: (adInfo: AdInfo) => void): void => {
-	addEventListener(ON_APPOPEN_AD_LOADED_EVENT, listener);
-};
-
-const removeAdLoadedEventListener = (): void => {
-	removeEventListener(ON_APPOPEN_AD_LOADED_EVENT);
-};
-
-const addAdLoadFailedEventListener = (listener: (errorInfo: AdLoadFailedInfo) => void): void => {
-	addEventListener(ON_APPOPEN_AD_LOAD_FAILED_EVENT, listener);
-};
-
-const removeAdLoadFailedEventListener = (): void => {
-	removeEventListener(ON_APPOPEN_AD_LOAD_FAILED_EVENT);
-};
-
-const addAdClickedEventListener = (listener: (adInfo: AdInfo) => void): void => {
-	addEventListener(ON_APPOPEN_AD_CLICKED_EVENT, listener);
-};
-
-const removeAdClickedEventListener = (): void => {
-	removeEventListener(ON_APPOPEN_AD_CLICKED_EVENT);
-};
-
-const addAdDisplayedEventListener = (listener: (adInfo: AdInfo) => void): void => {
-	addEventListener(ON_APPOPEN_AD_DISPLAYED_EVENT, listener);
-};
-
-const removeAdDisplayedEventListener = (): void => {
-	removeEventListener(ON_APPOPEN_AD_DISPLAYED_EVENT);
-};
-
-const addAdFailedToDisplayEventListener = (listener: (errorInfo: AdDisplayFailedInfo) => void): void => {
-	addEventListener(ON_APPOPEN_AD_FAILED_TO_DISPLAY_EVENT, listener);
-};
-
-const removeAdFailedToDisplayEventListener = (): void => {
-	removeEventListener(ON_APPOPEN_AD_FAILED_TO_DISPLAY_EVENT);
-};
-
-const addAdHiddenEventListener = (listener: (adInfo: AdInfo) => void): void => {
-	addEventListener(ON_APPOPEN_AD_HIDDEN_EVENT, listener);
-};
-
-const removeAdHiddenEventListener = (): void => {
-	removeEventListener(ON_APPOPEN_AD_HIDDEN_EVENT);
-};
-
-const addAdImpressionRecordedListener = (listener: (adInfo: AdInfo) => void): void => {
-	addEventListener(ON_APPOPEN_AD_IMPRESSION_RECORDED, listener);
-};
-
-const removeAdImpressionRecordedListener = (): void => {
-	removeEventListener(ON_APPOPEN_AD_IMPRESSION_RECORDED);
-};
-
-export const AppOpenAd: AppOpenAdType = {
-	isAdReady,
-	loadAd,
-	showAd,
-
-	addAdLoadedEventListener,
-	removeAdLoadedEventListener,
-
-	addAdLoadFailedEventListener,
-	removeAdLoadFailedEventListener,
-
-	addAdClickedEventListener,
-	removeAdClickedEventListener,
-
-	addAdDisplayedEventListener,
-	removeAdDisplayedEventListener,
-
-	addAdFailedToDisplayEventListener,
-	removeAdFailedToDisplayEventListener,
-
-	addAdHiddenEventListener,
-	removeAdHiddenEventListener,
-
-	addAdImpressionRecordedListener,
-	removeAdImpressionRecordedListener,
-};
+const NATIVE_EVENT_BY_TYPE: Record<AdEventType, string> = {
+  [AdEventType.LOADED]: ON_APPOPEN_AD_LOADED_EVENT,
+  [AdEventType.LOAD_FAILED]: ON_APPOPEN_AD_LOAD_FAILED_EVENT,
+  [AdEventType.CLICKED]: ON_APPOPEN_AD_CLICKED_EVENT,
+  [AdEventType.DISPLAYED]: ON_APPOPEN_AD_DISPLAYED_EVENT,
+  [AdEventType.FAILED_TO_DISPLAY]: ON_APPOPEN_AD_FAILED_TO_DISPLAY_EVENT,
+  [AdEventType.HIDDEN]: ON_APPOPEN_AD_HIDDEN_EVENT,
+  [AdEventType.IMPRESSION_RECORDED]: ON_APPOPEN_AD_IMPRESSION_RECORDED,
+};
+
+export class AppOpenAd {
+  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): AppOpenAd {
+    const requestId = AppOpenAd._nextRequestId++;
+    return new AppOpenAd(requestId, adUnitId);
+  }
+
+  isAdReady(): Promise<boolean> {
+    return DaroMModule.isAppOpenAdReady(this.requestId, this.adUnitId);
+  }
+
+  load(): void {
+    DaroMModule.loadAppOpenAd(this.requestId, this.adUnitId);
+  }
+
+  show(placement?: string | null, customData?: string | null): void {
+    DaroMModule.showAppOpenAd(
+      this.requestId,
+      this.adUnitId,
+      placement ?? undefined,
+      customData ?? undefined
+    );
+  }
+
+  addAdEventListener<T extends AdEventType>(
+    type: T,
+    listener: (info: AdEventPayloadMap[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 = AppOpenAd._legacyRequestIds.get(adUnitId);
+    if (requestId === undefined) {
+      requestId = AppOpenAd._nextRequestId++;
+      AppOpenAd._legacyRequestIds.set(adUnitId, requestId);
+      AppOpenAd._legacyRequestIdSet.add(requestId);
+    }
+    return requestId;
+  }
+
+  private static _addLegacyEventListener<T>(
+    event: string,
+    listener: (info: T) => void
+  ): void {
+    addEventListener(event, (payload: any) => {
+      if (!AppOpenAd._legacyRequestIdSet.has(payload?.requestId)) {
+        return;
+      }
+      listener(payload);
+    });
+  }
+
+  /** @deprecated `AppOpenAd.createForAdRequest(adUnitId)` 인스턴스의 `isAdReady()`를 사용하세요. */
+  static isAdReady(adUnitId: string): Promise<boolean> {
+    const requestId = AppOpenAd._getLegacyRequestId(adUnitId);
+    return DaroMModule.isAppOpenAdReady(requestId, adUnitId);
+  }
+
+  /** @deprecated `AppOpenAd.createForAdRequest(adUnitId)` 인스턴스의 `load()`를 사용하세요. */
+  static loadAd(adUnitId: string): void {
+    const requestId = AppOpenAd._getLegacyRequestId(adUnitId);
+    DaroMModule.loadAppOpenAd(requestId, adUnitId);
+  }
+
+  /** @deprecated `AppOpenAd.createForAdRequest(adUnitId)` 인스턴스의 `show()`를 사용하세요. */
+  static showAd(
+    adUnitId: string,
+    placement?: string | null,
+    customData?: string | null
+  ): void {
+    const requestId = AppOpenAd._getLegacyRequestId(adUnitId);
+    DaroMModule.showAppOpenAd(
+      requestId,
+      adUnitId,
+      placement ?? undefined,
+      customData ?? undefined
+    );
+  }
+
+  /** @deprecated `addAdEventListener(AdEventType.LOADED, ...)`를 인스턴스에서 사용하세요. */
+  static addAdLoadedEventListener(listener: (adInfo: AdInfo) => void): void {
+    AppOpenAd._addLegacyEventListener(ON_APPOPEN_AD_LOADED_EVENT, listener);
+  }
+
+  /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
+  static removeAdLoadedEventListener(): void {
+    removeEventListener(ON_APPOPEN_AD_LOADED_EVENT);
+  }
+
+  /** @deprecated `addAdEventListener(AdEventType.LOAD_FAILED, ...)`를 인스턴스에서 사용하세요. */
+  static addAdLoadFailedEventListener(
+    listener: (errorInfo: AdLoadFailedInfo) => void
+  ): void {
+    AppOpenAd._addLegacyEventListener(
+      ON_APPOPEN_AD_LOAD_FAILED_EVENT,
+      listener
+    );
+  }
+
+  /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
+  static removeAdLoadFailedEventListener(): void {
+    removeEventListener(ON_APPOPEN_AD_LOAD_FAILED_EVENT);
+  }
+
+  /** @deprecated `addAdEventListener(AdEventType.CLICKED, ...)`를 인스턴스에서 사용하세요. */
+  static addAdClickedEventListener(listener: (adInfo: AdInfo) => void): void {
+    AppOpenAd._addLegacyEventListener(ON_APPOPEN_AD_CLICKED_EVENT, listener);
+  }
+
+  /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
+  static removeAdClickedEventListener(): void {
+    removeEventListener(ON_APPOPEN_AD_CLICKED_EVENT);
+  }
+
+  /** @deprecated `addAdEventListener(AdEventType.DISPLAYED, ...)`를 인스턴스에서 사용하세요. */
+  static addAdDisplayedEventListener(listener: (adInfo: AdInfo) => void): void {
+    AppOpenAd._addLegacyEventListener(ON_APPOPEN_AD_DISPLAYED_EVENT, listener);
+  }
+
+  /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
+  static removeAdDisplayedEventListener(): void {
+    removeEventListener(ON_APPOPEN_AD_DISPLAYED_EVENT);
+  }
+
+  /** @deprecated `addAdEventListener(AdEventType.FAILED_TO_DISPLAY, ...)`를 인스턴스에서 사용하세요. */
+  static addAdFailedToDisplayEventListener(
+    listener: (errorInfo: AdDisplayFailedInfo) => void
+  ): void {
+    AppOpenAd._addLegacyEventListener(
+      ON_APPOPEN_AD_FAILED_TO_DISPLAY_EVENT,
+      listener
+    );
+  }
+
+  /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
+  static removeAdFailedToDisplayEventListener(): void {
+    removeEventListener(ON_APPOPEN_AD_FAILED_TO_DISPLAY_EVENT);
+  }
+
+  /** @deprecated `addAdEventListener(AdEventType.HIDDEN, ...)`를 인스턴스에서 사용하세요. */
+  static addAdHiddenEventListener(listener: (adInfo: AdInfo) => void): void {
+    AppOpenAd._addLegacyEventListener(ON_APPOPEN_AD_HIDDEN_EVENT, listener);
+  }
+
+  /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
+  static removeAdHiddenEventListener(): void {
+    removeEventListener(ON_APPOPEN_AD_HIDDEN_EVENT);
+  }
+
+  /** @deprecated `addAdEventListener(AdEventType.IMPRESSION_RECORDED, ...)`를 인스턴스에서 사용하세요. */
+  static addAdImpressionRecordedListener(
+    listener: (adInfo: AdInfo) => void
+  ): void {
+    AppOpenAd._addLegacyEventListener(
+      ON_APPOPEN_AD_IMPRESSION_RECORDED,
+      listener
+    );
+  }
+
+  /** @deprecated 인스턴스의 `addAdEventListener` disposer를 사용하세요. */
+  static removeAdImpressionRecordedListener(): void {
+    removeEventListener(ON_APPOPEN_AD_IMPRESSION_RECORDED);
+  }
+}
 
 export default AppOpenAd;

package/src/ErrorCode.ts

@@ -1,4 +1,3 @@
-
 export enum ErrorCode {
-	UNSPECIFIED = 0
+  UNSPECIFIED = 0,
 }

package/src/EventEmitter.ts

@@ -5,21 +5,70 @@ import type { AdEventObject, AdEventListener } from './types/AdEvent';
 const { DaroMModule } = NativeModules;
 
 const emitter = new NativeEventEmitter(DaroMModule);
-const subscriptions: Record<string, EventSubscription> = {};
-
-export const addEventListener = <T extends AdEventObject>(event: string, handler: AdEventListener<T>): void => {
-	const subscription: EventSubscription = emitter.addListener(event, handler);
-	const currentSubscription = subscriptions[event];
-	if (currentSubscription) {
-		currentSubscription.remove();
-	}
-	subscriptions[event] = subscription;
+const subscriptions: Map<string, Set<EventSubscription>> = new Map();
+
+export const addEventListener = <T extends AdEventObject>(
+  event: string,
+  handler: AdEventListener<T>
+): (() => void) => {
+  const subscription: EventSubscription = emitter.addListener(
+    event,
+    handler as (...args: Object[]) => void
+  );
+
+  if (!subscriptions.has(event)) {
+    subscriptions.set(event, new Set());
+  }
+  subscriptions.get(event)!.add(subscription);
+
+  return () => {
+    subscription.remove();
+    subscriptions.get(event)?.delete(subscription);
+  };
 };
 
 export const removeEventListener = (event: string): void => {
-	const currentSubscription = subscriptions[event];
-	if (currentSubscription) {
-		currentSubscription.remove();
-		delete subscriptions[event];
-	}
+  subscriptions.get(event)?.forEach((sub) => sub.remove());
+  subscriptions.delete(event);
 };
+
+export class AdEventEmitter {
+  private emitter: NativeEventEmitter;
+  private subscriptions: Map<string, Set<EventSubscription>> = new Map();
+
+  constructor() {
+    this.emitter = new NativeEventEmitter(DaroMModule);
+  }
+
+  addEventListener<T extends AdEventObject>(
+    event: string,
+    handler: AdEventListener<T>
+  ): () => void {
+    const subscription: EventSubscription = this.emitter.addListener(
+      event,
+      handler as (...args: Object[]) => void
+    );
+
+    if (!this.subscriptions.has(event)) {
+      this.subscriptions.set(event, new Set());
+    }
+    this.subscriptions.get(event)!.add(subscription);
+
+    return () => {
+      subscription.remove();
+      this.subscriptions.get(event)?.delete(subscription);
+    };
+  }
+
+  removeEventListener(event: string): void {
+    this.subscriptions.get(event)?.forEach((sub) => sub.remove());
+    this.subscriptions.delete(event);
+  }
+
+  removeAllListeners(): void {
+    for (const subs of this.subscriptions.values()) {
+      subs.forEach((sub) => sub.remove());
+    }
+    this.subscriptions.clear();
+  }
+}