react-native-davoice-tts 1.0.41 → 1.0.43

package/TTSRNBridge.podspec

@@ -16,7 +16,12 @@ Pod::Spec.new do |s|
 
 #    s.source_files = "ios/*.{h,m,mm,swift}"
 #    s.resources    = "ios/TTSRNBridge/models/*"
-    s.source_files = 'ios/TTSRNBridge/DaVoiceTTSBridge.m', 'ios/TTSRNBridge/DaVoiceTTSBridge.h'
+#    s.source_files = 'ios/TTSRNBridge/DaVoiceTTSBridge.m', 'ios/TTSRNBridge/DaVoiceTTSBridge.h'
+    s.source_files = [
+        "ios/TTSRNBridge/DaVoiceTTSBridge.{h,m}",
+        "ios/STTRNBridge/STTBridge.{h,m}",
+        "ios/STT/**/*.{swift}"
+    ]
 
     #s.static_framework = true
     # Add your static libraries explicitly as vendored_libraries

package/android/src/main/java/com/davoice/tts/rn/DaVoiceTTSBridge.java

@@ -1,21 +1,16 @@
-//DaVoiceTTSBridge.java 
 package com.davoice.tts.rn;
 
-import com.davoice.tts.DaVoiceTTSInterface; // core wrapper with all init logic
+import androidx.annotation.Nullable;                       // ✅ add
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;              // ✅ add
+import com.facebook.react.modules.core.DeviceEventManagerModule; // ✅ add
+
+import com.davoice.tts.DaVoiceTTSInterface;               // keep
 
-/**
- * Minimal RN bridge:
- *   NativeModules.DaVoiceTTSBridge.initTTS(modelName)
- *   NativeModules.DaVoiceTTSBridge.speak(text, speakerId)
- *   NativeModules.DaVoiceTTSBridge.stopSpeaking()
- *   // JS listens via new NativeEventEmitter(DaVoiceTTSBridge).addListener('onFinishedSpeaking', ...)
- * Everything else is handled by DaVoiceTTSInterface.
- */
 public class DaVoiceTTSBridge extends ReactContextBaseJavaModule {
 
     private final DaVoiceTTSInterface tts;
@@ -32,10 +27,7 @@ public class DaVoiceTTSBridge extends ReactContextBaseJavaModule {
         return "DaVoiceTTSBridge";
     }
 
-    // ---- helpers ----
-
     private void sendEvent(String name, @Nullable WritableMap params) {
-        // Emit on UI thread to be safe
         reactCtx.runOnUiQueueThread(() ->
             reactCtx
                 .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
@@ -43,8 +35,6 @@ public class DaVoiceTTSBridge extends ReactContextBaseJavaModule {
         );
     }
 
-    // ---- API ----
-
     @ReactMethod
     public void initTTS(ReadableMap config, Promise promise) {
         try {
@@ -53,19 +43,16 @@ public class DaVoiceTTSBridge extends ReactContextBaseJavaModule {
                 return;
             }
             final String modelName = config.getString("model");
-            // AAR handles the rest (tokens=<model>.json, espeak dir, etc.)
-            DaVoiceTTSInterface.Config cfg = new DaVoiceTTSInterface.Config(
-                    modelName,      // e.g. "model.onnx"
-                    "en-US",        // default voice (ignored/overridden by AAR if needed)
-                    "phonemes_dir"  // asset dir name (AAR copies recursively)
-            );
 
-            // Hook native → JS finished event
-            tts.setOnFinishedSpeakingListenerJava(() -> {
-                // no payload required; JS just needs the signal
-                sendEvent("onFinishedSpeaking", null);
-            });
+            // 1) attach listener (works even if called before init)
+            tts.setOnFinishedSpeakingListenerJava(() -> sendEvent("onFinishedSpeaking", null));
 
+            // 2) init
+            DaVoiceTTSInterface.Config cfg = new DaVoiceTTSInterface.Config(
+                    modelName,
+                    "en-US",
+                    "phonemes_dir"
+            );
             boolean ok = tts.initTTS(cfg);
             if (!ok) {
                 promise.reject("InitFailed", "Engine/TTS init failed");
@@ -97,7 +84,7 @@ public class DaVoiceTTSBridge extends ReactContextBaseJavaModule {
         }
     }
 
-    // RN event API stubs (avoid warnings if JS subscribes)
+    // RN event API stubs
     @ReactMethod public void addListener(String eventName) { /* no-op */ }
     @ReactMethod public void removeListeners(double count) { /* no-op */ }
 }

package/ios/STTRNBridge/STTBridge.h

@@ -0,0 +1,7 @@
+#import <React/RCTEventEmitter.h>
+#import <React/RCTBridgeModule.h>
+
+@class STT;  // from Swift
+
+@interface STTBridge : RCTEventEmitter <RCTBridgeModule>
+@end

package/ios/STTRNBridge/STTBridge.m

@@ -0,0 +1,109 @@
+#import "STTBridge.h"
+#import <React/RCTLog.h>
+#import <React/RCTConvert.h>
+
+// Import the generated Swift header for your target.
+// Replace "YourTargetName-Swift.h" with your actual target name.
+#import "YourTargetName-Swift.h"
+
+@interface STTBridge () <STTDelegate>
+@property (nonatomic, strong, nullable) STT *stt;
+@property (nonatomic, assign) BOOL hasListeners;
+@end
+
+@implementation STTBridge
+
+RCT_EXPORT_MODULE(STT)  // matches NativeModules.STT in stt/index.ts
+
++ (BOOL)requiresMainQueueSetup { return YES; }
+
+- (NSArray<NSString *> *)supportedEvents
+{
+  // Keep event names EXACTLY as the native STT emits.
+  return @[
+    @"onSpeechResults",
+    @"onSpeechStart",
+    @"onSpeechPartialResults",
+    @"onSpeechError",
+    @"onSpeechEnd",
+    @"onSpeechRecognized",
+    @"onSpeechVolumeChanged"
+  ];
+}
+
+- (void)startObserving   { self.hasListeners = YES;  }
+- (void)stopObserving    { self.hasListeners = NO;   }
+- (dispatch_queue_t)methodQueue { return dispatch_get_main_queue(); }
+
+- (void)dealloc {
+  // Tear down safely
+  [self.stt destroySpeech:^(id _){}]; // optional; or call a direct Swift method if you exposed one
+  self.stt = nil;
+}
+
+#pragma mark - STTDelegate (from Swift)
+- (void)stt:(STT *)stt didEmitEvent:(NSString *)name body:(NSDictionary *)body
+{
+  if (!self.hasListeners) return;
+  [self sendEventWithName:name body:body ?: @{}];
+}
+
+#pragma mark - Helpers
+- (void)ensureSTT {
+  if (!self.stt) {
+    self.stt = [STT new];
+    self.stt.delegate = self;
+  }
+}
+
+#pragma mark - API (match your JS contract)
+
+RCT_EXPORT_METHOD(startSpeech:(NSString *)locale
+                  callback:(RCTResponseSenderBlock)callback)
+{
+  [self ensureSTT];
+  [self.stt startSpeechWithLocaleStr:locale];
+  // parity with old Voice bridge: immediately callback with "false"
+  if (callback) callback(@[@(NO)]);
+}
+
+RCT_EXPORT_METHOD(stopSpeech:(RCTResponseSenderBlock)callback)
+{
+  if (!self.stt) { if (callback) callback(@[@(NO)]); return; }
+  [self.stt stopSpeech:^(BOOL _){}];
+  if (callback) callback(@[@(NO)]);
+}
+
+RCT_EXPORT_METHOD(cancelSpeech:(RCTResponseSenderBlock)callback)
+{
+  if (!self.stt) { if (callback) callback(@[@(NO)]); return; }
+  [self.stt cancelSpeech:^(BOOL _){}];
+  if (callback) callback(@[@(NO)]);
+}
+
+RCT_EXPORT_METHOD(destroySpeech:(RCTResponseSenderBlock)callback)
+{
+  if (self.stt) {
+    [self.stt destroySpeech:^(BOOL _){}];
+    self.stt = nil;
+  }
+  if (callback) callback(@[@(NO)]);
+}
+
+RCT_EXPORT_METHOD(isSpeechAvailable:(RCTResponseSenderBlock)callback)
+{
+  [STT new]; // ensures class is loaded; optional
+  // Call the Swift closure-based API
+  STT *tmp = self.stt ?: [STT new];
+  [tmp 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)]);
+}
+
+@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>

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

@@ -282,7 +282,9 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 #pragma clang diagnostic ignored "-Watimport-in-framework-header"
 #endif
 @import AVFAudio;
+@import Foundation;
 @import ObjectiveC;
+@import Speech;
 #endif
 
 #endif
@@ -324,6 +326,31 @@ SWIFT_CLASS("_TtC10DavoiceTTS10DaVoiceTTS")
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
 @end
 
+@protocol STTDelegate;
+@class SFSpeechRecognizer;
+SWIFT_CLASS("_TtC10DavoiceTTS3STT")
+@interface STT : NSObject <SFSpeechRecognizerDelegate>
+@property (nonatomic, weak) id <STTDelegate> _Nullable delegate;
+@property (nonatomic) BOOL continuous;
+SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, copy) NSArray<NSString *> * _Nonnull supportedEvents;)
++ (NSArray<NSString *> * _Nonnull)supportedEvents SWIFT_WARN_UNUSED_RESULT;
+- (void)isSpeechAvailable:(void (^ _Nonnull)(BOOL))completion;
+- (BOOL)isRecognizing SWIFT_WARN_UNUSED_RESULT;
+- (void)startSpeechWithLocaleStr:(NSString * _Nullable)localeStr;
+- (void)stopSpeech:(void (^ _Nullable)(BOOL))completion;
+- (void)cancelSpeech:(void (^ _Nullable)(BOOL))completion;
+- (void)destroySpeech:(void (^ _Nullable)(BOOL))completion;
+- (void)teardown;
+- (void)teardown2;
+- (void)speechRecognizer:(SFSpeechRecognizer * _Nonnull)speechRecognizer availabilityDidChange:(BOOL)available;
+- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
+@end
+
+SWIFT_PROTOCOL("_TtP10DavoiceTTS11STTDelegate_")
+@protocol STTDelegate
+- (void)stt:(STT * _Nonnull)stt didEmitEvent:(NSString * _Nonnull)name body:(NSDictionary<NSString *, id> * _Nullable)body;
+@end
+
 @class AVAudioPlayer;
 SWIFT_CLASS("_TtC10DavoiceTTS15SwiftSoundQueue")
 @interface SwiftSoundQueue : NSObject <AVAudioPlayerDelegate>