v6.0.6

seydx · Jun 26, 2021 · 3b03f79 · 3b03f79
1 parent 3dd2ceb
commit 3b03f79
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 64 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+# 6.0.6 - 2021-06-27
+
+## Other Changes
+- Fixed an issue where broadband received wrong state/value
+- Updated dependencies
+
 # 6.0.5 - 2021-06-23
 
 ## Other Changes

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-fritz-platform",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "Homebridge Plugin to control FritzBox router, smarthome devices and more.",
   "main": "index.js",
   "funding": [
@@ -48,7 +48,7 @@
     "homebridge": "^1.3.0"
   },
   "dependencies": {
-    "@seydx/fritzbox": "^2.2.6",
+    "@seydx/fritzbox": "^2.2.7",
     "fakegato-history": "0.6.1",
     "form-data": "^4.0.0",
     "fs-extra": "10.0.0",
@@ -63,6 +63,6 @@
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.23.4",
     "eslint-plugin-prettier": "^3.4.0",
-    "prettier": "^2.3.1"
+    "prettier": "^2.3.2"
   }
 }
diff --git a/src/accessories/callmonitor/callmonitor.js b/src/accessories/callmonitor/callmonitor.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
   CallmonitorAccessory: require('./callmonitor.accessory'),
   CallmonitorHandler: require('./callmonitor.handler'),

diff --git a/src/accessories/childlock/childlock.handler.js b/src/accessories/childlock/childlock.handler.js
@@ -43,10 +43,6 @@ class Handler {
       .getService(this.api.hap.Service.Switch)
       .getCharacteristic(this.api.hap.Characteristic.On).value;
 
-    if (accessory.context.busy) {
-      return state;
-    }
-
     try {
       const states = [];
       const ipList = accessory.context.config.ips;
@@ -92,8 +88,6 @@ class Handler {
 
     subtype = subtype || accessory.context.config.subtype;
 
-    accessory.context.busy = true;
-
     logger.info(`${state ? 'ON' : 'OFF'}`, `${accessory.displayName} (${subtype})`);
 
     try {
@@ -113,8 +107,6 @@ class Handler {
       logger.warn('An error occured during getting state!', `${accessory.displayName} (${subtype})`);
       logger.error(err, `${accessory.displayName} (${subtype})`);
     }
-
-    accessory.context.busy = false;
   }
 
   async poll() {

diff --git a/src/accessories/childlock/childlock.js b/src/accessories/childlock/childlock.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
   ChildLockAccessory: require('./childlock.accessory'),
   ChildLockHandler: require('./childlock.handler'),

diff --git a/src/accessories/extras/extras.handler.js b/src/accessories/extras/extras.handler.js
@@ -84,10 +84,6 @@ class Handler {
     let characteristic = ownCharacteristic ? ownCharacteristic : this.api.hap.Characteristic.On;
     let state = accessory.getService(this.api.hap.Service.Switch).getCharacteristic(characteristic).value;
 
-    if (accessory.context.busy) {
-      return state;
-    }
-
     switch (subtype) {
       case 'alarm':
         break;
@@ -225,8 +221,6 @@ class Handler {
     let fritzbox = accessory.context.config.fritzbox || this.fritzbox;
     let characteristic = ownCharacteristic ? ownCharacteristic : this.api.hap.Characteristic.On;
 
-    accessory.context.busy = true;
-
     switch (subtype) {
       case 'alarm': {
         try {
@@ -745,8 +739,6 @@ class Handler {
         );
         break;
     }
-
-    accessory.context.busy = false;
   }
 
   async poll() {

diff --git a/src/accessories/extras/extras.js b/src/accessories/extras/extras.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
   ExtrasAccessory: require('./extras.accessory'),
   ExtrasHandler: require('./extras.handler'),

diff --git a/src/accessories/network/network.js b/src/accessories/network/network.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
   NetworkAccessory: require('./network.accessory'),
   NetworkHandler: require('./network.handler'),

diff --git a/src/accessories/presence/presence.js b/src/accessories/presence/presence.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
   PresenceMotionAccessory: require('./motion/motion.accessory'),
   PresenceOccupancyAccessory: require('./occupancy/occupancy.accessory'),

diff --git a/src/accessories/router/router.accessory.js b/src/accessories/router/router.accessory.js
@@ -341,7 +341,7 @@ class Accessory {
 
       service
         .getCharacteristic(this.api.hap.Characteristic.Download)
-        .onGet(() => this.handler.get(this.accessory, 'broadband'));
+        .onGet(() => this.handler.get(this.accessory, 'broadband', this.api.hap.Characteristic.Download));
     } else {
       if (service.testCharacteristic(this.api.hap.Characteristic.Download)) {
         logger.info(

diff --git a/src/accessories/router/router.handler.js b/src/accessories/router/router.handler.js
@@ -95,10 +95,6 @@ class Handler {
     let characteristic = ownCharacteristic ? ownCharacteristic : this.api.hap.Characteristic.On;
     let state = accessory.getService(this.api.hap.Service.Switch).getCharacteristic(characteristic).value;
 
-    if (accessory.context.busy) {
-      return state;
-    }
-
     switch (subtype) {
       case 'dsl': {
         try {
@@ -366,7 +362,7 @@ class Handler {
           }
 
           //old fw
-          if (body && body.data && body.data.led_display) {
+          if (body && body.data) {
             state = parseInt(body.data.led_display) === 0;
           }
         } catch (err) {
@@ -468,8 +464,6 @@ class Handler {
     let fritzbox = accessory.context.config.fritzbox || this.fritzbox;
     let characteristic = ownCharacteristic ? ownCharacteristic : this.api.hap.Characteristic.On;
 
-    accessory.context.busy = true;
-
     switch (subtype) {
       case 'dsl': {
         logger.info(`${state ? 'ON' : 'OFF'}`, `${accessory.displayName} (${subtype})`);
@@ -987,8 +981,6 @@ class Handler {
         );
         break;
     }
-
-    accessory.context.busy = false;
   }
 
   async poll() {

diff --git a/src/accessories/router/router.js b/src/accessories/router/router.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
   RouterAccessory: require('./router.accessory'),
   RouterHandler: require('./router.handler'),

diff --git a/src/accessories/smarthome/smarthome.handler.js b/src/accessories/smarthome/smarthome.handler.js
@@ -219,10 +219,6 @@ class Handler {
 
         let state = accessory.getService(service).getCharacteristic(this.api.hap.Characteristic.On).value;
 
-        if (accessory.context.busy) {
-          return state;
-        }
-
         let bulbState = accessory
           .getService(this.api.hap.Service.Lightbulb)
           .getCharacteristic(this.api.hap.Characteristic.On).value;
@@ -440,10 +436,6 @@ class Handler {
           .getService(this.api.hap.Service.Lightbulb)
           .getCharacteristic(this.api.hap.Characteristic.On).value;
 
-        if (accessory.context.busy) {
-          return state;
-        }
-
         let brightness, temp, hue, sat;
 
         if (accessory.context.config.brightness) {
@@ -592,10 +584,6 @@ class Handler {
 
         let state = service.getCharacteristic(this.api.hap.Characteristic.On).value;
 
-        if (accessory.context.busy) {
-          return state;
-        }
-
         try {
           let device = !accessory.context.config.group
             ? this.smarthomeList.devices.find((device) => device.ain.includes(accessory.context.config.ain))
@@ -939,11 +927,6 @@ class Handler {
           .getService(this.api.hap.Service.HeaterCooler)
           .getCharacteristic(this.api.hap.Characteristic.HeatingThresholdTemperature).value;
 
-        if (accessory.context.busy) {
-          //assuming we are calling GET event for Characteristic.Active
-          return active;
-        }
-
         try {
           let device = !accessory.context.config.group
             ? this.smarthomeList.devices.find((device) => device.ain.includes(accessory.context.config.ain))
@@ -1140,8 +1123,6 @@ class Handler {
 
     subtype = subtype || accessory.context.config.subtype;
 
-    accessory.context.busy = true;
-
     switch (subtype) {
       case 'smarthome-switch-lightbulb':
         {
@@ -1663,8 +1644,6 @@ class Handler {
         );
         break;
     }
-
-    accessory.context.busy = false;
   }
 
   async poll() {

diff --git a/src/accessories/smarthome/smarthome.js b/src/accessories/smarthome/smarthome.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
   SHBlindAccessory: require('./blind/blind.accessory'),
   SHButtonAccessory: require('./button/button.accessory'),

diff --git a/src/accessories/wol/wol.handler.js b/src/accessories/wol/wol.handler.js
@@ -47,8 +47,6 @@ class Handler {
     // eslint-disable-next-line no-unused-vars
     subtype = subtype || accessory.context.config.subtype;
 
-    accessory.context.busy = true;
-
     try {
       logger.info('ON', `${accessory.displayName} (${subtype})`);
 
@@ -68,8 +66,6 @@ class Handler {
         1000
       );
     }
-
-    accessory.context.busy = false;
   }
 
   async poll() {}

diff --git a/src/accessories/wol/wol.js b/src/accessories/wol/wol.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
   WolAccessory: require('./wol.accessory'),
   WolHandler: require('./wol.handler'),