-
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/chatbox-improvements' into develop
- Loading branch information
Showing
11 changed files
with
335 additions
and
180 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| using System.Threading.Channels; | ||
| using OpenShock.SDK.CSharp.Models; | ||
| using OpenShock.ShockOsc.Config; | ||
| using OpenShock.ShockOsc.Utils; | ||
| using SmartFormat; | ||
| using Timer = System.Timers.Timer; | ||
|
|
||
| namespace OpenShock.ShockOsc.Services; | ||
|
|
||
| /// <summary> | ||
| /// Handle chatbox interactions and behaviour | ||
| /// </summary> | ||
| public sealed class ChatboxService : IAsyncDisposable | ||
| { | ||
| private readonly ConfigManager _configManager; | ||
| private readonly OscClient _oscClient; | ||
| private readonly ILogger<ChatboxService> _logger; | ||
| private readonly System.Threading.Timer _clearTimer; | ||
|
|
||
| private readonly CancellationTokenSource _cts = new(); | ||
|
|
||
| private readonly Channel<Message> _messageChannel = Channel.CreateBounded<Message>(new BoundedChannelOptions(4) | ||
| { | ||
| SingleReader = true, | ||
| FullMode = BoundedChannelFullMode.DropOldest | ||
| }); | ||
|
|
||
| public ChatboxService(ConfigManager configManager, OscClient oscClient, ILogger<ChatboxService> logger) | ||
| { | ||
| _configManager = configManager; | ||
| _oscClient = oscClient; | ||
| _logger = logger; | ||
|
|
||
| _clearTimer = new System.Threading.Timer(ClearChatbox); | ||
|
|
||
| OsTask.Run(MessageLoop); | ||
| } | ||
|
|
||
| private async void ClearChatbox(object? state) | ||
| { | ||
| try | ||
| { | ||
| await _oscClient.SendChatboxMessage(string.Empty); | ||
| _logger.LogTrace("Cleared chatbox"); | ||
| } | ||
| catch (Exception e) | ||
| { | ||
| _logger.LogError(e, "Failed to send clear chatbox"); | ||
| } | ||
| } | ||
|
|
||
| public async ValueTask SendLocalControlMessage(string name, byte intensity, uint duration, ControlType type) | ||
| { | ||
| if (!_configManager.Config.Chatbox.Enabled) return; | ||
|
|
||
| if (!_configManager.Config.Chatbox.Types.TryGetValue(type, out var template)) | ||
| { | ||
| _logger.LogError("No message template found for control type {ControlType}", type); | ||
| return; | ||
| } | ||
|
|
||
| if (!template.Enabled) return; | ||
|
|
||
| // Chatbox message local | ||
| var dat = new | ||
| { | ||
| GroupName = name, | ||
| ShockerName = name, | ||
| Intensity = intensity, | ||
| Duration = duration, | ||
| DurationSeconds = duration.DurationInSecondsString() | ||
| }; | ||
|
|
||
| var msg = $"{_configManager.Config.Chatbox.Prefix}{Smart.Format(template.Local, dat)}"; | ||
|
|
||
| await _messageChannel.Writer.WriteAsync(new Message(msg, _configManager.Config.Chatbox.TimeoutTimeSpan)); | ||
| } | ||
|
|
||
| public async ValueTask SendRemoteControlMessage(string shockerName, string senderName, string? customName, | ||
| byte intensity, uint duration, ControlType type) | ||
| { | ||
| if (!_configManager.Config.Chatbox.Enabled || !_configManager.Config.Chatbox.DisplayRemoteControl) return; | ||
|
|
||
| if (!_configManager.Config.Chatbox.Types.TryGetValue(type, out var template)) | ||
| { | ||
| _logger.LogError("No message template found for control type {ControlType}", type); | ||
| return; | ||
| } | ||
|
|
||
| if (!template.Enabled) return; | ||
|
|
||
| // Chatbox message remote | ||
| var dat = new | ||
| { | ||
| ShockerName = shockerName, | ||
| Intensity = intensity, | ||
| Duration = duration, | ||
| DurationSeconds = duration.DurationInSecondsString(), | ||
| Name = senderName, | ||
| CustomName = customName | ||
| }; | ||
|
|
||
| var templateToUse = customName == null ? template.Remote : template.RemoteWithCustomName; | ||
|
|
||
| var msg = $"{_configManager.Config.Chatbox.Prefix}{Smart.Format(templateToUse, dat)}"; | ||
|
|
||
| await _messageChannel.Writer.WriteAsync(new Message(msg, _configManager.Config.Chatbox.TimeoutTimeSpan)); | ||
| } | ||
|
|
||
| private async Task MessageLoop() | ||
| { | ||
| await foreach (var message in _messageChannel.Reader.ReadAllAsync()) | ||
| { | ||
| await _oscClient.SendChatboxMessage(message.Text); | ||
|
|
||
| if(_configManager.Config.Osc.Hoscy) continue; | ||
| // We dont need to worry about timeouts if we're using hoscy | ||
| if(_configManager.Config.Chatbox.TimeoutEnabled) _clearTimer.Change(message.Timeout, Timeout.InfiniteTimeSpan); | ||
| await Task.Delay(1250); // VRChat chatbox rate limit | ||
| } | ||
| } | ||
|
|
||
| private bool _disposed; | ||
|
|
||
| public async ValueTask DisposeAsync() | ||
| { | ||
| if (_disposed) return; | ||
| _disposed = true; | ||
|
|
||
| await _clearTimer.DisposeAsync(); | ||
|
|
||
| await _cts.CancelAsync(); | ||
| _cts.Dispose(); | ||
|
|
||
| GC.SuppressFinalize(this); | ||
| } | ||
|
|
||
| ~ChatboxService() | ||
| { | ||
| if (_disposed) return; | ||
| DisposeAsync().AsTask().Wait(); | ||
| } | ||
| } | ||
|
|
||
| public record Message(string Text, TimeSpan Timeout); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.