react-native-davoice 1.0.9 → 1.0.11

package/TTSRNBridge.podspec

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

package/android/libs/com/davoice/tts/1.0.0/tts-1.0.0.aar.md5

@@ -1 +1 @@
-4dcec1844fb7ccbbe7cc17176ace80ef  tts-1.0.0.aar
+42672253290af681c13e0c48a8ea05dd  tts-1.0.0.aar

package/android/libs/com/davoice/tts/1.0.0/tts-1.0.0.aar.sha1

@@ -1 +1 @@
-f077da0fe66163982b6bd9114e106f015fbdb95e  tts-1.0.0.aar
+db50ab0dec3bc798242d72f812bf5d7b4f87ed0d  tts-1.0.0.aar

package/ios/SpeechBridge/SpeechBridge.m

@@ -25,14 +25,6 @@ static BOOL SBHasSpeechRecognitionPermission(void) {
   return status == SFSpeechRecognizerAuthorizationStatusAuthorized;
 }
 
-static void SBLog(NSString *format, ...) {
-  va_list args;
-  va_start(args, format);
-  NSString *msg = [[NSString alloc] initWithFormat:format arguments:args];
-  va_end(args);
-  NSLog(@"[SpeechBridge] %@", msg);
-}
-
 // Make a mono Float32 AVAudioPCMBuffer from raw PCM payload (i16 or f32).
 // We accept either interleaved or non-interleaved input and mixdown to mono
 // (DaVoiceTTS.playBuffer will resample / normalize as needed).
@@ -255,6 +247,36 @@ RCT_EXPORT_MODULE(SpeechBridge)
   };
 }
 
+- (void)waitForSTTEngineHotWithTimeoutMs:(NSNumber *)timeoutMs
+                              completion:(void (^)(BOOL ok))completion
+{
+  NSNumber *t = timeoutMs ?: @(2500);
+  if (t.doubleValue <= 0) t = @(2500);
+
+  CFTimeInterval deadline = CACurrentMediaTime() + MAX(0.1, t.doubleValue / 1000.0);
+
+  __weak typeof(self) weakSelf = self;
+  __block void (^poll)(void) = ^{
+    __strong typeof(weakSelf) strongSelf = weakSelf;
+    if (!strongSelf) {
+      completion(NO);
+      return;
+    }
+    if (strongSelf.sttEngineHot) {
+      completion(YES);
+      return;
+    }
+    if (CACurrentMediaTime() >= deadline) {
+      completion(NO);
+      return;
+    }
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)),
+                   dispatch_get_main_queue(), poll);
+  };
+
+  dispatch_async(dispatch_get_main_queue(), poll);
+}
+
 RCT_EXPORT_METHOD(hasMicPermissions:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
@@ -391,10 +413,12 @@ RCT_EXPORT_METHOD(initAll:(NSDictionary *)opts
     if (self.initialized)  { resolve(@"already_initialized");  return; }
 
     self.initializing = YES;
+    self.sttEngineHot = NO;
 
     NSString *locale = opts[@"locale"] ?: @"en-US";
     NSString *onboardingJsonPath = opts[@"onboardingJsonPath"];
     NSString *modelPath = opts[@"model"];
+    NSNumber *timeoutMs = opts[@"timeoutMs"];
     if (modelPath.length == 0) {
       self.initializing = NO;
       reject(@"invalid_args", @"Missing 'model' in initAll()", nil);
@@ -469,6 +493,7 @@ RCT_EXPORT_METHOD(initAll:(NSDictionary *)opts
       dispatch_async(dispatch_get_main_queue(), ^{
         if (err || !tts) {
           self.initializing = NO;
+          self.sttEngineHot = NO;
           [self.stt destroySpeech:nil];
           self.stt = nil;
           reject(@"tts_init_failed", err.localizedDescription ?: @"TTS init failed", err);
@@ -477,10 +502,16 @@ RCT_EXPORT_METHOD(initAll:(NSDictionary *)opts
 
         self.tts = tts;
         [self wireTTSFinishedCallback];
-
-        self.initialized  = YES;
-        self.initializing = NO;
-        resolve(@"initialized");
+        [self waitForSTTEngineHotWithTimeoutMs:timeoutMs completion:^(BOOL ok) {
+          if (!ok) {
+            self.initializing = NO;
+            reject(@"stt_init_timeout", @"STT did not become ready before timeout", nil);
+            return;
+          }
+          self.initialized  = YES;
+          self.initializing = NO;
+          resolve(@"initialized");
+        }];
       });
     });
   });
@@ -496,37 +527,70 @@ RCT_EXPORT_METHOD(pauseSpeechRecognitionLite:(RCTResponseSenderBlock)callback)
   if (callback) callback(@[@(YES)]);
 }
 
+RCT_EXPORT_METHOD(pauseSpeechRecognitionLiteAsync:(nonnull NSNumber *)timeoutMs
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+  if (!self.stt) { resolve(@{@"ok": @(YES), @"reason": @""}); return; }
+
+  NSNumber *t = timeoutMs ?: @(1500);
+  if (t.doubleValue <= 0) t = @(1500);
+
+  if ([(id)self.stt respondsToSelector:@selector(pauseSpeechRecognitionLiteAndWait:completion:)]) {
+    [(id)self.stt pauseSpeechRecognitionLiteAndWait:t completion:^(BOOL ok, NSString * _Nullable reason) {
+      resolve(@{@"ok": @(ok), @"reason": reason ?: @""});
+    }];
+    return;
+  }
+
+  [self.stt pauseSpeechRecognitionLite];
+  resolve(@{@"ok": @(YES), @"reason": @"bridge_fallback_no_wait_method"});
+}
+
 RCT_EXPORT_METHOD(unPauseSpeechRecognitionLite:(nonnull NSNumber *)times
                   callback:(RCTResponseSenderBlock)callback)
 {
-  SBLog(@"unPauseSpeechRecognitionLite ENTER times=%@", times);
   // No-op if STT isn't initialized yet (avoid JS error spam).
-  if (!self.stt) {
-    SBLog(@"unPauseSpeechRecognitionLite EXIT no STT instance");
-    if (callback) callback(@[@(YES)]);
-    return;
-  }
+  if (!self.stt) { if (callback) callback(@[@(YES)]); return; }
   [self.stt unPauseSpeechRecognitionLite:times];
-  SBLog(@"unPauseSpeechRecognitionLite AFTER Swift call times=%@", times);
   if (callback) callback(@[@(YES)]);
-  SBLog(@"unPauseSpeechRecognitionLite CALLBACK fired times=%@", times);
 }
 
 RCT_EXPORT_METHOD(unPauseSpeechRecognitionLiteWithPreFetch:(nonnull NSNumber *)times
                   preFetchMs:(nonnull NSNumber *)preFetch
                   callback:(RCTResponseSenderBlock)callback)
 {
-  SBLog(@"unPauseSpeechRecognitionLiteWithPreFetch ENTER times=%@ preFetchMs=%@", times, preFetch);
   // No-op if STT isn't initialized yet (avoid JS error spam).
-  if (!self.stt) {
-    SBLog(@"unPauseSpeechRecognitionLiteWithPreFetch EXIT no STT instance");
-    if (callback) callback(@[@(YES)]);
-    return;
-  }
+  if (!self.stt) { if (callback) callback(@[@(YES)]); return; }
   [self.stt unPauseSpeechRecognitionLite:times preFetch:preFetch];
-  SBLog(@"unPauseSpeechRecognitionLiteWithPreFetch AFTER Swift call times=%@ preFetchMs=%@", times, preFetch);
   if (callback) callback(@[@(YES)]);
-  SBLog(@"unPauseSpeechRecognitionLiteWithPreFetch CALLBACK fired times=%@ preFetchMs=%@", times, preFetch);
+}
+
+RCT_EXPORT_METHOD(unPauseSpeechRecognitionLiteAsync:(nonnull NSNumber *)times
+                  preFetchMs:(nonnull NSNumber *)preFetch
+                  timeoutMs:(nonnull NSNumber *)timeoutMs
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+  if (!self.stt) { resolve(@{@"ok": @(YES), @"reason": @""}); return; }
+
+  NSNumber *t = timeoutMs ?: @(2500);
+  if (t.doubleValue <= 0) t = @(2500);
+  NSNumber *pf = preFetch ?: @(0);
+  if (pf.doubleValue < 0) pf = @(0);
+
+  if ([(id)self.stt respondsToSelector:@selector(unPauseSpeechRecognitionLiteAndWait:preFetch:timeoutMs:completion:)]) {
+    [(id)self.stt unPauseSpeechRecognitionLiteAndWait:times
+                                             preFetch:pf
+                                            timeoutMs:t
+                                           completion:^(BOOL ok, NSString * _Nullable reason) {
+      resolve(@{@"ok": @(ok), @"reason": reason ?: @""});
+    }];
+    return;
+  }
+
+  [self.stt unPauseSpeechRecognitionLite:times preFetch:pf];
+  resolve(@{@"ok": @(YES), @"reason": @"bridge_fallback_no_wait_method"});
 }
 
 // Promise-based pause that resolves ONLY when iOS is actually settled in playback (mic released)
@@ -597,6 +661,7 @@ RCT_EXPORT_METHOD(destroyAll:(RCTPromiseResolveBlock)resolve
     @try { [self.stt destroySpeech:nil]; } @catch (__unused id e) {}
     self.stt = nil;
 
+    self.sttEngineHot = NO;
     self.initialized  = NO;
     self.initializing = NO;
     resolve(@"destroyed");
@@ -609,15 +674,34 @@ RCT_EXPORT_METHOD(startSpeech:(NSString *)locale
                   callback:(RCTResponseSenderBlock)callback)
 {
   [self ensureSTT];
+  self.sttEngineHot = NO;
   [self.stt startSpeechWithLocaleStr:locale];
   if (callback) callback(@[@(NO)]);
 }
 
+RCT_EXPORT_METHOD(startSpeechAsync:(NSString *)locale
+                  timeoutMs:(nonnull NSNumber *)timeoutMs
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+  [self ensureSTT];
+  self.sttEngineHot = NO;
+  [self.stt startSpeechWithLocaleStr:locale];
+  [self waitForSTTEngineHotWithTimeoutMs:timeoutMs completion:^(BOOL ok) {
+    if (!ok) {
+      reject(@"stt_start_timeout", @"STT did not become ready before timeout", nil);
+      return;
+    }
+    resolve(@{@"ok": @(YES)});
+  }];
+}
+
 RCT_EXPORT_METHOD(startSpeechWithSVOnboardingJson:(NSString *)locale
                   onboardingJsonPath:(NSString *)onboardingJsonPath
                   callback:(RCTResponseSenderBlock)callback)
 {
   [self ensureSTT];
+  self.sttEngineHot = NO;
   if (onboardingJsonPath && (id)onboardingJsonPath != [NSNull null] && onboardingJsonPath.length > 0) {
     [self.stt startSpeechWithLocaleStr:locale onboardingJsonPath:onboardingJsonPath];
   } else {
@@ -626,6 +710,28 @@ RCT_EXPORT_METHOD(startSpeechWithSVOnboardingJson:(NSString *)locale
   if (callback) callback(@[@(NO)]);
 }
 
+RCT_EXPORT_METHOD(startSpeechWithSVOnboardingJsonAsync:(NSString *)locale
+                  onboardingJsonPath:(NSString *)onboardingJsonPath
+                  timeoutMs:(nonnull NSNumber *)timeoutMs
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+  [self ensureSTT];
+  self.sttEngineHot = NO;
+  if (onboardingJsonPath && (id)onboardingJsonPath != [NSNull null] && onboardingJsonPath.length > 0) {
+    [self.stt startSpeechWithLocaleStr:locale onboardingJsonPath:onboardingJsonPath];
+  } else {
+    [self.stt startSpeechWithLocaleStr:locale];
+  }
+  [self waitForSTTEngineHotWithTimeoutMs:timeoutMs completion:^(BOOL ok) {
+    if (!ok) {
+      reject(@"stt_start_timeout", @"STT did not become ready before timeout", nil);
+      return;
+    }
+    resolve(@{@"ok": @(YES)});
+  }];
+}
+
 RCT_EXPORT_METHOD(stopSpeech:(RCTResponseSenderBlock)callback)
 {
   if (!self.stt) { if (callback) callback(@[@(NO)]); return; }

package/ios/TTSRNBridge/DavoiceTTS.xcframework/ios-arm64/DavoiceTTS.framework/Headers/DavoiceTTS-Swift.h

@@ -361,8 +361,10 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, copy) NSArray<NSStri
 + (NSArray<NSString *> * _Nonnull)supportedEvents SWIFT_WARN_UNUSED_RESULT;
 - (BOOL)setLicenseWithLicenseKey:(NSString * _Nonnull)licenseKey SWIFT_WARN_UNUSED_RESULT;
 - (void)pauseSpeechRecognitionLite;
+- (void)pauseSpeechRecognitionLiteAndWait:(NSNumber * _Nonnull)timeoutMs completion:(void (^ _Nonnull)(BOOL, NSString * _Nullable))completion;
 - (void)unPauseSpeechRecognitionLite:(NSNumber * _Nonnull)times;
 - (void)unPauseSpeechRecognitionLite:(NSNumber * _Nonnull)times preFetch:(NSNumber * _Nonnull)preFetch;
+- (void)unPauseSpeechRecognitionLiteAndWait:(NSNumber * _Nonnull)times preFetch:(NSNumber * _Nonnull)preFetch timeoutMs:(NSNumber * _Nonnull)timeoutMs completion:(void (^ _Nonnull)(BOOL, NSString * _Nullable))completion;
 - (void)pauseMicrophoneAndWait:(NSNumber * _Nonnull)timeoutMs completion:(void (^ _Nonnull)(BOOL, NSString * _Nullable))completion;
 - (void)unPauseMicrophoneAndWait:(NSNumber * _Nonnull)timeoutMs completion:(void (^ _Nonnull)(BOOL, NSString * _Nullable))completion;
 - (void)pauseMicrophone;