fix: only delay promise resolution when needed (#154)

NativeScript · Mar 18, 2022 · f46c425 · f46c425
1 parent 3e318c1
commit f46c425
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/NativeScript/NativeScript-Prefix.pch b/NativeScript/NativeScript-Prefix.pch
@@ -1,7 +1,7 @@
 #ifndef NativeScript_Prefix_pch
 #define NativeScript_Prefix_pch
 
-#define NATIVESCRIPT_VERSION "8.2.1"
+#define NATIVESCRIPT_VERSION "8.2.2-alpha.0"
 
 #ifdef DEBUG
 #define SIZEOF_OFF_T 8

diff --git a/NativeScript/runtime/PromiseProxy.cpp b/NativeScript/runtime/PromiseProxy.cpp
@@ -17,11 +17,21 @@ void PromiseProxy::Init(v8::Local<v8::Context> context) {
 
                     let promise = new target(function(resolve, reject) {
                         origFunc(value => {
-                            CFRunLoopPerformBlock(runloop, kCFRunLoopDefaultMode, resolve.bind(this, value));
-                            CFRunLoopWakeUp(runloop);
+                            const resolveCall = resolve.bind(this, value);
+                            if (runloop === CFRunLoopGetCurrent()) {
+                                resolveCall();
+                            } else {
+                                CFRunLoopPerformBlock(runloop, kCFRunLoopDefaultMode, resolveCall);
+                                CFRunLoopWakeUp(runloop);
+                            }
                         }, reason => {
-                            CFRunLoopPerformBlock(runloop, kCFRunLoopDefaultMode, reject.bind(this, reason));
-                            CFRunLoopWakeUp(runloop);
+                            const rejectCall = reject.bind(this, reason);
+                            if (runloop === CFRunLoopGetCurrent()) {
+                                rejectCall();
+                            } else {
+                                CFRunLoopPerformBlock(runloop, kCFRunLoopDefaultMode, rejectCall);
+                                CFRunLoopWakeUp(runloop);
+                            }
                         });
                     });
 
@@ -32,6 +42,10 @@ void PromiseProxy::Init(v8::Local<v8::Context> context) {
                                 return orig.bind(target);
                             }
                             return typeof orig === 'function' ? function(x) {
+                                if (runloop === CFRunLoopGetCurrent()) {
+                                    orig.bind(target, x)();
+                                    return target;
+                                }
                                 CFRunLoopPerformBlock(runloop, kCFRunLoopDefaultMode, orig.bind(target, x));
                                 CFRunLoopWakeUp(runloop);
                                 return target;

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@nativescript/ios",
   "description": "NativeScript Runtime for iOS",
-  "version": "8.2.1",
+  "version": "8.2.2-alpha.0",
   "keywords": [
     "NativeScript",
     "iOS",