yelda-webchat 1.1.18 → 1.1.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yelda-webchat",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "description": "Website Chat Plugin",
   "main": "./dist/js/yeldaWebchatInjector.min.js",
   "license": "MIT",
@@ -27,7 +27,7 @@
     "autoprefixer-loader": "^3.2.0",
     "aws-sdk": "^2.732.0",
     "babel-core": "^6.26.3",
-    "babel-eslint": "^8.2.6",
+    "babel-eslint": "^10.1.0",
     "babel-loader": "^7.1.5",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-env": "^1.7.0",
@@ -44,7 +44,7 @@
     "extract-text-webpack-plugin": "^3.0.2",
     "file-loader": "^1.1.11",
     "inject-loader": "^4.0.1",
-    "jsdom": "^13.2.0",
+    "jsdom": "^16.5.0",
     "less": "^3.10.3",
     "less-loader": "^4.1.0",
     "mime": "^2.4.6",

package/src/js/yeldaWebchatInjector.js

@@ -14,17 +14,32 @@ import config from '../config'
  * @returns {Boolean}
  */
 const isStrLikelyEncoded = (str) => {
-  // Check if the string contains any characters that would typically need encoding
-  const needsEncoding = /[?&=<>#%{}|\\\^~\[\]`;"\s]/.test(str)
-
   // Check if the string contains any non-ASCII characters
+  // eslint-disable-next-line no-control-regex
   const hasNonASCII = /[^\x00-\x7F]/.test(str);
 
   // Check if the string contains any percent-encoded characters
   const hasPercentEncoding = /%[0-9A-Fa-f]{2}/.test(str)
 
   // Return true if any of the conditions are met
-  return needsEncoding || hasNonASCII || hasPercentEncoding
+  return hasNonASCII || hasPercentEncoding
+}
+
+/**
+ * Check whether the string is stringified object
+ * @param {String} str
+ * @returns {Boolean}
+ */
+const isStringifiedObject = (str) => {
+  try {
+    // Replace single quotes with double quotes
+    const jsonString = str.replace(/'/g, '"')
+    // Attempt to parse the string
+    const obj = JSON.parse(jsonString)
+    return typeof obj === 'object' && obj !== null
+  } catch (error) {
+    return false // Parsing failed, not a valid JSON string
+  }
 }
 
 /**
@@ -112,6 +127,12 @@ class YeldaChat {
         } catch(err) {
           return ''
         }
+      } else if (isStringifiedObject(arg)) {
+        try{
+          return JSON.parse(arg.replace(/'/g, '"'))
+        } catch(err) {
+          return ''
+        }
       }
       return arg.replace(/^['"]|['"]$/g, '') // Remove surrounding quotes if any
     })