android-device-manager 25.8.11-1614 → 25.10.16-1609

package/README.md

@@ -1,7 +1,7 @@
-# AndroidDeviceManager
+# Android Device Manager
 
 ## Description ##
-Java desktop app to manage multiple Android devices via adb
+Android Device Manager is a desktop app which can manage one or more Android devices
 
 ## Features ##
 - View all connected (and wireless) devices

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 = "AndroidDeviceManager.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')
@@ -105,7 +106,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 +232,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 +267,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 +284,85 @@ 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?";
 
-         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
+        // 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'));
+            }
+        }
 
-               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);
+        };
+
+        // 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
+            });
     }
 
-    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 +430,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 +482,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;

package/package.json

@@ -1 +1 @@
-{"bin":{"adm":"jdeploy-bundle/jdeploy.js"},"author":"Joe Page","description":"Java desktop app to manage multiple Android devices via adb","main":"index.js","preferGlobal":true,"repository":"","version":"25.8.11-1614","jdeploy":{"jdk":false,"checksums":{"icon.png":"4b08e47a91c363c29f10aa1ca9a9ce55","installsplash.png":"b8596a651c248c986b5f572760b64dbf"},"javaVersion":"17","documentTypes":[{"editor":false,"extension":"apk","mimetype":"application/vnd.android.package-archive"},{"editor":false,"extension":"xapk","mimetype":"application/vnd.android.package-archive"}],"jar":"target/AndroidDeviceManager.jar","javafx":false,"title":"Android Device Manager"},"dependencies":{"command-exists-promise":"^2.0.2","node-fetch":"2.6.7","tar":"^4.4.8","yauzl":"^2.10.0","run":"^1.5.0","jdeploy":"^4.1.2","shelljs":"^0.8.4"},"license":"ISC","name":"android-device-manager","files":["jdeploy-bundle"],"scripts":{"test":"echo \"Error: no test specified\" && exit 1"},"homepage":""}
+{"bin":{"adm":"jdeploy-bundle/jdeploy.js"},"author":"Joe Page","description":"Java desktop app to manage multiple Android devices via adb","main":"index.js","preferGlobal":true,"repository":"","version":"25.10.16-1609","jdeploy":{"jdk":false,"checksums":{"icon.png":"4b08e47a91c363c29f10aa1ca9a9ce55","installsplash.png":"b8596a651c248c986b5f572760b64dbf"},"mainClass":"com.jpage4500.devicemanager.MainApplication","javaVersion":"17","documentTypes":[{"editor":false,"extension":"apk","mimetype":"application/vnd.android.package-archive"},{"editor":false,"extension":"xapk","mimetype":"application/vnd.android.package-archive"}],"jar":"target/AndroidDeviceManager.jar","javafx":false,"title":"Android Device Manager"},"dependencies":{"command-exists-promise":"^2.0.2","node-fetch":"2.6.7","tar":"^4.4.8","yauzl":"^2.10.0","run":"^1.5.0","jdeploy":"^5.2.5","shelljs":"^0.8.4"},"license":"ISC","name":"android-device-manager","files":["jdeploy-bundle"],"scripts":{"test":"echo \"Error: no test specified\" && exit 1"},"homepage":""}