more macos tests

Author: DjDeveloperr

NativeScript/CMakeLists.txt

@@ -290,6 +290,17 @@ target_sources(
   "NativeScript.h"
 )
 
+if(TARGET_ENGINE_V8 AND TARGET_PLATFORM_IOS)
+  # iOS V8 slices are built with pointer compression enabled. Keep embedder
+  # build flags in sync to satisfy V8::Initialize() build config checks.
+  target_compile_definitions(
+    ${NAME}
+    PRIVATE
+    V8_COMPRESS_POINTERS
+    V8_31BIT_SMIS_ON_64BIT_ARCH
+  )
+endif()
+
 set(FRAMEWORK_VERSION_VALUE "${VERSION}")
 if(TARGET_PLATFORM_MACOS)
   # macOS framework consumers (including Xcode's copy/sign phases) expect

NativeScript/napi/v8/jsr.cpp

@@ -8,12 +8,23 @@
 #include <ctime>
 #include <fstream>
 
+#if defined(__APPLE__)
+#include <TargetConditionals.h>
+#endif
+
 #include "libplatform/libplatform.h"
 #include "v8-fast-api-calls.h"
 
 using namespace v8;
 using namespace tns;
 
+#if defined(__APPLE__) && TARGET_OS_IPHONE
+static_assert(v8::internal::PointerCompressionIsEnabled(),
+              "iOS V8 embedder must be built with pointer compression enabled");
+static_assert(v8::internal::SmiValuesAre31Bits(),
+              "iOS V8 embedder must use 31-bit smis on 64-bit arch");
+#endif
+
 tns::SimpleAllocator g_allocator;
 
 static void divide(const FunctionCallbackInfo<Value>& args) {

NativeScript/napi/v8/v8_inspector/src/base/base-export.h

@@ -5,7 +5,7 @@
 #ifndef V8_BASE_BASE_EXPORT_H_
 #define V8_BASE_BASE_EXPORT_H_
 
-#include "include/v8config.h"
+#include "v8config.h"
 
 #if V8_OS_WIN
 

NativeScript/napi/v8/v8_inspector/src/base/bounds.h

@@ -5,7 +5,7 @@
 #ifndef V8_BASE_BOUNDS_H_
 #define V8_BASE_BOUNDS_H_
 
-#include "include/v8config.h"
+#include "v8config.h"
 #include "src/base/macros.h"
 
 namespace v8 {

NativeScript/napi/v8/v8_inspector/src/base/build_config.h

@@ -5,7 +5,7 @@
 #ifndef V8_BASE_BUILD_CONFIG_H_
 #define V8_BASE_BUILD_CONFIG_H_
 
-#include "include/v8config.h"
+#include "v8config.h"
 
 // Processor architecture detection.  For more info on what's defined, see:
 //   http://msdn.microsoft.com/en-us/library/b0084kay.aspx

NativeScript/napi/v8/v8_inspector/src/base/compiler-specific.h

@@ -5,7 +5,7 @@
 #ifndef V8_BASE_COMPILER_SPECIFIC_H_
 #define V8_BASE_COMPILER_SPECIFIC_H_
 
-#include "include/v8config.h"
+#include "v8config.h"
 
 // Annotation to silence compiler warnings about unused
 // types/functions/variables. Use like:

NativeScript/napi/v8/v8_inspector/src/base/immediate-crash.h

@@ -5,7 +5,7 @@
 #ifndef V8_BASE_IMMEDIATE_CRASH_H_
 #define V8_BASE_IMMEDIATE_CRASH_H_
 
-#include "include/v8config.h"
+#include "v8config.h"
 #include "src/base/build_config.h"
 
 // Crashes in the fastest possible way with no attempt at logging.

NativeScript/napi/v8/v8_inspector/src/base/platform/platform-posix.h

@@ -5,7 +5,7 @@
 #ifndef V8_BASE_PLATFORM_PLATFORM_POSIX_H_
 #define V8_BASE_PLATFORM_PLATFORM_POSIX_H_
 
-#include "include/v8config.h"
+#include "v8config.h"
 #include "src/base/platform/platform.h"
 #include "src/base/timezone-cache.h"
 

NativeScript/napi/v8/v8_inspector/src/inspector/test-interface.h

@@ -5,7 +5,7 @@
 #ifndef V8_INSPECTOR_TEST_INTERFACE_H_
 #define V8_INSPECTOR_TEST_INTERFACE_H_
 
-#include "include/v8config.h"
+#include "v8config.h"
 
 namespace v8_inspector {
 

NativeScript/runtime/NativeScript.mm

@@ -1,6 +1,9 @@
 #include "NativeScript.h"
 #include "Runtime.h"
 #include "RuntimeConfig.h"
+#include "js_native_api.h"
+#include "jsr.h"
+#include "ffi/NativeScriptException.h"
 #include "ffi/Tasks.h"
 
 using namespace nativescript;
@@ -31,13 +34,93 @@ - (void)runScriptString:(NSString*)script runLoop:(BOOL)runLoop {
 
 - (void)runMainApplication {
   std::string spec = "./app";
-  runtime_->RunModule(spec);
+  try {
+    runtime_->RunModule(spec);
+  } catch (const NativeScriptException& e) {
+    std::string description = e.Description();
+    NSLog(@"NativeScript runMainApplication failed: %s", description.c_str());
+    @throw [NSException exceptionWithName:@"NativeScriptException"
+                                   reason:@(description.c_str())
+                                 userInfo:nil];
+  } catch (const std::exception& e) {
+    NSLog(@"NativeScript runMainApplication failed: %s", e.what());
+    @throw [NSException exceptionWithName:@"NativeScriptException"
+                                   reason:@(e.what())
+                                 userInfo:nil];
+  }
   runtime_->RunLoop();
   Tasks::Drain();
 }
 
 - (bool)liveSync {
-  return false;
+  if (!runtime_) {
+    return false;
+  }
+
+  napi_env env = runtime_->GetEnv();
+  if (env == nullptr) {
+    return false;
+  }
+
+  bool didInvokeCallback = false;
+
+  NapiScope scope(env);
+
+  napi_value global;
+  if (napi_get_global(env, &global) != napi_ok) {
+    return false;
+  }
+
+  bool hasLiveSyncCallback = false;
+  if (napi_has_named_property(env, global, "__onLiveSync",
+                              &hasLiveSyncCallback) != napi_ok ||
+      !hasLiveSyncCallback) {
+    return false;
+  }
+
+  napi_value callback;
+  if (napi_get_named_property(env, global, "__onLiveSync", &callback) != napi_ok) {
+    return false;
+  }
+
+  napi_valuetype callbackType;
+  if (napi_typeof(env, callback, &callbackType) != napi_ok ||
+      callbackType != napi_function) {
+    return false;
+  }
+
+  napi_value context;
+  if (napi_create_object(env, &context) != napi_ok) {
+    return false;
+  }
+
+  napi_value result;
+  napi_status status = napi_call_function(env, global, callback, 1, &context, &result);
+  if (status != napi_ok) {
+    bool hasPendingException = false;
+    if (napi_is_exception_pending(env, &hasPendingException) == napi_ok &&
+        hasPendingException) {
+      napi_value error;
+      napi_get_and_clear_last_exception(env, &error);
+    }
+    return false;
+  }
+
+  didInvokeCallback = true;
+
+  if (result != nullptr) {
+    napi_valuetype returnType;
+    if (napi_typeof(env, result, &returnType) == napi_ok &&
+        returnType == napi_boolean) {
+      bool callbackResult = false;
+      if (napi_get_value_bool(env, result, &callbackResult) == napi_ok) {
+        didInvokeCallback = callbackResult;
+      }
+    }
+  }
+
+  Tasks::Drain();
+  return didInvokeCallback;
 }
 
 - (void)shutdownRuntime {