tom/hermes-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some of the compiler warnings.

Browse Source
This commit is contained in:
Tom
2024-12-28 21:19:28 +00:00
parent db1d57c218
commit 4f5dd8f24e
20 changed files with 93 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OBS/Socket/Handlers/EventMessageHandler.cs
View File

@ -17,19 +17,17 @@ namespace TwitchChatTTS.OBS.Socket.Handlers
_logger = logger;
}
public async Task Execute<Data>(SocketClient<WebSocketMessage> sender, Data data)
public Task Execute<Data>(SocketClient<WebSocketMessage> sender, Data data)
{
if (data is not EventMessage message || message == null)
return;
return Task.CompletedTask;
if (sender is not OBSSocketClient obs)
return;
return Task.CompletedTask;
switch (message.EventType)
{
case "StreamStateChanged":
if (sender is not OBSSocketClient client)
return;
return Task.CompletedTask;
string? raw_state = message.EventData["outputState"].ToString();
string? state = raw_state?.Substring(21).ToLower();
obs.Streaming = message.EventData["outputActive"].ToString()!.ToLower() == "true";
@ -44,6 +42,8 @@ namespace TwitchChatTTS.OBS.Socket.Handlers
_logger.Debug(message.EventType + " EVENT: " + string.Join(" | ", message.EventData?.Select(x => x.Key + "=" + x.Value?.ToString()) ?? Array.Empty<string>()));
break;
}
return Task.CompletedTask;
}
}
}

65
OBS/Socket/Handlers/RequestResponseHandler.cs
View File

@ -18,12 +18,12 @@ namespace TwitchChatTTS.OBS.Socket.Handlers
_logger = logger;
}
public async Task Execute<Data>(SocketClient<WebSocketMessage> sender, Data data)
public Task Execute<Data>(SocketClient<WebSocketMessage> sender, Data data)
{
if (data is not RequestResponseMessage message || message == null)
return;
return Task.CompletedTask;
if (sender is not OBSSocketClient obs)
return;
return Task.CompletedTask;
_logger.Debug($"Received an OBS request response [obs request id: {message.RequestId}]");
@ -31,13 +31,12 @@ namespace TwitchChatTTS.OBS.Socket.Handlers
if (requestData == null)
{
_logger.Warning($"OBS Request Response not being processed: request not stored [obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
var request = requestData.Message;
if (request == null)
return;
return Task.CompletedTask;
try
{
switch (request.RequestType)
@ -50,26 +49,26 @@ namespace TwitchChatTTS.OBS.Socket.Handlers
if (!request.RequestData.TryGetValue("sceneName", out object? sceneName) || sceneName == null)
{
_logger.Warning($"Failed to find the scene name that was requested [obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
if (!request.RequestData.TryGetValue("sourceName", out object? sourceName) || sourceName == null)
{
_logger.Warning($"Failed to find the scene item name that was requested [scene: {sceneName}][obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
if (message.ResponseData == null)
{
_logger.Warning($"OBS Response is null [scene: {sceneName}][scene item: {sourceName}][obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
if (!message.ResponseData.TryGetValue("sceneItemId", out object? sceneItemId) || sceneItemId == null)
{
_logger.Warning($"Failed to fetch the scene item id [scene: {sceneName}][scene item: {sourceName}][obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
_logger.Debug($"Found the scene item by name [scene: {sceneName}][source: {sourceName}][id: {sceneItemId}][obs request id: {message.RequestId}].");
//_manager.AddSourceId(sceneName.ToString(), sourceName.ToString(), (long) sceneItemId);
obs.AddSourceId(sourceName.ToString()!, (long)sceneItemId);
requestData.ResponseValues = message.ResponseData;
break;
@ -79,22 +78,22 @@ namespace TwitchChatTTS.OBS.Socket.Handlers
if (!request.RequestData.TryGetValue("sceneName", out object? sceneName) || sceneName == null)
{
_logger.Warning($"Failed to find the scene name that was requested [obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
if (!request.RequestData.TryGetValue("sceneItemId", out object? sceneItemId) || sceneItemId == null)
{
_logger.Warning($"Failed to find the scene item name that was requested [scene: {sceneName}][obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
if (message.ResponseData == null)
{
_logger.Warning($"OBS Response is null [scene: {sceneName}][scene item id: {sceneItemId}][obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
if (!message.ResponseData.TryGetValue("sceneItemTransform", out object? transformData) || transformData == null)
{
_logger.Warning($"Failed to fetch the OBS transformation data [obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
_logger.Debug($"Fetched OBS transformation data [scene: {sceneName}][scene item id: {sceneItemId}][transformation: {transformData}][obs request id: {message.RequestId}]");
@ -106,22 +105,22 @@ namespace TwitchChatTTS.OBS.Socket.Handlers
if (!request.RequestData.TryGetValue("sceneName", out object? sceneName) || sceneName == null)
{
_logger.Warning($"Failed to find the scene name that was requested [obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
if (!request.RequestData.TryGetValue("sceneItemId", out object? sceneItemId) || sceneItemId == null)
{
_logger.Warning($"Failed to find the scene item name that was requested [scene: {sceneName}][obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
if (message.ResponseData == null)
{
_logger.Warning($"OBS Response is null [scene: {sceneName}][scene item id: {sceneItemId}][obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
if (!message.ResponseData.TryGetValue("sceneItemEnabled", out object? sceneItemVisibility) || sceneItemVisibility == null)
{
_logger.Warning($"Failed to fetch the scene item visibility [scene: {sceneName}][scene item id: {sceneItemId}][obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
_logger.Debug($"Fetched OBS scene item visibility [scene: {sceneName}][scene item id: {sceneItemId}][visibility: {sceneItemVisibility}][obs request id: {message.RequestId}]");
@ -133,12 +132,12 @@ namespace TwitchChatTTS.OBS.Socket.Handlers
if (!request.RequestData.TryGetValue("sceneName", out object? sceneName) || sceneName == null)
{
_logger.Warning($"Failed to find the scene name that was requested [obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
if (!request.RequestData.TryGetValue("sceneItemId", out object? sceneItemId) || sceneItemId == null)
{
_logger.Warning($"Failed to find the scene item name that was requested [scene: {sceneName}][obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
_logger.Debug($"Received response from OBS for updating scene item transformation [scene: {sceneName}][scene item id: {sceneItemId}][obs request id: {message.RequestId}]");
break;
@ -148,12 +147,12 @@ namespace TwitchChatTTS.OBS.Socket.Handlers
if (!request.RequestData.TryGetValue("sceneName", out object? sceneName) || sceneName == null)
{
_logger.Warning($"Failed to find the scene name that was requested [obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
if (!request.RequestData.TryGetValue("sceneItemId", out object? sceneItemId) || sceneItemId == null)
{
_logger.Warning($"Failed to find the scene item name that was requested [scene: {sceneName}][obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
_logger.Debug($"Received response from OBS for updating scene item visibility [scene: {sceneName}][scene item id: {sceneItemId}][obs request id: {message.RequestId}]");
break;
@ -163,12 +162,12 @@ namespace TwitchChatTTS.OBS.Socket.Handlers
if (message.ResponseData == null)
{
_logger.Warning($"OBS Response is null [obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
if (!message.ResponseData.TryGetValue("groups", out object? value) || value == null)
{
_logger.Warning($"Failed to fetch the scene item visibility [obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
var groups = JsonSerializer.Deserialize<IEnumerable<string>>(value.ToString());
_logger.Debug($"Fetched OBS groups [obs request id: {message.RequestId}]");
@ -183,17 +182,17 @@ namespace TwitchChatTTS.OBS.Socket.Handlers
if (!request.RequestData.TryGetValue("sceneName", out object? sceneName) || sceneName == null)
{
_logger.Warning($"Failed to find the scene name that was requested [obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
if (message.ResponseData == null)
{
_logger.Warning($"OBS Response is null [scene: {sceneName}][obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
if (!message.ResponseData.TryGetValue("sceneItems", out object? value) || value == null)
{
_logger.Warning($"Failed to fetch the scene item visibility [scene: {sceneName}][obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
_logger.Debug($"Fetched OBS scene items in group [scene: {sceneName}][obs request id: {message.RequestId}]");
var sceneItems = JsonSerializer.Deserialize<IEnumerable<OBSSceneItem>>(value.ToString()!, new JsonSerializerOptions()
@ -203,7 +202,7 @@ namespace TwitchChatTTS.OBS.Socket.Handlers
if (sceneItems == null)
{
_logger.Warning($"Failed to deserialize the data received [scene: {sceneName}][obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
foreach (var sceneItem in sceneItems)
@ -220,7 +219,7 @@ namespace TwitchChatTTS.OBS.Socket.Handlers
if (!request.RequestData.TryGetValue("sleepMillis", out object? sleepMillis) || sleepMillis == null)
{
_logger.Warning($"Failed to find the amount of time to sleep for [obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
_logger.Debug($"Received response from OBS for sleeping [sleep: {sleepMillis}][obs request id: {message.RequestId}]");
break;
@ -230,12 +229,12 @@ namespace TwitchChatTTS.OBS.Socket.Handlers
if (message.ResponseData == null)
{
_logger.Warning($"OBS Response is null [obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
if (!message.ResponseData.TryGetValue("outputActive", out object? outputActive) || outputActive == null)
{
_logger.Warning($"Failed to fetch the scene item visibility [obs request id: {message.RequestId}]");
return;
return Task.CompletedTask;
}
obs.Streaming = outputActive?.ToString()!.ToLower() == "true";
@ -257,6 +256,8 @@ namespace TwitchChatTTS.OBS.Socket.Handlers
if (requestData.Callback != null)
requestData.Callback(requestData.ResponseValues);
}
return Task.CompletedTask;
}
}
}

6
OBS/Socket/OBSSocketClient.cs
View File

@ -167,7 +167,7 @@ namespace TwitchChatTTS.OBS.Socket
await Send(8, new RequestBatchMessage(uid, list));
}
public async Task Send(RequestMessage message, Action<Dictionary<string, object>>? callback = null)
public async Task Send(RequestMessage message, Action<Dictionary<string, object>?>? callback = null)
{
if (!Connected)
{
@ -335,7 +335,7 @@ namespace TwitchChatTTS.OBS.Socket
}
var m = new RequestMessage("GetSceneItemId", string.Empty, new Dictionary<string, object>() { { "sceneName", sceneName }, { "sourceName", sceneItemName } });
await Send(m, async (d) =>
await Send(m, (d) =>
{
if (d == null || !d.TryGetValue("sceneItemId", out object? value) || value == null || !long.TryParse(value.ToString(), out long sceneItemId))
return;
@ -357,7 +357,7 @@ namespace TwitchChatTTS.OBS.Socket
public RequestMessage Message { get; }
public string ParentId { get; }
public Dictionary<string, object>? ResponseValues { get; set; }
public Action<Dictionary<string, object>>? Callback { get; set; }
public Action<Dictionary<string, object>?>? Callback { get; set; }
public RequestData(RequestMessage message, string parentId)
{