🐛 (bot) Fix setTimeout onCanPlay concurrency issues

baptisteArno · Jul 12, 2023 · 082084a · 082084a · vercel · Jul 12, 2023
1 parent abb363b
commit 082084a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/packages/embeds/js/package.json b/packages/embeds/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typebot.io/js",
-  "version": "0.0.76",
+  "version": "0.0.77",
   "description": "Javascript library to display typebots on your website",
   "type": "module",
   "main": "dist/index.js",

diff --git a/packages/embeds/js/src/features/blocks/bubbles/audio/components/AudioBubble.tsx b/packages/embeds/js/src/features/blocks/bubbles/audio/components/AudioBubble.tsx
@@ -9,6 +9,7 @@ type Props = {
 
 const showAnimationDuration = 400
 const defaultTypingDuration = 5000
+let isPlayed = false
 
 let typingTimeout: NodeJS.Timeout
 
@@ -18,26 +19,27 @@ export const AudioBubble = (props: Props) => {
   const [isTyping, setIsTyping] = createSignal(true)
 
   const autoPlay = () => {
+    isPlayed = true
     if (audioElement)
       audioElement
         .play()
         .catch((e) => console.warn('Could not autoplay the audio:', e))
     props.onTransitionEnd(ref?.offsetTop)
   }
 
-  const onCanPlay = () => {
-    clearTimeout(typingTimeout)
-    setIsTyping(false)
-    setTimeout(autoPlay, showAnimationDuration)
-  }
-
   onMount(() => {
+    if (audioElement)
+      audioElement.oncanplay = () => {
+        if (isPlayed) return
+        clearTimeout(typingTimeout)
+        setIsTyping(false)
+        setTimeout(autoPlay, showAnimationDuration)
+      }
     typingTimeout = setTimeout(() => {
-      if (audioElement) audioElement.removeEventListener('canplay', onCanPlay)
+      if (isPlayed) return
       setIsTyping(false)
       setTimeout(autoPlay, showAnimationDuration)
     }, defaultTypingDuration)
-    if (audioElement) audioElement.addEventListener('canplay', onCanPlay)
   })
 
   onCleanup(() => {

diff --git a/packages/embeds/js/src/features/blocks/bubbles/video/components/VideoBubble.tsx b/packages/embeds/js/src/features/blocks/bubbles/video/components/VideoBubble.tsx
@@ -10,6 +10,7 @@ type Props = {
 
 export const showAnimationDuration = 400
 const defaultTypingDuration = 5000
+let isPlayed = false
 
 let typingTimeout: NodeJS.Timeout
 
@@ -19,31 +20,30 @@ export const VideoBubble = (props: Props) => {
   const [isTyping, setIsTyping] = createSignal(true)
 
   const autoPlay = () => {
-    console.log(videoElement)
+    isPlayed = true
     if (videoElement)
       videoElement
         .play()
         .catch((e) => console.warn('Could not autoplay the video:', e))
     props.onTransitionEnd(ref?.offsetTop)
   }
 
-  const onCanPlay = () => {
-    clearTimeout(typingTimeout)
-    setIsTyping(false)
-    setTimeout(autoPlay, showAnimationDuration)
-  }
-
   onMount(() => {
-    console.log(videoElement)
+    if (videoElement)
+      videoElement.oncanplay = () => {
+        if (isPlayed) return
+        clearTimeout(typingTimeout)
+        setIsTyping(false)
+        setTimeout(autoPlay, showAnimationDuration)
+      }
     typingTimeout = setTimeout(
       () => {
-        if (videoElement) videoElement.removeEventListener('canplay', onCanPlay)
+        if (isPlayed) return
         setIsTyping(false)
         setTimeout(autoPlay, showAnimationDuration)
       },
       videoElement ? defaultTypingDuration : 2000
     )
-    if (videoElement) videoElement.addEventListener('canplay', onCanPlay)
   })
 
   onCleanup(() => {

diff --git a/packages/embeds/react/package.json b/packages/embeds/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typebot.io/react",
-  "version": "0.0.76",
+  "version": "0.0.77",
   "description": "React library to display typebots on your website",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",