Eng 6525 update to 4.31.0

gulpfile.js

@@ -157,7 +157,7 @@ function makeWebpackPkg() {
 
   const analyticsSources = helpers.getAnalyticsSources();
   const moduleSources = helpers.getModulePaths(externalModules);
-  const modulesString = (externalModules.length > 0) ? externalModules.join(', ') :  'All available modules in current version.';
+  const modulesString = getModulesListToAddInBanner(externalModules);
 
   return gulp.src([].concat(moduleSources, analyticsSources, 'src/prebid.js'))
     .pipe(helpers.nameModules(externalModules))
@@ -167,6 +167,10 @@ function makeWebpackPkg() {
     .pipe(gulp.dest('build/dist'));
 }
 
+function getModulesListToAddInBanner(modules){
+  return (modules.length > 0) ? modules.join(', ') :  'All available modules in current version.';
+}
+
 function gulpBundle(dev) {
   return bundle(dev).pipe(gulp.dest('build/' + (dev ? 'dev' : 'dist')));
 }
@@ -216,6 +220,8 @@ function bundle(dev, moduleArr) {
   return gulp.src(
     entries
   )
+    // Need to uodate the "Modules: ..." section in comment with the current modules list
+    .pipe(replace(/(Modules: )(.*?)(\*\/)/, ('$1' + getModulesListToAddInBanner(helpers.getArgModules()) + ' $3')))
     .pipe(gulpif(dev, sourcemaps.init({ loadMaps: true })))
     .pipe(concat(outputFileName))
     .pipe(gulpif(!argv.manualEnable, footer('\n<%= global %>.processQueue();', {

integrationExamples/gpt/jwplayerRtdProvider_example.html

@@ -10,32 +10,30 @@
       var PREBID_TIMEOUT = 1000;
 
       var adUnits = [{
-        code: 'div-gpt-ad-1460505748561-0',
-        fpd: {
-          context: {
-            data: {
-              jwTargeting: {
-                // Note: the following Ids are placeholders and should be replaced with your Ids.
-                playerID: '123',
-                mediaID: 'abc'
+          code: 'div-gpt-ad-1460505748561-0',
+          ortb2Imp: {
+              ext: {
+                  data: {
+                      jwTargeting: {
+                          // Note: the following Ids are placeholders and should be replaced with your Ids.
+                          playerID: '123',
+                          mediaID: 'abc'
+                      }
+                  }
               }
-            },
-          }
-        },
-
-        mediaTypes: {
-          banner: {
-            sizes: [[300, 250], [300,600]],
-          }
-        },
-        // Replace this object to test a new Adapter!
-        bids: [{
-          bidder: 'appnexus',
-          params: {
-            placementId: 13144370
-          }
-        }]
-
+          },
+          mediaTypes: {
+              banner: {
+                  sizes: [[300, 250], [300,600]],
+              }
+          },
+          // Replace this object to test a new Adapter!
+          bids: [{
+              bidder: 'appnexus',
+              params: {
+                  placementId: 13144370
+              }
+          }]
       }];
 
       var pbjs = pbjs || {};

integrationExamples/gpt/permutiveRtdProvider_example.html

@@ -50,7 +50,7 @@
                     params: {
                       placementId: 13144370,
                       keywords: {
-                        inline_kvs: ['1']
+                        test_kv: ['true']
                       }
                     }
                   },
@@ -64,7 +64,7 @@
                         area: ['home']
                       },
                       visitor: {
-                        inline_kvs: ['1']
+                        test_kv: ['true']
                       }
                     }
                   },
@@ -78,12 +78,21 @@
                         {
                           settings: {},
                           targeting: {
-                            inline_kvs: ['1', '2', '3', '4']
+                            test_kv: ['true']
                           }
                         }
                       ],
                       ozoneData: {}
                     }
+                  },
+                  {
+                    bidder: 'trustx',
+                    params: {
+                      uid: 45,
+                      keywords: {
+                        test_kv: ['true']
+                      }
+                    }
                   }
                 ]
               },
@@ -127,13 +136,13 @@
               pbjs.setConfig({
                 debug: true,
                 realTimeData: {
-                  auctionDelay: 50, // maximum time for RTD modules to respond
+                  auctionDelay: 80, // maximum time for RTD modules to respond
                   dataProviders: [
                     {
                       name: 'permutive',
                       waitForIt: true,
                       params: {
-                        acBidders: ['appnexus', 'rubicon', 'ozone'],
+                        acBidders: ['appnexus', 'rubicon', 'ozone', 'trustx'],
                         maxSegs: 500,
                         overwrites: {
                           rubicon: function (bid, data, acEnabled, utils, defaultFn) {

modules/.submodules.json

@@ -20,7 +20,8 @@
     "fabrickIdSystem",
     "verizonMediaIdSystem",
     "pubProvidedIdSystem",
-    "tapadIdSystem"
+    "tapadIdSystem",
+    "novatiqIdSystem"
   ],
   "adpod": [
     "freeWheelAdserverVideo",

modules/adagioBidAdapter.js

@@ -8,16 +8,16 @@ import sha256 from 'crypto-js/sha256.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { getRefererInfo } from '../src/refererDetection.js';
 import { createEidsArray } from './userId/eids.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { Renderer } from '../src/Renderer.js';
 import { OUTSTREAM } from '../src/video.js';
 
 export const BIDDER_CODE = 'adagio';
 export const LOG_PREFIX = 'Adagio:';
-export const VERSION = '2.6.0';
+export const VERSION = '2.7.0';
 export const FEATURES_VERSION = '1';
 export const ENDPOINT = 'https://mp.4dex.io/prebid';
-export const SUPPORTED_MEDIA_TYPES = [BANNER, VIDEO];
+export const SUPPORTED_MEDIA_TYPES = [BANNER, NATIVE, VIDEO];
 export const ADAGIO_TAG_URL = 'https://script.4dex.io/localstore.js';
 export const ADAGIO_LOCALSTORAGE_KEY = 'adagioScript';
 export const GVLID = 617;
@@ -687,6 +687,112 @@ function _renderer(bid) {
   });
 }
 
+function _parseNativeBidResponse(bid) {
+  if (!bid.admNative || !Array.isArray(bid.admNative.assets)) {
+    utils.logError(`${LOG_PREFIX} Invalid native response`);
+    return;
+  }
+
+  const native = {}
+
+  function addAssetDataValue(data) {
+    const map = {
+      1: 'sponsoredBy', // sponsored
+      2: 'body', // desc
+      3: 'rating',
+      4: 'likes',
+      5: 'downloads',
+      6: 'price',
+      7: 'salePrice',
+      8: 'phone',
+      9: 'address',
+      10: 'body2', // desc2
+      11: 'displayUrl',
+      12: 'cta'
+    }
+    if (map.hasOwnProperty(data.type) && typeof data.value === 'string') {
+      native[map[data.type]] = data.value;
+    }
+  }
+
+  // assets
+  bid.admNative.assets.forEach(asset => {
+    if (asset.title) {
+      native.title = asset.title.text
+    } else if (asset.data) {
+      addAssetDataValue(asset.data)
+    } else if (asset.img) {
+      switch (asset.img.type) {
+        case 1:
+          native.icon = {
+            url: asset.img.url,
+            width: asset.img.w,
+            height: asset.img.h
+          };
+          break;
+        default:
+          native.image = {
+            url: asset.img.url,
+            width: asset.img.w,
+            height: asset.img.h
+          };
+          break;
+      }
+    }
+  });
+
+  if (bid.admNative.link) {
+    if (bid.admNative.link.url) {
+      native.clickUrl = bid.admNative.link.url;
+    }
+    if (Array.isArray(bid.admNative.link.clickTrackers)) {
+      native.clickTrackers = bid.admNative.link.clickTrackers
+    }
+  }
+
+  if (Array.isArray(bid.admNative.eventtrackers)) {
+    native.impressionTrackers = [];
+    bid.admNative.eventtrackers.forEach(tracker => {
+      // Only Impression events are supported. Prebid does not support Viewability events yet.
+      if (tracker.event !== 1) {
+        return;
+      }
+
+      // methods:
+      // 1: image
+      // 2: js
+      // note: javascriptTrackers is a string. If there's more than one JS tracker in bid response, the last script will be used.
+      switch (tracker.method) {
+        case 1:
+          native.impressionTrackers.push(tracker.url);
+          break;
+        case 2:
+          native.javascriptTrackers = `<script src=\"${tracker.url}\"></script>`;
+          break;
+      }
+    });
+  } else {
+    native.impressionTrackers = Array.isArray(bid.admNative.imptrackers) ? bid.admNative.imptrackers : [];
+    if (bid.admNative.jstracker) {
+      native.javascriptTrackers = bid.admNative.jstracker;
+    }
+  }
+
+  if (bid.admNative.privacy) {
+    native.privacyLink = bid.admNative.privacy;
+  }
+
+  if (bid.admNative.ext) {
+    native.ext = {}
+
+    if (bid.admNative.ext.bvw) {
+      native.ext.adagio_bvw = bid.admNative.ext.bvw;
+    }
+  }
+
+  bid.native = native
+}
+
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
@@ -873,6 +979,10 @@ export const spec = {
                 }
               }
 
+              if (bidObj.mediaType === NATIVE) {
+                _parseNativeBidResponse(bidObj);
+              }
+
               bidObj.site = bidReq.params.site;
               bidObj.placement = bidReq.params.placement;
               bidObj.pagetype = bidReq.params.pagetype;

modules/adagioBidAdapter.md

@@ -38,8 +38,8 @@ Connects to Adagio demand source to fetch bids.
             category: 'sport', // Recommended. Category of the content displayed in the page.
             subcategory: 'handball', // Optional. Subcategory of the content displayed in the page.
             postBid: false, // Optional. Use it in case of Post-bid integration only.
-            useAdUnitCodeAsAdUnitElementId: false // Optional. Use it by-pass adUnitElementId and use the adUnit code as value
-            useAdUnitCodeAsPlacement: false // Optional. Use it to by-pass placement and use the adUnit code as value
+            useAdUnitCodeAsAdUnitElementId: false, // Optional. Use it by-pass adUnitElementId and use the adUnit code as value
+            useAdUnitCodeAsPlacement: false, // Optional. Use it to by-pass placement and use the adUnit code as value
             // Optional debug mode, used to get a bid response with expected cpm.
             debug: {
               enabled: true,
@@ -78,8 +78,8 @@ Connects to Adagio demand source to fetch bids.
             category: 'sport', // Recommended. Category of the content displayed in the page.
             subcategory: 'handball', // Optional. Subcategory of the content displayed in the page.
             postBid: false, // Optional. Use it in case of Post-bid integration only.
-            useAdUnitCodeAsAdUnitElementId: false // Optional. Use it by-pass adUnitElementId and use the adUnit code as value
-            useAdUnitCodeAsPlacement: false // Optional. Use it to by-pass placement and use the adUnit code as value
+            useAdUnitCodeAsAdUnitElementId: false, // Optional. Use it by-pass adUnitElementId and use the adUnit code as value
+            useAdUnitCodeAsPlacement: false, // Optional. Use it to by-pass placement and use the adUnit code as value
             video: {
               skip: 0
               // OpenRTB 2.5 video options defined here override ones defined in mediaTypes.
@@ -91,6 +91,58 @@ Connects to Adagio demand source to fetch bids.
             }
           }
         }]
+      },
+      {
+        code: 'article_native',
+        mediaTypes: {
+          native: {
+            // generic Prebid options
+            title: {
+                required: true,
+                len: 80
+            },
+            // …
+            // Custom Adagio data assets
+            ext: {
+              adagio_bvw: {
+                required: false
+              }
+            }
+          }
+        },
+        bids: [{
+          bidder: 'adagio', // Required
+          params: {
+            organizationId: '1002', // Required - Organization ID provided by Adagio.
+            site: 'adagio-io', // Required - Site Name provided by Adagio.
+            placement: 'in_article', // Required. Refers to the placement of an adunit in a page. Must not contain any information about the type of device. Other example: `mpu_btf'.
+            adUnitElementId: 'article_native', // Required - AdUnit element id. Refers to the adunit id in a page. Usually equals to the adunit code above.
+
+            // The following params are limited to 30 characters,
+            // and can only contain the following characters:
+            // - alphanumeric (A-Z+a-z+0-9, case-insensitive)
+            // - dashes `-`
+            // - underscores `_`
+            // Also, each param can have at most 50 unique active values (case-insensitive).
+            pagetype: 'article', // Highly recommended. The pagetype describes what kind of content will be present in the page.
+            environment: 'mobile', // Recommended. Environment where the page is displayed.
+            category: 'sport', // Recommended. Category of the content displayed in the page.
+            subcategory: 'handball', // Optional. Subcategory of the content displayed in the page.
+            postBid: false, // Optional. Use it in case of Post-bid integration only.
+            useAdUnitCodeAsAdUnitElementId: false, // Optional. Use it by-pass adUnitElementId and use the adUnit code as value
+            useAdUnitCodeAsPlacement: false, // Optional. Use it to by-pass placement and use the adUnit code as value
+            // Optional OpenRTB Native 1.2 request object. Only `context`, `plcmttype` fields are supported.
+            native: {
+              context: 1,
+              plcmttype: 2
+            },
+            // Optional debug mode, used to get a bid response with expected cpm.
+            debug: {
+              enabled: true,
+              cpm: 3.00 // default to 1.00
+            }
+          }
+        }]
       }
     ];
 

modules/admixerBidAdapter.js

@@ -21,7 +21,7 @@ export const spec = {
   buildRequests: function (validRequest, bidderRequest) {
     const payload = {
       imps: [],
-      fpd: config.getConfig('fpd')
+      fpd: config.getLegacyFpd(config.getConfig('ortb2'))
     };
     let endpointUrl;
     if (bidderRequest) {
@@ -42,7 +42,11 @@ export const spec = {
       }
     }
     validRequest.forEach((bid) => {
-      payload.imps.push(bid);
+      let imp = {};
+      Object.keys(bid).forEach(key => {
+        (key === 'ortb2Imp') ? imp.fpd = config.getLegacyImpFpd(bid[key]) : imp[key] = bid[key];
+      });
+      payload.imps.push(imp);
     });
     const payloadString = JSON.stringify(payload);
     return {