react-native-davoice-tts 1.0.255 → 1.0.256

package/ios/TTSRNBridge/DavoiceTTS.xcframework/ios-arm64_x86_64-simulator/DavoiceTTS.framework/Modules/DavoiceTTS.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface

@@ -14,6 +14,18 @@ import _StringProcessing
 import _SwiftConcurrencyShims
 import onnxruntime_objc
 import phonemes
+public typealias EngineSchedule = (_ url: Foundation.URL, _ onDone: @escaping () -> Swift.Void) -> Swift.Bool
+public typealias IsEngineReady = () -> Swift.Bool
+public typealias useOnlyEnginePlayback = () -> Swift.Bool
+public typealias StopEnginePlayback = () -> Swift.Void
+public typealias CurrentEngineProvider = () -> AVFAudio.AVAudioEngine?
+public enum AudioPlaybackHook {
+  public static var engineScheduleFile: DavoiceTTS.EngineSchedule?
+  public static var isEngineReady: DavoiceTTS.IsEngineReady?
+  public static var useOnlyEnginePlayback: DavoiceTTS.useOnlyEnginePlayback?
+  public static var stopEnginePlayback: DavoiceTTS.StopEnginePlayback?
+  public static var currentEngine: DavoiceTTS.CurrentEngineProvider?
+}
 @objc public protocol STTDelegate {
   @objc func stt(_ stt: DavoiceTTS.STT, didEmitEvent name: Swift.String, body: [Swift.String : Any]?)
 }
@@ -75,15 +87,3 @@ import phonemes
   @objc final public func playWav(_ url: Foundation.URL, markAsLastUtterance: Swift.Bool = true)
   @objc final public func playBuffer(_ buffer: AVFAudio.AVAudioPCMBuffer, markAsLastUtterance: Swift.Bool = true)
 }
-public typealias EngineSchedule = (_ url: Foundation.URL, _ onDone: @escaping () -> Swift.Void) -> Swift.Bool
-public typealias IsEngineReady = () -> Swift.Bool
-public typealias useOnlyEnginePlayback = () -> Swift.Bool
-public typealias StopEnginePlayback = () -> Swift.Void
-public typealias CurrentEngineProvider = () -> AVFAudio.AVAudioEngine?
-public enum AudioPlaybackHook {
-  public static var engineScheduleFile: DavoiceTTS.EngineSchedule?
-  public static var isEngineReady: DavoiceTTS.IsEngineReady?
-  public static var useOnlyEnginePlayback: DavoiceTTS.useOnlyEnginePlayback?
-  public static var stopEnginePlayback: DavoiceTTS.StopEnginePlayback?
-  public static var currentEngine: DavoiceTTS.CurrentEngineProvider?
-}

package/ios/TTSRNBridge/DavoiceTTS.xcframework/ios-arm64_x86_64-simulator/DavoiceTTS.framework/Modules/DavoiceTTS.swiftmodule/x86_64-apple-ios-simulator.swiftinterface

@@ -14,6 +14,18 @@ import _StringProcessing
 import _SwiftConcurrencyShims
 import onnxruntime_objc
 import phonemes
+public typealias EngineSchedule = (_ url: Foundation.URL, _ onDone: @escaping () -> Swift.Void) -> Swift.Bool
+public typealias IsEngineReady = () -> Swift.Bool
+public typealias useOnlyEnginePlayback = () -> Swift.Bool
+public typealias StopEnginePlayback = () -> Swift.Void
+public typealias CurrentEngineProvider = () -> AVFAudio.AVAudioEngine?
+public enum AudioPlaybackHook {
+  public static var engineScheduleFile: DavoiceTTS.EngineSchedule?
+  public static var isEngineReady: DavoiceTTS.IsEngineReady?
+  public static var useOnlyEnginePlayback: DavoiceTTS.useOnlyEnginePlayback?
+  public static var stopEnginePlayback: DavoiceTTS.StopEnginePlayback?
+  public static var currentEngine: DavoiceTTS.CurrentEngineProvider?
+}
 @objc public protocol STTDelegate {
   @objc func stt(_ stt: DavoiceTTS.STT, didEmitEvent name: Swift.String, body: [Swift.String : Any]?)
 }
@@ -75,15 +87,3 @@ import phonemes
   @objc final public func playWav(_ url: Foundation.URL, markAsLastUtterance: Swift.Bool = true)
   @objc final public func playBuffer(_ buffer: AVFAudio.AVAudioPCMBuffer, markAsLastUtterance: Swift.Bool = true)
 }
-public typealias EngineSchedule = (_ url: Foundation.URL, _ onDone: @escaping () -> Swift.Void) -> Swift.Bool
-public typealias IsEngineReady = () -> Swift.Bool
-public typealias useOnlyEnginePlayback = () -> Swift.Bool
-public typealias StopEnginePlayback = () -> Swift.Void
-public typealias CurrentEngineProvider = () -> AVFAudio.AVAudioEngine?
-public enum AudioPlaybackHook {
-  public static var engineScheduleFile: DavoiceTTS.EngineSchedule?
-  public static var isEngineReady: DavoiceTTS.IsEngineReady?
-  public static var useOnlyEnginePlayback: DavoiceTTS.useOnlyEnginePlayback?
-  public static var stopEnginePlayback: DavoiceTTS.StopEnginePlayback?
-  public static var currentEngine: DavoiceTTS.CurrentEngineProvider?
-}

package/ios/TTSRNBridge/DavoiceTTS.xcframework/ios-arm64_x86_64-simulator/DavoiceTTS.framework/_CodeSignature/CodeResources

@@ -14,11 +14,11 @@
 		</data>
 		<key>Modules/DavoiceTTS.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<data>
-		f7N4jI+WXib0a9+L4aFqHkbjA3Y=
+		3RAZZqjPN6AsMS8CRPYam5UrI+Q=
 		</data>
 		<key>Modules/DavoiceTTS.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
-		uXsP9gnz1xzAaRo2eLoIl5JQ3VY=
+		4O+ZELfFqgN6Wieq1IiRQfAtoN4=
 		</data>
 		<key>Modules/DavoiceTTS.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
 		<data>
@@ -26,19 +26,19 @@
 		</data>
 		<key>Modules/DavoiceTTS.swiftmodule/arm64-apple-ios-simulator.swiftinterface</key>
 		<data>
-		uXsP9gnz1xzAaRo2eLoIl5JQ3VY=
+		4O+ZELfFqgN6Wieq1IiRQfAtoN4=
 		</data>
 		<key>Modules/DavoiceTTS.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
 		<data>
-		Swgw9eGnnFVxOIl5VEEdlXTultM=
+		INJcQbxf4lAuyKTlVvVmR2cNZaM=
 		</data>
 		<key>Modules/DavoiceTTS.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<data>
-		f7N4jI+WXib0a9+L4aFqHkbjA3Y=
+		3RAZZqjPN6AsMS8CRPYam5UrI+Q=
 		</data>
 		<key>Modules/DavoiceTTS.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
-		ZQ//BRCMXbUeGU+SHLgs9vdg3gI=
+		1Vb2U866a0w0XTRJKjUPBKyutls=
 		</data>
 		<key>Modules/DavoiceTTS.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
 		<data>
@@ -46,11 +46,11 @@
 		</data>
 		<key>Modules/DavoiceTTS.swiftmodule/x86_64-apple-ios-simulator.swiftinterface</key>
 		<data>
-		ZQ//BRCMXbUeGU+SHLgs9vdg3gI=
+		1Vb2U866a0w0XTRJKjUPBKyutls=
 		</data>
 		<key>Modules/DavoiceTTS.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
 		<data>
-		Wb0CH+d5Rt+B/fW1YFQ4KFp3CkQ=
+		+9dEdU5i48FoqSKVckzAEJMNdIc=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -74,22 +74,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			f7N4jI+WXib0a9+L4aFqHkbjA3Y=
+			3RAZZqjPN6AsMS8CRPYam5UrI+Q=
 			</data>
 			<key>hash2</key>
 			<data>
-			lhKit0no618yBgiAOzE/KbAwrp3qsphrs6kySop747M=
+			tJBTb1sJo1EzXnSMFMyFRZF5Mf/pWCw0spR0l6AoO6s=
 			</data>
 		</dict>
 		<key>Modules/DavoiceTTS.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			uXsP9gnz1xzAaRo2eLoIl5JQ3VY=
+			4O+ZELfFqgN6Wieq1IiRQfAtoN4=
 			</data>
 			<key>hash2</key>
 			<data>
-			aAIibkQumUq3CC2187V6O9u81lZQtF+Zo062pC65QHw=
+			m6+AXAvSKhaIawhOn0Oa+LfqZr0mwnH+e49WljlXBDQ=
 			</data>
 		</dict>
 		<key>Modules/DavoiceTTS.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
@@ -107,44 +107,44 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			uXsP9gnz1xzAaRo2eLoIl5JQ3VY=
+			4O+ZELfFqgN6Wieq1IiRQfAtoN4=
 			</data>
 			<key>hash2</key>
 			<data>
-			aAIibkQumUq3CC2187V6O9u81lZQtF+Zo062pC65QHw=
+			m6+AXAvSKhaIawhOn0Oa+LfqZr0mwnH+e49WljlXBDQ=
 			</data>
 		</dict>
 		<key>Modules/DavoiceTTS.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			Swgw9eGnnFVxOIl5VEEdlXTultM=
+			INJcQbxf4lAuyKTlVvVmR2cNZaM=
 			</data>
 			<key>hash2</key>
 			<data>
-			oOwDygBnum5lqC5hoFBQaoYemQOzZjsbr+FlcYF7pHc=
+			TVZZVoeIqGe9BS6dOJAJ6/MMUEQQuiCMAA4f9OcB+b0=
 			</data>
 		</dict>
 		<key>Modules/DavoiceTTS.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			f7N4jI+WXib0a9+L4aFqHkbjA3Y=
+			3RAZZqjPN6AsMS8CRPYam5UrI+Q=
 			</data>
 			<key>hash2</key>
 			<data>
-			lhKit0no618yBgiAOzE/KbAwrp3qsphrs6kySop747M=
+			tJBTb1sJo1EzXnSMFMyFRZF5Mf/pWCw0spR0l6AoO6s=
 			</data>
 		</dict>
 		<key>Modules/DavoiceTTS.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			ZQ//BRCMXbUeGU+SHLgs9vdg3gI=
+			1Vb2U866a0w0XTRJKjUPBKyutls=
 			</data>
 			<key>hash2</key>
 			<data>
-			Hw+bYIfvYYhjCYfipeFH/tzcwytcA0GefnHPjhJvdWc=
+			xnT9sHQ+AlnAVwienpdc3CibbdtRRl60kSp3a3bXvKw=
 			</data>
 		</dict>
 		<key>Modules/DavoiceTTS.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
@@ -162,22 +162,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			ZQ//BRCMXbUeGU+SHLgs9vdg3gI=
+			1Vb2U866a0w0XTRJKjUPBKyutls=
 			</data>
 			<key>hash2</key>
 			<data>
-			Hw+bYIfvYYhjCYfipeFH/tzcwytcA0GefnHPjhJvdWc=
+			xnT9sHQ+AlnAVwienpdc3CibbdtRRl60kSp3a3bXvKw=
 			</data>
 		</dict>
 		<key>Modules/DavoiceTTS.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			Wb0CH+d5Rt+B/fW1YFQ4KFp3CkQ=
+			+9dEdU5i48FoqSKVckzAEJMNdIc=
 			</data>
 			<key>hash2</key>
 			<data>
-			FDf9Qwlm9ywiwgD1CrwyWkjfjdbnoHLObwQ6w5KGbJA=
+			8yWt+N+RFv6qWVK5ez+zZef+TsiN7MStzeI9jMjZ34E=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>

package/package.json

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

package/speech/index.ts

@@ -551,45 +551,78 @@ class Speech {
     return NativeTTS.stopSpeaking();
   }
 
-  // --- NEW: TTS passthroughs for external audio ---
-  /** Queue a WAV file (local path, file:// URL, or require() asset). */
+  // ADD near your other TTS queue fields (DO NOT remove existing ones)
+  private wavChain: Promise<void> = Promise.resolve();
+
+  // ADD helper (minimal, uses existing onFinishedSpeaking event)
+  private _playWavAndWait(realPath: string, markAsLast: boolean, timeoutMs = 10000) {
+    return new Promise<void>((resolve, reject) => {
+      this.ttsPendingResolve = resolve; // reuse existing resolver + event
+      this.ttsPendingTimeout = setTimeout(() => {
+        this.ttsPendingResolve = null;
+        reject(new Error('WAV timeout waiting for onFinishedSpeaking'));
+      }, timeoutMs);
+
+      try {
+        // Prefer unified iOS bridge if present
+        if (Platform.OS === 'ios' && NativeSpeech?.playWav) {
+          (NativeSpeech as any).playWav(realPath, markAsLast);
+          return;
+        }
+        if (!NativeTTS?.playWav) throw new Error('playWav not available on this platform.');
+        (NativeTTS as any).playWav(realPath, markAsLast);
+      } catch (e) {
+        if (this.ttsPendingTimeout) { clearTimeout(this.ttsPendingTimeout); this.ttsPendingTimeout = null; }
+        this.ttsPendingResolve = null;
+        reject(e as any);
+      }
+    });
+  }
+
   async playWav(pathOrURL: any, markAsLast = true) {
-    // NEW: resolve require() assets to actual file path/URI
+    // ✅ KEEP ALL YOUR EXISTING LOGGING + resolveAssetSource LOGIC
     console.log('[Speech.playWav] called with:', pathOrURL, '| type:', typeof pathOrURL);
-    //const resolveAssetSource = require('react-native/Libraries/Image/resolveAssetSource').default;
 
     const asset = resolveAssetSource(pathOrURL);
     console.log('[Speech.playWav] resolveAssetSource ->', asset);
 
-    let realPath = asset?.uri ?? pathOrURL; // fallback keeps string path intact
+    let realPath = asset?.uri ?? pathOrURL;
     console.log('[Speech.playWav] resolved realPath:', realPath);
 
-      // ✅ Coerce to string explicitly
     if (typeof realPath !== 'string') {
       realPath = String(realPath);
       console.log('[Speech.playWav] converted ?? realPath:', realPath);
     }
-    
+
     console.log('[Speech.playWav] before checking ios realPath:', realPath);
 
-    // Prefer unified iOS bridge if present
+    // ✅ IMPORTANT: separate logic per platform + queue only when markAsLast=true
+    this.ensureListeners();
+
+    if (markAsLast) {
+      // Waitable: serialize on its own queue (separate from speak)
+      this.wavChain = this.wavChain.then(() => this._playWavAndWait(realPath, true));
+      return this.wavChain;
+    }
+
+    // Fire-and-forget (cannot await because native will not emit completion)
     if (Platform.OS === 'ios' && NativeSpeech?.playWav) {
-      return NativeSpeech.playWav(realPath, markAsLast);
+      return (NativeSpeech as any).playWav(realPath, false);
     }
+
     console.log('[Speech.playWav] after checking ios realPath:', realPath);
-    console.log('[Speech.playWav] after checking ios realPath:', typeof(realPath));
+    console.log('[Speech.playWav] after checking ios realPath:', typeof realPath);
 
-    // Fallback: direct TTS bridge (Android + iOS fallback)
     if (!NativeTTS?.playWav) {
       console.log('[Speech.playWav] NativeTTS:', NativeTTS);
-      if (NativeTTS)
-        console.log('[Speech.playWav] NativeTTS.playWav :', NativeTTS.playWav);
+      if (NativeTTS) console.log('[Speech.playWav] NativeTTS.playWav :', NativeTTS.playWav);
       throw new Error('playWav not available on this platform.');
     }
-    console.log('[Speech.playWav] calling NativeTTS.playWav with type of realPath:', typeof(realPath));
-    return NativeTTS.playWav(realPath, markAsLast);
+    console.log('[Speech.playWav] calling NativeTTS.playWav with type of realPath:', typeof realPath);
+    return (NativeTTS as any).playWav(realPath, false);
   }
 
+
   // /** Queue a WAV file (local path or file:// URL). Routed via AEC path, queued with speak(). */
   // async playWav(pathOrURL: string, markAsLast = true) {
   //   // Prefer unified iOS bridge if present