apps-sdk 1.1.87 → 1.1.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps-sdk",
-  "version": "1.1.87",
+  "version": "1.1.88",
   "description": "Apps SDK",
   "main": "index.js",
   "author": "ASD",

package/src/libraries/Voice.js

@@ -1,5 +1,5 @@
 import * as config from '../../config';
-import { ExpoSpeechRecognitionModule, addSpeechRecognitionEventListener } from 'expo-speech-recognition';
+import { ExpoSpeechRecognitionModule } from 'expo-speech-recognition';
 import Session from "./Session";
 import * as Speech from 'expo-speech';
 import { franc } from 'franc-min';
@@ -18,33 +18,38 @@ class VoiceService {
                 throw new Error('Speech recognition permission not granted');
             }
 
-            const language = Session.getDeviceLanguageAndRegion();
+            let language = Session.getDeviceLanguageAndRegion();
+            language = this.normalizeLocale(language);
 
             if (this.resultListener) {
                 this.resultListener.remove();
             }
 
-            this.resultListener = addSpeechRecognitionEventListener('result', (event) => {
+            ExpoSpeechRecognitionModule.addListener('start', () => {
+                onSpeechStart();
+                this.resetInactivityTimeout(inactivitySeconds, onInactivityTimeout);
+            });
+
+            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);
                 }
-                if (event.isFinal) {
-                    this.stopRecognizing();
-                }
+            });
+
+            ExpoSpeechRecognitionModule.addListener('error', (event) => {
+                console.error('Speech recognition error:', event.error, event.message);
             });
 
             await ExpoSpeechRecognitionModule.start({
                 lang: language,
                 interimResults: true,
                 maxAlternatives: 1,
-                continuous: false,
+                continuous: true,
             });
 
             this.isRecognizing = true;
-            onSpeechStart();
-            this.resetInactivityTimeout(inactivitySeconds, onInactivityTimeout);
 
         } catch (e) {
             console.error('Speech recognition error:', e);
@@ -90,6 +95,57 @@ class VoiceService {
         }
     }
 
+    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) {
         let detectedLanguageCode = 'en_US';
         try {