@focus8/expo-acapela-tts 0.1.9 → 0.1.12

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

@@ -113,9 +113,9 @@ class ExpoAcapelaTtsModule : Module(), iTTSEventsCallback {
       }
     }
 
-    Function("setLicense") { userId: Double, password: Double, key: String ->
-      licenseUserId = userId.toLong()
-      licensePassword = password.toLong()
+    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: userId=0x${java.lang.Long.toHexString(licenseUserId!!)} password=0x${java.lang.Long.toHexString(licensePassword!!)}")
     }
@@ -198,14 +198,21 @@ class ExpoAcapelaTtsModule : Module(), iTTSEventsCallback {
           logInfo("  Voice: $v")
         }
 
-        val voices = voicesList.map { voiceName ->
+        val seen = mutableMapOf<String, Int>()
+        val voices = voicesList.mapIndexed { index, voiceName ->
           val info = tts!!.getVoiceInfo(voiceName) ?: emptyMap()
           val genderValue = info["gender"] ?: "0"
+          val internalName = info["name"] ?: "voice_$index"
+          // Track duplicates and create unique id
+          val count = seen.getOrDefault(voiceName, 0)
+          seen[voiceName] = count + 1
+          val uniqueId = if (count == 0) voiceName else "${voiceName}_${count}"
           mapOf(
+            "id" to uniqueId,
             "name" to voiceName,
             "locale" to (info["locale"] ?: ""),
             "language" to (info["language"] ?: ""),
-            "speaker" to (info["name"]?.let { extractSpeakerName(it) } ?: ""),
+            "speaker" to internalName,
             "gender" to if (genderValue == "1") "female" else "male",
             "quality" to (info["quality"] ?: ""),
             "age" to (info["age"] ?: ""),

package/build/ExpoAcapelaTts.types.d.ts

@@ -1,4 +1,5 @@
 export type AcapelaVoice = {
+    id: string;
     name: string;
     locale: string;
     language: string;

package/build/ExpoAcapelaTts.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoAcapelaTts.types.d.ts","sourceRoot":"","sources":["../src/ExpoAcapelaTts.types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,OAAO,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CAC7D,CAAC"}
+{"version":3,"file":"ExpoAcapelaTts.types.d.ts","sourceRoot":"","sources":["../src/ExpoAcapelaTts.types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,OAAO,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CAC7D,CAAC"}

package/build/ExpoAcapelaTts.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoAcapelaTts.types.js","sourceRoot":"","sources":["../src/ExpoAcapelaTts.types.ts"],"names":[],"mappings":"","sourcesContent":["export type AcapelaVoice = {\n  name: string;\n  locale: string;\n  language: string;\n  speaker: string;\n  gender: 'male' | 'female';\n  quality: string;\n  age: string;\n  frequency: string;\n};\n\nexport type ExpoAcapelaTtsModuleEvents = {\n  onSpeechStart: () => void;\n  onSpeechEnd: () => void;\n  onError: (event: { message: string; code: number }) => void;\n};\n"]}
+{"version":3,"file":"ExpoAcapelaTts.types.js","sourceRoot":"","sources":["../src/ExpoAcapelaTts.types.ts"],"names":[],"mappings":"","sourcesContent":["export type AcapelaVoice = {\n  id: string;\n  name: string;\n  locale: string;\n  language: string;\n  speaker: string;\n  gender: 'male' | 'female';\n  quality: string;\n  age: string;\n  frequency: string;\n};\n\nexport type ExpoAcapelaTtsModuleEvents = {\n  onSpeechStart: () => void;\n  onSpeechEnd: () => void;\n  onError: (event: { message: string; code: number }) => void;\n};\n"]}

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.9",
+  "version": "0.1.12",
   "description": "Acapela TTS integration for Expo on Android",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/src/ExpoAcapelaTts.types.ts

@@ -1,4 +1,5 @@
 export type AcapelaVoice = {
+  id: string;
   name: string;
   locale: string;
   language: string;

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;
   },