homebridge-smartsystem 6.8.13 → 6.8.18

package/README.md

@@ -315,6 +315,7 @@ Homebridge UI version
 - 9: corrected reading the local config file + dump it in the logs
 - 10: wrong default port for cloud server
 - 11: use new DNS entries + exponential backoff for new connections, give up after 16 seconds.
+- 12, 13: small changes for missing value for Target...  
 
 ## Hardware 
 A Raspberry Pi that connects to a Duotecno IP Node 

package/accessories/accessory.js

@@ -49,8 +49,16 @@ class Accessory {
     getState(next) {
         if (this.unit) {
             this.unit.reqState(unit => {
-                next(null, unit.status);
-                (0, logger_1.log)("accessory", "getState was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status);
+                try {
+                    if (!unit) {
+                        return next(new Error("Unit state not available"));
+                    }
+                    next(null, unit.status);
+                    (0, logger_1.log)("accessory", "getState was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status);
+                }
+                catch (err) {
+                    next(err);
+                }
             }).catch(err => next(err));
         }
         else {
@@ -60,8 +68,16 @@ class Accessory {
     getValue(next) {
         if (this.unit) {
             this.unit.reqState(unit => {
-                next(null, unit.value);
-                (0, logger_1.log)("accessory", "getValue was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
+                try {
+                    if (!unit) {
+                        return next(new Error("Unit state not available"));
+                    }
+                    next(null, unit.value);
+                    (0, logger_1.log)("accessory", "getValue was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
+                }
+                catch (err) {
+                    next(err);
+                }
             }).catch(err => next(err));
         }
         else {

package/accessories/accessory.ts

@@ -68,8 +68,15 @@ export class Accessory {
   getState(next) {
     if (this.unit) {
       this.unit.reqState(unit => { 
-        next(null, unit.status);
-        log("accessory", "getState was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status);
+        try {
+          if (!unit) {
+            return next(new Error("Unit state not available"));
+          }
+          next(null, unit.status);
+          log("accessory", "getState was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status);
+        } catch(err) {
+          next(err);
+        }
       }).catch(err => next(err));
     } else {
       next( new Error("accessory - getState needs to be overridden if no unit is provided.") );
@@ -79,14 +86,22 @@ export class Accessory {
   getValue(next) {
     if (this.unit) {
       this.unit.reqState(unit => { 
-        next(null, unit.value);
-        log("accessory", "getValue was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
+        try {
+          if (!unit) {
+            return next(new Error("Unit state not available"));
+          }
+          next(null, unit.value);
+          log("accessory", "getValue was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
+        } catch(err) {
+          next(err);
+        }
       }).catch(err => next(err));
     } else {
       next( new Error("accessory - getState needs to be overridden if no unit is provided.") );
     }
   }
 
+
   setState(value, next) {
     if (this.unit)
       this.unit.setState(value)

package/accessories/bulb.js

@@ -25,11 +25,6 @@ class Bulb extends accessory_1.Accessory {
             .then(() => next())
             .catch(err => next(err));
     }
-    setBrightness(value, next) {
-        this.unit.setState(value)
-            .then(() => next())
-            .catch(err => next(err));
-    }
 }
 exports.Bulb = Bulb;
 //# sourceMappingURL=bulb.js.map

package/accessories/bulb.ts

@@ -34,9 +34,5 @@ export class Bulb extends Accessory {
       .then(() => next())
       .catch(err => next(err))
   }
-  setBrightness(value, next) {
-    this.unit.setState(value)
-      .then(() => next())
-      .catch(err => next(err))
-  }
+  
 }

package/accessories/dimmer.js

@@ -30,12 +30,20 @@ class Dimmer extends accessory_1.Accessory {
     getBrightness(next) {
         if (this.unit) {
             this.unit.reqState(unit => {
-                next(null, unit.value);
-                (0, logger_1.log)("accessory", "getBrightness was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
+                try {
+                    if (!unit) {
+                        return next(new Error("Unit state not available"));
+                    }
+                    next(null, unit.value);
+                    (0, logger_1.log)("accessory", "getBrightness was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
+                }
+                catch (err) {
+                    next(err);
+                }
             }).catch(err => next(err));
         }
         else {
-            next(new Error("accessory - getState needs to be overridden if no unit is provided."));
+            next(new Error("accessory - getBrightness needs to be overridden if no unit is provided."));
         }
     }
     setPower(powerOn, next) {

package/accessories/dimmer.ts

@@ -41,14 +41,21 @@ export class Dimmer extends Accessory {
   getBrightness(next) {
     if (this.unit) {
       this.unit.reqState(unit => { 
-        next(null, unit.value);
-        log("accessory", "getBrightness was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
+        try {
+          if (!unit) {
+            return next(new Error("Unit state not available"));
+          }
+          next(null, unit.value);
+          log("accessory", "getBrightness was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
+        } catch(err) {
+          next(err);
+        }
       }).catch(err => next(err));
     } else {
-      next( new Error("accessory - getState needs to be overridden if no unit is provided.") );
+      next( new Error("accessory - getBrightness needs to be overridden if no unit is provided.") );
     }
   }
-
+  
   setPower(powerOn, next) {
     this.waitingSetPower = true;
     log("accessory", "setPower: *** waiting *** " + powerOn);

package/accessories/garagedoor.js

@@ -13,7 +13,7 @@ const accessory_1 = require("./accessory");
 class GarageDoor extends accessory_1.Accessory {
     constructor(homebridge, unit) {
         super(homebridge, unit);
-        this.targetState = this.homebridge.Characteristic.CurrentDoorState.STOPPED;
+        this.targetState = this.homebridge.Characteristic.TargetDoorState.CLOSED;
     }
     getAccessoryServices() {
         // GarageDoorOpener needs authentication
@@ -39,13 +39,15 @@ class GarageDoor extends accessory_1.Accessory {
             return this.homebridge.Characteristic.CurrentDoorState.OPENING;
         else if (status == types_1.UnitState.kStopped)
             return this.homebridge.Characteristic.CurrentDoorState.STOPPED;
-        else
-            return this.homebridge.Characteristic.CurrentDoorState.STOPPED; // ????
+        else {
+            (0, logger_1.log)("accessory", `Unknown Door/UnitState ${status}, defaulting to STOPPED`);
+            return this.homebridge.Characteristic.CurrentDoorState.STOPPED;
+        }
     }
     HB2DT(state) {
-        if (state == this.homebridge.Characteristic.CurrentDoorState.OPEN)
+        if (state == this.homebridge.Characteristic.TargetDoorState.OPEN)
             return types_1.UnitMotorCmd.kOpen;
-        else if (state == this.homebridge.Characteristic.CurrentDoorState.CLOSED)
+        else if (state == this.homebridge.Characteristic.TargetDoorState.CLOSED)
             return types_1.UnitMotorCmd.kClose;
         else if (state == this.homebridge.Characteristic.CurrentDoorState.STOPPED)
             return types_1.UnitMotorCmd.kStop;
@@ -56,7 +58,7 @@ class GarageDoor extends accessory_1.Accessory {
         try {
             this.unit.reqState(unit => {
                 const hb = this.DT2HB(unit.status);
-                (0, logger_1.log)("accessory", "Get TargetDoorState of " + this.name + " = " + unit.status + " -> " + hb);
+                (0, logger_1.log)("accessory", "Get CurrentDoorState of " + this.name + " = " + unit.status + " -> " + hb);
                 next(null, hb);
             });
         }
@@ -86,9 +88,17 @@ class GarageDoor extends accessory_1.Accessory {
     }
     // in response to Duotecno status messages
     updateState() {
-        const value = this.DT2HB(this.unit.status);
-        (0, logger_1.log)("accessory", "Received updateState -> Homekit GarageDoor for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status + " / " + this.unit.value + " -> passing to HB: " + value);
-        this.me.getCharacteristic(this.homebridge.Characteristic.CurrentDoorState).updateValue(value);
+        const current = this.DT2HB(this.unit.status);
+        const target = current === this.homebridge.Characteristic.CurrentDoorState.OPEN
+            ? this.homebridge.Characteristic.TargetDoorState.OPEN
+            : this.homebridge.Characteristic.TargetDoorState.CLOSED;
+        (0, logger_1.log)("accessory", "Received updateState -> Homekit GarageDoor for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status + " -> passing to HB (current/target): " + current + " / " + target);
+        this.me
+            .getCharacteristic(this.homebridge.Characteristic.CurrentDoorState)
+            .updateValue(current);
+        this.me
+            .getCharacteristic(this.homebridge.Characteristic.TargetDoorState)
+            .updateValue(target);
     }
 }
 exports.GarageDoor = GarageDoor;

package/accessories/garagedoor.ts

@@ -14,7 +14,7 @@ import { Accessory } from "./accessory";
 
 
 export class GarageDoor extends Accessory {
-  targetState = this.homebridge.Characteristic.CurrentDoorState.STOPPED;
+  targetState = this.homebridge.Characteristic.TargetDoorState.CLOSED;
 
   constructor(homebridge: API, unit: Unit) {
     super(homebridge, unit);
@@ -56,15 +56,17 @@ export class GarageDoor extends Accessory {
     else if (status == UnitState.kStopped) 
       return this.homebridge.Characteristic.CurrentDoorState.STOPPED;
 
-    else 
-      return this.homebridge.Characteristic.CurrentDoorState.STOPPED;  // ????
+    else {
+      log("accessory", `Unknown Door/UnitState ${status}, defaulting to STOPPED`);
+      return this.homebridge.Characteristic.CurrentDoorState.STOPPED;
+    }
   }
 
   HB2DT(state): UnitMotorCmd | null {
-    if (state == this.homebridge.Characteristic.CurrentDoorState.OPEN)
+    if (state == this.homebridge.Characteristic.TargetDoorState.OPEN)
       return UnitMotorCmd.kOpen;
       
-    else if (state == this.homebridge.Characteristic.CurrentDoorState.CLOSED)
+    else if (state == this.homebridge.Characteristic.TargetDoorState.CLOSED)
       return UnitMotorCmd.kClose;
 
     else if (state == this.homebridge.Characteristic.CurrentDoorState.STOPPED)
@@ -78,7 +80,7 @@ export class GarageDoor extends Accessory {
     try {
       this.unit.reqState(unit => {
         const hb = this.DT2HB(unit.status);
-        log("accessory", "Get TargetDoorState of " + this.name + " = " + unit.status + " -> " + hb);
+        log("accessory", "Get CurrentDoorState of " + this.name + " = " + unit.status + " -> " + hb);
         next(null, hb);
       });
 
@@ -114,9 +116,19 @@ export class GarageDoor extends Accessory {
 
   // in response to Duotecno status messages
   updateState() {
-    const value = this.DT2HB(this.unit.status);
-    log("accessory", "Received updateState -> Homekit GarageDoor for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status + " / " + this.unit.value + " -> passing to HB: " + value);
-    this.me.getCharacteristic(this.homebridge.Characteristic.CurrentDoorState).updateValue(value);
+    const current = this.DT2HB(this.unit.status);
+      const target =
+        current === this.homebridge.Characteristic.CurrentDoorState.OPEN
+          ? this.homebridge.Characteristic.TargetDoorState.OPEN
+          : this.homebridge.Characteristic.TargetDoorState.CLOSED;
+
+    log("accessory", "Received updateState -> Homekit GarageDoor for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status + " -> passing to HB (current/target): " + current + " / " + target);
+    this.me
+        .getCharacteristic(this.homebridge.Characteristic.CurrentDoorState)
+        .updateValue(current);
+    this.me
+      .getCharacteristic(this.homebridge.Characteristic.TargetDoorState)
+      .updateValue(target);
   }
 
 }

package/accessories/lock.js

@@ -63,9 +63,17 @@ class Lock extends accessory_1.Accessory {
     }
     getCurrent(next) {
         this.unit.reqState(unit => {
-            (0, logger_1.log)("accessory", "HB getting current state of lock = " + this.unit.status + " of " + this.unit.getDescription());
-            next(null, !!this.unit.status);
-        });
+            try {
+                if (!unit) {
+                    return next(new Error("Unit state not available"));
+                }
+                (0, logger_1.log)("accessory", "HB getting current state of lock = " + this.unit.status + " of " + this.unit.getDescription());
+                next(null, !!this.unit.status);
+            }
+            catch (err) {
+                next(err);
+            }
+        }).catch(err => next(err));
     }
     // in response to Duotecno status messages
     updateState() {

package/accessories/lock.ts

@@ -81,9 +81,16 @@ export class Lock extends Accessory {
 
   getCurrent(next) {
     this.unit.reqState(unit => {
-      log("accessory", "HB getting current state of lock = " + this.unit.status + " of " + this.unit.getDescription());
-      next(null, !!this.unit.status);
-    });
+      try {
+        if (!unit) {
+          return next(new Error("Unit state not available"));
+        }
+        log("accessory", "HB getting current state of lock = " + this.unit.status + " of " + this.unit.getDescription());
+        next(null, !!this.unit.status);
+      } catch(err) {
+        next(err);
+      }
+    }).catch(err => next(err));
   }
 
 

package/accessories/temperature.js

@@ -23,8 +23,16 @@ class Temperature extends accessory_1.Accessory {
     getTemperature(next) {
         if (this.unit) {
             this.unit.reqState(unit => {
-                (0, logger_1.log)("accessory", "reqState/getTemperature returned a value for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
-                next(null, unit.value / 10.0);
+                try {
+                    if (!unit) {
+                        return next(new Error("Unit state not available"));
+                    }
+                    (0, logger_1.log)("accessory", "reqState/getTemperature returned a value for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
+                    next(null, unit.value / 10.0);
+                }
+                catch (err) {
+                    next(err);
+                }
             })
                 .catch(err => next(err));
         }

package/accessories/temperature.ts

@@ -31,8 +31,15 @@ export class Temperature extends Accessory {
   getTemperature(next) {
     if (this.unit) {
       this.unit.reqState(unit => {
-        log("accessory", "reqState/getTemperature returned a value for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
-        next(null, <number>unit.value / 10.0);
+        try {
+          if (!unit) {
+            return next(new Error("Unit state not available"));
+          }
+          log("accessory", "reqState/getTemperature returned a value for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
+          next(null, <number>unit.value / 10.0);
+        } catch(err) {
+          next(err);
+        }
       })
       .catch(err => next(err));
     } else {

package/accessories/windowcovering.js

@@ -93,13 +93,21 @@ class WindowCovering extends accessory_1.Accessory {
     getCurrentPosition(next) {
         (0, logger_1.log)("accessory", "get CurrentPosition was called of " + this.name);
         this.unit.reqState(unit => {
-            if (unit.status == types_1.UnitState.kOpen)
-                next(null, 100);
-            else if (unit.status == types_1.UnitState.kClosed)
-                next(null, 0);
-            else
-                next(null, 50); // ????
-        });
+            try {
+                if (!unit) {
+                    return next(new Error("Unit state not available"));
+                }
+                if (unit.status == types_1.UnitState.kOpen)
+                    next(null, 100);
+                else if (unit.status == types_1.UnitState.kClosed)
+                    next(null, 0);
+                else
+                    next(null, 50);
+            }
+            catch (err) {
+                next(err);
+            }
+        }).catch(err => next(err));
     }
     setTargetPosition(value, next) {
         // homekit is giving 0-100 for windows
@@ -123,13 +131,21 @@ class WindowCovering extends accessory_1.Accessory {
     getTargetPosition(next) {
         (0, logger_1.log)("accessory", "get Characteristic.TargetPosition was called");
         this.unit.reqState(unit => {
-            if (this.unit.status == types_1.UnitState.kOpen)
-                next(null, 100);
-            else if (this.unit.status == types_1.UnitState.kClosed)
-                next(null, 0);
-            else
-                next(null, 50); // ????
-        });
+            try {
+                if (!unit) {
+                    return next(new Error("Unit state not available"));
+                }
+                if (this.unit.status == types_1.UnitState.kOpen)
+                    next(null, 100);
+                else if (this.unit.status == types_1.UnitState.kClosed)
+                    next(null, 0);
+                else
+                    next(null, 50);
+            }
+            catch (err) {
+                next(err);
+            }
+        }).catch(err => next(err));
     }
     // called in response to Duotecno status update
     updateState() {

package/accessories/windowcovering.ts

@@ -110,15 +110,22 @@ export class WindowCovering extends Accessory {
 
   getCurrentPosition(next) {
     log("accessory", "get CurrentPosition was called of " + this.name);
-  
+
     this.unit.reqState(unit => {
-      if (unit.status == UnitState.kOpen) 
-        next(null, 100);
-      else if (unit.status == UnitState.kClosed) 
-        next(null, 0);
-      else 
-        next(null, 50);  // ????
-    });
+      try {
+        if (!unit) {
+          return next(new Error("Unit state not available"));
+        }
+        if (unit.status == UnitState.kOpen) 
+          next(null, 100);
+        else if (unit.status == UnitState.kClosed) 
+          next(null, 0);
+        else 
+          next(null, 50);
+      } catch(err) {
+        next(err);
+      }
+    }).catch(err => next(err));
   }
 
 
@@ -147,13 +154,20 @@ export class WindowCovering extends Accessory {
     log("accessory", "get Characteristic.TargetPosition was called");
 
     this.unit.reqState(unit => {
-      if (this.unit.status == UnitState.kOpen) 
-        next(null, 100);
-      else if (this.unit.status == UnitState.kClosed) 
-        next(null, 0);
-      else 
-        next(null, 50);  // ????
-    });
+      try {
+        if (!unit) {
+          return next(new Error("Unit state not available"));
+        }
+        if (this.unit.status == UnitState.kOpen) 
+          next(null, 100);
+        else if (this.unit.status == UnitState.kClosed) 
+          next(null, 0);
+        else 
+          next(null, 50);
+      } catch(err) {
+        next(err);
+      }
+    }).catch(err => next(err));
   }
 
   // called in response to Duotecno status update

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "6.8.13",
+  "version": "6.8.18",
   "description": "SmartServer (Proxy TCP sockets to the cloud, Smappee MQTT, Duotecno IP Nodes, Homekit interface)",
   "main": "index.js",
   "author": "Johan Coppieters",
@@ -10,7 +10,11 @@
   "scripts": {
     "start": "DEBUG=* homebridge -D -P '/Users/johan/Development/duotecno/smartsocket'",
     "watch": "npx tsc --build . --watch",
-    "publish": "npx tsc --build && npm i && npm publish"
+    "build": "npx tsc --build",
+    "prepublishOnly": "npm run build",
+    "publish": "npm publish",
+    "version:patch": "npm version patch && npm publish",
+    "version:minor": "npm version minor && npm publish"
   },
   "engines": {
     "node": "^18.20.4 || ^20.15.1 || ^22",