@focus8/expo-acapela-tts 0.1.6 → 0.1.11

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

@@ -113,11 +113,11 @@ class ExpoAcapelaTtsModule : Module(), iTTSEventsCallback {
       }
     }
 
-    Function("setLicense") { userId: Long, password: Long, key: String ->
-      licenseUserId = userId
-      licensePassword = password
+    Function("setLicense") { userIdStr: String, passwordStr: String, key: String ->
+      licenseUserId = java.lang.Long.decode(userIdStr)
+      licensePassword = java.lang.Long.decode(passwordStr)
       licenseKey = key
-      logInfo("License set")
+      logInfo("License set: userId=0x${java.lang.Long.toHexString(licenseUserId!!)} password=0x${java.lang.Long.toHexString(licensePassword!!)}")
     }
 
     AsyncFunction("initializeAsync") {
@@ -131,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
       }
 
@@ -144,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")
@@ -178,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")

package/build/ExpoAcapelaTtsModule.android.d.ts

@@ -5,7 +5,7 @@ declare class ExpoAcapelaTtsModule extends NativeModule<ExpoAcapelaTtsModuleEven
     hasStoragePermission(): boolean;
     requestStoragePermissionAsync(): Promise<boolean>;
     addVoicePath(path: string): void;
-    setLicense(userId: number, password: number, key: string): void;
+    setLicense(userId: string, password: string, key: string): void;
     initializeAsync(): Promise<boolean>;
     getVoicesAsync(): Promise<AcapelaVoice[]>;
     loadVoiceAsync(voiceName: string): Promise<boolean>;

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;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"]}
+{"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: string, password: string, 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

@@ -3,7 +3,7 @@ declare const _default: {
     hasStoragePermission(): boolean;
     requestStoragePermissionAsync(): Promise<boolean>;
     addVoicePath(_path: string): void;
-    setLicense(_userId: number, _password: number, _key: string): void;
+    setLicense(_userId: string, _password: string, _key: string): void;
     initializeAsync(): Promise<boolean>;
     getVoicesAsync(): Promise<never[]>;
     loadVoiceAsync(_voiceName: string): Promise<boolean>;

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,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"]}
+{"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: string, _password: string, _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.6",
+  "version": "0.1.11",
   "description": "Acapela TTS integration for Expo on Android",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/src/ExpoAcapelaTtsModule.android.ts

@@ -10,7 +10,7 @@ declare class ExpoAcapelaTtsModule extends NativeModule<ExpoAcapelaTtsModuleEven
   hasStoragePermission(): boolean;
   requestStoragePermissionAsync(): Promise<boolean>;
   addVoicePath(path: string): void;
-  setLicense(userId: number, password: number, key: string): void;
+  setLicense(userId: string, password: string, key: string): void;
   initializeAsync(): Promise<boolean>;
   getVoicesAsync(): Promise<AcapelaVoice[]>;
   loadVoiceAsync(voiceName: string): Promise<boolean>;

package/src/ExpoAcapelaTtsModule.ts

@@ -10,7 +10,7 @@ export default {
     return true;
   },
   addVoicePath(_path: string) {},
-  setLicense(_userId: number, _password: number, _key: string) {},
+  setLicense(_userId: string, _password: string, _key: string) {},
   async initializeAsync(): Promise<boolean> {
     return false;
   },