yelda-webchat 1.1.19 → 1.1.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yelda-webchat",
-  "version": "1.1.19",
+  "version": "1.1.21",
   "description": "Website Chat Plugin",
   "main": "./dist/js/yeldaWebchatInjector.min.js",
   "license": "MIT",

package/src/js/yeldaWebchatInjector.js

@@ -25,6 +25,23 @@ const isStrLikelyEncoded = (str) => {
   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
+  }
+}
+
 /**
  * Execute the function by name with the arguments
  * @param {String} functionName
@@ -78,11 +95,19 @@ class YeldaChat {
     if (argsStr !== '') {
       let argBuffer = ''
       let parenCount = 0
+      const openingBrackets = ['(', '[', '{']
+      const closingBrackets = [')', ']', '}']
+      let isQuotesOpened = false
+
       for (const element of argsStr) {
-          if (element === '(') parenCount++
-          else if (element === ')') parenCount--
+        if (element === `'`) {
+            isQuotesOpened = !isQuotesOpened
+          }
 
-          if (element === ',' && parenCount === 0) {
+          if (openingBrackets.includes(element)) parenCount++
+          else if(closingBrackets.includes(element)) parenCount--
+
+          if (element === ',' && parenCount === 0 && !isQuotesOpened) {
               args.push(argBuffer.trim())
               argBuffer = ''
           } else {
@@ -100,7 +125,7 @@ class YeldaChat {
       else if (arg === 'null') return null
       else if (arg.startsWith('[') && arg.endsWith(']')) {
         try {
-          return JSON.parse(arg)
+          return JSON.parse(JSON.stringify(arg))
         } catch(err) {
           return ''
         }
@@ -110,9 +135,16 @@ 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
     })
+
     return { functionName, args }
   }