homebridge-smartsystem 6.2.2 → 6.2.5

package/README.md

@@ -271,6 +271,9 @@ Homebridge UI version
  ### v6.2.x - 11-08-2022 - P1 release
  - 1: always write config to file too (next to sending through the HB-UI API)
  - 2: added headers to http calls from switches, dimmers and up/down's (including OH stuff)
+ - 3: fixed bug in Sanitizer of UnitConfig preventing from publishing units to homebridge
+ - 4: fixed empty name bug in unit-def / new accessory()
+ - 5: fixed bad displayNames in published units
  
 
 ## Hardware 

package/accessories/accessory.js

@@ -9,9 +9,9 @@ const logger_1 = require("../duotecno/logger");
 class Accessory {
     constructor(api, unit) {
         this.homebridge = api.hap;
-        this.unit = unit; // : Duotecno Unit
-        this.name = unit.getDisplayName();
         this.uuid_base = unit.getSerialNr();
+        this.unit = unit; // : Duotecno Unit
+        this.name = unit.getDisplayName() || this.uuid_base;
         // get all services and add ours
         this.services = this.getAccessoryServices();
         this.services.push(this.getInformationService());
@@ -33,10 +33,10 @@ class Accessory {
         throw new Error('The getSystemServices method must be overridden.');
     }
     getModelName() {
-        return this.name;
+        return this.name || this.unit.getSerialNr();
     }
     getName() {
-        return this.name;
+        return this.name || this.unit.getSerialNr();
     }
     getSerialNumber() {
         if (this.unit)

package/accessories/accessory.ts

@@ -18,9 +18,10 @@ export class Accessory {
 
   constructor(api: API, unit: Unit) {
     this.homebridge = api.hap;
-    this.unit = unit;       // : Duotecno Unit
-    this.name = unit.getDisplayName();
+
     this.uuid_base = unit.getSerialNr();
+    this.unit = unit;       // : Duotecno Unit
+    this.name = unit.getDisplayName() || this.uuid_base;
 
     // get all services and add ours
     this.services = this.getAccessoryServices();
@@ -47,10 +48,10 @@ export class Accessory {
   }
 
   getModelName(): string {
-    return this.name;
+    return this.name || this.unit.getSerialNr();
   }
   getName(): string {
-    return this.name;
+    return this.name || this.unit.getSerialNr();
   }
 
   getSerialNumber(): string {

package/duotecno/types.js

@@ -373,38 +373,42 @@ exports.Sanitizers = {
             logicalNodeAddress: info.logicalNodeAddress || 0,
             logicalAddress: info.logicalAddress || 0,
             masterAddress: info.masterAddress || '',
-            masterPort: info.masterPort || 5001
+            masterPort: info.masterPort || 5001,
+            name: info.name || ('unit ' + info.logicalNodeAddress + ":" + info.logicalAddress),
+            displayName: info.displayName || info.name || ('unit ' + info.logicalNodeAddress + ":" + info.logicalAddress),
+            extendedType: info.extendedType || UnitExtendedType.kNoType
         };
     },
     unitConfig: function (config) {
         if (!config) {
             config = {};
         }
-        config = exports.Sanitizers.unitDef(config);
-        config.active = config.active || 'N';
-        config.used = config.used || config.active;
+        const cfg = exports.Sanitizers.unitDef(config);
+        cfg.active = config.active || 'N';
+        cfg.used = config.used || config.active;
         if (typeof config.group === 'string') {
             config.group = parseInt(config.group);
         }
-        config.group = config.group || 0;
-        return config;
+        cfg.group = config.group || 0;
+        return cfg;
     },
     unitScene: function (config) {
         // change + create new clean record for writing to config files
         if (!config) {
             config = {};
         }
-        config = exports.Sanitizers.unitDef(config);
+        const cfg = exports.Sanitizers.unitDef(config);
         if (typeof config.value === "undefined")
-            config.value = 0;
+            cfg.value = 0;
         if (typeof config.value === "string")
-            config.value = parseInt(config.value);
-        return { logicalNodeAddress: config.logicalNodeAddress,
-            logicalAddress: config.logicalAddress,
-            masterAddress: config.masterAddress,
-            masterPort: config.masterPort,
-            value: config.value,
-            name: config.name };
+            cfg.value = parseInt(config.value);
+        cfg.name = config.name || "New scene";
+        return { logicalNodeAddress: cfg.logicalNodeAddress,
+            logicalAddress: cfg.logicalAddress,
+            masterAddress: cfg.masterAddress,
+            masterPort: cfg.masterPort,
+            value: cfg.value,
+            name: cfg.name };
     },
     ////////////
     // Scenes //

package/duotecno/types.ts

@@ -563,38 +563,44 @@ export const Sanitizers = {
       logicalNodeAddress: info.logicalNodeAddress || 0,
       logicalAddress: info.logicalAddress || 0,
       masterAddress: info.masterAddress || '',
-      masterPort: info.masterPort || 5001
+      masterPort: info.masterPort || 5001,
+
+      name: info.name || ('unit '+info.logicalNodeAddress+":"+info.logicalAddress),
+      displayName: info.displayName || info.name || ('unit '+info.logicalNodeAddress+":"+info.logicalAddress),
+      
+      extendedType: info.extendedType || UnitExtendedType.kNoType
     };
   },
 
 
   unitConfig: function(config?: UnitConfig) {  // unitDef + active + group
     if (!config) { config = <UnitConfig>{}; }
-    config = <UnitConfig>Sanitizers.unitDef(config);
+    const cfg = <UnitConfig>Sanitizers.unitDef(config);
 
-    config.active = config.active || 'N';
-    config.used = config.used || config.active;
+    cfg.active = config.active || 'N';
+    cfg.used = config.used || config.active;
 
     if (typeof config.group === 'string') { config.group = parseInt(config.group); }
-    config.group = config.group || 0;
+    cfg.group = config.group || 0;
 
-    return config;
+    return cfg;
   },
 
   
   unitScene: function(config?: UnitScene) {  // unitDef + value 
     // change + create new clean record for writing to config files
     if (!config) { config = <UnitScene>{}; }
-    config = <UnitScene>Sanitizers.unitDef(config);
-    if (typeof config.value === "undefined") config.value = 0;
-    if (typeof config.value === "string") config.value = parseInt(config.value);
-
-    return { logicalNodeAddress: config.logicalNodeAddress,
-             logicalAddress: config.logicalAddress,
-             masterAddress: config.masterAddress,
-             masterPort: config.masterPort,
-             value: config.value,
-             name: config.name };
+    const cfg = <UnitScene>Sanitizers.unitDef(config);
+    if (typeof config.value === "undefined") cfg.value = 0;
+    if (typeof config.value === "string") cfg.value = parseInt(config.value);
+    cfg.name = config.name || "New scene";
+
+    return { logicalNodeAddress: cfg.logicalNodeAddress,
+             logicalAddress: cfg.logicalAddress,
+             masterAddress: cfg.masterAddress,
+             masterPort: cfg.masterPort,
+             value: cfg.value,
+             name: cfg.name };
   },
 
 

package/package.json

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

package/server/views/settings.ejs

@@ -20,7 +20,6 @@
           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">
@@ -41,7 +40,7 @@
           </div>
         </div>
 
-        <div class="row">
+        <!-- div class="row">
           <div class="input-field col s6">
             <input placeholder="" id="ip2" name="ip2" type="text" value="<%= config.network.ip2 %>">
             <label for="ip2">Secondary Fixed IP Address / netmask</label>
@@ -50,7 +49,7 @@
             <input placeholder="" id="gateway2" name="gateway2" type="text" value="<%= config.network.gateway2 %>">
             <label for="gateway2">Secondary Gateway</label>
           </div>
-        </div>
+        </div -->
 
       </form>