react-native-daro 1.0.13 → 1.0.15

package/android/src/main/java/com/daro/reactnative/view/DaroMAdBannerViewContainer.kt

@@ -0,0 +1,417 @@
+package com.daro.reactnative.view
+
+import android.annotation.SuppressLint
+import android.graphics.Rect
+import android.view.View
+import android.view.ViewTreeObserver
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.core.view.children
+import androidx.core.view.isVisible
+import com.daro.reactnative.event.AdViewEvent
+import com.daro.reactnative.util.AdInfoUtil
+import com.daro.reactnative.util.EventEmitterUtil.sendNativeViewEvent
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.views.view.ReactViewGroup
+import droom.daro.core.adunit.DaroBannerAdUnit
+import droom.daro.core.model.DaroAdInfo
+import droom.daro.core.model.DaroAdLoadError
+import droom.daro.core.model.DaroBannerSize
+import droom.daro.core.model.DaroViewAd
+import droom.daro.view.DaroAdViewListener
+import droom.daro.view.DaroBannerAdView
+
+@SuppressLint("ViewConstructor")
+class DaroMAdBannerViewContainer(val context: ReactContext) : ReactViewGroup(context),
+  DaroAdViewListener {
+  private companion object {
+    private const val MAX_PENDING_LOAD_RETRIES = 10
+    private const val PENDING_LOAD_RETRY_DELAY_MS = 100L
+  }
+
+  private var adView: DaroBannerAdView? = null
+
+  internal var adUnitId: String = ""
+
+  internal var adSize: DaroBannerSize? = null
+
+  internal var loadOnMount: Boolean = true
+
+  private var isAdVisible: Boolean = true
+  private var isAdPaused: Boolean = false
+  private var hasRequestedInitialLoad: Boolean = false
+  private var hasPendingLoad: Boolean = false
+  private var isPendingLoadRetryScheduled: Boolean = false
+  private var pendingLoadRetryCount: Int = 0
+  private var pendingLoadRetryRunnable: Runnable? = null
+  private var hasScheduledLoadedAdDrawActivation: Boolean = false
+  private var hasPulsedLoadedAdAttach: Boolean = false
+  private var activatedAdChild: View? = null
+  private var pulsedAdChild: View? = null
+  private val visibleRect = Rect()
+
+  fun loadAd() {
+    (adView ?: buildAdView())?.apply {
+      adView = this
+
+      if (this.parent == null) {
+        this.layoutParams = ViewGroup.LayoutParams(
+          ViewGroup.LayoutParams.MATCH_PARENT,
+          ViewGroup.LayoutParams.MATCH_PARENT,
+        )
+        this@DaroMAdBannerViewContainer.addView(this)
+      }
+
+      layoutAdView()
+      if (!canLoadAd()) {
+        if (!hasPendingLoad) {
+          pendingLoadRetryCount = 0
+        }
+        hasPendingLoad = true
+        schedulePendingLoadRetry()
+        return
+      }
+
+      hasPendingLoad = false
+      pendingLoadRetryCount = 0
+      cancelPendingLoadRetry()
+      hasScheduledLoadedAdDrawActivation = false
+      hasPulsedLoadedAdAttach = false
+      activatedAdChild = null
+      pulsedAdChild = null
+      loadAd()
+    }
+  }
+
+  private fun buildAdView(): DaroBannerAdView? {
+    if (adUnitId.isEmpty() || adSize == null) {
+      return null
+    }
+
+    return DaroBannerAdView(
+      context,
+      DaroBannerAdUnit(
+        key = adUnitId,
+        placement = adUnitId,
+        bannerSize = adSize!!,
+      )
+    ).also { view ->
+      view.setListener(this)
+      view.setOnHierarchyChangeListener(object : ViewGroup.OnHierarchyChangeListener {
+        override fun onChildViewAdded(parent: View, child: View) {
+          if (activatedAdChild !== child) {
+            hasScheduledLoadedAdDrawActivation = false
+            hasPulsedLoadedAdAttach = false
+            activatedAdChild = null
+            pulsedAdChild = null
+          }
+
+          layoutAdView()
+          layoutLoadedAdChild(child)
+        }
+
+        override fun onChildViewRemoved(parent: View, child: View) = Unit
+      })
+    }
+  }
+
+  fun destroy() {
+    cancelPendingLoadRetry()
+    hasPendingLoad = false
+    pendingLoadRetryCount = 0
+    hasScheduledLoadedAdDrawActivation = false
+    hasPulsedLoadedAdAttach = false
+    activatedAdChild = null
+    pulsedAdChild = null
+    adView?.setOnHierarchyChangeListener(null)
+    adView?.destroy()
+    adView = null
+  }
+
+  fun setAdVisibility(visible: Boolean) {
+    isAdVisible = visible
+    this.isVisible = visible
+    adView?.isVisible = visible
+
+    if (visible) {
+      resumeAd()
+      loadPendingAdIfReady()
+    } else {
+      cancelPendingLoadRetry()
+      pauseAd()
+    }
+  }
+
+  fun pauseAd() {
+    cancelPendingLoadRetry()
+    if (!isAdPaused) {
+      isAdPaused = true
+      adView?.pause()
+    }
+  }
+
+  fun resumeAd() {
+    if (isAdPaused) {
+      isAdPaused = false
+      adView?.resume()
+    }
+    loadPendingAdIfReady()
+  }
+
+  override fun onAdClicked(adInfo: DaroAdInfo) {
+    sendNativeViewEvent(
+      reactContext = context,
+      event = AdViewEvent.ON_AD_CLICKED,
+      params = AdInfoUtil.getAdInfo(adUnitId, adInfo)
+    )
+  }
+
+  override fun onAdImpression(adInfo: DaroAdInfo) {
+    sendNativeViewEvent(
+      reactContext = context,
+      event = AdViewEvent.ON_AD_IMPRESSION,
+      params = AdInfoUtil.getAdInfo(adUnitId, adInfo),
+    )
+  }
+
+  override fun onAdLoadFail(err: DaroAdLoadError) {
+    sendNativeViewEvent(
+      reactContext = context,
+      event = AdViewEvent.ON_AD_FAILED_TO_LOAD,
+      params = AdInfoUtil.getAdLoadFailedInfo(adUnitId, err),
+    )
+  }
+
+  override fun onAdLoadSuccess(
+    ad: DaroViewAd,
+    adInfo: DaroAdInfo,
+  ) {
+    layoutLoadedAdView()
+
+    sendNativeViewEvent(
+      reactContext = context,
+      event = AdViewEvent.ON_AD_LOADED,
+      params = AdInfoUtil.getAdInfo(adUnitId, adInfo),
+    )
+
+    post {
+      layoutLoadedAdView()
+    }
+  }
+
+  override fun requestLayout() {
+    super.requestLayout()
+
+    // https://stackoverflow.com/a/39838774/5477988
+    // This is required to ensure ad refreshes render correctly in RN Android due to known issue
+    // where `getWidth()` and `getHeight()` return 0 on attach
+    post {
+      layoutAdView()
+      loadPendingAdIfReady()
+    }
+  }
+
+  override fun onAttachedToWindow() {
+    super.onAttachedToWindow()
+    loadPendingAdIfReady()
+  }
+
+  override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+    super.onSizeChanged(w, h, oldw, oldh)
+    layoutAdView()
+    loadPendingAdIfReady()
+  }
+
+  override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+    super.onLayout(changed, left, top, right, bottom)
+    layoutAdView()
+    loadPendingAdIfReady()
+  }
+
+  override fun onWindowVisibilityChanged(visibility: Int) {
+    super.onWindowVisibilityChanged(visibility)
+
+    if (visibility == View.VISIBLE) {
+      loadPendingAdIfReady()
+    }
+  }
+
+  private fun layoutAdView() {
+    if (width <= 0 || height <= 0) {
+      return
+    }
+
+    try {
+      adView?.measure(
+        MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+        MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+      )
+
+      adView?.layout(0, 0, width, height)
+    } catch (_: Exception) {
+      // Ignore
+    }
+  }
+
+  private fun layoutLoadedAdView() {
+    layoutAdView()
+    adView?.children?.firstOrNull()?.let { layoutLoadedAdChild(it) }
+  }
+
+  private fun layoutLoadedAdChild(child: View) {
+    layoutLoadedAdChild(child, scheduleDrawActivation = true)
+  }
+
+  private fun layoutLoadedAdChild(child: View, scheduleDrawActivation: Boolean) {
+    if (width <= 0 || height <= 0) {
+      return
+    }
+
+    ensureMatchParentLayoutParams(child)
+
+    child.measure(
+      MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+      MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+    )
+
+    child.layout(0, 0, width, height)
+    child.requestLayout()
+    adView?.requestLayout()
+
+    if (scheduleDrawActivation) {
+      scheduleLoadedAdDrawActivation(child)
+    }
+  }
+
+  private fun scheduleLoadedAdDrawActivation(child: View) {
+    if (hasScheduledLoadedAdDrawActivation && activatedAdChild === child) {
+      return
+    }
+
+    hasScheduledLoadedAdDrawActivation = true
+    activatedAdChild = child
+    child.viewTreeObserver.addOnPreDrawListener(object : ViewTreeObserver.OnPreDrawListener {
+      override fun onPreDraw(): Boolean {
+        if (child.viewTreeObserver.isAlive) {
+          child.viewTreeObserver.removeOnPreDrawListener(this)
+        }
+
+        layoutLoadedAdChild(child)
+        pulseLoadedAdAttachIfNeeded(child)
+        adView?.requestLayout()
+        adView?.invalidate()
+        child.requestLayout()
+        child.invalidate()
+        return true
+      }
+    })
+  }
+
+  private fun pulseLoadedAdAttachIfNeeded(child: View) {
+    if ((hasPulsedLoadedAdAttach && pulsedAdChild === child) || !isStableVisibleAdChild(child)) {
+      return
+    }
+
+    hasPulsedLoadedAdAttach = true
+    pulsedAdChild = child
+    post {
+      val parent = child.parent as? ViewGroup
+      val currentAdView = adView
+      if (parent == null || currentAdView == null || parent !== currentAdView) {
+        return@post
+      }
+
+      parent.removeView(child)
+      ensureMatchParentLayoutParams(child)
+      currentAdView.addView(child)
+      layoutAdView()
+      layoutLoadedAdChild(child, scheduleDrawActivation = false)
+      child.requestLayout()
+      child.invalidate()
+      currentAdView.requestLayout()
+      currentAdView.invalidate()
+    }
+  }
+
+  private fun isStableVisibleAdChild(child: View): Boolean {
+    val hasGlobalVisibleRect = child.getGlobalVisibleRect(visibleRect)
+    return width > 0 &&
+      height > 0 &&
+      child.width > 0 &&
+      child.height > 0 &&
+      child.isAttachedToWindow &&
+      child.isShown &&
+      child.windowVisibility == View.VISIBLE &&
+      hasGlobalVisibleRect &&
+      visibleRect.width() > 0 &&
+      visibleRect.height() > 0
+  }
+
+  private fun ensureMatchParentLayoutParams(child: View) {
+    val layoutParams = child.layoutParams
+    if (layoutParams == null) {
+      child.layoutParams = FrameLayout.LayoutParams(
+        ViewGroup.LayoutParams.MATCH_PARENT,
+        ViewGroup.LayoutParams.MATCH_PARENT,
+      )
+      return
+    }
+
+    layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT
+    layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+    child.layoutParams = layoutParams
+  }
+
+  private fun loadPendingAdIfReady() {
+    if (!hasPendingLoad) {
+      return
+    }
+
+    if (canLoadAd()) {
+      loadAd()
+    } else {
+      schedulePendingLoadRetry()
+    }
+  }
+
+  private fun schedulePendingLoadRetry() {
+    if (isPendingLoadRetryScheduled || pendingLoadRetryCount >= MAX_PENDING_LOAD_RETRIES) {
+      return
+    }
+
+    isPendingLoadRetryScheduled = true
+    pendingLoadRetryCount += 1
+    val retryRunnable = Runnable {
+      pendingLoadRetryRunnable = null
+      isPendingLoadRetryScheduled = false
+      loadPendingAdIfReady()
+    }
+    pendingLoadRetryRunnable = retryRunnable
+    postDelayed(retryRunnable, PENDING_LOAD_RETRY_DELAY_MS)
+  }
+
+  private fun cancelPendingLoadRetry() {
+    pendingLoadRetryRunnable?.let { removeCallbacks(it) }
+    pendingLoadRetryRunnable = null
+    isPendingLoadRetryScheduled = false
+  }
+
+  private fun canLoadAd(): Boolean {
+    return isAdVisible &&
+      isAttachedToWindow &&
+      width > 0 &&
+      height > 0 &&
+      windowVisibility == View.VISIBLE
+  }
+
+  fun onSetProps() {
+    if (loadOnMount && !hasRequestedInitialLoad && canBuildAdView()) {
+      hasRequestedInitialLoad = true
+      loadAd()
+    }
+  }
+
+  private fun canBuildAdView(): Boolean {
+    return adUnitId.isNotEmpty() && adSize != null
+  }
+}

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

@@ -1,4 +1,4 @@
-package com.darom.view
+package com.daro.reactnative.view
 
 import android.annotation.SuppressLint
 import android.os.Handler
@@ -10,9 +10,9 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.annotation.IdRes
 import androidx.core.view.children
-import com.darom.event.AdViewEvent
-import com.darom.util.AdInfoUtil
-import com.darom.util.EventEmitterUtil.sendNativeViewEvent
+import com.daro.reactnative.event.AdViewEvent
+import com.daro.reactnative.util.AdInfoUtil
+import com.daro.reactnative.util.EventEmitterUtil.sendNativeViewEvent
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.views.text.ReactTextView
 import com.facebook.react.views.view.ReactViewGroup

package/app.plugin.js

@@ -0,0 +1 @@
+module.exports = require('./plugin/build').default;

package/ios/DaroMAdBannerViewManager.swift

@@ -1,4 +1,4 @@
-import Daro
+import React
 
 @objc(DaroMAdBannerViewManager)
 class DaroMAdBannerViewManager: RCTViewManager {

package/ios/DaroMModule+AppOpen.swift

@@ -1,12 +1,13 @@
-import Daro
+import React
 
 // MARK: - AppOpen Ad Methods
 
 extension DaroMModule {
-    
-    @objc(isAppOpenAdReady:::)
+
+    @objc(isAppOpenAdReady::::)
     func isAppOpenAdReady(
-        _ adUnitId: String,
+        _ requestId: NSNumber,
+        adUnitId: String,
         resolve: RCTPromiseResolveBlock,
         reject: RCTPromiseRejectBlock
     ) {
@@ -15,28 +16,31 @@ extension DaroMModule {
         resolve(false)
         return
       }
-      resolve(appOpenAds[adUnitId]?.loadedAd != nil)
+      resolve(appOpenAds[requestId.intValue]?.loadedAd != nil)
     }
 
-    @objc(loadAppOpenAd:::)
+    @objc(loadAppOpenAd::::)
     func loadAppOpenAd(
-        _ adUnitId: String,
+        _ requestId: NSNumber,
+        adUnitId: String,
         resolve: RCTPromiseResolveBlock,
         reject: RCTPromiseRejectBlock
     ) {
-        let appOpenAdLoader = retrieveAppOpenLoader(for: adUnitId)
+        let appOpenAdLoader = retrieveAppOpenLoader(requestId: requestId.intValue, adUnitId: adUnitId)
       appOpenAdLoader.loadAd()
         resolve(Void())
     }
 
-    @objc(showAppOpenAd::::)
+    @objc(showAppOpenAd::::::)
     func showAppOpenAd(
-        _ adUnitId: String,
+        _ requestId: NSNumber,
+        adUnitId: String,
+        placement: String?,
         customData: String?,
         resolve: @escaping RCTPromiseResolveBlock,
         reject: RCTPromiseRejectBlock
     ) {
-      guard let loadedAd = appOpenAds[adUnitId]?.loadedAd else {
+      guard let loadedAd = appOpenAds[requestId.intValue]?.loadedAd else {
         reject("APPOPEN_NOT_LOADED", "AppOpen ad not loaded", nil)
         return
       }
@@ -46,53 +50,52 @@ extension DaroMModule {
       }
     }
 
-  func retrieveAppOpenLoader(for unitId: String) -> DaroAppOpenAdLoader {
-    if let appOpenLoader = appOpenAds[unitId] {
+  func retrieveAppOpenLoader(requestId: Int, adUnitId: String) -> DaroAppOpenAdLoader {
+    if let appOpenLoader = appOpenAds[requestId] {
       return appOpenLoader.loader
     } else {
-      let appOpenLoader = DaroAppOpenAdLoader(unit: DaroAdUnit(unitId: unitId))
+      let appOpenLoader = DaroAppOpenAdLoader(unit: DaroAdUnit(unitId: adUnitId))
       appOpenLoader.listener.onAdClicked = { [weak self] adInfo in
-        DaroMModule.logger.debug("[DARO] Sample Interstitial Ad clicked")
-        self?.sendEvent(with: .onAppOpenAdClickedEvent, body: adInfo?.toBody)
+        DaroMModule.logger.debug("[DARO] Sample AppOpen Ad clicked")
+        self?.sendEvent(with: .onAppOpenAdClickedEvent, body: adInfo?.toBody(requestId: requestId))
       }
 
       appOpenLoader.listener.onAdImpression = { [weak self] adInfo in
-        DaroMModule.logger.debug("[DARO] Sample Interstitial Ad impression")
-        self?.interstitials[unitId]?.loadedAd = nil
-        self?.sendEvent(with: .onAppOpenAdImpressionRecordedEvent, body: adInfo?.toBody)
+        DaroMModule.logger.debug("[DARO] Sample AppOpen Ad impression")
+        self?.appOpenAds[requestId]?.loadedAd = nil
+        self?.sendEvent(with: .onAppOpenAdImpressionRecordedEvent, body: adInfo?.toBody(requestId: requestId))
       }
 
       appOpenLoader.listener.onAdLoadSuccess = { [weak self] ad, adInfo in
-        DaroMModule.logger.debug("[DARO] Sample Interstitial Ad loaded")
-        self?.appOpenAds[unitId]?.loadedAd = ad
-        self?.sendEvent(with: .onAppOpenAdLoadedEvent, body: adInfo?.toBody)
-        self?.setupAppOpenListener(for: ad)
+        DaroMModule.logger.debug("[DARO] Sample AppOpen Ad loaded")
+        self?.appOpenAds[requestId]?.loadedAd = ad
+        self?.sendEvent(with: .onAppOpenAdLoadedEvent, body: adInfo?.toBody(requestId: requestId))
+        self?.setupAppOpenListener(for: ad, requestId: requestId)
       }
 
       appOpenLoader.listener.onAdLoadFail = { [weak self] error in
-        DaroMModule.logger.debug("[DARO] Sample Interstitial Ad failed: \(error)")
-        self?.sendEvent(with: .onAppOpenAdLoadFailedEvent, body: error.toBody)
+        DaroMModule.logger.debug("[DARO] Sample AppOpen Ad failed: \(error)")
+        self?.sendEvent(with: .onAppOpenAdLoadFailedEvent, body: error.toBody(requestId: requestId))
       }
-      self.appOpenAds[unitId] = AppOpenAd(loader: appOpenLoader)
+      self.appOpenAds[requestId] = AppOpenAd(loader: appOpenLoader)
       return appOpenLoader
     }
   }
 
-  private func setupAppOpenListener(for ad: DaroAppOpenAd) {
+  private func setupAppOpenListener(for ad: DaroAppOpenAd, requestId: Int) {
     ad.appOpenAdListener.onShown = { [weak self] adInfo in
       DaroMModule.logger.debug("[DARO] Sample AppOpen Ad displayed")
-      self?.sendEvent(with: .onAppOpenAdDisplayedEvent, body: adInfo?.toBody)
+      self?.sendEvent(with: .onAppOpenAdDisplayedEvent, body: adInfo?.toBody(requestId: requestId))
     }
 
     ad.appOpenAdListener.onDismiss = { [weak self] adInfo in
       DaroMModule.logger.debug("[DARO] Sample AppOpen Ad hidden")
-      self?.sendEvent(with: .onAppOpenAdHiddenEvent, body: adInfo?.toBody)
+      self?.sendEvent(with: .onAppOpenAdHiddenEvent, body: adInfo?.toBody(requestId: requestId))
     }
 
     ad.appOpenAdListener.onFailedToShow = { [weak self] adInfo, error in
       DaroMModule.logger.debug("[DARO] Sample AppOpen Ad failed to display")
-      self?.sendEvent(with: .onAppOpenAdFailedToDisplayEvent, body: adInfo?.toBody)
+      self?.sendEvent(with: .onAppOpenAdFailedToDisplayEvent, body: adInfo?.toBody(requestId: requestId))
     }
   }
 }
-

package/ios/DaroMModule+Interstitial.swift

@@ -1,12 +1,13 @@
-import Daro
+import React
 
 // MARK: - Interstitial Ad Methods
 
 extension DaroMModule {
-    
-  @objc(isInterstitialReady:::)
+
+  @objc(isInterstitialReady::::)
     func isInterstitialReady(
-      _ adUnitId: String,
+      _ requestId: NSNumber,
+      adUnitId: String,
       resolve: RCTPromiseResolveBlock,
       reject: RCTPromiseRejectBlock
     ) {
@@ -15,27 +16,29 @@ extension DaroMModule {
         resolve(false)
         return
       }
-      resolve(interstitials[adUnitId]?.loadedAd != nil)
+      resolve(interstitials[requestId.intValue]?.loadedAd != nil)
     }
 
-    @objc(loadInterstitial:::)
+    @objc(loadInterstitial::::)
     func loadInterstitial(
-      _ adUnitId: String,
+      _ requestId: NSNumber,
+      adUnitId: String,
       resolve: RCTPromiseResolveBlock,
       reject: RCTPromiseRejectBlock
     ) {
-      let interstitialLoader = retrieveInterstitialLoader(for: adUnitId)
+      let interstitialLoader = retrieveInterstitialLoader(requestId: requestId.intValue, adUnitId: adUnitId)
       interstitialLoader.loadAd()
       resolve(Void())
     }
 
-    @objc(showInterstitial:::)
+    @objc(showInterstitial::::)
     func showInterstitial(
-      _ adUnitId: String,
+      _ requestId: NSNumber,
+      adUnitId: String,
       resolve: @escaping RCTPromiseResolveBlock,
       reject: @escaping RCTPromiseRejectBlock
     ) {
-      guard let loadedAd = interstitials[adUnitId]?.loadedAd else {
+      guard let loadedAd = interstitials[requestId.intValue]?.loadedAd else {
         reject("INTERSTITIAL_NOT_LOADED", "Interstitial ad not loaded", nil)
         return
       }
@@ -49,52 +52,52 @@ extension DaroMModule {
       }
     }
 
-    func retrieveInterstitialLoader(for unitId: String) -> DaroInterstitialAdLoader {
-      if let interstitialAd = interstitials[unitId] {
+    func retrieveInterstitialLoader(requestId: Int, adUnitId: String) -> DaroInterstitialAdLoader {
+      if let interstitialAd = interstitials[requestId] {
         return interstitialAd.loader
       } else {
-        let interstitialLoader = DaroInterstitialAdLoader(unit: DaroAdUnit(unitId: unitId))
+        let interstitialLoader = DaroInterstitialAdLoader(unit: DaroAdUnit(unitId: adUnitId))
         interstitialLoader.listener.onAdClicked = { [weak self] adInfo in
           DaroMModule.logger.debug("[DARO] Sample Interstitial Ad clicked")
-          self?.sendEvent(with: .onInterstitialClickedEvent, body: adInfo?.toBody)
+          self?.sendEvent(with: .onInterstitialClickedEvent, body: adInfo?.toBody(requestId: requestId))
         }
 
         interstitialLoader.listener.onAdImpression = { [weak self] adInfo in
           DaroMModule.logger.debug("[DARO] Sample Interstitial Ad impression")
-          self?.interstitials[unitId]?.loadedAd = nil
-          self?.sendEvent(with: .onInterstitialAdImpressionRecordedEvent, body: adInfo?.toBody)
+          self?.interstitials[requestId]?.loadedAd = nil
+          self?.sendEvent(with: .onInterstitialAdImpressionRecordedEvent, body: adInfo?.toBody(requestId: requestId))
         }
 
         interstitialLoader.listener.onAdLoadSuccess = { [weak self] ad, adInfo in
           DaroMModule.logger.debug("[DARO] Sample Interstitial Ad loaded")
-          self?.interstitials[unitId]?.loadedAd = ad
-          self?.sendEvent(with: .onInterstitialLoadedEvent, body: adInfo?.toBody)
-          self?.setupInterstitialListener(for: ad)
+          self?.interstitials[requestId]?.loadedAd = ad
+          self?.sendEvent(with: .onInterstitialLoadedEvent, body: adInfo?.toBody(requestId: requestId))
+          self?.setupInterstitialListener(for: ad, requestId: requestId)
         }
 
         interstitialLoader.listener.onAdLoadFail = { [weak self] error in
           DaroMModule.logger.debug("[DARO] Sample Interstitial Ad failed: \(error)")
-          self?.sendEvent(with: .onInterstitialLoadFailedEvent, body: error.toBody)
+          self?.sendEvent(with: .onInterstitialLoadFailedEvent, body: error.toBody(requestId: requestId))
         }
-        self.interstitials[unitId] = InterstitialAd(loader: interstitialLoader)
+        self.interstitials[requestId] = InterstitialAd(loader: interstitialLoader)
         return interstitialLoader
       }
     }
 
-    private func setupInterstitialListener(for ad: DaroInterstitialAd) {
+    private func setupInterstitialListener(for ad: DaroInterstitialAd, requestId: Int) {
       ad.interstitialListener.onShown = { [weak self] adInfo in
         DaroMModule.logger.debug("[DARO] Sample Interstitial Ad displayed")
-        self?.sendEvent(with: .onInterstitialDisplayedEvent, body: adInfo?.toBody)
+        self?.sendEvent(with: .onInterstitialDisplayedEvent, body: adInfo?.toBody(requestId: requestId))
       }
 
       ad.interstitialListener.onDismiss = { [weak self] adInfo in
         DaroMModule.logger.debug("[DARO] Sample Interstitial Ad hidden")
-        self?.sendEvent(with: .onInterstitialHiddenEvent, body: adInfo?.toBody)
+        self?.sendEvent(with: .onInterstitialHiddenEvent, body: adInfo?.toBody(requestId: requestId))
       }
 
       ad.interstitialListener.onFailedToShow = { [weak self] adInfo, error in
         DaroMModule.logger.debug("[DARO] Sample Interstitial Ad failed to display")
-        self?.sendEvent(with: .onInterstitialAdFailedToDisplayEvent, body: adInfo?.toBody)
+        self?.sendEvent(with: .onInterstitialAdFailedToDisplayEvent, body: adInfo?.toBody(requestId: requestId))
       }
     }
 }