From b71e957e7cb7c64dde5f8614a44bf252b3f8ebc8 Mon Sep 17 00:00:00 2001
From: Baptiste Arnaud <contact@baptiste-arnaud.fr>
Date: Tue, 11 Jul 2023 11:25:50 +0200
Subject: [PATCH] =?UTF-8?q?:ambulance:=20(bot)=20Fix=20try=20catch=20injec?=
 =?UTF-8?q?tion=20when=20opening=20s=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/embeds/js/package.json    |  2 +-
 packages/embeds/react/package.json |  2 +-
 packages/lib/utils.ts              | 36 ++++++++++++++++++++----------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/packages/embeds/js/package.json b/packages/embeds/js/package.json
index d7f621999..4a9b19a39 100644
--- a/packages/embeds/js/package.json
+++ b/packages/embeds/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typebot.io/js",
-  "version": "0.0.72",
+  "version": "0.0.73",
   "description": "Javascript library to display typebots on your website",
   "type": "module",
   "main": "dist/index.js",
diff --git a/packages/embeds/react/package.json b/packages/embeds/react/package.json
index fe3f72b96..e911609ed 100644
--- a/packages/embeds/react/package.json
+++ b/packages/embeds/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typebot.io/react",
-  "version": "0.0.72",
+  "version": "0.0.73",
   "description": "React library to display typebots on your website",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/lib/utils.ts b/packages/lib/utils.ts
index 9e5bc0669..044c2c1c5 100644
--- a/packages/lib/utils.ts
+++ b/packages/lib/utils.ts
@@ -287,18 +287,7 @@ export const parseNumberWithCommas = (num: number) =>
   num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')
 
 export const injectCustomHeadCode = (customHeadCode: string) => {
-  customHeadCode = customHeadCode.replace(
-    /<script>/g,
-    `<script>
-try {`
-  )
-  customHeadCode = customHeadCode.replace(
-    /<\/script>/g,
-    `} catch(e) {
-  console.warn("Error while executing custom head code", e)
-}
-</script>`
-  )
+  customHeadCode = injectTryCatch(customHeadCode)
   const headCodes = customHeadCode.split('</noscript>')
   headCodes.forEach((headCode) => {
     const [codeToInject, noScriptContentToInject] = headCode.split('<noscript>')
@@ -318,6 +307,29 @@ try {`
   })
 }
 
+const injectTryCatch = (headCode: string) => {
+  const scriptTagRegex = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi
+  const scriptTags = headCode.match(scriptTagRegex)
+  if (scriptTags) {
+    scriptTags.forEach(function (tag) {
+      const wrappedTag = tag.replace(
+        /(<script\b[^>]*>)([\s\S]*?)(<\/script>)/gi,
+        function (_, openingTag, content, closingTag) {
+          return `${openingTag}
+try {
+  ${content}
+} catch (e) {
+  console.warn(e); 
+}
+${closingTag}`
+        }
+      )
+      headCode = headCode.replace(tag, wrappedTag)
+    })
+  }
+  return headCode
+}
+
 export const getAtPath = <T>(obj: T, path: string): unknown => {
   if (isNotDefined(obj)) return undefined
   const pathParts = path.split('.')