prebid.js 7.47.0 → 7.48.0

package/modules/ttdBidAdapter.js

@@ -185,7 +185,7 @@ function getImpression(bidRequest) {
   if (mediaTypesBanner) {
     mediaTypes[BANNER] = banner(bidRequest);
   }
-  if (mediaTypesVideo) {
+  if (FEATURES.VIDEO && mediaTypesVideo) {
     mediaTypes[VIDEO] = video(bidRequest);
   }
 
@@ -248,79 +248,81 @@ function banner(bid) {
 }
 
 function video(bid) {
-  let minduration = utils.deepAccess(bid, 'mediaTypes.video.minduration');
-  const maxduration = utils.deepAccess(bid, 'mediaTypes.video.maxduration');
-  const playerSize = utils.deepAccess(bid, 'mediaTypes.video.playerSize');
-  const api = utils.deepAccess(bid, 'mediaTypes.video.api');
-  const mimes = utils.deepAccess(bid, 'mediaTypes.video.mimes');
-  const placement = utils.deepAccess(bid, 'mediaTypes.video.placement');
-  const plcmt = utils.deepAccess(bid, 'mediaTypes.video.plcmt');
-  const protocols = utils.deepAccess(bid, 'mediaTypes.video.protocols');
-  const playbackmethod = utils.deepAccess(bid, 'mediaTypes.video.playbackmethod');
-  const pos = utils.deepAccess(bid, 'mediaTypes.video.pos');
-  const startdelay = utils.deepAccess(bid, 'mediaTypes.video.startdelay');
-  const skip = utils.deepAccess(bid, 'mediaTypes.video.skip');
-  const skipmin = utils.deepAccess(bid, 'mediaTypes.video.skipmin');
-  const skipafter = utils.deepAccess(bid, 'mediaTypes.video.skipafter');
-  const minbitrate = utils.deepAccess(bid, 'mediaTypes.video.minbitrate');
-  const maxbitrate = utils.deepAccess(bid, 'mediaTypes.video.maxbitrate');
-
-  if (!minduration || !utils.isInteger(minduration)) {
-    minduration = 0;
-  }
-  let video = {
-    minduration: minduration,
-    maxduration: maxduration,
-    api: api,
-    mimes: mimes,
-    placement: placement,
-    protocols: protocols
-  };
+  if (FEATURES.VIDEO) {
+    let minduration = utils.deepAccess(bid, 'mediaTypes.video.minduration');
+    const maxduration = utils.deepAccess(bid, 'mediaTypes.video.maxduration');
+    const playerSize = utils.deepAccess(bid, 'mediaTypes.video.playerSize');
+    const api = utils.deepAccess(bid, 'mediaTypes.video.api');
+    const mimes = utils.deepAccess(bid, 'mediaTypes.video.mimes');
+    const placement = utils.deepAccess(bid, 'mediaTypes.video.placement');
+    const plcmt = utils.deepAccess(bid, 'mediaTypes.video.plcmt');
+    const protocols = utils.deepAccess(bid, 'mediaTypes.video.protocols');
+    const playbackmethod = utils.deepAccess(bid, 'mediaTypes.video.playbackmethod');
+    const pos = utils.deepAccess(bid, 'mediaTypes.video.pos');
+    const startdelay = utils.deepAccess(bid, 'mediaTypes.video.startdelay');
+    const skip = utils.deepAccess(bid, 'mediaTypes.video.skip');
+    const skipmin = utils.deepAccess(bid, 'mediaTypes.video.skipmin');
+    const skipafter = utils.deepAccess(bid, 'mediaTypes.video.skipafter');
+    const minbitrate = utils.deepAccess(bid, 'mediaTypes.video.minbitrate');
+    const maxbitrate = utils.deepAccess(bid, 'mediaTypes.video.maxbitrate');
+
+    if (!minduration || !utils.isInteger(minduration)) {
+      minduration = 0;
+    }
+    let video = {
+      minduration: minduration,
+      maxduration: maxduration,
+      api: api,
+      mimes: mimes,
+      placement: placement,
+      protocols: protocols
+    };
 
-  if (typeof playerSize !== 'undefined') {
-    if (utils.isArray(playerSize[0])) {
-      video.w = parseInt(playerSize[0][0]);
-      video.h = parseInt(playerSize[0][1]);
-    } else if (utils.isNumber(playerSize[0])) {
-      video.w = parseInt(playerSize[0]);
-      video.h = parseInt(playerSize[1]);
+    if (typeof playerSize !== 'undefined') {
+      if (utils.isArray(playerSize[0])) {
+        video.w = parseInt(playerSize[0][0]);
+        video.h = parseInt(playerSize[0][1]);
+      } else if (utils.isNumber(playerSize[0])) {
+        video.w = parseInt(playerSize[0]);
+        video.h = parseInt(playerSize[1]);
+      }
     }
-  }
 
-  if (playbackmethod) {
-    video.playbackmethod = playbackmethod;
-  }
-  if (plcmt) {
-    video.plcmt = plcmt;
-  }
-  if (pos) {
-    video.pos = pos;
-  }
-  if (startdelay && utils.isInteger(startdelay)) {
-    video.startdelay = startdelay;
-  }
-  if (skip && (skip === 0 || skip === 1)) {
-    video.skip = skip;
-  }
-  if (skipmin && utils.isInteger(skipmin)) {
-    video.skipmin = skipmin;
-  }
-  if (skipafter && utils.isInteger(skipafter)) {
-    video.skipafter = skipafter;
-  }
-  if (minbitrate && utils.isInteger(minbitrate)) {
-    video.minbitrate = minbitrate;
-  }
-  if (maxbitrate && utils.isInteger(maxbitrate)) {
-    video.maxbitrate = maxbitrate;
-  }
+    if (playbackmethod) {
+      video.playbackmethod = playbackmethod;
+    }
+    if (plcmt) {
+      video.plcmt = plcmt;
+    }
+    if (pos) {
+      video.pos = pos;
+    }
+    if (startdelay && utils.isInteger(startdelay)) {
+      video.startdelay = startdelay;
+    }
+    if (skip && (skip === 0 || skip === 1)) {
+      video.skip = skip;
+    }
+    if (skipmin && utils.isInteger(skipmin)) {
+      video.skipmin = skipmin;
+    }
+    if (skipafter && utils.isInteger(skipafter)) {
+      video.skipafter = skipafter;
+    }
+    if (minbitrate && utils.isInteger(minbitrate)) {
+      video.minbitrate = minbitrate;
+    }
+    if (maxbitrate && utils.isInteger(maxbitrate)) {
+      video.maxbitrate = maxbitrate;
+    }
 
-  const battr = utils.deepAccess(bid, 'ortb2Imp.battr');
-  if (battr) {
-    video.battr = battr;
-  }
+    const battr = utils.deepAccess(bid, 'ortb2Imp.battr');
+    if (battr) {
+      video.battr = battr;
+    }
 
-  return video;
+    return video;
+  }
 }
 
 export const spec = {
@@ -379,7 +381,7 @@ export const spec = {
       return false;
     }
 
-    if (mediaTypesVideo) {
+    if (FEATURES.VIDEO && mediaTypesVideo) {
       if (!mediaTypesVideo.maxduration || !utils.isInteger(mediaTypesVideo.maxduration)) {
         utils.logWarn(BIDDER_CODE + ': mediaTypes.video.maxduration must be set to the maximum video ad duration in seconds');
         return false;
@@ -506,7 +508,7 @@ export const spec = {
               mediaType: BANNER
             }
           );
-        } else if (bid.ext.mediatype === MEDIA_TYPE.VIDEO) {
+        } else if (FEATURES.VIDEO && bid.ext.mediatype === MEDIA_TYPE.VIDEO) {
           Object.assign(
             bidResponse,
             {

package/modules/underdogmediaBidAdapter.js

@@ -1,21 +1,18 @@
 import {
-  logMessage,
+  deepAccess,
   flatten,
-  parseSizesInput,
+  getWindowSelf,
+  getWindowTop,
   isGptPubadsDefined,
   isSlotMatchingAdUnitCode,
   logInfo,
+  logMessage,
   logWarn,
-  getWindowSelf,
-  getWindowTop,
-  deepAccess
+  parseSizesInput
 } from '../src/utils.js';
-import {
-  config
-} from '../src/config.js';
-import {
-  registerBidder
-} from '../src/adapters/bidderFactory.js';
+import {config} from '../src/config.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+
 const BIDDER_CODE = 'underdogmedia';
 const UDM_ADAPTER_VERSION = '7.30V';
 const UDM_VENDOR_ID = '159';
@@ -377,7 +374,7 @@ function makeNotification(bid, mid, bidParam) {
   url += `;version=${UDM_ADAPTER_VERSION}`;
   url += ';cb=' + Math.random();
   url += ';qqq=' + (1 / bid.cpm);
-  url += ';hbt=' + config.getConfig('_bidderTimeout');
+  url += ';hbt=' + config.getConfig('bidderTimeout');
   url += ';style=adapter';
   url += ';vis=' + encodeURIComponent(document.visibilityState);
 

package/modules/userId/index.js

@@ -1085,7 +1085,7 @@ module('userId', attachIdSystem);
 
 export function setOrtbUserExtEids(ortbRequest, bidderRequest, context) {
   const eids = deepAccess(context, 'bidRequests.0.userIdAsEids');
-  if (eids) {
+  if (eids && Object.keys(eids).length > 0) {
     deepSetValue(ortbRequest, 'user.ext.eids', eids);
   }
 }

package/modules/vdoaiBidAdapter.js

@@ -1,5 +1,4 @@
-import { getAdUnitSizes } from '../src/utils.js';
-import {config} from '../src/config.js';
+import {getAdUnitSizes} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 
@@ -87,7 +86,7 @@ export const spec = {
         // dealId: dealId,
         currency: currency,
         netRevenue: netRevenue,
-        ttl: config.getConfig('_bidderTimeout'),
+        ttl: 60,
         // referrer: referrer,
         // ad: response.adm
         // ad: adCreative,

package/modules/wipesBidAdapter.js

@@ -1,5 +1,4 @@
-import { logWarn } from '../src/utils.js';
-import {config} from '../src/config.js';
+import {logWarn} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
 
@@ -50,7 +49,7 @@ function interpretResponse(serverResponse, bidRequest) {
       dealId: response.deal_id,
       currency: 'JPY',
       netRevenue: netRevenue,
-      ttl: config.getConfig('_bidderTimeout'),
+      ttl: 60,
       referrer: bidRequest.data.r || '',
       mediaType: BANNER,
       ad: response.ad_tag,

package/modules/yieldoneBidAdapter.js

@@ -1,8 +1,7 @@
 import {deepAccess, isEmpty, isStr, logWarn, parseSizesInput} from '../src/utils.js';
-import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { Renderer } from '../src/Renderer.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import {Renderer} from '../src/Renderer.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
 
 /**
  * @typedef {import('../src/adapters/bidderFactory').Bid} Bid
@@ -147,7 +146,7 @@ export const spec = {
         dealId: dealId,
         currency: currency,
         netRevenue: netRevenue,
-        ttl: config.getConfig('_bidderTimeout'),
+        ttl: 60,
         referrer: referrer,
         meta: {
           advertiserDomains: response.adomain ? response.adomain : []

package/package.json

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

package/test/spec/modules/adlooxAdServerVideo_spec.js

@@ -118,6 +118,16 @@ describe('Adloox Ad Server Video', function () {
   });
 
   describe('buildVideoUrl', function () {
+    beforeEach(() => {
+      sinon.stub(URL, 'createObjectURL');
+      sinon.stub(URL, 'revokeObjectURL');
+    });
+
+    afterEach(() => {
+      URL.createObjectURL.restore()
+      URL.revokeObjectURL.restore()
+    });
+
     describe('invalid arguments', function () {
       it('should require callback', function (done) {
         const ret = buildVideoUrl();
@@ -235,7 +245,6 @@ describe('Adloox Ad Server Video', function () {
       it('should fetch, retry on withoutCredentials, follow and return a wrapped blob that expires', function (done) {
         BID.responseTimestamp = utils.timestamp();
         BID.ttl = 30;
-        this.timeout(5000)
 
         const clock = sandbox.useFakeTimers(BID.responseTimestamp);
 
@@ -244,42 +253,16 @@ describe('Adloox Ad Server Video', function () {
           url: wrapperUrl,
           bid: BID
         };
+
+        URL.createObjectURL.callsFake(() => 'mock-blob-url');
+
         const ret = buildVideoUrl(options, function (url) {
           expect(url.substr(0, options.url_vast.length)).is.equal(options.url_vast);
-
-          const match = url.match(/[?&]vast=(blob%3A[^&]+)/);
-          expect(match).is.not.null;
-
-          const blob = decodeURIComponent(match[1]);
-
-          const xfr = sandbox.useFakeXMLHttpRequest();
-          xfr.useFilters = true;
-          xfr.addFilter(x => true);	// there is no network traffic for Blob URLs here
-
-          ajax(blob, {
-            success: (responseText, q) => {
-              expect(q.status).is.equal(200);
-              expect(q.getResponseHeader('content-type')).is.equal(vastHeaders['content-type']);
-
-              clock.runAll();
-
-              ajax(blob, {
-                success: (responseText, q) => {
-                  xfr.useFilters = false;		// .restore() does not really work
-                  if (q.status == 0) return done();
-                  done(new Error('Blob should have expired'));
-                },
-                error: (statusText, q) => {
-                  xfr.useFilters = false;
-                  done();
-                }
-              });
-            },
-            error: (statusText, q) => {
-              xfr.useFilters = false;
-              done(new Error(statusText));
-            }
-          });
+          expect(url).to.match(/[?&]vast=mock-blob-url/);
+          sinon.assert.calledWith(URL.createObjectURL, sinon.match((val) => val.type === vastHeaders['content-type']));
+          clock.runAll();
+          sinon.assert.calledWith(URL.revokeObjectURL, 'mock-blob-url');
+          done();
         });
         expect(ret).is.true;
 

package/test/spec/modules/admaticBidAdapter_spec.js

@@ -22,11 +22,13 @@ describe('admaticBidAdapter', () => {
         'host': 'layer.serve.admatic.com.tr'
       },
       'adUnitCode': 'adunit-code',
+      'mediaType': 'banner',
       'sizes': [[300, 250], [300, 600]],
       'bidId': '30b31c1838de1e',
       'bidderRequestId': '22edbae2733bf6',
       'auctionId': '1d1a030790a475',
-      'creativeId': 'er2ee'
+      'creativeId': 'er2ee',
+      'ortb2': { 'badv': ['admatic.com.tr'] }
     };
 
     it('should return true when required params found', function() {
@@ -34,15 +36,11 @@ describe('admaticBidAdapter', () => {
     });
 
     it('should return false when required params are not passed', function() {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-
-      bid.params = {
-        'networkId': 0,
-        'host': 'layer.serve.admatic.com.tr'
+      let bid2 = {};
+      bid2.params = {
+        'someIncorrectParam': 0
       };
-
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(bid2)).to.equal(false);
     });
   });
 
@@ -54,6 +52,7 @@ describe('admaticBidAdapter', () => {
           'networkId': 10433394,
           'host': 'layer.serve.admatic.com.tr'
         },
+        'ortb2': { 'badv': ['admatic.com.tr'] },
         'mediaTypes': {
           'banner': {
             'sizes': [[300, 250], [728, 90]]
@@ -98,6 +97,8 @@ describe('admaticBidAdapter', () => {
                 'h': 90
               }
             ],
+            'mediatype': {},
+            'type': 'banner',
             'id': '2205da7a81846b',
             'floors': {
               'banner': {
@@ -105,6 +106,49 @@ describe('admaticBidAdapter', () => {
                 '728x90': { 'currency': 'USD', 'floor': 2 }
               }
             }
+          },
+          {
+            'size': [
+              {
+                'w': 338,
+                'h': 280
+              }
+            ],
+            'type': 'video',
+            'mediatype': {
+              'context': 'instream',
+              'mimes': [
+                'video/mp4'
+              ],
+              'maxduration': 240,
+              'api': [
+                1,
+                2
+              ],
+              'playerSize': [
+                [
+                  338,
+                  280
+                ]
+              ],
+              'protocols': [
+                1,
+                2,
+                3,
+                4,
+                5,
+                6,
+                7,
+                8
+              ],
+              'skip': 1,
+              'playbackmethod': [
+                2
+              ],
+              'linearity': 1,
+              'placement': 2
+            },
+            'id': '45e86fc7ce7fc93'
           }
         ],
         'ext': {
@@ -118,6 +162,7 @@ describe('admaticBidAdapter', () => {
           'networkId': 10433394,
           'host': 'layer.serve.admatic.com.tr'
         },
+        'ortb2': { 'badv': ['admatic.com.tr'] },
         'mediaTypes': {
           'banner': {
             'sizes': [[300, 250], [728, 90]]
@@ -163,12 +208,57 @@ describe('admaticBidAdapter', () => {
               }
             ],
             'id': '2205da7a81846b',
+            'mediatype': {},
+            'type': 'banner',
             'floors': {
               'banner': {
                 '300x250': { 'currency': 'USD', 'floor': 1 },
                 '728x90': { 'currency': 'USD', 'floor': 2 }
               }
             }
+          },
+          {
+            'size': [
+              {
+                'w': 338,
+                'h': 280
+              }
+            ],
+            'type': 'video',
+            'mediatype': {
+              'context': 'instream',
+              'mimes': [
+                'video/mp4'
+              ],
+              'maxduration': 240,
+              'api': [
+                1,
+                2
+              ],
+              'playerSize': [
+                [
+                  338,
+                  280
+                ]
+              ],
+              'protocols': [
+                1,
+                2,
+                3,
+                4,
+                5,
+                6,
+                7,
+                8
+              ],
+              'skip': 1,
+              'playbackmethod': [
+                2
+              ],
+              'linearity': 1,
+              'placement': 2
+            },
+            'id': '45e86fc7ce7fc93'
           }
         ],
         'ext': {
@@ -194,6 +284,7 @@ describe('admaticBidAdapter', () => {
               'sizes': [[300, 250], [728, 90]]
             }
           },
+          'ortb2': { 'badv': ['admatic.com.tr'] },
           getFloor: inputParams => {
             if (inputParams.mediaType === BANNER && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
               return {
@@ -217,6 +308,7 @@ describe('admaticBidAdapter', () => {
           'networkId': 10433394,
           'host': 'layer.serve.admatic.com.tr'
         },
+        'ortb2': { 'badv': ['admatic.com.tr'] },
         'adUnitCode': 'adunit-code',
         'sizes': [[300, 250], [728, 90]],
         'bidId': '30b31c1838de1e',
@@ -249,9 +341,35 @@ describe('admaticBidAdapter', () => {
             'width': 300,
             'height': 250,
             'price': 0.01,
+            'type': 'banner',
             'bidder': 'admatic',
             'adomain': ['admatic.com.tr'],
-            'party_tag': '<div></div>'
+            'party_tag': '<div></div>',
+            'iurl': 'https://www.admatic.com.tr'
+          },
+          {
+            'id': 2,
+            'creative_id': '3741',
+            'width': 300,
+            'height': 250,
+            'price': 0.01,
+            'type': 'video',
+            'bidder': 'admatic',
+            'adomain': ['admatic.com.tr'],
+            'party_tag': '<VAST></VAST>',
+            'iurl': 'https://www.admatic.com.tr'
+          },
+          {
+            'id': 3,
+            'creative_id': '3741',
+            'width': 300,
+            'height': 250,
+            'price': 0.01,
+            'type': 'video',
+            'bidder': 'admatic',
+            'adomain': ['admatic.com.tr'],
+            'party_tag': 'https://www.admatic.com.tr',
+            'iurl': 'https://www.admatic.com.tr'
           }
         ],
         'queryId': 'cdnbh24rlv0hhkpfpln0',
@@ -265,13 +383,48 @@ describe('admaticBidAdapter', () => {
           width: 300,
           height: 250,
           currency: 'TRY',
+          mediaType: 'banner',
           netRevenue: true,
           ad: '<div></div>',
           creativeId: '374',
           meta: {
             advertiserDomains: ['admatic.com.tr']
           },
-          ttl: 360,
+          ttl: 60,
+          bidder: 'admatic'
+        },
+        {
+          requestId: 2,
+          cpm: 0.01,
+          width: 300,
+          height: 250,
+          currency: 'TRY',
+          mediaType: 'video',
+          netRevenue: true,
+          vastImpUrl: 'https://www.admatic.com.tr',
+          vastXml: '<VAST></VAST>',
+          creativeId: '3741',
+          meta: {
+            advertiserDomains: ['admatic.com.tr']
+          },
+          ttl: 60,
+          bidder: 'admatic'
+        },
+        {
+          requestId: 3,
+          cpm: 0.01,
+          width: 300,
+          height: 250,
+          currency: 'TRY',
+          mediaType: 'video',
+          netRevenue: true,
+          vastImpUrl: 'https://www.admatic.com.tr',
+          vastXml: 'https://www.admatic.com.tr',
+          creativeId: '3741',
+          meta: {
+            advertiserDomains: ['admatic.com.tr']
+          },
+          ttl: 60,
           bidder: 'admatic'
         }
       ];