prebid.js 5.20.0 → 6.3.0

package/.babelrc.js

@@ -14,16 +14,7 @@ module.exports = {
     [
       useLocal('@babel/preset-env'),
       {
-        "targets": {
-          "browsers": [
-            "chrome >= 75",
-            "safari >=10",
-            "edge >= 70",
-            "ff >= 70",
-            "ie >= 11",
-            "ios >= 11"
-          ]
-        }
+        "useBuiltIns": "entry"
       }
     ]
   ],

package/README.md

@@ -59,6 +59,8 @@ module.exports = {
           loader: 'babel-loader',
           // presets and plugins for Prebid.js must be manually specified separate from your other babel rule.
           // this can be accomplished by requiring prebid's .babelrc.js file (requires Babel 7 and Node v8.9.0+)
+          // as of Prebid 6, babelrc.js only targets modern browsers. One can change the targets and build for
+          // older browsers if they prefer, but integration tests on ie11 were removed in Prebid.js 6.0
           options: require('prebid.js/.babelrc.js')
         }
       }
@@ -272,7 +274,7 @@ As you make code changes, the bundles will be rebuilt and the page reloaded auto
 
 ## Contribute
 
-Many SSPs, bidders, and publishers have contributed to this project. [Hundreds of bidders](https://github.com/prebid/Prebid.js/tree/master/src/adapters) are supported by Prebid.js.
+Many SSPs, bidders, and publishers have contributed to this project. [Hundreds of bidders](https://github.com/prebid/Prebid.js/tree/master/modules) are supported by Prebid.js.
 
 For guidelines, see [Contributing](./CONTRIBUTING.md).
 
@@ -314,7 +316,7 @@ For instructions on writing tests for Prebid.js, see [Testing Prebid.js](http://
 
 ### Supported Browsers
 
-Prebid.js is supported on IE11 and modern browsers.
+Prebid.js is supported on IE11 and modern browsers until 5.x. 6.x+ transpiles to target >0.25%; not Opera Mini; not IE11. 
 
 ### Governance
 Review our governance model [here](https://github.com/prebid/Prebid.js/tree/master/governance.md).

package/browsers.json

@@ -1,73 +1,49 @@
 {
-  "bs_edge_17_windows_10": {
+  "bs_edge_latest_windows_10": {
     "base": "BrowserStack",
     "os_version": "10",
     "browser": "edge",
-    "browser_version": "17.0",
+    "browser_version": "latest",
     "device": null,
     "os": "Windows"
   },
-  "bs_edge_90_windows_10": {
-    "base": "BrowserStack",
-    "os_version": "10",
-    "browser": "edge",
-    "browser_version": "90.0",
-    "device": null,
-    "os": "Windows"
-  },
-  "bs_ie_11_windows_10": {
-    "base": "BrowserStack",
-    "os_version": "10",
-    "browser": "ie",
-    "browser_version": "11.0",
-    "device": null,
-    "os": "Windows"
-  },
-  "bs_chrome_90_windows_10": {
+  "bs_chrome_latest_windows_10": {
     "base": "BrowserStack",
     "os_version": "10",
     "browser": "chrome",
-    "browser_version": "90.0",
+    "browser_version": "latest",
     "device": null,
     "os": "Windows"
   },
-  "bs_chrome_79_windows_10": {
+  "bs_chrome_87_windows_10": {
     "base": "BrowserStack",
     "os_version": "10",
     "browser": "chrome",
-    "browser_version": "79.0",
-    "device": null,
-    "os": "Windows"
-  },
-  "bs_firefox_88_windows_10": {
-    "base": "BrowserStack",
-    "os_version": "10",
-    "browser": "firefox",
-    "browser_version": "88.0",
+    "browser_version": "87.0",
     "device": null,
     "os": "Windows"
   },
-  "bs_firefox_72_windows_10": {
+  "bs_firefox_latest_windows_10": {
     "base": "BrowserStack",
     "os_version": "10",
     "browser": "firefox",
-    "browser_version": "72.0",
+    "browser_version": "latest",
     "device": null,
     "os": "Windows"
   },
-  "bs_safari_14_mac_bigsur": {
+  "bs_safari_latest_mac_bigsur": {
     "base": "BrowserStack",
     "os_version": "Big Sur",
     "browser": "safari",
-    "browser_version": "14.0",
+    "browser_version": "latest",
     "device": null,
     "os": "OS X"
   },
-  "bs_safari_12_mac_mojave": {
+  "bs_safari_15_catalina": {
     "base": "BrowserStack",
-    "os_version": "Mojave",
+    "os_version": "Catalina",
     "browser": "safari",
-    "browser_version": "12.0",
+    "browser_version": "13.1",
     "device": null,
     "os": "OS X"
   }

package/gulpfile.js

@@ -76,6 +76,7 @@ function lint(done) {
     'modules/**/*.js',
     'test/**/*.js',
     'plugins/**/*.js',
+    '!plugins/**/node_modules/**',
     './*.js'
   ], { base: './' })
     .pipe(gulpif(argv.nolintfix, eslint(), eslint({ fix: true })))
@@ -140,12 +141,6 @@ function watch(done) {
   done();
 };
 
-function makeModuleList(modules) {
-  return modules.map(module => {
-    return '"' + module + '"'
-  });
-}
-
 function makeDevpackPkg() {
   var cloned = _.cloneDeep(webpackConfig);
   cloned.devtool = 'source-map';
@@ -157,7 +152,6 @@ function makeDevpackPkg() {
   return gulp.src([].concat(moduleSources, analyticsSources, 'src/prebid.js'))
     .pipe(helpers.nameModules(externalModules))
     .pipe(webpackStream(cloned, webpack))
-    .pipe(replace(/('|")v\$prebid\.modulesList\$('|")/g, makeModuleList(externalModules)))
     .pipe(gulp.dest('build/dev'))
     .pipe(connect.reload());
 }
@@ -175,7 +169,6 @@ function makeWebpackPkg() {
     .pipe(helpers.nameModules(externalModules))
     .pipe(webpackStream(cloned, webpack))
     .pipe(terser())
-    .pipe(replace(/('|")v\$prebid\.modulesList\$('|")/g, makeModuleList(externalModules)))
     .pipe(gulpif(file => file.basename === 'prebid-core.js', header(banner, { prebid: prebid })))
     .pipe(gulp.dest('build/dist'));
 }

package/integrationExamples/gpt/weboramaRtdProvider_example.html

@@ -17,22 +17,31 @@
             debug: true,
             realTimeData: {
                 auctionDelay: 1000,
-                dataProviders: [
-                    {
+                dataProviders: [{
                         name: "weborama",
                         waitForIt: true,
                         params: {
-                            weboCtxConf: {
-                                setTargeting: true,
-                                token: "to-be-defined",
-                                targetURL: "https://prebid.org/",
-                                defaultProfile: {
-                                  webo_ctx: ['moon']
-                                }
-                            }
-                        }
-                    }
-                ]
+				  weboCtxConf: {
+				      token: "to-be-defined", // mandatory
+				      targetURL: "https://prebid.org", // default is document.URL
+				      setPrebidTargeting: true, // default
+				      sendToBidders: true,      // default
+				      defaultProfile: {         // optional
+					webo_ctx: ['moon'],
+					webo_ds: ['bar']
+				      }
+				    },
+				    weboUserDataConf: {
+				      setPrebidTargeting: true, // default
+				      sendToBidders: true,      // default
+				      defaultProfile: {         // optional
+					webo_cs: ['Red'],
+					webo_audiences: ['bam']
+				      },
+				      localStorageProfileKey: 'webo_wam2gam_entry' // default
+				    }
+			 }
+                }]
             }
         });
     });
@@ -54,7 +63,7 @@
                 }
             },
             bids: [{
-              bidder: 'appnexus',
+              bidder: 'smartadserver',
               params: {
                 placementId: 1
               }

package/karma.conf.maker.js

@@ -166,7 +166,7 @@ module.exports = function(codeCoverage, browserstack, watchMode, file) {
     browserNoActivityTimeout: 3e5, // default 10000
     captureTimeout: 3e5, // default 60000,
     browserDisconnectTolerance: 3,
-    concurrency: 5,
+    concurrency: 6,
 
     plugins: plugins
   }

package/modules/33acrossBidAdapter.js

@@ -1,11 +1,20 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
 import {
-  deepAccess, uniques, isArray, getWindowTop, isGptPubadsDefined, isSlotMatchingAdUnitCode, logInfo, logWarn,
-  getWindowSelf
+  deepAccess,
+  uniques,
+  isArray,
+  getWindowTop,
+  isGptPubadsDefined,
+  isSlotMatchingAdUnitCode,
+  logInfo,
+  logWarn,
+  getWindowSelf,
+  mergeDeep,
 } from '../src/utils.js';
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
 
+// **************************** UTILS *************************** //
 const BIDDER_CODE = '33across';
 const END_POINT = 'https://ssc.33across.com/api/v1/hb';
 const SYNC_ENDPOINT = 'https://ssc-cms.33across.com/ps/?m=xch&rt=html&ru=deb';
@@ -42,6 +51,14 @@ const adapterState = {
 
 const NON_MEASURABLE = 'nm';
 
+function getTTXConfig() {
+  const ttxSettings = Object.assign({},
+    config.getConfig('ttxSettings')
+  );
+
+  return ttxSettings;
+}
+
 // **************************** VALIDATION *************************** //
 function isBidRequestValid(bid) {
   return (
@@ -74,6 +91,7 @@ function _validateGUID(bid) {
 
 function _validateBanner(bid) {
   const banner = deepAccess(bid, 'mediaTypes.banner');
+
   // If there's no banner no need to validate against banner rules
   if (banner === undefined) {
     return true;
@@ -140,91 +158,125 @@ function _validateVideo(bid) {
 // NOTE: With regards to gdrp consent data, the server will independently
 // infer the gdpr applicability therefore, setting the default value to false
 function buildRequests(bidRequests, bidderRequest) {
+  const {
+    ttxSettings,
+    gdprConsent,
+    uspConsent,
+    pageUrl
+  } = _buildRequestParams(bidRequests, bidderRequest);
+
+  const groupedRequests = _buildRequestGroups(ttxSettings, bidRequests);
+
+  const serverRequests = [];
+
+  for (const key in groupedRequests) {
+    serverRequests.push(
+      _createServerRequest({
+        bidRequests: groupedRequests[key],
+        gdprConsent,
+        uspConsent,
+        pageUrl,
+        ttxSettings
+      })
+    )
+  }
+
+  return serverRequests;
+}
+
+function _buildRequestParams(bidRequests, bidderRequest) {
+  const ttxSettings = getTTXConfig();
+
   const gdprConsent = Object.assign({
     consentString: undefined,
     gdprApplies: false
   }, bidderRequest && bidderRequest.gdprConsent);
 
   const uspConsent = bidderRequest && bidderRequest.uspConsent;
+
   const pageUrl = (bidderRequest && bidderRequest.refererInfo) ? (bidderRequest.refererInfo.referer) : (undefined);
 
   adapterState.uniqueSiteIds = bidRequests.map(req => req.params.siteId).filter(uniques);
 
-  return bidRequests.map(bidRequest => _createServerRequest(
-    {
-      bidRequest,
-      gdprConsent,
-      uspConsent,
-      pageUrl
-    })
-  );
+  return {
+    ttxSettings,
+    gdprConsent,
+    uspConsent,
+    pageUrl
+  }
+}
+
+function _buildRequestGroups(ttxSettings, bidRequests) {
+  const bidRequestsComplete = bidRequests.map(_inferProduct);
+  const enableSRAMode = ttxSettings && ttxSettings.enableSRAMode;
+  const keyFunc = (enableSRAMode === true) ? _getSRAKey : _getMRAKey;
+
+  return _groupBidRequests(bidRequestsComplete, keyFunc);
+}
+
+function _groupBidRequests(bidRequests, keyFunc) {
+  const groupedRequests = {};
+
+  bidRequests.forEach((req) => {
+    const key = keyFunc(req);
+
+    groupedRequests[key] = groupedRequests[key] || [];
+    groupedRequests[key].push(req);
+  });
+
+  return groupedRequests;
+}
+
+function _getSRAKey(bidRequest) {
+  return `${bidRequest.params.siteId}:${bidRequest.params.productId}`;
+}
+
+function _getMRAKey(bidRequest) {
+  return `${bidRequest.bidId}`;
 }
 
 // Infer the necessary data from valid bid for a minimal ttxRequest and create HTTP request
-// NOTE: At this point, TTX only accepts request for a single impression
-function _createServerRequest({bidRequest, gdprConsent = {}, uspConsent, pageUrl}) {
+function _createServerRequest({ bidRequests, gdprConsent = {}, uspConsent, pageUrl, ttxSettings }) {
   const ttxRequest = {};
-  const params = bidRequest.params;
+  const { siteId, test } = bidRequests[0].params;
 
   /*
    * Infer data for the request payload
    */
-  ttxRequest.imp = [{}];
+  ttxRequest.imp = [];
 
-  if (deepAccess(bidRequest, 'mediaTypes.banner')) {
-    ttxRequest.imp[0].banner = {
-      ..._buildBannerORTB(bidRequest)
-    }
-  }
-
-  if (deepAccess(bidRequest, 'mediaTypes.video')) {
-    ttxRequest.imp[0].video = _buildVideoORTB(bidRequest);
-  }
-
-  ttxRequest.imp[0].ext = {
-    ttx: {
-      prod: _getProduct(bidRequest)
-    }
-  };
+  bidRequests.forEach((req) => {
+    ttxRequest.imp.push(_buildImpORTB(req));
+  });
 
-  ttxRequest.site = { id: params.siteId };
+  ttxRequest.site = { id: siteId };
 
   if (pageUrl) {
     ttxRequest.site.page = pageUrl;
   }
 
-  // Go ahead send the bidId in request to 33exchange so it's kept track of in the bid response and
-  // therefore in ad targetting process
-  ttxRequest.id = bidRequest.bidId;
+  ttxRequest.id = bidRequests[0].auctionId;
 
   if (gdprConsent.consentString) {
-    ttxRequest.user = setExtension(
-      ttxRequest.user,
-      'consent',
-      gdprConsent.consentString
-    )
+    ttxRequest.user = setExtensions(ttxRequest.user, {
+      'consent': gdprConsent.consentString
+    });
   }
 
-  if (Array.isArray(bidRequest.userIdAsEids) && bidRequest.userIdAsEids.length > 0) {
-    ttxRequest.user = setExtension(
-      ttxRequest.user,
-      'eids',
-      bidRequest.userIdAsEids
-    )
+  if (Array.isArray(bidRequests[0].userIdAsEids) && bidRequests[0].userIdAsEids.length > 0) {
+    ttxRequest.user = setExtensions(ttxRequest.user, {
+      'eids': bidRequests[0].userIdAsEids
+    });
   }
 
-  ttxRequest.regs = setExtension(
-    ttxRequest.regs,
-    'gdpr',
-    Number(gdprConsent.gdprApplies)
-  );
+  ttxRequest.regs = setExtensions(ttxRequest.regs, {
+    'gdpr': Number(gdprConsent.gdprApplies)
+  });
 
   if (uspConsent) {
-    ttxRequest.regs = setExtension(
-      ttxRequest.regs,
-      'us_privacy',
-      uspConsent
-    )
+    ttxRequest.regs = setExtensions(ttxRequest.regs, {
+      'us_privacy': uspConsent
+    });
   }
 
   ttxRequest.ext = {
@@ -237,16 +289,14 @@ function _createServerRequest({bidRequest, gdprConsent = {}, uspConsent, pageUrl
     }
   };
 
-  if (bidRequest.schain) {
-    ttxRequest.source = setExtension(
-      ttxRequest.source,
-      'schain',
-      bidRequest.schain
-    )
+  if (bidRequests[0].schain) {
+    ttxRequest.source = setExtensions(ttxRequest.source, {
+      'schain': bidRequests[0].schain
+    });
   }
 
   // Finally, set the openRTB 'test' param if this is to be a test bid
-  if (params.test === 1) {
+  if (test === 1) {
     ttxRequest.test = 1;
   }
 
@@ -259,8 +309,7 @@ function _createServerRequest({bidRequest, gdprConsent = {}, uspConsent, pageUrl
   };
 
   // Allow the ability to configure the HB endpoint for testing purposes.
-  const ttxSettings = config.getConfig('ttxSettings');
-  const url = (ttxSettings && ttxSettings.url) || `${END_POINT}?guid=${params.siteId}`;
+  const url = (ttxSettings && ttxSettings.url) || `${END_POINT}?guid=${siteId}`;
 
   // Return the server request
   return {
@@ -272,14 +321,36 @@ function _createServerRequest({bidRequest, gdprConsent = {}, uspConsent, pageUrl
 }
 
 // BUILD REQUESTS: SET EXTENSIONS
-function setExtension(obj = {}, key, value) {
-  return Object.assign({}, obj, {
-    ext: Object.assign({}, obj.ext, {
-      [key]: value
-    })
+function setExtensions(obj = {}, extFields) {
+  return mergeDeep({}, obj, {
+    'ext': extFields
   });
 }
 
+// BUILD REQUESTS: IMP
+function _buildImpORTB(bidRequest) {
+  const imp = {
+    id: bidRequest.bidId,
+    ext: {
+      ttx: {
+        prod: deepAccess(bidRequest, 'params.productId')
+      }
+    }
+  };
+
+  if (deepAccess(bidRequest, 'mediaTypes.banner')) {
+    imp.banner = {
+      ..._buildBannerORTB(bidRequest)
+    }
+  }
+
+  if (deepAccess(bidRequest, 'mediaTypes.video')) {
+    imp.video = _buildVideoORTB(bidRequest);
+  }
+
+  return imp;
+}
+
 // BUILD REQUESTS: SIZE INFERENCE
 function _transformSizes(sizes) {
   if (isArray(sizes) && sizes.length === 2 && !isArray(sizes[0])) {
@@ -297,6 +368,14 @@ function _getSize(size) {
 }
 
 // BUILD REQUESTS: PRODUCT INFERENCE
+function _inferProduct(bidRequest) {
+  return mergeDeep({}, bidRequest, {
+    params: {
+      productId: _getProduct(bidRequest)
+    }
+  });
+}
+
 function _getProduct(bidRequest) {
   const { params, mediaTypes } = bidRequest;
 
@@ -367,7 +446,7 @@ function _buildVideoORTB(bidRequest) {
 
   const video = {}
 
-  const {w, h} = _getSize(videoParams.playerSize[0]);
+  const { w, h } = _getSize(videoParams.playerSize[0]);
   video.w = w;
   video.h = h;
 
@@ -388,11 +467,11 @@ function _buildVideoORTB(bidRequest) {
   if (product === PRODUCT.INSTREAM) {
     video.startdelay = video.startdelay || 0;
     video.placement = 1;
-  };
+  }
 
   // bidfloors
   if (typeof bidRequest.getFloor === 'function') {
-    const bidfloors = _getBidFloors(bidRequest, {w: video.w, h: video.h}, VIDEO);
+    const bidfloors = _getBidFloors(bidRequest, { w: video.w, h: video.h }, VIDEO);
 
     if (bidfloors) {
       Object.assign(video, {
@@ -404,6 +483,7 @@ function _buildVideoORTB(bidRequest) {
       });
     }
   }
+
   return video;
 }
 
@@ -556,54 +636,61 @@ function _isIframe() {
 }
 
 // **************************** INTERPRET RESPONSE ******************************** //
-// NOTE: At this point, the response from 33exchange will only ever contain one bid
-// i.e. the highest bid
 function interpretResponse(serverResponse, bidRequest) {
-  const bidResponses = [];
-
-  // If there are bids, look at the first bid of the first seatbid (see NOTE above for assumption about ttx)
-  if (serverResponse.body.seatbid.length > 0 && serverResponse.body.seatbid[0].bid.length > 0) {
-    bidResponses.push(_createBidResponse(serverResponse.body));
-  }
-
-  return bidResponses;
+  const { seatbid, cur = 'USD' } = serverResponse.body;
+
+  if (!isArray(seatbid)) {
+    return [];
+  }
+
+  // Pick seats with valid bids and convert them into an Array of responses
+  // in format expected by Prebid Core
+  return seatbid
+    .filter((seat) => (
+      isArray(seat.bid) &&
+      seat.bid.length > 0
+    ))
+    .reduce((acc, seat) => {
+      return acc.concat(
+        seat.bid.map((bid) => _createBidResponse(bid, cur))
+      );
+    }, []);
 }
 
-// All this assumes that only one bid is ever returned by ttx
-function _createBidResponse(response) {
+function _createBidResponse(bid, cur) {
   const isADomainPresent =
-    response.seatbid[0].bid[0].adomain && response.seatbid[0].bid[0].adomain.length;
-  const bid = {
-    requestId: response.id,
+    bid.adomain && bid.adomain.length;
+  const bidResponse = {
+    requestId: bid.impid,
     bidderCode: BIDDER_CODE,
-    cpm: response.seatbid[0].bid[0].price,
-    width: response.seatbid[0].bid[0].w,
-    height: response.seatbid[0].bid[0].h,
-    ad: response.seatbid[0].bid[0].adm,
-    ttl: response.seatbid[0].bid[0].ttl || 60,
-    creativeId: response.seatbid[0].bid[0].crid,
-    mediaType: deepAccess(response.seatbid[0].bid[0], 'ext.ttx.mediaType', BANNER),
-    currency: response.cur,
+    cpm: bid.price,
+    width: bid.w,
+    height: bid.h,
+    ad: bid.adm,
+    ttl: bid.ttl || 60,
+    creativeId: bid.crid,
+    mediaType: deepAccess(bid, 'ext.ttx.mediaType', BANNER),
+    currency: cur,
     netRevenue: true
   }
 
   if (isADomainPresent) {
-    bid.meta = {
-      advertiserDomains: response.seatbid[0].bid[0].adomain
+    bidResponse.meta = {
+      advertiserDomains: bid.adomain
     };
   }
 
-  if (bid.mediaType === VIDEO) {
-    const vastType = deepAccess(response.seatbid[0].bid[0], 'ext.ttx.vastType', 'xml');
+  if (bidResponse.mediaType === VIDEO) {
+    const vastType = deepAccess(bid, 'ext.ttx.vastType', 'xml');
 
     if (vastType === 'xml') {
-      bid.vastXml = bid.ad;
+      bidResponse.vastXml = bidResponse.ad;
     } else {
-      bid.vastUrl = bid.ad;
+      bidResponse.vastUrl = bidResponse.ad;
     }
   }
 
-  return bid;
+  return bidResponse;
 }
 
 // **************************** USER SYNC *************************** //

package/modules/adagioBidAdapter.js

@@ -308,7 +308,7 @@ function getElementFromTopWindow(element, currentWindow) {
 function autoDetectAdUnitElementIdFromGpt(adUnitCode) {
   const autoDetectedAdUnit = getGptSlotInfoForAdUnitCode(adUnitCode);
 
-  if (autoDetectedAdUnit && autoDetectedAdUnit.divId) {
+  if (autoDetectedAdUnit.divId) {
     return autoDetectedAdUnit.divId;
   }
 };

package/modules/addefendBidAdapter.js

@@ -19,6 +19,7 @@ export const spec = {
       v: $$PREBID_GLOBAL$$.version,
       auctionId: false,
       pageId: false,
+      gdpr_applies: bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies ? bidderRequest.gdprConsent.gdprApplies : 'true',
       gdpr_consent: bidderRequest.gdprConsent && bidderRequest.gdprConsent.consentString ? bidderRequest.gdprConsent.consentString : '',
       referer: bidderRequest.refererInfo.referer,
       bids: [],