[RemoteNET] Read Loader errors from type listing calls

Author: RemoteNet

src/RemoteNET/ManagedRemoteApp.cs

@@ -5,6 +5,7 @@
 using System.Reflection;
 using RemoteNET.Internal;
 using RemoteNET.Internal.Reflection.DotNet;
+using RemoteNET.Utils;
 using ScubaDiver.API;
 using ScubaDiver.API.Interactions.Dumps;
 using ScubaDiver.API.Utils;
@@ -127,23 +128,16 @@ public ManagedRemoteApp(Process procWithDiver, DiverCommunicator managedCommunic
 
         public override IEnumerable<CandidateType> QueryTypes(string typeFullNameFilter)
         {
-            List<TypesDump.TypeIdentifiers> typeIdentifiers;
             try
             {
-                typeIdentifiers = _managedCommunicator.DumpTypes(typeFullNameFilter).Types;
+                List<TypesDump.TypeIdentifiers> typeIdentifiers = _managedCommunicator.DumpTypes(typeFullNameFilter, out _).Types;
+                return TypesDumpHelpers.ToCandidateTypes(typeIdentifiers);
             }
             catch
             {
                 // TODO:
                 Debug.WriteLine($"[{nameof(ManagedRemoteApp)}][{nameof(QueryTypes)}] Exception thrown when Querying for Type filter: {typeFullNameFilter}");
-                yield break;
-            }
-            foreach (TypesDump.TypeIdentifiers type in typeIdentifiers)
-            {
-                ulong? xoredMethodTable = null;
-                if (type.XoredMethodTable.HasValue)
-                    xoredMethodTable = type.XoredMethodTable ^ TypesDump.TypeIdentifiers.XorMask;
-                yield return new CandidateType(RuntimeType.Managed, type.FullTypeName, type.Assembly, xoredMethodTable);
+                return new List<CandidateType>();
             }
         }
 

src/RemoteNET/Utils/TypesDumpHelpers.cs

@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using System.Linq;
+using ScubaDiver.API.Interactions.Dumps;
+
+namespace RemoteNET.Utils
+{
+    public static class TypesDumpHelpers
+    {
+        public static List<CandidateType> QueryTypes(RemoteApp app, string typeFullNameFilter, out List<TypesDump.AssemblyLoadError> loadErrors)
+        {
+            if (app is ManagedRemoteApp managedApp)
+            {
+                TypesDump dump = managedApp.Communicator.DumpTypes(typeFullNameFilter, out loadErrors);
+                List<TypesDump.TypeIdentifiers> typeIdentifiers = dump?.Types ?? new List<TypesDump.TypeIdentifiers>();
+                return ToCandidateTypes(typeIdentifiers);
+            }
+
+            loadErrors = new List<TypesDump.AssemblyLoadError>();
+            return app.QueryTypes(typeFullNameFilter).ToList();
+        }
+
+        public static ulong? UnmaskMethodTable(ulong? xoredMethodTable)
+        {
+            if (!xoredMethodTable.HasValue)
+                return null;
+            return xoredMethodTable ^ TypesDump.TypeIdentifiers.XorMask;
+        }
+
+        public static List<CandidateType> ToCandidateTypes(IEnumerable<TypesDump.TypeIdentifiers> typeIdentifiers)
+        {
+            List<CandidateType> results = new();
+            foreach (TypesDump.TypeIdentifiers type in typeIdentifiers)
+            {
+                ulong? methodTable = UnmaskMethodTable(type.XoredMethodTable);
+                results.Add(new CandidateType(RuntimeType.Managed, type.FullTypeName, type.Assembly, methodTable));
+            }
+            return results;
+        }
+    }
+}