@memori.ai/memori-react 2.8.1 → 2.8.3

package/src/components/MemoriWidget/MemoriWidget.tsx

@@ -148,7 +148,6 @@ let audioContext: IAudioContext;
 
 let memoriPassword: string | undefined;
 let speakerMuted: boolean = false;
-let speakLanguage: string | undefined;
 
 export interface LayoutProps {
   Header?: typeof Header;
@@ -274,7 +273,7 @@ const MemoriWidget = ({
     multilingual !== undefined
       ? multilingual
       : !!integrationConfig?.multilanguage;
-  const [userLang, _setUserLang] = useState(
+  const [userLang, setUserLang] = useState(
     memoriLang ??
       integrationConfig?.lang ??
       memori?.culture?.split('-')?.[0] ??
@@ -283,10 +282,6 @@ const MemoriWidget = ({
       i18n.language ??
       'IT'
   );
-  const setUserLang: typeof _setUserLang = lang => {
-    _setUserLang(lang);
-    speakLanguage = lang;
-  };
 
   const [loading, setLoading] = useState(false);
   const [memoriTyping, setMemoriTyping] = useState(false);
@@ -694,7 +689,7 @@ const MemoriWidget = ({
         ...params,
         additionalInfo: {
           ...(additionalInfo || {}),
-          language: userLang,
+          language: getCultureCodeByLanguage(userLang),
           referral: referral,
         },
       });
@@ -781,7 +776,7 @@ const MemoriWidget = ({
         birthDate: birthDate || storageBirthDate || undefined,
         additionalInfo: {
           ...(additionalInfo || {}),
-          language: userLang,
+          language: getCultureCodeByLanguage(userLang),
           referral: referral,
         },
       });
@@ -882,6 +877,15 @@ const MemoriWidget = ({
             undefined
           );
 
+          let referral;
+          try {
+            referral = (() => {
+              return window.location.href;
+            })();
+          } catch (err) {
+            console.error(err);
+          }
+
           fetchSession({
             memoriID: memori.engineMemoriID ?? '',
             password: secret || memoriPwd || memori.secretToken,
@@ -890,6 +894,11 @@ const MemoriWidget = ({
             initialContextVars,
             initialQuestion,
             birthDate: birthDate || storageBirthDate || undefined,
+            additionalInfo: {
+              ...(additionalInfo || {}),
+              language: getCultureCodeByLanguage(userLang),
+              referral: referral,
+            },
           });
         } else if (!!currentState) {
           return {
@@ -952,6 +961,7 @@ const MemoriWidget = ({
       !speechSynthesizer &&
       !isPlayingAudio &&
       !userMessage.length &&
+      !memoriTyping &&
       !listening
     )
       setInteractionTimeout();
@@ -961,6 +971,7 @@ const MemoriWidget = ({
       !!speechSynthesizer ||
       isPlayingAudio ||
       !!userMessage.length ||
+      memoriTyping ||
       listening
     ) {
       resetInteractionTimeout();
@@ -1021,16 +1032,13 @@ const MemoriWidget = ({
       }
     }
 
-    if (memori.enableCompletions) {
-      timeout = timeout + 60;
-    }
-
     let uiTimeout = setTimeout(handleTimeout, timeout * 1000);
     setUserInteractionTimeout(uiTimeout);
     timeoutRef.current = uiTimeout;
   };
   useEffect(() => {
-    if (!!userMessage.length || isPlayingAudio) clearInteractionTimeout();
+    if (!!userMessage.length || isPlayingAudio || memoriTyping)
+      clearInteractionTimeout();
     if (sessionId && !!!userMessage.length) resetInteractionTimeout();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [
@@ -1041,6 +1049,7 @@ const MemoriWidget = ({
     sessionId,
     history,
     userMessage,
+    memoriTyping,
   ]);
   useEffect(() => {
     return () => {
@@ -1283,182 +1292,177 @@ const MemoriWidget = ({
     // .replace(/qfe/gi, `<sub alias="Quota Filo Erba">QFE</sub>`)
   };
 
-  const speak = useCallback(
-    (text: string): void => {
-      if (!AZURE_COGNITIVE_SERVICES_TTS_KEY) return;
-      stopListening();
-      // stopAudio();
-
-      if (preview) return;
-
-      if (muteSpeaker || speakerMuted) {
-        // trigger start continuous listening if set, see MemoriChat
-        if (continuousSpeech) {
-          setListeningTimeout();
-        }
-        return;
-      }
+  const speak = (text: string): void => {
+    if (!AZURE_COGNITIVE_SERVICES_TTS_KEY) return;
+    stopListening();
+    // stopAudio();
 
-      if (audioDestination) audioDestination.pause();
-
-      // if (audioContext?.state === 'running') {
-      //   //   audioContext.suspend();
-      //   // }
-      //   // if (audioContext) {
-      //   audioContext.close().then(() => {
-      //     audioContext = new AudioContext();
-      //     let buffer = audioContext.createBuffer(1, 10000, 22050);
-      //     let source = audioContext.createBufferSource();
-      //     source.buffer = buffer;
-      //     source.connect(audioContext.destination);
-      //   });
-      // }
+    if (preview) return;
 
-      let isSafari =
-        window.navigator.userAgent.includes('Safari') &&
-        !window.navigator.userAgent.includes('Chrome');
-      let isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
-      if ((audioContext.state as string) === 'interrupted') {
-        audioContext.resume().then(() => speak(text));
-        return;
+    if (muteSpeaker || speakerMuted) {
+      // trigger start continuous listening if set, see MemoriChat
+      if (continuousSpeech) {
+        setListeningTimeout();
       }
-      if (isIOS && isSafari) {
-        audioContext.suspend();
+      return;
+    }
 
-        if (isPlayingAudio) {
-          try {
-            if (speechSynthesizer) {
-              speechSynthesizer.close();
-              speechSynthesizer = null;
-            }
-            if (audioDestination) {
-              audioDestination.pause();
-              audioDestination.close();
-            }
-            if (audioContext) {
-              // audioContext.close().then(() => {
-              //   audioContext = new AudioContext();
-              //   let buffer = audioContext.createBuffer(1, 10000, 22050);
-              //   let source = audioContext.createBufferSource();
-              //   source.buffer = buffer;
-              //   source.connect(audioContext.destination);
-              // });
-              audioContext.destination.disconnect();
-            }
-          } catch (e) {
-            console.error('stopAudio error: ', e);
+    if (audioDestination) audioDestination.pause();
+
+    // if (audioContext?.state === 'running') {
+    //   //   audioContext.suspend();
+    //   // }
+    //   // if (audioContext) {
+    //   audioContext.close().then(() => {
+    //     audioContext = new AudioContext();
+    //     let buffer = audioContext.createBuffer(1, 10000, 22050);
+    //     let source = audioContext.createBufferSource();
+    //     source.buffer = buffer;
+    //     source.connect(audioContext.destination);
+    //   });
+    // }
+
+    let isSafari =
+      window.navigator.userAgent.includes('Safari') &&
+      !window.navigator.userAgent.includes('Chrome');
+    let isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
+    if ((audioContext.state as string) === 'interrupted') {
+      audioContext.resume().then(() => speak(text));
+      return;
+    }
+    if (isIOS && isSafari) {
+      audioContext.suspend();
+
+      if (isPlayingAudio) {
+        try {
+          if (speechSynthesizer) {
+            speechSynthesizer.close();
+            speechSynthesizer = null;
+          }
+          if (audioDestination) {
+            audioDestination.pause();
+            audioDestination.close();
           }
+          if (audioContext) {
+            // audioContext.close().then(() => {
+            //   audioContext = new AudioContext();
+            //   let buffer = audioContext.createBuffer(1, 10000, 22050);
+            //   let source = audioContext.createBufferSource();
+            //   source.buffer = buffer;
+            //   source.connect(audioContext.destination);
+            // });
+            audioContext.destination.disconnect();
+          }
+        } catch (e) {
+          console.error('stopAudio error: ', e);
         }
       }
-      if (audioContext.state === 'closed') {
-        audioContext = new AudioContext();
-        let buffer = audioContext.createBuffer(1, 10000, 22050);
-        let source = audioContext.createBufferSource();
-        source.buffer = buffer;
-        source.connect(audioContext.destination);
-      } else if (audioContext.state === 'suspended') {
-        stopAudio();
-
-        audioContext = new AudioContext();
-        let buffer = audioContext.createBuffer(1, 10000, 22050);
-        let source = audioContext.createBufferSource();
-        source.buffer = buffer;
-        source.connect(audioContext.destination);
-      }
-
-      if (!speechSynthesizer) {
-        audioDestination = new speechSdk.SpeakerAudioDestination();
-        let audioConfig =
-          speechSdk.AudioConfig.fromSpeakerOutput(audioDestination);
-        speechSynthesizer = new speechSdk.SpeechSynthesizer(
-          speechConfig,
-          audioConfig
-        );
-      }
-
-      const source = audioContext.createBufferSource();
-      source.addEventListener('ended', () => {
-        setIsPlayingAudio(false);
-      });
-      audioDestination.onAudioEnd = () => {
-        setIsPlayingAudio(false);
-        source.disconnect();
-
-        // trigger start continuous listening if set
-        // document.dispatchEvent(new Event('endSpeakStartListen'));
-        onEndSpeakStartListen();
-      };
+    }
+    if (audioContext.state === 'closed') {
+      audioContext = new AudioContext();
+      let buffer = audioContext.createBuffer(1, 10000, 22050);
+      let source = audioContext.createBufferSource();
+      source.buffer = buffer;
+      source.connect(audioContext.destination);
+    } else if (audioContext.state === 'suspended') {
+      stopAudio();
 
-      const lang = speakLanguage || userLang;
+      audioContext = new AudioContext();
+      let buffer = audioContext.createBuffer(1, 10000, 22050);
+      let source = audioContext.createBufferSource();
+      source.buffer = buffer;
+      source.connect(audioContext.destination);
+    }
 
-      speechSynthesizer.speakSsmlAsync(
-        `<speak version="1.0" xmlns="http://www.w3.org/2001/10/synthesis" xmlns:mstts="https://www.w3.org/2001/mstts" xmlns:emo="http://www.w3.org/2009/10/emotionml" xml:lang="${getCultureCodeByLanguage(
-          lang
-        )}"><voice name="${getTTSVoice(lang)}"><s>${replaceTextWithPhonemes(
-          escapeHTML(text),
-          lang.toLowerCase()
-        )}</s></voice></speak>`,
-        result => {
-          if (result) {
-            setIsPlayingAudio(true);
+    if (!speechSynthesizer) {
+      audioDestination = new speechSdk.SpeakerAudioDestination();
+      let audioConfig =
+        speechSdk.AudioConfig.fromSpeakerOutput(audioDestination);
+      speechSynthesizer = new speechSdk.SpeechSynthesizer(
+        speechConfig,
+        audioConfig
+      );
+    }
 
-            try {
-              // if (audioContext.destination.context.state === 'running') {
-              //   audioContext.destination.disconnect();
-              // }
-              audioContext.decodeAudioData(result.audioData, function (buffer) {
-                source.buffer = buffer;
-                source.connect(audioContext.destination);
-
-                if (history.length < 1 || (isSafari && isIOS)) {
-                  source.start(0);
-                }
-              });
+    const source = audioContext.createBufferSource();
+    source.addEventListener('ended', () => {
+      setIsPlayingAudio(false);
+    });
+    audioDestination.onAudioEnd = () => {
+      setIsPlayingAudio(false);
+      source.disconnect();
 
-              audioContext.onstatechange = () => {
-                if (
-                  audioContext.state === 'suspended' ||
-                  audioContext.state === 'closed'
-                ) {
-                  source.disconnect();
-                  setIsPlayingAudio(false);
-                } else if ((audioContext.state as string) === 'interrupted') {
-                  audioContext.resume();
-                }
-              };
+      // trigger start continuous listening if set
+      // document.dispatchEvent(new Event('endSpeakStartListen'));
+      onEndSpeakStartListen();
+    };
 
-              audioContext.resume();
+    speechSynthesizer.speakSsmlAsync(
+      `<speak version="1.0" xmlns="http://www.w3.org/2001/10/synthesis" xmlns:mstts="https://www.w3.org/2001/mstts" xmlns:emo="http://www.w3.org/2009/10/emotionml" xml:lang="${getCultureCodeByLanguage(
+        userLang
+      )}"><voice name="${getTTSVoice(userLang)}"><s>${replaceTextWithPhonemes(
+        escapeHTML(text),
+        userLang.toLowerCase()
+      )}</s></voice></speak>`,
+      result => {
+        if (result) {
+          setIsPlayingAudio(true);
 
-              if (speechSynthesizer) {
-                speechSynthesizer.close();
-                speechSynthesizer = null;
+          try {
+            // if (audioContext.destination.context.state === 'running') {
+            //   audioContext.destination.disconnect();
+            // }
+            audioContext.decodeAudioData(result.audioData, function (buffer) {
+              source.buffer = buffer;
+              source.connect(audioContext.destination);
+
+              if (history.length < 1 || (isSafari && isIOS)) {
+                source.start(0);
               }
-            } catch (e) {
-              console.error('speak error: ', e);
-              window.speechSynthesis.speak(new SpeechSynthesisUtterance(text));
-              setIsPlayingAudio(false);
+            });
 
-              if (speechSynthesizer) {
-                speechSynthesizer.close();
-                speechSynthesizer = null;
+            audioContext.onstatechange = () => {
+              if (
+                audioContext.state === 'suspended' ||
+                audioContext.state === 'closed'
+              ) {
+                source.disconnect();
+                setIsPlayingAudio(false);
+              } else if ((audioContext.state as string) === 'interrupted') {
+                audioContext.resume();
               }
-            }
-          } else {
+            };
+
             audioContext.resume();
+
+            if (speechSynthesizer) {
+              speechSynthesizer.close();
+              speechSynthesizer = null;
+            }
+          } catch (e) {
+            console.error('speak error: ', e);
+            window.speechSynthesis.speak(new SpeechSynthesisUtterance(text));
             setIsPlayingAudio(false);
+
+            if (speechSynthesizer) {
+              speechSynthesizer.close();
+              speechSynthesizer = null;
+            }
           }
-        },
-        error => {
-          console.error('speak:', error);
-          window.speechSynthesis.speak(new SpeechSynthesisUtterance(text));
+        } else {
+          audioContext.resume();
           setIsPlayingAudio(false);
         }
-      );
+      },
+      error => {
+        console.error('speak:', error);
+        window.speechSynthesis.speak(new SpeechSynthesisUtterance(text));
+        setIsPlayingAudio(false);
+      }
+    );
 
-      setMemoriTyping(false);
-    },
-    [userLang, speakerMuted]
-  );
+    setMemoriTyping(false);
+  };
   const stopAudio = () => {
     setIsPlayingAudio(false);
     try {