java version info per-server on the UI (#478)

Author: flareofghast

html/index.html

@@ -965,6 +965,9 @@ <h4 class="title"><span class="icon icone-ticket"></span>{{ 'JAVA_SETTINGS' | tr
                                             </header>
                                             <section class="body">
                                                 <div class="body-inner">
+                                                    <div class="control-group">
+                                                        {{( 'CURRENT_JAVA_VERSION' | translate)+': ' + servers[current].page_data.glance.java_version_in_use}}
+                                                    </div>
                                                     <!-- Select -->
                                                     <div class="control-group">
                                                         <div class="controls">
@@ -1635,6 +1638,9 @@ <h4 translate="STARTING_A_NEW_SERVER"></h4>
                         <select class="" ng-model="myprofile" default-option="Select a profile" data-ng-options="p as p.id group by p.group for p in profiles | profile_downloaded: 'only_downloaded' | orderBy:'-releaseTime'" ng-change="change_sc('minecraft', 'profile', myprofile.id)">
                             <option value="" disabled selected translate="CHANGE_PROFILE_TO"></option>
                         </select>
+                        <div class="control-group">
+                            {{( 'CURRENT_JAVA_VERSION' | translate)+': ' + servers[current].page_data.glance.java_version_in_use}}
+                        </div>
                         <!-- Select -->
                         <div class="control-group">
                             <div class="controls">

html/locales/locale-en_US.json

@@ -103,6 +103,7 @@
   "SELECT_SERVER_PROFILE": "Select server profile",
   "CHANGE_PROFILE_TO": "Change profile to:",
   "CHANGE_JARFILE_TO": "Change runnable jar to:",
+  "CURRENT_JAVA_VERSION": "Java Version in Use",
   "ADDITIONAL_JAVA_ARGS": "Additional Java arguments:",
   "ADDITIONAL_JAR_ARGS": "Additional Jar arguments:",
   "CHANGE_NICENESS": "Change Process Niceness",

java.js

@@ -0,0 +1,23 @@
+async function usedJavaVersion(sc, callback){
+  try{
+    var child_process = require('child_process');
+    var which = require('which');
+
+    var java_binary = which.sync('java');
+    var value = (sc.java || {}).java_binary || java_binary;
+
+    var java_version = child_process.spawnSync(`${value}`, ['-version']);
+
+    var stdout = java_version.stdout.toString();
+    var stderr = java_version.stderr.toString();
+
+    var toReturn = stdout ? stdout.split('"')[1].split('"')[0] : stderr.split('"')[1].split('"')[0];
+
+    callback(null, toReturn);
+  }catch(e){
+    callback(null, `Error accessing location '${value}'`);
+  }
+
+}
+
+module.exports = {usedJavaVersion};

mineos.js

@@ -6,6 +6,7 @@ var child_process = require('child_process');
 var which = require('which');
 var logging = require('winston');
 var mineos = exports;
+const java = require('./java.js');
 
 mineos.DIRS = {
   'servers': 'servers',
@@ -537,7 +538,7 @@ mineos.mc = function(server_name, base_dir) {
             var value = (dict.java || {}).java_tweaks || null;
             cb(null, value);
           });
-        }
+        },
       }, function(err, results) {
         if (err) {
           inner_callback(err, {});
@@ -1567,6 +1568,12 @@ mineos.mc = function(server_name, base_dir) {
         fs.stat(path.join(self.env.cwd, 'FTBInstall.sh'), function(err, stat_data) {
           callback(null, !!stat_data);
         })
+        break;
+      case 'java_version_in_use':
+        self.sc(function(err,dict){
+          java.usedJavaVersion(dict,callback);
+        })
+        
         break;
       default:
         callback(true, undefined);

package-lock.json

@@ -1304,7 +1304,8 @@ function server_container(server_name, user_config, socket_io) {
             'eula': async.apply(instance.property, 'eula'),
             'base_dir': function(cb) {
               cb(null, user_config.base_directory)
-            }
+            },
+            'java_version_in_use': async.apply(instance.property, 'java_version_in_use'),
           }, function(err, results) {
             if (err instanceof Object)
               logging.error('[{0}] Error with get_page_data glance'.format(server_name), err, results);