Adagio*: add adagioUtils.js, remove duplicated code (#11849)

libraries/adagioUtils/adagioUtils.js

@@ -0,0 +1,35 @@
+import {
+ canAccessWindowTop,
+ generateUUID,
+ getWindowSelf,
+ getWindowTop,
+ isSafeFrameWindow
+} from '../../src/utils.js';
+
+/**
+ * Returns the best Window object to use with ADAGIO.
+ * @returns {Window} window.top or window.self object
+ */
+export function getBestWindowForAdagio() {
+ return (canAccessWindowTop()) ? getWindowTop() : getWindowSelf();
+}
+
+/**
+ * Returns the window.ADAGIO global object used to store Adagio data.
+ * This object is created in window.top if possible, otherwise in window.self.
+ */
+export const _ADAGIO = (function() {
+ const w = getBestWindowForAdagio();
+
+ w.ADAGIO = w.ADAGIO || {};
+ w.ADAGIO.pageviewId = w.ADAGIO.pageviewId || generateUUID();
+ w.ADAGIO.adUnits = w.ADAGIO.adUnits || {};
+ w.ADAGIO.pbjsAdUnits = w.ADAGIO.pbjsAdUnits || [];
+ w.ADAGIO.queue = w.ADAGIO.queue || [];
+ w.ADAGIO.versions = w.ADAGIO.versions || {};
+ w.ADAGIO.versions.pbjs = '$prebid.version$';
+ w.ADAGIO.windows = w.ADAGIO.windows || [];
+ w.ADAGIO.isSafeFrameWindow = isSafeFrameWindow();
+
+ return w.ADAGIO;
+})();

modules/adagioBidAdapter.js

@@ -7,13 +7,11 @@ import {
  generateUUID,
  getDNT,
  getWindowSelf,
- getWindowTop,
  isArray,
  isArrayOfNums,
  isFn,
  isInteger,
  isNumber,
- isSafeFrameWindow,
  isStr,
  logError,
  logInfo,
@@ -26,6 +24,7 @@ import { config } from '../src/config.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 import { find } from '../src/polyfill.js';
 import { getGptSlotInfoForAdUnitCode } from '../libraries/gptUtils/gptUtils.js';
+import { _ADAGIO } from '../libraries/adagioUtils/adagioUtils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { userSync } from '../src/userSync.js';
 
@@ -78,21 +77,6 @@ export const ORTB_VIDEO_PARAMS = {
  * Returns the window.ADAGIO global object used to store Adagio data.
  * This object is created in window.top if possible, otherwise in window.self.
  */
-const _ADAGIO = (function() {
- const w = (canAccessWindowTop()) ? getWindowTop() : getWindowSelf();
-
- w.ADAGIO = w.ADAGIO || {};
- w.ADAGIO.pageviewId = w.ADAGIO.pageviewId || generateUUID();
- w.ADAGIO.adUnits = w.ADAGIO.adUnits || {};
- w.ADAGIO.pbjsAdUnits = w.ADAGIO.pbjsAdUnits || [];
- w.ADAGIO.queue = w.ADAGIO.queue || [];
- w.ADAGIO.versions = w.ADAGIO.versions || {};
- w.ADAGIO.versions.pbjs = '$prebid.version$';
- w.ADAGIO.isSafeFrameWindow = isSafeFrameWindow();
-
- return w.ADAGIO;
-})();
-
 function getDevice() {
  const language = navigator.language ? 'language' : 'userLanguage';
  return {

modules/adagioRtdProvider.js

@@ -26,6 +26,7 @@ import {
  isStr,
  prefixLog
 } from '../src/utils.js';
+import { _ADAGIO, getBestWindowForAdagio } from '../libraries/adagioUtils/adagioUtils.js';
 import { getGptSlotInfoForAdUnitCode } from '../libraries/gptUtils/gptUtils.js';
 
 /**
@@ -44,23 +45,6 @@ const { logError, logWarn } = prefixLog('AdagioRtdProvider:');
 // Guard to avoid storing the same bid data several times.
 const guard = new Set();
 
-/**
- * Returns the window.ADAGIO global object used to store Adagio data.
- * This object is created in window.top if possible, otherwise in window.self.
- */
-const _ADAGIO = (function() {
- const w = (canAccessWindowTop()) ? getWindowTop() : getWindowSelf();
-
- w.ADAGIO = w.ADAGIO || {};
- w.ADAGIO.pageviewId = w.ADAGIO.pageviewId || generateUUID();
- w.ADAGIO.adUnits = w.ADAGIO.adUnits || {};
- w.ADAGIO.pbjsAdUnits = w.ADAGIO.pbjsAdUnits || [];
- w.ADAGIO.queue = w.ADAGIO.queue || [];
- w.ADAGIO.windows = w.ADAGIO.windows || [];
-
- return w.ADAGIO;
-})();
-
 /**
  * Store the sampling data.
  * This data is used to determine if beacons should be sent to adagio.
@@ -133,7 +117,7 @@ const _FEATURES = (function() {
  features.data = {};
  },
  get: function() {
- const w = (canAccessWindowTop()) ? getWindowTop() : getWindowSelf();
+ const w = getBestWindowForAdagio();
 
  if (!features.initialized) {
  features.data = {