prebid.js 5.14.0 → 5.18.0

package/modules/yuktamediaAnalyticsAdapter.js

@@ -1,8 +1,8 @@
+import { getWindowLocation, generateUUID, parseUrl, buildUrl, logInfo, parseSizesInput, logError } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
 import adapter from '../src/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
-import * as utils from '../src/utils.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { getRefererInfo } from '../src/refererDetection.js';
 import strIncludes from 'core-js-pure/features/string/includes.js';
@@ -17,7 +17,7 @@ const events = {
 };
 const localStoragePrefix = 'yuktamediaAnalytics_';
 const utmTags = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content'];
-const location = utils.getWindowLocation();
+const location = getWindowLocation();
 const referer = getRefererInfo().referer;
 const _pageInfo = {
   userAgent: window.navigator.userAgent,
@@ -25,13 +25,13 @@ const _pageInfo = {
   language: window.navigator.language,
   screenWidth: window.screen.width,
   screenHeight: window.screen.height,
-  pageViewId: utils.generateUUID(),
+  pageViewId: generateUUID(),
   host: location.host,
   path: location.pathname,
   search: location.search,
   hash: location.hash,
   referer: referer,
-  refererDomain: utils.parseUrl(referer).host,
+  refererDomain: parseUrl(referer).host,
   yuktamediaAnalyticsVersion: yuktamediaAnalyticsVersion,
   prebidVersion: $$PREBID_GLOBAL$$.version
 };
@@ -53,7 +53,7 @@ function isNavigatorSendBeaconSupported() {
 
 function updateSessionId() {
   if (isSessionIdTimeoutExpired()) {
-    let newSessionId = utils.generateUUID();
+    let newSessionId = generateUUID();
     storage.setDataInLocalStorage(localStoragePrefix.concat('session_id'), newSessionId);
   }
   initOptions.sessionId = getSessionId();
@@ -80,7 +80,7 @@ function isUtmTimeoutExpired() {
 
 function send(data, status) {
   data.initOptions = Object.assign(_pageInfo, initOptions);
-  const yuktamediaAnalyticsRequestUrl = utils.buildUrl({
+  const yuktamediaAnalyticsRequestUrl = buildUrl({
     protocol: 'https',
     hostname: 'analytics-prebid.yuktamedia.com',
     pathname: '/api/bids'
@@ -97,13 +97,13 @@ var yuktamediaAnalyticsAdapter = Object.assign(adapter({ analyticsType: 'endpoin
     if (typeof args !== 'undefined') {
       switch (eventType) {
         case CONSTANTS.EVENTS.AUCTION_INIT:
-          utils.logInfo(localStoragePrefix + 'AUCTION_INIT:', JSON.stringify(args));
+          logInfo(localStoragePrefix + 'AUCTION_INIT:', JSON.stringify(args));
           if (typeof args.auctionId !== 'undefined' && args.auctionId.length) {
             events.auctions[args.auctionId] = { bids: {} };
           }
           break;
         case CONSTANTS.EVENTS.BID_REQUESTED:
-          utils.logInfo(localStoragePrefix + 'BID_REQUESTED:', JSON.stringify(args));
+          logInfo(localStoragePrefix + 'BID_REQUESTED:', JSON.stringify(args));
           if (typeof args.auctionId !== 'undefined' && args.auctionId.length) {
             if (typeof events.auctions[args.auctionId] === 'undefined') {
               events.auctions[args.auctionId] = { bids: {} };
@@ -113,7 +113,7 @@ var yuktamediaAnalyticsAdapter = Object.assign(adapter({ analyticsType: 'endpoin
               events.auctions[args.auctionId]['bids'][bidRequest.bidId] = {
                 bidder: bidRequest.bidder,
                 adUnit: bidRequest.adUnitCode,
-                sizes: utils.parseSizesInput(bidRequest.sizes).toString(),
+                sizes: parseSizesInput(bidRequest.sizes).toString(),
                 isBid: false,
                 won: false,
                 timeout: false,
@@ -132,7 +132,7 @@ var yuktamediaAnalyticsAdapter = Object.assign(adapter({ analyticsType: 'endpoin
           }
           break;
         case CONSTANTS.EVENTS.BID_RESPONSE:
-          utils.logInfo(localStoragePrefix + 'BID_RESPONSE:', JSON.stringify(args));
+          logInfo(localStoragePrefix + 'BID_RESPONSE:', JSON.stringify(args));
           if (typeof args.auctionId !== 'undefined' && args.auctionId.length) {
             if (typeof events.auctions[args.auctionId] === 'undefined') {
               events.auctions[args.auctionId] = { bids: {} };
@@ -162,7 +162,7 @@ var yuktamediaAnalyticsAdapter = Object.assign(adapter({ analyticsType: 'endpoin
           }
           break;
         case CONSTANTS.EVENTS.NO_BID:
-          utils.logInfo(localStoragePrefix + 'NO_BID:', JSON.stringify(args));
+          logInfo(localStoragePrefix + 'NO_BID:', JSON.stringify(args));
           if (typeof args.auctionId !== 'undefined' && args.auctionId.length) {
             if (typeof events.auctions[args.auctionId] === 'undefined') {
               events.auctions[args.auctionId] = { bids: {} };
@@ -173,7 +173,7 @@ var yuktamediaAnalyticsAdapter = Object.assign(adapter({ analyticsType: 'endpoin
           }
           break;
         case CONSTANTS.EVENTS.BID_WON:
-          utils.logInfo(localStoragePrefix + 'BID_WON:', JSON.stringify(args));
+          logInfo(localStoragePrefix + 'BID_WON:', JSON.stringify(args));
           if (typeof initOptions.enableSession !== 'undefined' && initOptions.enableSession) {
             updateSessionId();
           }
@@ -189,7 +189,7 @@ var yuktamediaAnalyticsAdapter = Object.assign(adapter({ analyticsType: 'endpoin
           }
           break;
         case CONSTANTS.EVENTS.BID_TIMEOUT:
-          utils.logInfo(localStoragePrefix + 'BID_TIMEOUT:', JSON.stringify(args));
+          logInfo(localStoragePrefix + 'BID_TIMEOUT:', JSON.stringify(args));
           if (args.length) {
             args.forEach(timeout => {
               if (typeof timeout !== 'undefined' && typeof timeout.auctionId !== 'undefined' && timeout.auctionId.length) {
@@ -205,7 +205,7 @@ var yuktamediaAnalyticsAdapter = Object.assign(adapter({ analyticsType: 'endpoin
           }
           break;
         case CONSTANTS.EVENTS.AUCTION_END:
-          utils.logInfo(localStoragePrefix + 'AUCTION_END:', JSON.stringify(args));
+          logInfo(localStoragePrefix + 'AUCTION_END:', JSON.stringify(args));
           if (typeof initOptions.enableSession !== 'undefined' && initOptions.enableSession) {
             updateSessionId();
           }
@@ -249,7 +249,7 @@ yuktamediaAnalyticsAdapter.originEnableAnalytics = yuktamediaAnalyticsAdapter.en
 yuktamediaAnalyticsAdapter.enableAnalytics = function (config) {
   if (config && config.options) {
     if (typeof config.options.pubId === 'undefined' || typeof config.options.pubKey === 'undefined') {
-      utils.logError('Need pubId and pubKey to log auction results. Please contact a YuktaMedia representative if you do not know your pubId and pubKey.');
+      logError('Need pubId and pubKey to log auction results. Please contact a YuktaMedia representative if you do not know your pubId and pubKey.');
       return;
     }
   }

package/modules/zeotapIdPlusIdSystem.js

@@ -4,7 +4,7 @@
  * @module modules/zeotapIdPlusIdSystem
  * @requires module:modules/userId
  */
-import * as utils from '../src/utils.js'
+import { isStr, isPlainObject } from '../src/utils.js';
 import {submodule} from '../src/hook.js';
 import { getStorageManager } from '../src/storageManager.js';
 
@@ -45,7 +45,7 @@ export const zeotapIdPlusSubmodule = {
    * @return { Object | string | undefined }
    */
   decode(value) {
-    const id = value ? utils.isStr(value) ? value : utils.isPlainObject(value) ? value.id : undefined : undefined;
+    const id = value ? isStr(value) ? value : isPlainObject(value) ? value.id : undefined : undefined;
     return id ? {
       'IDP': JSON.parse(atob(id))
     } : undefined;

package/modules/zetaBidAdapter.js

@@ -1,4 +1,4 @@
-import * as utils from '../src/utils.js';
+import { logWarn } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
 const BIDDER_CODE = 'zeta_global';
@@ -24,30 +24,30 @@ export const spec = {
     if (!(bid &&
           bid.bidId &&
           bid.params)) {
-      utils.logWarn('Invalid bid request - missing required bid data');
+      logWarn('Invalid bid request - missing required bid data');
       return false;
     }
 
     if (!(bid.params.user &&
           bid.params.user.buyeruid)) {
-      utils.logWarn('Invalid bid request - missing required user data');
+      logWarn('Invalid bid request - missing required user data');
       return false;
     }
 
     if (!(bid.params.device &&
           bid.params.device.ip)) {
-      utils.logWarn('Invalid bid request - missing required device data');
+      logWarn('Invalid bid request - missing required device data');
       return false;
     }
 
     if (!(bid.params.device.geo &&
           bid.params.device.geo.country)) {
-      utils.logWarn('Invalid bid request - missing required geo data');
+      logWarn('Invalid bid request - missing required geo data');
       return false;
     }
 
     if (!bid.params.definerId) {
-      utils.logWarn('Invalid bid request - missing required definer data');
+      logWarn('Invalid bid request - missing required definer data');
       return false;
     }
 

package/modules/zeta_global_sspBidAdapter.js

@@ -1,4 +1,4 @@
-import * as utils from '../src/utils.js';
+import { logWarn, deepSetValue, deepAccess, isArray, isNumber, isBoolean, isStr } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
@@ -51,7 +51,7 @@ export const spec = {
     if (!(bid &&
       bid.bidId &&
       bid.params)) {
-      utils.logWarn('Invalid bid request - missing required bid data');
+      logWarn('Invalid bid request - missing required bid data');
       return false;
     }
     return true;
@@ -115,13 +115,13 @@ export const spec = {
 
     // Attaching GDPR Consent Params
     if (bidderRequest && bidderRequest.gdprConsent) {
-      utils.deepSetValue(payload, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
-      utils.deepSetValue(payload, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
+      deepSetValue(payload, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(payload, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
     }
 
     // CCPA
     if (bidderRequest && bidderRequest.uspConsent) {
-      utils.deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+      deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
     }
 
     provideEids(request, payload);
@@ -219,17 +219,17 @@ function buildBanner(request) {
 
 function buildVideo(request) {
   let video = {};
-  const videoParams = utils.deepAccess(request, 'mediaTypes.video', {});
+  const videoParams = deepAccess(request, 'mediaTypes.video', {});
   for (const key in VIDEO_CUSTOM_PARAMS) {
     if (videoParams.hasOwnProperty(key)) {
       video[key] = checkParamDataType(key, videoParams[key], VIDEO_CUSTOM_PARAMS[key]);
     }
   }
   if (videoParams.playerSize) {
-    if (utils.isArray(videoParams.playerSize[0])) {
+    if (isArray(videoParams.playerSize[0])) {
       video.w = parseInt(videoParams.playerSize[0][0], 10);
       video.h = parseInt(videoParams.playerSize[0][1], 10);
-    } else if (utils.isNumber(videoParams.playerSize[0])) {
+    } else if (isNumber(videoParams.playerSize[0])) {
       video.w = parseInt(videoParams.playerSize[0], 10);
       video.h = parseInt(videoParams.playerSize[1], 10);
     }
@@ -241,28 +241,28 @@ function checkParamDataType(key, value, datatype) {
   let functionToExecute;
   switch (datatype) {
     case DATA_TYPES.BOOLEAN:
-      functionToExecute = utils.isBoolean;
+      functionToExecute = isBoolean;
       break;
     case DATA_TYPES.NUMBER:
-      functionToExecute = utils.isNumber;
+      functionToExecute = isNumber;
       break;
     case DATA_TYPES.STRING:
-      functionToExecute = utils.isStr;
+      functionToExecute = isStr;
       break;
     case DATA_TYPES.ARRAY:
-      functionToExecute = utils.isArray;
+      functionToExecute = isArray;
       break;
   }
   if (functionToExecute(value)) {
     return value;
   }
-  utils.logWarn('Ignoring param key: ' + key + ', expects ' + datatype + ', found ' + typeof value);
+  logWarn('Ignoring param key: ' + key + ', expects ' + datatype + ', found ' + typeof value);
   return undefined;
 }
 
 function provideEids(request, payload) {
   if (Array.isArray(request.userIdAsEids) && request.userIdAsEids.length > 0) {
-    utils.deepSetValue(payload, 'user.ext.eids', request.userIdAsEids);
+    deepSetValue(payload, 'user.ext.eids', request.userIdAsEids);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "5.14.0",
+  "version": "5.18.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

package/src/AnalyticsAdapter.js

@@ -1,8 +1,8 @@
 import CONSTANTS from './constants.json';
 import { ajax } from './ajax.js';
+import { logMessage, _each } from './utils.js';
 
 const events = require('./events.js');
-const utils = require('./utils.js');
 
 const {
   EVENTS: {
@@ -123,22 +123,22 @@ export default function AnalyticsAdapter({ url, analyticsType, global, handler }
         }
       };
 
-      utils._each(_handlers, (handler, event) => {
+      _each(_handlers, (handler, event) => {
         events.on(event, handler);
       });
     } else {
-      utils.logMessage(`Analytics adapter for "${global}" disabled by sampling`);
+      logMessage(`Analytics adapter for "${global}" disabled by sampling`);
     }
 
     // finally set this function to return log message, prevents multiple adapter listeners
     this._oldEnable = this.enableAnalytics;
     this.enableAnalytics = function _enable() {
-      return utils.logMessage(`Analytics adapter for "${global}" already enabled, unnecessary call to \`enableAnalytics\`.`);
+      return logMessage(`Analytics adapter for "${global}" already enabled, unnecessary call to \`enableAnalytics\`.`);
     };
   }
 
   function _disable() {
-    utils._each(_handlers, (handler, event) => {
+    _each(_handlers, (handler, event) => {
       events.off(event, handler);
     });
     this.enableAnalytics = this._oldEnable ? this._oldEnable : _enable;
@@ -158,6 +158,6 @@ export default function AnalyticsAdapter({ url, analyticsType, global, handler }
       _enableCheck = false;
     }
 
-    utils.logMessage(`event count sent to ${global}: ${_eventCount}`);
+    logMessage(`event count sent to ${global}: ${_eventCount}`);
   }
 }

package/src/Renderer.js

@@ -1,5 +1,7 @@
 import { loadExternalScript } from './adloader.js';
-import * as utils from './utils.js';
+import {
+  logError, logWarn, logMessage, deepAccess
+} from './utils.js';
 import find from 'core-js-pure/features/array/find.js';
 const moduleCode = 'outstream';
 
@@ -25,7 +27,7 @@ export function Renderer(options) {
   this.cmd = [];
   this.push = func => {
     if (typeof func !== 'function') {
-      utils.logError('Commands given to Renderer.push must be wrapped in a function');
+      logError('Commands given to Renderer.push must be wrapped in a function');
       return;
     }
     this.loaded ? func.call() : this.cmd.push(func);
@@ -44,7 +46,7 @@ export function Renderer(options) {
       if (this._render) {
         this._render.apply(this, renderArgs)
       } else {
-        utils.logWarn(`No render function was provided, please use .setRender on the renderer`);
+        logWarn(`No render function was provided, please use .setRender on the renderer`);
       }
     }
 
@@ -53,7 +55,7 @@ export function Renderer(options) {
       this.cmd.unshift(runRender) // should render run first ?
       loadExternalScript(url, moduleCode, this.callback);
     } else {
-      utils.logWarn(`External Js not loaded by Renderer since renderer url and callback is already defined on adUnit ${adUnitCode}`);
+      logWarn(`External Js not loaded by Renderer since renderer url and callback is already defined on adUnit ${adUnitCode}`);
       runRender()
     }
   }.bind(this) // bind the function to this object to avoid 'this' errors
@@ -80,7 +82,7 @@ Renderer.prototype.handleVideoEvent = function({ id, eventName }) {
     this.handlers[eventName]();
   }
 
-  utils.logMessage(`Prebid Renderer event for id ${id} type ${eventName}`);
+  logMessage(`Prebid Renderer event for id ${id} type ${eventName}`);
 };
 
 /*
@@ -92,7 +94,7 @@ Renderer.prototype.process = function() {
     try {
       this.cmd.shift().call();
     } catch (error) {
-      utils.logError('Error processing Renderer command: ', error);
+      logError('Error processing Renderer command: ', error);
     }
   }
 };
@@ -126,11 +128,11 @@ function isRendererPreferredFromAdUnit(adUnitCode) {
   }
 
   // renderer defined at adUnit level
-  const adUnitRenderer = utils.deepAccess(adUnit, 'renderer');
+  const adUnitRenderer = deepAccess(adUnit, 'renderer');
   const hasValidAdUnitRenderer = !!(adUnitRenderer && adUnitRenderer.url && adUnitRenderer.render);
 
   // renderer defined at adUnit.mediaTypes level
-  const mediaTypeRenderer = utils.deepAccess(adUnit, 'mediaTypes.video.renderer');
+  const mediaTypeRenderer = deepAccess(adUnit, 'mediaTypes.video.renderer');
   const hasValidMediaTypeRenderer = !!(mediaTypeRenderer && mediaTypeRenderer.url && mediaTypeRenderer.render)
 
   return !!(