Alkimi-Exchange · pro-nsk · Apr 11, 2024 · Mar 27, 2024 · Mar 27, 2024 · Mar 27, 2024
diff --git a/RELEASE_SCHEDULE.md b/RELEASE_SCHEDULE.md
@@ -9,7 +9,7 @@
 
 ## Release Schedule
 
-We aim to push a new release of Prebid.js every week on Tuesday.
+We aim to push a new release of Prebid.js each week barring any unforseen circumstances or in observance of holidays.
 
 While the releases will be available immediately for those using direct Git access,
 it will be about a week before the Prebid Org [Download Page](https://docs.prebid.org/download.html) will be updated.

diff --git a/gulpfile.js b/gulpfile.js
@@ -295,8 +295,7 @@ function bundle(dev, moduleArr) {
   [coreFile].concat(moduleFiles).map(name => path.basename(name)).forEach((file) => {
     (depGraph[file] || []).forEach((dep) => dependencies.add(helpers.getBuiltPath(dev, dep)));
   });
-
-  const entries = [coreFile].concat(Array.from(dependencies), moduleFiles);
+  const entries = _.uniq([coreFile].concat(Array.from(dependencies), moduleFiles));
 
   var outputFileName = argv.bundleName ? argv.bundleName : 'prebid.js';
 

diff --git a/...ples/gpt/jwplayerRtdProvider_example.html → ...TimeData/jwplayerRtdProvider_example.html b/...ples/gpt/jwplayerRtdProvider_example.html → ...TimeData/jwplayerRtdProvider_example.html
@@ -1,16 +1,18 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+
+    /* Paste JW Player script tag here */
+
     <script async src="../../build/dev/prebid.js"></script>
-    <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
     <meta charset="UTF-8">
     <title>JW Player RTD Provider Example</title>
     <script>
       var FAILSAFE_TIMEOUT = 3300;
       var PREBID_TIMEOUT = 1000;
 
       var adUnits = [{
-          code: 'div-gpt-ad-1460505748561-0',
+          code: 'video-ad-unit',
           ortb2Imp: {
               ext: {
                   data: {
@@ -23,16 +25,21 @@
               }
           },
           mediaTypes: {
-              banner: {
-                  sizes: [[300, 250], [300,600]],
+              video: {
+                sizes: [[320, 460]],
+                mimes :  ["video/mp4"],
+                minduration : 3,
+                maxduration: 30,
+                protocols : [1,2]
               }
           },
           // Replace this object to test a new Adapter!
           bids: [{
-              bidder: 'appnexus',
-              params: {
-                  placementId: 13144370
-              }
+            bidder: 'ix',
+            params: {
+              siteId: '300',
+              video: {}
+            }
           }]
       }];
 
@@ -41,11 +48,6 @@
     </script>
 
     <script>
-      var googletag = googletag || {};
-      googletag.cmd = googletag.cmd || [];
-      googletag.cmd.push(function() {
-        googletag.pubads().disableInitialLoad();
-      });
 
       pbjs.que.push(function() {
         pbjs.setConfig({
@@ -63,44 +65,28 @@
         });
         pbjs.addAdUnits(adUnits);
         pbjs.requestBids({
-          bidsBackHandler: sendAdserverRequest,
+          bidsBackHandler: renderHighestBid,
           timeout: PREBID_TIMEOUT
         });
       });
 
-      function sendAdserverRequest() {
-        if (pbjs.adserverRequestSent) return;
-        pbjs.adserverRequestSent = true;
-        googletag.cmd.push(function() {
-          pbjs.que.push(function() {
-            pbjs.setTargetingForGPTAsync();
-            googletag.pubads().refresh();
-          });
-        });
-      }
-
-      setTimeout(function() {
-        sendAdserverRequest();
-      }, FAILSAFE_TIMEOUT);
-
-    </script>
+      function renderHighestBid() {
+        const highestBids = pbjs.getHighestCpmBids('video-ad-unit');
+        const highestBid = highestBids && highestBids.length && highestBids[0];
+        if (!highestBid) {
+          return;
+        }
 
-    <script>
-      googletag.cmd.push(function () {
-        googletag.defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0').addService(googletag.pubads());
+        if (highestBid.vastXml) {
+          jwplayer().loadAdXml(highestBid.vastXml);
+        } else if (highestBid.vastUrl) {
+          jwplayer().loadAdTag(highestBid.vastUrl);
+        }
+      }
 
-        googletag.pubads().enableSingleRequest();
-        googletag.enableServices();
-      });
     </script>
 </head>
 
 <body>
-<h5>Div-1</h5>
-<div id='div-gpt-ad-1460505748561-0'>
-    <script type='text/javascript'>
-      googletag.cmd.push(function() { googletag.display('div-gpt-ad-1460505748561-0'); });
-    </script>
-</div>
 </body>
 </html>
diff --git a/karma.conf.maker.js b/karma.conf.maker.js
@@ -15,8 +15,7 @@ function newWebpackConfig(codeCoverage, disableFeatures) {
     mode: 'development',
     devtool: 'inline-source-map',
   });
-
-  delete webpackConfig.entry;
+  ['entry', 'optimization'].forEach(prop => delete webpackConfig[prop]);
 
   webpackConfig.module.rules
     .flatMap((r) => r.use)

diff --git a/modules/adagioAnalyticsAdapter.js b/modules/adagioAnalyticsAdapter.js
@@ -17,6 +17,8 @@ const ADAGIO_GVLID = 617;
 const VERSION = '3.0.0';
 const PREBID_VERSION = '$prebid.version$';
 const ENDPOINT = 'https://c.4dex.io/pba.gif';
+const CURRENCY_USD = 'USD';
+const ADAGIO_CODE = 'adagio';
 const cache = {
   auctions: {},
   getAuction: function(auctionId, adUnitCode) {
@@ -92,17 +94,11 @@ function removeDuplicates(arr, getKey) {
   });
 };
 
-function getAdapterNameForAlias(aliasName) {
-  return adapterManager.aliasRegistry[aliasName] || aliasName;
-};
-
-function isAdagio(value) {
-  if (!value) {
+function isAdagio(alias) {
+  if (!alias) {
     return false
   }
-
-  return value.toLowerCase().includes('adagio') ||
-    getAdapterNameForAlias(value).toLowerCase().includes('adagio');
+  return (alias + adapterManager.aliasRegistry[alias]).toLowerCase().includes(ADAGIO_CODE);
 };
 
 function getMediaTypeAlias(mediaType) {
@@ -129,6 +125,26 @@ function addKeyPrefix(obj, prefix) {
   }, {});
 }
 
+function getUsdCpm(cpm, currency) {
+  let netCpm = cpm
+
+  if (typeof currency === 'string' && currency.toUpperCase() !== CURRENCY_USD) {
+    if (typeof getGlobal().convertCurrency === 'function') {
+      netCpm = parseFloat(Number(getGlobal().convertCurrency(cpm, currency, CURRENCY_USD))).toFixed(3);
+    } else {
+      netCpm = null
+    }
+  }
+  return netCpm
+}
+
+function getCurrencyData(bid) {
+  return {
+    netCpm: getUsdCpm(bid.cpm, bid.currency),
+    orginalCpm: getUsdCpm(bid.originalCpm, bid.originalCurrency)
+  }
+}
+
 /**
  * sendRequest to Adagio. It filter null values and encode each query param.
  * @param {Object} qp
@@ -258,7 +274,7 @@ function handlerAuctionInit(event) {
       t_v: params.testVersion || null,
       mts: mediaTypesKeys.join(','),
       ban_szs: bannerSizes.join(','),
-      bdrs: bidders.map(bidder => getAdapterNameForAlias(bidder.bidder)).sort().join(','),
+      bdrs: bidders.map(bidder => bidder.bidder).sort().join(','),
       adg_mts: adagioMediaTypes.join(',')
     };
 
@@ -299,56 +315,43 @@ function handlerAuctionEnd(event) {
 
   const adUnitCodes = cache.getAllAdUnitCodes(auctionId);
   adUnitCodes.forEach(adUnitCode => {
-    const mapper = (bidder) => event.bidsReceived.find(bid => bid.adUnitCode === adUnitCode && bid.bidder === bidder) ? '1' : '0';
+    const bidResponseMapper = (bidder) => {
+      const bid = event.bidsReceived.find(bid => bid.adUnitCode === adUnitCode && bid.bidder === bidder)
+      return bid ? '1' : '0'
+    }
+    const bidCpmMapper = (bidder) => {
+      const bid = event.bidsReceived.find(bid => bid.adUnitCode === adUnitCode && bid.bidder === bidder)
+      return bid ? getCurrencyData(bid).netCpm : null
+    }
 
     cache.updateAuction(auctionId, adUnitCode, {
-      bdrs_bid: cache.getBiddersFromAuction(auctionId, adUnitCode).map(mapper).join(',')
+      bdrs_bid: cache.getBiddersFromAuction(auctionId, adUnitCode).map(bidResponseMapper).join(','),
+      bdrs_cpm: cache.getBiddersFromAuction(auctionId, adUnitCode).map(bidCpmMapper).join(',')
     });
     sendNewBeacon(auctionId, adUnitCode);
   });
 }
-
 function handlerBidWon(event) {
   let auctionId = getTargetedAuctionId(event);
 
   if (!guard.bidTracked(auctionId, event.adUnitCode)) {
     return;
   }
 
-  let adsCurRateToUSD = (event.currency === 'USD') ? 1 : null;
-  let ogCurRateToUSD = (event.originalCurrency === 'USD') ? 1 : null;
-  try {
-    if (typeof getGlobal().convertCurrency === 'function') {
-      // Currency module is loaded, we can calculate the conversion rate.
-
-      // Get the conversion rate from the original currency to USD.
-      ogCurRateToUSD = getGlobal().convertCurrency(1, event.originalCurrency, 'USD');
-      // Get the conversion rate from the ad server currency to USD.
-      adsCurRateToUSD = getGlobal().convertCurrency(1, event.currency, 'USD');
-    }
-  } catch (error) {
-    logError('Error on Adagio Analytics Adapter - handlerBidWon', error);
-  }
+  const currencyData = getCurrencyData(event)
 
   const adagioAuctionCacheId = (
     (event.latestTargetedAuctionId && event.latestTargetedAuctionId !== event.auctionId)
       ? cache.getAdagioAuctionId(event.auctionId)
       : null);
 
   cache.updateAuction(auctionId, event.adUnitCode, {
-    win_bdr: getAdapterNameForAlias(event.bidder),
+    win_bdr: event.bidder,
     win_mt: getMediaTypeAlias(event.mediaType),
     win_ban_sz: event.mediaType === BANNER ? `${event.width}x${event.height}` : null,
 
-    // ad server currency
-    win_cpm: event.cpm,
-    cur: event.currency,
-    cur_rate: adsCurRateToUSD,
-
-    // original currency from bidder
-    og_cpm: event.originalCpm,
-    og_cur: event.originalCurrency,
-    og_cur_rate: ogCurRateToUSD,
+    win_net_cpm: currencyData.netCpm,
+    win_og_cpm: currencyData.orginalCpm,
 
     // cache bid id
     auct_id_c: adagioAuctionCacheId,
@@ -428,7 +431,7 @@ adagioAdapter.enableAnalytics = config => {
 
 adapterManager.registerAnalyticsAdapter({
   adapter: adagioAdapter,
-  code: 'adagio',
+  code: ADAGIO_CODE,
   gvlid: ADAGIO_GVLID,
 });