react-native-davoice-tts 1.0.252 → 1.0.253

package/TTSRNBridge.podspec

@@ -2,7 +2,7 @@ require 'json'
 
 Pod::Spec.new do |s|
     s.name         = "TTSRNBridge"
-    s.version      = "1.0.125" # Update to your package version
+    s.version      = "1.0.126" # Update to your package version
     s.summary      = "TTS for React Native."
     s.description  = <<-DESC
                      A React Native module for tts .

package/ios/SpeechBridge/SpeechBridge.m

@@ -161,6 +161,24 @@ RCT_EXPORT_MODULE(SpeechBridge)
 - (NSURL *)resolveLocalURLFromPathOrURL:(NSString *)pathOrURL
 {
   if (!pathOrURL || (id)pathOrURL == [NSNull null] || pathOrURL.length == 0) return nil;
+  // ✅ Handle http(s): download to tmp and return file URL
+  if ([pathOrURL hasPrefix:@"http://"] || [pathOrURL hasPrefix:@"https://"]) {
+    NSURL *remoteURL = [NSURL URLWithString:pathOrURL];
+    if (!remoteURL) return nil;
+
+    NSData *data = [NSData dataWithContentsOfURL:remoteURL];
+    if (!data) return nil;
+
+    // keep extension if possible
+    NSString *ext = remoteURL.pathExtension.length ? remoteURL.pathExtension : @"bin";
+    NSString *tempName = [NSString stringWithFormat:@"rn_asset_%f.%@", [[NSDate date] timeIntervalSince1970], ext];
+    NSString *tempPath = [NSTemporaryDirectory() stringByAppendingPathComponent:tempName];
+
+    [[NSFileManager defaultManager] removeItemAtPath:tempPath error:nil];
+    if (![data writeToFile:tempPath atomically:YES]) return nil;
+
+    return [NSURL fileURLWithPath:tempPath];
+  }
 
   // Already a file URL
   if ([pathOrURL hasPrefix:@"file://"]) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-davoice-tts",
-    "version": "1.0.252",
+    "version": "1.0.253",
     "description": "tts library for React Native",
     "main": "tts/index.js",
     "types": "tts/index.d.ts",

package/speech/index.ts

@@ -2,7 +2,6 @@
 import { NativeModules, NativeEventEmitter, DeviceEventEmitter, Platform } from 'react-native';
 import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
 
-
 // -------------------- VERBOSE LOGGING --------------------
 const VERBOSE = true;
 const PFX = '[SpeechJS]';
@@ -109,6 +108,47 @@ export type ExternalPCM = {
 };
 
 class Speech {
+  // ---- MIN: serialize TTS + wait-for-finished ----
+  private ttsChain: Promise<void> = Promise.resolve();
+  private ttsPendingResolve: (() => void) | null = null;
+  private ttsPendingTimeout: any = null;
+
+  private _onNativeFinishedSpeaking() {
+    dbg('[EVENT onFinishedSpeaking]');
+    // 1) let app callback run
+    try { this.handlers.onFinishedSpeaking(); } catch (e) { dbgErr('onFinishedSpeaking handler error', String(e)); }
+
+    // 2) resolve the internal await (if any)
+    if (this.ttsPendingTimeout) { clearTimeout(this.ttsPendingTimeout); this.ttsPendingTimeout = null; }
+    const r = this.ttsPendingResolve;
+    this.ttsPendingResolve = null;
+    if (r) r();
+  }
+
+  private _nativeSpeak(text: string, speakerId: number, s: number) {
+    if (Platform.OS === 'ios' && NativeSpeech?.speak) return (NativeSpeech as any).speak(text, speakerId, s);
+    if (!NativeTTS?.speak) throw new Error('TTS speak not available');
+    return (NativeTTS as any).speak(text, speakerId, s);
+  }
+
+  private _speakAndWait(text: string, speakerId: number, s: number, timeoutMs = 60000) {
+    return new Promise<void>((resolve, reject) => {
+      this.ttsPendingResolve = resolve;
+      // safety: never hang forever
+      this.ttsPendingTimeout = setTimeout(() => {
+        this.ttsPendingResolve = null;
+        reject(new Error('TTS timeout waiting for onFinishedSpeaking'));
+      }, timeoutMs);
+      try {
+        this._nativeSpeak(text, speakerId, s);
+      } catch (e) {
+        if (this.ttsPendingTimeout) { clearTimeout(this.ttsPendingTimeout); this.ttsPendingTimeout = null; }
+        this.ttsPendingResolve = null;
+        reject(e as any);
+      }
+    });
+  }
+
   private sttEmitter: NativeEventEmitter | null = null;
   private ttsEmitter: NativeEventEmitter | typeof DeviceEventEmitter | null = null;
   private unifiedEmitter: NativeEventEmitter | null = null;
@@ -374,8 +414,9 @@ class Speech {
     if (Platform.OS === 'ios' && (NativeSpeech as any)?.pauseMicrophoneAsync) {
       dbg('IOS [pauseMicrophone] using NativeSpeech.pauseMicrophoneAsync()');
       try {
-        await (NativeSpeech as any).pauseMicrophoneAsync();
-        dbg('IOS [pauseMicrophone] NativeSpeech.pauseMicrophoneAsync() DONE');
+        const r = await (NativeSpeech as any).pauseMicrophoneAsync(1000);
+        dbg('pauseMicrophoneAsync result', r);
+        if (r?.ok === false) dbgErr('pauseMicrophoneAsync failed', r?.reason);
         return;
       } catch (e) {
         dbgErr('IOS [pauseMicrophone] NativeSpeech.pauseMicrophoneAsync() ERROR:', String(e));
@@ -403,7 +444,8 @@ class Speech {
     if (Platform.OS === 'ios' && (NativeSpeech as any)?.unPauseMicrophoneAsync) {
       dbg('IOS [unPauseMicrophone] using NativeSpeech.unPauseMicrophoneAsync()');
       try {
-        await (NativeSpeech as any).unPauseMicrophoneAsync();
+        const r = await (NativeSpeech as any).unPauseMicrophoneAsync(1000);
+        if (r?.ok === false) dbgErr('pauseMicrophoneAsync failed', r?.reason);
         dbg('IOS [unPauseMicrophone] NativeSpeech.unPauseMicrophoneAsync() DONE');
         return;
       } catch (e) {
@@ -495,17 +537,10 @@ class Speech {
     // sanitize and invert (avoid NaN/undefined/null)
     // Reverse speed to length.
     const s = Number.isFinite(speed as number) && speed !== 0 ? 1.0 / (speed as number) : 1.0;
-
-    // iOS unified
-    if (Platform.OS === 'ios' && NativeSpeech?.speak) {
-      // ✅ always call native with 3 args (text, speakerId, speed)
-      return (NativeSpeech as any).speak(text, speakerId, s);
-    }
-
-    if (!NativeTTS?.speak) throw new Error('TTS speak not available');
-
-    // ✅ always call native with 3 args (text, speakerId, speed)
-    return (NativeTTS as any).speak(text, speakerId, s);
+    this.ensureListeners();
+    // MIN: serialize + await actual completion (event-driven)
+    this.ttsChain = this.ttsChain.then(() => this._speakAndWait(text, speakerId, s));
+    return this.ttsChain;
   }
 
   async stopSpeaking() {
@@ -645,7 +680,7 @@ class Speech {
         onSpeechResults: (e) => this.handlers.onSpeechResults(e),
         onSpeechPartialResults: (e) => this.handlers.onSpeechPartialResults(e),
         onSpeechVolumeChanged: (e) => this.handlers.onSpeechVolumeChanged(e),
-        onFinishedSpeaking: () => this.handlers.onFinishedSpeaking(),
+        onFinishedSpeaking: () => this._onNativeFinishedSpeaking(),
       };
       (Object.keys(map) as NativeEventName[]).forEach((name) => {
         try {
@@ -677,9 +712,11 @@ class Speech {
     }
     if (this.ttsEmitter) {
       try {
-        const sub = this.ttsEmitter.addListener('onFinishedSpeaking', () =>
-          this.handlers.onFinishedSpeaking(),
-        );
+        // MIN: prevent duplicate listeners across Fast Refresh / reload
+        const g: any = globalThis as any;
+        try { g.__SpeechJS_finishedSub?.remove?.(); } catch {}
+        const sub = this.ttsEmitter.addListener('onFinishedSpeaking', () => this._onNativeFinishedSpeaking());
+        g.__SpeechJS_finishedSub = sub;
         this.subs.push(sub);
       } catch {}
     }