Merge pull request #264 from AoshiW/parsing-error

catch parsing error
TwitchLib · Mar 25, 2024 · f54d60b · f54d60b
2 parents 0fa8038 + aadb9a5
commit f54d60b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/TwitchLib.Client/Extensions/LogExtensions.cs b/TwitchLib.Client/Extensions/LogExtensions.cs
@@ -37,6 +37,9 @@ internal static partial class LogExtensions
     [LoggerMessage(LogLevel.Warning, "Unaccounted for: {ircString} (please create a TwitchLib GitHub issue :P)")]
     public static partial void LogUnaccountedFor(this ILogger<TwitchClient> logger, string ircString);
 
+    [LoggerMessage(LogLevel.Error, "Unexpected error during message parsing, message: {message}")]
+    public static partial void LogParsingError(this ILogger<TwitchClient> logger, string message, Exception ex);
+
     [LoggerMessage(LogLevel.Debug, "Writing: {message}")]
     public static partial void LogWriting(this ILogger<TwitchClient> logger, string message);
 

diff --git a/TwitchLib.Client/TwitchClient.cs b/TwitchLib.Client/TwitchClient.cs
@@ -699,7 +699,18 @@ private async Task _client_OnMessage(object? sender, OnMessageEventArgs e)
                 _logger?.LogReceived(line);
 
                 await OnSendReceiveData.TryInvoke(this, new(SendReceiveDirection.Received, line));
-                await HandleIrcMessageAsync(IrcParser.ParseMessage(line));
+                IrcMessage ircMessage;
+                try
+                {
+                    ircMessage = IrcParser.ParseMessage(line);
+                }
+                catch (Exception ex)
+                {
+                    _logger?.LogParsingError(line, ex);
+                    OnError?.Invoke(this, new(ex));
+                    continue;
+                }
+                await HandleIrcMessageAsync(ircMessage);
             }
         }