homebridge-smartsystem 6.0.9 → 6.0.10

package/README.md

@@ -240,6 +240,9 @@ switch =>
 ## v6.0.x - 01-07-2022
 - .1: first version running on Homebridge UI
 - .9: read version from package.json
+- .10: removed "homekit" nav tab, 
+ added "restart plugin" to settings, 
+ set lock target state to "locked"
 
 ## Hardware 
 A Raspberry Pi that connects to a Duotecno IP Node 

package/accessories/lock.js

@@ -13,6 +13,7 @@ const accessory_1 = require("./accessory");
 class Lock extends accessory_1.Accessory {
     constructor(log, homebridge, unit) {
         super(log, homebridge, unit);
+        this.targetState = 1; // locked
         this.log("created Lock -> " + unit.getDescription());
         // set default for Unlocked to Locked
         if (this.unit.getType() === types_1.UnitExtendedType.kUnlocker)

package/accessories/lock.ts

@@ -14,7 +14,7 @@ import { Accessory } from "./accessory";
 
 
 export class Lock extends Accessory {
-  targetState;
+  targetState = 1; // locked
 
   constructor(log: LogFunction, homebridge: API, unit: Unit) {
     super(log, homebridge, unit);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "6.0.9",
+  "version": "6.0.10",
   "description": "SmartServer (Proxy Websockets to TCP sockets, Smappee MQTT, Duotecno IP Nodes, Homekit interface)",
   "main": "index.js",
   "author": "Johan Coppieters",

package/server/smartapp.js

@@ -211,8 +211,13 @@ class SmartApp extends webapp_1.WebApp {
                 config = this.scrapeSettings(context);
                 this.write("settings", config);
             }
+            else if (context.action === "restart") {
+                context.request = "restart";
+                return this.doRestart(false);
+            }
             else if (context.action === "install") {
                 config = this.scrapeSettings(context);
+                context.request = "install";
                 this.write("settings", config);
                 this.writeDHCP(context, config);
             }

package/server/smartapp.ts

@@ -227,8 +227,13 @@ export class SmartApp extends WebApp {
       config = this.scrapeSettings(context);
       this.write("settings", config);
 
+    } else if (context.action === "restart") {
+      context.request = "restart";
+      return this.doRestart(false)
+
     } else if (context.action === "install") {
       config = this.scrapeSettings(context);
+      context.request = "install";
       this.write("settings", config);
       this.writeDHCP(context, config);
 

package/server/views/nav.ejs

@@ -2,7 +2,7 @@
   <div class="nav-wrapper">
     <a href="/index.html" target=_blank class="brand-logo hide-on-small-only" >Duotecno</a>
     <ul id="nav-mobile" class="right">
-      <li <%= (request === "homekit") ? 'class="active"' : '' %></li><a href="/homekit">Homekit</a></li>
+      <!-- li <%= (request === "homekit") ? 'class="active"' : '' %></li><a href="/homekit">Homekit</a></li -->
       <li <%= (request === "masters") ? 'class="active"' : '' %></li><a href="/masters">Masters</a></li>
       <li <%= (request === "services") ? 'class="active"' : '' %></li><a href="/services">Services</a></li>
       <% if (hasSmappee) { %><li <%= (request === "smappee") ? 'class="active"' : '' %></li><a href="/smappee">Smappee</a></li><% } %>

package/server/views/settings.ejs

@@ -17,10 +17,10 @@
       <form method="POST" action="/settings">
         <input type="hidden" name="daction" value="save">
         <h1>
-          IP Settings
-          <button class="right btn waves-effect waves-light" type="submit" name="action" value="reset">Reset</button>
-          <button class="right btn waves-effect waves-light" type="submit" name="action" value="install">Install</button>
-          <button class="right btn waves-effect waves-light" type="submit" name="action" value="reboot">Reboot</button>
+          Settings<button class="right btn waves-effect waves-light" type="submit" name="action" value="reset">Reset to DHCP</button>
+          <button class="right btn waves-effect waves-light" type="submit" name="action" value="install">Install IP Settings</button>
+          <button class="right btn waves-effect waves-light" type="submit" name="action" value="reboot">Reboot PI</button>
+          <button class="right btn waves-effect waves-light" type="submit" name="action" value="restart">Restart Homebridge</button>
         </h1>
         
         <div class="row">