Fix exceptions handling

nilproject · Nov 5, 2023 · 0dc2e8f · 0dc2e8f
1 parent f2ea242
commit 0dc2e8f
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 13 deletions.
diff --git a/NiL.JS/Core/Functions/AsyncFunction.cs b/NiL.JS/Core/Functions/AsyncFunction.cs
@@ -10,7 +10,7 @@ namespace NiL.JS.Core.Functions
     [Prototype(typeof(Function), true)]
     internal sealed class AsyncFunction : Function
     {
-        private sealed class Сontinuator
+        internal sealed class Сontinuator
         {
             private readonly AsyncFunction _asyncFunction;
             private readonly Context _context;

diff --git a/NiL.JS/Core/GlobalContext.cs b/NiL.JS/Core/GlobalContext.cs
@@ -10,6 +10,7 @@
 using System.Dynamic;
 using System.Threading.Tasks;
 using NiL.JS.Backward;
+using System.Runtime.ExceptionServices;
 
 namespace NiL.JS.Core
 {
@@ -511,7 +512,18 @@ public JSValue ProxyValue(object value)
                         Task<JSValue> result;
                         if (Tools.IsTaskOfT(value.GetType()))
                         {
-                            result = new Task<JSValue>(() => ProxyValue(value.GetType().GetMethod("get_Result", Type.EmptyTypes).Invoke(value, null)));
+                            result = new Task<JSValue>(() =>
+                            {
+                                try
+                                {
+                                    return ProxyValue(value.GetType().GetMethod("get_Result", Type.EmptyTypes).Invoke(value, null));
+                                }
+                                catch (TargetInvocationException e)
+                                {
+                                    ExceptionDispatchInfo.Capture(e.InnerException).Throw();
+                                    throw;
+                                }
+                            });
                         }
                         else
                         {

diff --git a/NiL.JS/ExceptionHelper.cs b/NiL.JS/ExceptionHelper.cs
@@ -12,6 +12,7 @@
 using NiL.JS.Statements;
 using System.Collections;
 using System.Runtime.ExceptionServices;
+using NiL.JS.Core.Functions;
 
 namespace NiL.JS
 {
@@ -29,6 +30,7 @@ internal static class ExceptionHelper
             typeof(ExceptionHelper),
             typeof(ConstructorInfo),
             typeof(RuntimeMethodHandle),
+            typeof(AsyncFunction.Сontinuator),
         };
 
         internal sealed class StackTraceState
@@ -58,8 +60,9 @@ public string ToString(JSException jSException)
                 {
                     StackFrame frame = frames[i];
                     var method = frame.GetMethod();
-                    if (method != null
-                             && method.GetCustomAttribute(typeof(StackFrameOverrideAttribute)) != null)
+                    if (stack is not null
+                        && method is not null
+                        && method.GetCustomAttribute(typeof(StackFrameOverrideAttribute)) != null)
                     {
                         stackTraceTexts.RemoveRange(stackTraceTexts.Count - recordsToRemove, recordsToRemove);
                         recordsToRemove = 0;

diff --git a/NiL.JS/Extensions/JSValueExtensions.cs b/NiL.JS/Extensions/JSValueExtensions.cs
@@ -170,21 +170,22 @@ public static T GetDefinedOr<T>(this JSValue self, T defaultValue)
 
                 case TypeCode.Object:
                 {
-                    if (self is null || self.Value is null)
+                    var value = self.Value;
+                    if (self is null || value is null)
                         return default(T);
 
-                    if (self.Value is Function && typeof(Delegate).IsAssignableFrom(typeof(T)))
-                        return ((Function)self.Value).MakeDelegate<T>();
+                    if (value is Function && typeof(Delegate).IsAssignableFrom(typeof(T)))
+                        return ((Function)value).MakeDelegate<T>();
 
-                    if (typeof(T).IsAssignableFrom(self.Value.GetType()))
-                        return (T)self.Value;
-
-                    if (typeof(T).IsAssignableFrom(self._oValue.GetType()))
+                    if (self._oValue is not null && typeof(T).IsAssignableFrom(self._oValue.GetType()))
                         return (T)self._oValue;
 
+                    if (typeof(T).IsAssignableFrom(value.GetType()))
+                        return (T)value;
+
                     try
                     {
-                        return (T)(Tools.ConvertJStoObj(self, typeof(T), true) ?? self.Value);
+                        return (T)(Tools.ConvertJStoObj(self, typeof(T), true) ?? value);
                     }
                     catch (InvalidCastException)
                     {

diff --git a/Tests/Core/Functions/AsyncFunctionTests.cs b/Tests/Core/Functions/AsyncFunctionTests.cs
@@ -43,7 +43,7 @@ public async Task RejectedPromiseShouldBeReturnedAsFaultedTask()
             context.Eval("let result = null; async function testAsync() { result = await testAwaitable('test'); }");
 
             var task = context.GetVariable("testAsync").As<Function>().Call(new Arguments()).As<Promise>().Task;
-            await Assert.ThrowsExceptionAsync<AggregateException>(async () =>
+            await Assert.ThrowsExceptionAsync<JSException>(async () =>
             {
                 await task;
             });