react-native-davoice-tts 1.0.416 → 1.0.418

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

@@ -6,7 +6,7 @@
 	<dict>
 		<key>Headers/DavoiceTTS-Swift.h</key>
 		<data>
-		AWEkyK7MwB2lgAqCUgjeu5xTFck=
+		Q2XyvfydwNU3JNGF6wk63Up6aKE=
 		</data>
 		<key>Info.plist</key>
 		<data>
@@ -14,7 +14,7 @@
 		</data>
 		<key>Modules/DavoiceTTS.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<data>
-		zRlixOTcAOBEtyzKpleosinbHug=
+		O63HvKnrlAg1FO1UVI1kp6yoOCY=
 		</data>
 		<key>Modules/DavoiceTTS.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
@@ -22,7 +22,7 @@
 		</data>
 		<key>Modules/DavoiceTTS.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
 		<data>
-		Qohaf1bbC3ySIV4l0Kd1u7WRxNA=
+		7k5UFU0VKirpYFIRunlliBIHL1o=
 		</data>
 		<key>Modules/DavoiceTTS.swiftmodule/arm64-apple-ios-simulator.swiftinterface</key>
 		<data>
@@ -34,7 +34,7 @@
 		</data>
 		<key>Modules/DavoiceTTS.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<data>
-		zRlixOTcAOBEtyzKpleosinbHug=
+		O63HvKnrlAg1FO1UVI1kp6yoOCY=
 		</data>
 		<key>Modules/DavoiceTTS.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
@@ -42,7 +42,7 @@
 		</data>
 		<key>Modules/DavoiceTTS.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
 		<data>
-		6oDtn94702Q+vHr6Bj4oQOChf+8=
+		eS9T1ZYAn+xLScjKP2bpqIpMYrY=
 		</data>
 		<key>Modules/DavoiceTTS.swiftmodule/x86_64-apple-ios-simulator.swiftinterface</key>
 		<data>
@@ -63,22 +63,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			AWEkyK7MwB2lgAqCUgjeu5xTFck=
+			Q2XyvfydwNU3JNGF6wk63Up6aKE=
 			</data>
 			<key>hash2</key>
 			<data>
-			f08bFZb6PDxKecAU3fD6qpDee0FnQoPFMDnOFr9RuyA=
+			AthueO1O6cexeZK4ZfeVLmt/LqhO6D/Et8IsQ/xoflE=
 			</data>
 		</dict>
 		<key>Modules/DavoiceTTS.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			zRlixOTcAOBEtyzKpleosinbHug=
+			O63HvKnrlAg1FO1UVI1kp6yoOCY=
 			</data>
 			<key>hash2</key>
 			<data>
-			cESkmIRBFoOFqkrNolbR0zTofPjYkkrvxJ84yxY9Gjc=
+			zcbpuYRRmRG6cNAVG2A4fkJBBOd0dPH3u/1NMvkZqeM=
 			</data>
 		</dict>
 		<key>Modules/DavoiceTTS.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
@@ -96,11 +96,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			Qohaf1bbC3ySIV4l0Kd1u7WRxNA=
+			7k5UFU0VKirpYFIRunlliBIHL1o=
 			</data>
 			<key>hash2</key>
 			<data>
-			G1JNEp6xnntkfAZBTS7FfkK/5oETV8jVZXUGMYC02cU=
+			pf5qrxCXbftxQ7yXOymTUQbyezZ6+KXKE4r61K9f0XI=
 			</data>
 		</dict>
 		<key>Modules/DavoiceTTS.swiftmodule/arm64-apple-ios-simulator.swiftinterface</key>
@@ -129,11 +129,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			zRlixOTcAOBEtyzKpleosinbHug=
+			O63HvKnrlAg1FO1UVI1kp6yoOCY=
 			</data>
 			<key>hash2</key>
 			<data>
-			cESkmIRBFoOFqkrNolbR0zTofPjYkkrvxJ84yxY9Gjc=
+			zcbpuYRRmRG6cNAVG2A4fkJBBOd0dPH3u/1NMvkZqeM=
 			</data>
 		</dict>
 		<key>Modules/DavoiceTTS.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
@@ -151,11 +151,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			6oDtn94702Q+vHr6Bj4oQOChf+8=
+			eS9T1ZYAn+xLScjKP2bpqIpMYrY=
 			</data>
 			<key>hash2</key>
 			<data>
-			ECm+og8uRxOokCDsyKDOREvUJ1Bdt/xlzSCConMnlMg=
+			NejMEctREOpazPZmdBdVctGGgujh0Wsd3xYnAY1eh3Y=
 			</data>
 		</dict>
 		<key>Modules/DavoiceTTS.swiftmodule/x86_64-apple-ios-simulator.swiftinterface</key>

package/package.json

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

package/speech/index.d.ts

@@ -146,6 +146,9 @@ declare class Speech {
     private ttsChain;
     private ttsPendingResolve;
     private ttsPendingTimeout;
+    private speakWaiters;
+    private speakWaitTimeout;
+    private ttsEpoch;
     private sttTransitionChain;
     private dbgAsset;
     private _onNativeFinishedSpeaking;
@@ -196,7 +199,6 @@ declare class Speech {
     changeVoice(name: string): Promise<number>;
     private _nativeSpeak;
     private enqueueSttTransition;
-    private _speakAndWait;
     private sttEmitter;
     private ttsEmitter;
     private unifiedEmitter;
@@ -309,7 +311,15 @@ declare class Speech {
     initTTS(modelOrConfig: ModelRef | {
         model: ModelRef;
     }): Promise<any>;
+    /**
+     * Speaks `text`. The text goes to the native speech queue right away, so call
+     * it for each sentence as soon as you have it: the queue prepares the next
+     * sentences while the current one plays, and they follow each other without
+     * gaps. Resolves when everything queued so far has been spoken (native
+     * onFinishedSpeaking: the queue is empty).
+     */
     speak(text: string, speakerId?: number, speed?: number): Promise<void>;
+    private _releaseSpeakWaiters;
     private _cancelTtsWait;
     stopSpeaking(): Promise<any>;
     private wavChain;

package/speech/index.ts

@@ -280,6 +280,10 @@ class Speech {
   private ttsChain: Promise<void> = Promise.resolve();
   private ttsPendingResolve: (() => void) | null = null;
   private ttsPendingTimeout: any = null;
+  // speak(): texts native has queued, waiting for the queue to be spoken
+  private speakWaiters: Array<() => void> = [];
+  private speakWaitTimeout: any = null;
+  private ttsEpoch = 0; // bumped by stopSpeaking/initAll/destroyAll
   private sttTransitionChain: Promise<void> = Promise.resolve();
 
   private dbgAsset(label: string, x: any) {
@@ -308,6 +312,8 @@ class Speech {
     const r = this.ttsPendingResolve;
     this.ttsPendingResolve = null;
     if (r) r();
+    // 3) speak(): everything queued has been spoken
+    this._releaseSpeakWaiters();
   }
 
   /** Voices available in the loaded .dm (the names changeVoice() accepts; the
@@ -458,27 +464,6 @@ class Speech {
     return run;
   }
 
-  private _speakAndWait(text: string, speakerId: number, s: number, timeoutMs = 600000) {
-    return new Promise<void>((resolve, reject) => {
-      this.ttsPendingResolve = resolve;
-      // safety: never hang forever
-      this.ttsPendingTimeout = setTimeout(() => {
-        dbg('Timeout waiting for onFinishedSpeaking — releasing wait');
-        if (this.ttsPendingTimeout) { clearTimeout(this.ttsPendingTimeout); this.ttsPendingTimeout = null; }
-        const r = this.ttsPendingResolve;
-        this.ttsPendingResolve = null;
-        if (r) r(); // ✅ accept after timeout
-      }, 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;
@@ -1473,14 +1458,46 @@ class Speech {
     return r;
   }
 
+  /**
+   * Speaks `text`. The text goes to the native speech queue right away, so call
+   * it for each sentence as soon as you have it: the queue prepares the next
+   * sentences while the current one plays, and they follow each other without
+   * gaps. Resolves when everything queued so far has been spoken (native
+   * onFinishedSpeaking: the queue is empty).
+   */
   async speak(text: string, speakerId = 0, speed = 1.0) {
     // 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;
     this.ensureListeners();
-    // MIN: serialize + await actual completion (event-driven)
-    this.ttsChain = this.ttsChain.then(() => this._speakAndWait(text, speakerId, s));
-    return this.ttsChain;
+    const epoch = this.ttsEpoch;
+    let release!: () => void;
+    const spoken = new Promise<void>((resolve) => { release = resolve; });
+    // Only the sends are serialized (in order); none waits for the previous
+    // text to be spoken. A stop drops the texts not sent yet.
+    const send = this.ttsChain.then(async () => {
+      if (epoch !== this.ttsEpoch) return release();
+      await this._nativeSpeak(text, speakerId, s);
+      if (epoch !== this.ttsEpoch) return release();
+      // Waits from now: a queue-empty event sent before native had this text
+      // has already arrived.
+      this.speakWaiters.push(release);
+      if (this.speakWaitTimeout) clearTimeout(this.speakWaitTimeout);
+      this.speakWaitTimeout = setTimeout(() => {
+        dbg('Timeout waiting for onFinishedSpeaking — releasing speak waits');
+        this._releaseSpeakWaiters();
+      }, 600000);
+    });
+    this.ttsChain = send.catch(() => {});
+    await send;
+    return spoken;
+  }
+
+  private _releaseSpeakWaiters() {
+    if (this.speakWaitTimeout) { clearTimeout(this.speakWaitTimeout); this.speakWaitTimeout = null; }
+    const waiters = this.speakWaiters;
+    this.speakWaiters = [];
+    waiters.forEach((release) => release());
   }
 
     // --- NEW: cancel any pending "wait for finished" immediately ---
@@ -1498,6 +1515,10 @@ class Speech {
     this.ttsPendingResolve = null;
     if (r) r();
 
+    // speak(): drop the texts not sent yet, release the ones waiting
+    this.ttsEpoch++;
+    this._releaseSpeakWaiters();
+
     // IMPORTANT: do NOT call app callback here (stopSpeaking should not emit "finished")
     // this.handlers.onFinishedSpeaking() <-- DO NOT
   }