WEB-3536: fetch api changes

clevertap.js

@@ -7442,7 +7442,8 @@
     globalUnsubscribe: true,
     flutterVersion: null,
     variableStore: {},
-    pushConfig: null // domain: window.location.hostname, url -> getHostName()
+    pushConfig: null,
+    enableFetchApi: false // domain: window.location.hostname, url -> getHostName()
     // gcookie: -> device
 
   };
@@ -8476,6 +8477,44 @@
       _classPrivateFieldLooseBase(this, _fireRequest)[_fireRequest](url, 1, skipARP, sendOULFlag, evtName);
     }
 
+    static async handleFetchResponse(url) {
+      try {
+        const response = await fetch(url, {
+          method: 'GET',
+          headers: {
+            Accept: 'application/json'
+          }
+        });
+
+        if (!response.ok) {
+          throw new Error("Network response was not ok: ".concat(response.statusText));
+        }
+
+        const jsonResponse = await response.json();
+        const {
+          tr,
+          meta,
+          wpe
+        } = jsonResponse;
+
+        if (tr) {
+          window.$WZRK_WR.tr(tr);
+        }
+
+        if (meta) {
+          window.$WZRK_WR.s(meta);
+        }
+
+        if (wpe) {
+          window.$WZRK_WR.enableWebPush(wpe.enabled, wpe.key);
+        }
+
+        this.logger.debug('req snt -> url: ' + url);
+      } catch (error) {
+        this.logger.error('Fetch error:', error);
+      }
+    }
+
     getDelayFrequency() {
       this.logger.debug('Network retry #' + this.networkRetryCount); // Retry with delay as 1s for first 10 retries
 
@@ -8542,7 +8581,7 @@
     return this.device.gcookie.slice(-3) === OPTOUT_COOKIE_ENDSWITH;
   };
 
-  var _fireRequest2 = function _fireRequest2(url, tries, skipARP, sendOULFlag, evtName) {
+  var _fireRequest2 = async function _fireRequest2(url, tries, skipARP, sendOULFlag, evtName) {
     var _window$clevertap, _window$wizrocket;
 
     if (_classPrivateFieldLooseBase(this, _dropRequestDueToOptOut)[_dropRequestDueToOptOut]()) {
@@ -8620,14 +8659,18 @@
       ctCbScripts[0].parentNode.removeChild(ctCbScripts[0]);
     }
 
-    const s = document.createElement('script');
-    s.setAttribute('type', 'text/javascript');
-    s.setAttribute('src', url);
-    s.setAttribute('class', 'ct-jp-cb');
-    s.setAttribute('rel', 'nofollow');
-    s.async = true;
-    document.getElementsByTagName('head')[0].appendChild(s);
-    this.logger.debug('req snt -> url: ' + url);
+    if (!$ct.enableFetchApi) {
+      const s = document.createElement('script');
+      s.setAttribute('type', 'text/javascript');
+      s.setAttribute('src', url);
+      s.setAttribute('class', 'ct-jp-cb');
+      s.setAttribute('rel', 'nofollow');
+      s.async = true;
+      document.getElementsByTagName('head')[0].appendChild(s);
+      this.logger.debug('req snt -> url: ' + url);
+    } else {
+      this.handleFetchResponse(url);
+    }
   };
 
   RequestDispatcher.logger = void 0;
@@ -16143,6 +16186,8 @@
 
   var _pageChangeTimeoutId = _classPrivateFieldLooseKey("pageChangeTimeoutId");
 
+  var _enableFetchApi = _classPrivateFieldLooseKey("enableFetchApi");
+
   var _processOldValues = _classPrivateFieldLooseKey("processOldValues");
 
   var _debounce = _classPrivateFieldLooseKey("debounce");
@@ -16189,6 +16234,15 @@
       $ct.dismissSpamControl = dismissSpamControl;
     }
 
+    get enableFetchApi() {
+      return _classPrivateFieldLooseBase(this, _enableFetchApi)[_enableFetchApi];
+    }
+
+    set enableFetchApi(value) {
+      _classPrivateFieldLooseBase(this, _enableFetchApi)[_enableFetchApi] = value;
+      $ct.enableFetchApi = value;
+    }
+
     constructor() {
       var _clevertap$account, _clevertap$account2, _clevertap$account3, _clevertap$account4, _clevertap$account5, _clevertap$config, _clevertap$config2, _clevertap$account6;
 
@@ -16270,6 +16324,10 @@
         writable: true,
         value: void 0
       });
+      Object.defineProperty(this, _enableFetchApi, {
+        writable: true,
+        value: void 0
+      });
       this.popupCallbacks = {};
       this.popupCurrentWzrkId = '';
       _classPrivateFieldLooseBase(this, _onloadcalled)[_onloadcalled] = 0;
@@ -16293,6 +16351,7 @@
       });
       _classPrivateFieldLooseBase(this, _dismissSpamControl)[_dismissSpamControl] = clevertap.dismissSpamControl || false;
       this.shpfyProxyPath = clevertap.shpfyProxyPath || '';
+      _classPrivateFieldLooseBase(this, _enableFetchApi)[_enableFetchApi] = clevertap.enableFetchApi || false;
       _classPrivateFieldLooseBase(this, _session)[_session] = new SessionManager({
         logger: _classPrivateFieldLooseBase(this, _logger)[_logger],
         isPersonalisationActive: this._isPersonalisationActive
@@ -16347,6 +16406,7 @@
       });
       this.spa = clevertap.spa;
       this.dismissSpamControl = clevertap.dismissSpamControl;
+      this.enableFetchApi = clevertap.enableFetchApi;
       this.user = new User({
         isPersonalisationActive: this._isPersonalisationActive
       });
@@ -17010,6 +17070,11 @@
         this.createCustomIdIfValid(config.customId);
       }
 
+      if (config.enableFetchApi) {
+        _classPrivateFieldLooseBase(this, _enableFetchApi)[_enableFetchApi] = config.enableFetchApi;
+        $ct.enableFetchApi = config.enableFetchApi;
+      }
+
       const currLocation = location.href;
       const urlParams = getURLParams(currLocation.toLowerCase()); // eslint-disable-next-line eqeqeq
 

package.json

@@ -42,6 +42,7 @@
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
     "jest": "^26.4.2",
+    "regenerator-runtime": "^0.14.1",
     "rollup": "^2.26.5",
     "rollup-plugin-eslint": "^7.0.0",
     "rollup-plugin-sourcemaps": "^0.6.3",

src/clevertap.js

@@ -68,6 +68,7 @@ export default class CleverTap {
   #dismissSpamControl
   enablePersonalization
   #pageChangeTimeoutId
+  #enableFetchApi
 
   get spa () {
     return this.#isSpa
@@ -96,6 +97,15 @@ export default class CleverTap {
     $ct.dismissSpamControl = dismissSpamControl
   }
 
+  get enableFetchApi () {
+    return this.#enableFetchApi
+  }
+
+  set enableFetchApi (value) {
+    this.#enableFetchApi = value
+    $ct.enableFetchApi = value
+  }
+
   constructor (clevertap = {}) {
     this.#onloadcalled = 0
     this._isPersonalisationActive = this._isPersonalisationActive.bind(this)
@@ -114,6 +124,7 @@ export default class CleverTap {
     this.#device = new DeviceManager({ logger: this.#logger, customId: result?.isValid ? result?.sanitizedId : null })
     this.#dismissSpamControl = clevertap.dismissSpamControl || false
     this.shpfyProxyPath = clevertap.shpfyProxyPath || ''
+    this.#enableFetchApi = clevertap.enableFetchApi || false
     this.#session = new SessionManager({
       logger: this.#logger,
       isPersonalisationActive: this._isPersonalisationActive
@@ -175,6 +186,7 @@ export default class CleverTap {
 
     this.spa = clevertap.spa
     this.dismissSpamControl = clevertap.dismissSpamControl
+    this.enableFetchApi = clevertap.enableFetchApi
 
     this.user = new User({
       isPersonalisationActive: this._isPersonalisationActive
@@ -717,6 +729,11 @@ export default class CleverTap {
       this.createCustomIdIfValid(config.customId)
     }
 
+    if (config.enableFetchApi) {
+      this.#enableFetchApi = config.enableFetchApi
+      $ct.enableFetchApi = config.enableFetchApi
+    }
+
     const currLocation = location.href
     const urlParams = getURLParams(currLocation.toLowerCase())
 

src/util/requestDispatcher.js

@@ -13,7 +13,7 @@ export default class RequestDispatcher {
   minDelayFrequency = 0
 
   // ANCHOR - Requests get fired from here
-  static #fireRequest (url, tries, skipARP, sendOULFlag, evtName) {
+  static async #fireRequest (url, tries, skipARP, sendOULFlag, evtName) {
     if (this.#dropRequestDueToOptOut()) {
       this.logger.debug('req dropped due to optout cookie: ' + this.device.gcookie)
       return
@@ -82,14 +82,18 @@ export default class RequestDispatcher {
     while (ctCbScripts[0] && ctCbScripts[0].parentNode) {
       ctCbScripts[0].parentNode.removeChild(ctCbScripts[0])
     }
-    const s = document.createElement('script')
-    s.setAttribute('type', 'text/javascript')
-    s.setAttribute('src', url)
-    s.setAttribute('class', 'ct-jp-cb')
-    s.setAttribute('rel', 'nofollow')
-    s.async = true
-    document.getElementsByTagName('head')[0].appendChild(s)
-    this.logger.debug('req snt -> url: ' + url)
+    if (!$ct.enableFetchApi) {
+      const s = document.createElement('script')
+      s.setAttribute('type', 'text/javascript')
+      s.setAttribute('src', url)
+      s.setAttribute('class', 'ct-jp-cb')
+      s.setAttribute('rel', 'nofollow')
+      s.async = true
+      document.getElementsByTagName('head')[0].appendChild(s)
+      this.logger.debug('req snt -> url: ' + url)
+    } else {
+      this.handleFetchResponse(url)
+    }
   }
 
   /**
@@ -130,6 +134,29 @@ export default class RequestDispatcher {
     return url
   }
 
+  static async handleFetchResponse (url) {
+    try {
+      const response = await fetch(url, { method: 'GET', headers: { Accept: 'application/json' } })
+      if (!response.ok) {
+        throw new Error(`Network response was not ok: ${response.statusText}`)
+      }
+      const jsonResponse = await response.json()
+      const { tr, meta, wpe } = jsonResponse
+      if (tr) {
+        window.$WZRK_WR.tr(tr)
+      }
+      if (meta) {
+        window.$WZRK_WR.s(meta)
+      }
+      if (wpe) {
+        window.$WZRK_WR.enableWebPush(wpe.enabled, wpe.key)
+      }
+      this.logger.debug('req snt -> url: ' + url)
+    } catch (error) {
+      this.logger.error('Fetch error:', error)
+    }
+  }
+
   getDelayFrequency () {
     this.logger.debug('Network retry #' + this.networkRetryCount)
 

src/util/storage.js

@@ -275,7 +275,8 @@ export const $ct = {
   globalUnsubscribe: true,
   flutterVersion: null,
   variableStore: {},
-  pushConfig: null
+  pushConfig: null,
+  enableFetchApi: false
   // domain: window.location.hostname, url -> getHostName()
   // gcookie: -> device
 }