From e107dd350749712fbc201f026c68f1e79d472146 Mon Sep 17 00:00:00 2001
From: TopchetoEU <36534413+TopchetoEU@users.noreply.github.com>
Date: Sat, 25 Nov 2023 18:47:36 +0200
Subject: [PATCH] fix: promise doesn't use microtasks in some cases

---
 src/me/topchetoeu/jscript/lib/PromiseLib.java | 58 +++++++++----------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/src/me/topchetoeu/jscript/lib/PromiseLib.java b/src/me/topchetoeu/jscript/lib/PromiseLib.java
index f01cb01..3c93a40 100644
--- a/src/me/topchetoeu/jscript/lib/PromiseLib.java
+++ b/src/me/topchetoeu/jscript/lib/PromiseLib.java
@@ -12,10 +12,12 @@ import me.topchetoeu.jscript.engine.values.NativeWrapper;
 import me.topchetoeu.jscript.engine.values.ObjectValue;
 import me.topchetoeu.jscript.engine.values.Values;
 import me.topchetoeu.jscript.exceptions.EngineException;
-import me.topchetoeu.jscript.exceptions.InterruptException;
 import me.topchetoeu.jscript.interop.Native;
 
 @Native("Promise") public class PromiseLib {
+    public static interface PromiseRunner {
+        Object run();
+    }
     private static class Handle {
         public final Context ctx;
         public final FunctionValue fulfilled;
@@ -168,9 +170,7 @@ import me.topchetoeu.jscript.interop.Native;
         }
 
         var fulfillHandle = new NativeFunction(null, (_ctx, th, a) -> {
-            try {
-                res.fulfill(ctx, Values.convert(ctx, fulfill.call(ctx, null, a[0]), Object.class));
-            }
+            try { res.fulfill(ctx, Values.convert(ctx, fulfill.call(ctx, null, a[0]), Object.class)); }
             catch (EngineException err) { res.reject(ctx, err.value); }
             return null;
         });
@@ -231,7 +231,7 @@ import me.topchetoeu.jscript.interop.Native;
     private boolean handled = false;
     private Object val;
 
-    public void fulfill(Context ctx, Object val) {
+    public synchronized void fulfill(Context ctx, Object val) {
         if (this.state != STATE_PENDING) return;
 
         if (val instanceof PromiseLib) ((PromiseLib)val).handle(ctx,
@@ -239,12 +239,12 @@ import me.topchetoeu.jscript.interop.Native;
             new NativeFunction(null, (e, th, a) -> { this.reject(ctx, a[0]); return null; })
         );
         else {
-            Object next;
-            try { next = Values.getMember(ctx, val, "next"); }
-            catch (IllegalArgumentException e) { next = null; }
+            Object then;
+            try { then = Values.getMember(ctx, val, "then"); }
+            catch (IllegalArgumentException e) { then = null; }
 
             try {
-                if (next instanceof FunctionValue) ((FunctionValue)next).call(ctx, val,
+                if (then instanceof FunctionValue) ((FunctionValue)then).call(ctx, val,
                     new NativeFunction((e, _thisArg, a) -> { this.fulfill(ctx, a.length > 0 ? a[0] : null); return null; }),
                     new NativeFunction((e, _thisArg, a) -> { this.reject(ctx, a.length > 0 ? a[0] : null); return null; })
                 );
@@ -252,9 +252,13 @@ import me.topchetoeu.jscript.interop.Native;
                     this.val = val;
                     this.state = STATE_FULFILLED;
 
-                    for (var handle : handles) handle.fulfilled.call(handle.ctx, null, val);
-
-                    handles = null;
+                    ctx.engine.pushMsg(false, ctx, new NativeFunction((_ctx, _thisArg, _args) -> {
+                        for (var handle : handles) {
+                            handle.fulfilled.call(handle.ctx, null, val);
+                        }
+                        handles = null;
+                        return null;
+                    }), null);
                 }
             }
             catch (EngineException err) {
@@ -262,7 +266,7 @@ import me.topchetoeu.jscript.interop.Native;
             }
         }
     }
-    public void reject(Context ctx, Object val) {
+    public synchronized void reject(Context ctx, Object val) {
         if (this.state != STATE_PENDING) return;
 
         if (val instanceof PromiseLib) ((PromiseLib)val).handle(ctx,
@@ -270,12 +274,12 @@ import me.topchetoeu.jscript.interop.Native;
             new NativeFunction(null, (e, th, a) -> { this.reject(ctx, a[0]); return null; })
         );
         else {
-            Object next;
-            try { next = Values.getMember(ctx, val, "next"); }
-            catch (IllegalArgumentException e) { next = null; }
+            Object then;
+            try { then = Values.getMember(ctx, val, "then"); }
+            catch (IllegalArgumentException e) { then = null; }
 
             try {
-                if (next instanceof FunctionValue) ((FunctionValue)next).call(ctx, val,
+                if (then instanceof FunctionValue) ((FunctionValue)then).call(ctx, val,
                     new NativeFunction((e, _thisArg, a) -> { this.reject(ctx, a.length > 0 ? a[0] : null); return null; }),
                     new NativeFunction((e, _thisArg, a) -> { this.reject(ctx, a.length > 0 ? a[0] : null); return null; })
                 );
@@ -283,19 +287,13 @@ import me.topchetoeu.jscript.interop.Native;
                     this.val = val;
                     this.state = STATE_REJECTED;
 
-                    for (var handle : handles) handle.rejected.call(handle.ctx, null, val);
-                    if (handles.size() == 0) {
-                        ctx.engine.pushMsg(true, ctx, new NativeFunction((_ctx, _thisArg, _args) -> {
-                            if (!handled) {
-                                Values.printError(new EngineException(val).setCtx(ctx.environment(), ctx.engine), "(in promise)");
-                                throw new InterruptException();
-                            }
-
-                            return null;
-                        }), null);
-                    }
-
-                    handles = null;
+                    ctx.engine.pushMsg(false, ctx, new NativeFunction((_ctx, _thisArg, _args) -> {
+                        for (var handle : handles) handle.rejected.call(handle.ctx, null, val);
+                        if (!handled) {
+                            Values.printError(new EngineException(val).setCtx(ctx.environment(), ctx.engine), "(in promise)");
+                        }
+                        return null;
+                    }), null);
                 }
             }
             catch (EngineException err) {