apps-sdk 1.1.86 → 1.1.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps-sdk",
-  "version": "1.1.86",
+  "version": "1.1.88",
   "description": "Apps SDK",
   "main": "index.js",
   "author": "ASD",
@@ -17,6 +17,7 @@
     "expo-notifications": ">=0.29.0",
     "expo-sharing": ">=13.0.0",
     "expo-speech": ">=13.0.0",
+    "expo-speech-recognition": ">=0.1.0",
     "expo-store-review": ">=8.0.0",
     "expo-tracking-transparency": ">=5.1.0",
     "react-native": ">=0.76.0 <0.81.0",
@@ -32,7 +33,7 @@
     "@expo/config-plugins": "~9.0.0",
     "@react-native-async-storage/async-storage": "1.23.1",
     "@react-native-community/netinfo": "11.4.1",
-    "@react-native-voice/voice": "^3.2.4",
+    "expo-speech-recognition": "^3.0.1",
     "franc-min": "^6.2.0",
     "mixpanel-react-native": "^3.1.3",
     "react-native-btr": "^2.2.1",

package/src/libraries/Voice.js

@@ -1,34 +1,59 @@
 import * as config from '../../config';
-import Voice from '@react-native-voice/voice';
+import { ExpoSpeechRecognitionModule } from 'expo-speech-recognition';
 import Session from "./Session";
 import * as Speech from 'expo-speech';
 import { franc } from 'franc-min';
 
 class VoiceService {
     constructor() {
-        this.voice = Voice;
         this.inactivityTimeout = null;
+        this.resultListener = null;
+        this.isRecognizing = false;
     }
 
     async startRecognizing(onSpeechStart, onSpeechRecognized, onSpeechResults, onInactivityTimeout, inactivitySeconds = 3) {
         try {
-            const language = Session.getDeviceLanguageAndRegion();
+            const { status } = await ExpoSpeechRecognitionModule.requestPermissionsAsync();
+            if (status !== 'granted') {
+                throw new Error('Speech recognition permission not granted');
+            }
+
+            let language = Session.getDeviceLanguageAndRegion();
+            language = this.normalizeLocale(language);
 
-            this.voice.onSpeechStart = () => {
+            if (this.resultListener) {
+                this.resultListener.remove();
+            }
+
+            ExpoSpeechRecognitionModule.addListener('start', () => {
                 onSpeechStart();
                 this.resetInactivityTimeout(inactivitySeconds, onInactivityTimeout);
-            };
+            });
 
-            this.voice.onSpeechRecognized = onSpeechRecognized;
+            this.resultListener = ExpoSpeechRecognitionModule.addListener('result', (event) => {
+                if (event.results && event.results.length > 0) {
+                    const results = event.results.map(r => r.transcript);
+                    onSpeechResults(results);
+                    this.resetInactivityTimeout(inactivitySeconds, onInactivityTimeout);
+                }
+            });
 
-            this.voice.onSpeechResults = (e) => {
-                onSpeechResults(e.value);
-                this.resetInactivityTimeout(inactivitySeconds, onInactivityTimeout);
-            };
+            ExpoSpeechRecognitionModule.addListener('error', (event) => {
+                console.error('Speech recognition error:', event.error, event.message);
+            });
+
+            await ExpoSpeechRecognitionModule.start({
+                lang: language,
+                interimResults: true,
+                maxAlternatives: 1,
+                continuous: true,
+            });
+
+            this.isRecognizing = true;
 
-            await this.voice.start(language);
         } catch (e) {
-            console.error(e);
+            console.error('Speech recognition error:', e);
+            this.isRecognizing = false;
         }
     }
 
@@ -46,20 +71,79 @@ class VoiceService {
 
     async stopRecognizing() {
         try {
-            clearTimeout(this.inactivityTimeout);
-            await this.voice.stop();
+            if (this.inactivityTimeout) {
+                clearTimeout(this.inactivityTimeout);
+            }
+            if (this.resultListener) {
+                this.resultListener.remove();
+                this.resultListener = null;
+            }
+            if (this.isRecognizing) {
+                await ExpoSpeechRecognitionModule.stop();
+                this.isRecognizing = false;
+            }
         } catch (e) {
-            console.error(e);
+            console.error('Stop recognition error:', e);
         }
     }
 
     async destroyVoice() {
         try {
-            clearTimeout(this.inactivityTimeout);
-            await this.voice.destroy();
+            await this.stopRecognizing();
         } catch (e) {
-            console.error(e);
+            console.error('Destroy voice error:', e);
+        }
+    }
+
+    normalizeLocale(locale) {
+        const [lang, region] = locale.split('-');
+        
+        const validCombinations = {
+            'en': ['US', 'GB', 'AU', 'CA', 'NZ', 'ZA', 'AE', 'IN', 'SG', 'IE', 'PH', 'SA', 'ID'],
+            'es': ['ES', 'MX', 'CL', 'CO', '419', 'US'],
+            'fr': ['FR', 'CA', 'BE', 'CH'],
+            'de': ['DE', 'AT', 'CH'],
+            'pt': ['PT', 'BR'],
+            'it': ['IT', 'CH'],
+            'nl': ['NL', 'BE'],
+            'zh': ['CN', 'TW', 'HK'],
+            'ar': ['SA'],
+            'ja': ['JP'],
+            'ko': ['KR'],
+            'ru': ['RU'],
+            'tr': ['TR'],
+            'vi': ['VN'],
+            'sv': ['SE'],
+            'ms': ['MY'],
+            'id': ['ID'],
+            'el': ['GR'],
+            'uk': ['UA'],
+            'cs': ['CZ'],
+            'pl': ['PL'],
+            'hi': ['IN'],
+            'hr': ['HR'],
+            'ca': ['ES'],
+            'th': ['TH'],
+            'da': ['DK'],
+            'fi': ['FI'],
+            'he': ['IL'],
+            'nb': ['NO'],
+            'sk': ['SK'],
+            'ro': ['RO'],
+            'hu': ['HU'],
+        };
+
+        if (!validCombinations[lang]) {
+            return 'en-US';
         }
+
+        const validRegions = validCombinations[lang];
+        
+        if (validRegions.includes(region)) {
+            return locale;
+        }
+
+        return `${lang}-${validRegions[0]}`;
     }
 
     speak(message, language = null, voice = null, onStart, onDone, onError) {