wip

Elementary/Audio/AudioConverter.cs

@@ -6,7 +6,7 @@ using NAudio.Wave;
 
 namespace Elementary.Audio;
 
-public class AudioConverter
+public class AudioConverter : IAudioConverter
 {
     public readonly WaveFormat WaveFormat = new(48000, 16, 2);
 

Elementary/Audio/AudioManager.cs

@@ -62,7 +62,13 @@ public class AudioManager
             isConnected = false;
             await JoinChannel(channel);
         };
-
+        
+        _audioClient.StreamCreated += async (id, stream) =>
+        {
+            _logger.Log(LogLevel.Info, $"Stream created {id}");
+            await Task.Delay(-1);
+        };
+        
         _audioStream = _audioClient.CreatePCMStream(AudioApplication.Music, 128 * 1024);
 
         _playbackQueue = _services.GetRequiredService<PlaybackQueue>();
@@ -126,7 +132,7 @@ public class AudioManager
         
         text = text.Replace("～", "ー");
 
-        float volume = 0.12f;
+        float volume = 0.1f;
 
         Stream? stream = await _sozaiAPI.GetAudioStream(text);
         if (stream == null)

Elementary/Audio/AudioMixer.cs

@@ -1,80 +1,72 @@
-// using ManagedBass;
+using CSCore;
-// using ManagedBass.Mix;
+using CSCore.Codecs.WAV;
-//
+using System.Collections.Generic;
-// namespace Elementary.Audio;
+using System.IO;
-//
+using WaveFormat = CSCore.WaveFormat;
-// public class AudioMixer
+
-// {
+public class StreamMixer
-//     private readonly int _mixerStream;
+{
-//     private MemoryStream?[] _inputStreams;
+    private List<IWaveSource> sources = new List<IWaveSource>();
-//     private Stream _outStream;
+    private WaveWriter writer;
-//     private object _lock = new();
+
-//
+    public void AddInputStream(Stream inputStream)
-//     public AudioMixer(Stream outStream)
+    {
-//     {
+        var waveSource = new WaveStream(inputStream, new WaveFormat(48000, 16, 2));
-//         _outStream = outStream;
+        lock (sources)
-//         Bass.Init(-1, 44100, DeviceInitFlags.NoSpeakerAssignment, IntPtr.Zero);
+        {
-//         _mixerStream = BassMix.CreateMixerStream(44100, 2, BassFlags.Float | BassFlags.MixerNonStop);
+            sources.Add(waveSource);
-//         _inputStreams = new MemoryStream[10];
+        }
-//
+    }
-//         Bass.ChannelPlay(_mixerStream);
+
-//     }
+    public void WriteMixedToOutputStream(Stream outputStream)
-//
+    {
-//     /// <summary>
+        WaveFormat format = new WaveFormat(48000, 16, 2);
-//     /// Add a stream to the mixer.
+        writer = new WaveWriter(outputStream, format);
-//     /// wait for the stream to finish playing 
+
-//     /// </summary>
+        byte[] buffer = new byte[format.BytesPerSecond / 2];
-//     /// <param name="stream"></param>
+
-//     /// <param name="volume"></param>
+        while (sources.Count > 0)
-//     public void AddStream(Stream stream, float volume = 1.0f)
+        {
-//     {
+            int read = 0;
-//         Console.WriteLine("Adding stream to mixer");
+            lock (sources)
-//         byte[] pcmBytes;
+            {
-//         using (MemoryStream ms = new())
+                foreach (var source in sources)
-//         {
+                {
-//             stream.CopyTo(ms);
+                    int bytes = source.Read(buffer, 0, buffer.Length);
-//             pcmBytes = ms.ToArray();
+                    if (bytes == 0)
-//         }
+                    {
-//
+                        source.Dispose();
-//         lock (_lock)
+                        sources.Remove(source);
-//         {
+                    }
-//             for (var i = 0; i < _inputStreams.Length; i++)
+                    else
-//             {
+                    {
-//                 if (_inputStreams[i] == null)
+                        read = bytes;
-//                 {
+                    }
-//                     _inputStreams[i] = new MemoryStream(pcmBytes);
+                }
-//                     break;
+            }
-//                 }
+
-//             }
+            if (read > 0)
-//         }
+            {
-//         
+                writer.Write(buffer, 0, read);
-//         var channel = Bass.CreateStream(pcmBytes, 0, pcmBytes.Length, BassFlags.Float);
+            }
-//         Bass.ChannelSetAttribute(channel, ChannelAttribute.Volume, volume);
+        }
-//         BassMix.MixerAddChannel(_mixerStream, channel, BassFlags.Default);
+
-//         
+        writer.Dispose();
-//         int length = Bass.ChannelGetData(_mixerStream, new byte[4096], 4096);
+    }
-//         byte[] buffer = new byte[length];
+
-//         length = Bass.ChannelGetData(_mixerStream, buffer, length);
+    public void Stop()
-//         _outStream.Write(buffer, 0, length);
+    {
-//     }
+        writer?.Dispose();
-//
+        writer = null;
-//     public void Stop()
+
-//     {
+        lock (sources)
-//         Bass.ChannelStop(_mixerStream);
+        {
-//     }
+            foreach (var source in sources)
-//
+            {
-//     public void Dispose()
+                source.Dispose();
-//     {
+            }
-//         lock (_lock)
+
-//         {
+            sources.Clear();
-//             foreach (var stream in _inputStreams)
+        }
-//             {
+    }
-//                 stream?.Dispose();
+}
-//             }
-//         }
-//         
-//         _outStream.Flush();
-//         Bass.StreamFree(_mixerStream);
-//         Bass.Free();
-//     }
-// }

Elementary/Audio/IAudioConverter.cs

@@ -1,10 +1,13 @@
 using System.Diagnostics;
+using NAudio.Wave;
 
 namespace Elementary.Audio;
 
 public interface IAudioConverter
 {
-    public Process CreateStreamFromFilePath(string path);
+    WaveFormatConversionStream CreateStreamFromFilePath(string path, float volume = 1.0f);
 
-    public Process CreateStreamFromStream(Stream stream);
+    WaveFormatConversionStream CreateStreamFromStream(Stream stream);
+    
+    WaveFormatConversionStream CreateStreamFromStream(Stream stream, float volume = 1.0f);
 }

Elementary/Audio/IAudioManager.cs

@@ -0,0 +1,6 @@
+namespace Elementary.Audio;
+
+public interface IAudioManager
+{
+    
+}

Elementary/Audio/IPlaybackQueue.cs

@@ -0,0 +1,8 @@
+namespace Elementary.Audio;
+
+public interface IPlaybackQueue
+{
+    Task Enqueue(PlaybackJob job);
+    
+    void Flush();
+}

Elementary/Audio/ITtsAPI.cs

@@ -0,0 +1,6 @@
+namespace Elementary.Audio;
+
+public interface ITtsAPI
+{
+    Task<Stream?> GetAudioStream(string text);
+}

Elementary/Audio/MessageHandler.cs

@@ -1,30 +0,0 @@
-using Discord.Audio;
-using Discord.WebSocket;
-
-namespace Elementary.Audio;
-
-public class MessageHandler
-{
-    // private IAudioClient _audioClient;
-    private PlaybackQueue _playbackQueue;
-
-    public MessageHandler(PlaybackQueue playbackQueue)
-    {
-        _playbackQueue = playbackQueue;
-    }
-
-
-    public async Task HandleMessage(SocketMessage message)
-    {
-        List<String> lines = message.Content.Split("\n").ToList();
-
-        foreach (var line in lines)
-        {
-            await _playbackQueue.Enqueue(new PlaybackJob()
-            {
-                Type = JobType.Text,
-                Text = line
-            });
-        }
-    }
-}

Elementary/Audio/PlaybackQueue.cs

@@ -2,6 +2,7 @@
 using Discord.Audio;
 using NAudio.Wave;
 using NLog;
+using Exception = System.Exception;
 
 namespace Elementary.Audio;
 
@@ -19,7 +20,7 @@ public class PlaybackJob
     public float Volume = 1.0f;
 }
 
-public class PlaybackQueue
+public class PlaybackQueue : IPlaybackQueue
 {
     // any type of job ConcurrentQueue
 
@@ -73,26 +74,35 @@ public class PlaybackQueue
 
     private async void PlayNext()
     {
-        if (_queue.TryDequeue(out var currentStream))
+        try
         {
-            _logger.Info("Start Playing");
+            if (_queue.TryDequeue(out var currentStream))
-
-            _isPlaying = true;
-            await (currentStream.Type switch
             {
-                JobType.Audio => _audioManager.PlayAudio(currentStream.Text),
+                _logger.Info("Start Playing");
-                JobType.Text => _audioManager.PlayText(currentStream.Text),
+
-                _ => throw new ArgumentOutOfRangeException()
+                _isPlaying = true;
-            });
+                await (currentStream.Type switch
-            _logger.Info("Finished Playing");
+                {
-            await Task.Delay(200);
+                    JobType.Audio => _audioManager.PlayAudio(currentStream.Text),
+                    JobType.Text => _audioManager.PlayText(currentStream.Text),
+                    _ => throw new ArgumentOutOfRangeException()
+                });
+                _logger.Info("Finished Playing");
+                await Task.Delay(200);
+                _isPlaying = false;
+                PlayNext();
+            }
+            else if (_queue.IsEmpty)
+            {
+                _logger.Info("Queue is empty");
+                _isPlaying = false;
+            }
+        }
+        catch (Exception e)
+        {
+            _logger.Error(e);
             _isPlaying = false;
             PlayNext();
         }
-        else if (_queue.IsEmpty)
-        {
-            _logger.Info("Queue is empty");
-            _isPlaying = false;
-        }
     }
 }

Elementary/Audio/SozaiAPI.cs

@@ -4,7 +4,7 @@ using NLog;
 
 namespace Elementary.Audio;
 
-public class SozaiAPI
+public class SozaiAPI : ITtsAPI
 {
     private ILogger _logger;
     
@@ -30,13 +30,13 @@ public class SozaiAPI
 
     public SozaiAPI()
     {
-        _client = new HttpClient();
         _logger = LogManager.GetCurrentClassLogger();
         _cache = new MemoryCache(new MemoryCacheOptions());
     }
 
     public async Task Setup(string url)
     {
+        _client = new HttpClient();
         var response = await _client.GetAsync(url);
         var stream = await response.Content.ReadAsStreamAsync();
         Assets = await JsonSerializer.DeserializeAsync<Asset[]>(stream);

Elementary/Audio/VoicevoxAPI.cs

@@ -12,14 +12,18 @@ public class VoicevoxAPI
     private ILogger _logger;
     private MemoryCache _cache;
 
+    public VoicevoxAPI()
+    {
+        _logger = LogManager.GetCurrentClassLogger();
+        _cache = new MemoryCache(new MemoryCacheOptions());
+    }
+
     public async Task Setup(string url)
     {
+        _client = new HttpClient();
         Uri _url = new(url);
 
         _APIRootUrl = new UriBuilder($"{_url.Scheme}://{_url.Host}:{_url.Port}");
-        _client = new HttpClient();
-        _logger = LogManager.GetCurrentClassLogger();
-        _cache = new MemoryCache(new MemoryCacheOptions());
     }
 
     /// <summary>
@@ -31,7 +35,7 @@ public class VoicevoxAPI
     public async Task<Stream?> Speak(string text, string speaker = "47")
     {
         _logger.Info($"Requested TTS {text}");
-        
+
         if (_cache.TryGetValue(text, out Stream? stream))
         {
             _logger.Info($"Cache hit {text}");
@@ -52,9 +56,9 @@ public class VoicevoxAPI
         builder.Path = "/audio_query";
         builder.Query = $"text={text}&speaker={speaker}";
 
-        var response = await _client.PostAsync(builder.Uri, new StringContent(string.Empty));
+            var response = await _client.PostAsync(builder.Uri, new StringContent(string.Empty));
-        var stream = await response.Content.ReadAsStreamAsync();
+            var stream = await response.Content.ReadAsStreamAsync();
-        return await new StreamReader(stream).ReadToEndAsync();
+            return await new StreamReader(stream).ReadToEndAsync();
     }
 
     internal async Task<Stream?> GetAudioStream(string query, string speaker = "1")

Elementary/Commands/MessageCommands.cs

@@ -1,4 +1,6 @@
-using Discord;
+using System.Diagnostics;
+using System.Reflection;
+using Discord;
 using Discord.Commands;
 using Elementary.Audio;
 using Elementary.Dictionary;
@@ -119,4 +121,28 @@ public class MessageCommands : ModuleBase<SocketCommandContext>
     {
         await _audioManager.PlayYoutube(url);
     }
+    
+    [Command("memory", RunMode = RunMode.Async)]
+    [Summary("Show memory usage.")]
+    public async Task MemoryAsync()
+    {
+        var memory = Environment.WorkingSet;
+        await ReplyAsync($"Memory: {memory / 1024 / 1024} MB");
+    }
+    
+    [Command("restart", RunMode = RunMode.Async)]
+    [Summary("Restart the bot.")]
+    public async Task RestartAsync()
+    {
+        await ReplyAsync("Restarting...");
+        await LeaveAsync();
+        var assembly = Assembly.GetEntryAssembly();
+        var path = assembly.Location;
+        path = path.Replace(".dll", ".exe");
+        Console.WriteLine(path);
+        Process.Start(path);
+        
+        Environment.Exit(0);
+        
+    }
 }

Elementary/Elementary.csproj

@@ -14,9 +14,13 @@
         <Content Include="..\.dockerignore">
             <Link>.dockerignore</Link>
         </Content>
+        <Content Include="emoji-ja\data\emoji_ja.json">
+          <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </Content>
     </ItemGroup>
 
     <ItemGroup>
+        <PackageReference Include="CSCore" Version="1.2.1.2" />
         <PackageReference Include="Discord.Net" Version="3.11.0"/>
         <PackageReference Include="Discord.Net.Core" Version="3.11.0"/>
         <PackageReference Include="LiteDB" Version="5.0.17" />
@@ -57,4 +61,10 @@
     </ItemGroup>
 
 
+    <ItemGroup>
+      <Compile Remove="Audio\AudioMixer.cs" />
+    </ItemGroup>
+
+
+
 </Project>

Elementary/Message/Handler.cs

@@ -1,11 +1,10 @@
 using System.Reflection;
-using Discord.Audio;
 using Discord.Commands;
 using Discord.WebSocket;
 using Elementary.Audio;
 using NLog;
 
-namespace Elementary.Commands;
+namespace Elementary.Message;
 
 public class Handler
 {

Elementary/Message/MessageHandler.cs

@@ -0,0 +1,52 @@
+using Discord.WebSocket;
+using Elementary.Audio;
+
+namespace Elementary.Message;
+
+public class MessageHandler
+{
+    // private IAudioClient _audioClient;
+    private PlaybackQueue _playbackQueue;
+
+    public MessageHandler(PlaybackQueue playbackQueue)
+    {
+        _playbackQueue = playbackQueue;
+    }
+
+
+    public async Task HandleMessage(SocketMessage message)
+    {
+        // if contains mention, add mentioned user name to lines and replace <id>
+        List<String> lines = new();
+
+        if (message.MentionedUsers.Count > 0)
+        {
+            foreach (var mentionedUser in message.MentionedUsers)
+            {
+                message.Content.Replace(mentionedUser.Mention, $"@{mentionedUser.GlobalName}").Split('\n').ToList()
+                    .ForEach(lines.Add);
+            }
+        }
+        else
+        {
+            if (message.Content.Contains("```"))
+            {
+                lines = new List<string> {"コードブロック"};
+            }
+            else
+            {
+                message.Content.Split('\n').ToList().ForEach(lines.Add);
+            }
+        }
+
+
+        foreach (var line in lines)
+        {
+            await _playbackQueue.Enqueue(new PlaybackJob()
+            {
+                Type = JobType.Text,
+                Text = line
+            });
+        }
+    }
+}

Elementary/Program.cs

@@ -7,6 +7,7 @@ using Discord.WebSocket;
 using Elementary.Audio;
 using Elementary.Commands;
 using Elementary.Dictionary;
+using Elementary.Message;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NAudio.Wave;
@@ -32,14 +33,13 @@ public class Program
     private Mecab _mecab;
     private Ytdlp _ytdlp;
 
-    public static async Task Main(string[] args)
+    public static void Main(string[] args)
     {
         while (true)
         {
             try
             {
-                await new Program().Setup();
+                new Program().Setup().Wait();
-                await Task.Delay(-1);
             }
             catch (Exception e)
             {
@@ -55,7 +55,6 @@ public class Program
         {
             GatewayIntents = GatewayIntents.AllUnprivileged | GatewayIntents.MessageContent
         });
-        _commands = new CommandService();
         _services = new ServiceCollection()
             .AddLogging(builder =>
             {
@@ -64,21 +63,23 @@ public class Program
                 builder.AddNLog(configuration.ConfigurationRoot);
             })
             .AddSingleton(_client)
-            .AddSingleton(_commands)
+            .AddScoped<CommandService>()
-            .AddSingleton<Handler>()
+            .AddTransient<Handler>()
-            .AddSingleton<AudioManager>()
+            .AddScoped<AudioManager>()
-            .AddSingleton<VoicevoxAPI>()
+            .AddScoped<PlaybackQueue>()
-            .AddSingleton<SozaiAPI>()
+            .AddScoped<VoicevoxAPI>()
-            .AddSingleton<PlaybackQueue>()
+            .AddScoped<SozaiAPI>()
             .AddTransient<AudioConverter>()
-            .AddSingleton<MessageHandler>()
+            .AddScoped<MessageHandler>()
             .AddSingleton<EmojiDictionary>()
             .AddSingleton<DictionaryDB>()
-            .AddSingleton<Mecab>()
+            .AddScoped<Mecab>()
-            .AddSingleton<Ytdlp>()
+            .AddScoped<Ytdlp>()
             .BuildServiceProvider();
 
         _logger = LogManager.GetCurrentClassLogger();
+        
+        _commands = _services.GetRequiredService<CommandService>();
 
         _sozaiAPI = _services.GetRequiredService<SozaiAPI>();
         _voicevoxAPI = _services.GetRequiredService<VoicevoxAPI>();