cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-10-27 01:22:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Keep inner exceptions when serializing

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2024-03-10 14:03:25 -07:00
parent a3c4104e99
commit e44eb682f9
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NAPS2.Sdk/Remoting/Error.proto
View File

@ -6,4 +6,5 @@ message Error {
string type = 1;
string message = 2;
string stackTrace = 3;
Error innerException = 4;
}

33
NAPS2.Sdk/Remoting/RemotingHelper.cs
View File

@ -9,20 +9,32 @@ internal static class RemotingHelper
{
if (error != null && !string.IsNullOrEmpty(error.Type))
{
var exceptionType = Assembly.GetAssembly(typeof(ScanDriverException))!.GetType(error.Type, false);
var exception = CreateExceptionType(exceptionType);
var messageField =
typeof(Exception).GetField("_message", BindingFlags.NonPublic | BindingFlags.Instance);
var stackTraceField = typeof(Exception).GetField("_stackTraceString",
BindingFlags.NonPublic | BindingFlags.Instance);
var typePrefix = exceptionType == null ? $"{error.Type}: " : "";
messageField?.SetValue(exception, typePrefix + error.Message);
stackTraceField?.SetValue(exception, error.StackTrace);
var exception = MakeExceptionObject(error);
exception.PreserveStackTrace();
throw exception;
}
}
private static Exception MakeExceptionObject(Error error)
{
var exceptionType = Assembly.GetAssembly(typeof(ScanDriverException))!.GetType(error.Type, false);
var exception = CreateExceptionType(exceptionType);
var messageField =
typeof(Exception).GetField("_message", BindingFlags.NonPublic | BindingFlags.Instance);
var stackTraceField = typeof(Exception).GetField("_stackTraceString",
BindingFlags.NonPublic | BindingFlags.Instance);
var innerExceptionField = typeof(Exception).GetField("_innerException",
BindingFlags.NonPublic | BindingFlags.Instance);
var typePrefix = exceptionType == null ? $"{error.Type}: " : "";
messageField?.SetValue(exception, typePrefix + error.Message);
stackTraceField?.SetValue(exception, error.StackTrace);
if (error.InnerException != null)
{
innerExceptionField?.SetValue(exception, MakeExceptionObject(error.InnerException));
}
return exception;
}
private static Exception CreateExceptionType(Type? exceptionType)
{
if (exceptionType != null && typeof(ScanDriverException).IsAssignableFrom(exceptionType))
@ -44,6 +56,7 @@ internal static class RemotingHelper
{
Type = e.GetType().FullName,
Message = e.Message,
StackTrace = e.StackTrace
StackTrace = e.StackTrace,
InnerException = e.InnerException != null ? ToError(e.InnerException) : null
};
}