update,more task , more fix

Author: MS-crew

EXILED/Exiled.API/Features/Audio/AudioDataStorage.cs

@@ -47,7 +47,7 @@ static AudioDataStorage()
         /// <param name="name">The unique storage key to assign to this audio.</param>
         /// <param name="path">The absolute path to the local .wav file.</param>
         /// <returns><c>true</c> if the file was successfully loaded and stored; otherwise, <c>false</c>.</returns>
-        public static bool Add(string name, string path)
+        public static bool AddWav(string name, string path)
         {
             if (!ValidateName(name))
                 return false;
@@ -137,7 +137,7 @@ public static bool Add(string name, AudioData audioData)
         /// <param name="name">The unique storage key to assign.</param>
         /// <param name="url">The HTTP or HTTPS URL pointing to a valid .wav file.</param>
         /// <returns>A <see cref="CoroutineHandle"/> for the running download coroutine.</returns>
-        public static CoroutineHandle AddUrl(string name, string url) => Timing.RunCoroutine(AddUrlCoroutine(name, url));
+        public static CoroutineHandle AddWavUrl(string name, string url) => Timing.RunCoroutine(AddUrlCoroutine(name, url));
 
         /// <summary>
         /// Starts an asynchronous download of a .wav file from the specified URL and adds it to the storage.

EXILED/Exiled.API/Features/Audio/PcmSources/CachedPcmSource.cs

@@ -61,7 +61,7 @@ public CachedPcmSource(string name, string path)
 
             if (!AudioDataStorage.AudioStorage.ContainsKey(name))
             {
-                if (!AudioDataStorage.Add(name, path))
+                if (!AudioDataStorage.AddWav(name, path))
                 {
                     Log.Error($"[CachedPcmSource] Failed to load local file '{path}' into cache under the name '{name}'.");
                     throw new FileNotFoundException($"Failed to cache and load '{path}'.");

EXILED/Exiled.API/Features/Audio/PcmSources/MixerSource.cs

@@ -32,7 +32,7 @@ public sealed class MixerSource : IPcmSource
         /// Initializes a new instance of the <see cref="MixerSource"/> class with the specified initial sources.
         /// </summary>
         /// <param name="initialSources">An array of <see cref="IPcmSource"/> instances to mix.</param>
-        public MixerSource(params IPcmSource[] initialSources)
+        public MixerSource(IEnumerable<IPcmSource> initialSources)
         {
             if (initialSources != null)
                 sources.AddRange(initialSources.Where(s => s != null));

EXILED/Exiled.API/Features/Audio/PcmSources/PlayerVoiceSource.cs

@@ -8,7 +8,6 @@
 namespace Exiled.API.Features.Audio.PcmSources
 {
     using System.Buffers;
-    using System.Collections.Concurrent;
     using System.Collections.Generic;
 
     using Exiled.API.Features;

EXILED/Exiled.API/Features/Audio/PcmSources/PreloadedPcmSource.cs

@@ -8,6 +8,7 @@
 namespace Exiled.API.Features.Audio.PcmSources
 {
     using System;
+    using System.Threading.Tasks;
 
     using Exiled.API.Features.Audio;
     using Exiled.API.Interfaces.Audio;
@@ -18,20 +19,37 @@ namespace Exiled.API.Features.Audio.PcmSources
     /// <summary>
     /// Provides a <see cref="IPcmSource"/> preloaded with Pcm data or file.
     /// </summary>
-    public sealed class PreloadedPcmSource : IPcmSource
+    public sealed class PreloadedPcmSource : IPcmSource, IAsyncPcmSource
     {
-        private readonly float[] data;
+        private float[] data;
         private int pos;
 
+        private volatile bool isReady = false;
+        private volatile bool isFailed = false;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PreloadedPcmSource"/> class.
         /// </summary>
         /// <param name="path">The path to the audio file.</param>
         public PreloadedPcmSource(string path)
         {
-            AudioData result = WavUtility.WavToPcm(path);
-            data = result.Pcm;
-            TrackInfo = result.TrackInfo;
+            TrackInfo = new TrackData { Path = path, Duration = 0.0 };
+
+            Task.Run(() =>
+            {
+                try
+                {
+                    AudioData result = WavUtility.WavToPcm(path);
+                    data = result.Pcm;
+                    TrackInfo = result.TrackInfo;
+                    isReady = true;
+                }
+                catch (Exception ex)
+                {
+                    Log.Error($"[PreloadedPcmSource] Failed to load audio from path: {path} | Error: {ex.Message}");
+                    isFailed = true;
+                }
+            });
         }
 
         /// <summary>
@@ -41,33 +59,39 @@ public PreloadedPcmSource(string path)
         public PreloadedPcmSource(float[] pcmData)
         {
             data = pcmData;
+            isReady = true;
             TrackInfo = new TrackData { Duration = TotalDuration };
         }
 
         /// <summary>
         /// Gets the metadata of the loaded track.
         /// </summary>
-        public TrackData TrackInfo { get; }
+        public TrackData TrackInfo { get; private set; }
 
         /// <summary>
         /// Gets a value indicating whether the end of the PCM data buffer has been reached.
         /// </summary>
-        public bool Ended => pos >= data.Length;
+        public bool Ended => isFailed || (isReady && pos >= data.Length);
 
         /// <summary>
         /// Gets the total duration of the audio in seconds.
         /// </summary>
-        public double TotalDuration => (double)data.Length / VoiceChatSettings.SampleRate;
+        public double TotalDuration => isReady && data != null ? (double)data.Length / VoiceChatSettings.SampleRate : 0.0;
 
         /// <summary>
         /// Gets or sets the current playback position in seconds.
         /// </summary>
         public double CurrentTime
         {
-            get => (double)pos / VoiceChatSettings.SampleRate;
+            get => isReady ? (double)pos / VoiceChatSettings.SampleRate : 0.0;
             set => Seek(value);
         }
 
+        /// <summary>
+        /// Gets a value indicating whether the source failed to load.
+        /// </summary>
+        public bool IsFailed => isFailed;
+
         /// <summary>
         /// Reads a sequence of PCM samples from the preloaded buffer into the specified array.
         /// </summary>
@@ -77,6 +101,15 @@ public double CurrentTime
         /// <returns>The number of samples read into <paramref name="buffer"/>.</returns>
         public int Read(float[] buffer, int offset, int count)
         {
+            if (isFailed)
+                return 0;
+
+            if (!isReady || data == null)
+            {
+                Array.Clear(buffer, offset, count);
+                return count;
+            }
+
             int read = Math.Min(count, data.Length - pos);
             Array.Copy(data, pos, buffer, offset, read);
             pos += read;
@@ -90,6 +123,9 @@ public int Read(float[] buffer, int offset, int count)
         /// <param name="seconds">The target position in seconds.</param>
         public void Seek(double seconds)
         {
+            if (!isReady || data == null)
+                return;
+
             long targetIndex = (long)(seconds * VoiceChatSettings.SampleRate);
             pos = (int)Math.Max(0, Math.Min(targetIndex, data.Length));
         }

EXILED/Exiled.API/Features/Audio/PcmSources/VoiceRssTtsSource.cs

@@ -10,6 +10,7 @@ namespace Exiled.API.Features.Audio.PcmSources
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using System.Threading.Tasks;
 
     using Exiled.API.Features;
     using Exiled.API.Interfaces.Audio;
@@ -22,17 +23,19 @@ namespace Exiled.API.Features.Audio.PcmSources
     /// <summary>
     /// Provides a <see cref="IPcmSource"/> that converts text to speech using the <see href="https://www.voicerss.org/">VoiceRSS</see> Text-to-Speech API.
     /// </summary>
-    public sealed class VoiceRssTtsSource : IPcmSource
+    public sealed class VoiceRssTtsSource : IPcmSource, IAsyncPcmSource
     {
         private const string ApiEndpoint = "https://api.voicerss.org/";
         private const string AudioFormat = "48khz_16bit_mono";
 
+        private static readonly Dictionary<string, DateTime> BlacklistKeys = new();
+
         private IPcmSource internalSource;
         private UnityWebRequest webRequest;
         private CoroutineHandle downloadRoutine;
 
-        private bool isReady = false;
-        private bool isFailed = false;
+        private volatile bool isReady = false;
+        private volatile bool isFailed = false;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="VoiceRssTtsSource"/> class.
@@ -99,6 +102,11 @@ public double CurrentTime
         /// </summary>
         public bool Ended => isFailed || (isReady && internalSource != null && internalSource.Ended);
 
+        /// <summary>
+        /// Gets a value indicating whether the source failed to load.
+        /// </summary>
+        public bool IsFailed => isFailed;
+
         /// <summary>
         /// Reads PCM data from the audio source into the specified buffer.
         /// </summary>
@@ -154,8 +162,6 @@ public void Dispose()
 
         private IEnumerator<float> DownloadRoutine(string text, IEnumerable<string> apiKeys, string language, string voice, int rate)
         {
-            webRequest = null;
-
             string clampedRate = Math.Clamp(rate, -10, 10).ToString();
             string textEscaped = Uri.EscapeDataString(text);
             string langEscaped = Uri.EscapeDataString(language);
@@ -168,10 +174,26 @@ private IEnumerator<float> DownloadRoutine(string text, IEnumerable<string> apiK
                 if (string.IsNullOrWhiteSpace(apiKey))
                     continue;
 
+                if (BlacklistKeys.TryGetValue(apiKey, out DateTime exhaustedAt))
+                {
+                    if (DateTime.UtcNow.Day == exhaustedAt.Day)
+                        continue;
+
+                    BlacklistKeys.Remove(apiKey);
+                }
+
                 string url = $"{ApiEndpoint}?key={Uri.EscapeDataString(apiKey)}&hl={langEscaped}&c=WAV&f={AudioFormat}&r={clampedRate}&src={textEscaped}{voiceEscaped}";
 
                 webRequest?.Dispose();
-                webRequest = UnityWebRequest.Get(url);
+                try
+                {
+                    webRequest = UnityWebRequest.Get(url);
+                }
+                catch (Exception ex)
+                {
+                    Log.Error($"[VoiceRssTtsSource] Failed to get Url '{url}. Error: {ex.Message}");
+                    break;
+                }
 
                 yield return Timing.WaitUntilDone(webRequest.SendWebRequest());
 
@@ -189,6 +211,7 @@ private IEnumerator<float> DownloadRoutine(string text, IEnumerable<string> apiK
                     if (errorMessage.Contains("limit") || errorMessage.Contains("expired") || errorMessage.Contains("inactive") || errorMessage.Contains("API key"))
                     {
                         Log.Warn($"[VoiceRssTtsSource] Key issue, key: '{apiKey}', Error : {errorMessage}. Switching to another key...");
+                        BlacklistKeys[apiKey] = DateTime.UtcNow;
                         continue;
                     }
                     else
@@ -205,29 +228,40 @@ private IEnumerator<float> DownloadRoutine(string text, IEnumerable<string> apiK
             if (!successfulDownload)
             {
                 isFailed = true;
+                webRequest?.Dispose();
+                webRequest = null;
                 yield break;
             }
 
-            try
+            byte[] rawBytes = webRequest.downloadHandler.data;
+            webRequest.Dispose();
+            webRequest = null;
+
+            Task<AudioData> toPcmTask = Task.Run(() => WavUtility.WavToPcm(rawBytes));
+
+            yield return Timing.WaitUntilTrue(() => toPcmTask.IsCompleted);
+
+            if (toPcmTask.IsFaulted)
             {
-                byte[] rawBytes = webRequest.downloadHandler.data;
-                AudioData audioData = WavUtility.WavToPcm(rawBytes);
-                audioData.TrackInfo.Path = $"VoiceRSS: {text}";
+                Log.Error($"[VoiceRssTtsSource] Error read the downloaded file! \nError: {toPcmTask.Exception?.InnerException?.Message ?? toPcmTask.Exception?.Message}");
+                isFailed = true;
+                yield break;
+            }
+
+            AudioData audioData = toPcmTask.Result;
+            audioData.TrackInfo.Path = $"VoiceRSS: {text}";
 
+            try
+            {
                 internalSource = new PreloadedPcmSource(audioData.Pcm);
                 TrackInfo = audioData.TrackInfo;
                 isReady = true;
             }
-            catch (Exception e)
+            catch (Exception ex)
             {
-                Log.Error($"[VoiceRssTtsSource] Parsing Error! \nDetails: {e.Message}");
+                Log.Error($"[VoiceRssTtsSource] Failed to create internal source! \nError: {ex.InnerException?.Message ?? ex.Message}");
                 isFailed = true;
             }
-            finally
-            {
-                webRequest?.Dispose();
-                webRequest = null;
-            }
         }
     }
 }