prebid.js 7.27.0 → 7.28.0

package/dist/yieldoneAnalyticsAdapter.js

@@ -1 +1 @@
-(self.pbjsChunk=self.pbjsChunk||[]).push([[4572],{83519:function(e,t,n){var a=n(64358),i=n(48928),o=n(64563),r=n(5644),d=n(51039),s=n(18621),c=n(78653),u={},v={},g={},f={};f[r.FP.BID_ADJUSTMENT]=!0,f[r.FP.BIDDER_DONE]=!0,f[r.FP.AUCTION_END]=!0;var l="",p="https://pool.tsukiji.iponweb.net/hba",b="";function I(e,t){e.adUnitCode&&t[e.adUnitCode]&&(e.adUnitName=t[e.adUnitCode]),(0,a.isArray)(e.adUnits)&&e.adUnits.forEach((function(e){e.code&&t[e.code]&&(e.name=t[e.code])})),(0,a.isArray)(e.adUnitCodes)&&(e.adUnitNames=e.adUnitCodes.map((function(e){return t[e]}))),["bids","bidderRequests","bidsReceived","noBids"].forEach((function(n){!function(e,t){(0,a.isArray)(e)&&e.forEach((function(e){I(e,t)}))}(e[n],t)}))}var h=Object.assign((0,o.ZP)({analyticsType:"endpoint"}),{getUrl:function(){return p},track:function(e){var t=e.eventType,n=e.args,i=void 0===n?{}:n;if(t===r.FP.BID_REQUESTED){var o="".concat(i.bidderCode,"_").concat(i.auctionId);u[o]=(0,a.deepClone)(i),u[o].bids=[],i.bids.forEach((function(e){v["".concat(e.bidId,"_").concat(e.auctionId)]=e}))}if(t===r.FP.BID_TIMEOUT&&(0,a.isArray)(i)){var d=h.eventsStorage,p={};i.forEach((function(e){var n="".concat(e.bidId,"_").concat(e.auctionId),a="".concat(e.bidder,"_").concat(e.auctionId);d[e.auctionId]||(d[e.auctionId]={events:[]}),(u[a]||p[e.bidder])&&v[n]&&(p[e.bidder]||(p[e.bidder]=u[a],d[e.auctionId].events.push({eventType:t,params:p[e.bidder]}),delete u[a]),p[e.bidder].bids.push(v[n]),delete v[n])}))}else if(l=i.auctionId||l){var S=h.eventsStorage;S[l]||(S[l]={events:[]});var y=i.refererInfo&&i.refererInfo.page;y&&g[l]!==y&&(g[l]=y);var E=Object.assign({},i);if(delete E.ad,E.bidsReceived&&(E.bidsReceived=E.bidsReceived.map((function(e){var t=Object.assign({},e);return delete t.ad,t}))),f[t]||S[l].events.push({eventType:t,params:E}),t===r.FP.AUCTION_END||t===r.FP.BID_WON){if(E.adServerTargeting=s.q0.getAllTargeting(c.K.getAdUnitCodes(),c.K.getBidsReceived()),h.eventsStorage[l]&&h.eventsStorage[l].events.length){h.eventsStorage[l].page={url:g[l]},h.eventsStorage[l].pubId=b,h.eventsStorage[l].wrapper_version="7.27.0";var A=function(){if(window.googletag&&window.googletag.pubads){var e=googletag.pubads();if(e&&e.getSlots){var t=e.getSlots();if(t&&t.length){var n={};return t.forEach((function(e){var t=e.getSlotElementId(),a=(e.getAdUnitPath()||"").split("/").pop();n[t]=a})),n}}}}();A&&h.eventsStorage[l].events.forEach((function(e){I(e.params,A)}))}h.sendStat(h.eventsStorage[l],l)}}},sendStat:function(e,t){e&&e.events&&e.events.length&&(delete h.eventsStorage[t],(0,i.h)(p,{success:function(){},error:function(){}},JSON.stringify(e),{method:"POST"}))}});h.eventsStorage={},h.originEnableAnalytics=h.enableAnalytics,h.enableAnalytics=function(e){var t=e&&e.options;t&&("string"==typeof t.url&&(p=t.url),t.pubId&&(b=t.pubId.toString())),h.originEnableAnalytics(e)},d.ZP.registerAnalyticsAdapter({adapter:h,code:"yieldone"});window.pbjs.installedModules.push("yieldoneAnalyticsAdapter")}},function(e){e.O(0,[4861],(function(){return t=83519,e(e.s=t);var t}));e.O()}]);
+(self.pbjsChunk=self.pbjsChunk||[]).push([[4572],{83519:function(e,t,n){var a=n(64358),i=n(48928),o=n(64563),r=n(5644),d=n(51039),s=n(18621),c=n(78653),u={},v={},g={},f={};f[r.FP.BID_ADJUSTMENT]=!0,f[r.FP.BIDDER_DONE]=!0,f[r.FP.AUCTION_END]=!0;var l="",p="https://pool.tsukiji.iponweb.net/hba",b="";function I(e,t){e.adUnitCode&&t[e.adUnitCode]&&(e.adUnitName=t[e.adUnitCode]),(0,a.isArray)(e.adUnits)&&e.adUnits.forEach((function(e){e.code&&t[e.code]&&(e.name=t[e.code])})),(0,a.isArray)(e.adUnitCodes)&&(e.adUnitNames=e.adUnitCodes.map((function(e){return t[e]}))),["bids","bidderRequests","bidsReceived","noBids"].forEach((function(n){!function(e,t){(0,a.isArray)(e)&&e.forEach((function(e){I(e,t)}))}(e[n],t)}))}var h=Object.assign((0,o.ZP)({analyticsType:"endpoint"}),{getUrl:function(){return p},track:function(e){var t=e.eventType,n=e.args,i=void 0===n?{}:n;if(t===r.FP.BID_REQUESTED){var o="".concat(i.bidderCode,"_").concat(i.auctionId);u[o]=(0,a.deepClone)(i),u[o].bids=[],i.bids.forEach((function(e){v["".concat(e.bidId,"_").concat(e.auctionId)]=e}))}if(t===r.FP.BID_TIMEOUT&&(0,a.isArray)(i)){var d=h.eventsStorage,p={};i.forEach((function(e){var n="".concat(e.bidId,"_").concat(e.auctionId),a="".concat(e.bidder,"_").concat(e.auctionId);d[e.auctionId]||(d[e.auctionId]={events:[]}),(u[a]||p[e.bidder])&&v[n]&&(p[e.bidder]||(p[e.bidder]=u[a],d[e.auctionId].events.push({eventType:t,params:p[e.bidder]}),delete u[a]),p[e.bidder].bids.push(v[n]),delete v[n])}))}else if(l=i.auctionId||l){var S=h.eventsStorage;S[l]||(S[l]={events:[]});var y=i.refererInfo&&i.refererInfo.page;y&&g[l]!==y&&(g[l]=y);var E=Object.assign({},i);if(delete E.ad,E.bidsReceived&&(E.bidsReceived=E.bidsReceived.map((function(e){var t=Object.assign({},e);return delete t.ad,t}))),f[t]||S[l].events.push({eventType:t,params:E}),t===r.FP.AUCTION_END||t===r.FP.BID_WON){if(E.adServerTargeting=s.q0.getAllTargeting(c.K.getAdUnitCodes(),c.K.getBidsReceived()),h.eventsStorage[l]&&h.eventsStorage[l].events.length){h.eventsStorage[l].page={url:g[l]},h.eventsStorage[l].pubId=b,h.eventsStorage[l].wrapper_version="7.28.0";var A=function(){if(window.googletag&&window.googletag.pubads){var e=googletag.pubads();if(e&&e.getSlots){var t=e.getSlots();if(t&&t.length){var n={};return t.forEach((function(e){var t=e.getSlotElementId(),a=(e.getAdUnitPath()||"").split("/").pop();n[t]=a})),n}}}}();A&&h.eventsStorage[l].events.forEach((function(e){I(e.params,A)}))}h.sendStat(h.eventsStorage[l],l)}}},sendStat:function(e,t){e&&e.events&&e.events.length&&(delete h.eventsStorage[t],(0,i.h)(p,{success:function(){},error:function(){}},JSON.stringify(e),{method:"POST"}))}});h.eventsStorage={},h.originEnableAnalytics=h.enableAnalytics,h.enableAnalytics=function(e){var t=e&&e.options;t&&("string"==typeof t.url&&(p=t.url),t.pubId&&(b=t.pubId.toString())),h.originEnableAnalytics(e)},d.ZP.registerAnalyticsAdapter({adapter:h,code:"yieldone"});window.pbjs.installedModules.push("yieldoneAnalyticsAdapter")}},function(e){e.O(0,[4861],(function(){return t=83519,e(e.s=t);var t}));e.O()}]);

package/libraries/ortb2.5StrictTranslator/dsl.js

@@ -0,0 +1,54 @@
+export const ERR_TYPE = 0; // field has wrong type (only objects, enums, and arrays of objects or enums are checked)
+export const ERR_UNKNOWN_FIELD = 1; // field is not defined in ORTB 2.5 spec
+export const ERR_ENUM = 2; // field is an enum and its value is not one of those listed in the ORTB 2.5 spec
+
+// eslint-disable-next-line symbol-description
+export const extend = Symbol();
+
+export function Obj(primitiveFields, spec = {}) {
+  const scan = (path, parent, field, value, onError) => {
+    if (value == null || typeof value !== 'object') {
+      onError(ERR_TYPE, path, parent, field, value);
+      return;
+    }
+    Object.entries(value).forEach(([k, v]) => {
+      if (v == null) return;
+      const kpath = path == null ? k : `${path}.${k}`;
+      if (spec.hasOwnProperty(k)) {
+        spec[k](kpath, value, k, v, onError);
+        return;
+      }
+      if (k !== 'ext' && !primitiveFields.includes(k)) {
+        onError(ERR_UNKNOWN_FIELD, kpath, value, k, v);
+      }
+    });
+  };
+  scan[extend] = (extraPrimitives, specOverride = {}) =>
+    Obj(primitiveFields.concat(extraPrimitives), Object.assign({}, spec, specOverride));
+  return scan;
+}
+
+export const ID = Obj(['id']);
+export const Named = ID[extend](['name']);
+
+export function Arr(def) {
+  return (path, parent, field, value, onError) => {
+    if (!Array.isArray(value)) {
+      onError(ERR_TYPE, path, parent, field, value);
+    } else {
+      value.forEach((item, i) => def(`${path}.${i}`, value, i, item, onError));
+    }
+  };
+}
+
+export function IntEnum(min, max) {
+  return (path, parent, field, value, onError) => {
+    const errno = (() => {
+      if (typeof value !== 'number') return ERR_TYPE;
+      if (isNaN(value) || value > max || value < min) return ERR_ENUM;
+    })();
+    if (errno != null) {
+      onError(errno, path, parent, field, value);
+    }
+  };
+}

package/libraries/ortb2.5StrictTranslator/spec.js

@@ -0,0 +1,81 @@
+import {Arr, extend, ID, IntEnum, Named, Obj} from './dsl.js';
+
+const CatDomain = Named[extend](['cat', 'domain']);
+const Segment = Named[extend](['value']);
+const Data = Named[extend]([], {
+  segment: Arr(Segment)
+});
+const Content = ID[extend](['episode', 'title', 'series', 'season', 'artist', 'genre', 'album', 'isrc', 'url', 'cat', 'contentrating', 'userrating', 'keywords', 'livestream', 'sourcerelationship', 'len', 'language', 'embeddable'], {
+  producer: CatDomain,
+  data: Arr(Data),
+  prodq: IntEnum(0, 3),
+  videoquality: IntEnum(0, 3),
+  context: IntEnum(1, 7),
+  qagmediarating: IntEnum(1, 3),
+});
+
+const Client = CatDomain[extend](['sectioncat', 'pagecat', 'privacypolicy', 'keywords'], {
+  publisher: CatDomain, content: Content,
+});
+const Site = Client[extend](['page', 'ref', 'search', 'mobile']);
+const App = Client[extend](['bundle', 'storeurl', 'ver', 'paid']);
+
+const Geo = Obj(['lat', 'lon', 'accuracy', 'lastfix', 'country', 'region', 'regionfips104', 'metro', 'city', 'zip', 'utcoffset'], {
+  type: IntEnum(1, 3),
+  ipservice: IntEnum(1, 4)
+});
+const Device = Obj(['ua', 'dnt', 'lmt', 'ip', 'ipv6', 'make', 'model', 'os', 'osv', 'hwv', 'h', 'w', 'ppi', 'pxratio', 'js', 'geofetch', 'flashver', 'language', 'carrier', 'mccmnc', 'ifa', 'didsha1', 'didmd5', 'dpidsha1', 'dpidmd5', 'macsha1', 'macmd5'], {
+  geo: Geo, devicetype: IntEnum(1, 7), connectiontype: IntEnum(0, 6)
+});
+const User = ID[extend](['buyeruid', 'yob', 'gender', 'keywords', 'customdata'], {
+  geo: Geo, data: Arr(Data),
+});
+
+const Floorable = ID[extend](['bidfloor', 'bidfloorcur']);
+const Deal = Floorable[extend](['at', 'wseat', 'wadomain']);
+const Pmp = Obj(['private_auction'], {
+  deals: Arr(Deal),
+});
+const Format = Obj(['w', 'h', 'wratio', 'hratio', 'wmin']);
+const MediaType = Obj(['mimes'], {
+  api: Arr(IntEnum(1, 6)), battr: Arr(IntEnum(1, 17))
+});
+const Banner = MediaType[extend](['id', 'w', 'h', 'wmax', 'hmax', 'hmin', 'wmin', 'topframe', 'vcm'], {
+  format: Arr(Format), btype: Arr(IntEnum(1, 4)), pos: IntEnum(0, 7), expdir: Arr(IntEnum(1, 5))
+});
+const Native = MediaType[extend](['request', 'ver']);
+const RichMediaType = MediaType[extend](['minduration', 'maxduration', 'startdelay', 'sequence', 'maxextended', 'minbitrate', 'maxbitrate'], {
+  protocols: Arr(IntEnum(1, 10)),
+  delivery: Arr(IntEnum(1, 3)),
+  companionad: Arr(Banner),
+  companiontype: Arr(IntEnum(1, 3)),
+});
+/*
+const Audio = RichMediaType[extend](['maxseq', 'stitched'], {
+  feed: IntEnum(1, 3), nvol: IntEnum(0, 4),
+});
+ */
+const Video = RichMediaType[extend](['w', 'h', 'skip', 'skipmin', 'skipafter', 'boxingallowed'], {
+  pos: IntEnum(0, 7),
+  protocol: IntEnum(1, 10),
+  placement: IntEnum(1, 5),
+  linearity: IntEnum(1, 2),
+  playbackmethod: Arr(IntEnum(1, 6)),
+  playbackend: IntEnum(1, 3),
+});
+const Metric = Obj(['type', 'value', 'vendor']);
+const Imp = (() => {
+  const spec = {
+    metric: Arr(Metric), banner: Banner, video: Video, pmp: Pmp,
+  };
+  if (FEATURES.NATIVE) {
+    spec.native = Native;
+  }
+  return Floorable[extend](['displaymanager', 'displaymanagerver', 'instl', 'tagid', 'clickbrowser', 'secure', 'iframebuster', 'exp'], spec);
+})();
+
+const Regs = Obj(['coppa']);
+const Source = Obj(['fd', 'tid', 'pchain']);
+export const BidRequest = ID[extend](['test', 'at', 'tmax', 'wseat', 'bseat', 'allimps', 'cur', 'wlang', 'bcat', 'badv', 'bapp'], {
+  imp: Arr(Imp), site: Site, app: App, device: Device, user: User, source: Source, regs: Regs
+});

package/libraries/ortb2.5StrictTranslator/translator.js

@@ -0,0 +1,37 @@
+import {BidRequest} from './spec.js';
+import {logWarn} from '../../src/utils.js';
+import {toOrtb25} from '../ortb2.5Translator/translator.js';
+
+function deleteField(errno, path, obj, field, value) {
+  logWarn(`${path} is not valid ORTB 2.5, field will be removed from request:`, value);
+  Array.isArray(obj) ? obj.splice(field, 1) : delete obj[field];
+}
+
+/**
+ * Translates an ortb request to 2.5, and removes from the result any field that is:
+ *  - not defined in the 2.5 spec, or
+ *  - defined as an enum, but has a value that is not listed in the 2.5 spec.
+ *
+ * `ortb2` is modified in place and returned.
+ *
+ * Note that using this utility will cause your adapter to pull in an additional ~3KB after minification.
+ * If possible, consider making your endpoint tolerant to unrecognized or invalid fields instead.
+ *
+ *
+ * @param ortb2 ORTB request
+ * @param translator translation function. The default moves 2.x fields that have a known standard location in 2.5.
+ *                   See the `ortb2.5Translator` library.
+ * @param onError a function invoked once for each field that is not valid according to the 2.5 spec; it takes
+ *        (errno, path, obj, field, value), where:
+ *         - errno is an error code (defined in dsl.js)
+ *         - path is the JSON path of the offending field, for example `regs.gdpr`
+ *         - obj is the object containing the offending field, for example `ortb2.regs`
+ *         - field is the field name, for example `'gdpr'`
+ *         - value is `obj[field]`.
+ *        The default logs a warning and deletes the offending field.
+ */
+export function toOrtb25Strict(ortb2, translator = toOrtb25, onError = deleteField) {
+  ortb2 = translator(ortb2);
+  BidRequest(null, null, null, ortb2, onError);
+  return ortb2;
+}

package/libraries/ortb2.5Translator/translator.js

@@ -0,0 +1,82 @@
+import {deepAccess, deepSetValue, logError} from '../../src/utils.js';
+
+export const EXT_PROMOTIONS = [
+  'source.schain',
+  'regs.gdpr',
+  'regs.us_privacy',
+  'regs.gpp',
+  'user.consent',
+  'user.eids'
+];
+
+export function splitPath(path) {
+  const parts = path.split('.');
+  const prefix = parts.slice(0, parts.length - 1).join('.');
+  const field = parts[parts.length - 1];
+  return [prefix, field];
+}
+
+/**
+ * @param sourcePath a JSON path such as `regs.us_privacy`
+ * @param dest {function(String, String): String} a function taking (prefix, field) and returning a destination path;
+ *             for example, ('regs', 'us_privacy') => 'regs.ext.us_privacy'
+ * @return {(function({}): (function(): void|undefined))|*} a function that takes an object and, if it contains
+ *        sourcePath, copies its contents to destinationPath, returning a function that deletes the original sourcePath.
+ */
+export function moveRule(sourcePath, dest = (prefix, field) => `${prefix}.ext.${field}`) {
+  const [prefix, field] = splitPath(sourcePath);
+  dest = dest(prefix, field);
+  return (ortb2) => {
+    const obj = deepAccess(ortb2, prefix);
+    if (obj?.[field] != null) {
+      deepSetValue(ortb2, dest, obj[field]);
+      return () => delete obj[field];
+    }
+  };
+}
+
+function kwarrayRule(section) {
+  // move 2.6 `kwarray` into 2.5 comma-separated `keywords`.
+  return (ortb2) => {
+    const kwarray = ortb2[section]?.kwarray;
+    if (kwarray != null) {
+      let kw = (ortb2[section].keywords || '').split(',');
+      if (Array.isArray(kwarray)) kw.push(...kwarray);
+      ortb2[section].keywords = kw.join(',');
+      return () => delete ortb2[section].kwarray;
+    }
+  };
+}
+
+export const DEFAULT_RULES = Object.freeze([
+  ...EXT_PROMOTIONS.map((f) => moveRule(f)),
+  ...['app', 'content', 'site', 'user'].map(kwarrayRule)
+]);
+
+/**
+ * Factory for ORTB 2.5 translation functions.
+ *
+ * @param deleteFields if true, the translation function will remove fields that have been translated (transferred somewhere else within the request)
+ * @param rules translation rules; an array of functions of the type returned by `moveRule`
+ * @return {function({}): {}} a translation function that takes an ORTB object, modifies it in place, and returns it.
+ */
+export function ortb25Translator(deleteFields = true, rules = DEFAULT_RULES) {
+  return function (ortb2) {
+    rules.forEach(f => {
+      try {
+        const deleter = f(ortb2);
+        if (typeof deleter === 'function' && deleteFields) deleter();
+      } catch (e) {
+        logError('Error translating request to ORTB 2.5', e);
+      }
+    })
+    return ortb2;
+  }
+}
+
+/**
+ * Translate an ortb request to version 2.5 by moving 2.6 (and later) fields that have a standardized 2.5 extension.
+ *
+ * The request is modified in place and returned.
+ */
+export const toOrtb25 = ortb25Translator();

package/modules/33acrossIdSystem.js

@@ -13,6 +13,7 @@ import { uspDataHandler } from '../src/adapterManager.js';
 const MODULE_NAME = '33acrossId';
 const API_URL = 'https://lexicon.33across.com/v1/envelope';
 const AJAX_TIMEOUT = 10000;
+const CALLER_NAME = 'pbjs';
 
 function getEnvelope(response) {
   if (!response.succeeded) {
@@ -36,6 +37,8 @@ function calculateQueryStringParams(pid, gdprConsentData) {
   const params = {
     pid,
     gdpr: Number(gdprApplies),
+    src: CALLER_NAME,
+    ver: '$prebid.version$'
   };
 
   if (uspString) {

package/modules/adhashBidAdapter.js

@@ -1,10 +1,12 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {includes} from '../src/polyfill.js';
-import {BANNER} from '../src/mediaTypes.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { includes } from '../src/polyfill.js';
+import { BANNER } from '../src/mediaTypes.js';
 
-const VERSION = '1.0';
+const VERSION = '3.2';
 const BAD_WORD_STEP = 0.1;
 const BAD_WORD_MIN = 0.2;
+const ADHASH_BIDDER_CODE = 'adhash';
 
 /**
  * Function that checks the page where the ads are being served for brand safety.
@@ -54,43 +56,92 @@ function brandSafety(badWords, maxScore) {
     return positive ? result : -result;
   };
 
+  /**
+   * Checks what rule will match in the given array with words
+   * @param {string} rule rule type (full, partial, starts, ends, regexp)
+   * @param {string} decodedWord decoded word
+   * @param {array} wordsToMatch array to find a match
+   * @returns {object|boolean} matched rule and occurances. If nothing is matched returns false
+   */
+  const wordsMatchedWithRule = function (rule, decodedWord, wordsToMatch) {
+    if (rule === 'full' && wordsToMatch && wordsToMatch.includes(decodedWord)) {
+      return { rule, occurances: wordsToMatch.filter(element => element === decodedWord).length };
+    } else if (rule === 'partial' && wordsToMatch && wordsToMatch.some(element => element.indexOf(decodedWord) > -1)) {
+      return { rule, occurances: wordsToMatch.filter(element => element.indexOf(decodedWord) > -1).length };
+    } else if (rule === 'starts' && wordsToMatch && wordsToMatch.some(word => word.startsWith(decodedWord))) {
+      return { rule, occurances: wordsToMatch.filter(element => element.startsWith(decodedWord)).length };
+    } else if (rule === 'ends' && wordsToMatch && wordsToMatch.some(word => word.endsWith(decodedWord))) {
+      return { rule, occurances: wordsToMatch.filter(element => element.endsWith(decodedWord)).length };
+    } else if (rule === 'regexp' && wordsToMatch && wordsToMatch.some(element => element.match(new RegExp(decodedWord, 'i')))) {
+      return { rule, occurances: wordsToMatch.filter(element => element.match(new RegExp(decodedWord, 'i'))).length };
+    }
+    return false;
+  };
+
   // Default parameters if the bidder is unable to send some of them
   badWords = badWords || [];
   maxScore = parseInt(maxScore) || 10;
 
   try {
     let score = 0;
+    const decodedUrl = decodeURI(window.top.location.href.substring(window.top.location.origin.length));
+    const wordsAndNumbersInUrl = decodedUrl
+      .replaceAll(/[-,\._/\?=&#%]/g, ' ')
+      .replaceAll(/\s\s+/g, ' ')
+      .toLowerCase()
+      .trim();
     const content = window.top.document.body.innerText.toLowerCase();
-    const words = content.trim().split(/\s+/).length;
+    const contentWords = content.trim().split(/\s+/).length;
+    // \p{L} matches a single unicode code point in the category 'letter'. Matches any kind of letter from any language.
+    const regexp = new RegExp('[\\p{L}]+', 'gu');
+    const words = content.match(regexp);
+    const wordsInUrl = wordsAndNumbersInUrl.match(regexp);
+
     for (const [word, rule, points] of badWords) {
-      if (rule === 'full' && new RegExp('\\b' + rot13(word) + '\\b', 'i').test(content)) {
-        const occurances = content.match(new RegExp('\\b' + rot13(word) + '\\b', 'g')).length;
-        score += scoreCalculator(points, occurances);
-      } else if (rule === 'partial' && content.indexOf(rot13(word.toLowerCase())) > -1) {
-        const occurances = content.match(new RegExp(rot13(word), 'g')).length;
-        score += scoreCalculator(points, occurances);
+      const decodedWord = rot13(word.toLowerCase());
+
+      // Checks the words in the url of the page only for negative words. Don't serve any ad when at least one match is found
+      if (points > 0) {
+        const matchedRuleInUrl = wordsMatchedWithRule(rule, decodedWord, wordsInUrl);
+        if (matchedRuleInUrl.rule) {
+          return false;
+        }
+      }
+
+      // Check if site content's words match any of our brand safety rules
+      const matchedRule = wordsMatchedWithRule(rule, decodedWord, words);
+      if (matchedRule.rule === 'full') {
+        score += scoreCalculator(points, matchedRule.occurances);
+      } else if (matchedRule.rule === 'partial') {
+        score += scoreCalculator(points, matchedRule.occurances);
+      } else if (matchedRule.rule === 'starts') {
+        score += scoreCalculator(points, matchedRule.occurances);
+      } else if (matchedRule.rule === 'ends') {
+        score += scoreCalculator(points, matchedRule.occurances);
+      } else if (matchedRule.rule === 'regexp') {
+        score += scoreCalculator(points, matchedRule.occurances);
       }
     }
-    return score < maxScore * words / 500;
+    return score < (maxScore * contentWords) / 1000;
   } catch (e) {
     return true;
   }
 }
 
 export const spec = {
-  code: 'adhash',
-  url: 'https://bidder.adhash.com/rtb?version=' + VERSION + '&prebid=true',
+  code: ADHASH_BIDDER_CODE,
   supportedMediaTypes: [ BANNER ],
 
   isBidRequestValid: (bid) => {
     try {
-      const { publisherId, platformURL } = bid.params;
+      const { publisherId, platformURL, bidderURL } = bid.params;
       return (
         includes(Object.keys(bid.mediaTypes), BANNER) &&
         typeof publisherId === 'string' &&
         publisherId.length === 42 &&
         typeof platformURL === 'string' &&
-        platformURL.length >= 13
+        platformURL.length >= 13 &&
+        (!bidderURL || bidderURL.indexOf('https://') === 0)
       );
     } catch (error) {
       return false;
@@ -98,24 +149,51 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests, bidderRequest) => {
+    const storage = getStorageManager({ bidderCode: ADHASH_BIDDER_CODE });
     const { gdprConsent } = bidderRequest;
-    const { url } = spec;
     const bidRequests = [];
-    let referrer = '';
-    if (bidderRequest && bidderRequest.refererInfo) {
-      // TODO: is 'page' the right value here?
-      referrer = bidderRequest.refererInfo.page;
-    }
-    for (var i = 0; i < validBidRequests.length; i++) {
-      var index = Math.floor(Math.random() * validBidRequests[i].sizes.length);
-      var size = validBidRequests[i].sizes[index].join('x');
+    const body = document.body;
+    const html = document.documentElement;
+    const pageHeight = Math.max(
+      body.scrollHeight,
+      body.offsetHeight,
+      html.clientHeight,
+      html.scrollHeight,
+      html.offsetHeight
+    );
+    const pageWidth = Math.max(body.scrollWidth, body.offsetWidth, html.clientWidth, html.scrollWidth, html.offsetWidth);
+
+    for (let i = 0; i < validBidRequests.length; i++) {
+      const bidderURL = validBidRequests[i].params.bidderURL || 'https://bidder.adhash.com';
+      const url = `${bidderURL}/rtb?version=${VERSION}&prebid=true`;
+      const index = Math.floor(Math.random() * validBidRequests[i].sizes.length);
+      const size = validBidRequests[i].sizes[index].join('x');
+
+      let recentAds = [];
+      if (storage.localStorageIsEnabled()) {
+        const prefix = validBidRequests[i].params.prefix || 'adHash';
+        recentAds = JSON.parse(storage.getDataFromLocalStorage(prefix + 'recentAds') || '[]');
+      }
+
+      // Needed for the ad density calculation
+      var adHeight = validBidRequests[i].sizes[index][1];
+      var adWidth = validBidRequests[i].sizes[index][0];
+      if (!window.adsCount) {
+        window.adsCount = 0;
+      }
+      if (!window.adsTotalSurface) {
+        window.adsTotalSurface = 0;
+      }
+      window.adsTotalSurface += adHeight * adWidth;
+      window.adsCount++;
+
       bidRequests.push({
         method: 'POST',
         url: url + '&publisher=' + validBidRequests[i].params.publisherId,
         bidRequest: validBidRequests[i],
         data: {
           timezone: new Date().getTimezoneOffset() / 60,
-          location: referrer,
+          location: bidderRequest.refererInfo ? bidderRequest.refererInfo.topmostLocation : '',
           publisherId: validBidRequests[i].params.publisherId,
           size: {
             screenWidth: window.screen.width,
@@ -131,10 +209,14 @@ export const spec = {
             position: validBidRequests[i].adUnitCode
           }],
           blockedCreatives: [],
-          currentTimestamp: new Date().getTime(),
-          recentAds: [],
+          currentTimestamp: (new Date().getTime() / 1000) | 0,
+          recentAds: recentAds,
           GDPRApplies: gdprConsent ? gdprConsent.gdprApplies : null,
-          GDPR: gdprConsent ? gdprConsent.consentString : null
+          GDPR: gdprConsent ? gdprConsent.consentString : null,
+          servedAdsCount: window.adsCount,
+          adsTotalSurface: window.adsTotalSurface,
+          pageHeight: pageHeight,
+          pageWidth: pageWidth
         },
         options: {
           withCredentials: false,
@@ -157,7 +239,11 @@ export const spec = {
     }
 
     const publisherURL = JSON.stringify(request.bidRequest.params.platformURL);
+    const bidderURL = request.bidRequest.params.bidderURL || 'https://bidder.adhash.com';
     const oneTimeId = request.bidRequest.adUnitCode + Math.random().toFixed(16).replace('0.', '.');
+    const globalScript = !request.bidRequest.params.globalScript
+      ? `<script src="${bidderURL}/static/scripts/creative.min.js"></script>`
+      : '';
     const bidderResponse = JSON.stringify({ responseText: JSON.stringify(responseBody) });
     const requestData = JSON.stringify(request.data);
 
@@ -165,8 +251,7 @@ export const spec = {
       requestId: request.bidRequest.bidId,
       cpm: responseBody.creatives[0].costEUR,
       ad:
-        `<div id="${oneTimeId}"></div>
-        <script src="https://bidder.adhash.com/static/scripts/creative.min.js"></script>
+        `<div id="${oneTimeId}"></div>${globalScript}
         <script>callAdvertiser(${bidderResponse},['${oneTimeId}'],${requestData},${publisherURL})</script>`,
       width: request.bidRequest.sizes[0][0],
       height: request.bidRequest.sizes[0][1],

package/modules/adhashBidAdapter.md

@@ -3,7 +3,7 @@
 ```
 Module Name: AdHash Bidder Adapter
 Module Type: Bidder Adapter
-Maintainer: damyan@adhash.org
+Maintainer: damyan@adhash.com
 ```
 
 # Description
@@ -14,8 +14,6 @@ Here is what you need for Prebid integration with AdHash:
 3. Use the Publisher ID and Platform URL as parameters in params.
 
 Please note that a number of AdHash functionalities are not supported in the Prebid.js integration:
-* Cookie-less frequency and recency capping;
-* Audience segments;
 * Price floors and passback tags, as they are not needed in the Prebid.js setup;
 * Reservation for direct deals only, as bids are evaluated based on their price.
 

package/modules/discoveryBidAdapter.js

@@ -277,6 +277,8 @@ function getItems(validBidRequests, bidderRequest) {
 function getParam(validBidRequests, bidderRequest) {
   const pubcid = utils.deepAccess(validBidRequests[0], 'crumbs.pubcid');
   let isMobile = getDevice() ? 1 : 0;
+  // input test status by Publisher. more frequently for test true req
+  let isTest = validBidRequests[0].params.test || 0;
   let auctionId = getKv(bidderRequest, 'auctionId');
   let items = getItems(validBidRequests, bidderRequest);
 
@@ -290,6 +292,7 @@ function getParam(validBidRequests, bidderRequest) {
   if (items && items.length) {
     let c = {
       id: 'pp_hbjs_' + auctionId,
+      test: +isTest,
       at: 1,
       bcat: globals['bcat'],
       badv: globals['adv'],

package/modules/kargoBidAdapter.js

@@ -231,7 +231,7 @@ export const spec = {
   _getAllMetadata(bidderRequest, tdid) {
     return {
       userIDs: spec._getUserIds(tdid, bidderRequest.uspConsent, bidderRequest.gdprConsent),
-      pageURL: bidderRequest?.refererInfo?.topmostLocation || bidderRequest?.refererInfo?.page,
+      pageURL: bidderRequest?.refererInfo?.page,
       rawCRB: storage.getCookie('krg_crb'),
       rawCRBLocalStorage: spec._getLocalStorageSafely('krg_crb')
     };

package/modules/lassoBidAdapter.js

@@ -54,7 +54,7 @@ export const spec = {
 
       return {
         method: 'GET',
-        url: getBidRequestUrl(aimXR),
+        url: getBidRequestUrl(aimXR, bidRequest.params),
         data: payload,
         options: {
           withCredentials: true
@@ -113,11 +113,15 @@ export const spec = {
   supportedMediaTypes: [BANNER]
 }
 
-function getBidRequestUrl(aimXR) {
+function getBidRequestUrl(aimXR, params) {
+  let path = '/request';
+  if (params && params.dtc) {
+    path = '/dtc-request';
+  }
   if (!aimXR) {
-    return GET_IUD_URL + ENDPOINT_URL + '/request';
+    return GET_IUD_URL + ENDPOINT_URL + path;
   }
-  return ENDPOINT_URL + '/request'
+  return ENDPOINT_URL + path;
 }
 
 function getDeviceData() {

package/modules/liveIntentIdSystem.js

@@ -10,7 +10,6 @@ import { submodule } from '../src/hook.js';
 import { LiveConnect } from 'live-connect-js/esm/initializer.js';
 import { gdprDataHandler, uspDataHandler } from '../src/adapterManager.js';
 import { getStorageManager } from '../src/storageManager.js';
-import { MinimalLiveConnect } from 'live-connect-js/esm/minimal-live-connect.js';
 
 const MODULE_NAME = 'liveIntentId';
 export const storage = getStorageManager({gvlid: null, moduleName: MODULE_NAME});
@@ -140,7 +139,7 @@ export const liveIntentIdSubmodule = {
     this.moduleMode = mode
   },
   getInitializer() {
-    return this.moduleMode === 'minimal' ? MinimalLiveConnect : LiveConnect
+    return (liveConnectConfig, storage, calls) => LiveConnect(liveConnectConfig, storage, calls, this.moduleMode)
   },
 
   /**

package/modules/mediagoBidAdapter.js

@@ -297,7 +297,8 @@ function getParam(validBidRequests, bidderRequest) {
     utils.deepAccess(validBidRequests[0], 'userId.sharedid.id') ||
     utils.deepAccess(validBidRequests[0], 'userId.pubcid');
   let isMobile = isMobileAndTablet() ? 1 : 0;
-  let isTest = 0;
+  // input test status by Publisher. more frequently for test true req
+  let isTest = validBidRequests[0].params.test || 0;
   let auctionId = getProperty(bidderRequest, 'auctionId');
   let items = getItems(validBidRequests, bidderRequest);