voyagegroup · saxsir · Nov 17, 2021 · Sep 29, 2021 · Sep 29, 2021 · Sep 30, 2021
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -0,0 +1,11 @@
+ARG VARIANT="12"
+FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:${VARIANT}
+
+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+
+RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+RUN echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list
+RUN apt update
+RUN apt install -y google-chrome-stable xvfb
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1,27 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/main/containers/javascript-node
+{
+	"name": "Ubuntu",
+
+	"build": {
+		"dockerfile": "Dockerfile",		
+		"args": { "VARIANT": "12" }
+	},
+
+	"postCreateCommand": "bash .devcontainer/postCreate.sh",
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": {},
+
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"nickdodd79.gulptasks"
+	],
+
+	// 9999 is web server, 9876 is karma
+	"forwardPorts": [9876, 9999],
+
+	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "node"
+}
diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh
@@ -0,0 +1,6 @@
+echo "Post Create Starting"
+
+nvm install
+nvm use
+npm install gulp-cli -g
+npm ci
diff --git a/browsers.json b/browsers.json
@@ -71,4 +71,5 @@
     "device": null,
     "os": "OS X"
   }
+
 }
diff --git a/integrationExamples/gpt/akamaidap_segments_example.html b/integrationExamples/gpt/akamaidap_segments_example.html
@@ -0,0 +1,132 @@
+<html>
+<head>
+    <script async src="../../build/dev/prebid.js"></script>
+    <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+    <script>
+        var FAILSAFE_TIMEOUT = 3300;
+        var PREBID_TIMEOUT = 2000;
+
+        var adUnits = [{
+            code: 'div-gpt-ad-1460505748561-0',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250], [300,600]],
+                }
+            },
+            // Replace this object to test a new Adapter!
+            bids: [
+            {
+                bidder: 'appnexus',
+                params: {
+                placementId: 13144370
+                }
+            },
+            {
+              bidder: 'sovrn',
+              params: {
+                tagid: 1
+              }
+            }
+            ]
+
+        }];
+
+        var pbjs = pbjs || {};
+        pbjs.que = pbjs.que || [];
+
+    </script>
+
+    <script>
+        var googletag = googletag || {};
+        googletag.cmd = googletag.cmd || [];
+        googletag.cmd.push(function() {
+            googletag.pubads().disableInitialLoad();
+        });
+
+        pbjs.que.push(function() {
+            pbjs.setConfig({
+              debug: true,
+              ortb2: {
+                user: {
+                  data: [
+                    // DAP segment taxonomy inserted here
+                  ]
+                },
+                site: {
+                  ext: {
+                    data: {
+                      // DAP SAID will be inserted here
+                    }
+                  }
+                },
+                imp: {
+                  ext: {
+                    data: {
+                      // DAP SAID will be inserted here
+                    }
+                  }
+                }
+              },
+              realTimeData: {
+                dataProviders: [
+                  {
+                    name: "dap",
+                    waitForIt: true,
+                    params: {
+                      apiHostname: "prebid.dap.akadns.net",
+                      apiVersion: "x1",
+                      domain: "prebid.org",
+                      identityType: "dap-signature:1.0.0",
+                      segtax: 503,
+                      tokenTtl: 5,
+                    }
+                  }
+                ]
+              }
+            });
+            pbjs.addAdUnits(adUnits);
+            pbjs.requestBids({
+                bidsBackHandler: sendAdserverRequest,
+                timeout: PREBID_TIMEOUT
+            });
+        });
+
+        function sendAdserverRequest() {
+            if (pbjs.adserverRequestSent) return;
+            pbjs.adserverRequestSent = true;
+            googletag.cmd.push(function() {
+                pbjs.que.push(function() {
+                    pbjs.setTargetingForGPTAsync();
+                    googletag.pubads().refresh();
+                });
+            });
+        }
+
+        setTimeout(function() {
+            sendAdserverRequest();
+        }, FAILSAFE_TIMEOUT);
+
+    </script>
+
+    <script>
+        googletag.cmd.push(function () {
+            googletag.defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0').addService(googletag.pubads());
+            googletag.pubads().enableSingleRequest();
+            googletag.enableServices();
+        });
+    </script>
+
+                              <script>!function(a){var e="https://s.go-mpulse.net/boomerang/",t="addEventListener";if("False"=="True")a.BOOMR_config=a.BOOMR_config||{},a.BOOMR_config.PageParams=a.BOOMR_config.PageParams||{},a.BOOMR_config.PageParams.pci=!0,e="https://s2.go-mpulse.net/boomerang/";if(window.BOOMR_API_key="5G3ZS-8L7PG-U23WM-5CA4K-LQ3YP",function(){function n(e){a.BOOMR_onload=e&&e.timeStamp||(new Date).getTime()}if(!a.BOOMR||!a.BOOMR.version&&!a.BOOMR.snippetExecuted){a.BOOMR=a.BOOMR||{},a.BOOMR.snippetExecuted=!0;var i,_,o,r=document.createElement("iframe");if(a[t])a[t]("load",n,!1);else if(a.attachEvent)a.attachEvent("onload",n);r.src="javascript:void(0)",r.title="",r.role="presentation",(r.frameElement||r).style.cssText="width:0;height:0;border:0;display:none;",o=document.getElementsByTagName("script")[0],o.parentNode.insertBefore(r,o);try{_=r.contentWindow.document}catch(O){i=document.domain,r.src="javascript:var d=document.open();d.domain='"+i+"';void(0);",_=r.contentWindow.document}_.open()._l=function(){var a=this.createElement("script");if(i)this.domain=i;a.id="boomr-if-as",a.src=e+"5G3ZS-8L7PG-U23WM-5CA4K-LQ3YP",BOOMR_lstart=(new Date).getTime(),this.body.appendChild(a)},_.write("<bo"+'dy onload="document._l();">'),_.close()}}(),"".length>0)if(a&&"performance"in a&&a.performance&&"function"==typeof a.performance.setResourceTimingBufferSize)a.performance.setResourceTimingBufferSize();!function(){if(BOOMR=a.BOOMR||{},BOOMR.plugins=BOOMR.plugins||{},!BOOMR.plugins.AK){var e=""=="true"?1:0,t="",n="ghh4w4yxem66iyi6ijxa-f-a8f1ed317-clientnsv4-s.akamaihd.net",i="false"=="true"?2:1,_={"ak.v":"32","ak.cp":"540505","ak.ai":parseInt("351538",10),"ak.ol":"0","ak.cr":17,"ak.ipv":4,"ak.proto":"http/1.1","ak.rid":"322de403","ak.r":36326,"ak.a2":e,"ak.m":"dscx","ak.n":"essl","ak.bpcip":"49.207.203.0","ak.cport":5172,"ak.gh":"23.47.149.85","ak.quicv":"","ak.tlsv":"tls1.2","ak.0rtt":"","ak.csrc":"-","ak.acc":"bbr","ak.t":"1629373038","ak.ak":"hOBiQwZUYzCg5VSAfCLimQ==admFPBlxVf0VKeanKFKUThzq+or23aIaVFP5DBXpeOGEuvD5mQz0UZbvK242Y8cupS91bsNaM7uJT3/O00EszGTxlFhkv439YkTWfyegvqVlJhcrZ7jcRkIoyrmjoBqDZoF0WaG4rhwmNzkKEv6T1noRYwEWwRHOG8p7osPXWy5as6KkmhOYUiYk8S5hQj+HFzhYI5YUTx+8urmHdpVIDBkramcrT2V89mb0cH5L2bSGS2hahAA3Kkf+0Dul7r5hDFQaVTf17e4oKdM1G8cKVF5LGRxRl3v4Rn6tBJ+fjrJ7XYQWV30w1LPwcAmSfRX8iTCK4xzHwG1fwDFHb5tWVsxHeEkRgNN3/KhnrCjxKtaROjJeWypJf/rjn1HWHwy7uVVsP9f/HRN3drCCkEvJBmu6yi0jzFFCoeEkbUEoq+8=","ak.pv":"396","ak.dpoabenc":"","ak.tf":i};if(""!==t)_["ak.ruds"]=t;var o={i:!1,av:function(e){var t="http.initiator";if(e&&(!e[t]||"spa_hard"===e[t]))_["ak.feo"]=void 0!==a.aFeoApplied?1:0,BOOMR.addVar(_)},rv:function(){var a=["ak.bpcip","ak.cport","ak.cr","ak.csrc","ak.gh","ak.ipv","ak.m","ak.n","ak.ol","ak.proto","ak.quicv","ak.tlsv","ak.0rtt","ak.r","ak.acc","ak.t","ak.tf"];BOOMR.removeVar(a)}};BOOMR.plugins.AK={akVars:_,akDNSPreFetchDomain:n,init:function(){if(!o.i){var a=BOOMR.subscribe;a("before_beacon",o.av,null,null),a("onbeacon",o.rv,null,null),o.i=!0}return this},is_complete:function(){return!0}}}}()}(window);</script></head>
+
+<body>
+<h2>Prebid.js Test</h2>
+<h5>Div-1</h5>
+<div id='div-gpt-ad-1460505748561-0'>
+    <script type='text/javascript'>
+        googletag.cmd.push(function() { googletag.display('div-gpt-ad-1460505748561-0'); });
+    </script>
+</div>
+<h5>Segments Sent to Bidding Adapter</h5>
+<div id="user-segments"></div>
+</body>
+</html>
diff --git a/modules/.submodules.json b/modules/.submodules.json
@@ -5,6 +5,7 @@
     "akamaiDAPIdSystem",
     "amxIdSystem",
     "britepoolIdSystem",
+    "connectIdSystem",
     "criteoIdSystem",
     "deepintentDpesIdSystem",
     "dmdIdSystem",

diff --git a/modules/adfBidAdapter.js b/modules/adfBidAdapter.js
@@ -58,7 +58,11 @@ export const spec = {
   aliases: BIDDER_ALIAS,
   gvlid: GVLID,
   supportedMediaTypes: [ NATIVE, BANNER, VIDEO ],
-  isBidRequestValid: bid => !!bid.params.mid,
+  isBidRequestValid: (bid) => {
+    const params = bid.params || {};
+    const { mid, inv, mname } = params;
+    return !!(mid || (inv && mname));
+  },
   buildRequests: (validBidRequests, bidderRequest) => {
     let app, site;
 
@@ -104,12 +108,19 @@ export const spec = {
       }) : {};
       const bidfloor = floorInfo.floor;
       const bidfloorcur = floorInfo.currency;
+      const { mid, inv, mname } = bid.params;
 
       const imp = {
         id: id + 1,
-        tagid: bid.params.mid,
+        tagid: mid,
         bidfloor,
-        bidfloorcur
+        bidfloorcur,
+        ext: {
+          bidder: {
+            inv,
+            mname
+          }
+        }
       };
 
       const assets = _map(bid.nativeParams, (bidParams, key) => {
@@ -153,9 +164,6 @@ export const spec = {
             assets
           }
         };
-
-        bid.mediaType = NATIVE;
-        return imp;
       }
 
       const bannerParams = deepAccess(bid, 'mediaTypes.banner');
@@ -172,18 +180,14 @@ export const spec = {
         imp.banner = {
           format
         };
-        bid.mediaType = BANNER;
-
-        return imp;
       }
 
       const videoParams = deepAccess(bid, 'mediaTypes.video');
       if (videoParams) {
         imp.video = videoParams;
-        bid.mediaType = VIDEO;
-
-        return imp;
       }
+
+      return imp;
     });
 
     const request = {
@@ -243,30 +247,31 @@ export const spec = {
     return bids.map((bid, id) => {
       const bidResponse = bidResponses[id];
       if (bidResponse) {
+        const mediaType = deepAccess(bidResponse, 'ext.prebid.type');
         const result = {
           requestId: bid.bidId,
           cpm: bidResponse.price,
           creativeId: bidResponse.crid,
           ttl: 360,
           netRevenue: bid.netRevenue === 'net',
           currency: cur,
-          mediaType: bid.mediaType,
+          mediaType,
           width: bidResponse.w,
           height: bidResponse.h,
           dealId: bidResponse.dealid,
           meta: {
-            mediaType: bid.mediaType,
+            mediaType,
             advertiserDomains: bidResponse.adomain
           }
         };
 
         if (bidResponse.native) {
           result.native = parseNative(bidResponse);
         } else {
-          result[ bid.mediaType === VIDEO ? 'vastXml' : 'ad' ] = bidResponse.adm;
+          result[ mediaType === VIDEO ? 'vastXml' : 'ad' ] = bidResponse.adm;
         }
 
-        if (!bid.renderer && bid.mediaType === VIDEO && deepAccess(bid, 'mediaTypes.video.context') === 'outstream') {
+        if (!bid.renderer && mediaType === VIDEO && deepAccess(bid, 'mediaTypes.video.context') === 'outstream') {
           result.renderer = Renderer.install({id: bid.bidId, url: OUTSTREAM_RENDERER_URL, adUnitCode: bid.adUnitCode});
           result.renderer.setRender(renderer);
         }

diff --git a/modules/adgenerationBidAdapter.js b/modules/adgenerationBidAdapter.js
@@ -1,4 +1,4 @@
-import { tryAppendQueryString, getBidIdParameter } from '../src/utils.js';
+import {tryAppendQueryString, getBidIdParameter} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
@@ -25,7 +25,7 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
-    const ADGENE_PREBID_VERSION = '1.1.0';
+    const ADGENE_PREBID_VERSION = '1.2.0';
     let serverRequests = [];
     for (let i = 0, len = validBidRequests.length; i < len; i++) {
       const validReq = validBidRequests[i];
@@ -118,13 +118,25 @@ export const spec = {
 function createAd(body, bidRequest) {
   let ad = body.ad;
   if (body.vastxml && body.vastxml.length > 0) {
-    ad = `<body><div id="apvad-${bidRequest.bidId}"></div>${createAPVTag()}${insertVASTMethod(bidRequest.bidId, body.vastxml)}</body>`;
+    if (isUpperBillboard(body)) {
+      const marginTop = bidRequest.params.marginTop ? bidRequest.params.marginTop : '0';
+      ad = `<body>${createADGBrowserMTag()}${insertVASTMethodForADGBrowserM(body.vastxml, marginTop)}</body>`;
+    } else {
+      ad = `<body><div id="apvad-${bidRequest.bidId}"></div>${createAPVTag()}${insertVASTMethodForAPV(bidRequest.bidId, body.vastxml)}</body>`;
+    }
   }
   ad = appendChildToBody(ad, body.beacon);
   if (removeWrapper(ad)) return removeWrapper(ad);
   return ad;
 }
 
+function isUpperBillboard(body) {
+  if (body.location_params && body.location_params.option && body.location_params.option.ad_type) {
+    return body.location_params.option.ad_type === 'upper_billboard';
+  }
+  return false;
+}
+
 function isNative(body) {
   if (!body) return false;
   return body.native_ad && body.native_ad.assets.length > 0;
@@ -190,7 +202,12 @@ function createAPVTag() {
   return apvScript.outerHTML;
 }
 
-function insertVASTMethod(targetId, vastXml) {
+function createADGBrowserMTag() {
+  const ADGBrowserMURL = 'https://i.socdm.com/sdk/js/adg-browser-m.js';
+  return `<script type="text/javascript" src="${ADGBrowserMURL}"></script>`;
+}
+
+function insertVASTMethodForAPV(targetId, vastXml) {
   let apvVideoAdParam = {
     s: targetId
   };
@@ -200,6 +217,13 @@ function insertVASTMethod(targetId, vastXml) {
   return script.outerHTML;
 }
 
+function insertVASTMethodForADGBrowserM(vastXml, marginTop) {
+  const script = document.createElement(`script`);
+  script.type = 'text/javascript';
+  script.innerHTML = `window.ADGBrowserM.init({vastXml: '${vastXml.replace(/\r?\n/g, '')}', marginTop: '${marginTop}'});`;
+  return script.outerHTML;
+}
+
 /**
  *
  * @param ad

diff --git a/modules/adkernelBidAdapter.js b/modules/adkernelBidAdapter.js
@@ -74,7 +74,9 @@ export const spec = {
     {code: 'adomega'},
     {code: 'denakop'},
     {code: 'rtbanalytica'},
-    {code: 'unibots'}
+    {code: 'unibots'},
+    {code: 'ergadx'},
+    {code: 'turktelekom'}
   ],
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 

diff --git a/modules/admixerBidAdapter.js b/modules/admixerBidAdapter.js
@@ -19,9 +19,20 @@ export const spec = {
    * Make a server request from the list of BidRequests.
    */
   buildRequests: function (validRequest, bidderRequest) {
+    let w;
+    let docRef;
+    do {
+      w = w ? w.parent : window;
+      try {
+        docRef = w.document.referrer;
+      } catch (e) {
+        break;
+      }
+    } while (w !== window.top);
     const payload = {
       imps: [],
       ortb2: config.getConfig('ortb2'),
+      docReferrer: docRef,
     };
     let endpointUrl;
     if (bidderRequest) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,4 +71,5 @@ @@
         "device": null,
         "os": "OS X"
       }
     }