react-native-davoice-tts 1.0.74 → 1.0.76

package/TTSRNBridge.podspec

@@ -2,7 +2,7 @@ require 'json'
 
 Pod::Spec.new do |s|
     s.name         = "TTSRNBridge"
-    s.version      = "1.0.8" # Update to your package version
+    s.version      = "1.0.9" # Update to your package version
     s.summary      = "TTS for React Native."
     s.description  = <<-DESC
                      A React Native module for tts .
@@ -20,6 +20,7 @@ Pod::Spec.new do |s|
     s.source_files = [
         "ios/TTSRNBridge/DaVoiceTTSBridge.{h,m}",
         "ios/STTRNBridge/STTBridge.{h,m}",
+        "ios/SpeechBridge/SpeechBridge.{h,m}",
         "ios/STT/**/*.{swift}"
     ]
 

package/ios/SpeechBridge/SpeechBridge.h

@@ -0,0 +1,7 @@
+//ios/SpeechBridge/SpeechBridge.h
+// SpeechBridge.h
+#import <React/RCTEventEmitter.h>
+#import <React/RCTBridgeModule.h>
+
+@interface SpeechBridge : RCTEventEmitter <RCTBridgeModule>
+@end

package/ios/SpeechBridge/SpeechBridge.m

@@ -0,0 +1,220 @@
+// SpeechBridge.m
+#import "SpeechBridge.h"
+#import <React/RCTLog.h>
+#import <React/RCTConvert.h>
+
+// Import your Swift classes (names as in your project)
+#import <DaVoiceTTS/DaVoiceTTS-Swift.h>   // DaVoiceTTS + STT live here in your setup
+
+@interface SpeechBridge () <STTDelegate>
+@property (nonatomic, strong, nullable) STT *stt;
+@property (nonatomic, strong, nullable) DaVoiceTTS *tts;
+@property (nonatomic, assign) BOOL hasListeners;
+@property (atomic, assign) BOOL initializing;
+@property (atomic, assign) BOOL initialized;
+
+// used only to gate TTS init until STT engine is “hot”
+@property (atomic, assign) BOOL sttEngineHot;
+@end
+
+@implementation SpeechBridge
+
+RCT_EXPORT_MODULE(SpeechBridge)
+
+// We emit the union of STT + TTS events
+- (NSArray<NSString *> *)supportedEvents
+{
+  return @[
+    // STT events
+    @"onSpeechResults",
+    @"onSpeechStart",
+    @"onSpeechPartialResults",
+    @"onSpeechError",
+    @"onSpeechEnd",
+    @"onSpeechRecognized",
+    @"onSpeechVolumeChanged",
+    // TTS event
+    @"onFinishedSpeaking"
+  ];
+}
+
++ (BOOL)requiresMainQueueSetup { return YES; }
+- (dispatch_queue_t)methodQueue { return dispatch_get_main_queue(); }
+- (void)startObserving { self.hasListeners = YES; }
+- (void)stopObserving  { self.hasListeners = NO;  }
+
+- (void)dealloc
+{
+  // destroy in the safe order: TTS → STT
+  if (_tts) { [_tts destroy]; _tts = nil; }
+  if (_stt) { [_stt destroySpeech:nil]; _stt = nil; }
+}
+
+#pragma mark - STTDelegate (forward all events)
+
+- (void)stt:(STT *)stt didEmitEvent:(NSString *)name body:(NSDictionary *)body
+{
+  // Use the first onSpeechStart as the “engine hot” latch.
+  if ([name isEqualToString:@"onSpeechStart"] && !self.sttEngineHot) {
+    self.sttEngineHot = YES;
+  }
+  if (self.hasListeners) {
+    [self sendEventWithName:name body:body ?: @{}];
+  }
+}
+
+#pragma mark - Helpers
+
+- (void)ensureSTT
+{
+  if (!self.stt) {
+    self.stt = [STT new];
+    self.stt.delegate = self;
+  }
+}
+
+- (void)wireTTSFinishedCallback
+{
+  if (!self.tts) return;
+  __weak typeof(self) weakSelf = self;
+  self.tts.onLastUtteranceFinished = ^{
+    __strong typeof(weakSelf) strongSelf = weakSelf;
+    if (!strongSelf || !strongSelf.hasListeners) return;
+    dispatch_async(dispatch_get_main_queue(), ^{
+      [strongSelf sendEventWithName:@"onFinishedSpeaking" body:@{}];
+    });
+  };
+}
+
+#pragma mark - Unified API
+
+/// initAll({ locale: "en-US", model: "/path/model.onnx", timeoutMs?: 8000 })
+RCT_EXPORT_METHOD(initAll:(NSDictionary *)opts
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+  dispatch_async(dispatch_get_main_queue(), ^{
+    if (self.initializing) { resolve(@"already_initializing"); return; }
+    if (self.initialized)  { resolve(@"already_initialized");  return; }
+
+    self.initializing = YES;
+
+    NSString *locale = opts[@"locale"] ?: @"en-US";
+    NSString *modelPath = opts[@"model"];
+    if (modelPath.length == 0) {
+      self.initializing = NO;
+      reject(@"invalid_args", @"Missing 'model' in initAll()", nil);
+      return;
+    }
+
+    // 1) STT first
+    if (!self.stt) {
+      self.stt = [STT new];
+      self.stt.delegate = self;
+    }
+    [self.stt startSpeechWithLocaleStr:locale];
+
+    // 2) TTS next
+    NSURL *modelURL = [NSURL fileURLWithPath:modelPath];
+    NSError *err = nil;
+    self.tts = [[DaVoiceTTS alloc] initWithModel:modelURL error:&err];
+    if (err || !self.tts) {
+      self.initializing = NO;
+      [self.stt destroySpeech:nil];
+      self.stt = nil;
+      reject(@"tts_init_failed", err.localizedDescription ?: @"TTS init failed", err);
+      return;
+    }
+
+    __weak typeof(self) wself = self;
+    self.tts.onLastUtteranceFinished = ^{
+      __strong typeof(wself) sself = wself;
+      if (!sself || !sself.hasListeners) return;
+      [sself sendEventWithName:@"onFinishedSpeaking" body:@{}];
+    };
+
+    self.initialized  = YES;
+    self.initializing = NO;
+    resolve(@"initialized");
+  });
+}
+
+RCT_EXPORT_METHOD(destroyAll:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+  dispatch_async(dispatch_get_main_queue(), ^{
+    if (!self.initialized && !self.initializing) {
+      resolve(@"already_destroyed");
+      return;
+    }
+    // prevent re-entry during destroy
+    self.initializing = YES;
+
+    // Destroy in reverse order: TTS -> STT
+    @try { [self.tts stopSpeaking]; [self.tts destroy]; } @catch (__unused id e) {}
+    self.tts = nil;
+
+    @try { [self.stt destroySpeech:nil]; } @catch (__unused id e) {}
+    self.stt = nil;
+
+    self.initialized  = NO;
+    self.initializing = NO;
+    resolve(@"destroyed");
+  });
+}
+
+#pragma mark - Convenience passthroughs (optional)
+
+RCT_EXPORT_METHOD(startSpeech:(NSString *)locale
+                  callback:(RCTResponseSenderBlock)callback)
+{
+  [self ensureSTT];
+  [self.stt startSpeechWithLocaleStr:locale];
+  if (callback) callback(@[@(NO)]);
+}
+
+RCT_EXPORT_METHOD(stopSpeech:(RCTResponseSenderBlock)callback)
+{
+  if (!self.stt) { if (callback) callback(@[@(NO)]); return; }
+  [self.stt stopSpeech:^(BOOL ok) { if (callback) callback(@[@(NO)]); }];
+}
+
+RCT_EXPORT_METHOD(cancelSpeech:(RCTResponseSenderBlock)callback)
+{
+  if (!self.stt) { if (callback) callback(@[@(NO)]); return; }
+  [self.stt cancelSpeech:^(BOOL ok) { if (callback) callback(@[@(NO)]); }];
+}
+
+RCT_EXPORT_METHOD(isSpeechAvailable:(RCTResponseSenderBlock)callback)
+{
+  [self ensureSTT];
+  [self.stt isSpeechAvailable:^(BOOL ok){
+    if (callback) callback(@[@(ok ? 1 : 0), [NSNull null]]);
+  }];
+}
+
+RCT_EXPORT_METHOD(isRecognizing:(RCTResponseSenderBlock)callback)
+{
+  BOOL running = self.stt ? [self.stt isRecognizing] : NO;
+  if (callback) callback(@[@(running ? 1 : 0)]);
+}
+
+RCT_EXPORT_METHOD(speak:(NSString *)text
+                  speakerId:(nonnull NSNumber *)speakerId
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+  if (!self.tts) { reject(@"no_tts", @"Call initAll first", nil); return; }
+  [self.tts speak:text sid:speakerId.intValue];
+  resolve(@"Speaking");
+}
+
+RCT_EXPORT_METHOD(stopSpeaking:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+  if (!self.tts) { reject(@"no_tts", @"Call initAll first", nil); return; }
+  [self.tts stopSpeaking];
+  resolve(@"Stopped");
+}
+
+@end

package/ios/TTSRNBridge/DavoiceTTS.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>DavoiceTTS.framework/DavoiceTTS</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>DavoiceTTS.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>DavoiceTTS.framework/DavoiceTTS</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>DavoiceTTS.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>