Merge branch 'prebid:master' into master

Author: AdsInteractive

.gitignore

@@ -83,3 +83,6 @@ typings/
 
 # MacOS system files
 .DS_Store
+
+# Webpack cache
+.cache/

libraries/advangUtils/index.js

@@ -1,6 +1,6 @@
 import { deepAccess, generateUUID, isFn, parseSizesInput, parseUrl } from '../../src/utils.js';
 import { config } from '../../src/config.js';
-import { find, includes } from '../../src/polyfill.js';
+import { find } from '../../src/polyfill.js';
 
 export const DEFAULT_MIMES = ['video/mp4', 'application/javascript'];
 
@@ -115,12 +115,12 @@ export function getVideoTargetingParams(bid, VIDEO_TARGETING) {
   const result = {};
   const excludeProps = ['playerSize', 'context', 'w', 'h'];
   Object.keys(Object(bid.mediaTypes.video))
-    .filter(key => !includes(excludeProps, key))
+    .filter(key => !excludeProps.includes(key))
     .forEach(key => {
       result[ key ] = bid.mediaTypes.video[ key ];
     });
   Object.keys(Object(bid.params.video))
-    .filter(key => includes(VIDEO_TARGETING, key))
+    .filter(key => VIDEO_TARGETING.includes(key))
     .forEach(key => {
       result[ key ] = bid.params.video[ key ];
     });

libraries/blueUtils/bidderUtils.js

@@ -0,0 +1,113 @@
+import { isFn, isPlainObject, deepSetValue, replaceAuctionPrice, triggerPixel } from '../../src/utils.js';
+
+export function getBidFloor(bid, mediaType, defaultCurrency) {
+  if (isFn(bid.getFloor)) {
+    let floor = bid.getFloor({
+      currency: defaultCurrency,
+      mediaType: mediaType,
+      size: '*',
+    });
+    if (
+      isPlainObject(floor) &&
+      !isNaN(floor.floor) &&
+      floor.currency === defaultCurrency
+    ) {
+      return floor.floor;
+    }
+  }
+  return null;
+}
+
+export function buildOrtbRequest(bidRequests, bidderRequest, context, gvlid, ortbConverterInstance) {
+  const ortbRequest = ortbConverterInstance.toORTB({ bidRequests, bidderRequest, context });
+  ortbRequest.ext = ortbRequest.ext || {};
+  deepSetValue(ortbRequest, 'ext.gvlid', gvlid);
+  return ortbRequest;
+}
+
+export function ortbConverterRequest(buildRequest, imps, bidderRequest, context) {
+  let request = buildRequest(imps, bidderRequest, context);
+  deepSetValue(request, 'site.publisher.id', context.publisherId);
+  return request;
+}
+
+export function ortbConverterImp(buildImp, bidRequest, context) {
+  let imp = buildImp(bidRequest, context);
+  // context.mediaTypes is expected to be set by the adapter calling this function
+  const floor = getBidFloor(bidRequest, context.mediaTypes.banner, context.mediaTypes.defaultCurrency);
+  imp.tagid = bidRequest.params.placementId;
+
+  if (floor) {
+    imp.bidfloor = floor;
+    imp.bidfloorcur = context.mediaTypes.defaultCurrency;
+  }
+
+  return imp;
+}
+
+export function buildBidObjectBase(bid, serverResponseBody, bidderCode, defaultCurrency) {
+  return {
+    ad: replaceAuctionPrice(bid.adm, bid.price),
+    adapterCode: bidderCode,
+    cpm: bid.price,
+    currency: serverResponseBody.cur || defaultCurrency,
+    deferBilling: false,
+    deferRendering: false,
+    width: bid.w,
+    height: bid.h,
+    mediaType: bid.ext?.mediaType || 'banner',
+    netRevenue: true,
+    originalCpm: bid.price,
+    originalCurrency: serverResponseBody.cur || defaultCurrency,
+    requestId: bid.impid,
+    seatBidId: bid.id
+  };
+}
+
+export function commonOnBidWonHandler(bid, processUrl = (url, bidData) => url) {
+  const { burl, nurl } = bid || {};
+
+  if (nurl) {
+    triggerPixel(processUrl(nurl, bid));
+  }
+
+  if (burl) {
+    triggerPixel(processUrl(burl, bid));
+  }
+}
+
+export function commonIsBidRequestValid(bid) {
+  return !!bid.params.placementId && !!bid.params.publisherId;
+}
+
+export function createOrtbConverter(ortbConverterFunc, bannerMediaType, defaultCurrencyConst, impFunc, requestFunc) {
+  return ortbConverterFunc({
+    context: {
+      netRevenue: true,
+      ttl: 100,
+      mediaTypes: {
+        banner: bannerMediaType,
+        defaultCurrency: defaultCurrencyConst
+      }
+    },
+    imp: impFunc,
+    request: requestFunc,
+  });
+}
+
+export function getPublisherIdFromBids(validBidRequests) {
+  return validBidRequests.find(
+    (bidRequest) => bidRequest.params?.publisherId
+  )?.params.publisherId;
+}
+
+export function packageOrtbRequest(ortbRequest, endpointUrl, dataProcessor, requestOptions) {
+  return [
+    {
+      method: 'POST',
+      url: endpointUrl,
+      data: dataProcessor(ortbRequest),
+      options: requestOptions,
+    }
+  ];
+}

libraries/liveIntentId/shared.js

@@ -160,6 +160,10 @@ export function setUpTreatment(config) {
 
 export const eids = {
   ...UID1_EIDS,
+  tdid: {
+    ...UID1_EIDS.tdid,
+    matcher: LI_PROVIDER_DOMAIN
+  },
   ...UID2_EIDS,
   'lipb': {
     getValue: function(data) {

libraries/xeUtils/bidderUtils.js

@@ -1,6 +1,5 @@
 import {deepAccess, getBidIdParameter, isFn, logError, isArray, parseSizesInput, isPlainObject} from '../../src/utils.js';
 import {getAdUnitSizes} from '../sizeUtils/sizeUtils.js';
-import {findIndex} from '../../src/polyfill.js';
 
 export function getBidFloor(bid, currency = 'USD') {
   if (!isFn(bid.getFloor)) {
@@ -114,9 +113,9 @@ export function interpretResponse(serverResponse, {bidderRequest}) {
   }
 
   serverResponse.body.data.forEach(serverBid => {
-    const bidIndex = findIndex(bidderRequest.bids, (bidRequest) => {
-      return bidRequest.bidId === serverBid.requestId;
-    });
+    const bidIndex = Array.isArray(bidderRequest.bids)
+      ? bidderRequest.bids.findIndex(bidRequest => bidRequest.bidId === serverBid.requestId)
+      : undefined;
 
     if (bidIndex !== -1) {
       const bid = {

modules/adagioBidAdapter.js

@@ -21,7 +21,6 @@ import { Renderer } from '../src/Renderer.js';
 import { _ADAGIO } from '../libraries/adagioUtils/adagioUtils.js';
 import { config } from '../src/config.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-import { find } from '../src/polyfill.js';
 import { getGptSlotInfoForAdUnitCode } from '../libraries/gptUtils/gptUtils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { userSync } from '../src/userSync.js';
@@ -757,7 +756,7 @@ export const spec = {
         }
         if (response.bids) {
           response.bids.forEach(bidObj => {
-            const bidReq = (find(bidRequest.data.adUnits, bid => bid.bidId === bidObj.requestId));
+            const bidReq = bidRequest.data.adUnits.find(bid => bid.bidId === bidObj.requestId);
 
             if (bidReq) {
               // bidObj.meta is the `bidResponse.meta` object according to https://docs.prebid.org/dev-docs/bidder-adaptor.html#interpreting-the-response

modules/adverxoBidAdapter.js

@@ -181,7 +181,7 @@ const adverxoUtils = {
     bidRequests.forEach(bidRequest => {
       const adUnit = {
         host: bidRequest.params.host,
-        id: bidRequest.params.adUnitId,
+        id: Number(bidRequest.params.adUnitId),
         auth: bidRequest.params.auth,
       };
 
@@ -229,8 +229,8 @@ export const spec = {
       return false;
     }
 
-    if (!bid.params.adUnitId || typeof bid.params.adUnitId !== 'number') {
-      utils.logWarn('Adverxo Bid Adapter: adUnitId bid param is required and must be a number');
+    if (!bid.params.adUnitId || isNaN(Number(bid.params.adUnitId)) || bid.params.adUnitId <= 0) {
+      utils.logWarn('Adverxo Bid Adapter: adUnitId bid param is required and must be a positive number');
       return false;
     }
 

modules/blueBidAdapter.js

@@ -2,13 +2,20 @@ import { ortbConverter } from '../libraries/ortbConverter/converter.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 import { getStorageManager } from '../src/storageManager.js';
+import {
+  buildOrtbRequest,
+  ortbConverterRequest,
+  ortbConverterImp,
+  buildBidObjectBase,
+  commonOnBidWonHandler,
+  commonIsBidRequestValid,
+  createOrtbConverter,
+  getPublisherIdFromBids,
+  packageOrtbRequest
+} from '../libraries/blueUtils/bidderUtils.js';
 import {
   replaceAuctionPrice,
-  isFn,
-  isPlainObject,
-  deepSetValue,
-  isEmpty,
-  triggerPixel,
+  isEmpty
 } from '../src/utils.js';
 const BIDDER_CODE = 'blue';
 const ENDPOINT_URL = 'https://bidder-us-east-1.getblue.io/engine/?src=prebid';
@@ -17,90 +24,27 @@ const DEFAULT_CURRENCY = 'USD';
 
 export const storage = getStorageManager({ bidderCode: BIDDER_CODE });
 
-function getBidFloor(bid) {
-  if (isFn(bid.getFloor)) {
-    let floor = bid.getFloor({
-      currency: DEFAULT_CURRENCY,
-      mediaType: BANNER,
-      size: '*',
-    });
-    if (
-      isPlainObject(floor) &&
-      !isNaN(floor.floor) &&
-      floor.currency === DEFAULT_CURRENCY
-    ) {
-      return floor.floor;
-    }
-  }
-  return null;
-}
-
-const converter = ortbConverter({
-  context: {
-    netRevenue: true, // Default netRevenue setting
-    ttl: 100, // Default time-to-live for bid responses
-  },
-  imp,
-  request,
-});
-
-function request(buildRequest, imps, bidderRequest, context) {
-  let request = buildRequest(imps, bidderRequest, context);
-  deepSetValue(request, 'site.publisher.id', context.publisherId);
-  return request;
-}
-
-function imp(buildImp, bidRequest, context) {
-  let imp = buildImp(bidRequest, context);
-  const floor = getBidFloor(bidRequest);
-  imp.tagid = bidRequest.params.placementId;
-
-  if (floor) {
-    imp.bidfloor = floor;
-    imp.bidfloorcur = DEFAULT_CURRENCY;
-  }
-
-  return imp;
-}
+const converter = createOrtbConverter(ortbConverter, BANNER, DEFAULT_CURRENCY, ortbConverterImp, ortbConverterRequest);
 
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
   supportedMediaTypes: [BANNER],
 
   // Validate bid request
-  isBidRequestValid: function (bid) {
-    return !!bid.params.placementId && !!bid.params.publisherId;
-  },
+  isBidRequestValid: commonIsBidRequestValid,
 
   // Build OpenRTB requests using `ortbConverter`
   buildRequests: function (validBidRequests, bidderRequest) {
     const context = {
-      publisherId: validBidRequests.find(
-        (bidRequest) => bidRequest.params?.publisherId
-      )?.params.publisherId,
+      publisherId: getPublisherIdFromBids(validBidRequests),
     };
+    const ortbRequestData = buildOrtbRequest(validBidRequests, bidderRequest, context, GVLID, converter);
 
-    const ortbRequest = converter.toORTB({
-      bidRequests: validBidRequests,
-      bidderRequest,
-      context,
-    });
-
-    // Add extensions to the request
-    ortbRequest.ext = ortbRequest.ext || {};
-    deepSetValue(ortbRequest, 'ext.gvlid', GVLID);
+    const blueDataProcessor = (data) => data;
+    const blueOptions = { contentType: 'application/json' };
 
-    return [
-      {
-        method: 'POST',
-        url: ENDPOINT_URL,
-        data: ortbRequest,
-        options: {
-          contentType: 'application/json',
-        },
-      },
-    ];
+    return packageOrtbRequest(ortbRequestData, ENDPOINT_URL, blueDataProcessor, blueOptions);
   },
 
   interpretResponse: (serverResponse) => {
@@ -109,41 +53,17 @@ export const spec = {
     let bids = [];
     serverResponse.body.seatbid.forEach((response) => {
       response.bid.forEach((bid) => {
-        const mediaType = bid.ext?.mediaType || 'banner';
-        bids.push({
-          ad: replaceAuctionPrice(bid.adm, bid.price),
-          adapterCode: BIDDER_CODE,
-          cpm: bid.price,
-          creativeId: bid.ext.blue.adId,
-          creative_id: bid.ext.blue.adId,
-          currency: serverResponse.body.cur || 'USD',
-          deferBilling: false,
-          deferRendering: false,
-          width: bid.w,
-          height: bid.h,
-          mediaType,
-          netRevenue: true,
-          originalCpm: bid.price,
-          originalCurrency: serverResponse.body.cur || 'USD',
-          requestId: bid.impid,
-          seatBidId: bid.id,
-          ttl: 1200,
-        });
+        const baseBid = buildBidObjectBase(bid, serverResponse.body, BIDDER_CODE, DEFAULT_CURRENCY);
+        const blueSpecific = { creativeId: bid.ext.blue.adId, creative_id: bid.ext.blue.adId, ttl: 1200 };
+        bids.push({ ...baseBid, ...blueSpecific });
       });
     });
     return bids;
   },
 
   onBidWon: function (bid) {
-    const { burl, nurl } = bid || {};
-
-    if (nurl) {
-      triggerPixel(replaceAuctionPrice(nurl, bid.originalCpm || bid.cpm));
-    }
-
-    if (burl) {
-      triggerPixel(replaceAuctionPrice(burl, bid.originalCpm || bid.cpm));
-    }
+    // replaceAuctionPrice is available in this scope due to the import from ../src/utils.js
+    commonOnBidWonHandler(bid, (url, bidData) => replaceAuctionPrice(url, bidData.originalCpm || bidData.cpm));
   },
 };