prebid.js 7.22.0 → 7.24.0

package/modules/prebidServerBidAdapter/index.js

@@ -1,19 +1,11 @@
 import Adapter from '../../src/adapter.js';
-import {createBid} from '../../src/bidfactory.js';
 import {
   bind,
-  createTrackPixelHtml,
-  deepAccess,
   deepClone,
-  deepSetValue,
   flatten,
   generateUUID,
-  getBidRequest,
-  getDefinedParams,
   getPrebidInternal,
   insertUserSyncIframe,
-  isArray,
-  isEmpty,
   isNumber,
   isPlainObject,
   isStr,
@@ -21,34 +13,27 @@ import {
   logInfo,
   logMessage,
   logWarn,
-  mergeDeep,
-  parseSizesInput,
-  timestamp,
   triggerPixel,
-  uniques
+  uniques,
+  deepAccess,
 } from '../../src/utils.js';
 import CONSTANTS from '../../src/constants.json';
 import adapterManager from '../../src/adapterManager.js';
 import {config} from '../../src/config.js';
-import {NATIVE, VIDEO} from '../../src/mediaTypes.js';
 import {isValid} from '../../src/adapters/bidderFactory.js';
 import * as events from '../../src/events.js';
-import {find, includes} from '../../src/polyfill.js';
+import {includes} from '../../src/polyfill.js';
 import {S2S_VENDORS} from './config.js';
 import {ajax} from '../../src/ajax.js';
 import {hook} from '../../src/hook.js';
-import {getGlobal} from '../../src/prebidGlobal.js';
 import {hasPurpose1Consent} from '../../src/utils/gpdr.js';
+import {buildPBSRequest, interpretPBSResponse} from './ortbConverter.js';
 import {useMetrics} from '../../src/utils/perfMetrics.js';
 
 const getConfig = config.getConfig;
 
 const TYPE = CONSTANTS.S2S.SRC;
 let _syncCount = 0;
-const DEFAULT_S2S_TTL = 60;
-const DEFAULT_S2S_CURRENCY = 'USD';
-const DEFAULT_S2S_NETREVENUE = true;
-
 let _s2sConfigs;
 
 let eidPermissions;
@@ -95,12 +80,13 @@ let eidPermissions;
  * @property {boolean} [cacheMarkup] whether to cache the adm result
  * @property {string} [syncEndpoint] endpoint URL for syncing cookies
  * @property {Object} [extPrebid] properties will be merged into request.ext.prebid
+ * @property {Object} [ortbNative] base value for imp.native.request
  */
 
 /**
  * @type {S2SDefaultConfig}
  */
-const s2sDefaultConfig = {
+export const s2sDefaultConfig = {
   bidders: Object.freeze([]),
   timeout: 1000,
   syncTimeout: 1000,
@@ -108,7 +94,14 @@ const s2sDefaultConfig = {
   adapter: 'prebidServer',
   allowUnknownBidderCodes: false,
   adapterOptions: {},
-  syncUrlModifier: {}
+  syncUrlModifier: {},
+  ortbNative: {
+    context: 1,
+    plcmttype: 1,
+    eventtrackers: [
+      {event: 1, methods: [1]}
+    ],
+  }
 };
 
 config.setDefaults({
@@ -355,97 +348,6 @@ function doClientSideSyncs(bidders, gdprConsent, uspConsent) {
   });
 }
 
-function _appendSiteAppDevice(request, pageUrl, accountId) {
-  if (!request) return;
-
-  // ORTB specifies app OR site
-  if (typeof config.getConfig('app') === 'object') {
-    request.app = config.getConfig('app');
-    request.app.publisher = {id: accountId};
-  } else {
-    request.site = {};
-    if (isPlainObject(config.getConfig('site'))) {
-      request.site = config.getConfig('site');
-    }
-    // set publisher.id if not already defined
-    if (!deepAccess(request.site, 'publisher.id')) {
-      deepSetValue(request.site, 'publisher.id', accountId);
-    }
-    // set site.page if not already defined
-    if (!request.site.page) {
-      request.site.page = pageUrl;
-    }
-  }
-  if (typeof config.getConfig('device') === 'object') {
-    request.device = config.getConfig('device');
-  }
-  if (!request.device) {
-    request.device = {};
-  }
-  if (!request.device.w) {
-    request.device.w = window.innerWidth;
-  }
-  if (!request.device.h) {
-    request.device.h = window.innerHeight;
-  }
-}
-
-function addBidderFirstPartyDataToRequest(request, bidderFpd) {
-  const fpdConfigs = Object.entries(bidderFpd).reduce((acc, [bidder, bidderOrtb2]) => {
-    const ortb2 = mergeDeep({}, bidderOrtb2);
-    acc.push({
-      bidders: [ bidder ],
-      config: { ortb2 }
-    });
-    return acc;
-  }, []);
-
-  if (fpdConfigs.length) {
-    deepSetValue(request, 'ext.prebid.bidderconfig', fpdConfigs);
-  }
-}
-
-// https://iabtechlab.com/wp-content/uploads/2016/07/OpenRTB-Native-Ads-Specification-Final-1.2.pdf#page=40
-let nativeDataNames = Object.keys(CONSTANTS.PREBID_NATIVE_DATA_KEYS_TO_ORTB);
-
-// returns object with legacy asset name as key and asset id as value:
-// { "sponsoredBy": 1, ... }
-let nativeDataIdMap = nativeDataNames.reduce((prev, key) => {
-  prev[key] = CONSTANTS.NATIVE_ASSET_TYPES[CONSTANTS.PREBID_NATIVE_DATA_KEYS_TO_ORTB[key]];
-  return prev;
-}, {});
-
-let nativeImgIdMap = {
-  icon: 1,
-  image: 3
-};
-
-let nativeEventTrackerEventMap = {
-  impression: 1,
-  'viewable-mrc50': 2,
-  'viewable-mrc100': 3,
-  'viewable-video50': 4,
-};
-
-let nativeEventTrackerMethodMap = {
-  img: 1,
-  js: 2
-};
-
-if (FEATURES.NATIVE) {
-  // enable reverse lookup
-  [
-    nativeDataIdMap,
-    nativeImgIdMap,
-    nativeEventTrackerEventMap,
-    nativeEventTrackerMethodMap
-  ].forEach(map => {
-    Object.keys(map).forEach(key => {
-      map[map[key]] = key;
-    });
-  });
-}
-
 /**
  * map wurl to auction id and adId for use in the BID_WON event
  */
@@ -462,18 +364,6 @@ function addWurl(auctionId, adId, wurl) {
   }
 }
 
-function getPbsResponseData(bidderRequests, response, pbsName, pbjsName) {
-  const bidderValues = deepAccess(response, `ext.${pbsName}`);
-  if (bidderValues) {
-    Object.keys(bidderValues).forEach(bidder => {
-      let biddersReq = find(bidderRequests, bidderReq => bidderReq.bidderCode === bidder);
-      if (biddersReq) {
-        biddersReq[pbjsName] = bidderValues[bidder];
-      }
-    });
-  }
-}
-
 /**
  * @param {string} auctionId
  * @param {string} adId generated value set to bidObject.adId by bidderFactory Bid()
@@ -501,595 +391,6 @@ export function resetWurlMap() {
   wurlMap = {};
 }
 
-function ORTB2(s2sBidRequest, bidderRequests, adUnits, requestedBidders) {
-  this.s2sBidRequest = s2sBidRequest;
-  this.bidderRequests = bidderRequests;
-  this.adUnits = adUnits;
-  this.s2sConfig = s2sBidRequest.s2sConfig;
-  this.requestedBidders = requestedBidders;
-
-  this.bidIdMap = {};
-  this.adUnitsByImp = {};
-  this.impRequested = {};
-  this.auctionId = bidderRequests.map(br => br.auctionId).reduce((l, r) => (l == null || l === r) && r);
-  this.requestTimestamp = timestamp();
-}
-
-Object.assign(ORTB2.prototype, {
-  buildRequest() {
-    const {s2sBidRequest, bidderRequests: bidRequests, adUnits, s2sConfig, requestedBidders} = this;
-
-    let imps = [];
-    let aliases = {};
-    const firstBidRequest = bidRequests[0];
-    let floorMin = null;
-    let floorMinCur = null;
-
-    // transform ad unit into array of OpenRTB impression objects
-    let impIds = new Set();
-    adUnits.forEach(adUnit => {
-      // TODO: support labels / conditional bids
-      // for now, just warn about them
-      adUnit.bids.forEach((bid) => {
-        if (bid.mediaTypes != null) {
-          logWarn(`Prebid Server adapter does not (yet) support bidder-specific mediaTypes for the same adUnit. Size mapping configuration will be ignored for adUnit: ${adUnit.code}, bidder: ${bid.bidder}`);
-        }
-      });
-
-      // in case there is a duplicate imp.id, add '-2' suffix to the second imp.id.
-      // e.g. if there are 2 adUnits (case of twin adUnit codes) with code 'test',
-      // first imp will have id 'test' and second imp will have id 'test-2'
-      let impressionId = adUnit.code;
-      let i = 1;
-      while (impIds.has(impressionId)) {
-        i++;
-        impressionId = `${adUnit.code}-${i}`;
-      }
-      impIds.add(impressionId);
-      this.adUnitsByImp[impressionId] = adUnit;
-
-      const videoParams = deepAccess(adUnit, 'mediaTypes.video');
-      const bannerParams = deepAccess(adUnit, 'mediaTypes.banner');
-
-      adUnit.bids.forEach(bid => {
-        this.setBidRequestId(impressionId, bid.bidder, bid.bid_id);
-        // check for and store valid aliases to add to the request
-        if (adapterManager.aliasRegistry[bid.bidder]) {
-          const bidder = adapterManager.bidderRegistry[bid.bidder];
-          // adding alias only if alias source bidder exists and alias isn't configured to be standalone
-          // pbs adapter
-          if (!bidder || !bidder.getSpec().skipPbsAliasing) {
-            aliases[bid.bidder] = adapterManager.aliasRegistry[bid.bidder];
-          }
-        }
-      });
-
-      let mediaTypes = {};
-      if (bannerParams && bannerParams.sizes) {
-        const sizes = parseSizesInput(bannerParams.sizes);
-
-        // get banner sizes in form [{ w: <int>, h: <int> }, ...]
-        const format = sizes.map(size => {
-          const [ width, height ] = size.split('x');
-          const w = parseInt(width, 10);
-          const h = parseInt(height, 10);
-          return { w, h };
-        });
-
-        mediaTypes['banner'] = {format};
-
-        if (bannerParams.pos) mediaTypes['banner'].pos = bannerParams.pos;
-      }
-
-      if (!isEmpty(videoParams)) {
-        if (videoParams.context === 'outstream' && !videoParams.renderer && !adUnit.renderer) {
-          // Don't push oustream w/o renderer to request object.
-          logError('Outstream bid without renderer cannot be sent to Prebid Server.');
-        } else {
-          if (videoParams.context === 'instream' && !videoParams.hasOwnProperty('placement')) {
-            videoParams.placement = 1;
-          }
-
-          mediaTypes['video'] = Object.keys(videoParams).filter(param => param !== 'context')
-            .reduce((result, param) => {
-              if (param === 'playerSize') {
-                result.w = deepAccess(videoParams, `${param}.0.0`);
-                result.h = deepAccess(videoParams, `${param}.0.1`);
-              } else {
-                result[param] = videoParams[param];
-              }
-              return result;
-            }, {});
-        }
-      }
-      const nativeReq = deepAccess(adUnit, 'nativeOrtbRequest');
-      if (FEATURES.NATIVE && nativeReq) {
-        const defaultRequest = {
-          // TODO: determine best way to pass these and if we allow defaults
-          context: 1,
-          plcmttype: 1,
-          eventtrackers: [
-            { event: 1, methods: [1] }
-          ],
-          // TODO: figure out how to support privacy field
-          // privacy: int
-        };
-        try {
-          const request = Object.assign(defaultRequest, nativeReq);
-          mediaTypes[NATIVE] = {
-            request: JSON.stringify(request),
-            ver: '1.2'
-          };
-        } catch (e) {
-          logError('error creating native request: ' + String(e));
-        }
-      }
-
-      // get bidder params in form { <bidder code>: {...params} }
-      // initialize reduce function with the user defined `ext` properties on the ad unit
-      const ext = adUnit.bids.reduce((acc, bid) => {
-        if (bid.bidder == null) return acc;
-        const adapter = adapterManager.bidderRegistry[bid.bidder];
-        if (adapter && adapter.getSpec().transformBidParams) {
-          bid.params = adapter.getSpec().transformBidParams(bid.params, true, adUnit, bidRequests);
-        }
-        deepSetValue(acc,
-          `prebid.bidder.${bid.bidder}`,
-          (s2sConfig.adapterOptions && s2sConfig.adapterOptions[bid.bidder]) ? Object.assign({}, bid.params, s2sConfig.adapterOptions[bid.bidder]) : bid.params
-        );
-        return acc;
-      }, {...deepAccess(adUnit, 'ortb2Imp.ext')});
-
-      const imp = { ...adUnit.ortb2Imp, id: impressionId, ext, secure: s2sConfig.secure };
-
-      const ortb2 = {...deepAccess(adUnit, 'ortb2Imp.ext.data')};
-      Object.keys(ortb2).forEach(prop => {
-        /**
-          * Prebid AdSlot
-          * @type {(string|undefined)}
-        */
-        if (prop === 'pbadslot') {
-          if (typeof ortb2[prop] === 'string' && ortb2[prop]) {
-            deepSetValue(imp, 'ext.data.pbadslot', ortb2[prop]);
-          } else {
-            // remove pbadslot property if it doesn't meet the spec
-            delete imp.ext.data.pbadslot;
-          }
-        } else if (prop === 'adserver') {
-          /**
-           * Copy GAM AdUnit and Name to imp
-           */
-          ['name', 'adslot'].forEach(name => {
-            /** @type {(string|undefined)} */
-            const value = deepAccess(ortb2, `adserver.${name}`);
-            if (typeof value === 'string' && value) {
-              deepSetValue(imp, `ext.data.adserver.${name.toLowerCase()}`, value);
-            }
-          });
-        } else {
-          deepSetValue(imp, `ext.data.${prop}`, ortb2[prop]);
-        }
-      });
-
-      mergeDeep(imp, mediaTypes);
-
-      const convertCurrency = typeof getGlobal().convertCurrency !== 'function'
-        ? (amount) => amount
-        : (amount, from, to) => {
-          if (from === to) return amount;
-          let result = null;
-          try {
-            result = getGlobal().convertCurrency(amount, from, to);
-          } catch (e) {
-          }
-          return result;
-        }
-
-      const floor = (() => {
-        // we have to pick a floor for the imp - here we attempt to find the minimum floor
-        // across all bids for this adUnit
-        const s2sCurrency = config.getConfig('currency.adServerCurrency') || DEFAULT_S2S_CURRENCY;
-
-        return adUnit.bids
-          .map((bid) => this.getBidRequest(imp.id, bid.bidder))
-          .map((bid) => {
-            if (!bid || typeof bid.getFloor !== 'function') return;
-            try {
-              const {currency, floor} = bid.getFloor({
-                currency: s2sCurrency
-              });
-
-              return {
-                currency,
-                floor: parseFloat(floor)
-              }
-            } catch (e) {
-              logError('PBS: getFloor threw an error: ', e);
-            }
-          })
-          .reduce((min, floor) => {
-            // if any bid does not have a valid floor, do not attempt to send any to PBS
-            if (floor == null || floor.currency == null || floor.floor == null || isNaN(floor.floor)) {
-              min.min = null;
-            }
-            if (min.min === null) {
-              return min;
-            }
-            // otherwise, pick the minimum one (or, in some strange confluence of circumstances, the one in the best currency)
-            if (min.ref == null) {
-              min.ref = min.min = floor;
-            } else {
-              const value = convertCurrency(floor.floor, floor.currency, min.ref.currency);
-
-              if (value != null && value < min.ref.floor) {
-                min.ref.floor = value;
-                min.min = floor;
-              }
-            }
-
-            return min;
-          }, {}).min
-      })();
-
-      if (floor) {
-        imp.bidfloor = floor.floor;
-        imp.bidfloorcur = floor.currency;
-
-        // logic below relates to https://github.com/prebid/Prebid.js/issues/8749 and does the following:
-        // 1. check client-side floors (ref bidfloor/bidfloorcur & ortb2Imp floorMin/floorMinCur (if present))
-        // 2. set pbs req wide floorMinCur to the first floor currency found when iterating over imp's
-        //    (if currency conversion logic present, convert all imp floor values to this currency)
-        // 3. compare/store ref to lowest floorMin value as each imp is iterated over
-        // 4. set req wide floorMin and floorMinCur values for pbs after iterations are done
-        if (floorMinCur == null) { floorMinCur = floor.currency }
-        const ortb2ImpFloorMin = imp.ext?.prebid?.floors?.floorMin || imp.ext?.prebid?.floorMin;
-        const ortb2ImpFloorCur = imp.ext?.prebid?.floors?.floorMinCur || imp.ext?.prebid?.floorMinCur || floorMinCur;
-
-        const convertedFloorMinValue = convertCurrency(floor.floor, floor.currency, floorMinCur);
-        const convertedOrtb2ImpFloorMinValue = ortb2ImpFloorMin && ortb2ImpFloorCur ? convertCurrency(ortb2ImpFloorMin, ortb2ImpFloorCur, floorMinCur) : false;
-
-        const lowestImpFloorMin = convertedOrtb2ImpFloorMinValue && convertedOrtb2ImpFloorMinValue < convertedFloorMinValue
-          ? convertedOrtb2ImpFloorMinValue
-          : convertedFloorMinValue;
-
-        deepSetValue(imp, 'ext.prebid.floors.floorMin', lowestImpFloorMin);
-        if (floorMin == null || floorMin > lowestImpFloorMin) { floorMin = lowestImpFloorMin }
-      }
-
-      if (imp.banner || imp.video || imp.native) {
-        imps.push(imp);
-      }
-    });
-
-    if (!imps.length) {
-      logError('Request to Prebid Server rejected due to invalid media type(s) in adUnit.');
-      return;
-    }
-    const request = {
-      id: firstBidRequest.auctionId,
-      source: {tid: firstBidRequest.auctionId},
-      tmax: s2sConfig.timeout,
-      imp: imps,
-      // to do: add setconfig option to pass test = 1
-      test: 0,
-      ext: {
-        prebid: {
-          // set ext.prebid.auctiontimestamp with the auction timestamp. Data type is long integer.
-          auctiontimestamp: firstBidRequest.auctionStart,
-          targeting: {
-            // includewinners is always true for openrtb
-            includewinners: true,
-            // includebidderkeys always false for openrtb
-            includebidderkeys: false
-          }
-        }
-      }
-    };
-
-    // If the price floors module is active, then we need to signal to PBS! If floorData obj is present is best way to check
-    if (typeof deepAccess(firstBidRequest, 'bids.0.floorData') === 'object') {
-      request.ext.prebid.floors = { enabled: false };
-    }
-
-    // This is no longer overwritten unless name and version explicitly overwritten by extPrebid (mergeDeep)
-    request.ext.prebid = Object.assign(request.ext.prebid, {channel: {name: 'pbjs', version: $$PREBID_GLOBAL$$.version}});
-
-    // set debug flag if in debug mode
-    if (getConfig('debug')) {
-      request.ext.prebid = Object.assign(request.ext.prebid, {debug: true});
-    }
-
-    // s2sConfig video.ext.prebid is passed through openrtb to PBS
-    if (s2sConfig.extPrebid && typeof s2sConfig.extPrebid === 'object') {
-      request.ext.prebid = mergeDeep(request.ext.prebid, s2sConfig.extPrebid);
-    }
-
-    // get reference to pbs config schain bidder names (if any exist)
-    const pbsSchainBidderNamesArr = request.ext.prebid?.schains ? request.ext.prebid.schains.flatMap(s => s.bidders) : [];
-    // create an schains object
-    const schains = Object.fromEntries(
-      (request.ext.prebid?.schains || []).map(({bidders, schain}) => [JSON.stringify(schain), {bidders: new Set(bidders), schain}])
-    );
-
-    // compare bidder specific schains with pbs specific schains
-    request.ext.prebid.schains = Object.values(
-      bidRequests
-        .map((req) => [req.bidderCode, req.bids[0].schain])
-        .reduce((chains, [bidder, chain]) => {
-          const chainKey = JSON.stringify(chain);
-
-          switch (true) {
-            // if pbjs bidder name is same as pbs bidder name, pbs bidder name always wins
-            case chainKey && pbsSchainBidderNamesArr.indexOf(bidder) !== -1:
-              logInfo(`bidder-specific schain for ${bidder} skipped due to existing entry`);
-              break;
-            // if a pbjs schain obj is equal to an schain obj that exists on the pbs side, add the bidder name on the pbs side
-            case chainKey && chains.hasOwnProperty(chainKey) && pbsSchainBidderNamesArr.indexOf(bidder) === -1:
-              chains[chainKey].bidders.add(bidder);
-              break;
-            // if a pbjs schain obj is not on the pbs side, add a new schain entry on the pbs side
-            case chainKey && !chains.hasOwnProperty(chainKey):
-              chains[chainKey] = {bidders: new Set(), schain: chain};
-              chains[chainKey].bidders.add(bidder);
-              break;
-            default:
-          }
-
-          return chains;
-        }, schains)
-    ).map(({bidders, schain}) => ({bidders: Array.from(bidders), schain}));
-    // if schains evaluates to an empty array, remove it from the prebid object
-    if (request.ext.prebid.schains.length === 0) delete request.ext.prebid.schains;
-
-    /**
-     * @type {(string[]|string|undefined)} - OpenRTB property 'cur', currencies available for bids
-     */
-    const adServerCur = config.getConfig('currency.adServerCurrency');
-    if (adServerCur && typeof adServerCur === 'string') {
-      // if the value is a string, wrap it with an array
-      request.cur = [adServerCur];
-    } else if (Array.isArray(adServerCur) && adServerCur.length) {
-      // if it's an array, get the first element
-      request.cur = [adServerCur[0]];
-    }
-
-    _appendSiteAppDevice(request, bidRequests[0].refererInfo.page, s2sConfig.accountId);
-
-    // pass schain object if it is present
-    const schain = deepAccess(bidRequests, '0.bids.0.schain');
-    if (schain) {
-      request.source.ext = {
-        schain: schain
-      };
-    }
-
-    if (!isEmpty(aliases)) {
-      request.ext.prebid.aliases = {...request.ext.prebid.aliases, ...aliases};
-    }
-
-    const bidUserIdAsEids = deepAccess(bidRequests, '0.bids.0.userIdAsEids');
-    if (isArray(bidUserIdAsEids) && bidUserIdAsEids.length > 0) {
-      deepSetValue(request, 'user.ext.eids', bidUserIdAsEids);
-    }
-
-    if (isArray(eidPermissions) && eidPermissions.length > 0) {
-      if (requestedBidders && isArray(requestedBidders)) {
-        eidPermissions.forEach(i => {
-          if (i.bidders) {
-            i.bidders = i.bidders.filter(bidder => includes(requestedBidders, bidder))
-          }
-        });
-      }
-      deepSetValue(request, 'ext.prebid.data.eidpermissions', eidPermissions);
-    }
-
-    const multibid = config.getConfig('multibid');
-    if (multibid) {
-      deepSetValue(request, 'ext.prebid.multibid', multibid.reduce((result, i) => {
-        let obj = {};
-
-        Object.keys(i).forEach(key => {
-          obj[key.toLowerCase()] = i[key];
-        });
-
-        result.push(obj);
-
-        return result;
-      }, []));
-    }
-
-    if (bidRequests) {
-      if (firstBidRequest.gdprConsent) {
-        // note - gdprApplies & consentString may be undefined in certain use-cases for consentManagement module
-        let gdprApplies;
-        if (typeof firstBidRequest.gdprConsent.gdprApplies === 'boolean') {
-          gdprApplies = firstBidRequest.gdprConsent.gdprApplies ? 1 : 0;
-        }
-        deepSetValue(request, 'regs.ext.gdpr', gdprApplies);
-        deepSetValue(request, 'user.ext.consent', firstBidRequest.gdprConsent.consentString);
-        if (firstBidRequest.gdprConsent.addtlConsent && typeof firstBidRequest.gdprConsent.addtlConsent === 'string') {
-          deepSetValue(request, 'user.ext.ConsentedProvidersSettings.consented_providers', firstBidRequest.gdprConsent.addtlConsent);
-        }
-      }
-
-      // US Privacy (CCPA) support
-      if (firstBidRequest.uspConsent) {
-        deepSetValue(request, 'regs.ext.us_privacy', firstBidRequest.uspConsent);
-      }
-    }
-
-    if (getConfig('coppa') === true) {
-      deepSetValue(request, 'regs.coppa', 1);
-    }
-
-    const commonFpd = s2sBidRequest.ortb2Fragments?.global || {};
-    mergeDeep(request, commonFpd);
-
-    addBidderFirstPartyDataToRequest(request, s2sBidRequest.ortb2Fragments?.bidder || {});
-
-    request.imp.forEach((imp) => this.impRequested[imp.id] = imp);
-
-    if (request.ext?.prebid?.floors?.enabled) {
-      request.ext.prebid.floors.floorMin = floorMin;
-      request.ext.prebid.floors.floorMinCur = floorMinCur;
-    }
-
-    return request;
-  },
-
-  interpretResponse(response) {
-    const {bidderRequests, s2sConfig} = this;
-    const bids = [];
-
-    [['errors', 'serverErrors'], ['responsetimemillis', 'serverResponseTimeMs']]
-      .forEach(info => getPbsResponseData(bidderRequests, response, info[0], info[1]))
-
-    if (response.seatbid) {
-      // a seatbid object contains a `bid` array and a `seat` string
-      response.seatbid.forEach(seatbid => {
-        (seatbid.bid || []).forEach(bid => {
-          let bidRequest = this.getBidRequest(bid.impid, seatbid.seat);
-          if (bidRequest == null) {
-            // for stored impression, a request was made with bidder code `null`. Pick it up here so that NO_BID, BID_WON, etc events
-            // can work as expected (otherwise, the original request will always result in NO_BID).
-            bidRequest = this.getBidRequest(bid.impid, null);
-          }
-
-          const cpm = bid.price;
-          const status = cpm !== 0 ? CONSTANTS.STATUS.GOOD : CONSTANTS.STATUS.NO_BID;
-          let bidObject = createBid(status, {
-            bidder: seatbid.seat,
-            src: TYPE,
-            bidId: bidRequest ? (bidRequest.bidId || bidRequest.bid_Id) : null,
-            transactionId: this.adUnitsByImp[bid.impid].transactionId,
-            auctionId: this.auctionId,
-          });
-          bidObject.requestBidder = bidRequest?.bidder;
-          bidObject.requestTimestamp = this.requestTimestamp;
-          bidObject.cpm = cpm;
-          if (bid?.ext?.prebid?.meta?.adaptercode) {
-            bidObject.adapterCode = bid.ext.prebid.meta.adaptercode;
-          } else if (bidRequest?.bidder) {
-            bidObject.adapterCode = bidRequest.bidder;
-          } else {
-            bidObject.adapterCode = seatbid.seat;
-          }
-
-          // temporarily leaving attaching it to each bidResponse so no breaking change
-          // BUT: this is a flat map, so it should be only attached to bidderRequest, a the change above does
-          let serverResponseTimeMs = deepAccess(response, ['ext', 'responsetimemillis', seatbid.seat].join('.'));
-          if (bidRequest && serverResponseTimeMs) {
-            bidRequest.serverResponseTimeMs = serverResponseTimeMs;
-          }
-
-          // Look for seatbid[].bid[].ext.prebid.bidid and place it in the bidResponse object for use in analytics adapters as 'pbsBidId'
-          const bidId = deepAccess(bid, 'ext.prebid.bidid');
-          if (isStr(bidId)) {
-            bidObject.pbsBidId = bidId;
-          }
-
-          // store wurl by auctionId and adId so it can be accessed from the BID_WON event handler
-          if (isStr(deepAccess(bid, 'ext.prebid.events.win'))) {
-            addWurl(this.auctionId, bidObject.adId, deepAccess(bid, 'ext.prebid.events.win'));
-          }
-
-          let extPrebidTargeting = deepAccess(bid, 'ext.prebid.targeting');
-
-          // If ext.prebid.targeting exists, add it as a property value named 'adserverTargeting'
-          // The removal of hb_winurl and hb_bidid targeting values is temporary
-          // once we get through the transition, this block will be removed.
-          if (isPlainObject(extPrebidTargeting)) {
-            // If wurl exists, remove hb_winurl and hb_bidid targeting attributes
-            if (isStr(deepAccess(bid, 'ext.prebid.events.win'))) {
-              extPrebidTargeting = getDefinedParams(extPrebidTargeting, Object.keys(extPrebidTargeting)
-                .filter(i => (i.indexOf('hb_winurl') === -1 && i.indexOf('hb_bidid') === -1)));
-            }
-            bidObject.adserverTargeting = extPrebidTargeting;
-          }
-
-          bidObject.seatBidId = bid.id;
-
-          if (deepAccess(bid, 'ext.prebid.type') === VIDEO) {
-            bidObject.mediaType = VIDEO;
-            const impReq = this.impRequested[bid.impid];
-            [bidObject.playerWidth, bidObject.playerHeight] = [impReq.video.w, impReq.video.h];
-
-            // try to get cache values from 'response.ext.prebid.cache.js'
-            // else try 'bid.ext.prebid.targeting' as fallback
-            if (bid.ext.prebid.cache && typeof bid.ext.prebid.cache.vastXml === 'object' && bid.ext.prebid.cache.vastXml.cacheId && bid.ext.prebid.cache.vastXml.url) {
-              bidObject.videoCacheKey = bid.ext.prebid.cache.vastXml.cacheId;
-              bidObject.vastUrl = bid.ext.prebid.cache.vastXml.url;
-            } else if (extPrebidTargeting && extPrebidTargeting.hb_uuid && extPrebidTargeting.hb_cache_host && extPrebidTargeting.hb_cache_path) {
-              bidObject.videoCacheKey = extPrebidTargeting.hb_uuid;
-              // build url using key and cache host
-              bidObject.vastUrl = `https://${extPrebidTargeting.hb_cache_host}${extPrebidTargeting.hb_cache_path}?uuid=${extPrebidTargeting.hb_uuid}`;
-            }
-
-            if (bid.adm) { bidObject.vastXml = bid.adm; }
-            if (!bidObject.vastUrl && bid.nurl) { bidObject.vastUrl = bid.nurl; }
-          } else if (FEATURES.NATIVE && deepAccess(bid, 'ext.prebid.type') === NATIVE) {
-            bidObject.mediaType = NATIVE;
-            let ortb;
-            if (typeof bid.adm === 'string') {
-              ortb = bidObject.adm = JSON.parse(bid.adm);
-            } else {
-              ortb = bidObject.adm = bid.adm;
-            }
-
-            if (isPlainObject(ortb) && Array.isArray(ortb.assets)) {
-              bidObject.native = {
-                ortb,
-              };
-            } else {
-              logError('prebid server native response contained no assets');
-            }
-          } else { // banner
-            if (bid.adm && bid.nurl) {
-              bidObject.ad = bid.adm;
-              bidObject.ad += createTrackPixelHtml(decodeURIComponent(bid.nurl));
-            } else if (bid.adm) {
-              bidObject.ad = bid.adm;
-            } else if (bid.nurl) {
-              bidObject.adUrl = bid.nurl;
-            }
-          }
-
-          bidObject.width = bid.w;
-          bidObject.height = bid.h;
-          if (bid.dealid) { bidObject.dealId = bid.dealid; }
-          bidObject.creative_id = bid.crid;
-          bidObject.creativeId = bid.crid;
-          if (bid.burl) { bidObject.burl = bid.burl; }
-          bidObject.currency = (response.cur) ? response.cur : DEFAULT_S2S_CURRENCY;
-          bidObject.meta = {};
-          let extPrebidMeta = deepAccess(bid, 'ext.prebid.meta');
-          if (extPrebidMeta && isPlainObject(extPrebidMeta)) { bidObject.meta = deepClone(extPrebidMeta); }
-          if (bid.adomain) { bidObject.meta.advertiserDomains = bid.adomain; }
-
-          // the OpenRTB location for "TTL" as understood by Prebid.js is "exp" (expiration).
-          const configTtl = s2sConfig.defaultTtl || DEFAULT_S2S_TTL;
-          bidObject.ttl = (bid.exp) ? bid.exp : configTtl;
-          bidObject.netRevenue = (bid.netRevenue) ? bid.netRevenue : DEFAULT_S2S_NETREVENUE;
-
-          bids.push({ adUnit: this.adUnitsByImp[bid.impid].code, bid: bidObject });
-        });
-      });
-    }
-
-    return bids;
-  },
-  setBidRequestId(impId, bidderCode, bidId) {
-    this.bidIdMap[this.impBidderKey(impId, bidderCode)] = bidId;
-  },
-  getBidRequest(impId, bidderCode) {
-    const key = this.impBidderKey(impId, bidderCode);
-    return this.bidIdMap[key] && getBidRequest(this.bidIdMap[key], this.bidderRequests);
-  },
-  impBidderKey(impId, bidderCode) {
-    return `${impId}${bidderCode}`;
-  }
-});
-
 /**
  * BID_WON event to request the wurl
  * @param {Bid} bid the winning bid object
@@ -1161,6 +462,9 @@ export function PrebidServer() {
           } else {
             if (metrics.measureTime('addBidResponse.validate', () => isValid(adUnit, bid))) {
               addBidResponse(adUnit, bid);
+              if (bid.pbsWurl) {
+                addWurl(bid.auctionId, bid.adId, bid.pbsWurl);
+              }
             } else {
               addBidResponse.reject(adUnit, bid, CONSTANTS.REJECTION_REASON.INVALID);
             }
@@ -1200,8 +504,7 @@ export const processPBSRequest = hook('sync', function (s2sBidRequest, bidReques
     .reduce(flatten, [])
     .filter(uniques);
 
-  const ortb2 = new ORTB2(s2sBidRequest, bidRequests, adUnits, requestedBidders);
-  const request = s2sBidRequest.metrics.measureTime('buildRequests', () => ortb2.buildRequest());
+  const request = s2sBidRequest.metrics.measureTime('buildRequests', () => buildPBSRequest(s2sBidRequest, bidRequests, adUnits, requestedBidders, eidPermissions));
   const requestJson = request && JSON.stringify(request);
   logInfo('BidRequest: ' + requestJson);
   const endpointUrl = getMatchingConsentUrl(s2sBidRequest.s2sConfig.endpoint, gdprConsent);
@@ -1215,7 +518,7 @@ export const processPBSRequest = hook('sync', function (s2sBidRequest, bidReques
           let result;
           try {
             result = JSON.parse(response);
-            const bids = s2sBidRequest.metrics.measureTime('interpretResponse', () => ortb2.interpretResponse(result));
+            const bids = s2sBidRequest.metrics.measureTime('interpretResponse', () => interpretPBSResponse(result, request).bids);
             bids.forEach(onBid);
           } catch (error) {
             logError(error);