schoolzyinstall 1.0.41 → 1.0.43

package/jdeploy-bundle/jdeploy.js

@@ -1,8 +1,5 @@
 #! /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 = "schoolzy.jar";
 var mainClass = "{{MAIN_CLASS}}";
 var classPath = "{{CLASSPATH}}";
@@ -26,7 +23,9 @@ 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')
@@ -106,7 +105,7 @@ function njreWrap() {
 
     function move (file) {
       return new Promise((resolve, reject) => {
-        const jdeployDir = jdeployHomeDir;
+        const jdeployDir = path.join(os.homedir(), '.jdeploy');
         if (!fs.existsSync(jdeployDir)) {
             fs.mkdirSync(jdeployDir);
         }
@@ -232,16 +231,8 @@ 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, arch);
+          return installZulu(version, options);
       }
 
       let url = 'https://api.adoptopenjdk.net/v2/info/releases/openjdk' + version + '?'
@@ -267,9 +258,13 @@ function njreWrap() {
             return Promise.reject(new Error('Unsupported operating system'))
         }
       }
-
       if (!options.arch) {
-        options.arch = arch; // Use the detected 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] + '&' })
@@ -284,85 +279,68 @@ function njreWrap() {
         .then(extract)
     }
 
-    function installZulu(version = 11, options = {}, arch) {
-        const { type = 'jre', javafx = false } = options;
+    function installZulu(version = 11, options = {}) {
+         const { type = 'jre', javafx = false } = options
+         var q = {
 
-        // Prepare the query parameters for the request
-        let q = {
             java_version: version,
             ext: 'zip',
             bundle_type: type,
-            javafx: '' + javafx,
-            arch: arch,  // Use the detected architecture
+            javafx: ''+javafx,
+            arch: 'x86',
             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'));
-            }
-        }
 
-        // Construct the URL for the download request
-        let url = zuluBaseURL;
-        Object.keys(q).forEach(key => { url += key + '=' + q[key] + '&' });
+         var zuluBaseURL = "https://api.azul.com/zulu/download/community/v1.0/bundles/latest/binary?"
+         if (!options.os) {
+             switch (process.platform) {
 
-        const tmpdir = path.join(os.tmpdir(), 'njre');
+               case 'darwin':
+                 q.os = 'macos'
+                 break
+               case 'linux':
+                 q.os = 'linux'
+                 q.ext = 'tar.gz'
+                 break
 
-        // Function to handle the download and extraction
-        const attemptDownload = (url) => {
-            return download(tmpdir, url)
+               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);
-        };
-
-        // First, attempt to download the JRE
-        return download(tmpdir, url)
-            .then(response => {
-                // If the JRE is available, proceed with the download and extraction
-                if (response.status === 200) {
-                    return attemptDownload(url);
-                } else {
-                    // If JRE is not available, switch to JDK
-                    console.log(`JRE not available for version ${version}, falling back to JDK...`);
-                    // Update the query to request JDK instead of JRE
-                    q.bundle_type = 'jdk';  // Switch to JDK
-                    url = zuluBaseURL;
-                    Object.keys(q).forEach(key => { url += key + '=' + q[key] + '&' });
-                    return attemptDownload(url); // Try downloading the JDK
-                }
-            })
-            .catch(err => {
-                console.error("Download failed: ", err);
-                throw err; // Re-throw the error after logging
-            });
-    }
+                .then(extract)
 
+    }
 
     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) {
 
@@ -430,7 +408,7 @@ function getJavaHomeInPath(basepath) {
 }
 
 function findSupportedRuntime(javaVersion, jdk, javafx) {
-    var jdeployDir = jdeployHomeDir;
+    var jdeployDir = path.join(os.homedir(), ".jdeploy");
     var JAVA_HOME_OVERRIDE = env['JDEPLOY_JAVA_HOME_OVERRIDE'];
 
     if (JAVA_HOME_OVERRIDE && fs.existsSync(JAVA_HOME_OVERRIDE)) {
@@ -482,7 +460,7 @@ function getEmbeddedJavaHome() {
     }
     var typeDir = jdk ? 'jdk' : 'jre';
 
-    var jreDir = path.join(jdeployHomeDir,  'jre', vs, 'jre');
+    var jreDir = path.join(os.homedir(), '.jdeploy',  'jre', vs, 'jre');
     try {
         var out = jreDir + path.sep + getDirectories(jreDir)[0] + (_driver ? (path.sep + _driver) : '');
         return out;

package/package.json

@@ -1 +1 @@
-{"bin":{"":"jdeploy-bundle/jdeploy.js"},"author":"Numidia Technology Solutions","description":"SchoolZy System","main":"index.js","preferGlobal":true,"repository":"","version":"1.0.41","jdeploy":{"jdk":false,"checksums":{"icon.png":"60d27fb17e93e2f92c6c3dfa4c11e500","installsplash.png":"f00367ebc9d091c52c47a26241b79fd7"},"publishTargets":[{"name":"npm: schoolzyinstall","type":"NPM","url":"schoolzyinstall"}],"javaVersion":"24","documentTypes":[],"jar":"target/schoolzy.jar","javafx":true,"title":"SchoolZy"},"dependencies":{"njre":"^0.2.0","shelljs":"^0.8.4"},"license":"ISC","name":"schoolzyinstall","files":["jdeploy-bundle"],"scripts":{"test":"echo \"Error: no test specified\" && exit 1"}}
+{"bin":{"":"jdeploy-bundle/jdeploy.js"},"author":"Numidia Technology Solutions","description":"SchoolZy system","main":"index.js","preferGlobal":true,"repository":"","version":"1.0.43","jdeploy":{"jdk":false,"checksums":{"icon.png":"60d27fb17e93e2f92c6c3dfa4c11e500","installsplash.png":"60d27fb17e93e2f92c6c3dfa4c11e500"},"publishTargets":[{"name":"npm: schoolzyinstall","type":"NPM","url":"schoolzyinstall"}],"javaVersion":"24","jar":"target/schoolzy.jar","javafx":true,"title":"SchoolZy"},"dependencies":{"njre":"^0.2.0","shelljs":"^0.8.4"},"license":"ISC","name":"schoolzyinstall","files":["jdeploy-bundle"],"scripts":{"test":"echo \"Error: no test specified\" && exit 1"}}