@highfivve/ad-tag 5.8.32 → 5.8.34

package/lib/ads/modules/generic-skin/index.js

@@ -16,6 +16,32 @@ export const createSkin = () => {
     let skinModuleConfig = null;
     let bidsBackHandler = [];
     const config__ = () => skinModuleConfig;
+    const getSkinBids = (config, bidResponses) => {
+        const skinBidResponse = bidResponses[config.skinAdSlotDomId];
+        const isSkinBid = (bid) => {
+            const oneFilterApplied = config.formatFilter.some(filter => {
+                switch (filter.bidder) {
+                    case '*':
+                        return true;
+                    case 'gumgum':
+                        return (bid.bidder === prebidjs.GumGum &&
+                            (filter.auid === undefined ||
+                                (typeof bid.ad !== 'string' && bid.ad.auid === filter.auid)));
+                    default:
+                        return bid.bidder === filter.bidder;
+                }
+            });
+            return bid.cpm > 0 && oneFilterApplied;
+        };
+        return skinBidResponse
+            ?
+                skinBidResponse.bids.filter(isSkinBid).sort((bid1, bid2) => bid2.cpm - bid1.cpm)
+            : [];
+    };
+    const getHighestSkinBidCpm = (config, bidResponses) => {
+        const skinBids = getSkinBids(config, bidResponses);
+        return skinBids.length > 0 ? skinBids[0].cpm : null;
+    };
     const getConfigEffect = (config, bidResponses, log) => {
         const skinBidResponse = bidResponses[config.skinAdSlotDomId];
         const isSkinBid = (bid) => {
@@ -54,12 +80,29 @@ export const createSkin = () => {
         }
         return skinBids.length > 0 ? "BlockOtherSlots" : "NoBlocking";
     };
-    const selectConfig = (skinModuleConfig, bidResponses, log) => skinModuleConfig.configs
-        .map(config => ({
-        skinConfig: config,
-        configEffect: getConfigEffect(config, bidResponses, log)
-    }))
-        .find(({ configEffect }) => configEffect !== "NoBlocking");
+    const selectConfig = (skinModuleConfig, bidResponses, log) => {
+        const configEvaluations = skinModuleConfig.configs.map(config => ({
+            skinConfig: config,
+            configEffect: getConfigEffect(config, bidResponses, log),
+            highestSkinCpm: getHighestSkinBidCpm(config, bidResponses)
+        }));
+        const matchingConfigs = configEvaluations.filter(({ configEffect }) => configEffect !== "NoBlocking");
+        const compareWithOtherSkinsConfigs = matchingConfigs.filter(({ skinConfig }) => skinConfig.compareWithOtherSkins);
+        if (compareWithOtherSkinsConfigs.length > 1) {
+            return compareWithOtherSkinsConfigs.reduce((selectedConfig, currentConfig) => {
+                if (selectedConfig.highestSkinCpm === null ||
+                    (currentConfig.highestSkinCpm !== null &&
+                        currentConfig.highestSkinCpm > selectedConfig.highestSkinCpm)) {
+                    return currentConfig;
+                }
+                return selectedConfig;
+            });
+        }
+        const fallbackConfig = matchingConfigs[0];
+        return fallbackConfig
+            ? { skinConfig: fallbackConfig.skinConfig, configEffect: fallbackConfig.configEffect }
+            : undefined;
+    };
     const destroyAdSlot = (slotDefinitions, gWindow) => (adSlotDomId) => {
         const adSlots = slotDefinitions
             .map(slot => slot.adSlot)

package/lib/ads/modules/sticky-header-ad/index.js

@@ -7,6 +7,7 @@ export const createStickyHeaderAd = () => {
     const buttonSelector = '[data-ref="header-ad-close-button"]';
     const navbarHiddenClassName = 'h5v-header-ad--navbarHidden';
     let observer = null;
+    let observeTargetTimeoutId = null;
     let stickyHeaderAdConfig = null;
     const configure__ = (moduleConfig) => {
         if (moduleConfig?.stickyHeaderAd?.enabled) {
@@ -20,6 +21,10 @@ export const createStickyHeaderAd = () => {
         return config
             ? [
                 mkConfigureStepOncePerRequestAdsCycle('sticky-header-ads:cleanup', () => {
+                    if (observeTargetTimeoutId !== null) {
+                        clearTimeout(observeTargetTimeoutId);
+                        observeTargetTimeoutId = null;
+                    }
                     if (observer) {
                         observer.disconnect();
                         observer = null;
@@ -61,7 +66,12 @@ export const createStickyHeaderAd = () => {
                         if (target) {
                             const adRenderResultPromise = adRenderResult(ctx, headerSlot.moliSlot, config.disallowedAdvertiserIds, minVisibleDuration);
                             observer = new IntersectionObserver(intersectionObserverFadeOutCallback(container, target, adRenderResultPromise, navbar, navbarHiddenClass, config.fadeOutClassName), options);
-                            observer.observe(target);
+                            observeTargetTimeoutId = ctx.window__.setTimeout(() => {
+                                if (observer) {
+                                    observer.observe(target);
+                                }
+                                observeTargetTimeoutId = null;
+                            }, minVisibleDuration);
                             if (navbar) {
                                 observer.observe(navbar);
                             }

package/lib/ads/modules/utiq/index.js

@@ -18,6 +18,20 @@ const requiredPurposeIds = [
 export const createUtiq = () => {
     let utiqConfig = null;
     let scriptLoaded = false;
+    const hasRequiredPurposeConsent = (context) => {
+        const tcData = context.tcData__;
+        if (!tcData.gdprApplies) {
+            return true;
+        }
+        return !requiredPurposeIds.some(purposeId => !tcData.purpose.consents[purposeId]);
+    };
+    const hasRequiredVendorConsent = (context, vendorId) => {
+        const tcData = context.tcData__;
+        if (!vendorId || !tcData.gdprApplies) {
+            return true;
+        }
+        return tcData.vendor.consents[vendorId];
+    };
     const loadUtiq = (config, context) => {
         if (context.env__ === 'test') {
             return Promise.resolve();
@@ -25,6 +39,13 @@ export const createUtiq = () => {
         if (scriptLoaded) {
             return Promise.resolve();
         }
+        if (!hasRequiredVendorConsent(context, config.vendorId)) {
+            context.logger__.debug('Utiq', 'Skipping Utiq load because vendor consent is missing', config.vendorId);
+            return Promise.resolve();
+        }
+        if (!hasRequiredPurposeConsent(context)) {
+            return Promise.resolve();
+        }
         const utiqWindow = context.window__;
         utiqWindow.Utiq = utiqWindow.Utiq
             ? { ...utiqWindow.Utiq, config: { ...utiqWindow.Utiq.config, ...config.options } }
@@ -46,10 +67,6 @@ export const createUtiq = () => {
                 }
             });
         }
-        if (context.tcData__.gdprApplies &&
-            requiredPurposeIds.some(purposeId => context.tcData__.gdprApplies && !context.tcData__.purpose.consents[purposeId])) {
-            return Promise.resolve();
-        }
         const minAdRequests = config.delay?.enabled && config.delay.minAdRequests ? config.delay.minAdRequests : 0;
         if (!context.auction__.hasMinimumRequestAds(minAdRequests)) {
             context.logger__.info('Utiq', `not enough ad requests to load Utiq. ${minAdRequests} required.`);

package/lib/gen/packageJson.js

@@ -1,3 +1,3 @@
 export const packageJson = {
-    version: '5.8.32'
+    version: '5.8.34'
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highfivve/ad-tag",
-  "version": "5.8.32",
+  "version": "5.8.34",
   "license": "Apache-2.0",
   "description": "An ad tag implementation called moli",
   "main": "./lib/index.js",