react-native-davoice-tts 1.0.231 → 1.0.233

package/TTSRNBridge.podspec

@@ -2,7 +2,7 @@ require 'json'
 
 Pod::Spec.new do |s|
     s.name         = "TTSRNBridge"
-    s.version      = "1.0.104" # Update to your package version
+    s.version      = "1.0.106" # Update to your package version
     s.summary      = "TTS for React Native."
     s.description  = <<-DESC
                      A React Native module for tts .

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

@@ -24,6 +24,7 @@ public class DaVoiceTTSBridge extends ReactContextBaseJavaModule {
 
     private final DaVoiceTTSInterface tts;
     private final ReactApplicationContext reactCtx;
+    final String TAG = "TTS";
 
     public DaVoiceTTSBridge(ReactApplicationContext context) {
         super(context);
@@ -198,36 +199,116 @@ public class DaVoiceTTSBridge extends ReactContextBaseJavaModule {
             dst[f] = acc / channels;
         }
     }
-// ADD
-@ReactMethod
+
+    // @ReactMethod
+    // public void playWav(String pathOrURL, boolean markAsLast, Promise promise) {
+    //     Log.d(TAG, "playWav() called with: " + pathOrURL + " | markAsLast=" + markAsLast);
+    //     try {
+    //         if (isHttpOrHttps(pathOrURL)) {
+    //             promise.reject("unsupported_url", "Remote URLs not supported. Download to a local file first.");
+    //             return;
+    //         }
+
+    //                 // --- NEW: handle require() assets from RN ---
+    //         if (pathOrURL.startsWith("asset:/")) {
+    //             Log.e(TAG, "Rejected remote URL: " + pathOrURL);
+    //             String assetName = pathOrURL.replace("asset:/", "");
+    //             Log.d(TAG, "Detected bundled asset: " + assetName);
+    //             try (AssetFileDescriptor afd = getReactApplicationContext().getAssets().openFd(assetName)) {
+    //                 tts.playWav(afd, markAsLast);  // overload that accepts AssetFileDescriptor
+    //                 promise.resolve("queued");
+    //                 return;
+    //             } catch (IOException e) {
+    //                 promise.reject("asset_load_failed", "Unable to open bundled asset: " + e.getMessage(), e);
+    //                 return;
+    //             }
+    //         }
+
+    //         String path = pathOrURL;
+    //         if (isFileUrl(pathOrURL)) {
+    //             Uri u = Uri.parse(pathOrURL);
+    //             File f = new File(u.getPath());
+    //             path = f.getAbsolutePath();
+    //         }
+    //         if (path == null) {
+    //             promise.reject("bad_path", "Invalid file URL");
+    //             return;
+    //         }
+    //         File f = new File(path);
+    //         if (!f.exists()) {
+    //             promise.reject("file_missing", "WAV file does not exist at path");
+    //             return;
+    //         }
+    //         tts.playWav(f, markAsLast);
+    //         promise.resolve("queued");
+    //     } catch (Exception e) {
+    //         promise.reject("PlayWavError", e.getMessage(), e);
+    //     }
+    // }
+    // ADD
 public void playWav(String pathOrURL, boolean markAsLast, Promise promise) {
+    final String TAG = "TTS";
+    Log.d(TAG, "playWav() called with: " + pathOrURL + " | markAsLast=" + markAsLast);
+
     try {
         if (isHttpOrHttps(pathOrURL)) {
+            Log.e(TAG, "Rejected remote URL: " + pathOrURL);
             promise.reject("unsupported_url", "Remote URLs not supported. Download to a local file first.");
             return;
         }
+
+        // --- NEW: handle require() assets from RN ---
+        if (pathOrURL.startsWith("asset:/")) {
+            String assetName = pathOrURL.replace("asset:/", "");
+            Log.d(TAG, "Detected bundled asset: " + assetName);
+            try (AssetFileDescriptor afd = getReactApplicationContext().getAssets().openFd(assetName)) {
+                Log.d(TAG, "Successfully opened asset: " + assetName + 
+                           " | startOffset=" + afd.getStartOffset() + 
+                           " | length=" + afd.getLength());
+                tts.playWav(afd, markAsLast);  // overload that accepts AssetFileDescriptor
+                Log.d(TAG, "Queued asset playback successfully.");
+                promise.resolve("queued");
+                return;
+            } catch (IOException e) {
+                Log.e(TAG, "Failed to open asset: " + assetName + " | " + e.getMessage(), e);
+                promise.reject("asset_load_failed", "Unable to open bundled asset: " + e.getMessage(), e);
+                return;
+            }
+        }
+
+        // --- file:// handling ---
         String path = pathOrURL;
         if (isFileUrl(pathOrURL)) {
             Uri u = Uri.parse(pathOrURL);
             File f = new File(u.getPath());
             path = f.getAbsolutePath();
+            Log.d(TAG, "Resolved file:// URL to path: " + path);
         }
+
         if (path == null) {
+            Log.e(TAG, "Invalid or null path provided");
             promise.reject("bad_path", "Invalid file URL");
             return;
         }
+
         File f = new File(path);
         if (!f.exists()) {
+            Log.e(TAG, "File does not exist at path: " + path);
             promise.reject("file_missing", "WAV file does not exist at path");
             return;
         }
+
+        Log.d(TAG, "Playing WAV from path: " + path + " (exists=" + f.exists() + ")");
         tts.playWav(f, markAsLast);
+        Log.d(TAG, "Queued playback successfully for: " + path);
         promise.resolve("queued");
+
     } catch (Exception e) {
+        Log.e(TAG, "PlayWavError: " + e.getMessage(), e);
         promise.reject("PlayWavError", e.getMessage(), e);
     }
 }
-    // ADD
+
     @ReactMethod
     public void playBuffer(ReadableMap desc, Promise promise) {
         try {

package/package.json

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

package/speech/index.ts

@@ -1,5 +1,6 @@
 // speech/index.ts
 import { NativeModules, NativeEventEmitter, DeviceEventEmitter, Platform } from 'react-native';
+import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
 
 // If you use typed-array -> base64, Buffer is convenient (works in RN)
 let toBase64: (u8: Uint8Array) => string;
@@ -406,18 +407,33 @@ private rewireListenersForMode() {
   }
 
   // --- NEW: TTS passthroughs for external audio ---
+  /** Queue a WAV file (local path, file:// URL, or require() asset). */
+  async playWav(pathOrURL: string | number, markAsLast = true) {
+    // NEW: resolve require() assets to actual file path/URI
+    const asset = resolveAssetSource(pathOrURL);
+    const realPath = asset?.uri ?? pathOrURL; // fallback keeps string path intact
 
-  /** Queue a WAV file (local path or file:// URL). Routed via AEC path, queued with speak(). */
-  async playWav(pathOrURL: string, markAsLast = true) {
     // Prefer unified iOS bridge if present
     if (Platform.OS === 'ios' && NativeSpeech?.playWav) {
-      return NativeSpeech.playWav(pathOrURL, markAsLast);
+      return NativeSpeech.playWav(realPath, markAsLast);
     }
+
     // Fallback: direct TTS bridge (Android + iOS fallback)
     if (!NativeTTS?.playWav) throw new Error('playWav not available on this platform.');
-    return NativeTTS.playWav(pathOrURL, markAsLast);
+    return NativeTTS.playWav(realPath, markAsLast);
   }
 
+  // /** Queue a WAV file (local path or file:// URL). Routed via AEC path, queued with speak(). */
+  // async playWav(pathOrURL: string, markAsLast = true) {
+  //   // Prefer unified iOS bridge if present
+  //   if (Platform.OS === 'ios' && NativeSpeech?.playWav) {
+  //     return NativeSpeech.playWav(pathOrURL, markAsLast);
+  //   }
+  //   // Fallback: direct TTS bridge (Android + iOS fallback)
+  //   if (!NativeTTS?.playWav) throw new Error('playWav not available on this platform.');
+  //   return NativeTTS.playWav(pathOrURL, markAsLast);
+  // }
+
   /**
    * Convenience: queue a typed array (Int16Array | Float32Array | ArrayBuffer) as PCM.
    * We’ll base64 it and pass through to native with the right metadata.