chore: bump node to v22.15.0 (37-x-y) (#46869)

* chore: bump node in DEPS to v22.15.0

* inspector: fix GN build

nodejs/node#56798

* test: search cctest files

nodejs/node#56791

* crypto: fix missing OPENSSL_NO_ENGINE guard

nodejs/node#57012

* test,crypto: make tests work for BoringSSL

nodejs/node#57021

* module: use synchronous hooks for preparsing in import(cjs)

nodejs/node#55698

* deps: update simdjson to 3.12.0

nodejs/node#56874

* build: remove explicit linker call to libm on macOS

nodejs/node#56901

* test: make eval snapshot comparison more flexible

nodejs/node#57020

* src: allow embedder customization of OOMErrorHandler

nodejs/node#57325

* src: do not pass nullptr to std::string ctor

nodejs/node#57354

* src: lock the isolate properly in IsolateData destructor

nodejs/node#57031

* chore: shrink --trace-atomics-wait patch

* chore: fixup patch indices

* build: fix GN build failure

nodejs/node#57013

* crypto: expose security levels

nodejs/node#56601

* zlib: add zstd support

nodejs/node#52100

* test: move crypto related common utilities in common/crypto

nodejs/node#56714

* cli: move --trace-atomics-wait to eol

nodejs/node#52747

* test: disable test-https-client-renegotiation-limit

BoringSSL doesn't support caller-initiated renegotiation - see
https://source.chromium.org/chromium/chromium/src/+/main:third_party/boringssl/src/ssl/ssl_lib.cc;l=1627-1631

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <[email protected]>

Author: electron-roller[bot]

DEPS

@@ -4,7 +4,7 @@ vars = {
   'chromium_version':
     '138.0.7160.0',
   'node_version':
-    'v22.14.0',
+    'v22.15.0',
   'nan_version':
     'e14bdcd1f72d62bca1d541b66da43130384ec213',
   'squirrel.mac_version':

patches/chromium/build_allow_electron_to_use_exec_script.patch

@@ -6,10 +6,10 @@ Subject: build: allow electron to use exec_script
 This is similar to the //build usecase so we're OK adding ourselves here
 
 diff --git a/.gn b/.gn
-index ae58a0b0a64ae1fdb3f9cd8587041d71a121c6b9..7a1373c1cb78133375071cf5479561b64376b4dc 100644
+index ae58a0b0a64ae1fdb3f9cd8587041d71a121c6b9..0ed56526002b12deb6d29f3dd23a0d74d8e7473c 100644
 --- a/.gn
 +++ b/.gn
-@@ -167,4 +167,26 @@ exec_script_allowlist =
+@@ -167,4 +167,27 @@ exec_script_allowlist =
 
        "//tools/grit/grit_rule.gni",
        "//tools/gritsettings/BUILD.gn",
@@ -34,5 +34,6 @@ index ae58a0b0a64ae1fdb3f9cd8587041d71a121c6b9..7a1373c1cb78133375071cf5479561b6
 +      "//third_party/electron_node/deps/sqlite/unofficial.gni",
 +      "//third_party/electron_node/deps/uv/unofficial.gni",
 +      "//third_party/electron_node/deps/uvwasi/unofficial.gni",
++      "//third_party/electron_node/deps/zstd/unofficial.gni",
 +      "//third_party/electron_node/src/inspector/unofficial.gni",
      ]

patches/node/.patches

@@ -38,14 +38,10 @@ build_use_third_party_simdutf.patch
 fix_remove_fastapitypedarray_usage.patch
 test_handle_explicit_resource_management_globals.patch
 linux_try_preadv64_pwritev64_before_preadv_pwritev_4683.patch
-build_remove_explicit_linker_call_to_libm_on_macos.patch
 build_change_crdtp_protocoltypetraits_signatures_to_avoid_conflict.patch
-test_make_eval_snapshot_tests_more_flexible.patch
 build_option_to_use_custom_inspector_protocol_path.patch
 fix_adjust_wpt_and_webidl_tests_for_enabled_float16array.patch
 chore_add_createexternalizabletwobytestring_to_globals.patch
-feat_add_oom_error_callback_in_node_isolatesettings.patch
-fix_-wnonnull_warning.patch
 refactor_attach_cppgc_heap_on_v8_isolate_creation.patch
 fix_ensure_traverseparent_bails_on_resource_path_exit.patch
 cli_move_--trace-atomics-wait_to_eol.patch

patches/node/build_add_gn_build_files.patch

@@ -54,71 +54,11 @@ index a2123cc6c6d21c53fafc8934203b3720393e7b11..245a43920c7baf000ba63192a84a4c3f
  }
 
  assert(!node_enable_inspector || node_use_openssl,
-diff --git a/src/inspector/unofficial.gni b/src/inspector/unofficial.gni
-index 5d87f3c901ab509e534598ed1eb0796a96355b5e..3d7aa148678b2646b88fa7c32abec91791b02b82 100644
---- a/src/inspector/unofficial.gni
-+++ b/src/inspector/unofficial.gni
-@@ -13,7 +13,7 @@ template("inspector_gn_build") {
-   }
- 
-   node_gen_dir = get_label_info("../..", "target_gen_dir")
--  protocol_tool_path = "../../tools/inspector_protocol"
-+  protocol_tool_path = "../../deps/inspector_protocol"
- 
-   gypi_values = exec_script(
-       "../../tools/gypi_to_gn.py",
-@@ -35,6 +35,8 @@ template("inspector_gn_build") {
-     ]
- 
-     args = [
-+      "--inspector_protocol_dir",
-+      rebase_path(protocol_tool_path, root_build_dir),
-       "--jinja_dir",
-       # jinja is in third_party.
-       rebase_path("//third_party/", root_build_dir),
-@@ -72,4 +74,37 @@ template("inspector_gn_build") {
-     outputs = [ "$node_gen_dir/src/{{source_name_part}}.json" ]
-     args = [ "{{source}}" ] + rebase_path(outputs, root_build_dir)
-   }
-+
-+  config("crdtp_config") {
-+    include_dirs = [ protocol_tool_path ]
-+  }
-+
-+  static_library("crdtp") {
-+    public_configs = [ ":crdtp_config" ]
-+    sources = [
-+      "$protocol_tool_path/crdtp/cbor.cc",
-+      "$protocol_tool_path/crdtp/cbor.h",
-+      "$protocol_tool_path/crdtp/dispatch.cc",
-+      "$protocol_tool_path/crdtp/dispatch.h",
-+      "$protocol_tool_path/crdtp/error_support.cc",
-+      "$protocol_tool_path/crdtp/error_support.h",
-+      "$protocol_tool_path/crdtp/export.h",
-+      "$protocol_tool_path/crdtp/find_by_first.h",
-+      "$protocol_tool_path/crdtp/frontend_channel.h",
-+      "$protocol_tool_path/crdtp/glue.h",
-+      "$protocol_tool_path/crdtp/json.cc",
-+      "$protocol_tool_path/crdtp/json.h",
-+      "$protocol_tool_path/crdtp/parser_handler.h",
-+      "$protocol_tool_path/crdtp/protocol_core.cc",
-+      "$protocol_tool_path/crdtp/protocol_core.h",
-+      "$protocol_tool_path/crdtp/serializable.cc",
-+      "$protocol_tool_path/crdtp/serializable.h",
-+      "$protocol_tool_path/crdtp/span.cc",
-+      "$protocol_tool_path/crdtp/span.h",
-+      "$protocol_tool_path/crdtp/status.cc",
-+      "$protocol_tool_path/crdtp/status.h",
-+      "$protocol_tool_path/crdtp/json_platform.cc",
-+      "$protocol_tool_path/crdtp/json_platform.h",
-+    ]
-+  }
- }
 diff --git a/src/node_builtins.cc b/src/node_builtins.cc
-index 894fd515202cc3a1f933c2bbc618dd09869ad904..4f1ed661e9c432f3b50f2e7e348ad9794ff773d0 100644
+index e85860de93dd5753dd4542ecee9f0888af93898a..04eab49c368c8f86837ed2c1384bf3c63e4bde24 100644
 --- a/src/node_builtins.cc
 +++ b/src/node_builtins.cc
-@@ -781,6 +781,7 @@ void BuiltinLoader::RegisterExternalReferences(
+@@ -783,6 +783,7 @@ void BuiltinLoader::RegisterExternalReferences(
    registry->Register(GetNatives);
 
    RegisterExternalReferencesForInternalizedBuiltinCode(registry);
@@ -306,38 +246,53 @@ index 21992cbe894a880e3223c379326b62db22f2f12d..1296a5457422099035ba34f2b02624f2
  }  // namespace js2c
  }  // namespace node
 diff --git a/tools/search_files.py b/tools/search_files.py
-index 65d0e1be42f0a85418491ebb548278cf431aa6a0..d4a31342f1c6107b029394c6e1d00a1d1e877e03 100755
+index 856878c33681a73d41016729dabe48b0a6a80589..91a11852d206b65485fe90fd037a0bd17a16c20b 100755
 --- a/tools/search_files.py
 +++ b/tools/search_files.py
 @@ -14,6 +14,7 @@ if __name__ == '__main__':
    try:
      files = SearchFiles(*sys.argv[2:])
      files = [ os.path.relpath(x, sys.argv[1]) for x in files ]
 +    files = [os.path.normpath(x).replace(os.sep, '/') for x in files]
-     print('\n'.join(files))
-   except Exception as e:
-     print(str(e))
+     # Apply the same transform in SearchFiles after relpath
+     if sys.platform == 'win32':
+       files = [ x.replace('\\', '/') for x in files ]
 diff --git a/unofficial.gni b/unofficial.gni
-index 9e496d99d7141bf42ef7374a3c676c7b333eeeab..a2f3a769ceaa08db6d7438223884dc5aeab1340d 100644
+index 44641b92678ab2f28e6f5de75a92878f9f3d322d..672e97436d9220e8d5046b0c92025f50ae50a3d8 100644
 --- a/unofficial.gni
 +++ b/unofficial.gni
-@@ -145,6 +145,7 @@ template("node_gn_build") {
+@@ -142,32 +142,39 @@ template("node_gn_build") {
+     public_configs = [
+       ":node_external_config",
+       "deps/googletest:googletest_config",
++      ":zstd_include_config"
+     ]
      public_deps = [
        "deps/ada",
        "deps/uv",
 +      "//electron:electron_js2c",
        "deps/simdjson",
        "$node_v8_path",
      ]
-@@ -156,7 +157,6 @@ template("node_gn_build") {
+     deps = [
+       ":run_node_js2c",
+-      "deps/brotli",
+       "deps/cares",
+       "deps/histogram",
        "deps/llhttp",
        "deps/nbytes",
        "deps/nghttp2",
 -      "deps/ngtcp2",
        "deps/postject",
        "deps/sqlite",
        "deps/uvwasi",
-@@ -165,7 +165,11 @@ template("node_gn_build") {
+-      "deps/zstd",
+       "//third_party/zlib",
++      "//third_party/brotli:dec",
++      "//third_party/brotli:enc",
++      "//third_party/zstd:decompress",
++      "//third_party/zstd:headers",
+       "$node_simdutf_path",
        "$node_v8_path:v8_libplatform",
      ]
 
@@ -349,7 +304,7 @@ index 9e496d99d7141bf42ef7374a3c676c7b333eeeab..a2f3a769ceaa08db6d7438223884dc5a
        "$target_gen_dir/node_javascript.cc",
      ] + gypi_values.node_sources
 
-@@ -185,11 +189,12 @@ template("node_gn_build") {
+@@ -190,7 +197,7 @@ template("node_gn_build") {
      }
      if (node_use_openssl) {
        deps += [ "deps/ncrypto" ]
@@ -358,20 +313,26 @@ index 9e496d99d7141bf42ef7374a3c676c7b333eeeab..a2f3a769ceaa08db6d7438223884dc5a
        sources += gypi_values.node_crypto_sources
      }
      if (node_enable_inspector) {
-       deps += [
-+        "src/inspector:crdtp",
-         "src/inspector:node_protocol_generated_sources",
-         "src/inspector:v8_inspector_compress_protocol_json",
-       ]
-@@ -282,6 +287,7 @@ template("node_gn_build") {
+@@ -214,6 +221,10 @@ template("node_gn_build") {
+     }
+   }
+ 
++  config("zstd_include_config") {
++    include_dirs = [ "//third_party/zstd/src/lib" ]
++  }
++
+   executable(target_name) {
+     forward_variables_from(invoker, "*")
+ 
+@@ -288,6 +299,7 @@ template("node_gn_build") {
    }
 
    executable("node_js2c") {
 +    defines = []
      deps = [
        "deps/uv",
        "$node_simdutf_path",
-@@ -292,26 +298,75 @@ template("node_gn_build") {
+@@ -298,26 +310,75 @@ template("node_gn_build") {
        "src/embedded_data.cc",
        "src/embedded_data.h",
      ]
@@ -457,7 +418,7 @@ index 9e496d99d7141bf42ef7374a3c676c7b333eeeab..a2f3a769ceaa08db6d7438223884dc5a
      outputs = [ "$target_gen_dir/node_javascript.cc" ]
 
      # Get the path to node_js2c executable of the host toolchain.
-@@ -325,11 +380,11 @@ template("node_gn_build") {
+@@ -331,11 +392,11 @@ template("node_gn_build") {
          get_label_info(":node_js2c($host_toolchain)", "name") +
          host_executable_suffix
 

patches/node/build_allow_unbundling_of_node_js_dependencies.patch

@@ -14,18 +14,18 @@ We don't need to do this for zlib, as the existing gn workflow uses the same
 Upstreamed at https://github.com/nodejs/node/pull/55903
 
 diff --git a/unofficial.gni b/unofficial.gni
-index 08603eaef2da51fd92f9bf977647b56409eff48c..cd0eae52ca9bf244e43643a2034fa9d26c4db206 100644
+index 672e97436d9220e8d5046b0c92025f50ae50a3d8..a8ce18acfe333350f91b3e5f235db5f756b2e34a 100644
 --- a/unofficial.gni
 +++ b/unofficial.gni
-@@ -153,7 +153,6 @@ template("node_gn_build") {
+@@ -155,7 +155,6 @@ template("node_gn_build") {
        ":run_node_js2c",
        "deps/cares",
        "deps/histogram",
 -      "deps/llhttp",
        "deps/nbytes",
        "deps/nghttp2",
        "deps/postject",
-@@ -184,7 +183,17 @@ template("node_gn_build") {
+@@ -191,7 +190,17 @@ template("node_gn_build") {
        configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
        configs += [ "//build/config/gcc:symbol_visibility_default" ]
      }
@@ -44,7 +44,7 @@ index 08603eaef2da51fd92f9bf977647b56409eff48c..cd0eae52ca9bf244e43643a2034fa9d2
      if (v8_enable_i18n_support) {
        deps += [ "//third_party/icu" ]
      }
-@@ -212,6 +221,19 @@ template("node_gn_build") {
+@@ -219,6 +228,19 @@ template("node_gn_build") {
        sources += node_inspector.node_inspector_sources +
                   node_inspector.node_inspector_generated_sources
      }
@@ -63,4 +63,4 @@ index 08603eaef2da51fd92f9bf977647b56409eff48c..cd0eae52ca9bf244e43643a2034fa9d2
 +    }
    }
 
-   executable(target_name) {
+   config("zstd_include_config") {

patches/node/build_change_crdtp_protocoltypetraits_signatures_to_avoid_conflict.patch

@@ -14,7 +14,7 @@ error: duplicate symbol: crdtp::ProtocolTypeTraits<std::__Cr::basic_string<char,
 Some distinguishing change should be upstreamed to Node.js.
 
 diff --git a/src/inspector/node_string.cc b/src/inspector/node_string.cc
-index d83c53c81ca7745a31b200d5af3656af59f4f530..b2f6d412415e2988ead3c1e25b9557e1f0c91de3 100644
+index 6db4bee1072bfe911a4179c3edb2bbaf18f1a182..c603f95f1f93438bd55bce3ff7f5bb314eb33666 100644
 --- a/src/inspector/node_string.cc
 +++ b/src/inspector/node_string.cc
 @@ -7,7 +7,8 @@
@@ -44,7 +44,7 @@ index d83c53c81ca7745a31b200d5af3656af59f4f530..b2f6d412415e2988ead3c1e25b9557e1
  namespace inspector {
  namespace protocol {
 diff --git a/src/inspector/node_string.h b/src/inspector/node_string.h
-index d529d1337be0e2292202920446e841701d16b0b7..08e00f9b94918e3385aed18de80eec5c7ad81095 100644
+index 38cf96e874dcc49cde87137b2737c35a84f418d0..b2f67c224acc7b3a3b867867e251a7c62833f46e 100644
 --- a/src/inspector/node_string.h
 +++ b/src/inspector/node_string.h
 @@ -15,8 +15,8 @@ namespace crdtp {

patches/node/build_compile_with_c_20_support.patch

@@ -10,10 +10,10 @@ V8 requires C++20 support as of https://chromium-review.googlesource.com/c/v8/v8
 This can be removed when Electron upgrades to a version of Node.js containing the required V8 version.
 
 diff --git a/common.gypi b/common.gypi
-index 755bd203173a69564be203ad58c33eb50680b204..a7a0ffde7209de51ffcbf0db0ed7efcf09ad606d 100644
+index 53016fc79c3d914982abeb61bf0a76181024e2bf..99b147482b636706b1372b89298f35b60ca2bb31 100644
 --- a/common.gypi
 +++ b/common.gypi
-@@ -518,7 +518,7 @@
+@@ -530,7 +530,7 @@
            '-fno-rtti',
            '-fno-exceptions',
            '-fno-strict-aliasing',
@@ -22,7 +22,7 @@ index 755bd203173a69564be203ad58c33eb50680b204..a7a0ffde7209de51ffcbf0db0ed7efcf
          ],
          'defines': [ '__STDC_FORMAT_MACROS' ],
          'ldflags': [ '-rdynamic' ],
-@@ -688,7 +688,7 @@
+@@ -700,7 +700,7 @@
            ['clang==1', {
              'xcode_settings': {
                'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',

patches/node/build_enable_perfetto.patch

@@ -64,18 +64,18 @@ index 251f51ec454f9cba4023b8b6729241ee753aac13..1de8cac6e3953ce9cab9db03530da327
 
  module.exports = {
 diff --git a/node.gyp b/node.gyp
-index d97004c8e148be6b63634dad5306756d503fb1f8..271fb4f76bc1e69baad0b1fafca128b3bca4a360 100644
+index ec1f90b73f7d119b2c0e0207a5e36f3cec7295e9..66244b6638e34536aed397f56c6a4570a73e9b90 100644
 --- a/node.gyp
 +++ b/node.gyp
-@@ -174,7 +174,6 @@
+@@ -175,7 +175,6 @@
        'src/timers.cc',
        'src/timer_wrap.cc',
        'src/tracing/agent.cc',
 -      'src/tracing/node_trace_buffer.cc',
        'src/tracing/node_trace_writer.cc',
        'src/tracing/trace_event.cc',
        'src/tracing/traced_value.cc',
-@@ -302,7 +301,6 @@
+@@ -303,7 +302,6 @@
        'src/tcp_wrap.h',
        'src/timers.h',
        'src/tracing/agent.h',

patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch

@@ -7,10 +7,10 @@ Subject: build: ensure native module compilation fails if not using a new
 This should not be upstreamed, it is a quality-of-life patch for downstream module builders.
 
 diff --git a/common.gypi b/common.gypi
-index 5d74876ab28f8c10bb9543f7652478514414d8d2..755bd203173a69564be203ad58c33eb50680b204 100644
+index f2a45f0f0bbfce93e61d3696a18425af4d022a00..53016fc79c3d914982abeb61bf0a76181024e2bf 100644
 --- a/common.gypi
 +++ b/common.gypi
-@@ -86,6 +86,8 @@
+@@ -88,6 +88,8 @@
      'v8_use_perfetto': 0,
      'tsan%': 0,
 
@@ -19,15 +19,15 @@ index 5d74876ab28f8c10bb9543f7652478514414d8d2..755bd203173a69564be203ad58c33eb5
      ##### end V8 defaults #####
 
      # When building native modules using 'npm install' with the system npm,
-@@ -291,6 +293,7 @@
+@@ -293,6 +295,7 @@
      # Defines these mostly for node-gyp to pickup.
      'defines': [
        '_GLIBCXX_USE_CXX11_ABI=1',
 +      'ELECTRON_ENSURE_CONFIG_GYPI',
      ],
 
      # Forcibly disable -Werror.  We support a wide range of compilers, it's
-@@ -437,6 +440,11 @@
+@@ -449,6 +452,11 @@
            }],
          ],
        }],
@@ -40,10 +40,10 @@ index 5d74876ab28f8c10bb9543f7652478514414d8d2..755bd203173a69564be203ad58c33eb5
        # list in v8/BUILD.gn.
        ['v8_enable_v8_checks == 1', {
 diff --git a/configure.py b/configure.py
-index 712ed40f77e54d52d5b3c52bb68e2b7d48879812..6bcb7450975636b5dbc689470663ee37903874d5 100755
+index 95faeeef3867cbf3ca4b1857d893aa127d550a2f..b36f63a5482074f79a20709b8c4774cb6dadec52 100755
 --- a/configure.py
 +++ b/configure.py
-@@ -1644,6 +1644,7 @@ def configure_library(lib, output, pkgname=None):
+@@ -1698,6 +1698,7 @@ def configure_library(lib, output, pkgname=None):
  def configure_v8(o, configs):
    set_configuration_variable(configs, 'v8_enable_v8_checks', release=1, debug=0)
 
@@ -52,7 +52,7 @@ index 712ed40f77e54d52d5b3c52bb68e2b7d48879812..6bcb7450975636b5dbc689470663ee37
    o['variables']['v8_enable_javascript_promise_hooks'] = 1
    o['variables']['v8_enable_lite_mode'] = 1 if options.v8_lite_mode else 0
 diff --git a/src/node.h b/src/node.h
-index 7726d3de1e82689655e8fceb4135eec303498572..120e3a1042e29590cbbf4be258a1cd2d3d4f0043 100644
+index 8b77f7cb4d53105f42ba76d99a76a98b7a73789f..bdc77f8eb7abffa9e6c98cd254daedad3e44b981 100644
 --- a/src/node.h
 +++ b/src/node.h
 @@ -22,6 +22,12 @@

patches/node/build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch

@@ -34,7 +34,7 @@ index 411eab8136d5957ae8a491bc38ffbdc88e59f5da..63c93b5be09692d0d4b6bfbb214b173b
  let kResistStopPropagation;
 
 diff --git a/src/node_builtins.cc b/src/node_builtins.cc
-index 4f1ed661e9c432f3b50f2e7e348ad9794ff773d0..16c95348ee254061d5c48f405968c1b0ee33bf82 100644
+index 04eab49c368c8f86837ed2c1384bf3c63e4bde24..c3d2b3c90c206dd81a3d8aa6c14fdf4678a1cddd 100644
 --- a/src/node_builtins.cc
 +++ b/src/node_builtins.cc
 @@ -34,6 +34,7 @@ using v8::Value;