@bigcrunch/react-native-ads 0.11.0 → 0.13.0

package/android/bigcrunch-ads/com/bigcrunch/ads/BigCrunchAds.kt

@@ -12,6 +12,7 @@ import com.bigcrunch.ads.internal.PrivacyStore
 import com.bigcrunch.ads.internal.SharedPreferencesStore
 import com.bigcrunch.ads.models.AppConfig
 import com.bigcrunch.ads.models.DeviceData
+import com.bigcrunch.ads.models.ScreenViewOptions
 import com.bigcrunch.ads.models.SessionInfo
 import com.google.android.gms.ads.MobileAds
 import com.google.android.gms.ads.RequestConfiguration
@@ -231,13 +232,14 @@ object BigCrunchAds {
      * Track screen view for analytics
      *
      * @param screenName Name of the screen being viewed
+     * @param options Optional overrides for page URL, content metadata, and custom dimensions
      */
-    fun trackScreen(screenName: String) = runSafely {
+    fun trackScreen(screenName: String, options: ScreenViewOptions? = null) = runSafely {
         if (!initialized) {
             BCLogger.w(TAG, "trackScreen called before initialization, ignoring")
             return@runSafely
         }
-        analyticsClient.trackScreenView(screenName)
+        analyticsClient.trackScreenView(screenName, options)
         SessionManager.incrementScreenViewCount()
     }
 
@@ -245,9 +247,10 @@ object BigCrunchAds {
      * Track screen view for analytics (alias for React Native compatibility)
      *
      * @param screenName Name of the screen being viewed
+     * @param options Optional overrides for page URL, content metadata, and custom dimensions
      */
-    fun trackScreenView(screenName: String) = runSafely {
-        trackScreen(screenName)
+    fun trackScreenView(screenName: String, options: ScreenViewOptions? = null) = runSafely {
+        trackScreen(screenName, options)
     }
 
     /**

package/android/bigcrunch-ads/com/bigcrunch/ads/adapters/GoogleAdsAdapter.kt

@@ -230,12 +230,17 @@ internal class GoogleAdsAdapter(
 
                 // Extract GAM metadata from ResponseInfo
                 val responseInfo = adView.responseInfo
-                val advertiserId = responseInfo?.loadedAdapterResponseInfo?.adSourceId
                 val adMetadata = extractAdMetadata(responseInfo)
 
+                // Extract ad size from the loaded banner
+                val loadedAdSize = adView.adSize
+                val adSizeString = if (loadedAdSize != null) "${loadedAdSize.width}x${loadedAdSize.height}" else ""
+
                 analyticsClient.trackAdImpression(
                     placementId = placementConfig.placementId,
                     format = placementConfig.format,
+                    gamAdUnit = placementConfig.gamAdUnit,
+                    adSize = adSizeString,
                     advertiserId = adMetadata["advertiser_id"] as? String,
                     campaignId = adMetadata["campaign_id"] as? String,
                     lineItemId = adMetadata["line_item_id"] as? String,
@@ -394,6 +399,7 @@ internal class GoogleAdsAdapter(
                 analyticsClient.trackAdImpression(
                     placementId = placementConfig.placementId,
                     format = placementConfig.format,
+                    gamAdUnit = placementConfig.gamAdUnit,
                     advertiserId = adMetadata["advertiser_id"] as? String,
                     campaignId = adMetadata["campaign_id"] as? String,
                     lineItemId = adMetadata["line_item_id"] as? String,
@@ -501,6 +507,7 @@ internal class GoogleAdsAdapter(
                 analyticsClient.trackAdImpression(
                     placementId = placementConfig.placementId,
                     format = placementConfig.format,
+                    gamAdUnit = placementConfig.gamAdUnit,
                     advertiserId = adMetadata["advertiser_id"] as? String,
                     campaignId = adMetadata["campaign_id"] as? String,
                     lineItemId = adMetadata["line_item_id"] as? String,

package/android/bigcrunch-ads/com/bigcrunch/ads/core/AdOrchestrator.kt

@@ -8,6 +8,7 @@ import com.bigcrunch.ads.adapters.GoogleAdsAdapter
 import com.bigcrunch.ads.adapters.InterstitialAdCallback
 import com.bigcrunch.ads.adapters.RewardedAdCallback
 import com.bigcrunch.ads.internal.BCLogger
+import com.bigcrunch.ads.models.AuctionData
 import com.bigcrunch.ads.models.PlacementConfig
 import com.google.android.gms.ads.admanager.AdManagerAdRequest
 import com.google.android.gms.ads.admanager.AdManagerAdView
@@ -164,16 +165,24 @@ internal class AdOrchestrator(
         val adRequestBuilder = AdManagerAdRequest.Builder()
 
         // 3. Fetch S2S demand (even if it fails, continue with Google)
-        val targeting = bidRequestClient.fetchDemand(placement)
-        if (targeting != null && targeting.isNotEmpty()) {
-            for ((key, value) in targeting) {
+        val bidResponse = bidRequestClient.fetchDemand(placement)
+        if (bidResponse != null && bidResponse.targeting.isNotEmpty()) {
+            for ((key, value) in bidResponse.targeting) {
                 adRequestBuilder.addCustomTargeting(key, value)
             }
-            BCLogger.d(TAG, "S2S demand fetched for: ${placement.placementId} (${targeting.size} keys)")
+            BCLogger.d(TAG, "S2S demand fetched for: ${placement.placementId} (${bidResponse.targeting.size} keys)")
         } else {
             BCLogger.w(TAG, "S2S demand fetch returned no targeting, continuing with Google only")
         }
 
+        // Store auction data for analytics (or default to GAM if no S2S)
+        val auctionData = bidResponse?.auctionData ?: AuctionData(
+            bidder = "google_ad_exchange",
+            floorPrice = placement.floorPrice,
+            demandChannel = "Google Ad Exchange"
+        )
+        analyticsClient.setAuctionData(placement.placementId, auctionData)
+
         // 4. Load Google ad with the (possibly enriched) ad request
         val adRequest = adRequestBuilder.build()
         val adapterCallback = object : BannerAdCallback {
@@ -292,16 +301,24 @@ internal class AdOrchestrator(
         val adRequestBuilder = AdManagerAdRequest.Builder()
 
         // 3. Fetch S2S demand
-        val targeting = bidRequestClient.fetchDemand(placement)
-        if (targeting != null && targeting.isNotEmpty()) {
-            for ((key, value) in targeting) {
+        val bidResponse = bidRequestClient.fetchDemand(placement)
+        if (bidResponse != null && bidResponse.targeting.isNotEmpty()) {
+            for ((key, value) in bidResponse.targeting) {
                 adRequestBuilder.addCustomTargeting(key, value)
             }
-            BCLogger.d(TAG, "S2S demand fetched for: ${placement.placementId} (${targeting.size} keys)")
+            BCLogger.d(TAG, "S2S demand fetched for: ${placement.placementId} (${bidResponse.targeting.size} keys)")
         } else {
             BCLogger.w(TAG, "S2S demand fetch returned no targeting, continuing with Google only")
         }
 
+        // Store auction data for analytics (or default to GAM if no S2S)
+        val auctionData = bidResponse?.auctionData ?: AuctionData(
+            bidder = "google_ad_exchange",
+            floorPrice = placement.floorPrice,
+            demandChannel = "Google Ad Exchange"
+        )
+        analyticsClient.setAuctionData(placement.placementId, auctionData)
+
         // Get test ads flag from config
         val useTestAds = configManager.shouldUseTestAds()
 
@@ -466,16 +483,24 @@ internal class AdOrchestrator(
         val adRequestBuilder = AdManagerAdRequest.Builder()
 
         // 3. Fetch S2S demand
-        val targeting = bidRequestClient.fetchDemand(placement)
-        if (targeting != null && targeting.isNotEmpty()) {
-            for ((key, value) in targeting) {
+        val bidResponse = bidRequestClient.fetchDemand(placement)
+        if (bidResponse != null && bidResponse.targeting.isNotEmpty()) {
+            for ((key, value) in bidResponse.targeting) {
                 adRequestBuilder.addCustomTargeting(key, value)
             }
-            BCLogger.d(TAG, "S2S demand fetched for: ${placement.placementId} (${targeting.size} keys)")
+            BCLogger.d(TAG, "S2S demand fetched for: ${placement.placementId} (${bidResponse.targeting.size} keys)")
         } else {
             BCLogger.w(TAG, "S2S demand fetch returned no targeting, continuing with Google only")
         }
 
+        // Store auction data for analytics (or default to GAM if no S2S)
+        val auctionData = bidResponse?.auctionData ?: AuctionData(
+            bidder = "google_ad_exchange",
+            floorPrice = placement.floorPrice,
+            demandChannel = "Google Ad Exchange"
+        )
+        analyticsClient.setAuctionData(placement.placementId, auctionData)
+
         // Get test ads flag from config
         val useTestAds = configManager.shouldUseTestAds()
 

package/android/bigcrunch-ads/com/bigcrunch/ads/core/AnalyticsClient.kt

@@ -50,16 +50,33 @@ internal class AnalyticsClient(
     /** Track impression contexts for correlating events */
     private val impressionContexts = ConcurrentHashMap<String, ImpressionContext>()
 
+    /** Per-placement auction data from S2S responses (set by AdOrchestrator, consumed by trackAdImpression) */
+    private val placementAuctionData = ConcurrentHashMap<String, AuctionData>()
+
+    /** Batching for impression events */
+    private val impressionBatch = mutableListOf<ImpressionBatchEvent>()
+    private var impressionBatchHandler: android.os.Handler? = null
+    private val impressionBatchLock = Any()
+
     /** Batching for viewability events */
     private val viewabilityBatch = mutableListOf<ViewabilityEvent>()
     private var viewabilityBatchHandler: android.os.Handler? = null
-    private val batchLock = Any()
+    private val viewabilityBatchLock = Any()
+
     private val BATCH_DELAY_MS = 250L
 
     /** Previous screen name for referrer tracking */
     @Volatile
     private var previousScreenName: String? = null
 
+    /** Current page URL (set by trackScreenView, used by all events) */
+    @Volatile
+    private var currentPageUrl: String = ""
+
+    /** Current custom dimensions (set by trackScreenView, used by all events) */
+    @Volatile
+    private var currentCustomDimensions: Map<String, String> = emptyMap()
+
     // MARK: - Session Context
 
     private val sessionManager: SessionManager
@@ -177,15 +194,37 @@ internal class AnalyticsClient(
 
     // MARK: - Page View Tracking
 
+    /**
+     * Generate the default page URL from screen name
+     */
+    private fun generatePageUrl(screenName: String): String {
+        val appName = try {
+            BigCrunchAds.getAppConfig()?.appName ?: "app"
+        } catch (e: Exception) {
+            "app"
+        }
+        val sanitizedAppName = appName.lowercase()
+            .replace(" ", "-")
+            .let { java.net.URLEncoder.encode(it, "UTF-8") }
+        val encodedScreen = java.net.URLEncoder.encode(screenName, "UTF-8")
+        return "https://$sanitizedAppName.mobile.app/$encodedScreen"
+    }
+
     /**
      * Track a screen view
      *
      * @param screenName Name of the screen being viewed
+     * @param options Optional overrides for page URL, metadata, and custom dimensions
      */
-    fun trackScreenView(screenName: String) {
+    fun trackScreenView(screenName: String, options: ScreenViewOptions? = null) {
         // Start new page view and get IDs (pass screen name for impression tracking)
         val pageId = sessionManager.startPageView(screenName)
 
+        // Resolve page URL: explicit override > auto-generated
+        val pageUrl = options?.pageUrl ?: generatePageUrl(screenName)
+        currentPageUrl = pageUrl
+        currentCustomDimensions = options?.customDimensions ?: emptyMap()
+
         // Get common event fields
         val common = getCommonEventFields()
 
@@ -201,7 +240,7 @@ internal class AnalyticsClient(
 
         val event = PageViewEvent(
             payloadVersion = "1.0.0",
-            configVersion = 1,  // TODO: Get from ConfigManager when available
+            configVersion = 1,
             browserTimestamp = sessionManager.getCurrentTimestamp(),
             sessionId = sessionManager.sessionId,
             userId = sessionManager.userId,
@@ -209,9 +248,9 @@ internal class AnalyticsClient(
             newUser = sessionManager.isNewUser,
             pageId = pageId,
             sessionDepth = sessionManager.sessionDepth,
-            pageUrl = "",  // page_url must be valid URL or empty - mobile doesn't have URLs
-            pageSearch = "",  // Not applicable for mobile
-            pageReferrer = "",  // page_referrer must be valid URL or empty
+            pageUrl = pageUrl,
+            pageSearch = "",
+            pageReferrer = "",
             browser = common.browser,
             device = common.device,
             os = common.os,
@@ -229,8 +268,9 @@ internal class AnalyticsClient(
             acctType = "anonymous",
             diiSource = "",
             gamNetworkCode = gamNetworkCode,
-            amznPubId = NIL_UUID,  // amzn_pub_id must be valid UUID
-            customDimensions = emptyMap()
+            amznPubId = NIL_UUID,
+            customDimensions = currentCustomDimensions,
+            pageMetaData = options?.pageMeta
         )
 
         sendEvent(event, pageViewAdapter, "pageviews")
@@ -286,6 +326,32 @@ internal class AnalyticsClient(
         return impressionContexts[impressionId]
     }
 
+    // MARK: - Auction Data Storage
+
+    /**
+     * Store auction data for a placement (called by AdOrchestrator after S2S demand fetch)
+     */
+    fun setAuctionData(placementId: String, auctionData: AuctionData) {
+        placementAuctionData[placementId] = auctionData
+        BCLogger.d(TAG, "Stored auction data for placement: $placementId (channel: ${auctionData.demandChannel ?: "unknown"})")
+    }
+
+    /**
+     * Consume auction data for a placement (returns and removes stored data)
+     */
+    private fun consumeAuctionData(placementId: String): AuctionData? {
+        return placementAuctionData.remove(placementId)
+    }
+
+    /**
+     * Compute min_bid_to_win: $0.01 above the higher of second-highest bid or floor price
+     */
+    private fun computeMinBidToWin(auctionData: AuctionData?): Double {
+        if (auctionData == null) return 0.0
+        val baseline = maxOf(auctionData.secondHighestBid ?: 0.0, auctionData.floorPrice ?: 0.0)
+        return if (baseline > 0) baseline + 0.01 else 0.0
+    }
+
     // MARK: - Enhanced Impression Tracking
 
     /**
@@ -316,16 +382,25 @@ internal class AnalyticsClient(
         val auctionId = context.auctionData.auctionId?.takeIf { it.isNotEmpty() }
             ?: UUID.randomUUID().toString()
 
-        // Create impression record with all fields (defaults to empty string/0.0)
+        // Look up stored auction data (may have been set by AdOrchestrator)
+        val storedAuctionData = consumeAuctionData(context.placementId)
+        val effectiveAuctionData = storedAuctionData ?: context.auctionData
+
+        // Create impression record with auction data fields populated
         val impressionRecord = ImpressionRecord(
             slotId = context.placementId,
             gamUnit = context.gamAdUnit,
+            gamPriceBucket = effectiveAuctionData.gamPriceBucket ?: "",
             impressionId = context.impressionId,
             auctionId = auctionId,
-            adBidder = context.auctionData.bidder ?: "",
+            adBidder = effectiveAuctionData.bidder ?: "",
             adSize = adSize,
-            adPrice = context.auctionData.bidPriceCpm ?: 0.0,
-            creativeId = context.auctionData.creativeId ?: ""
+            adPrice = effectiveAuctionData.bidPriceCpm ?: 0.0,
+            adFloorPrice = effectiveAuctionData.floorPrice ?: 0.0,
+            minBidToWin = computeMinBidToWin(effectiveAuctionData),
+            creativeId = effectiveAuctionData.creativeId ?: "",
+            adDemandType = context.format,
+            demandChannel = effectiveAuctionData.demandChannel ?: "Google Ad Exchange"
         )
 
         // region must be 2 chars or empty per backend validation
@@ -342,7 +417,7 @@ internal class AnalyticsClient(
             newUser = sessionManager.isNewUser,
             pageId = sessionManager.getOrCreatePageId(),
             sessionDepth = sessionManager.sessionDepth,
-            pageUrl = "",  // page_url must be valid URL or empty - mobile doesn't have URLs
+            pageUrl = currentPageUrl,
             pageSearch = "",
             pageReferrer = "",
             browser = common.browser,
@@ -362,21 +437,22 @@ internal class AnalyticsClient(
             acctType = "anonymous",
             diiSource = "",
             gamNetworkCode = getGamNetworkCode(),
-            amznPubId = NIL_UUID,  // amzn_pub_id must be valid UUID
-            customDimensions = emptyMap(),
+            amznPubId = NIL_UUID,
+            customDimensions = currentCustomDimensions,
             impressions = listOf(impressionRecord)
         )
 
-        sendEvent(batchEvent, impressionBatchAdapter, "impressions")
+        batchImpressionEvent(batchEvent)
     }
 
     /**
-     * Track an ad impression (simple version without auction data)
+     * Track an ad impression (simple version with auction data lookup)
      */
     fun trackAdImpression(
         placementId: String,
         format: String,
         gamAdUnit: String = "",
+        adSize: String = "",
         advertiserId: String? = null,
         campaignId: String? = null,
         lineItemId: String? = null,
@@ -389,19 +465,31 @@ internal class AnalyticsClient(
         // Get common event fields
         val common = getCommonEventFields()
 
-        // auction_id is required and must be a valid UUID
-        val auctionId = UUID.randomUUID().toString()
+        // Look up stored auction data from S2S response
+        val auctionData = consumeAuctionData(placementId)
+
+        // auction_id: use S2S auction ID if available, otherwise generate one
+        val auctionId = auctionData?.auctionId?.takeIf { it.isNotEmpty() }
+            ?: UUID.randomUUID().toString()
 
-        // Create impression record with all fields (defaults to empty string/0.0)
+        // Create impression record with auction data fields populated
         val impressionRecord = ImpressionRecord(
             slotId = placementId,
             gamUnit = gamAdUnit,
+            gamPriceBucket = auctionData?.gamPriceBucket ?: "",
             impressionId = UUID.randomUUID().toString(),
             auctionId = auctionId,
+            adBidder = auctionData?.bidder ?: "",
+            adSize = adSize,
+            adPrice = auctionData?.bidPriceCpm ?: 0.0,
+            adFloorPrice = auctionData?.floorPrice ?: 0.0,
+            minBidToWin = computeMinBidToWin(auctionData),
             advertiserId = advertiserId ?: "",
             campaignId = campaignId ?: "",
             lineItemId = lineItemId ?: "",
-            creativeId = creativeId ?: "",
+            creativeId = auctionData?.creativeId ?: creativeId ?: "",
+            adDemandType = format,
+            demandChannel = auctionData?.demandChannel ?: "Google Ad Exchange",
             refreshCount = refreshCount
         )
 
@@ -419,7 +507,7 @@ internal class AnalyticsClient(
             newUser = sessionManager.isNewUser,
             pageId = sessionManager.getOrCreatePageId(),
             sessionDepth = sessionManager.sessionDepth,
-            pageUrl = "",  // page_url must be valid URL or empty - mobile doesn't have URLs
+            pageUrl = currentPageUrl,
             pageSearch = "",
             pageReferrer = "",
             browser = common.browser,
@@ -439,12 +527,12 @@ internal class AnalyticsClient(
             acctType = "anonymous",
             diiSource = "",
             gamNetworkCode = getGamNetworkCode(),
-            amznPubId = NIL_UUID,  // amzn_pub_id must be valid UUID
-            customDimensions = emptyMap(),
+            amznPubId = NIL_UUID,
+            customDimensions = currentCustomDimensions,
             impressions = listOf(impressionRecord)
         )
 
-        sendEvent(batchEvent, impressionBatchAdapter, "impressions")
+        batchImpressionEvent(batchEvent)
     }
 
     // MARK: - Click Tracking
@@ -480,7 +568,7 @@ internal class AnalyticsClient(
             newUser = sessionManager.isNewUser,
             pageId = sessionManager.getOrCreatePageId(),
             sessionDepth = sessionManager.sessionDepth,
-            pageUrl = "",  // page_url must be valid URL or empty - mobile doesn't have URLs
+            pageUrl = currentPageUrl,
             pageSearch = "",
             pageReferrer = "",
             browser = common.browser,
@@ -500,8 +588,8 @@ internal class AnalyticsClient(
             acctType = "anonymous",
             diiSource = "",
             gamNetworkCode = getGamNetworkCode(),
-            amznPubId = NIL_UUID,  // amzn_pub_id must be valid UUID
-            customDimensions = emptyMap(),
+            amznPubId = NIL_UUID,
+            customDimensions = currentCustomDimensions,
             click = clickData
         )
 
@@ -555,7 +643,7 @@ internal class AnalyticsClient(
             newUser = sessionManager.isNewUser,
             pageId = sessionManager.getOrCreatePageId(),
             sessionDepth = sessionManager.sessionDepth,
-            pageUrl = "",  // page_url must be valid URL or empty - mobile doesn't have URLs
+            pageUrl = currentPageUrl,
             pageSearch = "",
             pageReferrer = "",
             browser = common.browser,
@@ -575,8 +663,8 @@ internal class AnalyticsClient(
             acctType = "anonymous",
             diiSource = "",
             gamNetworkCode = getGamNetworkCode(),
-            amznPubId = NIL_UUID,  // amzn_pub_id must be valid UUID
-            customDimensions = emptyMap(),
+            amznPubId = NIL_UUID,
+            customDimensions = currentCustomDimensions,
             viewability = listOf(viewabilityData)
         )
 
@@ -616,7 +704,7 @@ internal class AnalyticsClient(
             newUser = sessionManager.isNewUser,
             pageId = sessionManager.getOrCreatePageId(),
             sessionDepth = sessionManager.sessionDepth,
-            pageUrl = "",  // page_url must be valid URL or empty - mobile doesn't have URLs
+            pageUrl = currentPageUrl,
             pageSearch = "",
             pageReferrer = "",
             browser = common.browser,
@@ -636,8 +724,8 @@ internal class AnalyticsClient(
             acctType = "anonymous",
             diiSource = "",
             gamNetworkCode = getGamNetworkCode(),
-            amznPubId = NIL_UUID,  // amzn_pub_id must be valid UUID
-            customDimensions = emptyMap(),
+            amznPubId = NIL_UUID,
+            customDimensions = emptyMap(),  // Engagement uses array-valued custom dimensions per backend schema
             engagedTime = engagedTime,
             timeOnPage = timeOnPage,
             scrollDepth = scrollDepth
@@ -678,11 +766,66 @@ internal class AnalyticsClient(
 
     // MARK: - Batching Helpers
 
+    /**
+     * Batch an impression event (250ms delay)
+     */
+    private fun batchImpressionEvent(event: ImpressionBatchEvent) {
+        synchronized(impressionBatchLock) {
+            impressionBatch.add(event)
+
+            // Cancel existing timer
+            impressionBatchHandler?.removeCallbacksAndMessages(null)
+
+            // Create new handler if needed
+            if (impressionBatchHandler == null) {
+                impressionBatchHandler = android.os.Handler(android.os.Looper.getMainLooper())
+            }
+
+            // Schedule flush after 250ms
+            impressionBatchHandler?.postDelayed({
+                flushImpressionBatch()
+            }, BATCH_DELAY_MS)
+        }
+    }
+
+    /**
+     * Flush impression batch to backend
+     *
+     * Merges events with the same pageId into a single object with combined impressions array.
+     */
+    private fun flushImpressionBatch() {
+        synchronized(impressionBatchLock) {
+            if (impressionBatch.isEmpty()) return
+
+            val events = impressionBatch.toList()
+            impressionBatch.clear()
+
+            // Group by pageId and merge impressions into single objects
+            val merged = mutableMapOf<String, ImpressionBatchEvent>()
+            for (event in events) {
+                val existing = merged[event.pageId]
+                if (existing != null) {
+                    merged[event.pageId] = existing.copy(
+                        impressions = existing.impressions + event.impressions
+                    )
+                } else {
+                    merged[event.pageId] = event
+                }
+            }
+
+            val mergedEvents = merged.values.toList()
+
+            BCLogger.d(TAG, "Flushing ${mergedEvents.size} impression groups (${events.size} total impressions)")
+
+            sendEventBatch(mergedEvents, "impressions")
+        }
+    }
+
     /**
      * Batch a viewability event (250ms delay)
      */
     private fun batchViewabilityEvent(event: ViewabilityEvent) {
-        synchronized(batchLock) {
+        synchronized(viewabilityBatchLock) {
             viewabilityBatch.add(event)
 
             // Cancel existing timer
@@ -702,18 +845,34 @@ internal class AnalyticsClient(
 
     /**
      * Flush viewability batch to backend
+     *
+     * Merges events with the same pageId into a single object with combined viewability array.
      */
     private fun flushViewabilityBatch() {
-        synchronized(batchLock) {
+        synchronized(viewabilityBatchLock) {
             if (viewabilityBatch.isEmpty()) return
 
-            val eventsToSend = viewabilityBatch.toList()
+            val events = viewabilityBatch.toList()
             viewabilityBatch.clear()
 
-            BCLogger.d(TAG, "Flushing ${eventsToSend.size} viewability events")
+            // Group by pageId and merge viewability into single objects
+            val merged = mutableMapOf<String, ViewabilityEvent>()
+            for (event in events) {
+                val existing = merged[event.pageId]
+                if (existing != null) {
+                    merged[event.pageId] = existing.copy(
+                        viewability = existing.viewability + event.viewability
+                    )
+                } else {
+                    merged[event.pageId] = event
+                }
+            }
+
+            val mergedEvents = merged.values.toList()
+
+            BCLogger.d(TAG, "Flushing ${mergedEvents.size} viewability groups (${events.size} total)")
 
-            // Send events as a batch array
-            sendEventBatch(eventsToSend, "viewability")
+            sendEventBatch(mergedEvents, "viewability")
         }
     }
 }