react-native-davoice 1.0.12 → 1.0.13

package/TTSRNBridge.podspec

@@ -2,7 +2,7 @@ require 'json'
 
 Pod::Spec.new do |s|
     s.name         = "TTSRNBridge"
-    s.version      = "1.0.202" # Update to your package version
+    s.version      = "1.0.210" # 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 @@
-42672253290af681c13e0c48a8ea05dd  tts-1.0.0.aar
+34d5e94e94ed16ab142e04079aec0966  tts-1.0.0.aar

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

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

package/android/src/main/java/com/davoice/stt/rn/STTModule.kt

@@ -35,6 +35,21 @@ class STTModule(private val rc: ReactApplicationContext)
     return stt!!
   }
 
+  private fun readOnboardingJson(options: ReadableMap?): String? {
+    var onboardingJson: String? = null
+    try {
+      if (options != null && options.hasKey("onboardingJsonPath") && !options.isNull("onboardingJsonPath")) {
+        val p = options.getString("onboardingJsonPath")
+        if (!p.isNullOrBlank()) {
+          onboardingJson = java.io.File(p).readText(Charsets.UTF_8)
+        }
+      }
+    } catch (_: Throwable) {
+      onboardingJson = null
+    }
+    return onboardingJson
+  }
+
   // ===== JS API =====
 
   @ReactMethod
@@ -66,22 +81,18 @@ class STTModule(private val rc: ReactApplicationContext)
   // ANDROID expects (locale, options, callback) like @react-native-voice
   @ReactMethod
   fun startSpeech(locale: String?, options: ReadableMap, cb: Callback) {
-    var onboardingJson: String? = null
-    try {
-      if (options.hasKey("onboardingJsonPath") && !options.isNull("onboardingJsonPath")) {
-        val p = options.getString("onboardingJsonPath")
-        if (!p.isNullOrBlank()) {
-          onboardingJson = java.io.File(p).readText(Charsets.UTF_8)
-        }
-      }
-    } catch (_: Throwable) {
-      onboardingJson = null
-    }
-
+    val onboardingJson = readOnboardingJson(options)
     ensure().startSpeech(locale, onboardingJson, null)
     cb.invoke(false) // parity with voice: callback(false) on success
   }
 
+  @ReactMethod
+  fun initWithoutModel(locale: String?, options: ReadableMap?, cb: Callback) {
+    val onboardingJson = readOnboardingJson(options)
+    ensure().startSpeech(locale, onboardingJson, null)
+    cb.invoke(false)
+  }
+
   @ReactMethod
   fun stopSpeech(cb: Callback) {
     stt?.stopSpeech()
@@ -101,6 +112,18 @@ class STTModule(private val rc: ReactApplicationContext)
     cb.invoke(false)
   }
 
+  @ReactMethod
+  fun destroyWihtouModel(cb: Callback) {
+    stt?.destroySpeech()
+    stt = null
+    cb.invoke(false)
+  }
+
+  @ReactMethod
+  fun destroyWithoutModel(cb: Callback) {
+    destroyWihtouModel(cb)
+  }
+
   @ReactMethod
   fun isSpeechAvailable(p: Promise) {
     STT.isSpeechAvailable(rc) { ok -> p.resolve(ok) }

package/ios/SpeechBridge/SpeechBridge.m

@@ -25,6 +25,21 @@ static BOOL SBHasSpeechRecognitionPermission(void) {
   return status == SFSpeechRecognizerAuthorizationStatusAuthorized;
 }
 
+static NSString *SBNowString(void) {
+  static NSDateFormatter *formatter = nil;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    formatter = [NSDateFormatter new];
+    formatter.locale = [NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"];
+    formatter.dateFormat = @"yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ";
+  });
+  return [formatter stringFromDate:[NSDate date]];
+}
+
+static NSString *SBBoolString(BOOL value) {
+  return value ? @"YES" : @"NO";
+}
+
 // 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).
@@ -119,6 +134,8 @@ static AVAudioPCMBuffer *SB_MakeMonoF32Buffer(NSData *raw,
 
 // used only to gate TTS init until STT engine is “hot”
 @property (atomic, assign) BOOL sttEngineHot;
+// retained so we can re-license a fresh STT instance after destroyAll
+@property (nonatomic, copy, nullable) NSString *lastLicenseKey;
 @end
 
 @implementation SpeechBridge
@@ -228,6 +245,9 @@ RCT_EXPORT_MODULE(SpeechBridge)
   if (!self.stt) {
     self.stt = [STT new];
     self.stt.delegate = self;
+    if (self.lastLicenseKey) {
+      [self.stt setLicenseWithLicenseKey:self.lastLicenseKey];
+    }
   }
 }
 
@@ -381,6 +401,7 @@ RCT_EXPORT_METHOD(setLicense:(NSString *)licenseKey
   }
 
   dispatch_async(dispatch_get_main_queue(), ^{
+    self.lastLicenseKey = licenseKey;
     BOOL ttsOk = [DaVoiceTTS activateLicenseWithLicenseKey:licenseKey];
     [self ensureSTT];
     BOOL sttOk = [self.stt setLicenseWithLicenseKey:licenseKey];
@@ -429,6 +450,9 @@ RCT_EXPORT_METHOD(initAll:(NSDictionary *)opts
     if (!self.stt) {
       self.stt = [STT new];
       self.stt.delegate = self;
+      if (self.lastLicenseKey) {
+        [self.stt setLicenseWithLicenseKey:self.lastLicenseKey];
+      }
     }
     if (onboardingJsonPath && (id)onboardingJsonPath != [NSNull null] && onboardingJsonPath.length > 0) {
       [self.stt startSpeechWithLocaleStr:locale onboardingJsonPath:onboardingJsonPath];
@@ -486,6 +510,11 @@ RCT_EXPORT_METHOD(initAll:(NSDictionary *)opts
     }
     NSLog(@"[TTS] INIT: modelURL ==  %@", modelURL);
 
+    if (self.tts) {
+      @try { [self.tts stopSpeaking]; [self.tts destroy]; } @catch (__unused id e) {}
+      self.tts = nil;
+    }
+
     dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0), ^{
       NSError *err = nil;
       DaVoiceTTS *tts = [[DaVoiceTTS alloc] initWithModel:modelURL error:&err];
@@ -517,6 +546,55 @@ RCT_EXPORT_METHOD(initAll:(NSDictionary *)opts
   });
 }
 
+RCT_EXPORT_METHOD(initWithoutModel:(NSDictionary *)opts
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+  dispatch_async(dispatch_get_main_queue(), ^{
+    if (self.initializing) { resolve(@"already_initializing"); return; }
+    if (!self.tts) {
+      reject(@"no_tts", @"initWithoutModel() requires a successful initAll() first", nil);
+      return;
+    }
+    if (self.initialized && self.stt) {
+      resolve(@"already_initialized");
+      return;
+    }
+
+    self.initializing = YES;
+    self.sttEngineHot = NO;
+
+    NSString *locale = opts[@"locale"] ?: @"en-US";
+    NSString *onboardingJsonPath = opts[@"onboardingJsonPath"];
+    NSNumber *timeoutMs = opts[@"timeoutMs"];
+
+    @try { [self.stt destroySpeech:nil]; } @catch (__unused id e) {}
+    self.stt = nil;
+
+    [self ensureSTT];
+    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) {
+        self.initializing = NO;
+        self.initialized = NO;
+        self.sttEngineHot = NO;
+        @try { [self.stt destroySpeech:nil]; } @catch (__unused id e) {}
+        self.stt = nil;
+        reject(@"stt_init_timeout", @"STT did not become ready before timeout", nil);
+        return;
+      }
+      self.initialized = YES;
+      self.initializing = NO;
+      resolve(@"initialized_without_model");
+    }];
+  });
+}
+
 // --- SpeechRecognitionLite pause/unpause (counter-based) ---
 
 RCT_EXPORT_METHOD(pauseSpeechRecognitionLite:(RCTResponseSenderBlock)callback)
@@ -535,14 +613,22 @@ RCT_EXPORT_METHOD(pauseSpeechRecognitionLiteAsync:(nonnull NSNumber *)timeoutMs
 
   NSNumber *t = timeoutMs ?: @(1500);
   if (t.doubleValue <= 0) t = @(1500);
+  CFTimeInterval startedAt = CACurrentMediaTime();
+  RCTLogInfo(@"[SpeechBridge] %@ pauseSpeechRecognitionLiteAsync begin timeoutMs=%@ stt=%@", SBNowString(), t, self.stt);
 
   if ([(id)self.stt respondsToSelector:@selector(pauseSpeechRecognitionLiteAndWait:completion:)]) {
     [(id)self.stt pauseSpeechRecognitionLiteAndWait:t completion:^(BOOL ok, NSString * _Nullable reason) {
+      RCTLogInfo(@"[SpeechBridge] %@ pauseSpeechRecognitionLiteAsync resolved elapsedMs=%.1f ok=%@ reason=%@",
+                 SBNowString(),
+                 (CACurrentMediaTime() - startedAt) * 1000.0,
+                 SBBoolString(ok),
+                 reason ?: @"");
       resolve(@{@"ok": @(ok), @"reason": reason ?: @""});
     }];
     return;
   }
 
+  RCTLogInfo(@"[SpeechBridge] %@ pauseSpeechRecognitionLiteAsync fallback no-wait", SBNowString());
   [self.stt pauseSpeechRecognitionLite];
   resolve(@{@"ok": @(YES), @"reason": @"bridge_fallback_no_wait_method"});
 }
@@ -578,17 +664,32 @@ RCT_EXPORT_METHOD(unPauseSpeechRecognitionLiteAsync:(nonnull NSNumber *)times
   if (t.doubleValue <= 0) t = @(2500);
   NSNumber *pf = preFetch ?: @(0);
   if (pf.doubleValue < 0) pf = @(0);
+  CFTimeInterval startedAt = CACurrentMediaTime();
+  RCTLogInfo(@"[SpeechBridge] %@ unPauseSpeechRecognitionLiteAsync begin times=%@ preFetchMs=%@ timeoutMs=%@ stt=%@ initialized=%@ initializing=%@",
+             SBNowString(),
+             times,
+             pf,
+             t,
+             self.stt,
+             SBBoolString(self.initialized),
+             SBBoolString(self.initializing));
 
   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) {
+      RCTLogInfo(@"[SpeechBridge] %@ unPauseSpeechRecognitionLiteAsync resolved elapsedMs=%.1f ok=%@ reason=%@",
+                 SBNowString(),
+                 (CACurrentMediaTime() - startedAt) * 1000.0,
+                 SBBoolString(ok),
+                 reason ?: @"");
       resolve(@{@"ok": @(ok), @"reason": reason ?: @""});
     }];
     return;
   }
 
+  RCTLogInfo(@"[SpeechBridge] %@ unPauseSpeechRecognitionLiteAsync fallback no-wait", SBNowString());
   [self.stt unPauseSpeechRecognitionLite:times preFetch:pf];
   resolve(@{@"ok": @(YES), @"reason": @"bridge_fallback_no_wait_method"});
 }
@@ -647,7 +748,7 @@ RCT_EXPORT_METHOD(destroyAll:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
   dispatch_async(dispatch_get_main_queue(), ^{
-    if (!self.initialized && !self.initializing) {
+    if (!self.tts && !self.stt && !self.initialized && !self.initializing) {
       resolve(@"already_destroyed");
       return;
     }
@@ -668,6 +769,38 @@ RCT_EXPORT_METHOD(destroyAll:(RCTPromiseResolveBlock)resolve
   });
 }
 
+RCT_EXPORT_METHOD(destroyWihtouModel:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+  dispatch_async(dispatch_get_main_queue(), ^{
+    if (!self.tts) {
+      reject(@"no_tts", @"destroyWihtouModel() requires a successful initAll() first", nil);
+      return;
+    }
+
+    if (!self.stt && !self.initialized && !self.initializing) {
+      resolve(@"already_destroyed_without_model");
+      return;
+    }
+
+    self.initializing = YES;
+
+    @try { [self.stt destroySpeech:nil]; } @catch (__unused id e) {}
+    self.stt = nil;
+
+    self.sttEngineHot = NO;
+    self.initialized = NO;
+    self.initializing = NO;
+    resolve(@"destroyed_without_model");
+  });
+}
+
+RCT_EXPORT_METHOD(destroyWithoutModel:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+  [self destroyWihtouModel:resolve rejecter:reject];
+}
+
 #pragma mark - Convenience passthroughs (optional)
 
 RCT_EXPORT_METHOD(startSpeech:(NSString *)locale