react-native-davoice-tts 1.0.24 → 1.0.26

package/ios/TTSRNBridge/DaVoiceTTSBridge.m

@@ -1,11 +1,11 @@
 // DaVoiceTTSBridge.m
 #import "DaVoiceTTSBridge.h"
 #import <React/RCTLog.h>
+#import <React/RCTConvert.h>
 
 @interface DaVoiceTTSBridge()
-
-@property (nonatomic, strong) DaVoiceTTS *ttsInstance;
-
+@property (nonatomic, strong, nullable) DaVoiceTTS *ttsInstance;
+@property (nonatomic, assign) BOOL hasListeners;
 @end
 
 @implementation DaVoiceTTSBridge
@@ -19,6 +19,34 @@ RCT_EXPORT_MODULE();
   return YES;
 }
 
+#pragma mark - RCTEventEmitter
+
+- (NSArray<NSString *> *)supportedEvents
+{
+  // Single event exposed to JS.
+  return @[@"onFinishedSpeaking"];
+}
+
+- (void)startObserving
+{
+  self.hasListeners = YES;
+}
+
+- (void)stopObserving
+{
+  self.hasListeners = NO;
+}
+
+- (void)dealloc
+{
+  if (_ttsInstance) {
+    [_ttsInstance destroy];
+    _ttsInstance = nil;
+  }
+}
+
+#pragma mark - API
+
 - (instancetype)init {
   self = [super init];
   if (self) {
@@ -28,13 +56,6 @@ RCT_EXPORT_MODULE();
   return self;
 }
 
-// Declare events if needed (empty if none)
-- (NSArray<NSString *> *)supportedEvents {
-  RCTLogInfo(@"[DaVoiceTTSBridge] supportedEvents called.");
-  NSLog(@"[DaVoiceTTSBridge] supportedEvents called.");
-  return @[]; // If you don't have events, leave empty.
-}
-
 RCT_EXPORT_METHOD(initTTS:(NSDictionary *)configDict
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
@@ -51,27 +72,76 @@ RCT_EXPORT_METHOD(initTTS:(NSDictionary *)configDict
   NSURL *modelURL = [NSURL fileURLWithPath:modelPath];
 
   NSError *error = nil;
-  self.ttsInstance = [[DaVoiceTTS alloc] initWithModel:modelURL error:&error];
+  // Ensure we touch AVAudio/ORT from main.
+  dispatch_async(dispatch_get_main_queue(), ^{
+      NSError *error = nil;
+      self.ttsInstance = [[DaVoiceTTS alloc] initWithModel:modelURL error:&error];
+      if (error || !self.ttsInstance) {
+        reject(@"init_failed", error.localizedDescription ?: @"Failed to initialize", error);
+        return;
+      }
+
+      __weak typeof(self) weakSelf = self;
+      // Bridge Swift callback -> RN event
+      self.ttsInstance.onLastUtteranceFinished = ^{
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if (!strongSelf) return;
+        if (!strongSelf.hasListeners) return;
+
+        // Send on main just to be extra safe for JS listeners doing UI work.
+        dispatch_async(dispatch_get_main_queue(), ^{
+          [strongSelf sendEventWithName:@"onFinishedSpeaking" body:@{}];
+        });
+      };
+
+      resolve(@"TTS initialized");
+    });
+  }
 
-  if (error || !self.ttsInstance) {
-    reject(@"init_failed", error.localizedDescription ?: @"Failed to initialize", error);
-  } else {
-    resolve(@"TTS initialized");
+  RCT_EXPORT_METHOD(speak:(NSString *)text
+                    speakerId:(nonnull NSNumber *)speakerId
+                    resolver:(RCTPromiseResolveBlock)resolve
+                    rejecter:(RCTPromiseRejectBlock)reject)
+  {
+    if (!self.ttsInstance) {
+      reject(@"no_instance", @"TTS not initialized", nil);
+      return;
+    }
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+      [self.ttsInstance speak:text sid:speakerId.intValue];
+      resolve(@"Speaking");
+    });
   }
-}
 
-RCT_EXPORT_METHOD(speak:(NSString *)text
-                  speakerId:(nonnull NSNumber *)speakerId
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-{
-  if (!self.ttsInstance) {
-    reject(@"no_instance", @"TTS not initialized", nil);
-    return;
+  RCT_EXPORT_METHOD(stopSpeaking:(RCTPromiseResolveBlock)resolve
+                    rejecter:(RCTPromiseRejectBlock)reject)
+  {
+    if (!self.ttsInstance) {
+      reject(@"no_instance", @"TTS not initialized", nil);
+      return;
+    }
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+      [self.ttsInstance stopSpeaking];
+      resolve(@"Stopped");
+    });
   }
 
-  [self.ttsInstance speak:text sid:[speakerId intValue]];
-  resolve(@"Speaking");
-}
+  RCT_EXPORT_METHOD(destroy:(RCTPromiseResolveBlock)resolve
+                    rejecter:(RCTPromiseRejectBlock)reject)
+  {
+    if (!self.ttsInstance) {
+      // Idempotent: resolve anyway.
+      resolve(@"Already destroyed");
+      return;
+    }
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+      [self.ttsInstance destroy];
+      self.ttsInstance = nil;
+      resolve(@"Destroyed");
+    });
+  }
 
 @end

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

@@ -307,13 +307,19 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 
 @class NSURL;
 @class NSString;
+@class NSUUID;
 @class AVAudioPCMBuffer;
 SWIFT_CLASS("_TtC10DavoiceTTS10DaVoiceTTS")
 @interface DaVoiceTTS : NSObject
+@property (nonatomic, copy) void (^ _Nullable onLastUtteranceFinished)(void);
 - (nullable instancetype)initWithModel:(NSURL * _Nonnull)model error:(NSError * _Nullable * _Nullable)error OBJC_DESIGNATED_INITIALIZER;
+/// Immediately stop speaking: cancels future synthesis work and flushes all playback.
+- (void)stopSpeaking;
+/// Destroy the TTS instance resources; after this call, the object should not be used.
+/// Effectively returns the instance to “pre-init” state.
+- (void)destroy;
 - (void)speak:(NSString * _Nonnull)txt sid:(int32_t)sid;
-- (AVAudioPCMBuffer * _Nullable)synthesize:(NSString * _Nonnull)text speakerId:(int32_t)speakerId error:(NSError * _Nullable * _Nullable)error SWIFT_WARN_UNUSED_RESULT;
-- (AVAudioPCMBuffer * _Nullable)synthesize_top:(NSString * _Nonnull)text speakerId:(int32_t)speakerId error:(NSError * _Nullable * _Nullable)error SWIFT_WARN_UNUSED_RESULT;
+- (AVAudioPCMBuffer * _Nullable)synthesize_top:(NSString * _Nonnull)text speakerId:(int32_t)speakerId token:(NSUUID * _Nonnull)token error:(NSError * _Nullable * _Nullable)error SWIFT_WARN_UNUSED_RESULT;
 - (nonnull instancetype)init SWIFT_UNAVAILABLE;
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
 @end