improve: streamline voice fetching and URL building in FlowerySource

Author: 1Lucas1apk

src/sources/flowery.js

@@ -9,8 +9,8 @@ export default class FlowerySource {
     this.searchTerms = ['ftts', 'flowery']
     this.patterns = [/^ftts:\/\//]
     this.priority = 50
-    this.voiceMap = new Map() // Stores voiceName -> voiceId mapping
-    this.defaultVoiceId = null // Stores the ID of the default voice
+    this.voiceMap = new Map()
+    this.defaultVoiceId = null
   }
 
   async setup() {
@@ -25,18 +25,12 @@ export default class FlowerySource {
       if (cachedVoices) {
         this.voiceMap = new Map(Object.entries(cachedVoices.voiceMap))
         this.defaultVoiceId = cachedVoices.defaultVoiceId
-        logger(
-          'debug',
-          'Flowery',
-          `Loaded ${this.voiceMap.size} voices from CredentialManager.`
-        )
+        logger('debug', 'Flowery', `Loaded ${this.voiceMap.size} voices from CredentialManager.`)
         return
       }
 
       const voicesEndpoint = 'https://api.flowery.pw/v1/tts/voices'
-      const { body, error, statusCode } = await makeRequest(voicesEndpoint, {
-        method: 'GET'
-      })
+      const { body, error, statusCode } = await makeRequest(voicesEndpoint, { method: 'GET' })
 
       if (error || statusCode !== 200 || !body || !Array.isArray(body.voices)) {
         logger(
@@ -49,23 +43,15 @@ export default class FlowerySource {
 
       this.voiceMap.clear()
       for (const voice of body.voices) {
-        this.voiceMap.set(voice.name.toLowerCase(), voice.id)
+        this.voiceMap.set(String(voice.name).toLowerCase(), voice.id)
       }
 
       if (body.default?.id) {
         this.defaultVoiceId = body.default.id
-        logger(
-          'info',
-          'Flowery',
-          `Default voice set to: ${body.default.name} (${body.default.id})`
-        )
+        logger('info', 'Flowery', `Default voice set to: ${body.default.name} (${body.default.id})`)
       } else if (body.voices.length > 0) {
         this.defaultVoiceId = body.voices[0].id
-        logger(
-          'info',
-          'Flowery',
-          `Using first available voice as default: ${body.voices[0].name} (${body.voices[0].id})`
-        )
+        logger('info', 'Flowery', `Using first available voice as default: ${body.voices[0].name} (${body.voices[0].id})`)
       }
 
       this.nodelink.credentialManager.set(
@@ -84,9 +70,7 @@ export default class FlowerySource {
   }
 
   async search(query) {
-    if (!query) {
-      return { loadType: 'empty', data: {} }
-    }
+    if (!query) return { loadType: 'empty', data: {} }
 
     try {
       const url = this._buildUrl(query)
@@ -97,14 +81,9 @@ export default class FlowerySource {
         identifier: `ftts:${query}`
       })
 
-      return {
-        loadType: 'track',
-        data: track
-      }
+      return { loadType: 'track', data: track }
     } catch (e) {
-      return {
-        exception: { message: e.message, severity: 'fault', cause: 'Exception' }
-      }
+      return { exception: { message: e.message, severity: 'fault', cause: 'Exception' } }
     }
   }
 
@@ -144,9 +123,7 @@ export default class FlowerySource {
 
       return { loadType: 'track', data: track }
     } catch (e) {
-      return {
-        exception: { message: e.message, severity: 'fault', cause: 'Exception' }
-      }
+      return { exception: { message: e.message, severity: 'fault', cause: 'Exception' } }
     }
   }
 
@@ -166,46 +143,20 @@ export default class FlowerySource {
       if (overrides.speed !== undefined) speed = overrides.speed
     }
 
-    let voiceId =
-      this.voiceMap.get(voiceName.toLowerCase()) || this.defaultVoiceId
+    let voiceId = this.voiceMap.get(String(voiceName).toLowerCase()) || this.defaultVoiceId
 
     if (!voiceId) {
-      logger(
-        'warn',
-        'Flowery',
-        `Voice "${voiceName}" not found and no default voice available. Using a fallback empty voice ID.`
-      )
-      voiceId = 'default' // Fallback to a generic 'default' if no ID is found
-    }
-
-    let audioFormat = 'mp3'
-    const quality = this.nodelink.options.audio?.quality || 'high'
-
-    switch (quality) {
-      case 'high':
-        audioFormat = 'wav'
-        break
-      case 'medium':
-        audioFormat = 'flac'
-        break
-      case 'low':
-        audioFormat = 'ogg_opus'
-        break
-      case 'lowest':
-        audioFormat = 'mp3'
-        break
-      default:
-        audioFormat = 'wav'
-        break
+      logger('warn', 'Flowery', `Voice "${voiceName}" not found and no default voice available. Using fallback voice ID.`)
+      voiceId = 'default'
     }
 
     const baseUrl = 'https://api.flowery.pw/v1/tts'
     const queryParams = new URLSearchParams({
-      voice: voiceId,
-      text,
+      voice: String(voiceId),
+      text: String(text),
       translate: String(translate),
       silence: String(silence),
-      audio_format: audioFormat,
+      audio_format: 'mp3',
       speed: String(speed)
     })
 
@@ -227,11 +178,7 @@ export default class FlowerySource {
       sourceName: 'flowery'
     }
 
-    return {
-      encoded: encodeTrack(track),
-      info: track,
-      pluginInfo: {}
-    }
+    return { encoded: encodeTrack(track), info: track, pluginInfo: {} }
   }
 
   async getTrackUrl(track, itag, forceRefresh = false) {
@@ -240,47 +187,47 @@ export default class FlowerySource {
       if (cached) return cached
     }
 
-    let format = 'mp3'
+    const normalized = this._forceMp3Url(track.uri)
+
     try {
-      const urlObj = new URL(track.uri)
-      const audioFormat = urlObj.searchParams.get('audio_format')
-      if (audioFormat) {
-        if (audioFormat === 'wav') format = 'wav'
-        else if (audioFormat === 'flac') format = 'flac'
-        else if (audioFormat === 'ogg_opus') format = 'opus'
-        else if (audioFormat === 'mp3') format = 'mp3'
-      }
-    } catch (_e) {
+      this.nodelink.trackCacheManager.set('flowery', track.identifier, normalized)
+    } catch {
       // ignore
     }
 
-    return {
-      url: track.uri,
-      protocol: 'https',
-      format
+    return normalized
+  }
+
+  _forceMp3Url(uri) {
+    const out = { url: uri, protocol: 'https', format: 'mp3' }
+
+    try {
+      const urlObj = new URL(uri)
+      urlObj.searchParams.set('audio_format', 'mp3')
+      out.url = urlObj.toString()
+      return out
+    } catch {
+      return out
     }
   }
 
   async loadStream(decodedTrack, url, _protocol, _additionalData) {
-    logger(
-      'debug',
-      'Sources',
-      `Loading Flowery TTS stream for "${decodedTrack.title}"`
-    )
+    logger('debug', 'Sources', `Loading Flowery TTS stream for "${decodedTrack.title}"`)
+
+    const finalUrl = this._forceMp3Url(url).url
+
     try {
-      const response = await makeRequest(url, {
+      const response = await makeRequest(finalUrl, {
         method: 'GET',
         streamOnly: true,
         headers: {
-          'User-Agent': 'NodeLink/FloweryTTS'
+          'User-Agent': 'NodeLink/FloweryTTS',
+          Accept: '*/*'
         }
       })
 
       if (response.error || !response.stream) {
-        throw (
-          response.error ||
-          new Error('Failed to get stream, no stream object returned.')
-        )
+        throw (response.error || new Error('Failed to get stream, no stream object returned.'))
       }
 
       const stream = new PassThrough()
@@ -292,24 +239,14 @@ export default class FlowerySource {
 
       response.stream.on('error', (err) => {
         logger('error', 'Sources', `Flowery TTS stream error: ${err.message}`)
-        if (!stream.destroyed) {
-          stream.destroy(err)
-        }
+        if (!stream.destroyed) stream.destroy(err)
       })
 
       return { stream }
     } catch (err) {
-      logger(
-        'error',
-        'Sources',
-        `Failed to load Flowery TTS stream: ${err.message}`
-      )
+      logger('error', 'Sources', `Failed to load Flowery TTS stream: ${err.message}`)
       return {
-        exception: {
-          message: err.message,
-          severity: 'common',
-          cause: 'Upstream'
-        }
+        exception: { message: err.message, severity: 'common', cause: 'Upstream' }
       }
     }
   }