react-native-davoice-tts 1.0.40 → 1.0.42

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

@@ -1,27 +1,24 @@
-//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;
+    private final ReactApplicationContext reactCtx;
 
     public DaVoiceTTSBridge(ReactApplicationContext context) {
         super(context);
+        this.reactCtx = context;
         this.tts = new DaVoiceTTSInterface(context);
     }
 
@@ -30,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)
@@ -41,8 +35,6 @@ public class DaVoiceTTSBridge extends ReactContextBaseJavaModule {
         );
     }
 
-    // ---- API ----
-
     @ReactMethod
     public void initTTS(ReadableMap config, Promise promise) {
         try {
@@ -51,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");
@@ -95,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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-davoice-tts",
-    "version": "1.0.40",
+    "version": "1.0.42",
     "description": "tts library for React Native",
     "main": "tts/index.js",
     "types": "tts/index.d.ts",