run UI/NSApplicationMain as a task, fix for v8 napi on release mode

DjDeveloperr · DjDeveloperr · commit a7e8b25e42ac · 2025-05-31T01:40:42.000-04:00
diff --git a/NativeScript/CMakeLists.txt b/NativeScript/CMakeLists.txt
@@ -128,6 +128,7 @@ set(SOURCE_FILES
   ffi/InlineFunctions.mm
   ffi/ClassBuilder.mm
   ffi/NativeScriptException.mm
+  ffi/Tasks.cpp
 )
 
 if(ENABLE_JS_RUNTIME)
diff --git a/NativeScript/ffi/CFunction.mm b/NativeScript/ffi/CFunction.mm
@@ -2,6 +2,8 @@
 #include "ClassMember.h"
 #include "ObjCBridge.h"
 #include "ffi/NativeScriptException.h"
+#include "ffi/Tasks.h"
+#include "jsr.h"
 
 namespace nativescript {
 
@@ -52,7 +54,10 @@
   auto bridgeState = ObjCBridgeState::InstanceData(env);
   MDSectionOffset offset = (MDSectionOffset)((size_t)_offset);
 
+  auto name = bridgeState->metadata->getString(offset);
+
   auto func = bridgeState->getCFunction(env, offset);
+
   auto cif = func->cif;
 
   size_t argc = cif->argc;
@@ -72,6 +77,31 @@
     }
   }
 
+
+if (strcmp(name, "UIApplicationMain") == 0 || strcmp(name, "NSApplicationMain") == 0) {
+    void **avaluesPtr = new void*[cif->argc];
+    memcpy(avaluesPtr, avalues, cif->argc * sizeof(void*));
+
+    Tasks::Register([env, cif, func, rvalue, avaluesPtr]() {
+      NapiScope scope(env);
+
+      void * avalues[cif->argc];
+      memcpy(avalues, avaluesPtr, cif->argc * sizeof(void*));
+      delete[] avaluesPtr;
+      
+      @try {
+        ffi_call(&cif->cif, FFI_FN(func->fnptr), rvalue, avalues);
+      } @catch (NSException* exception) {
+        std::string message = exception.description.UTF8String;
+        NSLog(@"ObjC->JS: Exception in CFunction (task): %s", message.c_str());
+        nativescript::NativeScriptException nativeScriptException(message);
+        nativeScriptException.ReThrowToJS(env);
+      }
+    });
+    
+    return nullptr;
+  }
+
   @try {
     ffi_call(&cif->cif, FFI_FN(func->fnptr), rvalue, avalues);
   } @catch (NSException* exception) {
diff --git a/NativeScript/ffi/ClassMember.mm b/NativeScript/ffi/ClassMember.mm
@@ -144,8 +144,7 @@ napi_value JS_NSObject_alloc(napi_env env, napi_callback_info cbinfo) {
   }
 }
 
-inline bool objcNativeCall(napi_env env, napi_value jsThis, Cif* cif, id self, void** avalues,
-                           void* rvalue) {
+inline bool objcNativeCall(napi_env env, Cif* cif, id self, void** avalues, void* rvalue) {
   bool classMethod = class_isMetaClass(object_getClass(self));
 
   bool supercall = classMethod
@@ -252,7 +251,7 @@ inline id assertSelf(napi_env env, napi_value jsThis) {
 
   id rvalue;
 
-  if (!objcNativeCall(env, jsThis, cif, self, avalues, &rvalue)) {
+  if (!objcNativeCall(env, cif, self, avalues, &rvalue)) {
     return nullptr;
   }
 
@@ -319,7 +318,7 @@ inline id assertSelf(napi_env env, napi_value jsThis) {
     }
   }
 
-  if (!objcNativeCall(env, jsThis, cif, self, avalues, rvalue)) {
+  if (!objcNativeCall(env, cif, self, avalues, rvalue)) {
     return nullptr;
   }
 
@@ -361,7 +360,7 @@ inline id assertSelf(napi_env env, napi_value jsThis) {
   void* avalues[2] = {&self, &method->methodOrGetter.selector};
   void* rvalue = cif->rvalue;
 
-  if (!objcNativeCall(env, jsThis, cif, self, avalues, rvalue)) {
+  if (!objcNativeCall(env, cif, self, avalues, rvalue)) {
     return nullptr;
   }
 
@@ -403,7 +402,7 @@ inline id assertSelf(napi_env env, napi_value jsThis) {
   bool shouldFree = false;
   cif->argTypes[0]->toNative(env, argv, avalues[2], &shouldFree, &shouldFree);
 
-  if (!objcNativeCall(env, jsThis, cif, self, avalues, rvalue)) {
+  if (!objcNativeCall(env, cif, self, avalues, rvalue)) {
     return nullptr;
   }
 
diff --git a/NativeScript/ffi/Tasks.cpp b/NativeScript/ffi/Tasks.cpp
@@ -0,0 +1,25 @@
+#include "Tasks.h"
+
+namespace nativescript {
+
+void Tasks::Register(std::function<void()> task) {
+    tasks_.push_back(task);
+}
+
+void Tasks::Drain() {
+    auto i = std::begin(tasks_);
+    while (i != std::end(tasks_)) {
+        std::function<void()> task = *i;
+        task();
+        i = tasks_.erase(i);
+        ++i;
+    }
+}
+
+void Tasks::ClearTasks() {
+    tasks_.clear();
+}
+
+std::vector<std::function<void()>> Tasks::tasks_;
+
+}
diff --git a/NativeScript/ffi/Tasks.h b/NativeScript/ffi/Tasks.h
@@ -0,0 +1,20 @@
+#ifndef Tasks_h
+#define Tasks_h
+
+#include <vector>
+#include <functional>
+
+namespace nativescript {
+
+class Tasks {
+public:
+    static void Register(std::function<void()> task);
+    static void Drain();
+    static void ClearTasks();
+private:
+    static std::vector<std::function<void()>> tasks_;
+};
+
+}
+
+#endif /* Tasks_h */
diff --git a/NativeScript/napi/v8/v8-api.cpp b/NativeScript/napi/v8/v8-api.cpp
@@ -641,9 +641,8 @@ inline napi_status Wrap(napi_env env, napi_value js_object, void* native_object,
         env->isolate,
         v8::String::NewFromUtf8(env->isolate, "napi_private").ToLocalChecked());
 
-    CHECK(obj->SetPrivate(context, pkey,
-                          v8::External::New(env->isolate, reference))
-              .FromJust());
+    obj->SetPrivate(context, pkey,
+                    v8::External::New(env->isolate, reference));
   }
 
   return GET_RETURN_STATUS(env);
diff --git a/NativeScript/runtime/NativeScript.mm b/NativeScript/runtime/NativeScript.mm
@@ -1,6 +1,7 @@
 #include "NativeScript.h"
 #include "Runtime.h"
 #include "RuntimeConfig.h"
+#include "ffi/Tasks.h"
 
 using namespace nativescript;
 
@@ -25,12 +26,14 @@ - (void)runScriptString:(NSString*)script runLoop:(BOOL)runLoop {
   if (runLoop) {
     runtime_->RunLoop();
   }
+  Tasks::Drain();
 }
 
 - (void)runMainApplication {
   std::string spec = "./app/bundle.js";
   runtime_->RunModule(spec);
   runtime_->RunLoop();
+  Tasks::Drain();
 }
 
 - (bool)liveSync {
diff --git a/build_all_ios.sh b/build_all_ios.sh
@@ -2,7 +2,10 @@
 set -e
 
 rm -rf ./dist
-./update_version.sh
+# don't run if NO_UPDATE_VERSION is set
+if [ -z "$NO_UPDATE_VERSION" ]; then
+  ./update_version.sh
+fi
 ./build_metadata_generator.sh
 ./build_nativescript.sh --no-vision
 ./build_tklivesync.sh --no-vision
diff --git a/build_nativescript.sh b/build_nativescript.sh
@@ -32,12 +32,6 @@ VERBOSE=$(to_bool ${VERBOSE:=false})
 BUILD_MACOS_CLI=$(to_bool ${BUILD_MACOS_CLI:=false})
 EMBED_METADATA=$(to_bool ${EMBED_METADATA:=false})
 CONFIG_BUILD=RelWithDebInfo
-CONFIG_SIMPLE=Debug
-
-ANY_FRAMEWORK=$(to_bool ${ANY_FRAMEWORK:=false})
-if $BUILD_CATALYST || $BUILD_IPHONE || $BUILD_SIMULATOR || $BUILD_VISION || $BUILD_MACOS; then
-  ANY_FRAMEWORK=$(to_bool ${ANY_FRAMEWORK:=true})
-fi
 
 TARGET_ENGINE=${TARGET_ENGINE:=v8} # default to v8 for compat
 METADATA_SIZE=${METADATA_SIZE:=0}
@@ -153,34 +147,34 @@ fi
 
 XCFRAMEWORKS=()
 if $BUILD_CATALYST; then
-  XCFRAMEWORKS+=( -framework "$DIST/intermediates/catalyst/$CONFIG_SIMPLE-maccatalyst/NativeScript.framework"
-                  -debug-symbols "$DIST/intermediates/catalyst/$CONFIG_SIMPLE-maccatalyst/NativeScript.framework.dSYM" )
+  XCFRAMEWORKS+=( -framework "$DIST/intermediates/catalyst/$CONFIG_BUILD-maccatalyst/NativeScript.framework"
+                  -debug-symbols "$DIST/intermediates/catalyst/$CONFIG_BUILD-maccatalyst/NativeScript.framework.dSYM" )
 fi
 
 if $BUILD_SIMULATOR; then
-  XCFRAMEWORKS+=( -framework "$DIST/intermediates/ios-sim/$CONFIG_SIMPLE-iphonesimulator/NativeScript.framework"
-                  -debug-symbols "$DIST/intermediates/ios-sim/$CONFIG_SIMPLE-iphonesimulator/NativeScript.framework.dSYM" )
+  XCFRAMEWORKS+=( -framework "$DIST/intermediates/ios-sim/$CONFIG_BUILD-iphonesimulator/NativeScript.framework"
+                  -debug-symbols "$DIST/intermediates/ios-sim/$CONFIG_BUILD-iphonesimulator/NativeScript.framework.dSYM" )
 fi
 
 if $BUILD_IPHONE; then
-  XCFRAMEWORKS+=( -framework "$DIST/intermediates/ios/$CONFIG_SIMPLE-iphoneos/NativeScript.framework"
-                  -debug-symbols "$DIST/intermediates/ios/$CONFIG_SIMPLE-iphoneos/NativeScript.framework.dSYM" )
+  XCFRAMEWORKS+=( -framework "$DIST/intermediates/ios/$CONFIG_BUILD-iphoneos/NativeScript.framework"
+                  -debug-symbols "$DIST/intermediates/ios/$CONFIG_BUILD-iphoneos/NativeScript.framework.dSYM" )
 fi
 
 if $BUILD_MACOS; then
-  XCFRAMEWORKS+=( -framework "$DIST/intermediates/macos/$CONFIG_SIMPLE/NativeScript.framework"
-                  -debug-symbols "$DIST/intermediates/macos/$CONFIG_SIMPLE/NativeScript.framework.dSYM" )
+  XCFRAMEWORKS+=( -framework "$DIST/intermediates/macos/$CONFIG_BUILD/NativeScript.framework"
+                  -debug-symbols "$DIST/intermediates/macos/$CONFIG_BUILD/NativeScript.framework.dSYM" )
 fi
 
 if $BUILD_VISION; then
-  XCFRAMEWORKS+=( -framework "$DIST/intermediates/visionos/$CONFIG_SIMPLE-xros/NativeScript.framework"
-                  -debug-symbols "$DIST/intermediates/visionos/$CONFIG_SIMPLE-xros/NativeScript.framework.dSYM" )
+  XCFRAMEWORKS+=( -framework "$DIST/intermediates/visionos/$CONFIG_BUILD-xros/NativeScript.framework"
+                  -debug-symbols "$DIST/intermediates/visionos/$CONFIG_BUILD-xros/NativeScript.framework.dSYM" )
 
-  XCFRAMEWORKS+=( -framework "$DIST/intermediates/visionos-sim/$CONFIG_SIMPLE-xros/NativeScript.framework"
-                  -debug-symbols "$DIST/intermediates/visionos-sim/$CONFIG_SIMPLE-xros/NativeScript.framework.dSYM" )
+  XCFRAMEWORKS+=( -framework "$DIST/intermediates/visionos-sim/$CONFIG_BUILD-xros/NativeScript.framework"
+                  -debug-symbols "$DIST/intermediates/visionos-sim/$CONFIG_BUILD-xros/NativeScript.framework.dSYM" )
 fi
 
-if $ANY_FRAMEWORK; then
+if [[ -n "${XCFRAMEWORKS[@]}" ]]; then
 
 checkpoint "Creating NativeScript.xcframework"
 OUTPUT_DIR="$DIST/NativeScript.xcframework"
@@ -193,15 +187,15 @@ if $BUILD_MACOS; then
 
 checkpoint "Creating NativeScript.node"
 
-cp -r "$DIST/intermediates/macos/$CONFIG_SIMPLE/libNativeScript.dylib" "$DIST/NativeScript.node"
+cp -r "$DIST/intermediates/macos/$CONFIG_BUILD/libNativeScript.dylib" "$DIST/NativeScript.node"
 
 fi
 
 if $BUILD_MACOS_CLI; then
 
 checkpoint "Creating NativeScript CLI"
 
-cp -r "$DIST/intermediates/macos/$CONFIG_SIMPLE/NativeScript" "$DIST/nsr"
+cp -r "$DIST/intermediates/macos/$CONFIG_BUILD/NativeScript" "$DIST/nsr"
 
 fi
 

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@ set(SOURCE_FILES`
`128`	`128`	`ffi/InlineFunctions.mm`
`129`	`129`	`ffi/ClassBuilder.mm`
`130`	`130`	`ffi/NativeScriptException.mm`
	`131`	`+ ffi/Tasks.cpp`
`131`	`132`	`)`
`132`	`133`
`133`	`134`	`if(ENABLE_JS_RUNTIME)`
Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,7 @@ napi_value JS_NSObject_alloc(napi_env env, napi_callback_info cbinfo) {`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`
`147`		`-inline bool objcNativeCall(napi_env env, napi_value jsThis, Cif* cif, id self, void** avalues,`
`148`		`- void* rvalue) {`
	`147`	`+inline bool objcNativeCall(napi_env env, Cif* cif, id self, void** avalues, void* rvalue) {`
`149`	`148`	`bool classMethod = class_isMetaClass(object_getClass(self));`
`150`	`149`
`151`	`150`	`bool supercall = classMethod`
`@@ -252,7 +251,7 @@ inline id assertSelf(napi_env env, napi_value jsThis) {`
`252`	`251`
`253`	`252`	`id rvalue;`
`254`	`253`
`255`		`- if (!objcNativeCall(env, jsThis, cif, self, avalues, &rvalue)) {`
	`254`	`+ if (!objcNativeCall(env, cif, self, avalues, &rvalue)) {`
`256`	`255`	`return nullptr;`
`257`	`256`	`}`
`258`	`257`
`@@ -319,7 +318,7 @@ inline id assertSelf(napi_env env, napi_value jsThis) {`
`319`	`318`	`}`
`320`	`319`	`}`
`321`	`320`
`322`		`- if (!objcNativeCall(env, jsThis, cif, self, avalues, rvalue)) {`
	`321`	`+ if (!objcNativeCall(env, cif, self, avalues, rvalue)) {`
`323`	`322`	`return nullptr;`
`324`	`323`	`}`
`325`	`324`
`@@ -361,7 +360,7 @@ inline id assertSelf(napi_env env, napi_value jsThis) {`
`361`	`360`	`void* avalues[2] = {&self, &method->methodOrGetter.selector};`
`362`	`361`	`void* rvalue = cif->rvalue;`
`363`	`362`
`364`		`- if (!objcNativeCall(env, jsThis, cif, self, avalues, rvalue)) {`
	`363`	`+ if (!objcNativeCall(env, cif, self, avalues, rvalue)) {`
`365`	`364`	`return nullptr;`
`366`	`365`	`}`
`367`	`366`
`@@ -403,7 +402,7 @@ inline id assertSelf(napi_env env, napi_value jsThis) {`
`403`	`402`	`bool shouldFree = false;`
`404`	`403`	`cif->argTypes[0]->toNative(env, argv, avalues[2], &shouldFree, &shouldFree);`
`405`	`404`
`406`		`- if (!objcNativeCall(env, jsThis, cif, self, avalues, rvalue)) {`
	`405`	`+ if (!objcNativeCall(env, cif, self, avalues, rvalue)) {`
`407`	`406`	`return nullptr;`
`408`	`407`	`}`
`409`	`408`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`#include "NativeScript.h"`
`2`	`2`	`#include "Runtime.h"`
`3`	`3`	`#include "RuntimeConfig.h"`
	`4`	`+#include "ffi/Tasks.h"`
`4`	`5`
`5`	`6`	`using namespace nativescript;`
`6`	`7`
`@@ -25,12 +26,14 @@ - (void)runScriptString:(NSString*)script runLoop:(BOOL)runLoop {`
`25`	`26`	`if (runLoop) {`
`26`	`27`	`runtime_->RunLoop();`
`27`	`28`	`}`
	`29`	`+ Tasks::Drain();`
`28`	`30`	`}`
`29`	`31`
`30`	`32`	`- (void)runMainApplication {`
`31`	`33`	`std::string spec = "./app/bundle.js";`
`32`	`34`	`runtime_->RunModule(spec);`
`33`	`35`	`runtime_->RunLoop();`
	`36`	`+ Tasks::Drain();`
`34`	`37`	`}`
`35`	`38`
`36`	`39`	`- (bool)liveSync {`