jdeploy-installer 3.0.0-alpha.6 → 3.0.1

package/jdeploy-bundle/jdeploy.js

@@ -6,6 +6,18 @@ var classPath = "{{CLASSPATH}}";
 var port = "0";
 var warPath = "";
 var javaVersionString = "11";
+var tryJavaHomeFirst = false;
+var javafx = false;
+var bundleType = 'jre';
+if ('{{JAVAFX}}' === 'true') {
+    javafx = true;
+}
+if ('{{JDK}}' === 'true') {
+    bundleType = 'jdk';
+}
+
+var jdk = (bundleType === 'jdk');
+var jdkProvider = 'zulu';
 
 
 function njreWrap() {
@@ -34,11 +46,17 @@ function njreWrap() {
     }
 
     function download (dir, url) {
+        if (url.indexOf("?") > 0 || jdkProvider === 'zulu') {
+            var destName = bundleType + ".zip";
+        } else {
+            destName = path.basename(url);
+        }
+
       return new Promise((resolve, reject) => {
         createDir(dir)
           .then(() => fetch(url))
           .then(response => {
-            const destFile = path.join(dir, path.basename(url))
+            const destFile = path.join(dir, destName)
             const destStream = fs.createWriteStream(destFile)
             response.body.pipe(destStream).on('finish', () => resolve(destFile))
           })
@@ -86,17 +104,20 @@ function njreWrap() {
             fs.mkdirSync(jdeployDir);
         }
 
-        var jreDir = path.join(jdeployDir, 'jre');
+        var jreDir = path.join(jdeployDir, bundleType);
         if (!fs.existsSync(jreDir)) {
             fs.mkdirSync(jreDir);
         }
-
-        jreDir = path.join(jreDir, javaVersionString);
+        var vs = javaVersionString;
+        if (javafx) {
+            vs += 'fx';
+        }
+        jreDir = path.join(jreDir, vs);
         if (!fs.existsSync(jreDir)) {
             fs.mkdirSync(jreDir);
         }
         const newFile = path.join(jreDir, file.split(path.sep).slice(-1)[0])
-
+        //console.log("Copying file "+file+" to "+newFile);
         fs.copyFile(file, newFile, err => {
           if (err) reject(err)
 
@@ -109,6 +130,7 @@ function njreWrap() {
     }
 
     function extractZip (file, dir) {
+        //console.log("Extracting "+file+" to "+dir);
       return new Promise((resolve, reject) => {
         yauzl.open(file, { lazyEntries: true }, (err, zipFile) => {
           if (err) reject(err)
@@ -156,8 +178,10 @@ function njreWrap() {
     }
 
     function extract (file) {
-      const dir = path.join(path.dirname(file), 'jre')
+        var dirString = jdk? 'jdk' : 'jre';
 
+      const dir = path.join(path.dirname(file), dirString)
+        //console.log("About to extract "+file+" to "+dir);
       return createDir(dir).then(() => {
         return path.extname(file) === '.zip'
           ? extractZip(file, dir)
@@ -197,9 +221,14 @@ function njreWrap() {
      *     // Handle the error
      *   })
      */
-    function install (version = 8, options = {}) {
-      const { openjdk_impl = 'hotspot', release = 'latest', type = 'jre' } = options
+    function install (version = 11, options = {}) {
+      const { openjdk_impl = 'hotspot', release = 'latest', type = 'jre', javafx = false, provider = 'zulu' } = options
       options = { ...options, openjdk_impl, release, type }
+
+      if (provider === 'zulu') {
+          return installZulu(version, options);
+      }
+
       let url = 'https://api.adoptopenjdk.net/v2/info/releases/openjdk' + version + '?'
 
       if (!options.os) {
@@ -224,9 +253,12 @@ function njreWrap() {
         }
       }
       if (!options.arch) {
-        if (/^ppc64|s390x|x32|x64$/g.test(process.arch)) options.arch = process.arch
-        else if (process.arch === 'ia32') options.arch = 'x32'
-        else return Promise.reject(new Error('Unsupported architecture'))
+          if (options.os == 'mac') {
+              // For now, for compatibility reasons use x64 always
+              options.arch = 'x64';
+          } else if (/^ppc64|s390x|x32|x64$/g.test(process.arch)) options.arch = process.arch
+            else if (process.arch === 'ia32') options.arch = 'x32'
+            else return Promise.reject(new Error('Unsupported architecture'))
       }
 
       Object.keys(options).forEach(key => { url += key + '=' + options[key] + '&' })
@@ -241,6 +273,50 @@ function njreWrap() {
         .then(extract)
     }
 
+    function installZulu(version = 11, options = {}) {
+         const { type = 'jre', javafx = false } = options
+         var q = {
+
+            java_version: version,
+            ext: 'zip',
+            bundle_type: type,
+            javafx: ''+javafx,
+            arch: 'x86',
+            hw_bitness: '64',
+
+         };
+
+         var zuluBaseURL = "https://api.azul.com/zulu/download/community/v1.0/bundles/latest/binary?"
+         if (!options.os) {
+             switch (process.platform) {
+
+               case 'darwin':
+                 q.os = 'macos'
+                 break
+               case 'linux':
+                 q.os = 'linux'
+                 break
+
+               case 'win32':
+               case 'win64':
+                 q.os = 'windows'
+                 break
+               default:
+                 return Promise.reject(new Error('Unsupported operating system'))
+             }
+           }
+
+
+         	var url = zuluBaseURL;
+                Object.keys(q).forEach(key => { url += key + '=' + q[key] + '&' })
+             const tmpdir = path.join(os.tmpdir(), 'njre')
+            //console.log("Downloading "+url);
+              return download(tmpdir, url)
+                .then(move)
+                .then(extract)
+
+    }
+
     return {install:install};
 
 
@@ -271,8 +347,6 @@ function getJavaVersion(binPath) {
             return false;
         }
         var stdout = javaVersionProc.stderr;
-        //console.log(javaVersionProc);
-        //console.log("stdout is "+stdout);
         var regexp = /version "(.*?)"/;
         var match = regexp.exec(stdout);
         var parts = match[1].split('.');
@@ -286,7 +360,6 @@ function getJavaVersion(binPath) {
             }
         });
         versionStr = versionStr.replace('_', '');
-        //console.log("Java version string "+versionStr)
         return parseFloat(versionStr);
     } catch (e) {
         return false;
@@ -298,6 +371,66 @@ var getDirectories = dirPath => fs.readdirSync(dirPath).filter(
     file => fs.statSync(path.join(dirPath, file)).isDirectory()
   );
 
+function getJavaHomeInPath(basepath) {
+
+    var dirs = null;
+    try {
+        dirs = getDirectories(basepath);
+    } catch (e) {
+        return null;
+    }
+    if (dirs && dirs.length > 0) {
+        basepath = path.join(basepath, dirs[0]);
+        if (os.platform() != 'darwin') {
+            return basepath;
+        }
+        if (fs.existsSync(path.join(basepath, 'Contents', 'Home'))) {
+            return path.join(basepath, 'Contents', 'Home');
+        }
+
+        var adapterDirectories = getDirectories(basepath).filter(subdir => {
+            return subdir.match(/^zulu/) && fs.existsSync(path.join(basepath, subdir, 'Contents', 'Home'));
+        });
+
+        if (adapterDirectories && adapterDirectories.length > 0) {
+            return path.join(basepath, adapterDirectories[0], 'Contents', 'Home');
+        }
+    }
+    return null;
+}
+
+function findSupportedRuntime(javaVersion, jdk, javafx) {
+    var jdeployDir = path.join(os.homedir(), ".jdeploy");
+
+    // First check for the full-meal deal
+    var _javaHomePath = getJavaHomeInPath(path.join(jdeployDir, 'jdk', javaVersion+'fx', 'jdk'));
+    if (_javaHomePath && fs.existsSync(_javaHomePath)) {
+        return _javaHomePath;
+    }
+    if (!javafx) {
+        var _javaHomePath = getJavaHomeInPath(path.join(jdeployDir, 'jdk', javaVersion, 'jdk'));
+        if (_javaHomePath && fs.existsSync(_javaHomePath)) {
+            return _javaHomePath;
+        }
+    }
+
+    if (!jdk) {
+        var _javaHomePath = getJavaHomeInPath(path.join(jdeployDir, 'jre', javaVersion+'fx', 'jre'));
+        if (_javaHomePath && fs.existsSync(_javaHomePath)) {
+            return _javaHomePath;
+        }
+    }
+
+    if (!jdk && !javafx) {
+        var _javaHomePath = getJavaHomeInPath(path.join(jdeployDir, 'jre', javaVersion, 'jre'));
+        if (_javaHomePath && fs.existsSync(_javaHomePath)) {
+            return _javaHomePath;
+        }
+    }
+    return null;
+
+}
+
 function getEmbeddedJavaHome() {
     var _platform = os.platform();
     var _driver = '';
@@ -308,14 +441,18 @@ function getEmbeddedJavaHome() {
       default:
         fail('unsupported platform: ' + _platform);
     }
+    var vs = javaVersionString;
+    if (javafx) {
+        vs += 'fx';
+    }
+    var typeDir = jdk ? 'jdk' : 'jre';
 
-    var jreDir = path.join(os.homedir(), '.jdeploy',  'jre', javaVersionString, 'jre');
-
+    var jreDir = path.join(os.homedir(), '.jdeploy',  'jre', vs, 'jre');
     try {
-        return jreDir + path.sep + getDirectories(jreDir)[0] + (_driver ? (path.sep + _driver) : '');
+        var out = jreDir + path.sep + getDirectories(jreDir)[0] + (_driver ? (path.sep + _driver) : '');
+        return out;
     } catch (e) {
-        //console.log(e);
-        return jreDir;
+        return null;
     }
 }
 
@@ -339,46 +476,60 @@ function javaVersionMatch(v1, v2) {
 }
 
 var done = false;
-if (env['JAVA_HOME']) {
-    var javaHomeVersion = getJavaVersion(path.join(env['JAVA_HOME'], 'bin'));
-    if (javaVersionMatch(javaHomeVersion, targetJavaVersion)) {
-        done = true;
-        env['PATH'] = path.join(env['JAVA_HOME'], 'bin') + path.delimiter + env['PATH'];
-        run(env['JAVA_HOME']);
+if (tryJavaHomeFirst) {
+    if (env['JAVA_HOME']) {
+        var javaHomeVersion = getJavaVersion(path.join(env['JAVA_HOME'], 'bin'));
+        if (javaVersionMatch(javaHomeVersion, targetJavaVersion)) {
+            done = true;
+            env['PATH'] = path.join(env['JAVA_HOME'], 'bin') + path.delimiter + env['PATH'];
+            run(env['JAVA_HOME']);
 
+        }
     }
-}
 
-if (!done) {
-    var javaVersion = getJavaVersion();
-    if (javaVersionMatch(javaVersion, targetJavaVersion)) {
-        done = true;
-        run();
+    if (!done) {
+        var javaVersion = getJavaVersion();
+        if (javaVersionMatch(javaVersion, targetJavaVersion)) {
+            done = true;
+            run();
+        }
     }
 }
 
-if (!done) {
 
-    var _javaHome = getEmbeddedJavaHome();
-    var javaVersion = getJavaVersion(path.join(_javaHome, 'bin'));
-    if (javaVersionMatch(javaVersion, targetJavaVersion)) {
+if (!done) {
 
-        env['PATH'] = path.join(_javaHome, 'bin') + path.delimiter + env['PATH'];
-        env['JAVA_HOME'] = _javaHome;
-        done = true;
-        run(_javaHome);
+    var _javaHome = findSupportedRuntime(javaVersionString, bundleType === 'jdk', javafx);
+    if (_javaHome && fs.existsSync(_javaHome)) {
+        var javaVersion = getJavaVersion(path.join(_javaHome, 'bin'));
+        if (javaVersionMatch(javaVersion, targetJavaVersion)) {
+            env['PATH'] = path.join(_javaHome, 'bin') + path.delimiter + env['PATH'];
+            env['JAVA_HOME'] = _javaHome;
+            done = true;
+            run(_javaHome);
+        }
     }
+
 }
 
 if (!done) {
     console.log("Downloading java runtime environment for version "+targetJavaVersion);
-    njre.install(targetJavaVersion).then(function(dir) {
-        let dirCont = fs.readdirSync( dir );
-        if (os.platform() == 'darwin') {
-            env['JAVA_HOME'] = path.join(dir, dirCont[0], 'Contents', 'Home');
-        } else {
-            env['JAVA_HOME'] = path.join(dir, dirCont[0]);
+    njre.install(targetJavaVersion, {type: bundleType, javafx: javafx}).then(function(dir) {
+        var _javaHome = getJavaHomeInPath(dir);
+        if (_javaHome == null)
+
+        if (!_javaHome || !fs.existsSync(_javaHome)) {
+            throw new Error("After install, could not find java home at "+_javaHome);
+        }
+        env['JAVA_HOME'] = _javaHome;
+
+        var javaBinary = path.join(_javaHome, 'bin', 'java');
+        if (!fs.existsSync(javaBinary)) {
+            javaBinary += '.exe';
+
         }
+        fs.chmodSync(javaBinary, 0755);
+
         env['PATH'] = path.join(env['JAVA_HOME'], 'bin') + path.delimiter + env['PATH'];
 
         run(env['JAVA_HOME']);
@@ -428,13 +579,11 @@ function run(_javaHome) {
             env['PATH'] = env['JAVA_HOME'] + path.sep + 'bin' + path.delimiter + env['PATH'];
         }
 
+    } else {
+        env['JAVA_HOME'] = _javaHome;
+        cmd = _javaHome + path.sep + 'bin' + path.sep + 'java';
     }
 
-
-    var javaVersion = getJavaVersion();
-
-    //console.log("Java version is "+getJavaVersion());
-
     javaArgs.forEach(function(arg) {
         cmd += ' "'+arg+'"';
     });

package/package.json

@@ -11,7 +11,7 @@
     "url": "https://github.com/shannah/jdeploy.git",
     "directory": "installer"
   },
-  "version": "3.0.0-alpha.6",
+  "version": "3.0.1",
   "jdeploy": {
     "jar": "target/jdeploy-installer-1.0-SNAPSHOT.jar",
     "bundles": [
@@ -21,7 +21,8 @@
     ],
     "macAppBundleId": "HRNMHC7527.ca.weblite.jdeploy.installer",
     "codesign": true,
-    "notarize": false
+    "notarize": false,
+    "fork": false
   },
   "dependencies": {
     "shelljs": "^0.8.4"