prebid.js 7.42.0 → 7.43.0

package/modules/express.js

@@ -1,6 +1,8 @@
 import { logMessage, logWarn, logError, logInfo } from '../src/utils.js';
+import {getGlobal} from '../src/prebidGlobal.js';
 
 const MODULE_NAME = 'express';
+const pbjsInstance = getGlobal();
 
 /**
  * Express Module
@@ -12,7 +14,7 @@ const MODULE_NAME = 'express';
  *
  * @param {Object[]} [adUnits = pbjs.adUnits] - an array of adUnits for express to operate on.
  */
-$$PREBID_GLOBAL$$.express = function(adUnits = $$PREBID_GLOBAL$$.adUnits) {
+pbjsInstance.express = function(adUnits = pbjsInstance.adUnits) {
   logMessage('loading ' + MODULE_NAME);
 
   if (adUnits.length === 0) {
@@ -138,10 +140,10 @@ $$PREBID_GLOBAL$$.express = function(adUnits = $$PREBID_GLOBAL$$.adUnits) {
         }
 
         if (adUnits.length) {
-          $$PREBID_GLOBAL$$.requestBids({
+          pbjsInstance.requestBids({
             adUnits: adUnits,
             bidsBackHandler: function () {
-              $$PREBID_GLOBAL$$.setTargetingForGPTAsync();
+              pbjsInstance.setTargetingForGPTAsync();
               fGptRefresh.apply(pads(), [
                 adUnits.map(function (adUnit) {
                   return gptSlotCache[adUnit.code];
@@ -168,10 +170,10 @@ $$PREBID_GLOBAL$$.express = function(adUnits = $$PREBID_GLOBAL$$.adUnits) {
       }
 
       if (adUnits.length) {
-        $$PREBID_GLOBAL$$.requestBids({
+        pbjsInstance.requestBids({
           adUnits: adUnits,
           bidsBackHandler: function () {
-            $$PREBID_GLOBAL$$.setTargetingForGPTAsync();
+            pbjsInstance.setTargetingForGPTAsync();
             fGptRefresh.apply(pads(), [
               adUnits.map(function (adUnit) {
                 return gptSlotCache[adUnit.code];

package/modules/gumgumBidAdapter.js

@@ -392,12 +392,12 @@ function buildRequests(validBidRequests, bidderRequest) {
     if (gppConsent) {
       data.gppConsent = {
         gppString: bidderRequest.gppConsent.gppString,
-        applicableSections: bidderRequest.gppConsent.applicableSections
+        gpp_sid: bidderRequest.gppConsent.applicableSections
       }
     } else if (!gppConsent && bidderRequest?.ortb2?.regs?.gpp) {
       data.gppConsent = {
         gppString: bidderRequest.ortb2.regs.gpp,
-        applicableSections: bidderRequest.ortb2.regs.gpp_sid
+        gpp_sid: bidderRequest.ortb2.regs.gpp_sid
       };
     }
     if (coppa) {

package/modules/id5AnalyticsAdapter.js

@@ -4,6 +4,7 @@ import adapterManager from '../src/adapterManager.js';
 import { ajax } from '../src/ajax.js';
 import { logInfo, logError } from '../src/utils.js';
 import * as events from '../src/events.js';
+import {getGlobal} from '../src/prebidGlobal.js';
 
 const {
   EVENTS: {
@@ -34,7 +35,7 @@ const FLUSH_EVENTS = [
 
 const CONFIG_URL_PREFIX = 'https://api.id5-sync.com/analytics'
 const TZ = new Date().getTimezoneOffset();
-const PBJS_VERSION = $$PREBID_GLOBAL$$.version;
+const PBJS_VERSION = getGlobal().version;
 const ID5_REDACTED = '__ID5_REDACTED__';
 const isArray = Array.isArray;
 

package/modules/mabidderBidAdapter.js

@@ -1,5 +1,7 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
+import {getGlobal} from '../src/prebidGlobal.js';
+
 const BIDDER_CODE = 'mabidder';
 export const baseUrl = 'https://prebid.ecdrsvc.com/bid';
 export const spec = {
@@ -33,7 +35,7 @@ export const spec = {
       url: baseUrl,
       method: 'POST',
       data: {
-        v: $$PREBID_GLOBAL$$.version,
+        v: getGlobal().version,
         bids: bids,
         url: bidderRequest.refererInfo.page || '',
         referer: bidderRequest.refererInfo.ref || '',

package/modules/marsmediaAnalyticsAdapter.js

@@ -1,6 +1,7 @@
 import {ajax} from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
+import {getGlobal} from '../src/prebidGlobal.js';
 
 /****
  * Mars Media Analytics
@@ -33,7 +34,7 @@ var marsmediaAnalyticsAdapter = Object.assign(adapter(
             success: function() {},
             error: function() {}
           },
-          JSON.stringify({act: 'prebid_analytics', params: events, 'pbjs': $$PREBID_GLOBAL$$.getBidResponses(), ver: MARS_VERSION}),
+          JSON.stringify({act: 'prebid_analytics', params: events, 'pbjs': getGlobal().getBidResponses(), ver: MARS_VERSION}),
           {
             method: 'POST'
           }

package/modules/medianetAnalyticsAdapter.js

@@ -8,8 +8,7 @@ import {
   logError,
   logInfo,
   triggerPixel,
-  uniques,
-  getHighestCpm
+  uniques
 } from '../src/utils.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
@@ -18,6 +17,7 @@ import {ajax} from '../src/ajax.js';
 import {getRefererInfo} from '../src/refererDetection.js';
 import {AUCTION_COMPLETED, AUCTION_IN_PROGRESS, getPriceGranularity} from '../src/auction.js';
 import {includes} from '../src/polyfill.js';
+import {getGlobal} from '../src/prebidGlobal.js';
 
 const analyticsType = 'endpoint';
 const ENDPOINT = 'https://pb-logs.media.net/log?logid=kfk&evtid=prebid_analytics_events_client';
@@ -37,10 +37,11 @@ const PRICE_GRANULARITY = {
 
 const MEDIANET_BIDDER_CODE = 'medianet';
 // eslint-disable-next-line no-undef
-const PREBID_VERSION = $$PREBID_GLOBAL$$.version;
+const PREBID_VERSION = getGlobal().version;
 const ERROR_CONFIG_JSON_PARSE = 'analytics_config_parse_fail';
 const ERROR_CONFIG_FETCH = 'analytics_config_ajax_fail';
 const ERROR_WINNING_BID_ABSENT = 'winning_bid_absent';
+const ERROR_WINNING_AUCTION_MISSING = 'winning_auction_missing';
 const BID_SUCCESS = 1;
 const BID_NOBID = 2;
 const BID_TIMEOUT = 3;
@@ -72,7 +73,7 @@ class ErrorLogger {
     this.evtid = 'projectevents';
     this.project = 'prebidanalytics';
     this.dn = pageDetails.domain || '';
-    this.requrl = pageDetails.requrl || '';
+    this.requrl = pageDetails.topmostLocation || '';
     this.pbversion = PREBID_VERSION;
     this.cid = config.cid || '';
     this.rd = additionalData;
@@ -270,6 +271,52 @@ class AdSlot {
   }
 }
 
+class BidWrapper {
+  constructor() {
+    this.bidReqs = [];
+    this.bidObjs = [];
+  }
+
+  findReqBid(bidId) {
+    return this.bidReqs.find(bid => {
+      return bid['bidId'] === bidId
+    });
+  }
+
+  findBidObj(key, value) {
+    return this.bidObjs.find(bid => {
+      return bid[key] === value
+    });
+  }
+
+  addBidReq(bidRequest) {
+    this.bidReqs.push(bidRequest)
+  }
+
+  addBidObj(bidObj) {
+    if (!(bidObj instanceof Bid)) {
+      bidObj = Bid.getInstance(bidObj);
+    }
+    const bidReq = this.findReqBid(bidObj.bidId);
+    if (bidReq instanceof Bid) {
+      bidReq.used = true;
+    }
+    this.bidObjs.push(bidObj);
+  }
+
+  getAdSlotBids(adSlot) {
+    const bidResponses = this.getAdSlotBidObjs(adSlot);
+    return bidResponses.map((bid) => bid.getLoggingData());
+  }
+
+  getAdSlotBidObjs(adSlot) {
+    const bidResponses = this.bidObjs
+      .filter((bid) => bid.adUnitCode === adSlot);
+    const remResponses = this.bidReqs.filter(bid => !bid.used && bid.adUnitCode === adSlot);
+    return [...bidResponses, ...remResponses];
+  }
+}
+
 class Bid {
   constructor(bidId, bidder, src, start, adUnitCode, mediaType, allMediaTypeSizes) {
     this.bidId = bidId;
@@ -299,6 +346,9 @@ class Bid {
     this.floorPrice = undefined;
     this.floorRule = undefined;
     this.serverLatencyMillis = undefined;
+    this.used = false;
+    this.originalRequestId = bidId;
+    this.requestId = undefined;
   }
 
   get size() {
@@ -308,8 +358,15 @@ class Bid {
     return this.width + 'x' + this.height;
   }
 
+  static getInstance(bidProps) {
+    const bidObj = new Bid();
+    return bidProps && Object.assign(bidObj, bidProps);
+  }
+
   getLoggingData() {
     return {
+      reqId: this.requestId || this.bidId,
+      ogReqId: this.originalRequestId,
       adid: this.adId,
       pvnm: this.bidder,
       src: this.src,
@@ -341,7 +398,7 @@ class Auction {
   constructor(acid) {
     this.acid = acid;
     this.status = AUCTION_IN_PROGRESS;
-    this.bids = [];
+    this.bidWrapper = new BidWrapper();
     this.adSlots = {};
     this.auctionInitTime = undefined;
     this.auctionStartTime = undefined;
@@ -378,24 +435,31 @@ class Auction {
   addSlot({ adUnitCode, supplyAdCode, mediaTypes, allMediaTypeSizes, tmax, adext, context }) {
     if (adUnitCode && this.adSlots[adUnitCode] === undefined) {
       this.adSlots[adUnitCode] = new AdSlot(tmax, supplyAdCode, context, adext);
-      this.addBid(new Bid('-1', DUMMY_BIDDER, 'client', '-1', adUnitCode, mediaTypes, allMediaTypeSizes));
+      this.addBidObj(new Bid('-1', DUMMY_BIDDER, 'client', Date.now(), adUnitCode, mediaTypes, allMediaTypeSizes));
     }
   }
 
   addBid(bid) {
-    this.bids.push(bid);
+    this.bidWrapper.addBidReq(bid);
   }
 
-  findBid(key, value) {
-    return this.bids.filter(bid => {
-      return bid[key] === value
-    })[0];
+  addBidObj(bidObj) {
+    this.bidWrapper.addBidObj(bidObj)
   }
 
-  getAdslotBids(adslot) {
-    return this.bids
-      .filter((bid) => bid.adUnitCode === adslot)
-      .map((bid) => bid.getLoggingData());
+  findReqBid(bidId) {
+    return this.bidWrapper.findReqBid(bidId)
+  }
+
+  findBidObj(key, value) {
+    return this.bidWrapper.findBidObj(key, value)
+  }
+
+  getAdSlotBids(adSlot) {
+    return this.bidWrapper.getAdSlotBids(adSlot);
+  }
+  getAdSlotBidObjs(adSlot) {
+    return this.bidWrapper.getAdSlotBidObjs(adSlot);
   }
 
   _mergeFieldsToLog(objParams) {
@@ -494,41 +558,26 @@ function _getSizes(mediaTypes, sizes) {
   }
 }
 
-/*
-  - The code is used to determine if the current bid is higher than the previous bid.
-  - If it is, then the code will return true and if not, it will return false.
-  */
-function canSelectCurrentBid(previousBid, currentBid) {
-  if (!(previousBid instanceof Bid)) return false;
-
-  // For first bid response the previous bid will be containing bid request obj
-  // in which the cpm would be undefined so the current bid can directly be selected.
-  const isFirstBidResponse = previousBid.cpm === undefined && currentBid.cpm !== undefined;
-  if (isFirstBidResponse) return true;
-
-  // if there are 2 bids, get the highest bid
-  const selectedBid = getHighestCpm(previousBid, currentBid);
-
-  // Return true if selectedBid is currentBid,
-  // The timeToRespond field is used as an identifier for distinguishing
-  // between the current iterating bid and the previous bid.
-  return selectedBid.timeToRespond === currentBid.timeToRespond;
-}
-
 function bidResponseHandler(bid) {
-  const { width, height, mediaType, cpm, requestId, timeToRespond, auctionId, dealId } = bid;
-  const {originalCpm, bidderCode, creativeId, adId, currency} = bid;
+  const { width, height, mediaType, cpm, requestId, timeToRespond, auctionId, dealId, originalRequestId, bidder } = bid;
+  const {originalCpm, creativeId, adId, currency} = bid;
 
   if (!(auctions[auctionId] instanceof Auction)) {
     return;
   }
-  let bidObj = auctions[auctionId].findBid('bidId', requestId);
-  if (!canSelectCurrentBid(bidObj, bid)) {
-    return;
+  const reqId = originalRequestId || requestId;
+  const bidReq = auctions[auctionId].findReqBid(reqId);
+
+  if (!(bidReq instanceof Bid)) return;
+
+  let bidObj = auctions[auctionId].findBidObj('bidId', requestId);
+  let isBidOverridden = true;
+  if (!bidObj || bidObj.status === BID_SUCCESS) {
+    bidObj = {};
+    isBidOverridden = false;
   }
-  Object.assign(
-    bidObj,
-    { cpm, width, height, mediaType, timeToRespond, dealId, creativeId },
+  Object.assign(bidObj, bidReq,
+    { cpm, width, height, mediaType, timeToRespond, dealId, creativeId, originalRequestId, requestId },
     { adId, currency }
   );
   bidObj.floorPrice = deepAccess(bid, 'floorData.floorValue');
@@ -547,7 +596,7 @@ function bidResponseHandler(bid) {
     bidObj.status = BID_SUCCESS;
   }
 
-  if (bidderCode === MEDIANET_BIDDER_CODE && bid.ext instanceof Object) {
+  if (bidder === MEDIANET_BIDDER_CODE && bid.ext instanceof Object) {
     Object.assign(
       bidObj,
       { 'ext': bid.ext },
@@ -558,6 +607,7 @@ function bidResponseHandler(bid) {
   if (typeof bid.serverResponseTimeMs !== 'undefined') {
     bidObj.serverLatencyMillis = bid.serverResponseTimeMs;
   }
+  !isBidOverridden && auctions[auctionId].addBidObj(bidObj);
 }
 
 function noBidResponseHandler({ auctionId, bidId }) {
@@ -567,11 +617,13 @@ function noBidResponseHandler({ auctionId, bidId }) {
   if (auctions[auctionId].hasEnded()) {
     return;
   }
-  let bidObj = auctions[auctionId].findBid('bidId', bidId);
-  if (!(bidObj instanceof Bid)) {
+  const bidReq = auctions[auctionId].findReqBid(bidId);
+  if (!(bidReq instanceof Bid) || bidReq.used) {
     return;
   }
+  const bidObj = {...bidReq};
   bidObj.status = BID_NOBID;
+  auctions[auctionId].addBidObj(bidObj);
 }
 
 function bidTimeoutHandler(timedOutBids) {
@@ -579,11 +631,13 @@ function bidTimeoutHandler(timedOutBids) {
     if (!(auctions[auctionId] instanceof Auction)) {
       return;
     }
-    let bidObj = auctions[auctionId].findBid('bidId', bidId);
-    if (!(bidObj instanceof Bid)) {
+    const bidReq = auctions[auctionId].findReqBid('bidId', bidId);
+    if (!(bidReq instanceof Bid) || bidReq.used) {
       return;
     }
+    const bidObj = {...bidReq};
     bidObj.status = BID_TIMEOUT;
+    auctions[auctionId].addBidObj(bidObj);
   })
 }
 
@@ -614,13 +668,13 @@ function setTargetingHandler(params) {
       const winnerAdId = params[adunit][CONSTANTS.TARGETING_KEYS.AD_ID];
       let winningBid;
       let bidAdIds = Object.keys(targetingObj).map(k => targetingObj[k]);
-      auctionObj.bids.filter((bid) => bidAdIds.indexOf(bid.adId) !== -1).map(function(bid) {
+      auctionObj.bidWrapper.bidObjs.filter((bid) => bidAdIds.indexOf(bid.adId) !== -1).map(function(bid) {
         bid.iwb = 1;
         if (bid.adId === winnerAdId) {
           winningBid = bid;
         }
       });
-      auctionObj.bids.forEach(bid => {
+      auctionObj.bidWrapper.bidObjs.forEach(bid => {
         if (bid.bidder === DUMMY_BIDDER && bid.adUnitCode === adunit) {
           bid.iwb = bidAdIds.length === 0 ? 0 : 1;
           bid.width = deepAccess(winningBid, 'width');
@@ -633,16 +687,27 @@ function setTargetingHandler(params) {
 }
 
 function bidWonHandler(bid) {
-  const { auctionId, adUnitCode, adId } = bid;
+  const { auctionId, adUnitCode, adId, bidder, requestId, originalRequestId } = bid;
   if (!(auctions[auctionId] instanceof Auction)) {
+    new ErrorLogger(ERROR_WINNING_AUCTION_MISSING, {
+      adId,
+      auctionId,
+      adUnitCode,
+      bidder,
+      requestId,
+      originalRequestId
+    }).send();
     return;
   }
-  let bidObj = auctions[auctionId].findBid('adId', adId);
+  let bidObj = auctions[auctionId].findBidObj('adId', adId);
   if (!(bidObj instanceof Bid)) {
     new ErrorLogger(ERROR_WINNING_BID_ABSENT, {
-      adId: adId,
-      acid: auctionId,
+      adId,
+      auctionId,
       adUnitCode,
+      bidder,
+      requestId,
+      originalRequestId
     }).send();
     return;
   }
@@ -696,13 +761,13 @@ function fireAuctionLog(acid, adtag, logType, adId) {
   let bidParams;
 
   if (logType === LOG_TYPE.RA) {
-    const winningBidObj = auctions[acid].findBid('adId', adId);
+    const winningBidObj = auctions[acid].findBidObj('adId', adId);
     if (!winningBidObj) return;
     const winLogData = winningBidObj.getLoggingData();
     bidParams = [winLogData];
     commonParams.lper = 1;
   } else {
-    bidParams = auctions[acid].getAdslotBids(adtag).map(({winner, ...restParams}) => restParams);
+    bidParams = auctions[acid].getAdSlotBids(adtag).map(({winner, ...restParams}) => restParams);
     delete commonParams.wts;
   }
   let mnetPresent = bidParams.filter(b => b.pvnm === MEDIANET_BIDDER_CODE).length > 0;
@@ -822,8 +887,8 @@ medianetAnalytics.enableAnalytics = function (configuration) {
     logError('Media.net Analytics adapter: cid is required.');
     return;
   }
-  $$PREBID_GLOBAL$$.medianetGlobals = $$PREBID_GLOBAL$$.medianetGlobals || {};
-  $$PREBID_GLOBAL$$.medianetGlobals.analyticsEnabled = true;
+  getGlobal().medianetGlobals = getGlobal().medianetGlobals || {};
+  getGlobal().medianetGlobals.analyticsEnabled = true;
 
   pageDetails = new PageDetail();
 

package/modules/medianetBidAdapter.js

@@ -17,6 +17,7 @@ import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {getRefererInfo} from '../src/refererDetection.js';
 import {Renderer} from '../src/Renderer.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import {getGlobal} from '../src/prebidGlobal.js';
 
 const BIDDER_CODE = 'medianet';
 const BID_URL = 'https://prebid.media.net/rtb/prebid';
@@ -51,7 +52,7 @@ const aliases = [
   { code: 'aax', gvlid: 720 },
 ];
 
-$$PREBID_GLOBAL$$.medianetGlobals = $$PREBID_GLOBAL$$.medianetGlobals || {};
+getGlobal().medianetGlobals = getGlobal().medianetGlobals || {};
 
 function getTopWindowReferrer() {
   try {
@@ -177,7 +178,7 @@ function extParams(bidRequest, bidderRequests) {
   const coppaApplies = !!(config.getConfig('coppa'));
   return Object.assign({},
     { customer_id: params.cid },
-    { prebid_version: $$PREBID_GLOBAL$$.version },
+    { prebid_version: getGlobal().version },
     { gdpr_applies: gdprApplies },
     (gdprApplies) && { gdpr_consent_string: gdpr.consentString || '' },
     { usp_applies: uspApplies },
@@ -185,7 +186,7 @@ function extParams(bidRequest, bidderRequests) {
     {coppa_applies: coppaApplies},
     windowSize.w !== -1 && windowSize.h !== -1 && { screen: windowSize },
     userId && { user_id: userId },
-    $$PREBID_GLOBAL$$.medianetGlobals.analyticsEnabled && { analytics: true },
+    getGlobal().medianetGlobals.analyticsEnabled && { analytics: true },
     !isEmpty(sChain) && {schain: sChain}
   );
 }
@@ -358,7 +359,7 @@ function getLoggingData(event, data) {
   params.evtid = 'projectevents';
   params.project = 'prebid';
   params.acid = deepAccess(data, '0.auctionId') || '';
-  params.cid = $$PREBID_GLOBAL$$.medianetGlobals.cid || '';
+  params.cid = getGlobal().medianetGlobals.cid || '';
   params.crid = data.map((adunit) => deepAccess(adunit, 'params.0.crid') || adunit.adUnitCode).join('|');
   params.adunit_count = data.length || 0;
   params.dn = mnData.urlData.domain || '';
@@ -442,7 +443,7 @@ export const spec = {
       return false;
     }
 
-    Object.assign($$PREBID_GLOBAL$$.medianetGlobals, !$$PREBID_GLOBAL$$.medianetGlobals.cid && {cid: bid.params.cid});
+    Object.assign(getGlobal().medianetGlobals, !getGlobal().medianetGlobals.cid && {cid: bid.params.cid});
 
     return true;
   },

package/modules/orbidderBidAdapter.js

@@ -3,6 +3,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { BANNER, NATIVE } from '../src/mediaTypes.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import {getGlobal} from '../src/prebidGlobal.js';
 
 const storageManager = getStorageManager({bidderCode: 'orbidder'});
 
@@ -96,7 +97,7 @@ export const spec = {
         method: 'POST',
         options: { withCredentials: true },
         data: {
-          v: $$PREBID_GLOBAL$$.version,
+          v: getGlobal().version,
           pageUrl: referer,
           bidId: bidRequest.bidId,
           auctionId: bidRequest.auctionId,