homebridge-bond 3.2.11 → 3.2.12

package/dist/BondApi.js

@@ -180,6 +180,19 @@ class BondApi {
             }
         });
     }
+    setPosition(device, position, callback) {
+        return this.request(HTTPMethod.PUT, this.uri.action(device.id, Action_1.Action.SetPosition), { argument: position })
+            .then(() => {
+            if (callback) {
+                callback(null);
+            }
+        })
+            .catch((error) => {
+            if (callback) {
+                callback(Error(error));
+            }
+        });
+    }
     setFanSpeed(device, speed, callback) {
         return this.action(device, Action_1.Action.SetSpeed, callback, { argument: speed });
     }

package/dist/accessories/ShadesAccessory.js

@@ -23,9 +23,17 @@ class ShadesAccessory {
     }
     updateState(state) {
         if (this.windowCoveringService) {
-            // Always return either 0 or 100
-            this.windowCoveringService.currentPosition.updateValue(state.open === 1 ? 100 : 0);
-            this.windowCoveringService.targetPosition.updateValue(state.open === 1 ? 100 : 0);
+            // If position is available, use it, otherwise fall back to open state
+            if (state.position !== undefined) {
+                // Convert Bond's extended percentage (0=open, 100=closed) to HomeKit's open percentage (0=closed, 100=open)
+                const homekitPosition = 100 - state.position;
+                this.windowCoveringService.currentPosition.updateValue(homekitPosition);
+                this.windowCoveringService.targetPosition.updateValue(homekitPosition);
+            }
+            else {
+                this.windowCoveringService.currentPosition.updateValue(state.open === 1 ? 100 : 0);
+                this.windowCoveringService.targetPosition.updateValue(state.open === 1 ? 100 : 0);
+            }
         }
     }
     observe(bond) {
@@ -46,18 +54,31 @@ class ShadesAccessory {
         const props = {
             minValue: 0,
             maxValue: 100,
-            minStep: 100,
+            minStep: Device_1.Device.MShasPosition(device) ? 1 : 100,
         };
         this.windowCoveringService.targetPosition.setProps(props);
         Observer_1.Observer.set(this.windowCoveringService.targetPosition, (value, callback) => {
-            // Since we can't really track state, just toggle open / closed
-            bond.api.toggleOpen(device, callback)
-                .then(() => {
-                this.platform.debug(this.accessory, `Toggled open: ${value}`);
-            })
-                .catch((error) => {
-                this.platform.error(this.accessory, `Error toggling open: ${error}`);
-            });
+            if (Device_1.Device.MShasPosition(device)) {
+                // Convert HomeKit's open percentage (0=closed, 100=open) to Bond's extended percentage (0=open, 100=closed)
+                const bondPosition = 100 - value;
+                bond.api.setPosition(device, bondPosition, callback)
+                    .then(() => {
+                    this.platform.debug(this.accessory, `Set position: ${bondPosition} (HomeKit: ${value})`);
+                })
+                    .catch((error) => {
+                    this.platform.error(this.accessory, `Error setting position: ${error}`);
+                });
+            }
+            else {
+                // Otherwise, toggle open/closed based on target position
+                bond.api.toggleOpen(device, callback)
+                    .then(() => {
+                    this.platform.debug(this.accessory, `Toggled open: ${value}`);
+                })
+                    .catch((error) => {
+                    this.platform.error(this.accessory, `Error toggling open: ${error}`);
+                });
+            }
         });
     }
     observePreset(bond, device) {

package/dist/enum/Action.js

@@ -26,4 +26,5 @@ var Action;
     Action["Close"] = "Close";
     Action["Preset"] = "Preset";
     Action["SetFlame"] = "SetFlame";
+    Action["SetPosition"] = "SetPosition";
 })(Action = exports.Action || (exports.Action = {}));

package/dist/interface/Device.js

@@ -122,4 +122,9 @@ var Device;
         }
     }
     Device.fanSpeeds = fanSpeeds;
+    function MShasPosition(device) {
+        const required = [Action_1.Action.SetPosition];
+        return required.every(r => device.actions.includes(r));
+    }
+    Device.MShasPosition = MShasPosition;
 })(Device = exports.Device || (exports.Device = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-bond",
-  "version": "3.2.11",
+  "version": "3.2.12",
   "description": "A homebridge plugin to control your Bond devices over the v2 API.",
   "license": "MIT",
   "main": "dist/index.js",
@@ -42,18 +42,18 @@
     "eslint": "^7.22.0",
     "homebridge": "^1.3.1",
     "mocha": "^9.1.2",
-    "nodemon": "^2.0.19",
+    "nodemon": "^3.1.7",
     "nyc": "^15.1.0",
     "rimraf": "^3.0.2",
     "ts-node": "^10.8.1",
     "typescript": "^4.2.2"
   },
   "dependencies": {
-    "axios": "^0.21.4",
+    "axios": "^0.28.0",
     "axios-retry": "^3.1.8",
     "biguint-format": "^1.0.2",
     "flake-idgen": "^1.4.0"
   },
   "homepage": "https://github.com/aarons22/homebridge-bond#readme",
   "author": "Aaron Sapp"
-}
+}