java-caller 2.5.0 → 2.7.0

package/README.md

@@ -50,7 +50,7 @@ const {status, stdout, stderr} = java.run(JAVA_ARGUMENTS,JAVA_CALLER_RUN_OPTIONS
 | maximumJavaVersion    | Maximum java version to be used to call java command.<br/> If the java version found on machine is upper, java-caller will try to install and use the appropriate one <br/> Can be equal to minimumJavaVersion |                      | `10`                                     |
 | javaType              | jre or jdk (if not defined and installation is required, jre will be installed)                                                                                                                                |                      | `"jre"`                                  |
 | additionalJavaArgs    | Additional parameters for JVM that will be added in every JavaCaller instance runs                                                                                                                             |                      | `["-Xms256m","-Xmx2048m"]`               |
-| javaExecutable        | You can force to use a defined java executable, instead of letting java-caller find/install one                                                                                                                |                      | `"/home/some-java-version/bin/java.exe"` |
+| javaExecutable        | You can force to use a defined java executable, instead of letting java-caller find/install one. Can also be defined with env var `JAVA_CALLER_JAVA_EXECUTABLE`                                                |                      | `"/home/some-java-version/bin/java.exe"` |
 
 
 ### JAVA_ARGUMENTS

package/lib/java-caller.js

@@ -56,7 +56,7 @@ class JavaCaller {
         this.javaType = opts.javaType || this.javaType;
         this.rootPath = opts.rootPath || this.rootPath;
         this.javaCallerSupportDir = `${os.homedir() + path.sep}.java-caller`;
-        this.javaExecutable = opts.javaExecutable || this.javaExecutable;
+        this.javaExecutable = opts.javaExecutable || process.env.JAVA_CALLER_JAVA_EXECUTABLE || this.javaExecutable;
         this.additionalJavaArgs = opts.additionalJavaArgs || this.additionalJavaArgs;
         this.output = opts.output || this.output;
     }
@@ -66,6 +66,7 @@ class JavaCaller {
      * @param {string[]} [userArguments] - Java command line arguments
      * @param {object} [runOptions] - Run options
      * @param {boolean} [runOptions.detached = false] - If set to true, node will node wait for the java command to be completed. In that case, childJavaProcess property will be returned, but stdout and stderr may be empty
+     * @param {string} [runOptions.stdoutEncoding = 'utf8'] - Adds control on spawn process stdout
      * @param {number} [runOptions.waitForErrorMs = 500] - If detached is true, number of milliseconds to wait to detect an error before exiting JavaCaller run
      * @param {string} [runOptions.cwd = .] - You can override cwd of spawn called by JavaCaller runner
      * @param {string} [runOptions.javaArgs = []] - You can override cwd of spawn called by JavaCaller runner
@@ -75,13 +76,14 @@ class JavaCaller {
         runOptions.detached = runOptions.detached || false;
         runOptions.waitForErrorMs = runOptions.waitForErrorMs || 500;
         runOptions.cwd = runOptions.cwd || process.cwd();
+        runOptions.stdoutEncoding = runOptions.stdoutEncoding || 'utf8';
         this.commandJavaArgs = (runOptions.javaArgs || []).concat(this.additionalJavaArgs);
 
         let javaExe = this.javaExecutable;
         if (javaExe.toLowerCase().includes(".exe") && !javaExe.includes(`'`)) {
             // Java executable has been overridden by caller : use it
             javaExe = `"${path.resolve(javaExe)}"`;
-        } else {
+        } else if (javaExe === "java") {
             // Check if matching java version is present, install and update PATH if it is not
             await this.manageJavaInstall();
         }
@@ -110,6 +112,7 @@ class JavaCaller {
 
             // Gather stdout and stderr if they must be returned
             if (spawnOptions.stdio === "pipe") {
+                child.stdout.setEncoding(`${runOptions.stdoutEncoding}`);
                 child.stdout.on("data", (data) => {
                     stdout += data;
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "java-caller",
-  "version": "2.5.0",
+  "version": "2.7.0",
   "description": "Library to easily call java from node sources. Automatically installs java if not present",
   "main": "./lib/index.js",
   "files": [
@@ -35,16 +35,16 @@
   },
   "homepage": "https://github.com/nvuillam/node-java-caller#readme",
   "dependencies": {
-    "debug": "^4.1.1",
-    "fs-extra": "^9.0.1",
-    "njre": "^0.2.0"
+    "debug": "^4.3.4",
+    "fs-extra": "^10.1.0",
+    "njre": "^0.3.0"
   },
   "devDependencies": {
-    "babel-eslint": "^10.1.0",
-    "eslint": "^7.6.0",
-    "mocha": "^8.1.1",
+    "@babel/eslint-parser": "^7.19.1",
+    "eslint": "^8.27.0",
+    "mocha": "^10.1.0",
     "nyc": "^15.1.0",
-    "which": "^2.0.2"
+    "which": "^3.0.0"
   },
   "engines": {
     "node": ">=12.0.0"