Merge branch 'master' into apsBidAdapter/v2.1.0

patmmccann · web-flow · commit 14a60a6ee2e2 · 2026-03-09T13:44:23.000-07:00
diff --git a/modules/gumgumBidAdapter.js b/modules/gumgumBidAdapter.js
@@ -288,6 +288,8 @@ function _getDeviceData(ortb2Data) {
     model: _device.model,
     ppi: _device.ppi,
     pxratio: _device.pxratio,
+    lmt: _device.lmt,
+    ifa: _device.lmt !== 1 ? _device.ifa : undefined,
     foddid: _device?.ext?.fiftyonedegrees_deviceId,
   };
 
diff --git a/modules/mediaeyesBidAdapter.js b/modules/mediaeyesBidAdapter.js
@@ -1,5 +1,6 @@
 import {
-  BANNER
+  BANNER,
+  VIDEO
 } from '../src/mediaTypes.js';
 import {
   registerBidder
@@ -10,7 +11,7 @@ const ENDPOINT_URL = 'https://delivery.upremium.asia/ortb/open/auction';
 
 export const spec = {
   code: 'mediaeyes',
-  supportedMediaTypes: BANNER,
+  supportedMediaTypes: [BANNER, VIDEO],
 
   isBidRequestValid: (bid) => {
     return !!(bid.params.itemId);
@@ -57,10 +58,24 @@ export const spec = {
         netRevenue: true
       };
 
-      prBid.mediaType = BANNER;
+      let mediaType = rtbBid.ext?.mediaType;
+      if (!mediaType) {
+        if (rtbBid.adm && rtbBid.adm.includes('<VAST')) {
+          mediaType = VIDEO;
+        } else {
+          mediaType = BANNER;
+        }
+      }
+
+      if (mediaType === VIDEO) {
+        prBid.mediaType = VIDEO;
+        prBid.vastXml = rtbBid.adm;
+      } else {
+        prBid.mediaType = BANNER;
+        prBid.ad = rtbBid.adm;
+      }
       prBid.width = rtbBid.w;
       prBid.height = rtbBid.h;
-      prBid.ad = rtbBid.adm;
       if (isArray(rtbBid.adomain)) {
         deepSetValue(prBid, 'meta.advertiserDomains', rtbBid.adomain);
       }
@@ -96,7 +111,13 @@ function cookingImp(bidReq) {
 
     imp.id = bidReq.bidId;
     imp.bidfloor = bidfloor;
-    imp.banner = cookImpBanner(bidReq);
+    if (bidReq.mediaTypes?.banner) {
+      imp.banner = cookImpBanner(bidReq);
+    }
+
+    if (bidReq.mediaTypes?.video) {
+      imp.video = cookImpVideo(bidReq);
+    }
   }
   return imp;
 }
@@ -111,6 +132,33 @@ const cookImpBanner = ({ mediaTypes, params }) => {
   }
 };
 
+function cookImpVideo({ mediaTypes }) {
+  const video = mediaTypes.video;
+
+  const size = Array.isArray(video.playerSize[0])
+    ? video.playerSize[0]
+    : video.playerSize;
+
+  const [w, h] = size;
+
+  let placement = video.placement;
+  if (!placement && video.context) {
+    if (video.context === 'outstream') {
+      placement = 4;
+    } else if (video.context === 'instream') {
+      placement = 1;
+    }
+  }
+
+  return {
+    w,
+    h,
+    mimes: video.mimes || ['video/mp4'],
+    protocols: video.protocols || [2, 3, 5, 6],
+    placement: video.placement || 1
+  };
+}
+
 function getBidFloor(bidRequest) {
   let bidfloor = deepAccess(bidRequest, 'params.bidFloor', 0)
 
diff --git a/modules/mediaeyesBidAdapter.md b/modules/mediaeyesBidAdapter.md
@@ -31,3 +31,24 @@ Module that connects to MediaEyes Bidder System
         },
     ];
 ```
+
+```
+    var adUnits = [
+        {
+            code: "video-zone",
+            mediaTypes: {
+                video: {
+                    context: "instream",
+                    playerSize: [640, 480]
+                }
+            },
+            bids: [{
+                bidder: "mediaeyes",
+                params: {
+                    itemId: "4d27f3cc8bbd5bd153045e",
+                    bidFloor: 0.01
+                }
+            }]
+        }
+    ];
+```
diff --git a/modules/pubstackBidAdapter.ts b/modules/pubstackBidAdapter.ts
@@ -143,7 +143,7 @@ const getUserSyncs: GetUserSyncFn = (syncOptions, _serverResponses, gdprConsent,
 
 export const spec: BidderSpec<typeof BIDDER_CODE> = {
   code: BIDDER_CODE,
-  aliases: [ {code: `${BIDDER_CODE}_server`, gvlid: GVLID} ],
+  aliases: [{ code: `${BIDDER_CODE}_server`, gvlid: GVLID }],
   gvlid: GVLID,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
   isBidRequestValid,
diff --git a/modules/wurflRtdProvider.js b/modules/wurflRtdProvider.js
@@ -13,7 +13,7 @@ import { getGlobal } from '../src/prebidGlobal.js';
 // Constants
 const REAL_TIME_MODULE = 'realTimeData';
 const MODULE_NAME = 'wurfl';
-const MODULE_VERSION = '2.4.0';
+const MODULE_VERSION = '2.6.0';
 
 // WURFL_JS_HOST is the host for the WURFL service endpoints
 const WURFL_JS_HOST = 'https://prebid.wurflcloud.com';
@@ -50,6 +50,7 @@ const ORTB2_DEVICE_FIELDS = [
 const ENRICHMENT_TYPE = {
   UNKNOWN: 'unknown',
   NONE: 'none',
+  NONE_LCE: 'none_lce',
   LCE: 'lce',
   LCE_ERROR: 'lcefailed',
   WURFL_PUB: 'wurfl_pub',
@@ -76,8 +77,6 @@ const AB_TEST = {
   TREATMENT_GROUP: 'treatment',
   DEFAULT_SPLIT: 0.5,
   DEFAULT_NAME: 'unknown',
-  ENRICHMENT_TYPE_LCE: 'lce',
-  ENRICHMENT_TYPE_WURFL: 'wurfl'
 };
 
 const logger = prefixLog('[WURFL RTD Submodule]');
@@ -1023,8 +1022,6 @@ const ABTestManager = {
   _enabled: false,
   _name: null,
   _variant: null,
-  _excludeLCE: true,
-  _enrichmentType: null,
 
   /**
    * Initializes A/B test configuration
@@ -1034,8 +1031,6 @@ const ABTestManager = {
     this._enabled = false;
     this._name = null;
     this._variant = null;
-    this._excludeLCE = true;
-    this._enrichmentType = null;
 
     const abTestEnabled = params?.abTest ?? false;
     if (!abTestEnabled) {
@@ -1044,12 +1039,11 @@ const ABTestManager = {
 
     this._enabled = true;
     this._name = params?.abName ?? AB_TEST.DEFAULT_NAME;
-    this._excludeLCE = params?.abExcludeLCE ?? true;
 
     const split = params?.abSplit ?? AB_TEST.DEFAULT_SPLIT;
     this._variant = this._computeVariant(split);
 
-    logger.logMessage(`A/B test "${this._name}": user in ${this._variant} group (exclude_lce: ${this._excludeLCE})`);
+    logger.logMessage(`A/B test "${this._name}": user in ${this._variant} group`);
   },
 
   /**
@@ -1067,24 +1061,12 @@ const ABTestManager = {
     return Math.random() < split ? AB_TEST.TREATMENT_GROUP : AB_TEST.CONTROL_GROUP;
   },
 
-  /**
-   * Sets the enrichment type encountered in current auction
-   * @param {string} enrichmentType 'lce' or 'wurfl'
-   */
-  setEnrichmentType(enrichmentType) {
-    this._enrichmentType = enrichmentType;
-  },
-
   /**
    * Checks if A/B test is enabled for current auction
    * @returns {boolean} True if A/B test should be applied
    */
   isEnabled() {
-    if (!this._enabled) return false;
-    if (this._enrichmentType === AB_TEST.ENRICHMENT_TYPE_LCE && this._excludeLCE) {
-      return false;
-    }
-    return true;
+    return this._enabled;
   },
 
   /**
@@ -1168,14 +1150,21 @@ const getBidRequestData = (reqBidsConfigObj, callback, config, userConsent) => {
   const cachedWurflData = getObjectFromStorage(WURFL_RTD_STORAGE_KEY);
   WurflDebugger.cacheReadStop();
 
-  const abEnrichmentType = cachedWurflData ? AB_TEST.ENRICHMENT_TYPE_WURFL : AB_TEST.ENRICHMENT_TYPE_LCE;
-  ABTestManager.setEnrichmentType(abEnrichmentType);
-
   // A/B test: Skip enrichment for control group
   if (ABTestManager.isInControlGroup()) {
     logger.logMessage('A/B test control group: skipping enrichment');
-    enrichmentType = ENRICHMENT_TYPE.NONE;
-    bidders.forEach(bidder => bidderEnrichment.set(bidder, ENRICHMENT_TYPE.NONE));
+    const controlEnrichment = cachedWurflData ? ENRICHMENT_TYPE.NONE : ENRICHMENT_TYPE.NONE_LCE;
+    enrichmentType = controlEnrichment;
+    bidders.forEach(bidder => bidderEnrichment.set(bidder, controlEnrichment));
+
+    // Read cache metadata for beacon reporting (without enriching bid request)
+    if (cachedWurflData) {
+      wurflId = cachedWurflData.WURFL?.wurfl_id || '';
+      samplingRate = cachedWurflData.wurfl_pbjs?.sampling_rate ?? DEFAULT_SAMPLING_RATE;
+      tier = cachedWurflData.wurfl_pbjs?.tier ?? '';
+      overQuota = cachedWurflData.wurfl_pbjs?.over_quota ?? DEFAULT_OVER_QUOTA;
+    }
+
     WurflDebugger.moduleExecutionStop();
     callback();
     return;
diff --git a/test/spec/modules/gamAdServerVideo_spec.js b/test/spec/modules/gamAdServerVideo_spec.js
@@ -901,7 +901,7 @@ describe('The DFP video support module', function () {
       );
       server.respondWith(gamWrapper);
 
-      const result = getVastXml({url, adUnit: {}, bid: {}, params: {iu: '/19968336/prebid_cache_video_adunit'}}, []).then(() => {
+      const result = getVastXml({ url, adUnit: {}, bid: {}, params: { iu: '/19968336/prebid_cache_video_adunit' } }, []).then(() => {
         const request = server.requests[0];
         const url = new URL(request.url);
         return url.searchParams.get('us_privacy');
@@ -913,7 +913,7 @@ describe('The DFP video support module', function () {
 
     function obtainUsPrivacyInGamVideoUrl() {
       const url = 'https://pubads.g.doubleclick.net/gampad/ads'
-      return new URLSearchParams(buildDfpVideoUrl({url, adUnit: {}, bid: {}, params: {iu: '/19968336/prebid_cache_video_adunit'}})).get('us_privacy');
+      return new URLSearchParams(buildDfpVideoUrl({ url, adUnit: {}, bid: {}, params: { iu: '/19968336/prebid_cache_video_adunit' } })).get('us_privacy');
     }
 
     function mockGpp(gpp) {
diff --git a/test/spec/modules/gumgumBidAdapter_spec.js b/test/spec/modules/gumgumBidAdapter_spec.js
@@ -1291,6 +1291,8 @@ describe('gumgumAdapter', function () {
           ext: { fiftyonedegrees_deviceId: '17595-133085-133468-18092' },
           ip: '127.0.0.1',
           ipv6: '51dc:5e20:fd6a:c955:66be:03b4:dfa3:35b2',
+          lmt: 1,
+          ifa: 'test-ifa-id',
           sua: suaObject
 
         },
@@ -1309,11 +1311,25 @@ describe('gumgumAdapter', function () {
       expect(bidRequest.data.foddid).to.equal(ortb2.device.ext.fiftyonedegrees_deviceId);
       expect(bidRequest.data.ip).to.equal(ortb2.device.ip);
       expect(bidRequest.data.ipv6).to.equal(ortb2.device.ipv6);
+      expect(bidRequest.data.lmt).to.equal(ortb2.device.lmt);
+      expect(bidRequest.data).to.not.have.property('ifa');
       expect(bidRequest.data).to.have.property('sua');
       expect(() => JSON.parse(bidRequest.data.sua)).to.not.throw();
       expect(JSON.parse(bidRequest.data.sua)).to.deep.equal(suaObject);
     });
 
+    it('should include ifa when lmt is not 1', function () {
+      const ortb2 = {
+        device: {
+          lmt: 0,
+          ifa: 'test-ifa-id'
+        }
+      };
+      const bidRequest = spec.buildRequests(bidRequests, { ortb2 })[0];
+      expect(bidRequest.data.lmt).to.equal(0);
+      expect(bidRequest.data.ifa).to.equal('test-ifa-id');
+    });
+
     it('should set tId from ortb2Imp.ext.tid if available', function () {
       const ortb2Imp = { ext: { tid: 'test-tid-1' } };
       const request = { ...bidRequests[0], ortb2Imp };
diff --git a/test/spec/modules/mediaeyesBidAdapter_spec.js b/test/spec/modules/mediaeyesBidAdapter_spec.js
diff --git a/test/spec/modules/wurflRtdProvider_spec.js b/test/spec/modules/wurflRtdProvider_spec.js
