java-caller 3.3.2-beta202404281910.0 → 4.0.1-beta202405081245.0

package/lib/java-caller.js

@@ -10,7 +10,7 @@ const semver = require("semver");
 
 class JavaCaller {
     "use strict";
-    minimumJavaVersion = 8;
+    minimumJavaVersion = os.platform() === "darwin" ? 11 : 8; // Mac starts at 11
     maximumJavaVersion;
     javaType;
     rootPath = ".";
@@ -30,6 +30,7 @@ class JavaCaller {
 
     javaHome;
     javaBin;
+    javaExecutableFromNodeJavaCaller;
 
     prevPath;
     prevJavaHome;
@@ -59,6 +60,7 @@ class JavaCaller {
         this.rootPath = opts.rootPath || this.rootPath;
         this.javaCallerSupportDir = `${os.homedir() + path.sep}.java-caller`;
         this.javaExecutable = opts.javaExecutable || process.env.JAVA_CALLER_JAVA_EXECUTABLE || this.javaExecutable;
+        this.javaExecutableFromNodeJavaCaller = null;
         this.additionalJavaArgs = opts.additionalJavaArgs || this.additionalJavaArgs;
         this.output = opts.output || this.output;
     }
@@ -85,7 +87,7 @@ class JavaCaller {
         this.commandJavaArgs = (runOptions.javaArgs || []).concat(this.additionalJavaArgs);
 
         let javaExe = runOptions.windowless ? this.javaExecutableWindowless : this.javaExecutable;
-        if (javaExe.toLowerCase().includes(".exe") && !javaExe.includes(`'`)) {
+        if (javaExe.toLowerCase().includes(".exe") && javaExe.includes(" ") && !javaExe.includes(`'`)) {
             // Java executable has been overridden by caller : use it
             javaExe = `"${path.resolve(javaExe)}"`;
         } else if (javaExe === "java" || javaExe === "javaw") {
@@ -93,27 +95,27 @@ class JavaCaller {
             await this.manageJavaInstall();
         }
 
+        const javaExeToUse = this.javaExecutableFromNodeJavaCaller ?? javaExe;
         const classPathStr = this.buildClasspathStr();
-
         const javaArgs = this.buildArguments(classPathStr, (userArguments || []).concat(this.commandJavaArgs));
         let stdout = "";
         let stderr = "";
         let child;
         const prom = new Promise((resolve) => {
             // Spawn java command line
-            debug(`Java command: ${javaExe} ${javaArgs.join(" ")}`);
+            debug(`Java command: ${javaExeToUse} ${javaArgs.join(" ")}`);
             const spawnOptions = {
                 detached: runOptions.detached,
-                cwd: javaExe === "java" || javaExe === "javaw" ? runOptions.cwd : undefined,
+                cwd: javaExeToUse === "java" || javaExeToUse === "javaw" ? runOptions.cwd : undefined,
                 env: Object.assign({}, process.env),
                 stdio: this.output === "console" ? "inherit" : runOptions.detached ? "ignore" : "pipe",
                 windowsHide: true,
                 windowsVerbatimArguments: runOptions.windowsVerbatimArguments,
             };
-            if (javaExe.includes(" ")) {
+            if (javaExeToUse.includes(" ")) {
                 spawnOptions.shell = true;
             }
-            child = spawn(javaExe, javaArgs, spawnOptions);
+            child = spawn(javaExeToUse, javaArgs, spawnOptions);
 
             // Gather stdout and stderr if they must be returned
             if (spawnOptions.stdio === "pipe") {
@@ -220,6 +222,10 @@ class JavaCaller {
 
     // Install Java if the found java version is not matching the requirements
     async manageJavaInstall() {
+        if (this.javaExecutable !== 'java' && this.javaExecutable !== 'javaw') {
+            // Do not search/install java if its path is sent as argument
+            return;
+        }
         if (await this.getInstallInCache()) {
             return;
         }
@@ -239,15 +245,15 @@ class JavaCaller {
                 this.javaHome = javaVersionHome;
                 this.javaBin = javaVersionBin;
                 await this.addJavaInPath();
+                this.setJavaExecutableFromNodeJavaCaller(this.javaBin);
                 return;
             }
 
             // Inform user that the installation is pending
             const requiredMsg =
                 this.minimumJavaVersion !== this.maximumJavaVersion
-                    ? `Java ${this.javaType ? this.javaType : "jre or jdk"} between ${this.minimumJavaVersion} and ${
-                          this.maximumJavaVersion
-                      } is required `
+                    ? `Java ${this.javaType ? this.javaType : "jre or jdk"} between ${this.minimumJavaVersion} and ${this.maximumJavaVersion
+                    } is required `
                     : `Java ${this.javaType ? this.javaType : "jre or jdk"} ${this.minimumJavaVersion} is required`;
             console.log(requiredMsg);
             const javaVersionToInstall = this.maximumJavaVersion || this.minimumJavaVersion;
@@ -288,6 +294,7 @@ class JavaCaller {
                     this.javaHome = java_home;
                     this.javaBin = java_bin;
                     await this.addJavaInPath();
+                    this.setJavaExecutableFromNodeJavaCaller(this.javaBin);
                     return true;
                 }
             }
@@ -327,26 +334,25 @@ class JavaCaller {
         return await fse.readdir(javaInstallsTopDir)
             .then((items) =>
                 items
-                .filter((item) => fse.statSync(path.join(javaInstallsTopDir, item)).isDirectory())
-                .map((folder) => {
-                    const version = semver.coerce(folder)
-                    return { version, folder }
-                })
-                .filter(({ version, folder }) => this.checkMatchingJavaVersion(version.major, folder))
-                .map(({ version, folder }) => {
-                    const home = path.join(javaInstallsTopDir, folder);
-                    const bin = path.join(home, this.getPlatformBinPath());
-                    return { version, folder, home, bin }
-                })
-                .find(({ bin }) => fse.existsSync(bin))
+                    .filter((item) => fse.statSync(path.join(javaInstallsTopDir, item)).isDirectory())
+                    .map((folder) => {
+                        const version = semver.coerce(folder)
+                        return { version, folder }
+                    })
+                    .filter(({ version, folder }) => this.checkMatchingJavaVersion(version.major, folder))
+                    .map(({ version, folder }) => {
+                        const home = path.join(javaInstallsTopDir, folder);
+                        const bin = path.join(home, this.getPlatformBinPath());
+                        return { version, folder, home, bin }
+                    })
+                    .find(({ bin }) => fse.existsSync(bin))
             )
             .then((match) => {
                 if (!match) return {};
                 const { version, folder, home, bin } = match
 
                 debug(
-                    `Found matching java bin: ${bin} for ${this.javaType ? this.javaType : "jre or jdk"} ${this.minimumJavaVersion}${
-                        this.maximumJavaVersion && this.maximumJavaVersion !== this.minimumJavaVersion ? " -> " + this.maximumJavaVersion : "+"
+                    `Found matching java bin: ${bin} for ${this.javaType ? this.javaType : "jre or jdk"} ${this.minimumJavaVersion}${this.maximumJavaVersion && this.maximumJavaVersion !== this.minimumJavaVersion ? " -> " + this.maximumJavaVersion : "+"
                     }`
                 );
                 this.addInCache(version.major, folder, home, bin);
@@ -415,6 +421,15 @@ class JavaCaller {
         return binPath;
     }
 
+    setJavaExecutableFromNodeJavaCaller(javaBinPath) {
+        this.javaExecutableFromNodeJavaCaller = path.join(
+            javaBinPath,
+            os.platform() === "win32" ? "java.exe" : "java");
+        if (this.javaExecutableFromNodeJavaCaller.includes(" ") && !this.javaExecutableFromNodeJavaCaller.startsWith('"')) {
+            this.javaExecutableFromNodeJavaCaller = `"${path.resolve(this.javaExecutableFromNodeJavaCaller)}"`
+        }
+    }
+
     fail(reason) {
         console.error(reason);
         this.status = 666;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "java-caller",
-  "version": "3.3.2-beta202404281910.0",
+  "version": "4.0.1-beta202405081245.0",
   "description": "Library to easily call java from node sources. Automatically installs java if not present",
   "main": "./lib/index.js",
   "files": [
@@ -37,7 +37,7 @@
   "dependencies": {
     "debug": "^4.3.4",
     "fs-extra": "^11.1.1",
-    "njre": "^1.1.0",
+    "njre": "^1.2.1",
     "semver": "^7.5.4"
   },
   "devDependencies": {