apps-sdk 2.1.0 → 2.1.2

package/config.js

@@ -1,27 +1,61 @@
 const config = {
-    ENDPOINTS: {
-        CONTENT: "https://backend.ailandsapp.com/content",
-        PAYMENT_CARD: "https://backend.ailandsapp.com/payment-card",
-        EVENTS_PUSH: "https://backend.ailandsapp.com/event/push",
-        ATTRIBUTION_SET_ID: "https://backend.ailandsapp.com/user/set-attribution-data",
-        ATTRIBUTION_SET_DATA: "https://backend.ailandsapp.com/user/set-adjust-data",
-        USER_CREATE_ID: "https://backend.ailandsapp.com/user/create-id",
-        NOTIFICATION_SET_TOKEN: "https://backend.ailandsapp.com/user/notification-token",
-        CONFIG: "https://backend.ailandsapp.com/core/config",
-        SUB_NEW: "https://backend.ailandsapp.com/core/sub-new",
-        SUB_STATUS: "https://backend.ailandsapp.com/core/sub-status",
-        LOCALIZE: "https://backend.ailandsapp.com",
-        AUDIENCES: "https://backend.ailandsapp.com",
-        CONTENTS: "https://backend.ailandsapp.com",
+    // ========================================
+    // BASE URLS (Dynamic - configurable)
+    // ========================================
+    BASE_URLS: {
+        CORE: "https://backend.ailandsapp.com",// Default, can be overridden from app
         EVENTS: "https://ap0404.gways.org",
-        LEGAL_BASE: "https://bc1742.gways.org/legal",
-        WEBAPP: null,  // Will be set from app config
+        WEBAPP: "https://bc1742.gways.org",  // Default, can be overridden from app
+    },
+
+    // ========================================
+    // PATHS -
+    // ========================================
+    CORE_PATHS: {
+        CONTENT: "/content",
+        PAYMENT_CARD: "/payment-card",
+        EVENTS_PUSH: "/event/push",
+        ATTRIBUTION_SET_ID: "/user/set-attribution-data",
+        ATTRIBUTION_SET_DATA: "/user/set-adjust-data",
+        USER_CREATE_ID: "/user/create-id",
+        NOTIFICATION_SET_TOKEN: "/user/notification-token",
+        CONFIG: "/core/config",
+        SUB_NEW: "/core/sub-new",
+        SUB_STATUS: "/core/sub-status",
     },
 
     WEBAPP_PATHS: {
         GET_CREDITS: "/user/get-credits",
     },
 
+    LEGAL_PATHS: {
+        BASE: "/legal",
+    },
+
+    // ========================================
+    // COMPUTED ENDPOINTS (dynamic getter)
+    // ========================================
+    get ENDPOINTS() {
+        return {
+            CONTENT: `${this.BASE_URLS.CORE}${this.CORE_PATHS.CONTENT}`,
+            PAYMENT_CARD: `${this.BASE_URLS.CORE}${this.CORE_PATHS.PAYMENT_CARD}`,
+            EVENTS_PUSH: `${this.BASE_URLS.CORE}${this.CORE_PATHS.EVENTS_PUSH}`,
+            ATTRIBUTION_SET_ID: `${this.BASE_URLS.CORE}${this.CORE_PATHS.ATTRIBUTION_SET_ID}`,
+            ATTRIBUTION_SET_DATA: `${this.BASE_URLS.CORE}${this.CORE_PATHS.ATTRIBUTION_SET_DATA}`,
+            USER_CREATE_ID: `${this.BASE_URLS.CORE}${this.CORE_PATHS.USER_CREATE_ID}`,
+            NOTIFICATION_SET_TOKEN: `${this.BASE_URLS.CORE}${this.CORE_PATHS.NOTIFICATION_SET_TOKEN}`,
+            CONFIG: `${this.BASE_URLS.CORE}${this.CORE_PATHS.CONFIG}`,
+            SUB_NEW: `${this.BASE_URLS.CORE}${this.CORE_PATHS.SUB_NEW}`,
+            SUB_STATUS: `${this.BASE_URLS.CORE}${this.CORE_PATHS.SUB_STATUS}`,
+            LOCALIZE: this.BASE_URLS.CORE,
+            AUDIENCES: this.BASE_URLS.CORE,
+            CONTENTS: this.BASE_URLS.CORE,
+            EVENTS: this.BASE_URLS.EVENTS,
+            LEGAL_BASE: `${this.BASE_URLS.WEBAPP}${this.LEGAL_PATHS.BASE}`,  // LEGAL uses WEBAPP base
+            WEBAPP: this.BASE_URLS.WEBAPP,
+        };
+    },
+
     EVENTS: {},
     EVENTS_MIXPANEL: {},
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "apps-sdk",
-  "version": "2.1.0",
-  "description": "Apps SDK - Compatible with Expo SDK 54 + React 19 - Firebase optional",
+  "version": "2.1.2",
+  "description": "Apps SDK - Compatible with Expo SDK 54 + React 19 - create User pre url",
   "main": "index.js",
   "author": "ASD",
   "license": "ISC",

package/src/libraries/Networking.js

@@ -126,12 +126,23 @@ class Networking {
     }
 
     setEndpoints(domains) {
+        // Update BASE_URLS instead of ENDPOINTS directly
         for (let key in domains) {
             if (domains.hasOwnProperty(key)) {
-                config.ENDPOINTS[key.toUpperCase()] = domains[key];
+                const upperKey = key.toUpperCase();
+                // Map backend domains to BASE_URLS
+                if (upperKey === 'CONTENTS') {
+                    config.BASE_URLS.CORE = domains[key];
+                } else if (upperKey === 'EVENTS') {
+                    config.BASE_URLS.EVENTS = domains[key];
+                } else if (upperKey === 'LEGAL') {
+                    // LEGAL uses WEBAPP, no separate BASE_URL
+                    config.BASE_URLS.WEBAPP = domains[key];
+                }
             }
         }
-        storage.storeData("ENDPOINTS", config.ENDPOINTS);
+        // Store updated BASE_URLS
+        storage.storeData("BASE_URLS", config.BASE_URLS);
     }
 
     setImageCompression(compression) {

package/src/libraries/Session.js

@@ -26,10 +26,20 @@ class Session {
     }
 
     setConfigEndpoint = (endpoint) => {
-        config.DEBUG_MODE && console.debug("setInitEndpoint - endpoint: ", endpoint);
+        config.DEBUG_MODE && console.debug("setConfigEndpoint - endpoint: ", endpoint);
         config.ENDPOINTS.CONFIG = endpoint;
     }
 
+    setUserCreateEndpoint = (endpoint) => {
+        config.DEBUG_MODE && console.debug("setUserCreateEndpoint - endpoint: ", endpoint);
+        config.ENDPOINTS.USER_CREATE_ID = endpoint;
+    }
+
+    setBaseUrl = (baseUrl) => {
+        config.DEBUG_MODE && console.debug("setBaseUrl - baseUrl: ", baseUrl);
+        config.BASE_URLS.CORE = baseUrl;
+    }
+
     initSession = async () => {
         config.DEBUG_MODE && console.debug("initSession");
         await Networking.sendEvent(config.EVENT_TYPES.OTHER, 'init_session');

package/src/libraries/Voice.js

@@ -5,16 +5,75 @@ import * as Speech from 'expo-speech';
 import { franc } from 'franc-min';
 import Networking from './Networking';
 import MixPanel from './MixPanel';
+import { Platform } from 'react-native';
+
+const ANDROID_STOP_DELAY_MS = 400;
 
 class VoiceService {
     constructor() {
         this.inactivityTimeout = null;
-        this.resultListener = null;
-        this.volumeListener = null;
+
+        // Tracked listeners — always removed before re-registering
+        this.startListener    = null;
+        this.resultListener   = null;
+        this.errorListener    = null;
+        this.volumeListener   = null;
+
+        // State flags used to prevent race conditions
         this.isRecognizing = false;
+        this.isStarting    = false;
+        this.isStopping    = false;
+
+        // Android delivers speech in segments; we accumulate finalized segments here
+        // so callers always receive the full transcript, not just the latest chunk.
+        this._committedTranscript = '';
+    }
+
+    // ─────────────────────────────────────────────
+    // Internal helpers
+    // ─────────────────────────────────────────────
+
+    /** Remove ALL tracked listeners in one call. */
+    _removeAllListeners() {
+        const listeners = ['startListener', 'resultListener', 'errorListener', 'volumeListener'];
+        listeners.forEach(key => {
+            if (this[key]) {
+                try { this[key].remove(); } catch (_) {}
+                this[key] = null;
+            }
+        });
+    }
+
+    /** Wait for a given number of milliseconds. */
+    _delay(ms) {
+        return new Promise(resolve => setTimeout(resolve, ms));
     }
 
-    async startRecognizing(onSpeechStart, onSpeechRecognized, onSpeechResults, onInactivityTimeout, inactivitySeconds = 3, onVolumeChange = null, onNoSpeech = null) {
+    // ─────────────────────────────────────────────
+    // Public API
+    // ─────────────────────────────────────────────
+
+    async startRecognizing(
+        onSpeechStart,
+        onSpeechRecognized,
+        onSpeechResults,
+        onInactivityTimeout,
+        inactivitySeconds = 3,
+        onVolumeChange = null,
+        onNoSpeech = null
+    ) {
+        // Prevent concurrent start calls
+        if (this.isStarting || this.isStopping) {
+            config.DEBUG_MODE && console.log('Voice: startRecognizing skipped — transition in progress');
+            return;
+        }
+        if (this.isRecognizing) {
+            config.DEBUG_MODE && console.log('Voice: startRecognizing skipped — already recognizing');
+            return;
+        }
+
+        this.isStarting = true;
+
         try {
             const { status } = await ExpoSpeechRecognitionModule.requestPermissionsAsync();
             if (status !== 'granted') {
@@ -33,36 +92,56 @@ class VoiceService {
             let language = Session.getDeviceLanguageAndRegion();
             language = this.normalizeLocale(language);
 
-            if (this.resultListener) {
-                this.resultListener.remove();
-            }
+            // Always remove stale listeners before registering new ones
+            this._removeAllListeners();
 
-             this.volumeListener = ExpoSpeechRecognitionModule.addListener("volumechange" , ({value}) => {
-                if (onVolumeChange) {
-                    onVolumeChange(value);
-                }
-            })
+            // ── volume ──────────────────────────────────────────────────
+            this.volumeListener = ExpoSpeechRecognitionModule.addListener('volumechange', ({ value }) => {
+                if (onVolumeChange) onVolumeChange(value);
+            });
 
-            ExpoSpeechRecognitionModule.addListener('start', () => {
+            // ── start ───────────────────────────────────────────────────
+            this.startListener = ExpoSpeechRecognitionModule.addListener('start', () => {
+                console.log('SPEECH -  start');
+                // Reset accumulator at the beginning of each new recognition session
+                this._committedTranscript = '';
                 onSpeechStart();
                 this.resetInactivityTimeout(inactivitySeconds, onInactivityTimeout);
             });
 
+            // ── result ──────────────────────────────────────────────────
             this.resultListener = ExpoSpeechRecognitionModule.addListener('result', (event) => {
+                console.log('SPEECH -  result', event);
                 if (event.results && event.results.length > 0) {
-                    const results = event.results.map(r => r.transcript);
-                    onSpeechResults(results);
+                    // event.results[0] is the best hypothesis for the current segment
+                    const currentSegment = event.results[0].transcript || '';
+                    const isFinal = event.isFinal ?? false;
+
+                    // Build the full transcript: everything committed so far + current segment
+                    const fullTranscript = (this._committedTranscript + ' ' + currentSegment).trim();
+
+
+                    // Always pass the full accumulated transcript to the caller
+                    onSpeechResults([fullTranscript]);
+
+                    // When the engine finalises a segment, commit it
+                    if (isFinal) {
+                        this._committedTranscript = fullTranscript;
+                        console.log('SPEECH -  segment committed:', this._committedTranscript);
+                    }
+
                     this.resetInactivityTimeout(inactivitySeconds, onInactivityTimeout);
                 }
             });
 
-            ExpoSpeechRecognitionModule.addListener('error', (event) => {
+            // ── error ───────────────────────────────────────────────────
+            this.errorListener = ExpoSpeechRecognitionModule.addListener('error', (event) => {
+                config.DEBUG_MODE && console.log('Voice - ERROR', event);
                 console.error('Speech recognition error:', event.error, event.message);
-                
-                // Handle "no-speech" error specifically
+
                 if (event.error === 'no-speech' && onNoSpeech) {
                     onNoSpeech();
-                    // Don't stop recognition, just notify user
+                    // Non-fatal — just notify, recognition keeps running
                 }
             });
 
@@ -71,51 +150,81 @@ class VoiceService {
                 interimResults: true,
                 maxAlternatives: 1,
                 continuous: true,
-                volumeChangeEventOptions : {
-                    enabled : true,
-                    intervalMillis:150
-                }
+                volumeChangeEventOptions: {
+                    enabled: true,
+                    intervalMillis: 150,
+                },
             });
 
             this.isRecognizing = true;
 
         } catch (e) {
-            console.error('Speech recognition error:', e);
+            console.error('Speech recognition start error:', e);
+            this._removeAllListeners();
             this.isRecognizing = false;
+        } finally {
+            this.isStarting = false;
         }
     }
 
     resetInactivityTimeout(seconds, onInactivityTimeout) {
+        // Always clear any existing timer first
         if (this.inactivityTimeout) {
             clearTimeout(this.inactivityTimeout);
+            this.inactivityTimeout = null;
         }
-        this.inactivityTimeout = setTimeout(() => {
-            this.stopRecognizing();
-            if (onInactivityTimeout) {
-                onInactivityTimeout();
-            }
+
+        // A falsy / zero value means "run indefinitely — no auto-stop"
+        if (!seconds) {
+            config.DEBUG_MODE && console.log('Voice: inactivity timeout disabled (indefinite recognition)');
+            return;
+        }
+
+        this.inactivityTimeout = setTimeout(async () => {
+            // Await full stop (incl. Android delay) before notifying the caller.
+            // Without this await, onInactivityTimeout fires while isStopping=true
+            // and a secondary destroyVoice() call gets skipped by the guard.
+            await this.stopRecognizing();
+            if (onInactivityTimeout) onInactivityTimeout();
         }, seconds * 1000);
     }
 
     async stopRecognizing() {
+        // Prevent concurrent stop calls or stopping when already idle
+        if (this.isStopping) {
+            config.DEBUG_MODE && console.log('Voice: stopRecognizing skipped — already stopping');
+            return;
+        }
+        if (!this.isRecognizing && !this.isStarting) {
+            config.DEBUG_MODE && console.log('Voice: stopRecognizing skipped — not active');
+            return;
+        }
+
+        this.isStopping = true;
+
         try {
+            // Clear the inactivity timer first
             if (this.inactivityTimeout) {
                 clearTimeout(this.inactivityTimeout);
+                this.inactivityTimeout = null;
             }
-            if (this.resultListener) {
-                this.resultListener.remove();
-                this.resultListener = null;
-            }
-            if (this.volumeListener) {
-                this.volumeListener.remove();
-                this.volumeListener = null;
-            }
+
+            // Remove all event listeners before stopping the engine
+            this._removeAllListeners();
+
             if (this.isRecognizing) {
+                // Android needs a short pause before stop() is accepted reliably
+                if (Platform.OS === 'android') {
+                    await this._delay(ANDROID_STOP_DELAY_MS);
+                }
                 await ExpoSpeechRecognitionModule.stop();
                 this.isRecognizing = false;
             }
         } catch (e) {
             console.error('Stop recognition error:', e);
+            this.isRecognizing = false;
+        } finally {
+            this.isStopping = false;
         }
     }
 
@@ -129,7 +238,7 @@ 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'],
@@ -170,7 +279,7 @@ class VoiceService {
         }
 
         const validRegions = validCombinations[lang];
-        
+
         if (validRegions.includes(region)) {
             return locale;
         }
@@ -205,21 +314,19 @@ class VoiceService {
         const detectedLanguage = languageMap[detectedLanguageCode] || 'en_US';
         const finalLanguage = detectedLanguage || Session.getDeviceLanguageAndRegion();
         const finalVoice = voice || `${finalLanguage}-voice`;
-        config.DEBUG_MODE && console.log('Speech detected language:', detectedLanguage, 'final language:', finalLanguage, 'final voice:', finalVoice);
+        config.DEBUG_MODE && console.log(
+            'Speech detected language:', detectedLanguage,
+            'final language:', finalLanguage,
+            'final voice:', finalVoice
+        );
 
         Speech.speak(message, {
             language: finalLanguage,
             rate: 1,
             pitch: 1,
-            onStart: () => {
-                if (onStart) onStart();
-            },
-            onDone: () => {
-                if (onDone) onDone();
-            },
-            onError: (error) => {
-                if (onError) onError(error);
-            }
+            onStart: () => { if (onStart) onStart(); },
+            onDone:  () => { if (onDone)  onDone();  },
+            onError: (error) => { if (onError) onError(error); },
         });
     }
 
@@ -228,7 +335,7 @@ class VoiceService {
             await Speech.stop();
             if (onStop) onStop();
         } catch (error) {
-            console.error("Error stopping speech:", error);
+            console.error('Error stopping speech:', error);
         }
     }
 }