rudder-sdk-js 2.9.1 → 2.9.4

package/index.js

@@ -4939,7 +4939,7 @@
 
   // Reserved Keywords for properties/traits
   var RESERVED_KEYS = ['anonymous_id', 'id', 'sent_at', 'received_at', 'timestamp', 'original_timestamp', 'event_text', 'event'];
-  var CONFIG_URL = 'https://api.rudderlabs.com/sourceConfig/?p=npm&v=2.9.1';
+  var CONFIG_URL = 'https://api.rudderlabs.com/sourceConfig/?p=npm&v=2.9.4';
   var CDN_INT_DIR = 'js-integrations';
   var DEST_SDK_BASE_URL = "https://cdn.rudderlabs.com/v1.1/".concat(CDN_INT_DIR);
   var MAX_WAIT_FOR_INTEGRATION_LOAD = 10000;
@@ -10371,7 +10371,15 @@
   }
 
   function getReferrer() {
-    return document.referrer || "$direct";
+    // This error handling is in place to avoid accessing dead object(document)
+    var defaultReferrer = "$direct";
+
+    try {
+      return document.referrer || defaultReferrer;
+    } catch (e) {
+      logger.error("Error trying to access 'document.referrer': ", e);
+      return defaultReferrer;
+    }
   }
 
   function getReferringDomain(referrer) {
@@ -10557,28 +10565,28 @@
     return CONFIG_URL.concat(CONFIG_URL.includes("?") ? "&" : "?").concat(writeKey ? "writeKey=".concat(writeKey) : "");
   };
 
-  var checkSDKUrl = function checkSDKUrl() {
+  var getSDKUrlInfo = function getSDKUrlInfo() {
     var scripts = document.getElementsByTagName("script");
-    var rudderSDK = undefined;
-    var staging = false;
+    var sdkURL;
+    var isStaging = false;
 
     for (var i = 0; i < scripts.length; i += 1) {
-      var curScriptSrc = removeTrailingSlashes(scripts[i].getAttribute("src")); // only in case of staging SDK staging env will be set to true
+      var curScriptSrc = removeTrailingSlashes(scripts[i].getAttribute("src"));
 
-      if (curScriptSrc && curScriptSrc.startsWith("http") && (curScriptSrc.endsWith("rudder-analytics.min.js") || curScriptSrc.endsWith("rudder-analytics-staging.min.js"))) {
-        rudderSDK = curScriptSrc;
+      if (curScriptSrc) {
+        var urlMatches = curScriptSrc.match(/^(https?:)?\/\/.*rudder-analytics(-staging)?(\.min)?\.js$/);
 
-        if (curScriptSrc.endsWith("rudder-analytics-staging.min.js")) {
-          staging = true;
+        if (urlMatches) {
+          sdkURL = curScriptSrc;
+          isStaging = urlMatches[2] !== undefined;
+          break;
         }
-
-        break;
       }
     }
 
     return {
-      rudderSDK: rudderSDK,
-      staging: staging
+      sdkURL: sdkURL,
+      isStaging: isStaging
     };
   };
 
@@ -10589,7 +10597,7 @@
     this.build = "1.0.0";
     this.name = "RudderLabs JavaScript SDK";
     this.namespace = "com.rudderlabs.javascript";
-    this.version = "2.9.1";
+    this.version = "2.9.4";
   });
 
   /* eslint-disable max-classes-per-file */
@@ -10598,7 +10606,7 @@
     _classCallCheck(this, RudderLibraryInfo);
 
     this.name = "RudderLabs JavaScript SDK";
-    this.version = "2.9.1";
+    this.version = "2.9.4";
   }); // Operating System information class
 
 
@@ -10642,13 +10650,18 @@
       this.screen.height = window.screen.height;
       this.screen.density = window.devicePixelRatio;
       this.screen.innerWidth = window.innerWidth;
-      this.screen.innerHeight = window.innerHeight; // detect brave browser and append to the user agent
+      this.screen.innerHeight = window.innerHeight;
+      this.userAgent = navigator.userAgent; // For supporting Brave browser detection,
+      // add "Brave/<version>" to the user agent with the version value from the Chrome component
 
       if (navigator.brave && Object.getPrototypeOf(navigator.brave).isBrave) {
-        var version = navigator.userAgent.match(/(Chrome)\/([\w\.]+)/i)[2];
-        this.userAgent = "".concat(navigator.userAgent, " Brave/").concat(version);
-      } else {
-        this.userAgent = navigator.userAgent;
+        // Example:
+        // Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.5060.114 Safari/537.36
+        var matchedArr = this.userAgent.match(/(Chrome)\/([\w\.]+)/i);
+
+        if (matchedArr) {
+          this.userAgent = "".concat(this.userAgent, " Brave/").concat(matchedArr[2]);
+        }
       } // property name differs based on browser version
 
 
@@ -13260,7 +13273,7 @@
     if (API_KEY.match(apiKeyRegex) !== null) return;
     window.rsBugsnagClient = window.Bugsnag.start({
       apiKey: API_KEY,
-      appVersion: "2.9.1",
+      appVersion: "2.9.4",
       // Set SDK version as the app version
       metadata: META_DATA,
       onError: function onError(event) {
@@ -13425,6 +13438,24 @@
           return callback();
         });
       }
+      /**
+       * A function to validate integration SDK is available in window
+       * and integration constructor is not undefined
+       * @param {string} pluginName
+       * @param {string} modName
+       * @returns boolean
+       */
+
+    }, {
+      key: "integrationSDKLoaded",
+      value: function integrationSDKLoaded(pluginName, modName) {
+        try {
+          return window.hasOwnProperty(pluginName) && window[pluginName][modName] && typeof window[pluginName][modName].prototype.constructor !== 'undefined';
+        } catch (e) {
+          handleError(e);
+          return false;
+        }
+      }
       /**
        * Process the response from control plane and
        * call initialize for integrations
@@ -13496,11 +13527,10 @@
           var suffix = ''; // default suffix
           // Get the CDN base URL is rudder staging url
 
-          var _checkSDKUrl = checkSDKUrl(),
-              rudderSDK = _checkSDKUrl.rudderSDK,
-              staging = _checkSDKUrl.staging;
+          var _getSDKUrlInfo = getSDKUrlInfo(),
+              isStaging = _getSDKUrlInfo.isStaging;
 
-          if (rudderSDK && staging) {
+          if (isStaging) {
             suffix = '-staging'; // stagging suffix
           }
 
@@ -13520,7 +13550,7 @@
 
             var self = _this2;
             var interval = setInterval(function () {
-              if (window.hasOwnProperty(pluginName)) {
+              if (self.integrationSDKLoaded(pluginName, modName)) {
                 var intMod = window[pluginName];
                 clearInterval(interval); // logger.debug(pluginName, " dynamically loaded integration SDK");
 
@@ -13923,7 +13953,7 @@
           checkReservedKeywords(rudderElement.message, type); // if not specified at event level, All: true is default
 
           var clientSuppliedIntegrations = rudderElement.message.integrations || {
-            'All': true
+            All: true
           }; // structure user supplied integrations object to rudder format
 
           transformToRudderNames(clientSuppliedIntegrations);
@@ -14263,11 +14293,11 @@
           }
         } else {
           // Get the CDN base URL from the included 'rudder-analytics.min.js' script tag
-          var _checkSDKUrl2 = checkSDKUrl(),
-              rudderSDK = _checkSDKUrl2.rudderSDK;
+          var _getSDKUrlInfo2 = getSDKUrlInfo(),
+              sdkURL = _getSDKUrlInfo2.sdkURL;
 
-          if (rudderSDK) {
-            this.destSDKBaseURL = rudderSDK.split('/').slice(0, -1).concat(CDN_INT_DIR).join('/');
+          if (sdkURL) {
+            this.destSDKBaseURL = sdkURL.split('/').slice(0, -1).concat(CDN_INT_DIR).join('/');
           }
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rudder-sdk-js",
-  "version": "2.9.1",
+  "version": "2.9.4",
   "description": "RudderStack Javascript SDK",
   "main": "index.js",
   "types": "index.d.ts",