Add reboot

Author: javalikescript

Makefile

@@ -55,7 +55,7 @@ dist-any:
 	cp -ru $(LUAJLS)/jls/ $(LHA_DIST)/lua/
 	cp -ru lha/ $(LHA_DIST)/lua/
 	cp -u lha.sh $(LHA_DIST)/
-	cp -u lha.bat $(LHA_DIST)/
+	cp -u lha.cmd $(LHA_DIST)/
 	cp -u *.lua $(LHA_DIST)/
 	cp -ru extensions/ $(LHA_DIST)/
 	cp -ru assets/ $(LHA_DIST)/

extensions/hue/HueBridge.lua

@@ -553,6 +553,7 @@ return require('jls.lang.class').create(function(hueBridge)
   function hueBridge:updateThing(thing, info, isEvent)
     for name in pairs(thing:getProperties()) do
       local computeFn = computeFnByName[name] or getInfoProperty
+      ---@diagnostic disable-next-line: redundant-parameter
       local value = computeFn(info, name, self)
       if isValue(value) then
         thing:updatePropertyValue(name, value)
@@ -563,6 +564,7 @@ return require('jls.lang.class').create(function(hueBridge)
   function hueBridge:setThingPropertyValue(thing, id, name, value)
     local category = categoryByName[name]
     local toPostFn = toPostFnByName[name] or toPost
+    ---@diagnostic disable-next-line: redundant-parameter
     local t = toPostFn(value, name)
     local path
     if thing:hasType(Thing.CAPABILITIES.OnOffSwitch) or thing:hasType(Thing.CAPABILITIES.Light) then

extensions/web-tools/web-tools.js

@@ -90,6 +90,11 @@ define(['./web-tools.xml'], function(toolsTemplate) {
           fetch('/engine/admin/restart', { method: 'POST'});
         });
       },
+      rebootServer: function() {
+        confirmation.ask('Reboot the server?').then(function() {
+          fetch('/engine/admin/reboot', { method: 'POST'});
+        });
+      },
       stopServer: function() {
         confirmation.ask('Stop the server?').then(function() {
           fetch('/engine/admin/stop', { method: 'POST'}).then(function() {

extensions/web-tools/web-tools.xml

@@ -20,6 +20,7 @@
     <p>Engine</p>
     <button v-on:click="stopServer"><i class="fas fa-power-off"></i>&nbsp;Stop the Server</button>
     <button v-on:click="restartServer"><i class="fas fa-redo"></i>&nbsp;Restart the Server</button>
+    <button v-on:click="rebootServer"><i class="fas fa-redo"></i>&nbsp;Reboot the Server</button>
     <p>Advanced</p>
     <button v-on:click="reloadExtensions"><i class="fas fa-redo"></i>&nbsp;Reload the Extensions</button>
     <button v-on:click="reloadScripts"><i class="fas fa-redo"></i>&nbsp;Reload the Scripts</button>

lha.cmd

@@ -1 +1,6 @@
-bin\lua lha.lua %*
+@echo off
+:bof
+bin\lua lha.lua %*
+set STATUS=%ERRORLEVEL%
+if %STATUS% equ 11 goto bof
+exit /b %STATUS%

lha.sh

@@ -1,2 +1,8 @@
 #!/bin/sh
-exec bin/lua lha.lua $@
+status=11
+while test $status -eq 11
+do
+  bin/lua lha.lua $@
+  status=$?
+done
+exit $status

lha/restEngine.lua

@@ -157,6 +157,13 @@ local REST_ADMIN = {
     exchange.attributes.engine:reloadScripts(mode == 'full')
     return 'Done'
   end,
+  ['reboot?method=POST'] = function(exchange)
+    event:setTimeout(function()
+      exchange.attributes.engine:stop()
+      runtime.exit(11)
+    end, 100)
+    return 'In progress'
+  end,
   ['restart?method=POST'] = function(exchange)
     event:setTimeout(function()
       exchange.attributes.engine:stop()
@@ -165,8 +172,8 @@ local REST_ADMIN = {
     end, 100)
     return 'In progress'
   end,
-    -- curl -X POST http://localhost:8080/engine/stop
-    ['stop?method=POST'] = function(exchange)
+  -- curl -X POST http://localhost:8080/engine/stop
+  ['stop?method=POST'] = function(exchange)
     event:setTimeout(function()
       exchange.attributes.engine:stop()
       event:stop()