prebid.js 5.14.0 → 5.18.0

package/modules/medianetBidAdapter.js

@@ -1,5 +1,5 @@
+import { parseUrl, getWindowTop, isArray, getGptSlotInfoForAdUnitCode, isStr, deepAccess, isEmpty, logError, triggerPixel, buildUrl, isEmptyStr, logInfo } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import * as utils from '../src/utils.js';
 import { config } from '../src/config.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { getRefererInfo } from '../src/refererDetection.js';
@@ -27,7 +27,7 @@ window.mnet = window.mnet || {};
 window.mnet.queue = window.mnet.queue || [];
 
 mnData.urlData = {
-  domain: utils.parseUrl(refererInfo.referer).hostname,
+  domain: parseUrl(refererInfo.referer).hostname,
   page: refererInfo.referer,
   isTop: refererInfo.reachedTop
 }
@@ -78,7 +78,7 @@ function getUrlFromSelector(selector, attribute) {
 
 function getAttributeFromSelector(selector, attribute) {
   try {
-    let doc = utils.getWindowTop().document;
+    let doc = getWindowTop().document;
     let element = doc.querySelector(selector);
     if (element !== null && element[attribute]) {
       return element[attribute];
@@ -87,7 +87,7 @@ function getAttributeFromSelector(selector, attribute) {
 }
 
 function getAbsoluteUrl(url) {
-  let aTag = utils.getWindowTop().document.createElement('a');
+  let aTag = getWindowTop().document.createElement('a');
   aTag.href = url;
 
   return aTag.href;
@@ -98,7 +98,7 @@ function filterUrlsByType(urls, type) {
 }
 
 function transformSizes(sizes) {
-  if (utils.isArray(sizes) && sizes.length === 2 && !utils.isArray(sizes[0])) {
+  if (isArray(sizes) && sizes.length === 2 && !isArray(sizes[0])) {
     return [getSize(sizes)];
   }
 
@@ -123,8 +123,8 @@ function getCoordinates(adUnitCode) {
   let element = document.getElementById(adUnitCode);
   if (!element && adUnitCode.indexOf('/') !== -1) {
     // now it means that adUnitCode is GAM AdUnitPath
-    const {divId} = utils.getGptSlotInfoForAdUnitCode(adUnitCode);
-    if (utils.isStr(divId)) {
+    const {divId} = getGptSlotInfoForAdUnitCode(adUnitCode);
+    if (isStr(divId)) {
       element = document.getElementById(divId);
     }
   }
@@ -145,11 +145,11 @@ function getCoordinates(adUnitCode) {
 }
 
 function extParams(bidRequest, bidderRequests) {
-  const params = utils.deepAccess(bidRequest, 'params');
-  const gdpr = utils.deepAccess(bidderRequests, 'gdprConsent');
-  const uspConsent = utils.deepAccess(bidderRequests, 'uspConsent');
-  const userId = utils.deepAccess(bidRequest, 'userId');
-  const sChain = utils.deepAccess(bidRequest, 'schain') || {};
+  const params = deepAccess(bidRequest, 'params');
+  const gdpr = deepAccess(bidderRequests, 'gdprConsent');
+  const uspConsent = deepAccess(bidderRequests, 'uspConsent');
+  const userId = deepAccess(bidRequest, 'userId');
+  const sChain = deepAccess(bidRequest, 'schain') || {};
   const windowSize = spec.getWindowSize();
   const gdprApplies = !!(gdpr && gdpr.gdprApplies);
   const uspApplies = !!(uspConsent);
@@ -165,7 +165,7 @@ function extParams(bidRequest, bidderRequests) {
     windowSize.w !== -1 && windowSize.h !== -1 && { screen: windowSize },
     userId && { user_id: userId },
     $$PREBID_GLOBAL$$.medianetGlobals.analyticsEnabled && { analytics: true },
-    !utils.isEmpty(sChain) && {schain: sChain}
+    !isEmpty(sChain) && {schain: sChain}
   );
 }
 
@@ -179,13 +179,18 @@ function slotParams(bidRequest) {
     },
     all: bidRequest.params
   };
-  let bannerSizes = utils.deepAccess(bidRequest, 'mediaTypes.banner.sizes') || [];
 
-  const videoInMediaType = utils.deepAccess(bidRequest, 'mediaTypes.video') || {};
-  const videoInParams = utils.deepAccess(bidRequest, 'params.video') || {};
+  if (bidRequest.ortb2Imp) {
+    params.ortb2Imp = bidRequest.ortb2Imp;
+  }
+
+  let bannerSizes = deepAccess(bidRequest, 'mediaTypes.banner.sizes') || [];
+
+  const videoInMediaType = deepAccess(bidRequest, 'mediaTypes.video') || {};
+  const videoInParams = deepAccess(bidRequest, 'params.video') || {};
   const videoCombinedObj = Object.assign({}, videoInParams, videoInMediaType);
 
-  if (!utils.isEmpty(videoCombinedObj)) {
+  if (!isEmpty(videoCombinedObj)) {
     params.video = videoCombinedObj;
   }
 
@@ -196,7 +201,7 @@ function slotParams(bidRequest) {
     try {
       params.native = JSON.stringify(bidRequest.nativeParams);
     } catch (e) {
-      utils.logError((`${BIDDER_CODE} : Incorrect JSON : bidRequest.nativeParams`));
+      logError((`${BIDDER_CODE} : Incorrect JSON : bidRequest.nativeParams`));
     }
   }
 
@@ -314,8 +319,8 @@ function isValidBid(bid) {
 }
 
 function fetchCookieSyncUrls(response) {
-  if (!utils.isEmpty(response) && response[0].body &&
-    response[0].body.ext && utils.isArray(response[0].body.ext.csUrl)) {
+  if (!isEmpty(response) && response[0].body &&
+    response[0].body.ext && isArray(response[0].body.ext.csUrl)) {
     return response[0].body.ext.csUrl;
   }
 
@@ -323,15 +328,15 @@ function fetchCookieSyncUrls(response) {
 }
 
 function getLoggingData(event, data) {
-  data = (utils.isArray(data) && data) || [];
+  data = (isArray(data) && data) || [];
 
   let params = {};
   params.logid = 'kfk';
   params.evtid = 'projectevents';
   params.project = 'prebid';
-  params.acid = utils.deepAccess(data, '0.auctionId') || '';
+  params.acid = deepAccess(data, '0.auctionId') || '';
   params.cid = $$PREBID_GLOBAL$$.medianetGlobals.cid || '';
-  params.crid = data.map((adunit) => utils.deepAccess(adunit, 'params.0.crid') || adunit.adUnitCode).join('|');
+  params.crid = data.map((adunit) => deepAccess(adunit, 'params.0.crid') || adunit.adUnitCode).join('|');
   params.adunit_count = data.length || 0;
   params.dn = mnData.urlData.domain || '';
   params.requrl = mnData.urlData.page || '';
@@ -349,7 +354,7 @@ function logEvent (event, data) {
     hostname: EVENT_PIXEL_URL,
     search: getLoggingData(event, data)
   };
-  utils.triggerPixel(utils.buildUrl(getParams));
+  triggerPixel(buildUrl(getParams));
 }
 
 function clearMnData() {
@@ -357,8 +362,8 @@ function clearMnData() {
 }
 
 function addRenderer(bid) {
-  const videoContext = utils.deepAccess(bid, 'context') || '';
-  const vastTimeout = utils.deepAccess(bid, 'vto');
+  const videoContext = deepAccess(bid, 'context') || '';
+  const vastTimeout = deepAccess(bid, 'vto');
   /* Adding renderer only when the context is Outstream
      and the provider has responded with a renderer.
    */
@@ -384,7 +389,7 @@ function newVideoRenderer(bid) {
         mute: bid.mt
       }
       const adUnitCode = bid.dfp_id;
-      const divId = utils.getGptSlotInfoForAdUnitCode(adUnitCode).divId || adUnitCode;
+      const divId = getGptSlotInfoForAdUnitCode(adUnitCode).divId || adUnitCode;
       window.mnet.mediaNetoutstreamPlayer(bid, divId, obj);
     });
   });
@@ -405,12 +410,12 @@ export const spec = {
    */
   isBidRequestValid: function(bid) {
     if (!bid.params) {
-      utils.logError(`${BIDDER_CODE} : Missing bid parameters`);
+      logError(`${BIDDER_CODE} : Missing bid parameters`);
       return false;
     }
 
-    if (!bid.params.cid || !utils.isStr(bid.params.cid) || utils.isEmptyStr(bid.params.cid)) {
-      utils.logError(`${BIDDER_CODE} : cid should be a string`);
+    if (!bid.params.cid || !isStr(bid.params.cid) || isEmptyStr(bid.params.cid)) {
+      logError(`${BIDDER_CODE} : cid should be a string`);
       return false;
     }
 
@@ -445,13 +450,13 @@ export const spec = {
     let validBids = [];
 
     if (!serverResponse || !serverResponse.body) {
-      utils.logInfo(`${BIDDER_CODE} : response is empty`);
+      logInfo(`${BIDDER_CODE} : response is empty`);
       return validBids;
     }
 
     let bids = serverResponse.body.bidList;
-    if (!utils.isArray(bids) || bids.length === 0) {
-      utils.logInfo(`${BIDDER_CODE} : no bids`);
+    if (!isArray(bids) || bids.length === 0) {
+      logInfo(`${BIDDER_CODE} : no bids`);
       return validBids;
     }
     validBids = bids.filter(bid => isValidBid(bid));

package/modules/medianetRtdProvider.js

@@ -1,5 +1,5 @@
+import { isStr, isEmptyStr, logError, mergeDeep, isFn, insertElement } from '../src/utils.js';
 import { submodule } from '../src/hook.js';
-import * as utils from '../src/utils.js';
 import { getGlobal } from '../src/prebidGlobal.js';
 import includes from 'core-js-pure/features/array/includes.js';
 
@@ -15,8 +15,8 @@ window.mnjs.que = window.mnjs.que || [];
 
 function init(config) {
   const customerId = config.params && config.params.cid;
-  if (!customerId || !utils.isStr(customerId) || utils.isEmptyStr(customerId)) {
-    utils.logError(`${SOURCE}: cid should be a string`);
+  if (!customerId || !isStr(customerId) || isEmptyStr(customerId)) {
+    logError(`${SOURCE}: cid should be a string`);
     return false;
   }
 
@@ -40,8 +40,8 @@ function getBidRequestData(requestBidsProps, callback, config, userConsent) {
     const success = (adUnitProps, openRtbProps) => {
       adUnits.forEach(adUnit => {
         adUnit[OPEN_RTB_FIELD] = adUnit[OPEN_RTB_FIELD] || {};
-        utils.mergeDeep(adUnit[OPEN_RTB_FIELD], openRtbProps[adUnit.code]);
-        utils.mergeDeep(adUnit, adUnitProps[adUnit.code]);
+        mergeDeep(adUnit[OPEN_RTB_FIELD], openRtbProps[adUnit.code]);
+        mergeDeep(adUnit, adUnitProps[adUnit.code]);
       });
       callback();
     };
@@ -61,7 +61,7 @@ function onAuctionInitEvent(auctionInit) {
 function getTargetingData(adUnitCode) {
   const adUnits = getAdUnits(undefined, adUnitCode);
   let targetingData = {};
-  if (window.mnjs.loaded && utils.isFn(window.mnjs.getTargetingData)) {
+  if (window.mnjs.loaded && isFn(window.mnjs.getTargetingData)) {
     targetingData = window.mnjs.getTargetingData(adUnitCode, adUnits, SOURCE) || {};
   }
   const targeting = {};
@@ -86,7 +86,7 @@ function loadRtdScript(customerId) {
   script.type = 'text/javascript';
   script.async = true;
   script.src = getClientUrl(customerId, window.location.hostname);
-  utils.insertElement(script, window.document, 'head');
+  insertElement(script, window.document, 'head');
 }
 
 function getAdUnits(adUnits, adUnitCodes) {

package/modules/merkleIdSystem.js

@@ -5,7 +5,7 @@
  * @requires module:modules/userId
  */
 
-import * as utils from '../src/utils.js'
+import { logInfo, logError, logWarn } from '../src/utils.js';
 import * as ajaxLib from '../src/ajax.js';
 import {submodule} from '../src/hook.js'
 import {getStorageManager} from '../src/storageManager.js';
@@ -34,7 +34,7 @@ function setCookie(name, value, expires) {
 }
 
 function setSession(storage, response) {
-  utils.logInfo('Merkle setting session ');
+  logInfo('Merkle setting session ');
   if (response && response.c && response.c.value && typeof response.c.value === 'string') {
     setCookie(SESSION_COOKIE_NAME, response.c.value, storage.expires);
   }
@@ -46,7 +46,7 @@ function constructUrl(configParams) {
   if (session) {
     url = `${url}&sv_session=${session}`;
   }
-  utils.logInfo('Merkle url :' + url);
+  logInfo('Merkle url :' + url);
   return url;
 }
 
@@ -62,19 +62,19 @@ function generateId(configParams, configStorage) {
           try {
             responseObj = JSON.parse(response);
             setSession(configStorage, responseObj)
-            utils.logInfo('Merkle responseObj ' + JSON.stringify(responseObj));
+            logInfo('Merkle responseObj ' + JSON.stringify(responseObj));
           } catch (error) {
-            utils.logError(error);
+            logError(error);
           }
         }
 
         const date = new Date().toUTCString();
         responseObj.date = date;
-        utils.logInfo('Merkle responseObj with date ' + JSON.stringify(responseObj));
+        logInfo('Merkle responseObj with date ' + JSON.stringify(responseObj));
         callback(responseObj);
       },
       error => {
-        utils.logError(`${MODULE_NAME}: merkleId fetch encountered an error`, error);
+        logError(`${MODULE_NAME}: merkleId fetch encountered an error`, error);
         callback();
       },
       {method: 'GET', withCredentials: true}
@@ -98,7 +98,7 @@ export const merkleIdSubmodule = {
    */
   decode(value) {
     const id = (value && value.pam_id && typeof value.pam_id.id === 'string') ? value.pam_id : undefined;
-    utils.logInfo('Merkle id ' + JSON.stringify(id));
+    logInfo('Merkle id ' + JSON.stringify(id));
     return id ? {'merkleId': id} : undefined;
   },
   /**
@@ -109,31 +109,31 @@ export const merkleIdSubmodule = {
    * @returns {IdResponse|undefined}
    */
   getId(config, consentData) {
-    utils.logInfo('User ID - merkleId generating id');
+    logInfo('User ID - merkleId generating id');
 
     const configParams = (config && config.params) || {};
 
     if (!configParams || typeof configParams.vendor !== 'string') {
-      utils.logError('User ID - merkleId submodule requires a valid vendor to be defined');
+      logError('User ID - merkleId submodule requires a valid vendor to be defined');
       return;
     }
 
     if (typeof configParams.sv_cid !== 'string') {
-      utils.logError('User ID - merkleId submodule requires a valid sv_cid string to be defined');
+      logError('User ID - merkleId submodule requires a valid sv_cid string to be defined');
       return;
     }
 
     if (typeof configParams.sv_pubid !== 'string') {
-      utils.logError('User ID - merkleId submodule requires a valid sv_pubid string to be defined');
+      logError('User ID - merkleId submodule requires a valid sv_pubid string to be defined');
       return;
     }
 
     if (consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies) {
-      utils.logError('User ID - merkleId submodule does not currently handle consent strings');
+      logError('User ID - merkleId submodule does not currently handle consent strings');
       return;
     }
     if (typeof configParams.endpoint !== 'string') {
-      utils.logWarn('User ID - merkleId submodule endpoint string is not defined');
+      logWarn('User ID - merkleId submodule endpoint string is not defined');
       configParams.endpoint = ID_URL
     }
 
@@ -146,11 +146,11 @@ export const merkleIdSubmodule = {
     return {callback: resp};
   },
   extendId: function (config = {}, consentData, storedId) {
-    utils.logInfo('User ID - merkleId stored id ' + storedId);
+    logInfo('User ID - merkleId stored id ' + storedId);
     const configParams = (config && config.params) || {};
 
     if (consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies) {
-      utils.logError('User ID - merkleId submodule does not currently handle consent strings');
+      logError('User ID - merkleId submodule does not currently handle consent strings');
       return;
     }
 
@@ -164,19 +164,19 @@ export const merkleIdSubmodule = {
     let refreshInSeconds = DEFAULT_REFRESH;
     if (configParams && configParams.refreshInSeconds && typeof configParams.refreshInSeconds === 'number') {
       refreshInSeconds = configParams.refreshInSeconds;
-      utils.logInfo('User ID - merkleId param refreshInSeconds' + refreshInSeconds);
+      logInfo('User ID - merkleId param refreshInSeconds' + refreshInSeconds);
     }
     const storedDate = new Date(storedId.date);
     let refreshNeeded = false;
     if (storedDate) {
       refreshNeeded = storedDate && (Date.now() - storedDate.getTime() > refreshInSeconds * 1000);
       if (refreshNeeded) {
-        utils.logInfo('User ID - merkleId needs refreshing id');
+        logInfo('User ID - merkleId needs refreshing id');
         const resp = generateId(configParams, configStorage)
         return {callback: resp};
       }
     }
-    utils.logInfo('User ID - merkleId not refreshed');
+    logInfo('User ID - merkleId not refreshed');
     return {id: storedId};
   }