Enhance engine info

Author: javalikescript

extensions/web-base/www/app.html

@@ -215,9 +215,10 @@
     <page-article>
       <p>Information</p>
       <dl>
-        <dt><label>CPU Time</label></dt><dd><span v-html="clock">na</span></dd>
-        <dt><label>Memory size</label></dt><dd><span v-html="memory">na</span></dd>
-        <dt><label>Server Time</label></dt><dd><span v-html="time">na</span></dd>
+        <template v-for="(value, name) in infos">
+          <dt><label>{{ name }}</label></dt>
+          <dd><span>{{ value }}</span></dd>
+        </template>
       </dl>
     </page-article>
   </app-page>

extensions/web-base/www/app/app.js

@@ -351,22 +351,19 @@ var homePage = new Vue({
  new Vue({
   el: '#engineInfo',
   data: {
-    clock: '...',
-    memory: '...',
-    time: '...'
+    infos: {}
   },
   methods: {
     onShow: function() {
       var page = this;
       fetch('/engine/admin/info').then(function(response) {
         return response.json();
       }).then(function(data) {
-        //console.log('fetch(admin/info)', data);
-        page.clock = data.clock;
-        page.memory = data.memory;
+        console.log('fetch(admin/info)', data);
         var clientTime = Math.round(Date.now() / 1000);
-        var delta = clientTime - data.time;
-        page.time = '' + data.time + ' (' + delta + ')';
+        var serverTime = data['Server Time'];
+        data['Delta Time'] = clientTime - serverTime;
+        page.infos = data;
         toaster.toast('Refreshed');
       });
     }

lha/restEngine.lua

@@ -7,6 +7,7 @@ local RestHttpHandler = require('jls.net.http.handler.RestHttpHandler')
 local HttpExchange = require('jls.net.http.HttpExchange')
 local json = require('jls.util.json')
 local Date = require('jls.util.Date')
+local Map = require('jls.util.Map')
 local ZipFile = require('jls.util.zip.ZipFile')
 
 local utils = require('lha.utils')
@@ -89,6 +90,7 @@ local REST_ADMIN = {
   ['restart?method=POST'] = function(exchange)
     event:setTimeout(function()
       exchange.attributes.engine:stop()
+      runtime.gc()
       exchange.attributes.engine:start()
     end, 100)
     return 'In progress'
@@ -105,21 +107,18 @@ local REST_ADMIN = {
     return 'Done'
   end,
   info = function(exchange)
-    --local engine = exchange:getAttribute('engine')
-    --local ip, port = engine:getHTTPServer():getAddress()
+    local engine = exchange:getAttribute('engine')
+    local httpServer = engine:getHTTPServer()
+    --local ip, port = httpServer:getAddress()
     return {
-      clock = os.clock(),
-      memory = math.floor(collectgarbage('count') * 1024),
-      time = Date.now() // 1000
+      ['CPU Time'] = os.clock(),
+      ['Server Time'] = os.time(),
+      ['Lua Memory Size'] = math.floor(collectgarbage('count') * 1024),
+      ['Lua Registry Entries'] = Map.size(debug.getregistry()),
+      ['Loaded Packages'] = Map.size(package.loaded),
+      ['HTTP Clients'] = Map.size(httpServer.pendings),
     }
   end,
-  mem = function(exchange)
-    local report = ''
-    require('jls.util.memprof').printReport(function(data)
-      report = data
-    end, false, false, 'csv')
-    return report
-  end,
   backup = {
     ['create?method=POST'] = function(exchange)
       local engine = exchange:getAttribute('engine')