Using object for JavaGuard. May move java downloading processes to AssetGuard as a non-default category. Very much a WIP.
This commit is contained in:
Daniel Scalzi
parent
2062865e7f
commit
aacf15efc5
@ -1,67 +1,17 @@
|
||||
const cp = require('child_process')
|
||||
const EventEmitter = require('events')
|
||||
const fs = require('fs')
|
||||
const path = require('path')
|
||||
const Registry = require('winreg')
|
||||
const request = require('request')
|
||||
|
||||
/**
|
||||
* Attempts to find a valid x64 installation of Java on Windows machines.
|
||||
* Possible paths will be pulled from the registry and the JAVA_HOME environment
|
||||
* variable. The paths will be sorted with higher versions preceeding lower, and
|
||||
* JREs preceeding JDKs. The binaries at the sorted paths will then be validated.
|
||||
* The first validated is returned.
|
||||
*
|
||||
* Higher versions > Lower versions
|
||||
* If versions are equal, JRE > JDK.
|
||||
*
|
||||
* @returns {string} The root path of a valid x64 Java installation. If none are
|
||||
* found, null is returned.
|
||||
*/
|
||||
async function _win32Validate(){
|
||||
|
||||
// Get possible paths from the registry.
|
||||
const pathSet = await _scanRegistry()
|
||||
|
||||
console.log(Array.from(pathSet)) // DEBUGGING
|
||||
|
||||
// Validate JAVA_HOME
|
||||
const jHome = _scanJavaHome()
|
||||
if(jHome != null && jHome.indexOf('(x86)') === -1){
|
||||
pathSet.add(jHome)
|
||||
const PLATFORM_MAP = {
|
||||
win32: '-windows-x64.tar.gz',
|
||||
darwin: '-macosx-x64.tar.gz',
|
||||
linux: '-linux-x64.tar.gz'
|
||||
}
|
||||
|
||||
// Convert path set to an array for processing.
|
||||
let pathArr = Array.from(pathSet)
|
||||
|
||||
console.log(pathArr) // DEBUGGING
|
||||
|
||||
// Sorts array. Higher version numbers preceed lower. JRE preceeds JDK.
|
||||
pathArr = pathArr.sort((a, b) => {
|
||||
// Note that Java 9+ uses semver and that will need to be accounted for in
|
||||
// the future.
|
||||
const aVer = parseInt(a.split('_')[1])
|
||||
const bVer = parseInt(b.split('_')[1])
|
||||
if(bVer === aVer){
|
||||
return a.indexOf('jdk') > -1 ? 1 : 0
|
||||
} else {
|
||||
return bVer - aVer
|
||||
}
|
||||
})
|
||||
|
||||
console.log(pathArr) // DEBUGGING
|
||||
|
||||
// Validate that the binary is actually x64.
|
||||
for(let i=0; i<pathArr.length; i++) {
|
||||
let res = await _validateBinary(pathArr[i])
|
||||
if(res){
|
||||
return pathArr[i]
|
||||
}
|
||||
}
|
||||
|
||||
// No suitable candidates found.
|
||||
return null;
|
||||
|
||||
}
|
||||
class JavaGuard extends EventEmitter {
|
||||
|
||||
/**
|
||||
* Validates that a Java binary is at least 64 bit. This makes use of the non-standard
|
||||
@ -76,7 +26,7 @@ async function _win32Validate(){
|
||||
* @returns {Promise.<boolean>} Resolves to false only if the test is successful and the result
|
||||
* is less than 64.
|
||||
*/
|
||||
function _validateBinary(binaryPath){
|
||||
static _validateBinary(binaryPath){
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
const fBp = path.join(binaryPath, 'bin', 'java.exe')
|
||||
@ -119,7 +69,7 @@ function _validateBinary(binaryPath){
|
||||
*
|
||||
* @returns {string} The path defined by JAVA_HOME, if it exists. Otherwise null.
|
||||
*/
|
||||
function _scanJavaHome(){
|
||||
static _scanJavaHome(){
|
||||
const jHome = process.env.JAVA_HOME
|
||||
try {
|
||||
let res = fs.existsSync(jHome)
|
||||
@ -137,7 +87,7 @@ function _scanJavaHome(){
|
||||
* @returns {Promise.<Set.<string>>} A promise which resolves to a set of 64-bit Java root
|
||||
* paths found in the registry.
|
||||
*/
|
||||
function _scanRegistry(){
|
||||
static _scanRegistry(){
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
// Keys for Java v9.0.0 and later:
|
||||
@ -162,17 +112,19 @@ function _scanRegistry(){
|
||||
key: regKeys[i],
|
||||
arch: 'x64'
|
||||
})
|
||||
key.keyExists((err, exists) => {
|
||||
if(exists) {
|
||||
key.keys((err, javaVers) => {
|
||||
if(err){
|
||||
console.error(err)
|
||||
if(i === regKeys.length-1){
|
||||
if(i === regKeys.length-1 && cbAcc === cbTracker){
|
||||
resolve(candidates)
|
||||
}
|
||||
} else {
|
||||
cbTracker += javaVers.length
|
||||
if(i === regKeys.length-1 && cbTracker === cbAcc){
|
||||
resolve(candidates)
|
||||
}
|
||||
} else {
|
||||
for(let j=0; j<javaVers.length; j++){
|
||||
const javaVer = javaVers[j]
|
||||
const vKey = javaVer.key.substring(javaVer.key.lastIndexOf('\\')+1)
|
||||
@ -182,15 +134,28 @@ function _scanRegistry(){
|
||||
const jHome = res.value
|
||||
if(jHome.indexOf('(x86)') === -1){
|
||||
candidates.add(jHome)
|
||||
cbAcc++
|
||||
|
||||
}
|
||||
if(cbAcc === cbTracker){
|
||||
cbAcc++
|
||||
if(i === regKeys.length-1 && cbAcc === cbTracker){
|
||||
resolve(candidates)
|
||||
}
|
||||
})
|
||||
} else {
|
||||
cbAcc++
|
||||
if(i === regKeys.length-1 && cbAcc === cbTracker){
|
||||
resolve(candidates)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
} else {
|
||||
if(i === regKeys.length-1 && cbAcc === cbTracker){
|
||||
resolve(candidates)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@ -198,54 +163,121 @@ function _scanRegistry(){
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Attempts to find a valid x64 installation of Java on Windows machines.
|
||||
* Possible paths will be pulled from the registry and the JAVA_HOME environment
|
||||
* variable. The paths will be sorted with higher versions preceeding lower, and
|
||||
* JREs preceeding JDKs. The binaries at the sorted paths will then be validated.
|
||||
* The first validated is returned.
|
||||
*
|
||||
* Higher versions > Lower versions
|
||||
* If versions are equal, JRE > JDK.
|
||||
*
|
||||
* @returns {string} The root path of a valid x64 Java installation. If none are
|
||||
* found, null is returned.
|
||||
*/
|
||||
static async _win32Validate(){
|
||||
|
||||
// Get possible paths from the registry.
|
||||
const pathSet = await JavaGuard._scanRegistry()
|
||||
|
||||
console.log(Array.from(pathSet)) // DEBUGGING
|
||||
|
||||
// Validate JAVA_HOME
|
||||
const jHome = JavaGuard._scanJavaHome()
|
||||
if(jHome != null && jHome.indexOf('(x86)') === -1){
|
||||
pathSet.add(jHome)
|
||||
}
|
||||
|
||||
// Convert path set to an array for processing.
|
||||
let pathArr = Array.from(pathSet)
|
||||
|
||||
console.log(pathArr) // DEBUGGING
|
||||
|
||||
// Sorts array. Higher version numbers preceed lower. JRE preceeds JDK.
|
||||
pathArr = pathArr.sort((a, b) => {
|
||||
// Note that Java 9+ uses semver and that will need to be accounted for in
|
||||
// the future.
|
||||
const aVer = parseInt(a.split('_')[1])
|
||||
const bVer = parseInt(b.split('_')[1])
|
||||
if(bVer === aVer){
|
||||
return a.indexOf('jdk') > -1 ? 1 : 0
|
||||
} else {
|
||||
return bVer - aVer
|
||||
}
|
||||
})
|
||||
|
||||
console.log(pathArr) // DEBUGGING
|
||||
|
||||
// Validate that the binary is actually x64.
|
||||
for(let i=0; i<pathArr.length; i++) {
|
||||
let res = await JavaGuard._validateBinary(pathArr[i])
|
||||
if(res){
|
||||
return pathArr[i]
|
||||
}
|
||||
}
|
||||
|
||||
// No suitable candidates found.
|
||||
return null;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* WIP -> get a valid x64 Java path on macOS.
|
||||
*/
|
||||
function _darwinValidate(){
|
||||
static async _darwinValidate(){
|
||||
return null
|
||||
}
|
||||
|
||||
/**
|
||||
* WIP -> get a valid x64 Java path on linux.
|
||||
*/
|
||||
function _linuxValidate(){
|
||||
static async _linuxValidate(){
|
||||
return null
|
||||
}
|
||||
|
||||
// This will eventually return something.
|
||||
async function validate(){
|
||||
|
||||
let res = null
|
||||
|
||||
const opSys = process.platform
|
||||
if(opSys === 'win32'){
|
||||
res = await _win32Validate()
|
||||
} else if(opSys === 'darwin'){
|
||||
res = _darwinValidate()
|
||||
} else if(opSys === 'linux'){
|
||||
res = _linuxValidate()
|
||||
static async validate(){
|
||||
return await JavaGuard['_' + process.platform + 'Validate']()
|
||||
}
|
||||
|
||||
return res;
|
||||
// WIP -> Downloading Suite
|
||||
|
||||
static _latestJREOracle(){
|
||||
|
||||
const url = 'http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html'
|
||||
const regex = /http:\/\/.+?(?=\/java)\/java\/jdk\/([0-9]+u[0-9]+)-(b[0-9]+)\/([a-f0-9]{32})?\/jre-\1/
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
request(url, (err, resp, body) => {
|
||||
if(!err){
|
||||
const arr = body.match(regex)
|
||||
const verSplit = arr[1].split('u')
|
||||
resolve({
|
||||
uri: arr[0],
|
||||
version: {
|
||||
major: verSplit[0],
|
||||
update: verSplit[1],
|
||||
build: arr[2]
|
||||
}
|
||||
})
|
||||
} else {
|
||||
resolve(null)
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
const PLATFORM_MAP = {
|
||||
win32: '-windows-x64.tar.gz',
|
||||
darwin: '-macosx-x64.tar.gz',
|
||||
linux: '-linux-x64.tar.gz'
|
||||
}
|
||||
async _downloadOracleJRE(acceptLicense, dir){
|
||||
|
||||
const BASE_URL = 'http://download.oracle.com/otn-pub/java/jdk/8u161-b12/2f38c3b165be4555a1fa6e98c45e0808/jre-8u161'
|
||||
|
||||
function _downloadJava(acceptLicense, dir){
|
||||
if(!acceptLicense){
|
||||
return
|
||||
}
|
||||
|
||||
// TODO -> Complete this code. See format used in assetguard.js#510
|
||||
|
||||
const combined = BASE_URL + PLATFORM_MAP[process.platform]
|
||||
const latestData = await JavaGuard._latestJREOracle()
|
||||
|
||||
const combined = latestData.uri + PLATFORM_MAP[process.platform]
|
||||
const name = combined.substring(combined.lastIndexOf('/')+1)
|
||||
const fDir = path.join(dir, name)
|
||||
|
||||
@ -260,15 +292,24 @@ function _downloadJava(acceptLicense, dir){
|
||||
let writeStream = fs.createWriteStream(fDir)
|
||||
req.pipe(writeStream)
|
||||
req.resume()
|
||||
|
||||
}
|
||||
|
||||
_downloadJava(dir){
|
||||
this._downloadOracleJRE(true, dir)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
async function test(){
|
||||
console.log(await validate())
|
||||
//console.log(await JavaGuard.validate())
|
||||
const g = new JavaGuard()
|
||||
g._downloadJava('C:\\Users\\Asus\\Desktop\\LauncherElectron\\target\\')
|
||||
//console.log(JSON.stringify(await _latestJREOracle()))
|
||||
}
|
||||
|
||||
//test()
|
||||
_downloadJava(true, 'C:\\Users\\Asus\\Desktop\\LauncherElectron\\target\\')
|
||||
test()
|
||||
|
||||
module.exports = {
|
||||
validate
|
||||
JavaGuard
|
||||
}
|
||||
@ -5,6 +5,9 @@
|
||||
"smallImageText": "WesterosCraft",
|
||||
"smallImageKey": "seal-circle"
|
||||
},
|
||||
"java": {
|
||||
"oracle": "http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
|
||||
},
|
||||
"servers": [
|
||||
{
|
||||
"id": "WesterosCraft-1.11.2",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user