react-native-srschat 0.1.58 → 0.1.60

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

package/lib/commonjs/components/testProductCard.js

@@ -1,60 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.TestProductCard = void 0;
-var _react = _interopRequireDefault(require("react"));
-var _reactNative = require("react-native");
-var _productCard = require("./productCard");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const mockProduct = {
-  "part_number": "AEQO177",
-  "inventory_info": {
-    "default_uom": "EA",
-    "is_valid": true,
-    "info_by_uom": {
-      "EA": {
-        "gross_price": 7.83,
-        "net_price": 7.83,
-        "is_on_sale": false,
-        "quantity_available": 0,
-        "discounts": null,
-        "min_pack_qty": 1.5
-      }
-    }
-  },
-  "product_details": {
-    "product_name": "Aladdin Hayward SPX1600S SuperPump Lid Gasket | O-177-2",
-    "part_number": "AEQO177",
-    "manufacturer_id": "O-177-2",
-    "heritage_link": "https://www.heritagepoolplus.com/aeqo177-aladdin-o-ring-o-177-o-177-2-o-177-2",
-    "image_url": "https://media.heritageplus.com/image/upload/v1668157956/image/AEQO177_0.jpg"
-  }
-};
-const TestProductCard = () => {
-  return /*#__PURE__*/_react.default.createElement(_reactNative.ScrollView, {
-    style: styles.container
-  }, /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
-    style: styles.title
-  }, "Test Product Card"), /*#__PURE__*/_react.default.createElement(_productCard.ProductCard, {
-    prod: mockProduct,
-    onFocusQuantityInput: partNumber => console.log('Focus on:', partNumber),
-    messageId: "test-message-123"
-  }));
-};
-exports.TestProductCard = TestProductCard;
-const styles = _reactNative.StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: '#f6f6f6',
-    padding: 16
-  },
-  title: {
-    fontSize: 18,
-    fontWeight: 'bold',
-    marginBottom: 16,
-    textAlign: 'center'
-  }
-});
-//# sourceMappingURL=testProductCard.js.map

package/lib/commonjs/components/testProductCard.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_productCard","e","__esModule","default","mockProduct","TestProductCard","createElement","ScrollView","style","styles","container","Text","title","ProductCard","prod","onFocusQuantityInput","partNumber","console","log","messageId","exports","StyleSheet","create","flex","backgroundColor","padding","fontSize","fontWeight","marginBottom","textAlign"],"sourceRoot":"../../../src","sources":["components/testProductCard.js"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,YAAA,GAAAF,OAAA;AAA4C,SAAAD,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE5C,MAAMG,WAAW,GAAG;EAClB,aAAa,EAAE,SAAS;EACxB,gBAAgB,EAAE;IAChB,aAAa,EAAE,IAAI;IACnB,UAAU,EAAE,IAAI;IAChB,aAAa,EAAE;MACb,IAAI,EAAE;QACJ,aAAa,EAAE,IAAI;QACnB,WAAW,EAAE,IAAI;QACjB,YAAY,EAAE,KAAK;QACnB,oBAAoB,EAAE,CAAC;QACvB,WAAW,EAAE,IAAI;QACjB,cAAc,EAAE;MAClB;IACF;EACF,CAAC;EACD,iBAAiB,EAAE;IACjB,cAAc,EAAE,yDAAyD;IACzE,aAAa,EAAE,SAAS;IACxB,iBAAiB,EAAE,SAAS;IAC5B,eAAe,EAAE,+EAA+E;IAChG,WAAW,EAAE;EACf;AACF,CAAC;AAEM,MAAMC,eAAe,GAAGA,CAAA,KAAM;EACnC,oBACET,MAAA,CAAAO,OAAA,CAAAG,aAAA,CAACP,YAAA,CAAAQ,UAAU;IAACC,KAAK,EAAEC,MAAM,CAACC;EAAU,gBAClCd,MAAA,CAAAO,OAAA,CAAAG,aAAA,CAACP,YAAA,CAAAY,IAAI;IAACH,KAAK,EAAEC,MAAM,CAACG;EAAM,GAAC,mBAAuB,CAAC,eACnDhB,MAAA,CAAAO,OAAA,CAAAG,aAAA,CAACN,YAAA,CAAAa,WAAW;IACVC,IAAI,EAAEV,WAAY;IAClBW,oBAAoB,EAAGC,UAAU,IAAKC,OAAO,CAACC,GAAG,CAAC,WAAW,EAAEF,UAAU,CAAE;IAC3EG,SAAS,EAAC;EAAkB,CAC7B,CACS,CAAC;AAEjB,CAAC;AAACC,OAAA,CAAAf,eAAA,GAAAA,eAAA;AAEF,MAAMI,MAAM,GAAGY,uBAAU,CAACC,MAAM,CAAC;EAC/BZ,SAAS,EAAE;IACTa,IAAI,EAAE,CAAC;IACPC,eAAe,EAAE,SAAS;IAC1BC,OAAO,EAAE;EACX,CAAC;EACDb,KAAK,EAAE;IACLc,QAAQ,EAAE,EAAE;IACZC,UAAU,EAAE,MAAM;IAClBC,YAAY,EAAE,EAAE;IAChBC,SAAS,EAAE;EACb;AACF,CAAC,CAAC","ignoreList":[]}

package/lib/module/components/testProductCard.js

@@ -1,52 +0,0 @@
-import React from 'react';
-import { View, ScrollView, StyleSheet, Text } from 'react-native';
-import { ProductCard } from './productCard';
-const mockProduct = {
-  "part_number": "AEQO177",
-  "inventory_info": {
-    "default_uom": "EA",
-    "is_valid": true,
-    "info_by_uom": {
-      "EA": {
-        "gross_price": 7.83,
-        "net_price": 7.83,
-        "is_on_sale": false,
-        "quantity_available": 0,
-        "discounts": null,
-        "min_pack_qty": 1.5
-      }
-    }
-  },
-  "product_details": {
-    "product_name": "Aladdin Hayward SPX1600S SuperPump Lid Gasket | O-177-2",
-    "part_number": "AEQO177",
-    "manufacturer_id": "O-177-2",
-    "heritage_link": "https://www.heritagepoolplus.com/aeqo177-aladdin-o-ring-o-177-o-177-2-o-177-2",
-    "image_url": "https://media.heritageplus.com/image/upload/v1668157956/image/AEQO177_0.jpg"
-  }
-};
-export const TestProductCard = () => {
-  return /*#__PURE__*/React.createElement(ScrollView, {
-    style: styles.container
-  }, /*#__PURE__*/React.createElement(Text, {
-    style: styles.title
-  }, "Test Product Card"), /*#__PURE__*/React.createElement(ProductCard, {
-    prod: mockProduct,
-    onFocusQuantityInput: partNumber => console.log('Focus on:', partNumber),
-    messageId: "test-message-123"
-  }));
-};
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: '#f6f6f6',
-    padding: 16
-  },
-  title: {
-    fontSize: 18,
-    fontWeight: 'bold',
-    marginBottom: 16,
-    textAlign: 'center'
-  }
-});
-//# sourceMappingURL=testProductCard.js.map

package/lib/module/components/testProductCard.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["React","View","ScrollView","StyleSheet","Text","ProductCard","mockProduct","TestProductCard","createElement","style","styles","container","title","prod","onFocusQuantityInput","partNumber","console","log","messageId","create","flex","backgroundColor","padding","fontSize","fontWeight","marginBottom","textAlign"],"sourceRoot":"../../../src","sources":["components/testProductCard.js"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,IAAI,EAAEC,UAAU,EAAEC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AACjE,SAASC,WAAW,QAAQ,eAAe;AAE3C,MAAMC,WAAW,GAAG;EAClB,aAAa,EAAE,SAAS;EACxB,gBAAgB,EAAE;IAChB,aAAa,EAAE,IAAI;IACnB,UAAU,EAAE,IAAI;IAChB,aAAa,EAAE;MACb,IAAI,EAAE;QACJ,aAAa,EAAE,IAAI;QACnB,WAAW,EAAE,IAAI;QACjB,YAAY,EAAE,KAAK;QACnB,oBAAoB,EAAE,CAAC;QACvB,WAAW,EAAE,IAAI;QACjB,cAAc,EAAE;MAClB;IACF;EACF,CAAC;EACD,iBAAiB,EAAE;IACjB,cAAc,EAAE,yDAAyD;IACzE,aAAa,EAAE,SAAS;IACxB,iBAAiB,EAAE,SAAS;IAC5B,eAAe,EAAE,+EAA+E;IAChG,WAAW,EAAE;EACf;AACF,CAAC;AAED,OAAO,MAAMC,eAAe,GAAGA,CAAA,KAAM;EACnC,oBACEP,KAAA,CAAAQ,aAAA,CAACN,UAAU;IAACO,KAAK,EAAEC,MAAM,CAACC;EAAU,gBAClCX,KAAA,CAAAQ,aAAA,CAACJ,IAAI;IAACK,KAAK,EAAEC,MAAM,CAACE;EAAM,GAAC,mBAAuB,CAAC,eACnDZ,KAAA,CAAAQ,aAAA,CAACH,WAAW;IACVQ,IAAI,EAAEP,WAAY;IAClBQ,oBAAoB,EAAGC,UAAU,IAAKC,OAAO,CAACC,GAAG,CAAC,WAAW,EAAEF,UAAU,CAAE;IAC3EG,SAAS,EAAC;EAAkB,CAC7B,CACS,CAAC;AAEjB,CAAC;AAED,MAAMR,MAAM,GAAGP,UAAU,CAACgB,MAAM,CAAC;EAC/BR,SAAS,EAAE;IACTS,IAAI,EAAE,CAAC;IACPC,eAAe,EAAE,SAAS;IAC1BC,OAAO,EAAE;EACX,CAAC;EACDV,KAAK,EAAE;IACLW,QAAQ,EAAE,EAAE;IACZC,UAAU,EAAE,MAAM;IAClBC,YAAY,EAAE,EAAE;IAChBC,SAAS,EAAE;EACb;AACF,CAAC,CAAC","ignoreList":[]}

package/lib/typescript/components/testProductCard.d.ts

@@ -1,3 +0,0 @@
-export function TestProductCard(): React.JSX.Element;
-import React from 'react';
-//# sourceMappingURL=testProductCard.d.ts.map

package/lib/typescript/components/testProductCard.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"testProductCard.d.ts","sourceRoot":"","sources":["../../../src/components/testProductCard.js"],"names":[],"mappings":"AA6BO,qDAWN;kBAxCiB,OAAO"}

package/src/components/testProductCard.js

@@ -1,55 +0,0 @@
-import React from 'react';
-import { View, ScrollView, StyleSheet, Text } from 'react-native';
-import { ProductCard } from './productCard';
-
-const mockProduct = {
-  "part_number": "AEQO177",
-  "inventory_info": {
-    "default_uom": "EA",
-    "is_valid": true,
-    "info_by_uom": {
-      "EA": {
-        "gross_price": 7.83,
-        "net_price": 7.83,
-        "is_on_sale": false,
-        "quantity_available": 0,
-        "discounts": null,
-        "min_pack_qty": 1.5
-      }
-    }
-  },
-  "product_details": {
-    "product_name": "Aladdin Hayward SPX1600S SuperPump Lid Gasket | O-177-2",
-    "part_number": "AEQO177",
-    "manufacturer_id": "O-177-2",
-    "heritage_link": "https://www.heritagepoolplus.com/aeqo177-aladdin-o-ring-o-177-o-177-2-o-177-2",
-    "image_url": "https://media.heritageplus.com/image/upload/v1668157956/image/AEQO177_0.jpg"
-  }
-};
-
-export const TestProductCard = () => {
-  return (
-    <ScrollView style={styles.container}>
-      <Text style={styles.title}>Test Product Card</Text>
-      <ProductCard 
-        prod={mockProduct}
-        onFocusQuantityInput={(partNumber) => console.log('Focus on:', partNumber)}
-        messageId="test-message-123"
-      />
-    </ScrollView>
-  );
-};
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: '#f6f6f6',
-    padding: 16,
-  },
-  title: {
-    fontSize: 18,
-    fontWeight: 'bold',
-    marginBottom: 16,
-    textAlign: 'center',
-  },
-});