unique anonId and adblock request

rudderlabs · May 18, 2020 · 9e33e85 · 9e33e85
1 parent ca8cd92
commit 9e33e85
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 14 deletions.
diff --git a/analytics.js b/analytics.js
@@ -80,6 +80,7 @@ class Analytics {
     this.storage.setUserId(this.userId);
     this.deviceId = this.getDeviceId();
     this.eventRepository = EventRepository;
+    this.sendAdblockPage = false
     this.readyCallback = () => {};
     this.executeReadyCallback = undefined;
     this.methodToCallbackMapping = {
@@ -320,6 +321,9 @@ class Analytics {
       (options = properties), (properties = name), (name = null);
     if (typeof category === "string" && typeof name !== "string")
       (name = category), (category = null);
+    if(this.sendAdblockPage && category != "RudderJS-Initiated") {
+      this.sendSampleRequest()
+    }
     this.processPage(category, name, properties, options, callback);
   }
 
@@ -707,7 +711,6 @@ class Analytics {
   reset() {
     this.userId = "";
     this.userTraits = {};
-    this.anonymousId = this.setAnonymousId();
     this.storage.clear();
   }
 
@@ -744,6 +747,7 @@ class Analytics {
    * @memberof Analytics
    */
   load(writeKey, serverUrl, options) {
+    logger.debug("inside load ");
     let configUrl = CONFIG_URL;
     if (!writeKey || !serverUrl || serverUrl.length == 0) {
       handleError({
@@ -762,7 +766,9 @@ class Analytics {
     if (options && options.configUrl) {
       configUrl = options.configUrl;
     }
-    logger.debug("inside load ");
+    if(options && options.sendAdblockPage) {
+      this.sendAdblockPage = true
+    }
     this.eventRepository.writeKey = writeKey;
     if (serverUrl) {
       this.eventRepository.url = serverUrl;
@@ -821,7 +827,7 @@ class Analytics {
   }
 
   sendSampleRequest() {
-    ScriptLoader("ad-block", "//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js")
+    ScriptLoader("ad-block", "//pagead2.googlesyndication.com/pagead/js/adsbyrudder.js")
   }
 
 }
@@ -842,7 +848,7 @@ if (process.browser) {
 
 if (process.browser) {
   // test for adblocker
-  instance.sendSampleRequest()
+  // instance.sendSampleRequest()
 
   // register supported callbacks
   instance.registerCallbacks();

diff --git a/integrations/ScriptLoader.js b/integrations/ScriptLoader.js
@@ -3,6 +3,7 @@ function ScriptLoader(id, src) {
   logger.debug("in script loader=== " + id);
   let js = document.createElement("script");
   js.src = src;
+  js.async = true;
   js.type = "text/javascript";
   js.id = id;
   let e = document.getElementsByTagName("script")[0];

diff --git a/utils/storage/storage.js b/utils/storage/storage.js
@@ -174,7 +174,7 @@ class Storage {
   clear() {
     this.storage.remove(defaults.user_storage_key);
     this.storage.remove(defaults.user_storage_trait);
-    this.storage.remove(defaults.user_storage_anonymousId);
+    // this.storage.remove(defaults.user_storage_anonymousId);
   }
 }
 

diff --git a/utils/utils.js b/utils/utils.js
@@ -139,18 +139,24 @@ function getJSONTrimmed(context, url, writeKey, callback) {
 function handleError(error, analyticsInstance) {
   let errorMessage = error.message ? error.message : undefined;
   let sampleAdBlockTest = undefined
-  if (error instanceof Event) {
-    if (error.target && error.target.localName == "script") {
-      errorMessage = "error in script loading:: src::  " + error.target.src + " id:: " + error.target.id;
-      if(analyticsInstance && error.target.src.includes("adsbygoogle.js")) {
-        sampleAdBlockTest = true
-        analyticsInstance.page("", "ad-blocked", {path: "/ad-blocked", title: errorMessage})
+  try {
+    if (error instanceof Event) {
+      if (error.target && error.target.localName == "script") {
+        errorMessage = "error in script loading:: src::  " + error.target.src + " id:: " + error.target.id;
+        if(analyticsInstance && error.target.src.includes("adsbyrudder")) {
+          sampleAdBlockTest = true
+          analyticsInstance.page("RudderJS-Initiated", "ad-block page request", {path: "/ad-blocked", title: errorMessage})
+        }
       }
     }
+    logger.error("from 1=======", errorMessage)
+    if (errorMessage && !sampleAdBlockTest) {
+      logger.error("[Util] handleError:: ", errorMessage);
+    }
+  } catch (e) {
+    logger.error("[Util] handleError:: ", e)
   }
-  if (errorMessage && !sampleAdBlockTest) {
-    logger.error("[Util] handleError:: ", errorMessage);
-  }
+
 }
 
 function getDefaultPageProperties() {