react-native-davoice-tts 1.0.395 → 1.0.396

package/TTSRNBridge.podspec

@@ -2,7 +2,7 @@ require 'json'
 
 Pod::Spec.new do |s|
     s.name         = "TTSRNBridge"
-    s.version      = "1.0.375" # Update to your package version
+    s.version      = "1.0.377" # 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 @@
-ce637f9ae253c71eab5dbfbabe6335a7  tts-1.0.0.aar
+b2bbfb5fb59b4529ddc6a6e9ebb9a69a  tts-1.0.0.aar

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

@@ -1 +1 @@
-2404e2f50ac6d464affe24a6db99486113f92ff1  tts-1.0.0.aar
+827b55bde2ad6f58b9dcbb9d538917ab978d660c  tts-1.0.0.aar

package/ios/TTSRNBridge/DaVoiceTTSBridge.m

@@ -149,6 +149,54 @@ RCT_EXPORT_MODULE();
   return [NSURL fileURLWithPath:pathOrURL];
 }
 
+// Model initialization must not perform remote I/O on the React Native bridge
+// queue. Local paths are resolved asynchronously as well, so initTTS has one
+// consistent completion path and never blocks the bridge while resolving a model.
+- (void)resolveModelURLFromPathOrURL:(NSString *)pathOrURL
+                          completion:(void (^)(NSURL * _Nullable modelURL))completion
+{
+  if (!pathOrURL || (id)pathOrURL == [NSNull null] || pathOrURL.length == 0) {
+    dispatch_async(dispatch_get_main_queue(), ^{ completion(nil); });
+    return;
+  }
+
+  NSURL *candidate = [NSURL URLWithString:pathOrURL];
+  BOOL isRemote = [pathOrURL hasPrefix:@"http://"] || [pathOrURL hasPrefix:@"https://"];
+  if (!isRemote) {
+    dispatch_async(dispatch_get_global_queue(QOS_CLASS_UTILITY, 0), ^{
+      NSURL *url = [self resolveLocalURLFromPathOrURL:pathOrURL];
+      dispatch_async(dispatch_get_main_queue(), ^{ completion(url); });
+    });
+    return;
+  }
+
+  if (!candidate) {
+    dispatch_async(dispatch_get_main_queue(), ^{ completion(nil); });
+    return;
+  }
+
+  NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration ephemeralSessionConfiguration];
+  configuration.timeoutIntervalForRequest = 8.0;
+  configuration.timeoutIntervalForResource = 15.0;
+  NSURLSession *session = [NSURLSession sessionWithConfiguration:configuration];
+  NSURLSessionDataTask *task = [session dataTaskWithURL:candidate
+                                      completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+    NSInteger status = [response isKindOfClass:[NSHTTPURLResponse class]]
+      ? ((NSHTTPURLResponse *)response).statusCode : 200;
+    NSURL *result = nil;
+    if (!error && data.length > 0 && status < 400) {
+      NSString *extension = candidate.pathExtension.length ? candidate.pathExtension : @"bin";
+      NSString *name = [NSString stringWithFormat:@"rn_model_%f.%@",
+                        [[NSDate date] timeIntervalSince1970], extension];
+      NSString *path = [NSTemporaryDirectory() stringByAppendingPathComponent:name];
+      if ([data writeToFile:path atomically:YES]) result = [NSURL fileURLWithPath:path];
+    }
+    [session finishTasksAndInvalidate];
+    dispatch_async(dispatch_get_main_queue(), ^{ completion(result); });
+  }];
+  [task resume];
+}
+
 RCT_EXPORT_METHOD(setLicense:(NSString *)licenseKey
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
@@ -191,36 +239,39 @@ RCT_EXPORT_METHOD(initTTS:(NSDictionary *)configDict
     return;
   }
 
-  NSURL *modelURL = [self resolveLocalURLFromPathOrURL:modelPath];
-  if (!modelURL) {
-    reject(@"bad_model", [NSString stringWithFormat:@"Could not resolve model path: %@", modelPath], nil);
-    return;
-  }
-
-  dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0), ^{
-    NSError *error = nil;
-    DaVoiceTTS *tts = [[DaVoiceTTS alloc] initWithModel:modelURL error:&error];
-    if (error || !tts) {
-      reject(@"init_failed", error.localizedDescription ?: @"Failed to initialize", error);
+  [self resolveModelURLFromPathOrURL:modelPath completion:^(NSURL *modelURL) {
+    if (!modelURL) {
+      reject(@"bad_model", [NSString stringWithFormat:@"Could not resolve model path: %@", modelPath], nil);
       return;
     }
 
-    dispatch_async(dispatch_get_main_queue(), ^{
-      if (self.ttsInstance) {
-        @try { [self.ttsInstance stopSpeaking]; [self.ttsInstance destroy]; } @catch (__unused id e) {}
-      }
-      self.ttsInstance = tts;
-
-      __weak typeof(self) weakSelf = self;
-      self.ttsInstance.onLastUtteranceFinished = ^{
-        __strong typeof(weakSelf) strongSelf = weakSelf;
-        if (!strongSelf || !strongSelf.hasListeners) return;
+    dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0), ^{
+      NSError *error = nil;
+      DaVoiceTTS *tts = [[DaVoiceTTS alloc] initWithModel:modelURL error:&error];
+      if (error || !tts) {
         dispatch_async(dispatch_get_main_queue(), ^{
-          [strongSelf sendEventWithName:@"onFinishedSpeaking" body:@{}];
+          reject(@"init_failed", error.localizedDescription ?: @"Failed to initialize", error);
         });
-      };
+        return;
+      }
 
-      resolve(@"TTS initialized");
+      dispatch_async(dispatch_get_main_queue(), ^{
+        if (self.ttsInstance) {
+          @try { [self.ttsInstance stopSpeaking]; [self.ttsInstance destroy]; } @catch (__unused id e) {}
+        }
+        self.ttsInstance = tts;
+
+        __weak typeof(self) weakSelf = self;
+        self.ttsInstance.onLastUtteranceFinished = ^{
+          __strong typeof(weakSelf) strongSelf = weakSelf;
+          if (!strongSelf || !strongSelf.hasListeners) return;
+          dispatch_async(dispatch_get_main_queue(), ^{
+            [strongSelf sendEventWithName:@"onFinishedSpeaking" body:@{}];
+          });
+        };
+
+        resolve(@"TTS initialized");
+      });
     });
   });
 }

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

@@ -317,6 +317,29 @@ SWIFT_CLASS("_TtC10DavoiceTTS25DaVoiceAudioRoutingConfig")
 - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
 @end
 
+@class AVAudioSession;
+/// Echo cancellation for iPhones WITHOUT Apple’s session-level echo-cancelled
+/// input (<code>AVAudioSession.isEchoCancelledInputAvailable</code>, iOS 18.2+ on
+/// supported hardware). On those devices AEC only exists inside an
+/// AVAudioEngine with voice processing on, and it only cancels audio played
+/// through that same engine – so TTS must play through the engine whose mic
+/// input the listener (wake word) hears. See pocketTTS/AECSupportIOS.md.
+/// Nothing here runs on devices WITH session-level AEC, or when AEC isn’t
+/// requested: every caller then takes its exact pre-existing path.
+SWIFT_CLASS("_TtC10DavoiceTTS16DaVoiceLegacyAEC")
+@interface DaVoiceLegacyAEC : NSObject
+/// Kill switch for the old-iPhone fallback (default true).
+SWIFT_CLASS_PROPERTY(@property (nonatomic, class) BOOL isEnabled;)
++ (BOOL)isEnabled SWIFT_WARN_UNUSED_RESULT;
++ (void)setIsEnabled:(BOOL)newValue;
+/// True when this device/OS offers session-level AEC. Sticky: once seen
+/// true in this process it stays true, so a transient route/category where
+/// iOS reports it unavailable can never switch a newer iPhone onto the
+/// fallback path.
++ (BOOL)deviceHasSessionLevelAEC:(AVAudioSession * _Nonnull)session SWIFT_WARN_UNUSED_RESULT;
+- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
+@end
+
 @class NSURL;
 @class NSUUID;
 @class AVAudioPCMBuffer;