prebid.js 7.8.0 → 7.11.0

package/src/native.js

@@ -351,7 +351,7 @@ export function getNativeTargeting(bid, {index = auctionManager.index} = {}) {
       value = placeholder;
     }
 
-    let assetSendTargetingKeys = deepAccess(adUnit, `nativeParams.${asset}.sendTargetingKeys`)
+    let assetSendTargetingKeys = deepAccess(adUnit, `nativeParams.${asset}.sendTargetingKeys`);
     if (typeof assetSendTargetingKeys !== 'boolean') {
       assetSendTargetingKeys = deepAccess(adUnit, `nativeParams.ext.${asset}.sendTargetingKeys`);
     }
@@ -366,34 +366,9 @@ export function getNativeTargeting(bid, {index = auctionManager.index} = {}) {
   return keyValues;
 }
 
-/**
- * Constructs a message object containing asset values for each of the
- * requested data keys.
- */
-export function getAssetMessage(data, adObject) {
-  const message = {
-    message: 'assetResponse',
-    adId: data.adId,
-    assets: [],
-  };
-
-  if (adObject.native.hasOwnProperty('adTemplate')) {
-    message.adTemplate = getAssetValue(adObject.native['adTemplate']);
-  } if (adObject.native.hasOwnProperty('rendererUrl')) {
-    message.rendererUrl = getAssetValue(adObject.native['rendererUrl']);
-  }
-
-  data.assets.forEach(asset => {
-    const key = getKeyByValue(CONSTANTS.NATIVE_KEYS, asset);
-    const value = getAssetValue(adObject.native[key]);
-
-    message.assets.push({ key, value });
-  });
-
-  return message;
-}
+const getNativeRequest = (bidResponse) => auctionManager.index.getAdUnit(bidResponse)?.nativeOrtbRequest;
 
-export function getAllAssetsMessage(data, adObject, {getNativeReq = (bidResponse) => auctionManager.index.getAdUnit(bidResponse).nativeOrtbRequest} = {}) {
+function assetsMessage(data, adObject, keys, {getNativeReq = getNativeRequest} = {}) {
   const message = {
     message: 'assetResponse',
     adId: data.adId,
@@ -401,12 +376,12 @@ export function getAllAssetsMessage(data, adObject, {getNativeReq = (bidResponse
 
   // Pass to Prebid Universal Creative all assets, the legacy ones + the ortb ones (under ortb property)
   const ortbRequest = getNativeReq(adObject);
-  let nativeReq = adObject.native;
+  let nativeResp = adObject.native;
   const ortbResponse = adObject.native?.ortb;
   let legacyResponse = {};
   if (ortbRequest && ortbResponse) {
     legacyResponse = toLegacyResponse(ortbResponse, ortbRequest);
-    nativeReq = {
+    nativeResp = {
       ...adObject.native,
       ...legacyResponse
     };
@@ -416,20 +391,20 @@ export function getAllAssetsMessage(data, adObject, {getNativeReq = (bidResponse
   }
   message.assets = [];
 
-  Object.keys(nativeReq).forEach(function(key) {
-    if (key === 'adTemplate' && nativeReq[key]) {
-      message.adTemplate = getAssetValue(nativeReq[key]);
-    } else if (key === 'rendererUrl' && nativeReq[key]) {
-      message.rendererUrl = getAssetValue(nativeReq[key]);
+  (keys == null ? Object.keys(nativeResp) : keys).forEach(function(key) {
+    if (key === 'adTemplate' && nativeResp[key]) {
+      message.adTemplate = getAssetValue(nativeResp[key]);
+    } else if (key === 'rendererUrl' && nativeResp[key]) {
+      message.rendererUrl = getAssetValue(nativeResp[key]);
     } else if (key === 'ext') {
-      Object.keys(nativeReq[key]).forEach(extKey => {
-        if (nativeReq[key][extKey]) {
-          const value = getAssetValue(nativeReq[key][extKey]);
+      Object.keys(nativeResp[key]).forEach(extKey => {
+        if (nativeResp[key][extKey]) {
+          const value = getAssetValue(nativeResp[key][extKey]);
           message.assets.push({ key: extKey, value });
         }
       })
-    } else if (nativeReq[key] && CONSTANTS.NATIVE_KEYS.hasOwnProperty(key)) {
-      const value = getAssetValue(nativeReq[key]);
+    } else if (nativeResp[key] && CONSTANTS.NATIVE_KEYS.hasOwnProperty(key)) {
+      const value = getAssetValue(nativeResp[key]);
 
       message.assets.push({ key, value });
     }
@@ -437,6 +412,19 @@ export function getAllAssetsMessage(data, adObject, {getNativeReq = (bidResponse
   return message;
 }
 
+/**
+ * Constructs a message object containing asset values for each of the
+ * requested data keys.
+ */
+export function getAssetMessage(data, adObject, {getNativeReq = getNativeRequest} = {}) {
+  const keys = data.assets.map((k) => getKeyByValue(CONSTANTS.NATIVE_KEYS, k));
+  return assetsMessage(data, adObject, keys, {getNativeReq});
+}
+
+export function getAllAssetsMessage(data, adObject, {getNativeReq = getNativeRequest} = {}) {
+  return assetsMessage(data, adObject, null, {getNativeReq});
+}
+
 /**
  * Native assets can be a string or an object with a url prop. Returns the value
  * appropriate for sending in adserver targeting or placeholder replacement.
@@ -689,40 +677,47 @@ export function legacyPropertiesToOrtbNative(legacyNative) {
 }
 
 export function toOrtbNativeResponse(legacyResponse, ortbRequest) {
-  // copy the request, so we don't pollute it with response data below
-  ortbRequest = deepClone(ortbRequest);
-
   const ortbResponse = {
     ...legacyPropertiesToOrtbNative(legacyResponse),
     assets: []
   };
+
+  function useRequestAsset(predicate, fn) {
+    let asset = ortbRequest.assets.find(predicate);
+    if (asset != null) {
+      asset = deepClone(asset);
+      fn(asset);
+      ortbResponse.assets.push(asset);
+    }
+  }
+
   Object.keys(legacyResponse).filter(key => !!legacyResponse[key]).forEach(key => {
     const value = legacyResponse[key];
     switch (key) {
       // process titles
       case 'title':
-        const titleAsset = ortbRequest.assets.find(asset => asset.title != null);
-        titleAsset.title = {
-          text: value
-        };
-        ortbResponse.assets.push(titleAsset);
+        useRequestAsset(asset => asset.title != null, titleAsset => {
+          titleAsset.title = {
+            text: value
+          };
+        })
         break;
       case 'image':
       case 'icon':
         const imageType = key === 'image' ? NATIVE_IMAGE_TYPES.MAIN : NATIVE_IMAGE_TYPES.ICON;
-        const imageAsset = ortbRequest.assets.find(asset => asset.img != null && asset.img.type == imageType);
-        imageAsset.img = {
-          url: value
-        };
-        ortbResponse.assets.push(imageAsset);
+        useRequestAsset(asset => asset.img != null && asset.img.type === imageType, imageAsset => {
+          imageAsset.img = {
+            url: value
+          };
+        })
         break;
       default:
         if (key in PREBID_NATIVE_DATA_KEYS_TO_ORTB) {
-          const dataAsset = ortbRequest.assets.find(asset => asset.data != null && asset.data.type === NATIVE_ASSET_TYPES[PREBID_NATIVE_DATA_KEYS_TO_ORTB[key]]);
-          dataAsset.data = {
-            value
-          };
-          ortbResponse.assets.push(dataAsset);
+          useRequestAsset(asset => asset.data != null && asset.data.type === NATIVE_ASSET_TYPES[PREBID_NATIVE_DATA_KEYS_TO_ORTB[key]], dataAsset => {
+            dataAsset.data = {
+              value
+            };
+          })
         }
         break;
     }

package/src/sizeMapping.js

@@ -111,7 +111,7 @@ export function resolveStatus({labels = [], labelAll = false, activeLabels = []}
     results.filterResults = {
       before: oldSizes,
       after: mediaTypes.banner.sizes
-    }
+    };
   }
 
   return results;

package/src/targeting.js

@@ -63,7 +63,7 @@ export const getHighestCpmBidsFromBidPool = hook('sync', function(bidsReceived,
   }
 
   return bidsReceived;
-})
+});
 
 /**
 * A descending sort function that will sort the list of objects based on the following two dimensions:

package/src/userSync.js

@@ -311,7 +311,7 @@ export function newUserSync(userSyncDependencies) {
       }
     }
     return true;
-  }
+  };
   return publicApi;
 }
 

package/src/utils.js

@@ -52,7 +52,7 @@ export const internal = {
   deepEqual
 };
 
-let prebidInternal = {}
+let prebidInternal = {};
 /**
  * Returns object that is used as internal prebid namespace
  */

package/test/mocks/analyticsStub.js

@@ -1,4 +1,4 @@
-import {_internal} from '../../src/AnalyticsAdapter.js';
+import {_internal} from '../../libraries/analyticsAdapter/AnalyticsAdapter.js';
 
 before(() => {
   // stub out analytics networking to avoid random events polluting the global xhr mock

package/test/spec/AnalyticsAdapter_spec.js

@@ -14,7 +14,7 @@ const AD_RENDER_SUCCEEDED = CONSTANTS.EVENTS.AD_RENDER_SUCCEEDED;
 const AUCTION_DEBUG = CONSTANTS.EVENTS.AUCTION_DEBUG;
 const ADD_AD_UNITS = CONSTANTS.EVENTS.ADD_AD_UNITS;
 
-const AnalyticsAdapter = require('src/AnalyticsAdapter').default;
+const AnalyticsAdapter = require('libraries/analyticsAdapter/AnalyticsAdapter.js').default;
 const config = {
   url: 'https://localhost:9999/endpoint',
   analyticsType: 'endpoint'

package/test/spec/config_spec.js

@@ -596,6 +596,7 @@ describe('config API', function () {
     }
 
     setConfig({
+      bidderTimeout: 2000,
       ortb2: {
         user: {
           data: [userObj1, userObj2]
@@ -609,6 +610,7 @@ describe('config API', function () {
     });
 
     const rtd = {
+      bidderTimeout: 3000,
       ortb2: {
         user: {
           data: [userObj1]
@@ -623,11 +625,13 @@ describe('config API', function () {
     mergeConfig(rtd);
 
     let ortb2Config = getConfig('ortb2');
+    let bidderTimeout = getConfig('bidderTimeout');
 
     expect(ortb2Config.user.data).to.deep.include.members([userObj1, userObj2]);
     expect(ortb2Config.site.content.data).to.deep.include.members([siteObj1]);
     expect(ortb2Config.user.data).to.have.lengthOf(2);
     expect(ortb2Config.site.content.data).to.have.lengthOf(1);
+    expect(bidderTimeout).to.equal(3000);
   });
 
   it('should not corrupt global configuration with bidder configuration', () => {

package/test/spec/modules/adagioBidAdapter_spec.js

@@ -1391,6 +1391,7 @@ describe('Adagio bid adapter', () => {
         refererInfo: {
           numIframes: 0,
           reachedTop: true,
+          topmostLocation: 'https://test.io/article/a.html',
           page: 'https://test.io/article/a.html',
           domain: 'test.io',
           ref: 'https://google.com'
@@ -1417,6 +1418,7 @@ describe('Adagio bid adapter', () => {
         numIframes: 0,
         reachedTop: true,
         page: 'http://level.io/',
+        topmostLocation: 'http://level.io/',
         stack: [
           'http://level.io/',
           'http://example.com/iframe1.html',

package/test/spec/modules/adnuntiusBidAdapter_spec.js

@@ -13,7 +13,7 @@ describe('adnuntiusBidAdapter', function () {
   const meta = [{ key: 'usi', value: usi }]
 
   before(() => {
-    const storage = getStorageManager({gvlid: GVLID, moduleName: 'adnuntius'})
+    const storage = getStorageManager({ gvlid: GVLID, moduleName: 'adnuntius' })
     storage.setDataInLocalStorage('adn.metaData', JSON.stringify(meta))
   });
 
@@ -46,7 +46,11 @@ describe('adnuntiusBidAdapter', function () {
         auId: '8b6bc',
         network: 'adnuntius',
       },
-
+      mediaTypes: {
+        banner: {
+          sizes: [[640, 480], [600, 400]],
+        }
+      },
     }
   ]
 
@@ -228,7 +232,7 @@ describe('adnuntiusBidAdapter', function () {
       expect(request[0]).to.have.property('url');
       expect(request[0].url).to.equal(ENDPOINT_URL);
       expect(request[0]).to.have.property('data');
-      expect(request[0].data).to.equal('{\"adUnits\":[{\"auId\":\"8b6bc\",\"targetId\":\"123\"}],\"metaData\":{\"usi\":\"' + usi + '\"}}');
+      expect(request[0].data).to.equal('{\"adUnits\":[{\"auId\":\"8b6bc\",\"targetId\":\"123\",\"dimensions\":[[640,480],[600,400]]}],\"metaData\":{\"usi\":\"' + usi + '\"}}');
     });
 
     it('Test Video requests', function () {

package/test/spec/modules/adtelligentBidAdapter_spec.js

@@ -19,6 +19,7 @@ const aliasEP = {
   streamkey: 'https://ghb.hb.streamkey.net/v2/auction/',
   janet: 'https://ghb.bidder.jmgads.com/v2/auction/',
   pgam: 'https://ghb.pgamssp.com/v2/auction/',
+  ocm: 'https://ghb.cenarius.orangeclickmedia.com/v2/auction/',
 };
 
 const DEFAULT_ADATPER_REQ = { bidderCode: 'adtelligent' };