joeferner · joeferner · Oct 18, 2025 · Oct 16, 2025
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/javascript-node:22
+FROM mcr.microsoft.com/devcontainers/javascript-node:24

 # need to run update and install at the same time to prevent stale update layer
 RUN apt-get update && apt-get install -y gdb clang-format openjdk-21-jdk maven
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -9,7 +9,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        nodeVersion: [ 20, 22 ]
+        nodeVersion: [ 20, 22, 24 ]
        jdkVersion: [ openjdk9, openjdk10, openjdk11, openjdk21 ]
    steps:
      - name: Checkout source code

diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
@@ -10,7 +10,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        nodeVersion: [ 20, 22 ]
+        nodeVersion: [ 20, 22, 24 ]
        jdkVersion: [ openjdk9, openjdk10, openjdk11, openjdk21 ]
    steps:
      - name: Checkout source code

diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ node-java.cbp
 */.kdev_include_paths
 CMakeLists.txt
 cmake-build-debug/
+hs_err*
diff --git a/README.md b/README.md
@@ -884,7 +884,7 @@ Either `./scripts/postInstall.js` didn't run or there was a problem detecting ja
 ## Debugging

        npm install
-        node-gyp build --debug
+        npx node-gyp build --debug
        gdb --args "$(which node)" ./node_modules/.bin/vitest test

 ## License

diff --git a/package-lock.json b/package-lock.json
diff --git a/src-cpp/javaObject.cpp b/src-cpp/javaObject.cpp
@@ -325,14 +325,15 @@ NAN_INDEX_GETTER(JavaObject::indexGetter) {
  assertNoException(env);
  if ((jint)index >= arrayLength) {
    info.GetReturnValue().SetUndefined();
-    return;
+    RETURN_INTERCEPTED_YES;
  }

  jmethodID array_get = env->GetStaticMethodID(arrayClass, "get", "(Ljava/lang/Object;I)Ljava/lang/Object;");
  jobject item = env->CallStaticObjectMethod(arrayClass, array_get, self->m_obj, index);
  assertNoException(env);
  v8::Local<v8::Value> result = javaToV8(self->m_java, env, item);
  info.GetReturnValue().Set(result);
+  RETURN_INTERCEPTED_YES;
 }

 /*static*/ Nan::Persistent<v8::FunctionTemplate> JavaProxyObject::s_proxyCt;

diff --git a/src-cpp/utils.h b/src-cpp/utils.h
@@ -16,6 +16,14 @@ class Java;
 #define V8_HIDDEN_MARKER_JAVA_LONG "__isJavaLong"
 #define V8_HIDDEN_MARKER_JAVA_OBJECT "__isJavaObject"

+#if NODE_MAJOR_VERSION >= 23
+  #define RETURN_INTERCEPTED_YES return v8::Intercepted::kYes
+  #define RETURN_INTERCEPTED_NO  return v8::Intercepted::kNo
+#else
+  #define RETURN_INTERCEPTED_YES return
+  #define RETURN_INTERCEPTED_NO  return
+#endif
+
 typedef enum _jvalueType {
  TYPE_VOID = 1,
  TYPE_INT = 2,