From 6c783f88f477596eb44bd762441506ab3e9c4241 Mon Sep 17 00:00:00 2001
From: Olivier <osazos@adagio.io>
Date: Thu, 20 Jun 2024 19:04:18 +0200
Subject: [PATCH] Adagio*: add adagioUtils.js, remove duplicated code

---
 libraries/adagioUtils/adagioUtils.js | 35 ++++++++++++++++++++++++++++
 modules/adagioBidAdapter.js          | 18 +-------------
 modules/adagioRtdProvider.js         | 20 ++--------------
 3 files changed, 38 insertions(+), 35 deletions(-)
 create mode 100644 libraries/adagioUtils/adagioUtils.js

diff --git a/libraries/adagioUtils/adagioUtils.js b/libraries/adagioUtils/adagioUtils.js
new file mode 100644
index 00000000000..c2614c45d0c
--- /dev/null
+++ b/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;
+})();
diff --git a/modules/adagioBidAdapter.js b/modules/adagioBidAdapter.js
index 3cc31336827..8d945beafa1 100644
--- a/modules/adagioBidAdapter.js
+++ b/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 {
diff --git a/modules/adagioRtdProvider.js b/modules/adagioRtdProvider.js
index d76a27b17d7..75562580cd6 100644
--- a/modules/adagioRtdProvider.js
+++ b/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 = {