Zizibob/Relaunch-Process
1
0
Fork 0
mirror of https://github.com/SlothDpal/Relaunch-Process.git synced 2026-02-22 17:27:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

discord queue upgrade

Browse Source
This commit is contained in:
slothdpal
2025-09-23 00:57:17 +03:00
parent 71f6d7830d
commit f458a2d5e5
3 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Discord/DiscordWebHook.cs
View File

@@ -13,12 +13,17 @@ namespace Discord.Webhook
{ {
public string Url { get; set; } public string Url { get; set; }
private UInt64 queueNum = 0; private UInt64 totalMessages = 0;
private readonly ConcurrentQueue<(UInt64 num, DiscordMessage message, FileInfo[] files)> _queue = new ConcurrentQueue<(UInt64 num, DiscordMessage, FileInfo[])>(); private readonly ConcurrentQueue<(UInt64 num, DiscordMessage message, FileInfo[] files)> _queue = new ConcurrentQueue<(UInt64 num, DiscordMessage, FileInfo[])>();
private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1); private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
private bool _isProcessing; private bool _isProcessing;
private CancellationTokenSource _cts = new CancellationTokenSource();
public async Task SendAsync(DiscordMessage message, params FileInfo[] files) public UInt64 GetTotalMessages() => totalMessages;
public int GetQueueSize() => _queue.Count;
public void CancelProcessing() => _cts.Cancel();
public async Task<bool> SendAsync(DiscordMessage message, params FileInfo[] files)
{ {
if (string.IsNullOrEmpty(Url)) if (string.IsNullOrEmpty(Url))
throw new ArgumentNullException("Invalid Webhook URL."); throw new ArgumentNullException("Invalid Webhook URL.");
@@ -54,46 +59,70 @@ namespace Discord.Webhook
try try
{ {
var response = await client.PostAsync(Url, content); var response = await client.PostAsync(Url, content, _cts.Token);
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
} }
catch (HttpRequestException ex) catch (HttpRequestException ex)
{ {
Debug.WriteLine($"Discord webhook request failed: {ex.Message}"); Debug.WriteLine($"Discord webhook request failed: {ex.Message}");
return false;
}
catch (TaskCanceledException ex)
{
Debug.WriteLine($"Discord webhook request cancelled: {ex.Message}");
return false;
} }
} }
return true;
} }
private async Task ProcessQueueAsync() private async Task ProcessQueueAsync()
{ {
while (_queue.TryDequeue(out var item)) while (_queue.TryPeek(out var item))
{ {
if (_cts.Token.IsCancellationRequested)
{
Debug.WriteLine("Discord queue processing cancelled.");
break;
}
await _semaphore.WaitAsync(); await _semaphore.WaitAsync();
try try
{ {
Debug.WriteLine($"Processing message {item.num}. Queue size: {_queue.Count}"); Debug.WriteLine($"Processing message {item.num}. Queue size: {_queue.Count}");
await SendAsync(item.message, item.files); if (await SendAsync(item.message, item.files))
Debug.WriteLine($"Message {item.num} sent."); {
_queue.TryDequeue(out var deqItem);
}
} }
finally finally
{ {
_semaphore.Release(); _semaphore.Release();
} }
Task.Delay(500).Wait(); try
{
await Task.Delay(1000, _cts.Token); // Discord rate limit: 1 message per second
}
catch (TaskCanceledException)
{
Debug.WriteLine($"Discord queue processing cancelled during delay. Was {_queue.Count} messages in queue. {totalMessages} messages in session. ");
break;
}
} }
_isProcessing = false; _isProcessing = false;
} }
public void Send(DiscordMessage message, params FileInfo[] files) public void Send(DiscordMessage message, params FileInfo[] files)
{ {
_queue.Enqueue((queueNum++, message, files)); _queue.Enqueue((totalMessages++, message, files));
Debug.WriteLine($"Message {queueNum-1} added. Queue size: {_queue.Count}"); Debug.WriteLine($"Message {totalMessages-1} added. Queue size: {_queue.Count}");
if (_isProcessing) if (_isProcessing)
{ {
Debug.WriteLine("Already processing queue."); Debug.WriteLine("Already processing queue.");
return; return;
} }
Debug.WriteLine("Run ProcessQueueAsync"); Debug.WriteLine("Run ProcessQueueAsync");
_cts.Dispose();
_cts = new CancellationTokenSource();
_isProcessing = true; _isProcessing = true;
Task.Run(ProcessQueueAsync); Task.Run(ProcessQueueAsync);
} }

1
Form1.cs
View File

@@ -267,6 +267,7 @@ namespace Process_Auto_Relaunch
/// <param name="e"></param> /// <param name="e"></param>
private void Form1_FormClosing(object sender, FormClosingEventArgs e) private void Form1_FormClosing(object sender, FormClosingEventArgs e)
{ {
dwhHook.CancelProcessing();
Settings.Default.Save(); Settings.Default.Save();
Status("Наблюдение отменено - приложение закрыто.", NotifyLevel.logAlways); Status("Наблюдение отменено - приложение закрыто.", NotifyLevel.logAlways);
} }

6
Properties/AssemblyInfo.cs
View File

@@ -29,7 +29,7 @@ using System.Runtime.InteropServices;
// Номер сборки // Номер сборки
// Редакция // Редакция
// //
[assembly: AssemblyVersion("1.6.0.21")] [assembly: AssemblyVersion("1.6.0.32")]
[assembly: AssemblyFileVersion("1.6.0.21")] [assembly: AssemblyFileVersion("1.6.0.32")]
[assembly: AssemblyInformationalVersion("1.6.0.21")] [assembly: AssemblyInformationalVersion("1.6.0.32")]