prebid.js 7.42.0 → 7.43.0

package/src/adapterManager.js

@@ -459,7 +459,7 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
 
 function getSupportedMediaTypes(bidderCode) {
   let supportedMediaTypes = [];
-  if (includes(adapterManager.videoAdapters, bidderCode)) supportedMediaTypes.push('video');
+  if (FEATURES.VIDEO && includes(adapterManager.videoAdapters, bidderCode)) supportedMediaTypes.push('video');
   if (FEATURES.NATIVE && includes(nativeAdapters, bidderCode)) supportedMediaTypes.push('native');
   return supportedMediaTypes;
 }
@@ -471,7 +471,7 @@ adapterManager.registerBidAdapter = function (bidAdapter, bidderCode, {supported
     if (typeof bidAdapter.callBids === 'function') {
       _bidderRegistry[bidderCode] = bidAdapter;
 
-      if (includes(supportedMediaTypes, 'video')) {
+      if (FEATURES.VIDEO && includes(supportedMediaTypes, 'video')) {
         adapterManager.videoAdapters.push(bidderCode);
       }
       if (FEATURES.NATIVE && includes(supportedMediaTypes, 'native')) {

package/src/adapters/bidderFactory.js

@@ -472,51 +472,56 @@ export const addComponentAuction = hook('sync', (_bidRequest, fledgeAuctionConfi
 }, 'addComponentAuction')
 
 export function preloadBidderMappingFile(fn, adUnits) {
-  if (!config.getConfig('adpod.brandCategoryExclusion')) {
-    return fn.call(this, adUnits);
-  }
-  let adPodBidders = adUnits
-    .filter((adUnit) => deepAccess(adUnit, 'mediaTypes.video.context') === ADPOD)
-    .map((adUnit) => adUnit.bids.map((bid) => bid.bidder))
-    .reduce(flatten, [])
-    .filter(uniques);
-
-  adPodBidders.forEach(bidder => {
-    let bidderSpec = adapterManager.getBidAdapter(bidder);
-    if (bidderSpec.getSpec().getMappingFileInfo) {
-      let info = bidderSpec.getSpec().getMappingFileInfo();
-      let refreshInDays = (info.refreshInDays) ? info.refreshInDays : DEFAULT_REFRESHIN_DAYS;
-      let key = (info.localStorageKey) ? info.localStorageKey : bidderSpec.getSpec().code;
-      let mappingData = storage.getDataFromLocalStorage(key);
-      try {
-        mappingData = mappingData ? JSON.parse(mappingData) : undefined;
-        if (!mappingData || timestamp() > mappingData.lastUpdated + refreshInDays * 24 * 60 * 60 * 1000) {
-          ajax(info.url,
-            {
-              success: (response) => {
-                try {
-                  response = JSON.parse(response);
-                  let mapping = {
-                    lastUpdated: timestamp(),
-                    mapping: response.mapping
+  if (FEATURES.VIDEO) {
+    if (!config.getConfig('adpod.brandCategoryExclusion')) {
+      return fn.call(this, adUnits);
+    }
+
+    let adPodBidders = adUnits
+      .filter((adUnit) => deepAccess(adUnit, 'mediaTypes.video.context') === ADPOD)
+      .map((adUnit) => adUnit.bids.map((bid) => bid.bidder))
+      .reduce(flatten, [])
+      .filter(uniques);
+
+    adPodBidders.forEach(bidder => {
+      let bidderSpec = adapterManager.getBidAdapter(bidder);
+      if (bidderSpec.getSpec().getMappingFileInfo) {
+        let info = bidderSpec.getSpec().getMappingFileInfo();
+        let refreshInDays = (info.refreshInDays) ? info.refreshInDays : DEFAULT_REFRESHIN_DAYS;
+        let key = (info.localStorageKey) ? info.localStorageKey : bidderSpec.getSpec().code;
+        let mappingData = storage.getDataFromLocalStorage(key);
+        try {
+          mappingData = mappingData ? JSON.parse(mappingData) : undefined;
+          if (!mappingData || timestamp() > mappingData.lastUpdated + refreshInDays * 24 * 60 * 60 * 1000) {
+            ajax(info.url,
+              {
+                success: (response) => {
+                  try {
+                    response = JSON.parse(response);
+                    let mapping = {
+                      lastUpdated: timestamp(),
+                      mapping: response.mapping
+                    }
+                    storage.setDataInLocalStorage(key, JSON.stringify(mapping));
+                  } catch (error) {
+                    logError(`Failed to parse ${bidder} bidder translation mapping file`);
                   }
-                  storage.setDataInLocalStorage(key, JSON.stringify(mapping));
-                } catch (error) {
-                  logError(`Failed to parse ${bidder} bidder translation mapping file`);
+                },
+                error: () => {
+                  logError(`Failed to load ${bidder} bidder translation file`)
                 }
               },
-              error: () => {
-                logError(`Failed to load ${bidder} bidder translation file`)
-              }
-            },
-          );
+            );
+          }
+        } catch (error) {
+          logError(`Failed to parse ${bidder} bidder translation mapping file`);
         }
-      } catch (error) {
-        logError(`Failed to parse ${bidder} bidder translation mapping file`);
       }
-    }
-  });
-  fn.call(this, adUnits);
+    });
+    fn.call(this, adUnits);
+  } else {
+    return fn.call(this, adUnits)
+  }
 }
 
 getHook('checkAdUnitSetup').before(preloadBidderMappingFile);
@@ -599,7 +604,7 @@ export function isValid(adUnitCode, bid, {index = auctionManager.index} = {}) {
     logError(errorMessage('Native bid missing some required properties.'));
     return false;
   }
-  if (bid.mediaType === 'video' && !isValidVideoBid(bid, {index})) {
+  if (FEATURES.VIDEO && bid.mediaType === 'video' && !isValidVideoBid(bid, {index})) {
     logError(errorMessage(`Video bid does not have required vastUrl or renderer property`));
     return false;
   }

package/src/auction.js

@@ -94,6 +94,7 @@ import {GreedyPromise} from './utils/promise.js';
 import {useMetrics} from './utils/perfMetrics.js';
 import {createBid} from './bidfactory.js';
 import {adjustCpm} from './utils/cpm.js';
+import {getGlobal} from './prebidGlobal.js';
 
 const { syncUsers } = userSync;
 
@@ -111,6 +112,8 @@ const outstandingRequests = {};
 const sourceInfo = {};
 const queuedCalls = [];
 
+const pbjsInstance = getGlobal();
+
 /**
  * Clear global state for tests
  */
@@ -216,7 +219,7 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
             const bids = _bidsReceived
               .filter(bind.call(adUnitsFilter, this, adUnitCodes))
               .reduce(groupByPlacement, {});
-            _callback.apply($$PREBID_GLOBAL$$, [bids, timedOut, _auctionId]);
+            _callback.apply(pbjsInstance, [bids, timedOut, _auctionId]);
             _callback = null;
           }
         } catch (e) {
@@ -473,7 +476,7 @@ export function auctionCallbacks(auctionDone, auctionInstance, {index = auctionM
     handleBidResponse(adUnitCode, bid, (done) => {
       let bidResponse = getPreparedBidForAuction(bid);
 
-      if (bidResponse.mediaType === VIDEO) {
+      if (FEATURES.VIDEO && bidResponse.mediaType === VIDEO) {
         tryAddVideoBid(auctionInstance, bidResponse, done);
       } else {
         if (FEATURES.NATIVE && bidResponse.native != null && typeof bidResponse.native === 'object') {
@@ -620,7 +623,7 @@ const addLegacyFieldsIfNeeded = (bidResponse) => {
   }
 }
 
-const storeInCache = (batch) => {
+const _storeInCache = (batch) => {
   store(batch.map(entry => entry.bidResponse), function (error, cacheIds) {
     cacheIds.forEach((cacheId, i) => {
       const { auctionInstance, bidResponse, afterBidAdded } = batch[i];
@@ -647,6 +650,8 @@ const storeInCache = (batch) => {
   });
 };
 
+const storeInCache = FEATURES.VIDEO ? _storeInCache : () => {};
+
 let batchSize, batchTimeout;
 config.getConfig('cache', (cacheConfig) => {
   batchSize = typeof cacheConfig.cache.batchSize === 'number' && cacheConfig.cache.batchSize > 0
@@ -782,7 +787,7 @@ function setupBidTargeting(bidObject) {
  */
 export function getMediaTypeGranularity(mediaType, mediaTypes, mediaTypePriceGranularity) {
   if (mediaType && mediaTypePriceGranularity) {
-    if (mediaType === VIDEO) {
+    if (FEATURES.VIDEO && mediaType === VIDEO) {
       const context = deepAccess(mediaTypes, `${VIDEO}.context`, 'instream');
       if (mediaTypePriceGranularity[`${VIDEO}-${context}`]) {
         return mediaTypePriceGranularity[`${VIDEO}-${context}`];
@@ -891,7 +896,7 @@ export function getStandardBidderSettings(mediaType, bidderCode) {
     standardSettings[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING] = defaultAdserverTargeting();
   }
 
-  if (mediaType === 'video') {
+  if (FEATURES.VIDEO && mediaType === 'video') {
     const adserverTargeting = standardSettings[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING].slice();
     standardSettings[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING] = adserverTargeting;
 

package/src/fpd/enrichment.js

@@ -69,7 +69,7 @@ function winFallback(fn) {
 
 function getSUA() {
   const hints = config.getConfig('firstPartyData.uaHints');
-  return Array.isArray(hints) && hints.length === 0
+  return !Array.isArray(hints) || hints.length === 0
     ? GreedyPromise.resolve(dep.getLowEntropySUA())
     : dep.getHighEntropySUA(hints);
 }