[Core] [NativeAPI] Pass Exception to BotLogEvent

Linwenxuan04 · Linwenxuan04 · commit 94ca12f1213a · 2025-06-04T18:43:54.000+08:00
diff --git a/Lagrange.Core.NativeAPI/NativeModel/Event/BotLogEventStruct.cs b/Lagrange.Core.NativeAPI/NativeModel/Event/BotLogEventStruct.cs
@@ -29,7 +29,8 @@ public static implicit operator BotLogEvent(BotLogEventStruct e)
             return new BotLogEvent(
                 Encoding.UTF8.GetString(e.Tag),
                 (LogLevel)e.Level,
-                Encoding.UTF8.GetString(e.Message)
+                Encoding.UTF8.GetString(e.Message),
+                null // TODO: Handle exception if needed
             );
         }
     }
diff --git a/Lagrange.Core/BotContext.cs b/Lagrange.Core/BotContext.cs
@@ -44,44 +44,44 @@ internal BotContext(BotConfig config, BotKeystore keystore, BotAppInfo appInfo)
 
     #region Shortcut Methods
     
-    public void LogCritical(string tag, [StringSyntax(StringSyntaxAttribute.CompositeFormat)] string text, params object?[] args)
+    public void LogCritical(string tag, [StringSyntax(StringSyntaxAttribute.CompositeFormat)] string text, Exception? exception = null, params object?[] args)
     {
-        EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Critical, string.Format(text, args)));
+        EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Critical, string.Format(text, args), exception));
     }
 
-    public void LogError(string tag, [StringSyntax(StringSyntaxAttribute.CompositeFormat)] string text, params object?[] args)
+    public void LogError(string tag, [StringSyntax(StringSyntaxAttribute.CompositeFormat)] string text, Exception? exception = null, params object?[] args)
     {
         if (Config.LogLevel > LogLevel.Error) return;
         
-        EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Error, string.Format(text, args)));
+        EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Error, string.Format(text, args), exception));
     }
 
-    public void LogWarning(string tag, [StringSyntax(StringSyntaxAttribute.CompositeFormat)] string text, params object?[] args)
+    public void LogWarning(string tag, [StringSyntax(StringSyntaxAttribute.CompositeFormat)] string text, Exception? exception = null, params object?[] args)
     {
         if (Config.LogLevel > LogLevel.Warning) return;
         
-        EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Warning, string.Format(text, args)));
+        EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Warning, string.Format(text, args), exception));
     }
 
     public void LogInfo(string tag, [StringSyntax(StringSyntaxAttribute.CompositeFormat)] string text, params object?[] args)
     {
         if (Config.LogLevel > LogLevel.Information) return;
         
-        EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Information, string.Format(text, args)));
+        EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Information, string.Format(text, args), null));
     }
 
     public void LogDebug(string tag, [StringSyntax(StringSyntaxAttribute.CompositeFormat)] string text, params object?[] args)
     {
         if (Config.LogLevel > LogLevel.Debug) return;
         
-        EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Debug, string.Format(text, args)));
+        EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Debug, string.Format(text, args), null));
     }
 
     public void LogTrace(string tag, [StringSyntax(StringSyntaxAttribute.CompositeFormat)] string text, params object?[] args)
     {
         if (Config.LogLevel > LogLevel.Trace) return;
         
-        EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Trace, string.Format(text, args)));
+        EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Trace, string.Format(text, args), null));
     }
 
     #endregion
diff --git a/Lagrange.Core/Common/IAndroidBotSignProvider.cs b/Lagrange.Core/Common/IAndroidBotSignProvider.cs
@@ -187,7 +187,7 @@ internal class DefaultAndroidBotSignProvider(BotContext context) : IAndroidBotSi
         }
         catch (Exception e)
         {
-            context.LogWarning(Tag, "Failed to get sign: {0}", e.Message);
+            context.LogWarning(Tag, "Failed to get sign: {0}", e, e.Message);
             return null;
         }
     }
@@ -213,7 +213,7 @@ public async Task<byte[]> GetEnergy(long uin, string data)
         }
         catch (Exception e)
         {
-            context.LogWarning(Tag, "Failed to get energy: {0}", e.Message);
+            context.LogWarning(Tag, "Failed to get energy: {0}", e, e.Message);
             return [];
         }
     }
@@ -238,7 +238,7 @@ public async Task<byte[]> GetDebugXwid(long uin, string data)
         }
         catch (Exception e)
         {
-            context.LogWarning(Tag, "Failed to get debug_xwid: {0}", e.Message);
+            context.LogWarning(Tag, "Failed to get debug_xwid: {0}", e, e.Message);
             return [];
         }
     }
diff --git a/Lagrange.Core/Events/EventArgs/BotLogEvent.cs b/Lagrange.Core/Events/EventArgs/BotLogEvent.cs
@@ -10,13 +10,15 @@ public enum LogLevel
     Critical = 5
 }
 
-public class BotLogEvent(string tag, LogLevel level, string message) : EventBase
+public class BotLogEvent(string tag, LogLevel level, string message, Exception? Exception) : EventBase
 {
     public string Tag { get; } = tag;
     
     public LogLevel Level { get; } = level;
     
     public string Message { get; } = message;
+
+    public Exception? Exception { get; } = Exception;
     
     public override string ToEventMessage() => $"[{Tag}] [{Level.ToString().ToUpper()}]: {Message}";
 }
diff --git a/Lagrange.Core/Events/EventInvoker.cs b/Lagrange.Core/Events/EventInvoker.cs
@@ -64,7 +64,7 @@ internal void PostEvent<T>(T ev) where T : EventBase => Task.Run(async () =>
                 Console.WriteLine($"Failed to post event: {ev}");
                 return;
             }
-            PostEvent(new BotLogEvent(Tag, LogLevel.Error, ex.ToString()));
+            PostEvent(new BotLogEvent(Tag, LogLevel.Error, ex.ToString(), ex));
         }
     });
 
diff --git a/Lagrange.Core/Internal/Context/EventContext.cs b/Lagrange.Core/Internal/Context/EventContext.cs
@@ -140,7 +140,7 @@ public async Task HandleServerPacket(SsoPacket packet)
         }
         catch (ServiceNotFoundException e)
         {
-            _context.LogWarning(Tag, "Service not found for command: {0}", e.Command);
+            _context.LogWarning(Tag, "Service not found for command: {0}", e, e.Command);
         }
     }
     
diff --git a/Lagrange.Core/Internal/Context/HighwayContext.cs b/Lagrange.Core/Internal/Context/HighwayContext.cs
@@ -77,7 +77,7 @@ public void OnDisconnect() { }
 
     public void OnSocketError(Exception e, ReadOnlyMemory<byte> data = default)
     {
-        _context.LogError(Tag, "Highway Socket error: {0}", e.Message);
+        _context.LogError(Tag, "Highway Socket error: {0}", e, e.Message);
         if (e.StackTrace is { } stack) _context.LogDebug(Tag, stack);
     }
     
@@ -182,7 +182,7 @@ public async Task<bool> UploadFile(Stream stream, int commandId, ReadOnlyMemory<
                     }
                     catch (Exception e)
                     {
-                        _context.LogError(Tag, "Highway HTTP error: {0}", e.Message);
+                        _context.LogError(Tag, "Highway HTTP error: {0}", e, e.Message);
                         if (e.StackTrace is { } stack) _context.LogDebug(Tag, stack);
                     }
                     finally
diff --git a/Lagrange.Core/Internal/Context/SocketContext.cs b/Lagrange.Core/Internal/Context/SocketContext.cs
@@ -51,7 +51,7 @@ public async Task<bool> Connect()
         bool connected = await _client.Connect(servers[0]);
         
         if (connected) _context.LogInfo(Tag, "Connected to the server {0}", servers[0]);
-        else _context.LogError(Tag, "Failed to connect to the server {0}", servers[0]);
+        else _context.LogError(Tag, "Failed to connect to the server {0}", null,servers[0]);
         
         return connected;
     }
diff --git a/Lagrange.Core/Internal/Logic/WtExchangeLogic.cs b/Lagrange.Core/Internal/Logic/WtExchangeLogic.cs
@@ -58,7 +58,7 @@ public async ValueTask Incoming(ProtocolEvent e)
         {
             case KickEvent kick:
             {
-                _context.LogError(Tag, "Kicked by server: {0} | {1}", kick.TipsTitle, kick.TipsInfo);
+                _context.LogError(Tag, "Kicked by server: {0} | {1}", null, kick.TipsTitle, kick.TipsInfo);
                 _context.EventInvoker.PostEvent(new BotOfflineEvent(BotOfflineEvent.Reasons.Kicked, (kick.TipsTitle, kick.TipsInfo)));
                 _context.IsOnline = false;
                 _timers[SsoHeartBeatTag].Change(Timeout.Infinite, Timeout.Infinite);
@@ -109,7 +109,7 @@ public async Task<bool> Logout()
             }
             else
             {
-                _context.LogError(Tag, "Logout failed, directly offline {0}", result.Message);
+                _context.LogError(Tag, "Logout failed, directly offline {0}", null, result.Message);
             }
         }
         
@@ -121,7 +121,7 @@ private async Task<bool> ManualLogin(long uin, string? password)
     {
         if (string.IsNullOrEmpty(password) && _context.Config.Protocol.IsAndroid())
         {
-            _context.LogError(Tag, "Android Platform can not use QRLogin, Please fill in password");
+            _context.LogCritical(Tag, "Android Platform can not use QRLogin, Please fill in password");
             return false;
         }
 
@@ -150,7 +150,7 @@ private async Task<bool> ManualLogin(long uin, string? password)
                     if (await _transEmpSource.Task) return await Online();
                     break;
                 default:
-                    _context.LogError(Tag, "Login failed: {0} | Message: {1}", result.State, result.Tips);
+                    _context.LogError(Tag, "Login failed: {0} | Message: {1}", null, result.State, result.Tips);
                     _context.EventInvoker.PostEvent(new BotLoginEvent((int)result.State, result.Tips));
                     break;
             }
@@ -259,7 +259,7 @@ private async Task<bool> ManualLogin(long uin, string? password)
                 }
                 else
                 {
-                    _context.LogError(Tag, "Login failed: {0} | Message: {1}", result.RetCode, result.Error);
+                    _context.LogError(Tag, "Login failed: {0} | Message: {1}", null, result.RetCode, result.Error);
                     _context.EventInvoker.PostEvent(new BotLoginEvent(result.RetCode, result.Error));
                 }
             }
@@ -315,7 +315,7 @@ private async Task<bool> ManualLogin(long uin, string? password)
                             if (await _transEmpSource.Task) return await Online();
                             break;
                         default:
-                            _context.LogError(Tag, "Login failed: {0} | Message: {1}", result.State, result.Tips);
+                            _context.LogError(Tag, "Login failed: {0} | Message: {1}", null, result.State, result.Tips);
                             _context.EventInvoker.PostEvent(new BotLoginEvent((int)result.State, result.Tips));
                             return false;
                     }
@@ -344,7 +344,7 @@ public async Task<long> ResolveUinByQid(string qid)
         }
         else if (result is { Error: { } error })
         {
-            _context.LogError(Tag, "Failed to resolve uin: {0} | {1}", error.Item1, error.Item2);
+            _context.LogError(Tag, "Failed to resolve uin: {0} | {1}", null, error.Item1, error.Item2);
         }
 
         return 0;
@@ -398,7 +398,7 @@ private async Task<bool> Online()
         }
         catch (LagrangeException e) when (e.InnerException is InvalidOperationException invalid)
         {
-            _context.LogError(Tag, "Failed to send InfoSyncEvent: {0}", invalid.Message);
+            _context.LogError(Tag, "Failed to send InfoSyncEvent: {0}", null, invalid.Message);
         }
 
         return false;
@@ -451,7 +451,7 @@ private void OnQueryState(object? state) => Task.Run(async () =>
                     }
                     else
                     {
-                        _context.LogError(Tag, "Login failed: {0} | Message: {1}", result.State, result.Tips);
+                        _context.LogError(Tag, "Login failed: {0} | Message: {1}", null, result.State, result.Tips);
                         _transEmpSource.TrySetResult(false);
                     }
                     
@@ -469,15 +469,15 @@ private void OnQueryState(object? state) => Task.Run(async () =>
                     }
                     else
                     {
-                        _context.LogError(Tag, "Login failed: {0} | Message: {1}", result.RetCode, result.Error);
+                        _context.LogError(Tag, "Login failed: {0} | Message: {1}", null, result.RetCode, result.Error);
                         _transEmpSource.TrySetResult(false);
                     }
 
                     _context.EventInvoker.PostEvent(new BotLoginEvent(result.RetCode, result.Error));
                 } 
                 break;
             case { State: TransEmp12EventResp.TransEmpState.Canceled or TransEmp12EventResp.TransEmpState.Invalid or TransEmp12EventResp.TransEmpState.CodeExpired }:
-                _context.LogCritical(Tag, "QR Code State: {0}", transEmp12.State);
+                _context.LogCritical(Tag, "QR Code State: {0}", null, transEmp12.State);
                 
                 _transEmpSource.TrySetResult(false);
                 _timers[QueryStateTag].Change(Timeout.Infinite, Timeout.Infinite);
@@ -521,7 +521,7 @@ private void OnNewDevice(object? state) => Task.Run(async () =>
             }
             else
             {
-                _context.LogError(Tag, "Login failed: {0} | Message: {1}", result.State, result.Tips);
+                _context.LogError(Tag, "Login failed: {0} | Message: {1}", null, result.State, result.Tips);
                 _transEmpSource.TrySetResult(false);
             }
         }
diff --git a/Lagrange.Core/Internal/Services/OidbService.cs b/Lagrange.Core/Internal/Services/OidbService.cs
@@ -30,7 +30,7 @@ protected override async ValueTask<TEventResp> Parse(ReadOnlyMemory<byte> input,
         var oidb = ProtoHelper.Deserialize<Oidb>(input.Span);
         if (oidb.Result != 0)
         {
-            context.LogWarning(Tag, "Error: {0}, Message: {1}", oidb.Result, oidb.Message);
+            context.LogWarning(Tag, "Error: {0}, Message: {1}", null, oidb.Result, oidb.Message);
             throw new OperationException((int)oidb.Result, oidb.Message);
         }
         
diff --git a/Lagrange.Core/Utility/Binary/BinaryPacket.cs b/Lagrange.Core/Utility/Binary/BinaryPacket.cs
@@ -5,6 +5,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Text.Unicode;
 
 namespace Lagrange.Core.Utility.Binary;
 
@@ -208,8 +209,9 @@ public void ReadBytes(scoped Span<byte> buffer)
     
     public void ReadString(scoped Span<char> buffer)
     {
-        int byteCount = Encoding.UTF8.GetChars(_span.Slice(_offset, buffer.Length), buffer);
-        Encoding.UTF8.GetChars(_span.Slice(_offset, buffer.Length), buffer);
+        var status = Utf8.ToUtf16(_span.Slice(_offset, Math.Min(buffer.Length * 3, _span.Length - _offset)), buffer, out int byteCount, out int written);
+        Debug.Assert(written == buffer.Length);
+        Debug.Assert(status is OperationStatus.Done or OperationStatus.DestinationTooSmall, "Failed to read string from packet, status: " + status);
         Increment(byteCount);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,8 @@ public static implicit operator BotLogEvent(BotLogEventStruct e)`
`29`	`29`	`return new BotLogEvent(`
`30`	`30`	`Encoding.UTF8.GetString(e.Tag),`
`31`	`31`	`(LogLevel)e.Level,`
`32`		`- Encoding.UTF8.GetString(e.Message)`
	`32`	`+ Encoding.UTF8.GetString(e.Message),`
	`33`	`+ null // TODO: Handle exception if needed`
`33`	`34`	`);`
`34`	`35`	`}`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,44 +44,44 @@ internal BotContext(BotConfig config, BotKeystore keystore, BotAppInfo appInfo)`
`44`	`44`
`45`	`45`	`#region Shortcut Methods`
`46`	`46`
`47`		`- public void LogCritical(string tag, [StringSyntax(StringSyntaxAttribute.CompositeFormat)] string text, params object?[] args)`
	`47`	`+ public void LogCritical(string tag, [StringSyntax(StringSyntaxAttribute.CompositeFormat)] string text, Exception? exception = null, params object?[] args)`
`48`	`48`	`{`
`49`		`- EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Critical, string.Format(text, args)));`
	`49`	`+ EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Critical, string.Format(text, args), exception));`
`50`	`50`	`}`
`51`	`51`
`52`		`- public void LogError(string tag, [StringSyntax(StringSyntaxAttribute.CompositeFormat)] string text, params object?[] args)`
	`52`	`+ public void LogError(string tag, [StringSyntax(StringSyntaxAttribute.CompositeFormat)] string text, Exception? exception = null, params object?[] args)`
`53`	`53`	`{`
`54`	`54`	`if (Config.LogLevel > LogLevel.Error) return;`
`55`	`55`
`56`		`- EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Error, string.Format(text, args)));`
	`56`	`+ EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Error, string.Format(text, args), exception));`
`57`	`57`	`}`
`58`	`58`
`59`		`- public void LogWarning(string tag, [StringSyntax(StringSyntaxAttribute.CompositeFormat)] string text, params object?[] args)`
	`59`	`+ public void LogWarning(string tag, [StringSyntax(StringSyntaxAttribute.CompositeFormat)] string text, Exception? exception = null, params object?[] args)`
`60`	`60`	`{`
`61`	`61`	`if (Config.LogLevel > LogLevel.Warning) return;`
`62`	`62`
`63`		`- EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Warning, string.Format(text, args)));`
	`63`	`+ EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Warning, string.Format(text, args), exception));`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public void LogInfo(string tag, [StringSyntax(StringSyntaxAttribute.CompositeFormat)] string text, params object?[] args)`
`67`	`67`	`{`
`68`	`68`	`if (Config.LogLevel > LogLevel.Information) return;`
`69`	`69`
`70`		`- EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Information, string.Format(text, args)));`
	`70`	`+ EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Information, string.Format(text, args), null));`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`public void LogDebug(string tag, [StringSyntax(StringSyntaxAttribute.CompositeFormat)] string text, params object?[] args)`
`74`	`74`	`{`
`75`	`75`	`if (Config.LogLevel > LogLevel.Debug) return;`
`76`	`76`
`77`		`- EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Debug, string.Format(text, args)));`
	`77`	`+ EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Debug, string.Format(text, args), null));`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`public void LogTrace(string tag, [StringSyntax(StringSyntaxAttribute.CompositeFormat)] string text, params object?[] args)`
`81`	`81`	`{`
`82`	`82`	`if (Config.LogLevel > LogLevel.Trace) return;`
`83`	`83`
`84`		`- EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Trace, string.Format(text, args)));`
	`84`	`+ EventInvoker.PostEvent(new BotLogEvent(tag, LogLevel.Trace, string.Format(text, args), null));`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ internal class DefaultAndroidBotSignProvider(BotContext context) : IAndroidBotSi`
`187`	`187`	`}`
`188`	`188`	`catch (Exception e)`
`189`	`189`	`{`
`190`		`- context.LogWarning(Tag, "Failed to get sign: {0}", e.Message);`
	`190`	`+ context.LogWarning(Tag, "Failed to get sign: {0}", e, e.Message);`
`191`	`191`	`return null;`
`192`	`192`	`}`
`193`	`193`	`}`
`@@ -213,7 +213,7 @@ public async Task<byte[]> GetEnergy(long uin, string data)`
`213`	`213`	`}`
`214`	`214`	`catch (Exception e)`
`215`	`215`	`{`
`216`		`- context.LogWarning(Tag, "Failed to get energy: {0}", e.Message);`
	`216`	`+ context.LogWarning(Tag, "Failed to get energy: {0}", e, e.Message);`
`217`	`217`	`return [];`
`218`	`218`	`}`
`219`	`219`	`}`
`@@ -238,7 +238,7 @@ public async Task<byte[]> GetDebugXwid(long uin, string data)`
`238`	`238`	`}`
`239`	`239`	`catch (Exception e)`
`240`	`240`	`{`
`241`		`- context.LogWarning(Tag, "Failed to get debug_xwid: {0}", e.Message);`
	`241`	`+ context.LogWarning(Tag, "Failed to get debug_xwid: {0}", e, e.Message);`
`242`	`242`	`return [];`
`243`	`243`	`}`
`244`	`244`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,15 @@ public enum LogLevel`
`10`	`10`	`Critical = 5`
`11`	`11`	`}`
`12`	`12`
`13`		`-public class BotLogEvent(string tag, LogLevel level, string message) : EventBase`
	`13`	`+public class BotLogEvent(string tag, LogLevel level, string message, Exception? Exception) : EventBase`
`14`	`14`	`{`
`15`	`15`	`public string Tag { get; } = tag;`
`16`	`16`
`17`	`17`	`public LogLevel Level { get; } = level;`
`18`	`18`
`19`	`19`	`public string Message { get; } = message;`
	`20`	`+`
	`21`	`+ public Exception? Exception { get; } = Exception;`
`20`	`22`
`21`	`23`	`public override string ToEventMessage() => $"[{Tag}] [{Level.ToString().ToUpper()}]: {Message}";`
`22`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ internal void PostEvent<T>(T ev) where T : EventBase => Task.Run(async () =>`
`64`	`64`	`Console.WriteLine($"Failed to post event: {ev}");`
`65`	`65`	`return;`
`66`	`66`	`}`
`67`		`- PostEvent(new BotLogEvent(Tag, LogLevel.Error, ex.ToString()));`
	`67`	`+ PostEvent(new BotLogEvent(Tag, LogLevel.Error, ex.ToString(), ex));`
`68`	`68`	`}`
`69`	`69`	`});`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public async Task HandleServerPacket(SsoPacket packet)`
`140`	`140`	`}`
`141`	`141`	`catch (ServiceNotFoundException e)`
`142`	`142`	`{`
`143`		`- _context.LogWarning(Tag, "Service not found for command: {0}", e.Command);`
	`143`	`+ _context.LogWarning(Tag, "Service not found for command: {0}", e, e.Command);`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public void OnDisconnect() { }`
`77`	`77`
`78`	`78`	`public void OnSocketError(Exception e, ReadOnlyMemory<byte> data = default)`
`79`	`79`	`{`
`80`		`- _context.LogError(Tag, "Highway Socket error: {0}", e.Message);`
	`80`	`+ _context.LogError(Tag, "Highway Socket error: {0}", e, e.Message);`
`81`	`81`	`if (e.StackTrace is { } stack) _context.LogDebug(Tag, stack);`
`82`	`82`	`}`
`83`	`83`
`@@ -182,7 +182,7 @@ public async Task<bool> UploadFile(Stream stream, int commandId, ReadOnlyMemory<`
`182`	`182`	`}`
`183`	`183`	`catch (Exception e)`
`184`	`184`	`{`
`185`		`- _context.LogError(Tag, "Highway HTTP error: {0}", e.Message);`
	`185`	`+ _context.LogError(Tag, "Highway HTTP error: {0}", e, e.Message);`
`186`	`186`	`if (e.StackTrace is { } stack) _context.LogDebug(Tag, stack);`
`187`	`187`	`}`
`188`	`188`	`finally`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public async Task<bool> Connect()`
`51`	`51`	`bool connected = await _client.Connect(servers[0]);`
`52`	`52`
`53`	`53`	`if (connected) _context.LogInfo(Tag, "Connected to the server {0}", servers[0]);`
`54`		`- else _context.LogError(Tag, "Failed to connect to the server {0}", servers[0]);`
	`54`	`+ else _context.LogError(Tag, "Failed to connect to the server {0}", null,servers[0]);`
`55`	`55`
`56`	`56`	`return connected;`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public async ValueTask Incoming(ProtocolEvent e)`
`58`	`58`	`{`
`59`	`59`	`case KickEvent kick:`
`60`	`60`	`{`
`61`		`- _context.LogError(Tag, "Kicked by server: {0} \| {1}", kick.TipsTitle, kick.TipsInfo);`
	`61`	`+ _context.LogError(Tag, "Kicked by server: {0} \| {1}", null, kick.TipsTitle, kick.TipsInfo);`
`62`	`62`	`_context.EventInvoker.PostEvent(new BotOfflineEvent(BotOfflineEvent.Reasons.Kicked, (kick.TipsTitle, kick.TipsInfo)));`
`63`	`63`	`_context.IsOnline = false;`
`64`	`64`	`_timers[SsoHeartBeatTag].Change(Timeout.Infinite, Timeout.Infinite);`
`@@ -109,7 +109,7 @@ public async Task<bool> Logout()`
`109`	`109`	`}`
`110`	`110`	`else`
`111`	`111`	`{`
`112`		`- _context.LogError(Tag, "Logout failed, directly offline {0}", result.Message);`
	`112`	`+ _context.LogError(Tag, "Logout failed, directly offline {0}", null, result.Message);`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`@@ -121,7 +121,7 @@ private async Task<bool> ManualLogin(long uin, string? password)`
`121`	`121`	`{`
`122`	`122`	`if (string.IsNullOrEmpty(password) && _context.Config.Protocol.IsAndroid())`
`123`	`123`	`{`
`124`		`- _context.LogError(Tag, "Android Platform can not use QRLogin, Please fill in password");`
	`124`	`+ _context.LogCritical(Tag, "Android Platform can not use QRLogin, Please fill in password");`
`125`	`125`	`return false;`
`126`	`126`	`}`
`127`	`127`
`@@ -150,7 +150,7 @@ private async Task<bool> ManualLogin(long uin, string? password)`
`150`	`150`	`if (await _transEmpSource.Task) return await Online();`
`151`	`151`	`break;`
`152`	`152`	`default:`
`153`		`- _context.LogError(Tag, "Login failed: {0} \| Message: {1}", result.State, result.Tips);`
	`153`	`+ _context.LogError(Tag, "Login failed: {0} \| Message: {1}", null, result.State, result.Tips);`
`154`	`154`	`_context.EventInvoker.PostEvent(new BotLoginEvent((int)result.State, result.Tips));`
`155`	`155`	`break;`
`156`	`156`	`}`
`@@ -259,7 +259,7 @@ private async Task<bool> ManualLogin(long uin, string? password)`
`259`	`259`	`}`
`260`	`260`	`else`
`261`	`261`	`{`
`262`		`- _context.LogError(Tag, "Login failed: {0} \| Message: {1}", result.RetCode, result.Error);`
	`262`	`+ _context.LogError(Tag, "Login failed: {0} \| Message: {1}", null, result.RetCode, result.Error);`
`263`	`263`	`_context.EventInvoker.PostEvent(new BotLoginEvent(result.RetCode, result.Error));`
`264`	`264`	`}`
`265`	`265`	`}`
`@@ -315,7 +315,7 @@ private async Task<bool> ManualLogin(long uin, string? password)`
`315`	`315`	`if (await _transEmpSource.Task) return await Online();`
`316`	`316`	`break;`
`317`	`317`	`default:`
`318`		`- _context.LogError(Tag, "Login failed: {0} \| Message: {1}", result.State, result.Tips);`
	`318`	`+ _context.LogError(Tag, "Login failed: {0} \| Message: {1}", null, result.State, result.Tips);`
`319`	`319`	`_context.EventInvoker.PostEvent(new BotLoginEvent((int)result.State, result.Tips));`
`320`	`320`	`return false;`
`321`	`321`	`}`
`@@ -344,7 +344,7 @@ public async Task<long> ResolveUinByQid(string qid)`
`344`	`344`	`}`
`345`	`345`	`else if (result is { Error: { } error })`
`346`	`346`	`{`
`347`		`- _context.LogError(Tag, "Failed to resolve uin: {0} \| {1}", error.Item1, error.Item2);`
	`347`	`+ _context.LogError(Tag, "Failed to resolve uin: {0} \| {1}", null, error.Item1, error.Item2);`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`return 0;`
`@@ -398,7 +398,7 @@ private async Task<bool> Online()`
`398`	`398`	`}`
`399`	`399`	`catch (LagrangeException e) when (e.InnerException is InvalidOperationException invalid)`
`400`	`400`	`{`
`401`		`- _context.LogError(Tag, "Failed to send InfoSyncEvent: {0}", invalid.Message);`
	`401`	`+ _context.LogError(Tag, "Failed to send InfoSyncEvent: {0}", null, invalid.Message);`
`402`	`402`	`}`
`403`	`403`
`404`	`404`	`return false;`
`@@ -451,7 +451,7 @@ private void OnQueryState(object? state) => Task.Run(async () =>`
`451`	`451`	`}`
`452`	`452`	`else`
`453`	`453`	`{`
`454`		`- _context.LogError(Tag, "Login failed: {0} \| Message: {1}", result.State, result.Tips);`
	`454`	`+ _context.LogError(Tag, "Login failed: {0} \| Message: {1}", null, result.State, result.Tips);`
`455`	`455`	`_transEmpSource.TrySetResult(false);`
`456`	`456`	`}`
`457`	`457`
`@@ -469,15 +469,15 @@ private void OnQueryState(object? state) => Task.Run(async () =>`
`469`	`469`	`}`
`470`	`470`	`else`
`471`	`471`	`{`
`472`		`- _context.LogError(Tag, "Login failed: {0} \| Message: {1}", result.RetCode, result.Error);`
	`472`	`+ _context.LogError(Tag, "Login failed: {0} \| Message: {1}", null, result.RetCode, result.Error);`
`473`	`473`	`_transEmpSource.TrySetResult(false);`
`474`	`474`	`}`
`475`	`475`
`476`	`476`	`_context.EventInvoker.PostEvent(new BotLoginEvent(result.RetCode, result.Error));`
`477`	`477`	`}`
`478`	`478`	`break;`
`479`	`479`	`case { State: TransEmp12EventResp.TransEmpState.Canceled or TransEmp12EventResp.TransEmpState.Invalid or TransEmp12EventResp.TransEmpState.CodeExpired }:`
`480`		`- _context.LogCritical(Tag, "QR Code State: {0}", transEmp12.State);`
	`480`	`+ _context.LogCritical(Tag, "QR Code State: {0}", null, transEmp12.State);`
`481`	`481`
`482`	`482`	`_transEmpSource.TrySetResult(false);`
`483`	`483`	`_timers[QueryStateTag].Change(Timeout.Infinite, Timeout.Infinite);`
`@@ -521,7 +521,7 @@ private void OnNewDevice(object? state) => Task.Run(async () =>`
`521`	`521`	`}`
`522`	`522`	`else`
`523`	`523`	`{`
`524`		`- _context.LogError(Tag, "Login failed: {0} \| Message: {1}", result.State, result.Tips);`
	`524`	`+ _context.LogError(Tag, "Login failed: {0} \| Message: {1}", null, result.State, result.Tips);`
`525`	`525`	`_transEmpSource.TrySetResult(false);`
`526`	`526`	`}`
`527`	`527`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ protected override async ValueTask<TEventResp> Parse(ReadOnlyMemory<byte> input,`
`30`	`30`	`var oidb = ProtoHelper.Deserialize<Oidb>(input.Span);`
`31`	`31`	`if (oidb.Result != 0)`
`32`	`32`	`{`
`33`		`- context.LogWarning(Tag, "Error: {0}, Message: {1}", oidb.Result, oidb.Message);`
	`33`	`+ context.LogWarning(Tag, "Error: {0}, Message: {1}", null, oidb.Result, oidb.Message);`
`34`	`34`	`throw new OperationException((int)oidb.Result, oidb.Message);`
`35`	`35`	`}`
`36`	`36`