liverpool-telescope-phase2ui 2.1.1 → 2.1.2

package/jdeploy-bundle/jdeploy.js

@@ -1,5 +1,8 @@
 #! /usr/bin/env node
 
+var path = require('path');
+var os = require('os');
+var jdeployHomeDir = process.env.JDEPLOY_HOME || path.join(os.homedir(), '.jdeploy');
 var jarName = "Phase2UI.jar";
 var mainClass = "{{MAIN_CLASS}}";
 var classPath = "{{CLASSPATH}}";
@@ -23,9 +26,7 @@ var jdkProvider = 'zulu';
 function njreWrap() {
     'use strict'
 
-    const path = require('path')
     const fs = require('fs')
-    const os = require('os')
     const crypto = require('crypto')
     const fetch = require('node-fetch')
     const yauzl = require('yauzl')
@@ -62,6 +63,10 @@ function njreWrap() {
         createDir(dir)
           .then(() => fetch(url))
           .then(response => {
+            // Validate HTTP status code before writing the file
+            if (!response.ok) {
+              return reject(new Error(`HTTP ${response.status}: ${response.statusText} for ${url}`))
+            }
             const destFile = path.join(dir, destName)
             const destStream = fs.createWriteStream(destFile)
             response.body.pipe(destStream).on('finish', () => resolve(destFile))
@@ -105,7 +110,7 @@ function njreWrap() {
 
     function move (file) {
       return new Promise((resolve, reject) => {
-        const jdeployDir = path.join(os.homedir(), '.jdeploy');
+        const jdeployDir = jdeployHomeDir;
         if (!fs.existsSync(jdeployDir)) {
             fs.mkdirSync(jdeployDir);
         }
@@ -231,8 +236,16 @@ function njreWrap() {
       const { openjdk_impl = 'hotspot', release = 'latest', type = 'jre', javafx = false, provider = 'zulu' } = options
       options = { ...options, openjdk_impl, release, type }
 
+      // Determine the architecture based on the platform and environment
+      let arch = process.arch;
+      if (arch === 'arm64' || arch === 'aarch64') {
+        arch = 'aarch64';  // For ARM-based systems, standardize on aarch64
+      } else {
+        arch = 'x64';  // Default to x64 for non-ARM systems
+      }
+
       if (provider === 'zulu') {
-          return installZulu(version, options);
+          return installZulu(version, options, arch);
       }
 
       let url = 'https://api.adoptopenjdk.net/v2/info/releases/openjdk' + version + '?'
@@ -258,13 +271,9 @@ function njreWrap() {
             return Promise.reject(new Error('Unsupported operating system'))
         }
       }
+
       if (!options.arch) {
-          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'))
+        options.arch = arch; // Use the detected architecture
       }
 
       Object.keys(options).forEach(key => { url += key + '=' + options[key] + '&' })
@@ -279,68 +288,72 @@ function njreWrap() {
         .then(extract)
     }
 
-    function installZulu(version = 11, options = {}) {
-         const { type = 'jre', javafx = false } = options
-         var q = {
+    function installZulu(version = 11, options = {}, arch) {
+        const { type = 'jre', javafx = false } = options;
 
+        // Prepare the query parameters for the request
+        let q = {
             java_version: version,
             ext: 'zip',
             bundle_type: type,
-            javafx: ''+javafx,
-            arch: 'x86',
+            javafx: '' + javafx,
+            arch: arch,  // Use the detected architecture
             hw_bitness: '64',
+        };
 
-         };
+        // Base URL for the Azul API
+        const zuluBaseURL = "https://api.azul.com/zulu/download/community/v1.0/bundles/latest/binary?";
 
+        // Determine the OS
+        if (!options.os) {
+            switch (process.platform) {
+                case 'darwin':
+                    q.os = 'macos';
+                    break;
+                case 'linux':
+                    q.os = 'linux';
+                    q.ext = 'tar.gz';
+                    break;
+                case 'win32':
+                case 'win64':
+                    q.os = 'windows';
+                    break;
+                default:
+                    return Promise.reject(new Error('Unsupported operating system'));
+            }
+        }
 
-         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'
-                 q.ext = 'tar.gz'
-                 break
-
-               case 'win32':
-               case 'win64':
-                 q.os = 'windows'
-                 break
-               default:
-                 return Promise.reject(new Error('Unsupported operating system'))
-             }
-           }
+        // Construct the URL for the download request
+        let url = zuluBaseURL;
+        Object.keys(q).forEach(key => { url += key + '=' + q[key] + '&' });
 
+        const tmpdir = path.join(os.tmpdir(), 'njre');
 
-         	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)
+        // Function to handle the download and extraction
+        const attemptDownload = (url) => {
+            return download(tmpdir, url)
                 .then(move)
-                .then(extract)
-
+                .then(extract);
+        };
+
+        // Attempt to download and extract the JRE/JDK
+        return attemptDownload(url)
+            .catch(err => {
+                console.error("Download failed: ", err);
+                // Exit with non-zero status code to signal failure to CI/CD systems
+                process.exit(1);
+            });
     }
 
-    return {install:install};
-
-
 
+    return {install:install};
 }
 
 
 var fs = require('fs');
-var os = require('os');
-var path = require('path');
 const njre = njreWrap();
 const targetJavaVersion = parseInt(javaVersionString);
 var shell = require("shelljs/global");
-function getJdeploySupportDir() {
-    return os.homedir() + path.sep + ".jdeploy";
-}
 
 function getJavaVersion(binPath) {
 
@@ -408,7 +421,7 @@ function getJavaHomeInPath(basepath) {
 }
 
 function findSupportedRuntime(javaVersion, jdk, javafx) {
-    var jdeployDir = path.join(os.homedir(), ".jdeploy");
+    var jdeployDir = jdeployHomeDir;
     var JAVA_HOME_OVERRIDE = env['JDEPLOY_JAVA_HOME_OVERRIDE'];
 
     if (JAVA_HOME_OVERRIDE && fs.existsSync(JAVA_HOME_OVERRIDE)) {
@@ -460,7 +473,7 @@ function getEmbeddedJavaHome() {
     }
     var typeDir = jdk ? 'jdk' : 'jre';
 
-    var jreDir = path.join(os.homedir(), '.jdeploy',  'jre', vs, 'jre');
+    var jreDir = path.join(jdeployHomeDir,  'jre', vs, 'jre');
     try {
         var out = jreDir + path.sep + getDirectories(jreDir)[0] + (_driver ? (path.sep + _driver) : '');
         return out;
@@ -526,7 +539,7 @@ if (!done) {
 }
 
 if (!done) {
-    console.log("Downloading java runtime environment for version "+targetJavaVersion);
+    console.error("Downloading java runtime environment for version "+targetJavaVersion);
     njre.install(targetJavaVersion, {type: bundleType, javafx: javafx}).then(function(dir) {
         var _javaHome = getJavaHomeInPath(dir);
         if (_javaHome == null)
@@ -541,13 +554,15 @@ if (!done) {
             javaBinary += '.exe';
 
         }
-        fs.chmodSync(javaBinary, 0755);
+        fs.chmodSync(javaBinary, 0o755);
 
         env['PATH'] = path.join(env['JAVA_HOME'], 'bin') + path.delimiter + env['PATH'];
 
         run(env['JAVA_HOME']);
     }).catch(function(err) {
-        console.log("Failed to install JRE", err);
+        console.error("Failed to install JRE", err);
+        // Exit with non-zero status code to signal failure to CI/CD systems
+        process.exit(1);
     });
 }
 
@@ -573,6 +588,7 @@ function run(_javaHome) {
 
     var userArgs = process.argv.slice(2);
     var javaArgs = [];
+    javaArgs.push('-Djdeploy.mode=npx');
     javaArgs.push('-Djdeploy.base='+__dirname);
     javaArgs.push('-Djdeploy.port='+port);
     javaArgs.push('-Djdeploy.war.path='+warPath);

package/package.json

@@ -1 +1 @@
-{"bin":{"Phase2UI":"jdeploy-bundle/jdeploy.js"},"author":"ARI LJMU","description":"Liverpool Telescope Phase2UI","main":"index.js","preferGlobal":true,"repository":"","version":"2.1.1","jdeploy":{"jdk":false,"checksums":{"icon.png":"c61683452fcbd89eec1cfee19fbbb755"},"javaVersion":"8","jar":"Phase2UI.jar","javafx":false,"title":"Liverpool-Telescope-Phase2UI"},"dependencies":{"command-exists-promise":"^2.0.2","node-fetch":"2.6.7","tar":"^4.4.8","yauzl":"^2.10.0","shelljs":"^0.8.4"},"license":"ISC","name":"liverpool-telescope-phase2ui","files":["jdeploy-bundle"],"scripts":{"test":"echo \"Error: no test specified\" && exit 1"}}
+{"bin":{"Phase2UI":"jdeploy-bundle/jdeploy.js"},"author":"ARI LJMU","description":"Liverpool Telescope Phase2UI.","main":"index.js","preferGlobal":true,"version":"2.1.2","jdeploy":{"checksums":{"icon.png":"c61683452fcbd89eec1cfee19fbbb755"},"fallbackToUniversal":false,"generateLegacyBundles":false,"mainClass":"ngat.oss.client.gui.frame.LoginFrame","publishTargets":[{"name":"npm: npm","type":"NPM","url":""}],"javaVersion":"8","jar":"Phase2UI.jar","title":"Liverpool-Telescope-Phase2UI","platformBundlesEnabled":false,"downloadPage":{"platforms":["default"]}},"dependencies":{"command-exists-promise":"^2.0.2","node-fetch":"2.6.7","tar":"^4.4.8","yauzl":"^2.10.0","shelljs":"^0.8.4"},"license":"ISC","name":"liverpool-telescope-phase2ui","files":["jdeploy-bundle"],"scripts":{"test":"echo \"Error: no test specified\" && exit 1"},"homepage":"telescope.livjm.ac.uk"}