react-native-srschat 0.1.59 → 0.1.60

package/src/components/voice.js

@@ -19,7 +19,7 @@ import { AppContext } from '../contexts/AppContext';
 
 const PERMISSION_STORAGE_KEY = '@voice_permission_status';
 
-export const VoiceButton = () => {
+export const VoiceButton = ({ setInput }) => {
   const { handleVoiceSend } = useContext(AppContext);
   const [isListening, setIsListening] = useState(false);
   const [loading, setLoading] = useState(false);
@@ -48,23 +48,42 @@ export const VoiceButton = () => {
         setHasPermission(permissionResult);
         
         if (permissionResult) {
-          const initialized = await initVoice((result, error) => {
-            if (error) {
-              // Don't show alert for permission errors since we handle that elsewhere
-              if (!error.includes('permission')) {
-                Alert.alert('Error', error);
+          const initialized = await initVoice(
+            // Final result callback - just update input, don't send
+            (result, error) => {
+              console.log('Voice final result:', result, 'Error:', error);
+              if (error) {
+                // Don't show alert for permission errors since we handle that elsewhere
+                if (!error.includes('permission')) {
+                  Alert.alert('Error', error);
+                }
+                setIsListening(false);
+                setLoading(false);
+                return;
+              }
+              if (result) {
+                if (setInput) {
+                  // Just update the input field, don't send
+                  setInput(result);
+                } else {
+                  console.warn('VoiceButton: setInput prop is not provided');
+                }
               }
+              // Always reset states when the recognition ends
               setIsListening(false);
               setLoading(false);
-              return;
-            }
-            if (result) {
-              handleVoiceSend(null, result);
+            },
+            // Partial result callback for live transcription
+            (partialResult) => {
+              if (partialResult) {
+                if (setInput) {
+                  setInput(partialResult);
+                } else {
+                  console.warn('VoiceButton: setInput prop is not provided for partial results');
+                }
+              }
             }
-            // Always reset states when the recognition ends
-            setIsListening(false);
-            setLoading(false);
-          });
+          );
 
           if (!initialized) {
             // Only show this alert once per session

package/src/components/welcomeInput.js

@@ -17,6 +17,7 @@ import { VoiceButton } from './voice';
 export const WelcomeInput = ({ onProductCardClick, onAddToCartClick }) => {
 
   const { data, handleSend, input, setInput, showModal, theme } = useContext(AppContext);
+  const inputRef = useRef(null);
 
   const handleKeyPress = ({ nativeEvent }) => {
     if (nativeEvent.key === 'return' && !nativeEvent.shiftKey) {
@@ -35,6 +36,7 @@ export const WelcomeInput = ({ onProductCardClick, onAddToCartClick }) => {
   return (
         <View style={styles.inputContainer}>
         <TextInput
+            ref={inputRef}
             style={styles.input}
             value={input}
             onChangeText={setInput}
@@ -45,9 +47,32 @@ export const WelcomeInput = ({ onProductCardClick, onAddToCartClick }) => {
             enablesReturnKeyAutomatically={true}
             onKeyPress={handleKeyPress}
             onSubmitEditing={onSubmitEditing}
+            selection={undefined}
             // blurOnSubmit={false}
         />
-        <VoiceButton/>
+        <VoiceButton setInput={(text) => {
+          setInput(text);
+          // Auto-scroll to end
+          if (inputRef.current) {
+            // For iOS and Android, blur and refocus to ensure scroll
+            inputRef.current.blur();
+            setTimeout(() => {
+              if (inputRef.current) {
+                inputRef.current.focus();
+                // Set selection to end - Android sometimes needs a slight delay
+                if (Platform.OS === 'android') {
+                  setTimeout(() => {
+                    if (inputRef.current) {
+                      inputRef.current.setSelection(text.length, text.length);
+                    }
+                  }, 10);
+                } else {
+                  inputRef.current.setSelection(text.length, text.length);
+                }
+              }
+            }, 50);
+          }
+        }}/>
         <TouchableOpacity
             style={styles.sendButton}
             onPress={() => handleSend(input)}

package/src/utils/audioRecorder.js

@@ -6,10 +6,13 @@ import { check, PERMISSIONS, request, RESULTS } from 'react-native-permissions';
 import useAsyncStorage from '../hooks/useAsyncStorage';
 
 let resultCallback = null;
+let partialResultCallback = null;
 let silenceTimer = null;
 let isCurrentlyRecording = false;
 let finalResult = '';
+let lastPartialResultTime = 0;
 const SILENCE_DURATION = 1500; // 1.5 seconds of silence before stopping
+const PARTIAL_RESULT_THROTTLE = 100; // Throttle partial results to every 100ms
 
 // Add this constant for AsyncStorage key
 const PERMISSION_STORAGE_KEY = '@voice_permission_status';
@@ -25,9 +28,10 @@ export function setPermissionStatusHandlers(getter, setter) {
 }
 
 // Initialize Voice handlers
-export async function initVoice(onResult) {
+export async function initVoice(onResult, onPartialResult = null) {
   try {
     resultCallback = onResult;
+    partialResultCallback = onPartialResult;
     finalResult = '';
 
     // Check if Voice module is available
@@ -42,6 +46,18 @@ export async function initVoice(onResult) {
       console.error('Speech recognition is not available on this device');
       return false;
     }
+    
+    // Check if another recognition session is active
+    try {
+      const isRecognizing = await Voice.isRecognizing();
+      if (isRecognizing) {
+        console.log('Another recognition session is active, cleaning up...');
+        await Voice.destroy();
+        await new Promise(resolve => setTimeout(resolve, 300));
+      }
+    } catch (e) {
+      // Ignore errors checking recognition state
+    }
 
     // Set up all event listeners
     Voice.onSpeechStart = (e) => {
@@ -53,6 +69,9 @@ export async function initVoice(onResult) {
         clearTimeout(silenceTimer);
         silenceTimer = null;
       }
+      
+      // Start initial silence detection
+      handleSilenceDetection();
     };
 
     Voice.onSpeechRecognized = (e) => {
@@ -71,40 +90,54 @@ export async function initVoice(onResult) {
         silenceTimer = null;
       }
 
-      // Only handle final result if we're still recording
-      if (isCurrentlyRecording) {
-        await handleFinalResult();
+      // On iOS, onSpeechEnd can fire multiple times, so check if we're still recording
+      if (isCurrentlyRecording && finalResult) {
+        // Don't call handleFinalResult here on iOS as it causes the error
+        // Instead, just mark that speech ended and let silence detection handle it
+        if (Platform.OS === 'ios') {
+          console.log('iOS: Speech ended, waiting for silence detection to handle cleanup');
+        } else {
+          await handleFinalResult();
+        }
       }
     };
 
     Voice.onSpeechError = async (e) => {
-      // console.error('onSpeechError: ', e);
+      console.error('onSpeechError: ', e);
       
       if (silenceTimer) {
         clearTimeout(silenceTimer);
         silenceTimer = null;
       }
 
-      // Check for "No speech detected" error
+      // Check for specific error types
       const isNoSpeechError = e.error?.code === "recognition_fail" && 
                               e.error?.message?.includes("No speech detected");
       
+      // iOS error 1101 is often transient and related to service availability
+      const isTransientIOSError = Platform.OS === 'ios' && 
+                                  (e.error?.code === "1101" || 
+                                   e.error?.message?.includes("kAFAssistantErrorDomain"));
+      
       await cleanupVoiceSession();
       
-      // Only send error to callback if it's not a "No speech detected" error
-      // if (!isNoSpeechError) {
-      //   resultCallback(null, e.error?.message || 'Speech recognition error');
-      // } else {
-      //   console.log('No speech detected, ignoring error');
-      //   // Optionally, call the callback with null parameters or a special indicator
-      //   resultCallback(null, null); // This won't trigger an error alert in the component
-      // }
+      // Only send error to callback for non-transient errors
+      if (!isNoSpeechError && !isTransientIOSError && resultCallback) {
+        resultCallback(null, e.error?.message || 'Speech recognition error');
+      } else if (isTransientIOSError) {
+        console.log('Transient iOS speech recognition error, attempting to recover');
+        // Send the final result if we have one
+        if (finalResult && resultCallback) {
+          resultCallback(finalResult);
+        }
+      }
     };
 
     Voice.onSpeechResults = (e) => {
       console.log('onSpeechResults: ', e);
       if (e.value && e.value.length > 0) {
         finalResult = e.value[0];
+        // Also trigger silence detection for final results
         handleSilenceDetection();
       }
     };
@@ -118,6 +151,14 @@ export async function initVoice(onResult) {
       
       if (e.value && e.value.length > 0) {
         finalResult = e.value[0];
+        
+        // Throttle partial results to prevent overwhelming the UI and speech service
+        const now = Date.now();
+        if (partialResultCallback && (now - lastPartialResultTime) > PARTIAL_RESULT_THROTTLE) {
+          partialResultCallback(e.value[0]);
+          lastPartialResultTime = now;
+        }
+        
         handleSilenceDetection();
       }
     };
@@ -141,7 +182,8 @@ const handleSilenceDetection = () => {
   }
   
   silenceTimer = setTimeout(async () => {
-    if (isCurrentlyRecording) {
+    console.log('Silence detected, stopping recording...');
+    if (isCurrentlyRecording && finalResult) {
       await handleFinalResult();
     }
   }, SILENCE_DURATION);
@@ -150,15 +192,27 @@ const handleSilenceDetection = () => {
 const handleFinalResult = async () => {
   if (!isCurrentlyRecording) return;
   
-  if (finalResult) {
+  // Set flag immediately to prevent race conditions
+  isCurrentlyRecording = false;
+  
+  // Clear silence timer first
+  if (silenceTimer) {
+    clearTimeout(silenceTimer);
+    silenceTimer = null;
+  }
+  
+  // Send result if we have one
+  if (finalResult && resultCallback) {
     resultCallback(finalResult);
   }
   
-  // Stop recording first
-  await stopRecording();
+  // Give iOS time to finish processing before cleanup
+  if (Platform.OS === 'ios') {
+    await new Promise(resolve => setTimeout(resolve, 100));
+  }
   
-  // Then clean up the session
-  await cleanupVoiceSession();
+  // Stop recording with proper sequence
+  await stopRecording();
 };
 
 const cleanupVoiceSession = async () => {
@@ -229,6 +283,9 @@ export async function startRecording() {
       return false;
     }
 
+    // Reset throttle timer
+    lastPartialResultTime = 0;
+    
     await Voice.start('en-US');
     isCurrentlyRecording = true;
     return true;
@@ -241,7 +298,21 @@ export async function startRecording() {
 
 export async function stopRecording() {
   try {
-    if (!isCurrentlyRecording || !Voice) return;
+    if (!Voice) return;
+    
+    // Already stopped
+    if (!isCurrentlyRecording) {
+      // Still try to clean up any lingering session
+      try {
+        const isRecognizing = await Voice.isRecognizing();
+        if (isRecognizing) {
+          await Voice.stop();
+        }
+      } catch (e) {
+        // Ignore errors checking recognition state
+      }
+      return;
+    }
 
     // Set this first to prevent race conditions
     isCurrentlyRecording = false;
@@ -251,21 +322,46 @@ export async function stopRecording() {
       silenceTimer = null;
     }
 
-    // First try to stop
-    try {
-      await Voice.stop();
-      // Wait a bit for stop to complete
-      await new Promise(resolve => setTimeout(resolve, 100));
-    } catch (error) {
-      console.error('Error stopping Voice:', error);
-    }
+    // For iOS, use a more careful approach
+    if (Platform.OS === 'ios') {
+      try {
+        // First cancel any ongoing recognition
+        await Voice.cancel();
+        await new Promise(resolve => setTimeout(resolve, 50));
+      } catch (error) {
+        // Ignore cancel errors
+      }
+      
+      try {
+        // Then stop
+        await Voice.stop();
+        await new Promise(resolve => setTimeout(resolve, 100));
+      } catch (error) {
+        console.log('Error stopping Voice (expected on iOS):', error);
+      }
+      
+      try {
+        // Finally destroy
+        await Voice.destroy();
+        await new Promise(resolve => setTimeout(resolve, 200));
+      } catch (error) {
+        console.log('Error destroying Voice (expected on iOS):', error);
+      }
+    } else {
+      // Android can handle the normal sequence
+      try {
+        await Voice.stop();
+        await new Promise(resolve => setTimeout(resolve, 100));
+      } catch (error) {
+        console.error('Error stopping Voice:', error);
+      }
 
-    // Then force destroy
-    try {
-      await Voice.destroy();
-      await new Promise(resolve => setTimeout(resolve, 300));
-    } catch (error) {
-      console.error('Error destroying Voice:', error);
+      try {
+        await Voice.destroy();
+        await new Promise(resolve => setTimeout(resolve, 300));
+      } catch (error) {
+        console.error('Error destroying Voice:', error);
+      }
     }
 
     // Final cleanup