@focus8/expo-acapela-tts 0.1.5 → 0.1.9

package/android/build.gradle

@@ -32,6 +32,13 @@ android {
   defaultConfig {
     versionCode 1
     versionName "0.1.0"
+
+    buildConfigField "long", "ACAPELA_USER_ID", "${System.getenv('ACAPELA_USER_ID') ?: '0'}L"
+    buildConfigField "long", "ACAPELA_PASSWORD", "${System.getenv('ACAPELA_PASSWORD') ?: '0'}L"
+    buildConfigField "String", "ACAPELA_LICENSE_KEY", "\"${System.getenv('ACAPELA_LICENSE_KEY') ?: ''}\""
+  }
+  buildFeatures {
+    buildConfig true
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/expo/modules/acapelatts/ExpoAcapelaTtsModule.kt

@@ -1,8 +1,14 @@
 package expo.modules.acapelatts
 
+import android.Manifest
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
 import android.os.Build
 import android.os.Environment
+import android.provider.Settings
 import android.util.Log
+import androidx.core.content.ContextCompat
 import com.acapelagroup.android.tts.acattsandroid
 import com.acapelagroup.android.tts.acattsandroid.iTTSEventsCallback
 import expo.modules.kotlin.modules.Module
@@ -42,9 +48,43 @@ class ExpoAcapelaTtsModule : Module(), iTTSEventsCallback {
     Events("onSpeechStart", "onSpeechEnd", "onError")
 
     Function("hasStoragePermission") {
+      hasStorageAccess()
+    }
+
+    AsyncFunction("requestStoragePermissionAsync") {
+      val context = appContext.reactContext ?: return@AsyncFunction false
+
+      if (hasStorageAccess()) {
+        logInfo("Storage permission already granted")
+        return@AsyncFunction true
+      }
+
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-        Environment.isExternalStorageManager()
+        // Android 11+ needs MANAGE_EXTERNAL_STORAGE via Settings intent
+        try {
+          val intent = Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION).apply {
+            data = Uri.fromParts("package", context.packageName, null)
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+          }
+          context.startActivity(intent)
+          logInfo("Launched MANAGE_EXTERNAL_STORAGE settings for ${context.packageName}")
+        } catch (e: Exception) {
+          // Fallback for devices that don't support the per-app intent
+          try {
+            val intent = Intent(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION).apply {
+              addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            }
+            context.startActivity(intent)
+          } catch (e2: Exception) {
+            logError("Failed to launch storage permission settings", e2)
+            return@AsyncFunction false
+          }
+        }
+        // User needs to grant in settings and come back - we can't wait for result
+        false
       } else {
+        // Pre-Android 11: READ_EXTERNAL_STORAGE is enough, granted via manifest on enrolled AOSP
+        logInfo("Pre-Android 11: storage permissions handled by manifest")
         true
       }
     }
@@ -73,11 +113,11 @@ class ExpoAcapelaTtsModule : Module(), iTTSEventsCallback {
       }
     }
 
-    Function("setLicense") { userId: Long, password: Long, key: String ->
-      licenseUserId = userId
-      licensePassword = password
+    Function("setLicense") { userId: Double, password: Double, key: String ->
+      licenseUserId = userId.toLong()
+      licensePassword = password.toLong()
       licenseKey = key
-      logInfo("License set")
+      logInfo("License set: userId=0x${java.lang.Long.toHexString(licenseUserId!!)} password=0x${java.lang.Long.toHexString(licensePassword!!)}")
     }
 
     AsyncFunction("initializeAsync") {
@@ -91,8 +131,13 @@ class ExpoAcapelaTtsModule : Module(), iTTSEventsCallback {
         return@AsyncFunction true
       }
 
-      if (licenseUserId == null || licensePassword == null || licenseKey == null) {
-        logWarning("Cannot initialize: license not set. Call setLicense() first.")
+      // Use BuildConfig values as fallback if setLicense() was not called from JS
+      val uid = licenseUserId ?: BuildConfig.ACAPELA_USER_ID
+      val pwd = licensePassword ?: BuildConfig.ACAPELA_PASSWORD
+      val key = licenseKey ?: BuildConfig.ACAPELA_LICENSE_KEY
+
+      if (uid == 0L || key.isNullOrEmpty()) {
+        logWarning("Cannot initialize: no license configured (neither via setLicense() nor BuildConfig)")
         return@AsyncFunction false
       }
 
@@ -104,7 +149,13 @@ class ExpoAcapelaTtsModule : Module(), iTTSEventsCallback {
 
         tts = acattsandroid(context, this@ExpoAcapelaTtsModule, null)
         tts!!.setLog(true)
-        tts!!.setLicense(licenseUserId!!, licensePassword!!, licenseKey)
+        logInfo("setLicense userId=0x${java.lang.Long.toHexString(uid)} password=0x${java.lang.Long.toHexString(pwd)} keyLength=${key?.length}")
+        tts!!.setLicense(uid, pwd, key)
+
+        // Store for re-use after getVoicesList
+        licenseUserId = uid
+        licensePassword = pwd
+        licenseKey = key
 
         val version = tts!!.version
         logInfo("Initialized, SDK version: $version")
@@ -138,6 +189,10 @@ class ExpoAcapelaTtsModule : Module(), iTTSEventsCallback {
           }
         }
         val voicesList = tts!!.getVoicesList(voiceDirPaths) ?: emptyArray()
+        // Re-set license after getVoicesList as it may reset internal state
+        if (licenseUserId != null && licensePassword != null && licenseKey != null) {
+          tts!!.setLicense(licenseUserId!!, licensePassword!!, licenseKey)
+        }
         logInfo("Found ${voicesList.size} voices")
         for (v in voicesList) {
           logInfo("  Voice: $v")
@@ -297,6 +352,15 @@ class ExpoAcapelaTtsModule : Module(), iTTSEventsCallback {
     }
   }
 
+  private fun hasStorageAccess(): Boolean {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+      Environment.isExternalStorageManager()
+    } else {
+      val context = appContext.reactContext ?: return false
+      ContextCompat.checkSelfPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED
+    }
+  }
+
   private fun extractSpeakerName(voiceFileName: String): String {
     // Voice file names like "non_kari_22k_ns.qvcu" -> "Kari"
     // Or voice names like "hq-ref-Norwegian-Kari-22khz" -> "Kari"

package/build/ExpoAcapelaTtsModule.android.d.ts

@@ -2,6 +2,8 @@ import { NativeModule } from 'expo';
 import { AcapelaVoice, ExpoAcapelaTtsModuleEvents } from './ExpoAcapelaTts.types';
 declare class ExpoAcapelaTtsModule extends NativeModule<ExpoAcapelaTtsModuleEvents> {
     isAvailable(): boolean;
+    hasStoragePermission(): boolean;
+    requestStoragePermissionAsync(): Promise<boolean>;
     addVoicePath(path: string): void;
     setLicense(userId: number, password: number, key: string): void;
     initializeAsync(): Promise<boolean>;

package/build/ExpoAcapelaTtsModule.android.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoAcapelaTtsModule.android.d.ts","sourceRoot":"","sources":["../src/ExpoAcapelaTtsModule.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAuB,MAAM,MAAM,CAAC;AAEzD,OAAO,EACL,YAAY,EACZ,0BAA0B,EAC3B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,OAAO,oBAAqB,SAAQ,YAAY,CAAC,0BAA0B,CAAC;IACjF,WAAW,IAAI,OAAO;IACtB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAChC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAC/D,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IACnC,cAAc,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IACzC,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IACnD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IACzC,IAAI,IAAI,IAAI;IACZ,UAAU,IAAI,OAAO;IACrB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IACjC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAC7B,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAClC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;CAC/B;;AAED,wBAA2E"}
+{"version":3,"file":"ExpoAcapelaTtsModule.android.d.ts","sourceRoot":"","sources":["../src/ExpoAcapelaTtsModule.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAuB,MAAM,MAAM,CAAC;AAEzD,OAAO,EACL,YAAY,EACZ,0BAA0B,EAC3B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,OAAO,oBAAqB,SAAQ,YAAY,CAAC,0BAA0B,CAAC;IACjF,WAAW,IAAI,OAAO;IACtB,oBAAoB,IAAI,OAAO;IAC/B,6BAA6B,IAAI,OAAO,CAAC,OAAO,CAAC;IACjD,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAChC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAC/D,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IACnC,cAAc,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IACzC,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IACnD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IACzC,IAAI,IAAI,IAAI;IACZ,UAAU,IAAI,OAAO;IACrB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IACjC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAC7B,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAClC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;CAC/B;;AAED,wBAA2E"}

package/build/ExpoAcapelaTtsModule.android.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoAcapelaTtsModule.android.js","sourceRoot":"","sources":["../src/ExpoAcapelaTtsModule.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAuBzD,eAAe,mBAAmB,CAAuB,gBAAgB,CAAC,CAAC","sourcesContent":["import { NativeModule, requireNativeModule } from 'expo';\n\nimport {\n  AcapelaVoice,\n  ExpoAcapelaTtsModuleEvents,\n} from './ExpoAcapelaTts.types';\n\ndeclare class ExpoAcapelaTtsModule extends NativeModule<ExpoAcapelaTtsModuleEvents> {\n  isAvailable(): boolean;\n  addVoicePath(path: string): void;\n  setLicense(userId: number, password: number, key: string): void;\n  initializeAsync(): Promise<boolean>;\n  getVoicesAsync(): Promise<AcapelaVoice[]>;\n  loadVoiceAsync(voiceName: string): Promise<boolean>;\n  speakAsync(text: string): Promise<number>;\n  stop(): void;\n  isSpeaking(): boolean;\n  setSpeechRate(rate: number): void;\n  setPitch(pitch: number): void;\n  setAudioBoost(boost: number): void;\n  shutdownAsync(): Promise<void>;\n}\n\nexport default requireNativeModule<ExpoAcapelaTtsModule>('ExpoAcapelaTts');\n"]}
+{"version":3,"file":"ExpoAcapelaTtsModule.android.js","sourceRoot":"","sources":["../src/ExpoAcapelaTtsModule.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAyBzD,eAAe,mBAAmB,CAAuB,gBAAgB,CAAC,CAAC","sourcesContent":["import { NativeModule, requireNativeModule } from 'expo';\n\nimport {\n  AcapelaVoice,\n  ExpoAcapelaTtsModuleEvents,\n} from './ExpoAcapelaTts.types';\n\ndeclare class ExpoAcapelaTtsModule extends NativeModule<ExpoAcapelaTtsModuleEvents> {\n  isAvailable(): boolean;\n  hasStoragePermission(): boolean;\n  requestStoragePermissionAsync(): Promise<boolean>;\n  addVoicePath(path: string): void;\n  setLicense(userId: number, password: number, key: string): void;\n  initializeAsync(): Promise<boolean>;\n  getVoicesAsync(): Promise<AcapelaVoice[]>;\n  loadVoiceAsync(voiceName: string): Promise<boolean>;\n  speakAsync(text: string): Promise<number>;\n  stop(): void;\n  isSpeaking(): boolean;\n  setSpeechRate(rate: number): void;\n  setPitch(pitch: number): void;\n  setAudioBoost(boost: number): void;\n  shutdownAsync(): Promise<void>;\n}\n\nexport default requireNativeModule<ExpoAcapelaTtsModule>('ExpoAcapelaTts');\n"]}

package/build/ExpoAcapelaTtsModule.d.ts

@@ -1,5 +1,7 @@
 declare const _default: {
     isAvailable(): boolean;
+    hasStoragePermission(): boolean;
+    requestStoragePermissionAsync(): Promise<boolean>;
     addVoicePath(_path: string): void;
     setLicense(_userId: number, _password: number, _key: string): void;
     initializeAsync(): Promise<boolean>;

package/build/ExpoAcapelaTtsModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoAcapelaTtsModule.d.ts","sourceRoot":"","sources":["../src/ExpoAcapelaTtsModule.ts"],"names":[],"mappings":";mBAEiB,OAAO;wBAGF,MAAM;wBACN,MAAM,aAAa,MAAM,QAAQ,MAAM;uBAClC,OAAO,CAAC,OAAO,CAAC;;+BAMR,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;sBAGlC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;;kBAIlC,OAAO;yBAGA,MAAM;qBACV,MAAM;0BACD,MAAM;;;;;;;AAxB9B,wBA8BE"}
+{"version":3,"file":"ExpoAcapelaTtsModule.d.ts","sourceRoot":"","sources":["../src/ExpoAcapelaTtsModule.ts"],"names":[],"mappings":";mBAEiB,OAAO;4BAGE,OAAO;qCAGQ,OAAO,CAAC,OAAO,CAAC;wBAGnC,MAAM;wBACN,MAAM,aAAa,MAAM,QAAQ,MAAM;uBAClC,OAAO,CAAC,OAAO,CAAC;;+BAMR,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;sBAGlC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;;kBAIlC,OAAO;yBAGA,MAAM;qBACV,MAAM;0BACD,MAAM;;;;;;;AA9B9B,wBAoCE"}

package/build/ExpoAcapelaTtsModule.js

@@ -3,6 +3,12 @@ export default {
     isAvailable() {
         return false;
     },
+    hasStoragePermission() {
+        return true;
+    },
+    async requestStoragePermissionAsync() {
+        return true;
+    },
     addVoicePath(_path) { },
     setLicense(_userId, _password, _key) { },
     async initializeAsync() {

package/build/ExpoAcapelaTtsModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoAcapelaTtsModule.js","sourceRoot":"","sources":["../src/ExpoAcapelaTtsModule.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,eAAe;IACb,WAAW;QACT,OAAO,KAAK,CAAC;IACf,CAAC;IACD,YAAY,CAAC,KAAa,IAAG,CAAC;IAC9B,UAAU,CAAC,OAAe,EAAE,SAAiB,EAAE,IAAY,IAAG,CAAC;IAC/D,KAAK,CAAC,eAAe;QACnB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,KAAK,CAAC,cAAc;QAClB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,KAAK,CAAC,cAAc,CAAC,UAAkB;QACrC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,KAAK,CAAC,UAAU,CAAC,KAAa;QAC5B,OAAO,CAAC,CAAC,CAAC;IACZ,CAAC;IACD,IAAI,KAAI,CAAC;IACT,UAAU;QACR,OAAO,KAAK,CAAC;IACf,CAAC;IACD,aAAa,CAAC,KAAa,IAAG,CAAC;IAC/B,QAAQ,CAAC,MAAc,IAAG,CAAC;IAC3B,aAAa,CAAC,MAAc,IAAG,CAAC;IAChC,KAAK,CAAC,aAAa,KAAI,CAAC;IACxB,WAAW;QACT,OAAO,EAAE,MAAM,KAAI,CAAC,EAAE,CAAC;IACzB,CAAC;IACD,eAAe,KAAI,CAAC;CACrB,CAAC","sourcesContent":["// No-op stub for non-Android platforms\nexport default {\n  isAvailable(): boolean {\n    return false;\n  },\n  addVoicePath(_path: string) {},\n  setLicense(_userId: number, _password: number, _key: string) {},\n  async initializeAsync(): Promise<boolean> {\n    return false;\n  },\n  async getVoicesAsync() {\n    return [];\n  },\n  async loadVoiceAsync(_voiceName: string): Promise<boolean> {\n    return false;\n  },\n  async speakAsync(_text: string): Promise<number> {\n    return -1;\n  },\n  stop() {},\n  isSpeaking(): boolean {\n    return false;\n  },\n  setSpeechRate(_rate: number) {},\n  setPitch(_pitch: number) {},\n  setAudioBoost(_boost: number) {},\n  async shutdownAsync() {},\n  addListener() {\n    return { remove() {} };\n  },\n  removeListeners() {},\n};\n"]}
+{"version":3,"file":"ExpoAcapelaTtsModule.js","sourceRoot":"","sources":["../src/ExpoAcapelaTtsModule.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,eAAe;IACb,WAAW;QACT,OAAO,KAAK,CAAC;IACf,CAAC;IACD,oBAAoB;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,CAAC,6BAA6B;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,YAAY,CAAC,KAAa,IAAG,CAAC;IAC9B,UAAU,CAAC,OAAe,EAAE,SAAiB,EAAE,IAAY,IAAG,CAAC;IAC/D,KAAK,CAAC,eAAe;QACnB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,KAAK,CAAC,cAAc;QAClB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,KAAK,CAAC,cAAc,CAAC,UAAkB;QACrC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,KAAK,CAAC,UAAU,CAAC,KAAa;QAC5B,OAAO,CAAC,CAAC,CAAC;IACZ,CAAC;IACD,IAAI,KAAI,CAAC;IACT,UAAU;QACR,OAAO,KAAK,CAAC;IACf,CAAC;IACD,aAAa,CAAC,KAAa,IAAG,CAAC;IAC/B,QAAQ,CAAC,MAAc,IAAG,CAAC;IAC3B,aAAa,CAAC,MAAc,IAAG,CAAC;IAChC,KAAK,CAAC,aAAa,KAAI,CAAC;IACxB,WAAW;QACT,OAAO,EAAE,MAAM,KAAI,CAAC,EAAE,CAAC;IACzB,CAAC;IACD,eAAe,KAAI,CAAC;CACrB,CAAC","sourcesContent":["// No-op stub for non-Android platforms\nexport default {\n  isAvailable(): boolean {\n    return false;\n  },\n  hasStoragePermission(): boolean {\n    return true;\n  },\n  async requestStoragePermissionAsync(): Promise<boolean> {\n    return true;\n  },\n  addVoicePath(_path: string) {},\n  setLicense(_userId: number, _password: number, _key: string) {},\n  async initializeAsync(): Promise<boolean> {\n    return false;\n  },\n  async getVoicesAsync() {\n    return [];\n  },\n  async loadVoiceAsync(_voiceName: string): Promise<boolean> {\n    return false;\n  },\n  async speakAsync(_text: string): Promise<number> {\n    return -1;\n  },\n  stop() {},\n  isSpeaking(): boolean {\n    return false;\n  },\n  setSpeechRate(_rate: number) {},\n  setPitch(_pitch: number) {},\n  setAudioBoost(_boost: number) {},\n  async shutdownAsync() {},\n  addListener() {\n    return { remove() {} };\n  },\n  removeListeners() {},\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@focus8/expo-acapela-tts",
-  "version": "0.1.5",
+  "version": "0.1.9",
   "description": "Acapela TTS integration for Expo on Android",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/src/ExpoAcapelaTtsModule.android.ts

@@ -7,6 +7,8 @@ import {
 
 declare class ExpoAcapelaTtsModule extends NativeModule<ExpoAcapelaTtsModuleEvents> {
   isAvailable(): boolean;
+  hasStoragePermission(): boolean;
+  requestStoragePermissionAsync(): Promise<boolean>;
   addVoicePath(path: string): void;
   setLicense(userId: number, password: number, key: string): void;
   initializeAsync(): Promise<boolean>;

package/src/ExpoAcapelaTtsModule.ts

@@ -3,6 +3,12 @@ export default {
   isAvailable(): boolean {
     return false;
   },
+  hasStoragePermission(): boolean {
+    return true;
+  },
+  async requestStoragePermissionAsync(): Promise<boolean> {
+    return true;
+  },
   addVoicePath(_path: string) {},
   setLicense(_userId: number, _password: number, _key: string) {},
   async initializeAsync(): Promise<boolean> {