UnwrapIfPromise Call RunAvailableContinuations (#1813)

Jint.Tests/Runtime/AsyncTests.cs

@@ -228,4 +228,54 @@ async function foo(name) {
 
         Assert.Equal(expected, log.Select(x => x.AsString()).ToArray());
     }
+
+    [Fact]
+    public void ShouldPromiseBeResolved()
+    {
+        var log = new List<string>();
+        Engine engine = new();
+        engine.SetValue("log", (string str) =>
+        {
+            log.Add(str);
+        });
+
+        const string Script = """
+          async function main() {
+            return new Promise(function (resolve) {
+              log('Promise!')
+              resolve(null)
+            }).then(function () {
+              log('Resolved!')
+            });
+          }
+        """;
+        var result = engine.Execute(Script);
+        var val = result.GetValue("main");
+        val.Call().UnwrapIfPromise();
+        Assert.Equal(2, log.Count);
+        Assert.Equal("Promise!", log[0]);
+        Assert.Equal("Resolved!", log[1]);
+    }
+
+    [Fact]
+    public void ShouldPromiseBeResolved2()
+    {
+        Engine engine = new();
+        engine.SetValue("setTimeout",
+            (Action action, int ms) =>
+            {
+                Task.Delay(ms).ContinueWith(_ => action());
+            });
+
+        const string Script = """
+          var delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
+          async function main() {
+            await delay(100);
+            return 1;
+          }
+        """;
+        var result = engine.Execute(Script);
+        var val = result.GetValue("main").Call();
+        Assert.Equal(1, val.UnwrapIfPromise().AsInteger());
+    }
 }

Jint/JsValueExtensions.cs

@@ -630,6 +630,18 @@ public static JsValue UnwrapIfPromise(this JsValue value)
     {
         if (value is JsPromise promise)
         {
+            var engine = promise.Engine;
+            var task = promise.TaskCompletionSource.Task;
+            engine.RunAvailableContinuations();
+            engine.AddToEventLoop(() =>
+            {
+                if (!task.IsCompleted)
+                {
+                    // Task.Wait has the potential of inlining the task's execution on the current thread; avoid this.
+                    ((IAsyncResult) task).AsyncWaitHandle.WaitOne();
+                }
+            });
+            engine.RunAvailableContinuations();
             switch (promise.State)
             {
                 case PromiseState.Pending:

Jint/Native/Date/MimeKit.cs

@@ -454,7 +454,9 @@ private static bool TryParseStandardDateFormat(List<DateToken> tokens, byte[] te
         return true;
     }
 
+#pragma warning disable CA1859
     private static bool TryParseUnknownDateFormat(IList<DateToken> tokens, byte[] text, out DateTimeOffset date)
+#pragma warning restore CA1859
     {
         int? day = null, month = null, year = null, tzone = null;
         int hour = 0, minute = 0, second = 0;

Jint/Native/JsPromise.cs

@@ -12,6 +12,7 @@ internal sealed class JsPromise : ObjectInstance
 
     // valid only in settled state (Fulfilled or Rejected)
     internal JsValue Value { get; private set; } = null!;
+    internal TaskCompletionSource<JsPromise> TaskCompletionSource { get; }= new();
 
     internal List<PromiseReaction> PromiseRejectReactions = new();
     internal List<PromiseReaction> PromiseFulfillReactions = new();
@@ -126,6 +127,7 @@ private JsValue RejectPromise(JsValue reason)
         var reactions = PromiseRejectReactions;
         PromiseRejectReactions = new List<PromiseReaction>();
         PromiseFulfillReactions.Clear();
+        TaskCompletionSource.SetCanceled();
 
         // Note that this part is skipped because there is no tracking yet
         // 7. If promise.[[PromiseIsHandled]] is false, perform HostPromiseRejectionTracker(promise, "reject").
@@ -145,6 +147,7 @@ private JsValue FulfillPromise(JsValue result)
         var reactions = PromiseFulfillReactions;
         PromiseFulfillReactions = new List<PromiseReaction>();
         PromiseRejectReactions.Clear();
+        TaskCompletionSource.SetResult(this);
 
         return PromiseOperations.TriggerPromiseReactions(_engine, reactions, result);
     }

Jint/Native/JsValue.cs

@@ -178,15 +178,6 @@ internal static JsValue ConvertTaskToPromise(Engine engine, Task task)
                 }
             });
 
-            engine.AddToEventLoop(() =>
-            {
-                if (!task.IsCompleted)
-                {
-                    // Task.Wait has the potential of inlining the task's execution on the current thread; avoid this.
-                    ((IAsyncResult) task).AsyncWaitHandle.WaitOne();
-                }
-            });
-
             return promise;
         }
 

Jint/Runtime/Interpreter/Expressions/JintAwaitExpression.cs

@@ -34,7 +34,6 @@ protected override object EvaluateInternal(EvaluationContext context)
                 value = promiseInstance;
             }
 
-            engine.RunAvailableContinuations();
             return value.UnwrapIfPromise();
         }
         catch (PromiseRejectedException e)