Update Node-API to latest from node.js (#70)

Co-authored-by: Cedric Guillemet <[email protected]>
Co-authored-by: Gary Hsu <[email protected]>

Author: 3 people

.github/azure-pipelines.yml

@@ -4,6 +4,10 @@ trigger:
 pr:
 - main
 
+variables:
+- name: ndkVersion
+  value: 25.2.9519653
+
 jobs:
   # WIN32
   - template: jobs/win32.yml
@@ -71,6 +75,18 @@ jobs:
 
   # iOS
   - template: jobs/ios.yml
+    parameters:
+      name: 'iOS_Xcode142'
+      vmImage: 'macOS-latest'
+      xCodeVersion: 14.2
+      simulator: 'iPhone 11'
+
+  - template: jobs/ios.yml
+    parameters:
+      name: 'iOS_Xcode150'
+      vmImage: 'macOS-13'
+      xCodeVersion: 15.0
+      simulator: 'iPhone 14'
 
   # Linux
   - template: jobs/linux.yml

.github/jobs/android.yml

@@ -32,7 +32,7 @@ jobs:
     inputs:
       gradleWrapperFile: 'Tests/UnitTests/Android/gradlew'
       workingDirectory: 'Tests/UnitTests/Android'
-      options: '-PabiFilters=x86_64 -PjsEngine=${{parameters.jsEngine}}'
+      options: '-PabiFilters=x86_64 -PjsEngine=${{parameters.jsEngine}} -PndkVersion=$(ndkVersion)'
       tasks: 'connectedAndroidTest'
       jdkVersionOption: 1.11
     displayName: 'Run Connected Android Test'

.github/jobs/ios.yml

@@ -1,14 +1,20 @@
+parameters:
+  name: ''
+  vmImage: ''
+  xCodeVersion: ''
+  simulator: ''
+
 jobs:
-- job: iOS
+- job: ${{parameters.name}}
   timeoutInMinutes: 15
 
   pool:
-    vmImage: macos-latest
+    vmImage: ${{parameters.vmImage}}
 
   steps:
   - script: |
-      sudo xcode-select --switch /Applications/Xcode_14.0.app/Contents/Developer
-    displayName: 'Select XCode 14.0'
+      sudo xcode-select --switch /Applications/Xcode_${{parameters.xCodeVersion}}.app/Contents/Developer
+    displayName: 'Select XCode ${{parameters.xCodeVersion}}'
 
   - script: |
       cmake -B Build/iOS -G Xcode -D IOS=ON
@@ -24,8 +30,8 @@ jobs:
     displayName: 'Build Xcode Project'
 
   - script: |
-      echo Boot iOS Simulator
-      xcrun simctl boot "iPhone 11"
+      echo Boot "${{parameters.simulator}}"
+      xcrun simctl boot "${{parameters.simulator}}"
       echo Install UnitTests app
       xcrun simctl install booted "Build/iOS/Tests/UnitTests/RelWithDebInfo-iphonesimulator/UnitTests.app"
       echo Launch UnitTests app

CMakeLists.txt

@@ -26,7 +26,7 @@ FetchContent_Declare(ios-cmake
 FetchContent_Declare(llhttp
     URL "https://github.com/nodejs/llhttp/archive/refs/tags/release/v8.1.0.tar.gz")
 FetchContent_Declare(UrlLib
-    GIT_REPOSITORY https://github.com/bghgary/UrlLib.git
+    GIT_REPOSITORY https://github.com/BabylonJS/UrlLib.git
     GIT_TAG 59917f32f6ddfa26af07dd981842c51ce02dafcd)
 # --------------------------------------------------
 

Core/AppRuntime/Source/AppRuntime_V8.cpp

@@ -36,7 +36,7 @@ namespace Babylon
             ~Module()
             {
                 v8::V8::Dispose();
-                v8::V8::ShutdownPlatform();
+                v8::V8::DisposePlatform();
             }
 
             static Module& Initialize(const char* executablePath)

Core/AppRuntime/V8Inspector/Source/V8InspectorAgent.cpp

@@ -234,7 +234,13 @@ namespace Babylon
         void connectFrontend()
         {
             session_ = inspector_->connect(
-                1, new ChannelImpl(agent_), v8_inspector::StringView());
+                1, new ChannelImpl(agent_), v8_inspector::StringView()
+// v8-android package and v8 nuget do not share the same V8 version. A change in V8_inspector API forces us to add this
+// ifndef check. This will be fixed in a future nuget package update.
+#ifndef ANDROID
+                , v8_inspector::V8Inspector::kFullyTrusted
+#endif
+            );
         }
 
         void disconnectFrontend()
@@ -471,7 +477,7 @@ namespace Babylon
         v8::Local<v8::Context> context =
             v8::Isolate::GetCurrent()->GetCurrentContext();
 
-        int script_id = static_cast<int>(message->GetScriptOrigin().ScriptID()->Value());
+        int script_id = message->GetScriptOrigin().ScriptId();
 
         v8::Local<v8::StackTrace> stack_trace = message->GetStackTrace();
 

Core/AppRuntime/V8Inspector/Source/V8InspectorTCP.h

@@ -2,6 +2,14 @@
 // Licensed under the MIT license.
 // This code is based on the old node inspector implementation. See NOTICE.md for Node.js' project license details
 #pragma once
+
+// 'allocator<void>' is deprecated 
+// Android with NDK25
+// 23/10/04 : allocator still present in latest asio main branch
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 #ifdef WIN32
 #include <Winsock2.h>
 #endif

Core/Node-API/CMakeLists.txt

@@ -31,11 +31,11 @@ if(NAPI_BUILD_ABI)
             file(RENAME "${CMAKE_CURRENT_BINARY_DIR}/package-${name}.json" "${CMAKE_CURRENT_BINARY_DIR}/package.json")
             npm(install --no-package-lock --silent WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
-            file(GLOB_RECURSE ANDROID_ARCHIVE "${CMAKE_CURRENT_BINARY_DIR}/node_modules/${name}-android/${aar_path}/*.aar")
+            file(GLOB_RECURSE ANDROID_ARCHIVE "${CMAKE_CURRENT_BINARY_DIR}/node_modules/${V8_PACKAGE_NAME}/${aar_path}/*.aar")
             file(ARCHIVE_EXTRACT INPUT ${ANDROID_ARCHIVE} DESTINATION ${output_directory} PATTERNS jni)
-            message(STATUS "Extracting ${name}-android archive - done")
+            message(STATUS "Extracting ${V8_PACKAGE_NAME} archive - done")
 
-            file(COPY "${CMAKE_CURRENT_BINARY_DIR}/node_modules/${name}-android/dist/include" DESTINATION ${output_directory})
+            file(COPY "${CMAKE_CURRENT_BINARY_DIR}/node_modules/${V8_PACKAGE_NAME}/dist/include" DESTINATION ${output_directory})
         endfunction()
     endif()
 
@@ -54,7 +54,8 @@ if(NAPI_BUILD_ABI)
             "Source/js_native_api_javascriptcore.h")
 
         if(ANDROID)
-            set(JSC_ANDROID_DIR "${CMAKE_CURRENT_BINARY_DIR}/jsc-android")
+            set(V8_PACKAGE_NAME "jsc-android")
+            set(JSC_ANDROID_DIR "${CMAKE_CURRENT_BINARY_DIR}/${V8_PACKAGE_NAME}")
             napi_install_android_package(jsc "dist/org/webkit/android-jsc" ${JSC_ANDROID_DIR})
 
             # Add `JavaScriptCore` prefix to the include path
@@ -87,21 +88,24 @@ if(NAPI_BUILD_ABI)
             "Source/js_native_api_v8_internals.h")
 
         if(ANDROID)
-            set(V8_ANDROID_DIR "${CMAKE_CURRENT_BINARY_DIR}/v8-android")
+            set(V8_PACKAGE_NAME "v8-android-jit-nointl-nosnapshot")
+            set(V8_ANDROID_DIR "${CMAKE_CURRENT_BINARY_DIR}/${V8_PACKAGE_NAME}")
             napi_install_android_package(v8 "dist/org/chromium" ${V8_ANDROID_DIR})
 
             set(INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES}
                 PUBLIC "${V8_ANDROID_DIR}/include")
 
             set(LINK_LIBRARIES ${LINK_LIBRARIES}
                 PUBLIC "${V8_ANDROID_DIR}/jni/${ANDROID_ABI}/libv8android.so")
+
+            set(NAPI_DEFINITIONS PUBLIC V8_COMPRESS_POINTERS)
         elseif(WIN32)
             set_cpu_platform_arch()
-            set(V8_VERSION "8.4.371.15")
+            set(V8_VERSION "11.9.169.4")
             download_nuget()
-            set(V8_PACKAGE_PATH "${NUGET_PATH}/packages/v8-v142-${CPU_ARCH}.${V8_VERSION}")
-            set(V8_PACKAGE_PATH "${NUGET_PATH}/packages/v8-v142-${CPU_ARCH}.${V8_VERSION}")
-            set(V8_REDIST_PACKAGE_PATH "${NUGET_PATH}/packages/v8.redist-v142-${CPU_ARCH}.${V8_VERSION}")
+            set(V8_PACKAGE_PATH "${NUGET_PATH}/packages/v8-v143-${CPU_ARCH}.${V8_VERSION}")
+            set(V8_PACKAGE_PATH "${NUGET_PATH}/packages/v8-v143-${CPU_ARCH}.${V8_VERSION}")
+            set(V8_REDIST_PACKAGE_PATH "${NUGET_PATH}/packages/v8.redist-v143-${CPU_ARCH}.${V8_VERSION}")
 
             add_library(v8_libbase SHARED IMPORTED)
             set_target_properties(v8_libbase PROPERTIES IMPORTED_IMPLIB "${V8_PACKAGE_PATH}/lib/Release/v8_libbase.dll.lib")
@@ -111,15 +115,16 @@ if(NAPI_BUILD_ABI)
             set_target_properties(v8 PROPERTIES IMPORTED_IMPLIB "${V8_PACKAGE_PATH}/lib/Release/v8.dll.lib")
             target_link_libraries(v8 INTERFACE v8_libbase INTERFACE v8_libplatform)
             target_include_directories(v8 INTERFACE "${V8_PACKAGE_PATH}/include")
-            
+
             set(V8_DIST
                 "${V8_REDIST_PACKAGE_PATH}/lib/Release/icudtl.dat"
-                "${V8_REDIST_PACKAGE_PATH}/lib/Release/icui18n.dll"
+                "${V8_REDIST_PACKAGE_PATH}/lib/Release/third_party_icu_icui18n.dll"
+                "${V8_REDIST_PACKAGE_PATH}/lib/Release/third_party_abseil-cpp_absl.dll"
                 "${V8_REDIST_PACKAGE_PATH}/lib/Release/icuuc.dll"
                 "${V8_REDIST_PACKAGE_PATH}/lib/Release/v8.dll"
                 "${V8_REDIST_PACKAGE_PATH}/lib/Release/v8_libbase.dll"
                 "${V8_REDIST_PACKAGE_PATH}/lib/Release/v8_libplatform.dll"
-                "${V8_REDIST_PACKAGE_PATH}/lib/Release/zlib.dll")
+                "${V8_REDIST_PACKAGE_PATH}/lib/Release/third_party_zlib.dll")
 
             # only 1 imported location per library -> Adding 1 library per file
             foreach(V8FILE ${V8_DIST})
@@ -132,18 +137,18 @@ if(NAPI_BUILD_ABI)
             set(LINK_LIBRARIES ${LINK_LIBRARIES}
                 PUBLIC v8
                 PRIVATE v8::icudtl
-                PRIVATE v8::icui18n
+                PRIVATE v8::third_party_icu_icui18n
                 PRIVATE v8::icuuc
                 PRIVATE v8::v8
                 PRIVATE v8::v8_libbase
                 PRIVATE v8::v8_libplatform
-                PRIVATE v8::zlib)
-            
+                PRIVATE v8::third_party_zlib)
+
             if(CPU_ARCH STREQUAL "x64")
                 # Enable V8 Pointer Compression
                 # https://v8.dev/blog/pointer-compression
                 # https://stackoverflow.com/q/62921373
-                set(NAPI_DEFINITIONS PUBLIC V8_COMPRESS_POINTERS)
+                set(NAPI_DEFINITIONS PUBLIC V8_COMPRESS_POINTERS V8_ENABLE_SANDBOX)
             endif()
         else()
             message(FATAL_ERROR "Unsupported JavaScript engine: ${NAPI_JAVASCRIPT_ENGINE}")
@@ -160,6 +165,8 @@ add_library(napi ${SOURCES})
 target_compile_definitions(napi
     PUBLIC NODE_ADDON_API_DISABLE_DEPRECATED
     PUBLIC NODE_ADDON_API_DISABLE_NODE_SPECIFIC
+    PUBLIC NAPI_VERSION=5
+    PUBLIC NAPI_HAS_THREADS=0
     ${NAPI_DEFINITIONS})
 
 target_include_directories(napi ${INCLUDE_DIRECTORIES})