react-native-davoice-tts 1.0.275 → 1.0.277

package/TTSRNBridge.podspec

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

package/android/libs/com/davoice/tts/1.0.0/tts-1.0.0.aar.md5

@@ -1 +1 @@
-0f748bfafef7fdc5d03bbefdb41bfcdd  tts-1.0.0.aar
+faa5cade26dcaf91c23989be5442e102  tts-1.0.0.aar

package/android/libs/com/davoice/tts/1.0.0/tts-1.0.0.aar.sha1

@@ -1 +1 @@
-39cfd203581433a5e0e36e57abd911bcb30ea922  tts-1.0.0.aar
+d00ea3703391db2243e11526aebb47f37e146b97  tts-1.0.0.aar

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

@@ -24,10 +24,14 @@ import android.content.res.AssetFileDescriptor;
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
+import com.google.android.play.core.assetpacks.AssetPackLocation;
+import com.google.android.play.core.assetpacks.AssetPackManager;
+import com.google.android.play.core.assetpacks.AssetPackManagerFactory;
 
 
 import com.davoice.tts.DaVoiceTTSInterface;
 
+
 public class DaVoiceTTSBridge extends ReactContextBaseJavaModule {
 
     private final DaVoiceTTSInterface tts;
@@ -160,13 +164,19 @@ public class DaVoiceTTSBridge extends ReactContextBaseJavaModule {
                     !s.toLowerCase(Locale.US).startsWith("file:") &&
                     !s.toLowerCase(Locale.US).startsWith("content:") &&
                     !s.toLowerCase(Locale.US).startsWith("asset:") &&
-                    // ✅ IMPORTANT: RN release resource names are NOT AssetManager assets
-                    !s.startsWith("assets_");
+                    // ✅ IMPORTANT: RN release resource names are NOT AssetManager assets (res/raw)
+                    !s.startsWith("assets_") && !s.startsWith("src_assets_");
+
 
             final String modelName;
             if (looksLikePlainAssetPath) {
-                // PASS THROUGH (old working behavior)
-                modelName = s;
+                File f = resolvePlainModelToFile(s, modelExt != null ? modelExt : "onnx");
+                if (f != null) {
+                    modelName = f.getAbsolutePath();   // pass a real filesystem path to the engine
+                } else {
+                    // Last resort: keep old behavior (in case engine itself can open via AssetManager)
+                    modelName = s;
+                }
             } else {
                 // Use provided extension when RN gave us assets_* (no ext), otherwise fall back safely.
                 final String ext = (modelExt != null && !modelExt.isEmpty()) ? modelExt : "onnx";
@@ -197,6 +207,53 @@ public class DaVoiceTTSBridge extends ReactContextBaseJavaModule {
         }
     }
 
+        /** models_pack → absolute file (if installed), else null */
+    @Nullable
+    private File getFileFromAssetPack(String relative) {
+        try {
+            AssetPackManager apm = AssetPackManagerFactory.getInstance(reactCtx.getApplicationContext());
+            AssetPackLocation loc = apm.getPackLocation("models_pack");
+            if (loc == null) return null;
+            String root = loc.assetsPath();               // .../assets
+            if (root == null) return null;
+
+            // Accept both "model.onnx" and "models/model.onnx"
+            String rel = relative.startsWith("models/") ? relative : ("models/" + relative);
+            File f = new File(root, rel);
+            return f.exists() ? f : null;
+        } catch (Throwable t) {
+            Log.w(TAG, "getFileFromAssetPack failed: " + t.getMessage());
+            return null;
+        }
+    }
+
+    /** If in res/raw, copy to cache and return File; else null. */
+    @Nullable
+    private File tryResolveFromResRawToCache(String nameMaybeWithExt, @Nullable String defaultExt) {
+        // Accept "model.onnx" or "model"
+        String rawName = nameMaybeWithExt;
+        if (rawName == null) return null;
+        rawName = rawName.trim();
+        if (rawName.isEmpty()) return null;
+        int dot = rawName.lastIndexOf('.');
+        if (dot > 0) rawName = rawName.substring(0, dot);
+        return copyRawResourceToCache(rawName, defaultExt);
+    }
+
+    /** For plain names, resolve to an absolute File using res/raw or asset-pack. */
+    @Nullable
+    private File resolvePlainModelToFile(String plain, @Nullable String defaultExt) {
+        // 1) res/raw (RN may map bundled assets there in release)
+        File fromRaw = tryResolveFromResRawToCache(plain, defaultExt);
+        if (fromRaw != null && fromRaw.exists()) return fromRaw;
+
+        // 2) fast-follow asset pack
+        File fromPack = getFileFromAssetPack(plain);
+        if (fromPack != null && fromPack.exists()) return fromPack;
+
+        return null;
+    }
+
     @ReactMethod
     public void speak(String text, int speakerId, double speed, Promise promise) {
         try {
@@ -241,6 +298,24 @@ public class DaVoiceTTSBridge extends ReactContextBaseJavaModule {
         }
     }
 
+    private File tryCopyRawToCacheIfExists(String name, @Nullable String defaultExt) {
+        if (name == null) return null;
+        final String s = name.trim();
+        if (s.isEmpty()) return null;
+
+        // Only reasonable resource entry names (no scheme, no slashes)
+        if (s.contains("://") || s.contains("/") || s.contains("\\") || s.startsWith(".")) return null;
+
+        // IMPORTANT: res/raw entry names have NO extension in Android resources
+        // If caller passed "foo.wav", strip extension for resource lookup.
+        String rawName = s;
+        int dot = rawName.lastIndexOf('.');
+        if (dot > 0) rawName = rawName.substring(0, dot);
+
+        File out = copyRawResourceToCache(rawName, defaultExt);
+        return (out != null && out.exists()) ? out : null;
+    }
+
     // Resolve pathOrURL -> local readable File (supports http(s), asset:/, file://, plain path)
     // defaultExt can be "wav", "onnx", etc (used for tmp file naming when extension missing)
     private File resolveToLocalFileForRead(String pathOrURL, @Nullable String defaultExt) throws Exception {
@@ -248,6 +323,16 @@ public class DaVoiceTTSBridge extends ReactContextBaseJavaModule {
         final String s = pathOrURL.trim();
         if (s.isEmpty()) return null;
 
+        // 0) RN bundled assets on Android are usually in res/raw and resolve to a resource entry name
+        // like "assets_*" OR "src_assets_*" (no extension). Try res/raw first.
+        {
+            File out = tryCopyRawToCacheIfExists(s, defaultExt);
+            if (out != null) {
+                Log.i(TAG, "resolveToLocalFileForRead: copied res/raw '" + s + "' -> " + out.getAbsolutePath());
+                return out;
+            }
+        }
+
         // 0) RN bundled assets resolve to res/raw names like "assets_cashregistersound" (NO extension).
         // They are NOT APK /assets files. Handle exactly like react-native-sound: Resources.getIdentifier(..., "raw", ...)
         if (s.startsWith("assets_")) {

package/package.json

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

package/speech/index.ts

@@ -761,6 +761,11 @@ class Speech {
     console.log('[Speech.playWav] resolveAssetSource ->', asset);
 
     let realPath = asset?.uri ?? pathOrURL;
+    if (Platform.OS === 'android' && typeof asset?.uri === 'string') {
+      // Pass raw resource entry name through (native will resolve via res/raw)
+      realPath = asset.uri;
+    }
+
     console.log('[Speech.playWav] resolved realPath:', realPath);
 
     if (typeof realPath !== 'string') {