homebridge-smartsystem 6.2.6 → 6.3.2

package/server/smartapp.ts

@@ -26,6 +26,7 @@ import { setToken } from "../duotecno/config";
 
 const kMaster = {name: "master", type: "string", default: "0.0.0.0:5001"} as const;
 const kAddress = {name: "address", type: "string", default: "0.0.0.0"} as const;
+const kAddresses = {name: "addresses", type: "string", default: "[0.0.0.0]"} as const;
 const kAddressOld = {name: "addressX", type: "string", default: "0.0.0.0"} as const;
 const kPort = {name: "port", type: "integer", default: 80} as const;
 const kPortOld = {name: "portX", type: "integer", default: 80} as const;
@@ -357,7 +358,7 @@ export class SmartApp extends WebApp {
         power.updateRule( id, this.scrapeRule(context) );
 
       } else if (context.action === "save") {
-        power.updateConfig({address: context.getParam(kAddress), uid: context.getParam(kUID)});
+        power.updateConfig({address: context.getParam(kAddress), uid: context.getParam(kUID), addresses: context.getParam(kAddresses), });
 
 
       } else if (context.action === "badd") {
@@ -879,7 +880,6 @@ export class SmartApp extends WebApp {
 
   async updateNodes(master: Master, nodes, params) {
     if (nodes) {
-      // let nodeArr = nodes.split(",").map(s => parseInt(s));
       let nodeArr = nodes.map(s => parseInt(s));
       nodeArr.forEach(adr => {
         let node = this.system.findNode(master, adr);
@@ -935,7 +935,7 @@ export class SmartApp extends WebApp {
     } else { // context.action === "node"
       // reponding to  /units/[master ip address:port]/[logical node address]
       const nodeLogicalAddress = parseInt(context.id);
-      let response = await this.getNodeInfo(master, nodeLogicalAddress);
+      let response = await this.getNodeInfo(master, nodeLogicalAddress, true);
       let N = this.sortCopy(response.node, context);
       return this.ejs("nodeDetail", context, { message: response.message, node: N });
     }    
@@ -970,14 +970,14 @@ export class SmartApp extends WebApp {
     }
   }
 
-  async getNodeInfo(master: Master, nodeLogicalAddress: number) {
+  async getNodeInfo(master: Master, nodeLogicalAddress: number, doFetch = false) {
     let node = this.system.findNode(master, nodeLogicalAddress);
     if (! node) {
       // if no node found, make some dummy node for the display system. (should not occur !)
       return { node: new Node(this.system.masters[0], {name: "No node"}), message: "Node not found" };
 
     } else {
-      if (node.nrUnits != node.units.length) 
+      if ((node.nrUnits != node.units.length) || doFetch)
         await master.fetchAllUnits(node);
       await node.master.requestNodeStatus(node);
       return { node };

package/server/views/power.ejs

@@ -38,6 +38,14 @@
         </div>
         <% } %>
         
+        <% if (type === "shelly") { %>
+          <div class="row">
+            <div class="input-field col s12">
+              <input  placeholder="xx.xx.xx.xx, ..." id="addresses" name="addresses" type="text" value="<%= config.addresses %>">
+              <label for="addresses">Addresses (komma separated)</label>
+            </div>
+          </div>
+        <% } %>
 
         <h1>Rules
           <button class="right btn waves-effect waves-light" type="submit" name="action" value="add">Add rule</button>
@@ -91,17 +99,17 @@
         <h1>Info</h1>
         <% if (realtime) { %>
           <table>
-            <tr><th>totalPower</th><th>totalReactivePower</th>
-                <th>totalExportEnergy</th><th>totalImportEnergy</th>
-                <th>monitorStatus</th></tr>
+            <tr><th>Total Power</th><th>Total Reactive</th>
+                <th>Total Export</th><th>Total Import</th>
+                <th>Status</th></tr>
             <tr><td><%= realtime.totalPower %></td><td><%= realtime.totalReactivePower %></td>
                 <td><%= watt(realtime.totalExportEnergy) %>h</td><td><%= watt(realtime.totalImportEnergy) %>h</td>
                 <td><%= realtime.monitorStatus %></td></tr>
-            <tr><th>utcTimeStamp</th>
+            <tr><th>Time</th>
               <% for (let inx in voltages) {  %>
                 <th>Phase <%= inx %></th>
               <% } %>
-              <th>Realtime Counter</th>
+              <th>Poll Counter</th>
             </tr>
             <tr><td><%= datetime(new Date(realtime.utcTimeStamp)) %></td>
               <% for (let inx in voltages) {  %>
@@ -114,16 +122,17 @@
 
           <h1>Channels</h1>
           <table>
-            <tr><th>publishIndex</th><th>Name</th>
-                <th>power</th><th>exportEnergy</th><th>importEnergy</th>
-                <th>phaseId</th><th>current</th><th>apparentPower</th>
-                <th>cosPhi</th><th>type</th><th>flow</th><th>formula</th></tr>
+            <tr><th>Index</th><th>Name</th>
+                <th>Power</th><th>Total Export</th><th>Total Import</th>
+                <th>Phase</th><th>Current</th><th>Voltage</th><th>Apparent Power</th>
+                <th>cosPhi</th><th>Type</th><th>Flow</th><th>Formula</th></tr>
             <% for (let inx in channels) { const ch = channels[inx];  %>
               <tr><td><%= inx %></td>
                   <td><%= ch.name %></td>
-                  <td><%= ch.power %></td>
+                  <td><%= watt(ch.power) %></td>
                   <td><%= watt(ch.exportEnergy) %></td><td><%= watt(ch.importEnergy) %></td>
-                  <td><%= ch.phaseId %></td><td><%= ch.current %></td>
+                  <td><%= (ch.phaseId >= 0) ? ch.phaseId : "-" %></td><td><%= Math.round(ch.current*100)/100 %>A</td>
+                  <td><%= ch.voltage %>V</td>
                   <td><%= ch.apparentPower %></td><td><%= ch.cosPhi %></td>
                   <td><%= ch.type %></td><td><%= ch.flow %></td><td><%= ch.formula %></td>
                 </tr>