Merge branch 'refs/heads/master' into DEP-11967-Cookie-Sync-Prebid.js-integration

Author: IlliaMil

.github/workflows/PR-assignment-deps.yml

@@ -20,15 +20,15 @@ jobs:
         run: |
           npx gulp build
       - name: Upload dependencies.json
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: dependencies.json
           path: ./build/dist/dependencies.json
       - name: Generate PR info
         run: |
           echo '{ "prNo": ${{ github.event.pull_request.number }} }' >> ${{ runner.temp}}/prInfo.json
       - name: Upload PR info
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: prInfo
           path: ${{ runner.temp}}/prInfo.json

.github/workflows/jscpd.yml

@@ -119,7 +119,7 @@ jobs:
 
     - name: Upload comment data
       if: env.filtered_report_exists == 'true'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: comment
         path: ${{ runner.temp }}/comment.json

.github/workflows/linter.yml

@@ -117,7 +117,7 @@ jobs:
 
       - name: Upload comment data
         if: ${{ steps.comment.outputs.result == 'true' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: comment
           path: ${{ runner.temp }}/comment.json

integrationExamples/audio/audioGam.html

@@ -115,9 +115,11 @@
 
             const bid = bidResponse.bids[0];
 
+            const adUnit = adUnits.find(au => au.code === 'div-gpt-ad-51545-0');
+
             const adXml = await pbjs.adServers.gam.getVastXml({
               bid,
-              adUnit: 'div-gpt-ad-51545-0',
+              adUnit,
               params: {
                 iu: '/41758329/localcache',
                 url: "https://pubads.g.doubleclick.net/gampad/ads?iu=/41758329/localcache&sz=640x480&gdfp_req=1&output=vast&env=vp",

integrationExamples/gpt/localCacheGam.html

@@ -13,6 +13,8 @@
       mediaTypes: {
         video: {
             playerSize: [640, 360], 
+            playbackmethod: [2, 6],
+            api: [2, 7, 8],
         }
       },
       video: {
@@ -95,9 +97,11 @@
 
             const bid = bidResponse.bids[0];
 
+            const adUnit = adUnits.find(au => au.code === 'div-gpt-ad-51545-0');
+
             const vastXml = await pbjs.adServers.gam.getVastXml({
               bid,
-              adUnit: 'div-gpt-ad-51545-0',
+              adUnit,
               params: {
                 iu: '/41758329/localcache',
                 url: "https://pubads.g.doubleclick.net/gampad/ads?iu=/41758329/localcache&sz=640x480&gdfp_req=1&output=vast&env=vp",

libraries/intentIqConstants/intentIqConstants.js

@@ -12,6 +12,7 @@ export const GVLID = "1323";
 export const VERSION = 0.33;
 export const PREBID = "pbjs";
 export const HOURS_24 = 86400000;
+export const HOURS_72 = HOURS_24 * 3;
 
 export const INVALID_ID = "INVALID_ID";
 

libraries/intentIqUtils/getRefferer.js

@@ -4,19 +4,25 @@ import { getWindowTop, logError, getWindowLocation, getWindowSelf } from '../../
  * Determines if the script is running inside an iframe and retrieves the URL.
  * @return {string} The encoded vrref value representing the relevant URL.
  */
-export function getReferrer() {
+
+export function getCurrentUrl() {
+  let url = '';
   try {
-    const url = getWindowSelf() === getWindowTop()
-      ? getWindowLocation().href
-      : getWindowTop().location.href;
+    if (getWindowSelf() === getWindowTop()) {
+      // top page
+      url = getWindowLocation().href || '';
+    } else {
+      // iframe
+      url = getWindowTop().location.href || '';
+    }
 
     if (url.length >= 50) {
-      const { origin } = new URL(url);
-      return origin;
-    }
+      return new URL(url).origin;
+    };
 
     return url;
   } catch (error) {
+    // Handling access errors, such as cross-domain restrictions
     logError(`Error accessing location: ${error}`);
     return '';
   }
@@ -31,12 +37,12 @@ export function getReferrer() {
  * @return {string} The modified URL with appended `vrref` or `fui` parameters.
  */
 export function appendVrrefAndFui(url, domainName) {
-  const fullUrl = encodeURIComponent(getReferrer());
+  const fullUrl = getCurrentUrl();
   if (fullUrl) {
     return (url += '&vrref=' + getRelevantRefferer(domainName, fullUrl));
   }
   url += '&fui=1'; // Full Url Issue
-  url += '&vrref=' + encodeURIComponent(domainName || '');
+  if (domainName) url += '&vrref=' + encodeURIComponent(domainName);
   return url;
 }
 
@@ -47,10 +53,9 @@ export function appendVrrefAndFui(url, domainName) {
  * @return {string} The relevant referrer
  */
 export function getRelevantRefferer(domainName, fullUrl) {
-  if (domainName && isDomainIncluded(fullUrl, domainName)) {
-    return fullUrl;
-  }
-  return domainName ? encodeURIComponent(domainName) : fullUrl;
+  return encodeURIComponent(
+    domainName && isDomainIncluded(fullUrl, domainName) ? fullUrl : (domainName || fullUrl)
+  );
 }
 
 /**
@@ -61,7 +66,7 @@ export function getRelevantRefferer(domainName, fullUrl) {
  */
 export function isDomainIncluded(fullUrl, domainName) {
   try {
-    return fullUrl.includes(domainName);
+    return new URL(fullUrl).hostname === domainName;
   } catch (error) {
     logError(`Invalid URL provided: ${error}`);
     return false;

libraries/intentIqUtils/getUnitPosition.js

@@ -0,0 +1,17 @@
+export function getUnitPosition(pbjs, adUnitCode) {
+  const adUnits = pbjs?.adUnits;
+  if (!Array.isArray(adUnits) || !adUnitCode) return;
+
+  for (let i = 0; i < adUnits.length; i++) {
+    const adUnit = adUnits[i];
+    if (adUnit?.code !== adUnitCode) continue;
+
+    const mediaTypes = adUnit?.mediaTypes;
+    if (!mediaTypes || typeof mediaTypes !== 'object') return;
+
+    const firstKey = Object.keys(mediaTypes)[0];
+    const pos = mediaTypes[firstKey]?.pos;
+
+    return typeof pos === 'number' ? pos : undefined;
+  }
+}

libraries/intentIqUtils/intentIqConfig.js

@@ -1,3 +1,33 @@
-export const iiqServerAddress = (configParams, gdprDetected) => typeof configParams?.iiqServerAddress === 'string' ? configParams.iiqServerAddress : gdprDetected ? 'https://api-gdpr.intentiq.com' : 'https://api.intentiq.com'
-export const iiqPixelServerAddress = (configParams, gdprDetected) => typeof configParams?.iiqPixelServerAddress === 'string' ? configParams.iiqPixelServerAddress : gdprDetected ? 'https://sync-gdpr.intentiq.com' : 'https://sync.intentiq.com'
-export const reportingServerAddress = (reportEndpoint, gdprDetected) => reportEndpoint && typeof reportEndpoint === 'string' ? reportEndpoint : gdprDetected ? 'https://reports-gdpr.intentiq.com/report' : 'https://reports.intentiq.com/report'
+const REGION_MAPPING = {
+  gdpr: true,
+  apac: true,
+  emea: true
+};
+
+function checkRegion(region) {
+  if (typeof region !== 'string') return '';
+  const lower = region.toLowerCase();
+  return REGION_MAPPING[lower] ? lower : '';
+}
+
+function buildServerAddress(baseName, region) {
+  const checkedRegion = checkRegion(region);
+  if (checkedRegion) return `https://${baseName}-${checkedRegion}.intentiq.com`;
+  return `https://${baseName}.intentiq.com`;
+}
+
+export const getIiqServerAddress = (configParams = {}) => {
+  if (typeof configParams?.iiqServerAddress === 'string') return configParams.iiqServerAddress;
+  return buildServerAddress('api', configParams.region);
+};
+
+export const iiqPixelServerAddress = (configParams = {}) => {
+  if (typeof configParams?.iiqPixelServerAddress === 'string') return configParams.iiqPixelServerAddress;
+  return buildServerAddress('sync', configParams.region);
+};
+
+export const reportingServerAddress = (reportEndpoint, region) => {
+  if (reportEndpoint && typeof reportEndpoint === 'string') return reportEndpoint;
+  const host = buildServerAddress('reports', region);
+  return `${host}/report`;
+};

libraries/intentIqUtils/urlUtils.js

@@ -1,5 +1,7 @@
-export function appendSPData (url, firstPartyData) {
-  const spdParam = firstPartyData?.spd ? encodeURIComponent(typeof firstPartyData.spd === 'object' ? JSON.stringify(firstPartyData.spd) : firstPartyData.spd) : '';
-  url += spdParam ? '&spd=' + spdParam : '';
-  return url
+export function appendSPData (url, partnerData) {
+  const spdParam = partnerData?.spd ? encodeURIComponent(typeof partnerData.spd === 'object' ? JSON.stringify(partnerData.spd) : partnerData.spd) : '';
+  if (!spdParam) {
+    return url;
+  }
+  return `${url}&spd=${spdParam}`;
 };