react-native-daro 1.0.13 → 1.0.15

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Lion
+Copyright (c) 2026 Delightroom
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

package/README.md

@@ -1,47 +1,47 @@
-# react-native-daro-m
+# react-native-daro
 
-DaroM React Native Module for Android and iOS
+React Native module for the Daro SDK on Android and iOS.
 
 ## Installation
 
 ```sh
-yarn install
+npm install react-native-daro
 ```
 
 ## Usage
 
-
 ```js
-import { DaroMView } from "react-native-daro-m";
-
-// ...
-
-<DaroMView color="tomato" />
-```
+import { initialize, InterstitialAd } from 'react-native-daro';
 
-## Example
+await initialize();
 
-```sh
-cd example
+const interstitialAd = InterstitialAd.createForAdRequest('AD_UNIT_ID');
+interstitialAd.load();
 ```
 
-### Android
-
-```sh
-yarn run android
-```
+## Expo Config Plugin
 
-### iOS
+For Expo apps, add `react-native-daro` to `plugins`.
 
-```sh
-yarn run ios --simulator "iPhone 16"
+```js
+module.exports = {
+  expo: {
+    plugins: [
+      [
+        'react-native-daro',
+        {
+          ios: {
+            daroAppKey: 'DARO_IOS_APP_KEY',
+            daroKeyFile: './ios-daro-key.txt',
+            admobAppId: 'ca-app-pub-0000000000000000~0000000000',
+          },
+          android: {
+            daroAppKey: 'DARO_ANDROID_APP_KEY',
+            daroKeyFile: './android-daro-key.txt',
+          },
+        },
+      ],
+    ],
+  },
+};
 ```
-
-
-## License
-
-MIT
-
----
-
-Made with [create-react-native-library](https://github.com/callstack/react-native-builder-bob)

package/android/build.gradle

@@ -1,6 +1,20 @@
+import groovy.json.JsonSlurper
+
 buildscript {
-  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["DaroM_kotlinVersion"]
+  ext.DaroReactNative = [
+    kotlinVersion: "2.0.21",
+    minSdkVersion: 24,
+    compileSdkVersion: 36,
+    targetSdkVersion: 36
+  ]
+
+  ext.getExtOrDefault = { prop ->
+    if (rootProject.ext.has(prop)) {
+      return rootProject.ext.get(prop)
+    }
+
+    return DaroReactNative[prop]
+  }
 
   repositories {
     google()
@@ -8,62 +22,37 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:8.2.0"
+    classpath "com.android.tools.build:gradle:8.7.2"
     // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
   }
 }
 
-def reactNativeArchitectures() {
-  def value = rootProject.getProperties().get("reactNativeArchitectures")
-  return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
-}
-
-def isNewArchitectureEnabled() {
-  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
-}
 
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
 
-if (isNewArchitectureEnabled()) {
-  apply plugin: "com.facebook.react"
-}
-
-def getExtOrDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["DaroM_" + name]
-}
-
-def getExtOrIntegerDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["DaroM_" + name]).toInteger()
-}
-
-def supportsNamespace() {
-  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
-  def major = parsed[0].toInteger()
-  def minor = parsed[1].toInteger()
+apply plugin: "com.facebook.react"
 
-  // Namespace support was added in 7.3.0
-  return (major == 7 && minor >= 3) || major >= 8
-}
+def packageJson = new JsonSlurper().parse(file("$projectDir/../package.json"))
+def packageName = packageJson.name
+def localMediation = (
+  project.findProperty("daroMediation") ?: System.getenv("DARO_MEDIATION")
+)?.toString()?.toLowerCase()
+def mediation =
+  packageName == "react-native-daro-m" ? "max" :
+  packageName == "react-native-daro" ? "admob" :
+  localMediation == "max" ? "max" : "admob"
+def daroSdkDependency = mediation == "max" ? "so.daro:daro-m:1.3.8" : "so.daro:daro-a:1.5.5"
 
 android {
-  if (supportsNamespace()) {
-    namespace "com.darom"
-
-    sourceSets {
-      main {
-        manifest.srcFile "src/main/AndroidManifestNew.xml"
-      }
-    }
-  }
+  namespace "com.daro.reactnative"
 
-  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+  compileSdkVersion getExtOrDefault("compileSdkVersion")
 
   defaultConfig {
-    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
-    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
-
+    minSdkVersion getExtOrDefault("minSdkVersion")
+    targetSdkVersion getExtOrDefault("targetSdkVersion")
   }
 
   buildTypes {
@@ -72,7 +61,13 @@ android {
     }
   }
 
-  lintOptions {
+  sourceSets {
+    main {
+      java.srcDirs += "src/${mediation}/java"
+    }
+  }
+
+  lint {
     disable "GradleCompatible"
   }
 
@@ -82,19 +77,7 @@ android {
   }
 }
 
-repositories {
-  mavenCentral()
-  google()
-  maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
-}
-
-def kotlin_version = getExtOrDefault("kotlinVersion")
-
 dependencies {
-  // For < 0.71, this will be from the local maven repo
-  // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
-  //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-android:+"
-  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  compileOnly "so.daro:daro-a:1.5.5"
+  implementation "com.facebook.react:react-android"
+  compileOnly daroSdkDependency
 }

package/android/src/admob/java/com/daro/reactnative/DaroSdkBridge.kt

@@ -0,0 +1,23 @@
+package com.daro.reactnative
+
+import android.app.Application
+import android.content.Context
+import droom.daro.SDKConfig
+import droom.daro.a.Daro
+
+internal object DaroSdkBridge {
+  fun initialize(application: Application, sdkConfig: SDKConfig) {
+    Daro.init(
+      application = application,
+      sdkConfig = sdkConfig,
+    )
+  }
+
+  fun openDebugger(context: Context) {
+    Daro.openDebugger(context)
+  }
+
+  fun setUserId(context: Context, userId: String) {
+    Daro.setUserId(context, userId)
+  }
+}

package/android/src/main/AndroidManifest.xml

@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.darom">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>

package/android/src/main/java/com/{darom → daro/reactnative}/DaroMAdBannerViewManager.kt

@@ -1,8 +1,8 @@
-package com.darom
+package com.daro.reactnative
 
-import com.darom.constants.InternalDaroMBannerSize
-import com.darom.event.AdViewEvent
-import com.darom.view.DaroMAdBannerViewContainer
+import com.daro.reactnative.constants.InternalDaroMBannerSize
+import com.daro.reactnative.event.AdViewEvent
+import com.daro.reactnative.view.DaroMAdBannerViewContainer
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.SimpleViewManager

package/android/src/main/java/com/{darom → daro/reactnative}/DaroMAdNativeViewManager.kt

@@ -1,8 +1,8 @@
-package com.darom
+package com.daro.reactnative
 
-import com.darom.event.AdViewEvent
-import com.darom.view.DaroMAdBannerViewContainer
-import com.darom.view.DaroMAdNativeViewContainer
+import com.daro.reactnative.event.AdViewEvent
+import com.daro.reactnative.view.DaroMAdBannerViewContainer
+import com.daro.reactnative.view.DaroMAdNativeViewContainer
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.StateWrapper

package/android/src/main/java/com/{darom → daro/reactnative}/DaroMModule.kt

@@ -1,17 +1,17 @@
-package com.darom
+package com.daro.reactnative
 
 import android.app.Application
 import android.content.Context
-import com.darom.constants.InternalDaroMBannerSize
-import com.darom.event.DaroMEvent
-import com.darom.event.InterstitialEvent
-import com.darom.event.LightPopupEvent
-import com.darom.event.RewardedEvent
-import com.darom.impl.DaroMBannerViewModuleImpl
-import com.darom.impl.DaroMInterstitialModuleImpl
-import com.darom.impl.DaroMLightPopupModuleImpl
-import com.darom.impl.DaroMRewardedAdModuleImpl
-import com.darom.util.EventEmitterUtil
+import com.daro.reactnative.constants.InternalDaroMBannerSize
+import com.daro.reactnative.event.DaroMEvent
+import com.daro.reactnative.event.InterstitialEvent
+import com.daro.reactnative.event.LightPopupEvent
+import com.daro.reactnative.event.RewardedEvent
+import com.daro.reactnative.impl.DaroMBannerViewModuleImpl
+import com.daro.reactnative.impl.DaroMInterstitialModuleImpl
+import com.daro.reactnative.impl.DaroMLightPopupModuleImpl
+import com.daro.reactnative.impl.DaroMRewardedAdModuleImpl
+import com.daro.reactnative.util.EventEmitterUtil
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContext
@@ -20,7 +20,6 @@ import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import droom.daro.SDKConfig
-import droom.daro.a.Daro
 
 class DaroMModule(reactContext: ReactApplicationContext) :
   ReactContextBaseJavaModule(reactContext) {
@@ -39,7 +38,7 @@ class DaroMModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun initializeSdk() {
-    Daro.init(
+    DaroSdkBridge.initialize(
       application = context.applicationContext as Application,
       sdkConfig = SDKConfig.Builder()
         .setDebugMode(false)
@@ -56,12 +55,12 @@ class DaroMModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun showMediationDebugger() {
-    Daro.openDebugger(context)
+    DaroSdkBridge.openDebugger(context)
   }
 
   @ReactMethod
   fun setUserId(userId: String) {
-    Daro.setUserId(context, userId)
+    DaroSdkBridge.setUserId(context, userId)
   }
 
   override fun getConstants(): MutableMap<String, Any>? {
@@ -89,9 +88,9 @@ class DaroMModule(reactContext: ReactApplicationContext) :
   @OptIn(ExperimentalStdlibApi::class)
   internal abstract class DaroMInterstitialModule(context: ReactContext) :
     DaroMComponentModule(context) {
-    abstract fun isInterstitialReady(adUnitId: String, promise: Promise)
-    abstract fun loadInterstitial(adUnitId: String)
-    abstract fun showInterstitial(adUnitId: String)
+    abstract fun isInterstitialReady(requestId: Int, adUnitId: String, promise: Promise)
+    abstract fun loadInterstitial(requestId: Int, adUnitId: String)
+    abstract fun showInterstitial(requestId: Int, adUnitId: String)
 
     override fun getComponents(): MutableMap<String, Any> {
       return InterstitialEvent.entries.associate { it.value to it.value }.toMutableMap()
@@ -105,26 +104,26 @@ class DaroMModule(reactContext: ReactApplicationContext) :
     )
 
   @ReactMethod
-  fun isInterstitialReady(adUnitId: String, promise: Promise) {
-    daroMInterstitialModule.isInterstitialReady(adUnitId, promise)
+  fun isInterstitialReady(requestId: Double, adUnitId: String, promise: Promise) {
+    daroMInterstitialModule.isInterstitialReady(requestId.toInt(), adUnitId, promise)
   }
 
   @ReactMethod
-  fun loadInterstitial(adUnitId: String) {
-    daroMInterstitialModule.loadInterstitial(adUnitId)
+  fun loadInterstitial(requestId: Double, adUnitId: String) {
+    daroMInterstitialModule.loadInterstitial(requestId.toInt(), adUnitId)
   }
 
   @ReactMethod
-  fun showInterstitial(adUnitId: String) {
-    daroMInterstitialModule.showInterstitial(adUnitId)
+  fun showInterstitial(requestId: Double, adUnitId: String) {
+    daroMInterstitialModule.showInterstitial(requestId.toInt(), adUnitId)
   }
 
   @OptIn(ExperimentalStdlibApi::class)
   internal abstract class DaroMRewardedModule(context: ReactContext) :
     DaroMComponentModule(context) {
-    abstract fun isRewardedAdReady(adUnitId: String, promise: Promise)
-    abstract fun loadRewardedAd(adUnitId: String)
-    abstract fun showRewardedAd(adUnitId: String, customData: String?)
+    abstract fun isRewardedAdReady(requestId: Int, adUnitId: String, promise: Promise)
+    abstract fun loadRewardedAd(requestId: Int, adUnitId: String)
+    abstract fun showRewardedAd(requestId: Int, adUnitId: String, customData: String?)
 
     override fun getComponents(): MutableMap<String, Any> {
       return RewardedEvent.entries.associate { it.value to it.value }.toMutableMap()
@@ -138,28 +137,28 @@ class DaroMModule(reactContext: ReactApplicationContext) :
     )
 
   @ReactMethod
-  fun isRewardedAdReady(adUnitId: String, promise: Promise) {
-    daroMRewardedModule.isRewardedAdReady(adUnitId, promise)
+  fun isRewardedAdReady(requestId: Double, adUnitId: String, promise: Promise) {
+    daroMRewardedModule.isRewardedAdReady(requestId.toInt(), adUnitId, promise)
   }
 
   @ReactMethod
-  fun loadRewardedAd(adUnitId: String) {
-    daroMRewardedModule.loadRewardedAd(adUnitId)
+  fun loadRewardedAd(requestId: Double, adUnitId: String) {
+    daroMRewardedModule.loadRewardedAd(requestId.toInt(), adUnitId)
   }
 
   @ReactMethod
-  fun showRewardedAd(adUnitId: String, customData: String?) {
-    daroMRewardedModule.showRewardedAd(adUnitId, customData)
+  fun showRewardedAd(requestId: Double, adUnitId: String, customData: String?) {
+    daroMRewardedModule.showRewardedAd(requestId.toInt(), adUnitId, customData)
   }
 
   @OptIn(ExperimentalStdlibApi::class)
   internal abstract class DaroMLightPopupModule(context: ReactContext) :
     DaroMComponentModule(context) {
-    abstract fun isLightPopupReady(adUnitId: String, promise: Promise)
-    abstract fun loadLightPopup(adUnitId: String)
-    abstract fun showLightPopup(adUnitId: String)
+    abstract fun isLightPopupReady(requestId: Int, adUnitId: String, promise: Promise)
+    abstract fun loadLightPopup(requestId: Int, adUnitId: String)
+    abstract fun showLightPopup(requestId: Int, adUnitId: String)
 
-    abstract fun setLightPopupAdConfiguration(adUnitId: String, parameterMap: ReadableMap)
+    abstract fun setLightPopupAdConfiguration(requestId: Int, adUnitId: String, parameterMap: ReadableMap)
 
     override fun getComponents(): MutableMap<String, Any> {
       return LightPopupEvent.entries.associate { it.value to it.value }.toMutableMap()
@@ -172,23 +171,23 @@ class DaroMModule(reactContext: ReactApplicationContext) :
   )
 
   @ReactMethod
-  fun isLightPopupReady(adUnitId: String, promise: Promise) {
-    daroMLightPopupModule.isLightPopupReady(adUnitId, promise)
+  fun isLightPopupReady(requestId: Double, adUnitId: String, promise: Promise) {
+    daroMLightPopupModule.isLightPopupReady(requestId.toInt(), adUnitId, promise)
   }
 
   @ReactMethod
-  fun loadLightPopup(adUnitId: String) {
-    daroMLightPopupModule.loadLightPopup(adUnitId)
+  fun loadLightPopup(requestId: Double, adUnitId: String) {
+    daroMLightPopupModule.loadLightPopup(requestId.toInt(), adUnitId)
   }
 
   @ReactMethod
-  fun showLightPopup(adUnitId: String) {
-    daroMLightPopupModule.showLightPopup(adUnitId)
+  fun showLightPopup(requestId: Double, adUnitId: String) {
+    daroMLightPopupModule.showLightPopup(requestId.toInt(), adUnitId)
   }
 
   @ReactMethod
-  fun setLightPopupAdConfiguration(adUnitId: String, configurationMap: ReadableMap) {
-    daroMLightPopupModule.setLightPopupAdConfiguration(adUnitId, configurationMap)
+  fun setLightPopupAdConfiguration(requestId: Double, adUnitId: String, configurationMap: ReadableMap) {
+    daroMLightPopupModule.setLightPopupAdConfiguration(requestId.toInt(), adUnitId, configurationMap)
   }
 
   @OptIn(ExperimentalStdlibApi::class)

package/android/src/main/java/com/{darom → daro/reactnative}/DaroMPackage.kt

@@ -1,4 +1,4 @@
-package com.darom
+package com.daro.reactnative
 
 import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule

package/android/src/main/java/com/{darom → daro/reactnative}/constants/InternalDaroMBannerSize.kt

@@ -1,4 +1,4 @@
-package com.darom.constants
+package com.daro.reactnative.constants
 
 import droom.daro.core.model.DaroBannerSize
 

package/android/src/main/java/com/{darom → daro/reactnative}/event/DaroMEvent.kt

@@ -1,4 +1,4 @@
-package com.darom.event
+package com.daro.reactnative.event
 
 internal interface DaroMEvent{
   val value: String

package/android/src/main/java/com/{darom → daro/reactnative}/impl/DaroMBannerViewModuleImpl.kt

@@ -1,6 +1,6 @@
-package com.darom.impl
+package com.daro.reactnative.impl
 
-import com.darom.DaroMModule
+import com.daro.reactnative.DaroMModule
 import com.facebook.react.bridge.ReactApplicationContext
 
 internal class DaroMBannerViewModuleImpl(

package/android/src/main/java/com/{darom → daro/reactnative}/impl/DaroMInterstitialModuleImpl.kt

@@ -1,9 +1,9 @@
-package com.darom.impl
+package com.daro.reactnative.impl
 
 import android.app.Activity
-import com.darom.DaroMModule
-import com.darom.event.InterstitialEvent
-import com.darom.util.AdInfoUtil
+import com.daro.reactnative.DaroMModule
+import com.daro.reactnative.event.InterstitialEvent
+import com.daro.reactnative.util.AdInfoUtil
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import droom.daro.core.adunit.DaroInterstitialAdUnit
@@ -23,56 +23,56 @@ internal class DaroMInterstitialModuleImpl(
   private val currentActivity: Activity?
     get() = getCurrentActivity()
 
-  private val loaderMap: MutableMap<String, DaroInterstitialAdLoader> = mutableMapOf()
-  private val interstitialAdMap: MutableMap<String, DaroInterstitialAd> = mutableMapOf()
+  private val loaderMap: MutableMap<Int, DaroInterstitialAdLoader> = mutableMapOf()
+  private val interstitialAdMap: MutableMap<Int, DaroInterstitialAd> = mutableMapOf()
 
 
-  override fun isInterstitialReady(adUnitId: String, promise: Promise) {
-    promise.resolve(retrieveAd(adUnitId) != null)
+  override fun isInterstitialReady(requestId: Int, adUnitId: String, promise: Promise) {
+    promise.resolve(retrieveAd(requestId) != null)
   }
 
-  override fun loadInterstitial(adUnitId: String) {
-    retrieveLoader(adUnitId).load()
+  override fun loadInterstitial(requestId: Int, adUnitId: String) {
+    retrieveLoader(requestId, adUnitId).load()
   }
 
-  override fun showInterstitial(adUnitId: String) {
+  override fun showInterstitial(requestId: Int, adUnitId: String) {
     currentActivity?.let {
-      retrieveAd(adUnitId)?.apply {
+      retrieveAd(requestId)?.apply {
         setListener(object : DaroInterstitialAdListener {
           override fun onDismiss(ad: DaroAdInfo) {
             sendNativeEvent(
               event = InterstitialEvent.ON_INTERSTITIAL_HIDDEN_EVENT,
-              params = AdInfoUtil.getAdInfo(adUnitId, ad),
+              params = AdInfoUtil.getAdInfo(requestId, adUnitId, ad),
             )
           }
 
           override fun onFailedToShow(ad: DaroAdInfo, error: DaroAdDisplayFailError) {
             sendNativeEvent(
               event = InterstitialEvent.ON_INTERSTITIAL_AD_FAILED_TO_DISPLAY_EVENT,
-              params = AdInfoUtil.getAdDisplayFailedInfo(adUnitId, ad, error),
+              params = AdInfoUtil.getAdDisplayFailedInfo(requestId, adUnitId, ad, error),
             )
           }
 
           override fun onShown(ad: DaroAdInfo) {
             sendNativeEvent(
               event = InterstitialEvent.ON_INTERSTITIAL_DISPLAYED_EVENT,
-              params = AdInfoUtil.getAdInfo(adUnitId, ad),
+              params = AdInfoUtil.getAdInfo(requestId, adUnitId, ad),
             )
 
-            interstitialAdMap.remove(adUnitId)
+            interstitialAdMap.remove(requestId)
           }
 
           override fun onAdClicked(responseInfo: DaroAdInfo) {
             sendNativeEvent(
               event = InterstitialEvent.ON_INTERSTITIAL_CLICKED_EVENT,
-              params = AdInfoUtil.getAdInfo(adUnitId, responseInfo),
+              params = AdInfoUtil.getAdInfo(requestId, adUnitId, responseInfo),
             )
           }
 
           override fun onAdImpression(responseInfo: DaroAdInfo) {
             sendNativeEvent(
               event = InterstitialEvent.ON_INTERSTITIAL_AD_IMPRESSION_RECORDED,
-              params = AdInfoUtil.getAdInfo(adUnitId, responseInfo),
+              params = AdInfoUtil.getAdInfo(requestId, adUnitId, responseInfo),
             )
           }
         })
@@ -82,32 +82,32 @@ internal class DaroMInterstitialModuleImpl(
     }
   }
 
-  private fun retrieveLoader(adUnitId: String): DaroInterstitialAdLoader {
-    return loaderMap[adUnitId] ?: DaroInterstitialAdLoader(
+  private fun retrieveLoader(requestId: Int, adUnitId: String): DaroInterstitialAdLoader {
+    return loaderMap[requestId] ?: DaroInterstitialAdLoader(
       context,
       DaroInterstitialAdUnit(adUnitId, adUnitId)
     ).also {
-      loaderMap[adUnitId] = it
+      loaderMap[requestId] = it
       it.setListener(object : DaroInterstitialAdLoaderListener {
         override fun onAdLoadSuccess(ad: DaroInterstitialAd, responseInfo: DaroAdInfo) {
-          interstitialAdMap[adUnitId] = ad
+          interstitialAdMap[requestId] = ad
           sendNativeEvent(
             event = InterstitialEvent.ON_INTERSTITIAL_LOADED_EVENT,
-            params = AdInfoUtil.getAdInfo(adUnitId, responseInfo),
+            params = AdInfoUtil.getAdInfo(requestId, adUnitId, responseInfo),
           )
         }
 
         override fun onAdLoadFail(err: DaroAdLoadError) {
           sendNativeEvent(
             event = InterstitialEvent.ON_INTERSTITIAL_LOAD_FAILED_EVENT,
-            params = AdInfoUtil.getAdLoadFailedInfo(adUnitId, err),
+            params = AdInfoUtil.getAdLoadFailedInfo(requestId, adUnitId, err),
           )
         }
       })
     }
   }
 
-  private fun retrieveAd(adUnitId: String): DaroInterstitialAd? {
-    return interstitialAdMap[adUnitId]
+  private fun retrieveAd(requestId: Int): DaroInterstitialAd? {
+    return interstitialAdMap[requestId]
   }
 }