homebridge-carrier-infinity 1.6.9 → 1.7.0-beta.1

package/dist/characteristics_fan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"characteristics_fan.d.ts","sourceRoot":"","sources":["../src/characteristics_fan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,+BAA+B,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAqBvF,cAAM,SAAU,SAAQ,+BAA+B;IACrD,KAAK,0DAA8B;IACnC,GAAG,uBAwBD;IAEF,GAAG,UAAiB,mBAAmB,mBAoBrC;CACH;AAED,cAAM,QAAS,SAAQ,+BAA+B;IACpD,KAAK,mEAAuC;IAC5C,GAAG,2BAwBD;CACH;AAED,cAAM,QAAS,SAAQ,+BAA+B;IACpD,KAAK,iEAAqC;IAC1C,KAAK;;;;MAA0C;IAE/C,GAAG,qCAID;IAEF,GAAG,UAAiB,mBAAmB,mBAcrC;CACH;AAED,cAAM,cAAe,SAAQ,+BAA+B;IAC1D,KAAK,kEAAsC;IAE3C,GAAG,uBAOD;IAEF,GAAG,UAAiB,mBAAmB,mBAgBrC;CACH;AAED,qBAAa,UAAW,SAAQ,YAAY;IAC1C,QAAQ,mFAKN;CACH"}
+{"version":3,"file":"characteristics_fan.d.ts","sourceRoot":"","sources":["../src/characteristics_fan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,+BAA+B,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAsBvF,cAAM,SAAU,SAAQ,+BAA+B;IACrD,KAAK,0DAA8B;IACnC,KAAK,mCA8BH;IAEF,GAAG,UAAiB,mBAAmB,mBA6BrC;CACH;AAED,cAAM,QAAS,SAAQ,+BAA+B;IACpD,KAAK,mEAAuC;IAC5C,KAAK,uCA8BH;CACH;AAED,cAAM,QAAS,SAAQ,+BAA+B;IACpD,KAAK,iEAAqC;IAC1C,KAAK;;;;OAA8C;IACnD,KAAK,iDAAuG;IAE5G,GAAG,UAAiB,mBAAmB,mBAsBrC;CACH;AAED,cAAM,cAAe,SAAQ,+BAA+B;IAC1D,KAAK,kEAAsC;IAC3C,KAAK,mCAIH;IAEF,GAAG,UAAiB,mBAAmB,mBAwBrC;CACH;AAED,qBAAa,UAAW,SAAQ,YAAY;IAC1C,QAAQ,mFAKN;CACH"}

package/dist/characteristics_fan.js

@@ -4,6 +4,7 @@ exports.FanService = void 0;
 const characteristics_base_1 = require("./characteristics_base");
 const helpers_1 = require("./helpers");
 const constants_1 = require("./api/constants");
+const rxjs_1 = require("rxjs");
 /*
  * Controls for system fan.
  *
@@ -24,42 +25,48 @@ class FanStatus extends characteristics_base_1.ThermostatCharacteristicWrapper {
     constructor() {
         super(...arguments);
         this.ctype = this.Characteristic.Active;
-        this.get = async () => {
-            if (
-            // if the system is configured to be off, the fan must be off
-            await this.system.config.getMode() === constants_1.SYSTEM_MODE.OFF) {
-                return this.Characteristic.Active.INACTIVE;
-            }
-            else if (
-            // zone config api says manual fan mode
-            await this.system.config.getZoneActivityFan(this.context.zone, await this.getActivity()) !== constants_1.FAN_MODE.OFF ||
-                // zone status api says fan is on
-                await this.system.status.getZoneFan(this.context.zone) !== constants_1.FAN_MODE.OFF ||
-                // zone status api says zone is conditioning
-                await this.system.status.getZoneConditioning(this.context.zone) !== constants_1.SYSTEM_MODE.OFF) {
-                // but there is an exception to the above... which is the fan status/config
-                // can be wrong if the zone is actually closed off.
-                if (await this.system.status.getZoneOpen(this.context.zone)) {
-                    return this.Characteristic.Active.ACTIVE;
-                }
-                else {
-                    return this.Characteristic.Active.INACTIVE;
-                }
+        this.value = (0, rxjs_1.combineLatest)([
+            this.system.config.mode,
+            this.system.config.getZone(this.context.zone).fan,
+            this.system.status.getZone(this.context.zone).blowing,
+            this.system.status.getZone(this.context.zone).closed,
+        ]).pipe((0, rxjs_1.debounceTime)(50), (0, rxjs_1.map)(([c_mode, c_fan, s_blowing, s_closed]) => {
+            // First, we do the absolute checks. If the status says blowing, or the system
+            // is shut off, we know the state.
+            if (s_blowing) {
+                return this.Characteristic.Active.ACTIVE;
             }
-            else {
+            else if (c_mode === constants_1.SYSTEM_MODE.OFF) {
                 return this.Characteristic.Active.INACTIVE;
+                // Second, we check for the edge case between when a user changes the state
+                // and the system picks it up. If the fan is set to on, the fan will be on
+                // soon, even though it isn't yet (which we know since blowing was false).
+                // This mitigates switch instability.
+                // However, we only do this edge case fix if the damper status is not closed,
+                // since if the damper reports it is closed, there is a good chance the
+                // config may be ignored for one reason or another. (#156)
             }
-        };
+            else if (c_fan !== constants_1.FAN_MODE.OFF && !s_closed) {
+                return this.Characteristic.Active.ACTIVE;
+            }
+            // Finally, if we get here the zone is not blowing.
+            return this.Characteristic.Active.INACTIVE;
+        }), (0, rxjs_1.distinctUntilChanged)());
         this.set = async (value) => {
             // if we are trying to *turn on* fan, and system is off, set to fan only mode
             if (value === this.Characteristic.Active.ACTIVE &&
-                await this.system.config.getMode() === constants_1.SYSTEM_MODE.OFF) {
+                await (0, rxjs_1.firstValueFrom)(this.system.config.mode) === constants_1.SYSTEM_MODE.OFF) {
                 return await this.system.config.setMode(constants_1.SYSTEM_MODE.FAN_ONLY);
             }
             // if we are trying to turn off fan, turn off fan override (i.e. set fan speed=auto)
             // NOTE: If system is in FAN_ONLY mode, it will remain in FAN ONLY, but with speed=auto.
             if (value === this.Characteristic.Active.INACTIVE) {
-                return await this.system.config.setZoneActivityManualHold(this.context.zone, null, null, await this.getHoldTime(), constants_1.FAN_MODE.OFF);
+                // Sync current activity settings to manual activity
+                await this.system.config.setZoneActivityManualSync(this.context.zone, await (0, rxjs_1.firstValueFrom)(this.system.getZoneActivity(this.context.zone)));
+                // Update manual activity fan speed
+                await this.system.config.setZoneActivityManualFan(this.context.zone, constants_1.FAN_MODE.OFF);
+                // Enable manual activity hold
+                await this.system.config.setZoneActivityHold(this.context.zone, constants_1.ACTIVITY.MANUAL, await this.getHoldTime());
             }
         };
     }
@@ -68,49 +75,52 @@ class FanState extends characteristics_base_1.ThermostatCharacteristicWrapper {
     constructor() {
         super(...arguments);
         this.ctype = this.Characteristic.CurrentFanState;
-        this.get = async () => {
-            if (
-            // if the system is configured to be off, the fan must be off
-            await this.system.config.getMode() === constants_1.SYSTEM_MODE.OFF) {
-                return this.Characteristic.CurrentFanState.INACTIVE;
+        this.value = (0, rxjs_1.combineLatest)([
+            this.system.config.mode,
+            this.system.config.getZone(this.context.zone).fan,
+            this.system.status.getZone(this.context.zone).blowing,
+            this.system.status.getZone(this.context.zone).closed,
+        ]).pipe((0, rxjs_1.debounceTime)(50), (0, rxjs_1.map)(([c_mode, c_fan, s_blowing, s_closed]) => {
+            // First, we do the absolute checks. If the status says blowing, or the system
+            // is shut off, we know the state.
+            if (s_blowing) {
+                return this.Characteristic.CurrentFanState.BLOWING_AIR;
             }
-            else if (
-            // zone config api says manual fan mode
-            await this.system.config.getZoneActivityFan(this.context.zone, await this.getActivity()) !== constants_1.FAN_MODE.OFF ||
-                // zone status api says fan is on
-                await this.system.status.getZoneFan(this.context.zone) !== constants_1.FAN_MODE.OFF ||
-                // zone status api says zone is conditioning
-                await this.system.status.getZoneConditioning(this.context.zone) !== constants_1.SYSTEM_MODE.OFF) {
-                // but there is an exception to the above... which is the fan status/config
-                // can be wrong if the zone is actually closed off.
-                if (await this.system.status.getZoneOpen(this.context.zone)) {
-                    return this.Characteristic.CurrentFanState.BLOWING_AIR;
-                }
-                else {
-                    return this.Characteristic.CurrentFanState.IDLE;
-                }
+            else if (c_mode === constants_1.SYSTEM_MODE.OFF) {
+                return this.Characteristic.CurrentFanState.INACTIVE;
+                // Second, we check for the edge case between when a user changes the state
+                // and the system picks it up. If the fan is set to on, the fan will be on
+                // soon, even though it isn't yet (which we know since blowing was false).
+                // This mitigates switch instability.
+                // However, we only do this edge case fix if the damper status is not closed,
+                // since if the damper reports it is closed, there is a good chance the
+                // config may be ignored for one reason or another. (#156)
             }
-            else {
-                return this.Characteristic.CurrentFanState.IDLE;
+            else if (c_fan !== constants_1.FAN_MODE.OFF && !s_closed) {
+                return this.Characteristic.CurrentFanState.BLOWING_AIR;
             }
-        };
+            // Finally, if we get here the zone is not blowing.
+            return this.Characteristic.CurrentFanState.IDLE;
+        }), (0, rxjs_1.distinctUntilChanged)());
     }
 }
 class FanSpeed extends characteristics_base_1.ThermostatCharacteristicWrapper {
     constructor() {
         super(...arguments);
         this.ctype = this.Characteristic.RotationSpeed;
-        this.props = { minValue: 0, maxValue: 3, minStep: 1 };
-        this.get = async () => {
-            return (0, helpers_1.convertSystemFan2CharFan)(await this.system.config.getZoneActivityFan(this.context.zone, await this.getActivity()));
-        };
+        this.props = (0, rxjs_1.of)({ minValue: 0, maxValue: 3, minStep: 1 });
+        this.value = this.system.config.getZone(this.context.zone).fan.pipe((0, rxjs_1.map)(data => (0, helpers_1.convertSystemFan2CharFan)(data)));
         this.set = async (value) => {
             // if we are trying to control fan, and system is off, set to fan only mode
-            if (await this.system.config.getMode() === constants_1.SYSTEM_MODE.OFF) {
+            if (await (0, rxjs_1.firstValueFrom)(this.system.config.mode) === constants_1.SYSTEM_MODE.OFF) {
                 await this.system.config.setMode(constants_1.SYSTEM_MODE.FAN_ONLY);
             }
-            // set fan speed
-            return await this.system.config.setZoneActivityManualHold(this.context.zone, null, null, await this.getHoldTime(), (0, helpers_1.convertCharFan2SystemFan)(value));
+            // Sync current activity settings to manual activity
+            await this.system.config.setZoneActivityManualSync(this.context.zone, await (0, rxjs_1.firstValueFrom)(this.system.getZoneActivity(this.context.zone)));
+            // Update manual activity fan speed
+            await this.system.config.setZoneActivityManualFan(this.context.zone, (0, helpers_1.convertCharFan2SystemFan)(value));
+            // Enable manual activity hold
+            await this.system.config.setZoneActivityHold(this.context.zone, constants_1.ACTIVITY.MANUAL, await this.getHoldTime());
         };
     }
 }
@@ -118,20 +128,22 @@ class TargetFanState extends characteristics_base_1.ThermostatCharacteristicWrap
     constructor() {
         super(...arguments);
         this.ctype = this.Characteristic.TargetFanState;
-        this.get = async () => {
-            return await this.system.config.getZoneActivityFan(this.context.zone, await this.getActivity()) === constants_1.FAN_MODE.OFF ?
-                this.Characteristic.TargetFanState.AUTO :
-                this.Characteristic.TargetFanState.MANUAL;
-        };
+        this.value = this.system.config.getZone(this.context.zone).fan.pipe((0, rxjs_1.map)(data => data === constants_1.FAN_MODE.OFF ?
+            this.Characteristic.TargetFanState.AUTO :
+            this.Characteristic.TargetFanState.MANUAL));
         this.set = async (value) => {
             // if we are trying to control fan, and system is off, set to fan only mode
-            if (await this.system.config.getMode() === constants_1.SYSTEM_MODE.OFF) {
+            if (await (0, rxjs_1.firstValueFrom)(this.system.config.mode) === constants_1.SYSTEM_MODE.OFF) {
                 await this.system.config.setMode(constants_1.SYSTEM_MODE.FAN_ONLY);
             }
-            // set fan speed to switch between auto and manual
-            return await this.system.config.setZoneActivityManualHold(this.context.zone, null, null, await this.getHoldTime(), value === this.Characteristic.TargetFanState.AUTO ?
+            // Sync current activity settings to manual activity
+            await this.system.config.setZoneActivityManualSync(this.context.zone, await (0, rxjs_1.firstValueFrom)(this.system.getZoneActivity(this.context.zone)));
+            // Update manual activity fan speed to switch between auto and manual
+            await this.system.config.setZoneActivityManualFan(this.context.zone, value === this.Characteristic.TargetFanState.AUTO ?
                 constants_1.FAN_MODE.OFF : // fan off is auto
                 constants_1.FAN_MODE.MED);
+            // Enable manual activity hold
+            await this.system.config.setZoneActivityHold(this.context.zone, constants_1.ACTIVITY.MANUAL, await this.getHoldTime());
         };
     }
 }

package/dist/characteristics_fan.js.map

@@ -1 +1 @@
-{"version":3,"file":"characteristics_fan.js","sourceRoot":"","sources":["../src/characteristics_fan.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"characteristics_fan.js","sourceRoot":"","sources":["../src/characteristics_fan.ts"],"names":[],"mappings":"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"}

package/dist/characteristics_filter.d.ts

@@ -1,7 +1,7 @@
 import { CharacteristicWrapper, MultiWrapper } from './characteristics_base';
 declare class FilterLife extends CharacteristicWrapper {
     ctype: typeof import("hap-nodejs/dist/lib/definitions").FilterLifeLevel;
-    get: () => Promise<number>;
+    value: import("rxjs").Observable<number>;
 }
 export declare class FilterService extends MultiWrapper {
     WRAPPERS: (typeof FilterLife)[];

package/dist/characteristics_filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"characteristics_filter.d.ts","sourceRoot":"","sources":["../src/characteristics_filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE7E,cAAM,UAAW,SAAQ,qBAAqB;IAC5C,KAAK,mEAAuC;IAC5C,GAAG,wBAED;CACH;AAWD,qBAAa,aAAc,SAAQ,YAAY;IAC7C,QAAQ,wBAGN;CACH"}
+{"version":3,"file":"characteristics_filter.d.ts","sourceRoot":"","sources":["../src/characteristics_filter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE7E,cAAM,UAAW,SAAQ,qBAAqB;IAC5C,KAAK,mEAAuC;IAC5C,KAAK,oCAA0D;CAChE;AAWD,qBAAa,aAAc,SAAQ,YAAY;IAC7C,QAAQ,wBAGN;CACH"}

package/dist/characteristics_filter.js

@@ -1,25 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilterService = void 0;
+const rxjs_1 = require("rxjs");
 const characteristics_base_1 = require("./characteristics_base");
 class FilterLife extends characteristics_base_1.CharacteristicWrapper {
     constructor() {
         super(...arguments);
         this.ctype = this.Characteristic.FilterLifeLevel;
-        this.get = async () => {
-            return 100 - (await this.system.status.getFilterUsed());
-        };
+        this.value = this.system.status.filter_used.pipe((0, rxjs_1.map)(x => 100 - x));
     }
 }
 class FilterChange extends characteristics_base_1.CharacteristicWrapper {
     constructor() {
         super(...arguments);
         this.ctype = this.Characteristic.FilterChangeIndication;
-        this.get = async () => {
-            return (await this.system.status.getFilterUsed()) > 95 ?
-                this.Characteristic.FilterChangeIndication.CHANGE_FILTER :
-                this.Characteristic.FilterChangeIndication.FILTER_OK;
-        };
+        this.value = this.system.status.filter_used.pipe((0, rxjs_1.map)(x => x > 95 ?
+            this.Characteristic.FilterChangeIndication.CHANGE_FILTER :
+            this.Characteristic.FilterChangeIndication.FILTER_OK));
     }
 }
 class FilterService extends characteristics_base_1.MultiWrapper {

package/dist/characteristics_filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"characteristics_filter.js","sourceRoot":"","sources":["../src/characteristics_filter.ts"],"names":[],"mappings":";;;AAAA,iEAA6E;AAE7E,MAAM,UAAW,SAAQ,4CAAqB;IAA9C;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC;QAC5C,QAAG,GAAG,KAAK,IAAI,EAAE;YACf,OAAO,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC;QAC1D,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,MAAM,YAAa,SAAQ,4CAAqB;IAAhD;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC;QACnD,QAAG,GAAG,KAAK,IAAI,EAAE;YACf,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;gBACtD,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC;gBAC1D,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,SAAS,CAAC;QACzD,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,MAAa,aAAc,SAAQ,mCAAY;IAA/C;;QACE,aAAQ,GAAG;YACT,UAAU;YACV,YAAY;SACb,CAAC;IACJ,CAAC;CAAA;AALD,sCAKC"}
+{"version":3,"file":"characteristics_filter.js","sourceRoot":"","sources":["../src/characteristics_filter.ts"],"names":[],"mappings":";;;AAAA,+BAA2B;AAC3B,iEAA6E;AAE7E,MAAM,UAAW,SAAQ,4CAAqB;IAA9C;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC;QAC5C,UAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAA,UAAG,EAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IACjE,CAAC;CAAA;AAED,MAAM,YAAa,SAAQ,4CAAqB;IAAhD;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC;QACnD,UAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAA,UAAG,EAC7C,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;YACX,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC;YAC1D,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,SAAS,CACvD,CAAC,CAAC;IACL,CAAC;CAAA;AAED,MAAa,aAAc,SAAQ,mCAAY;IAA/C;;QACE,aAAQ,GAAG;YACT,UAAU;YACV,YAAY;SACb,CAAC;IACJ,CAAC;CAAA;AALD,sCAKC"}

package/dist/characteristics_humidity.d.ts

@@ -1,16 +1,13 @@
 import { CharacteristicWrapper, MultiWrapper } from './characteristics_base';
 declare class CurrentRH extends CharacteristicWrapper {
     ctype: typeof import("hap-nodejs/dist/lib/definitions").CurrentRelativeHumidity;
-    get: () => Promise<number>;
-}
-declare class TargetDehumidify extends CharacteristicWrapper {
-    ctype: typeof import("hap-nodejs/dist/lib/definitions").RelativeHumidityDehumidifierThreshold;
+    value: import("rxjs").Observable<number>;
 }
 export declare class ThermostatRHService extends MultiWrapper {
     WRAPPERS: (typeof CurrentRH)[];
 }
 export declare class HumidifierService extends MultiWrapper {
-    WRAPPERS: (typeof TargetDehumidify)[];
+    WRAPPERS: (typeof CurrentRH)[];
 }
 export {};
 //# sourceMappingURL=characteristics_humidity.d.ts.map

package/dist/characteristics_humidity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"characteristics_humidity.d.ts","sourceRoot":"","sources":["../src/characteristics_humidity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE7E,cAAM,SAAU,SAAQ,qBAAqB;IAC3C,KAAK,2EAA+C;IACpD,GAAG,wBAED;CACH;AAED,cAAM,gBAAiB,SAAQ,qBAAqB;IAClD,KAAK,yFAA6D;CACnE;AAOD,qBAAa,mBAAoB,SAAQ,YAAY;IACnD,QAAQ,uBAEN;CACH;AAED,qBAAa,iBAAkB,SAAQ,YAAY;IACjD,QAAQ,8BAIN;CACH"}
+{"version":3,"file":"characteristics_humidity.d.ts","sourceRoot":"","sources":["../src/characteristics_humidity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE7E,cAAM,SAAU,SAAQ,qBAAqB;IAC3C,KAAK,2EAA+C;IACpD,KAAK,oCAA0D;CAChE;AAWD,qBAAa,mBAAoB,SAAQ,YAAY;IACnD,QAAQ,uBAEN;CACH;AAED,qBAAa,iBAAkB,SAAQ,YAAY;IACjD,QAAQ,uBAIN;CACH"}

package/dist/characteristics_humidity.js

@@ -6,23 +6,15 @@ class CurrentRH extends characteristics_base_1.CharacteristicWrapper {
     constructor() {
         super(...arguments);
         this.ctype = this.Characteristic.CurrentRelativeHumidity;
-        this.get = async () => {
-            return await this.system.status.getZoneHumidity(this.context.zone);
-        };
-    }
-}
-class TargetDehumidify extends characteristics_base_1.CharacteristicWrapper {
-    constructor() {
-        super(...arguments);
-        this.ctype = this.Characteristic.RelativeHumidityDehumidifierThreshold;
-    }
-}
-class TargetHumidify extends characteristics_base_1.CharacteristicWrapper {
-    constructor() {
-        super(...arguments);
-        this.ctype = this.Characteristic.RelativeHumidityHumidifierThreshold;
+        this.value = this.system.status.getZone(this.context.zone).humidity;
     }
 }
+// class TargetDehumidify extends CharacteristicWrapper {
+//   ctype = this.Characteristic.RelativeHumidityDehumidifierThreshold;
+// }
+// class TargetHumidify extends CharacteristicWrapper {
+//   ctype = this.Characteristic.RelativeHumidityHumidifierThreshold;
+// }
 class ThermostatRHService extends characteristics_base_1.MultiWrapper {
     constructor() {
         super(...arguments);
@@ -37,8 +29,8 @@ class HumidifierService extends characteristics_base_1.MultiWrapper {
         super(...arguments);
         this.WRAPPERS = [
             CurrentRH,
-            TargetDehumidify,
-            TargetHumidify,
+            // TargetDehumidify,
+            // TargetHumidify,
         ];
     }
 }

package/dist/characteristics_humidity.js.map

@@ -1 +1 @@
-{"version":3,"file":"characteristics_humidity.js","sourceRoot":"","sources":["../src/characteristics_humidity.ts"],"names":[],"mappings":";;;AAAA,iEAA6E;AAE7E,MAAM,SAAU,SAAQ,4CAAqB;IAA7C;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC;QACpD,QAAG,GAAG,KAAK,IAAI,EAAE;YACf,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACrE,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,MAAM,gBAAiB,SAAQ,4CAAqB;IAApD;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,qCAAqC,CAAC;IACpE,CAAC;CAAA;AAED,MAAM,cAAe,SAAQ,4CAAqB;IAAlD;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,mCAAmC,CAAC;IAClE,CAAC;CAAA;AAGD,MAAa,mBAAoB,SAAQ,mCAAY;IAArD;;QACE,aAAQ,GAAG;YACT,SAAS;SACV,CAAC;IACJ,CAAC;CAAA;AAJD,kDAIC;AAED,MAAa,iBAAkB,SAAQ,mCAAY;IAAnD;;QACE,aAAQ,GAAG;YACT,SAAS;YACT,gBAAgB;YAChB,cAAc;SACf,CAAC;IACJ,CAAC;CAAA;AAND,8CAMC"}
+{"version":3,"file":"characteristics_humidity.js","sourceRoot":"","sources":["../src/characteristics_humidity.ts"],"names":[],"mappings":";;;AAAA,iEAA6E;AAE7E,MAAM,SAAU,SAAQ,4CAAqB;IAA7C;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC;QACpD,UAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IACjE,CAAC;CAAA;AAED,yDAAyD;AACzD,uEAAuE;AACvE,IAAI;AAEJ,uDAAuD;AACvD,qEAAqE;AACrE,IAAI;AAGJ,MAAa,mBAAoB,SAAQ,mCAAY;IAArD;;QACE,aAAQ,GAAG;YACT,SAAS;SACV,CAAC;IACJ,CAAC;CAAA;AAJD,kDAIC;AAED,MAAa,iBAAkB,SAAQ,mCAAY;IAAnD;;QACE,aAAQ,GAAG;YACT,SAAS;YACT,oBAAoB;YACpB,kBAAkB;SACnB,CAAC;IACJ,CAAC;CAAA;AAND,8CAMC"}

package/dist/platform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,qBAAqB,EAAE,MAAM,EAAE,iBAAiB,EAAE,cAAc,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAK5H,OAAO,EAEL,WAAW,EACZ,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,qBAAa,iCAAkC,YAAW,qBAAqB;aAc3D,GAAG,EAAE,MAAM;aACX,MAAM,EAAE,cAAc;aACtB,GAAG,EAAE,GAAG;IAf1B,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAwB;IAC/D,SAAgB,cAAc,EAAE,OAAO,cAAc,CAA+B;IAGpF,SAAgB,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAM;IAE7E,SAAgB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAM;IAGzD,eAAe,EAAE,kBAAkB,CAAC;IACpC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAM;gBAG/B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,GAAG;IA0B1B,kBAAkB,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI;IAIhD,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;CAqEvC"}
+{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,qBAAqB,EAAE,MAAM,EAAE,iBAAiB,EAAE,cAAc,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAK5H,OAAO,EAEL,WAAW,EACZ,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGvD,qBAAa,iCAAkC,YAAW,qBAAqB;aAc3D,GAAG,EAAE,MAAM;aACX,MAAM,EAAE,cAAc;aACtB,GAAG,EAAE,GAAG;IAf1B,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAwB;IAC/D,SAAgB,cAAc,EAAE,OAAO,cAAc,CAA+B;IAGpF,SAAgB,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAM;IAE7E,SAAgB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAM;IAGzD,eAAe,EAAE,kBAAkB,CAAC;IACpC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAM;gBAG/B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,GAAG;IA2B1B,kBAAkB,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI;IAIhD,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;CAyEvC"}

package/dist/platform.js

@@ -8,6 +8,7 @@ const models_1 = require("./api/models");
 const accessory_envsensor_1 = require("./accessory_envsensor");
 const accessory_comfort_activity_1 = require("./accessory_comfort_activity");
 const rest_client_1 = require("./api/rest_client");
+const rxjs_1 = require("rxjs");
 class CarrierInfinityHomebridgePlatform {
     constructor(log, config, api) {
         this.log = log;
@@ -30,6 +31,7 @@ class CarrierInfinityHomebridgePlatform {
         this.api.on('didFinishLaunching', () => {
             this.discoverSystems().then().catch(error => {
                 this.log.error('Could not discover devices: ' + error.message);
+                this.log.debug(error);
             });
         });
         // Periodically ping the carrier api to keep it in sync with the thermostat.
@@ -44,10 +46,12 @@ class CarrierInfinityHomebridgePlatform {
         this.restored_accessories[accessory.UUID] = accessory;
     }
     async discoverSystems() {
-        const systems = await new models_1.LocationsModel(this.infinity_client).getSystems();
+        const locations = await new models_1.LocationsModel(this.infinity_client);
+        const systems = await (0, rxjs_1.firstValueFrom)(locations.system_serials);
         for (const serialNumber of systems) {
             // Create system api object, and save for later reference
-            const system = new models_1.SystemModel(this.infinity_client, serialNumber);
+            const system = await new models_1.SystemModel(this.infinity_client, serialNumber);
+            // TODO make sure we can fetch all api calls, and timeout if not.
             this.systems[serialNumber] = system;
             // Add system based accessories
             const context_system = { serialNumber: system.serialNumber };
@@ -57,14 +61,16 @@ class CarrierInfinityHomebridgePlatform {
                 new accessory_oat_1.OutdoorTemperatureAccessory(this, { ...context_system, name: 'Outdoor Temperature' });
             }
             // Add system+zone based accessories
-            const zones = await system.profile.getZones();
+            const zones = await (0, rxjs_1.firstValueFrom)(system.profile.zone_ids);
             for (const zone of zones) { // 'of' makes sure we go through zone ids, not index
+                const zone_name = await (0, rxjs_1.firstValueFrom)(system.config.getZone(zone).name);
                 const context_zone = { ...context_system, zone: zone };
                 system.log.debug(`Discovered zone ${context_zone.zone}`);
                 // -> Zone Accessory: Thermostat
                 new accessory_thermostat_1.ThermostatAccessory(this, {
                     ...context_zone,
-                    name: `${await system.config.getZoneName(zone)} Thermostat`,
+                    name: `${zone_name} Thermostat`,
+                    zone_name: zone_name,
                     holdBehavior: this.config['holdBehavior'],
                     holdArgument: this.config['holdArgument'],
                 });
@@ -72,14 +78,14 @@ class CarrierInfinityHomebridgePlatform {
                 if (this.config['showIndoorHumiditySensors']) {
                     new accessory_envsensor_1.EnvSensorAccessory(this, {
                         ...context_zone,
-                        name: `${await system.config.getZoneName(zone)} Environmental Sensor`,
+                        name: `${zone_name} Environmental Sensor`,
                     });
                 }
                 // -> Zone Accessory: Activity Select Switches
                 if (this.config['showZoneComfortActivityControls']) {
                     new accessory_comfort_activity_1.ComfortActivityAccessory(this, {
                         ...context_zone,
-                        name: `${await system.config.getZoneName(zone)} Comfort Activity`,
+                        name: `${zone_name} Comfort Activity`,
                         holdBehavior: this.config['holdBehavior'],
                         holdArgument: this.config['holdArgument'],
                     });

package/dist/platform.js.map

@@ -1 +1 @@
-{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":";;;AAEA,yCAAwD;AACxD,iEAA6D;AAC7D,mDAA8D;AAC9D,yCAGsB;AACtB,+DAA2D;AAE3D,6EAAwE;AACxE,mDAAuD;AACvD,+BAAsC;AAEtC,MAAa,iCAAiC;IAa5C,YACkB,GAAW,EACX,MAAsB,EACtB,GAAQ;QAFR,QAAG,GAAH,GAAG,CAAQ;QACX,WAAM,GAAN,MAAM,CAAgB;QACtB,QAAG,GAAH,GAAG,CAAK;QAfV,YAAO,GAAmB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;QAC/C,mBAAc,GAA0B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC;QAEpF,oDAAoD;QACpC,yBAAoB,GAAsC,EAAE,CAAC;QAC7E,mDAAmD;QACnC,gBAAW,GAAkC,EAAE,CAAC;QAIzD,YAAO,GAAgC,EAAE,CAAC;QAO/C,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YACxC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qFAAqF,CAAC,CAAC;SACvG;QAED,IAAI,CAAC,eAAe,GAAG,IAAI,gCAAkB,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAChG,IAAI,CAAC,eAAe,CAAC,iBAAiB,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YAC5D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;YACrC,IAAI,CAAC,eAAe,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBAC1C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC/D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACxB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,4EAA4E;QAC5E,yEAAyE;QACzE,sCAAsC;QACtC,qEAAqE;QACrE,WAAW,CAAC,GAAG,EAAE;YACf,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;QAClC,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,eAAe;IACrC,CAAC;IAED,kBAAkB,CAAC,SAA4B;QAC7C,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,MAAM,SAAS,GAAG,MAAM,IAAI,uBAAc,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACjE,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAc,EAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAC/D,KAAK,MAAM,YAAY,IAAI,OAAO,EAAE;YAClC,yDAAyD;YACzD,MAAM,MAAM,GAAG,MAAM,IAAI,oBAAW,CAAC,IAAI,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;YACzE,iEAAiE;YACjE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;YAEpC,+BAA+B;YAC/B,MAAM,cAAc,GAAG,EAAC,YAAY,EAAE,MAAM,CAAC,YAAY,EAAC,CAAC;YAC3D,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACrC,2CAA2C;YAC3C,IAAI,IAAI,CAAC,MAAM,CAAC,8BAA8B,CAAC,EAAE;gBAC/C,IAAI,2CAA2B,CAC7B,IAAI,EACJ,EAAC,GAAG,cAAc,EAAE,IAAI,EAAE,qBAAqB,EAAC,CACjD,CAAC;aACH;YAED,oCAAoC;YACpC,MAAM,KAAK,GAAG,MAAM,IAAA,qBAAc,EAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC5D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,EAAG,oDAAoD;gBAC/E,MAAM,SAAS,GAAG,MAAM,IAAA,qBAAc,EAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;gBACzE,MAAM,YAAY,GAAG,EAAC,GAAG,cAAc,EAAE,IAAI,EAAE,IAAI,EAAC,CAAC;gBACrD,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;gBACzD,gCAAgC;gBAChC,IAAI,0CAAmB,CACrB,IAAI,EACJ;oBACE,GAAG,YAAY;oBACf,IAAI,EAAE,GAAG,SAAS,aAAa;oBAC/B,SAAS,EAAE,SAAS;oBACpB,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;oBACzC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;iBAC1C,CACF,CAAC;gBACF,gCAAgC;gBAChC,IAAI,IAAI,CAAC,MAAM,CAAC,2BAA2B,CAAC,EAAE;oBAC5C,IAAI,wCAAkB,CACpB,IAAI,EACJ;wBACE,GAAG,YAAY;wBACf,IAAI,EAAE,GAAG,SAAS,uBAAuB;qBAC1C,CACF,CAAC;iBACH;gBACD,8CAA8C;gBAC9C,IAAI,IAAI,CAAC,MAAM,CAAC,iCAAiC,CAAC,EAAE;oBAClD,IAAI,qDAAwB,CAC1B,IAAI,EACJ;wBACE,GAAG,YAAY;wBACf,IAAI,EAAE,GAAG,SAAS,mBAAmB;wBACrC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;wBACzC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;qBAC1C,CACF,CAAC;iBACH;aACF;SACF;QAED,oEAAoE;QACpE,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,oBAAoB,EAAE;YAC1C,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE;gBACzB,MAAM,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;gBAChD,4BAA4B;gBAC5B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,YAAY,MAAM,SAAS,CAAC,OAAO,CAAC,IAAI,mBAAmB,CAAC,CAAC;gBACjG,IAAI,CAAC,GAAG,CAAC,6BAA6B,CAAC,sBAAW,EAAE,wBAAa,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;gBAChF,OAAO,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;aACtC;SACF;IACH,CAAC;CACF;AAxHD,8EAwHC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Homebridge Carrier Infinity",
   "name": "homebridge-carrier-infinity",
-  "version": "1.6.9",
+  "version": "1.7.0-beta.1",
   "description": "Standalone homebridge plugin for Carrier Infinity / Bryant Evolution / ICP Brands Ion thermostats.",
   "license": "MIT",
   "repository": {
@@ -48,36 +48,37 @@
     "infinitive"
   ],
   "dependencies": {
-    "async-mutex": "^0.3.1",
+    "async-mutex": "^0.3.2",
     "axios": "^0.27.2",
     "oauth-signature": "^1.5.0",
     "object-hash": "^3.0.0",
-    "typescript-memoize": "^1.0.1",
+    "rxjs": "^7.8.0",
+    "typescript-memoize": "^1.1.1",
     "xml2js": "^0.4.23"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.0.3",
-    "@commitlint/config-conventional": "^17.0.3",
-    "@commitlint/cz-commitlint": "^17.0.3",
+    "@commitlint/cli": "^17.4.4",
+    "@commitlint/config-conventional": "^17.4.4",
+    "@commitlint/cz-commitlint": "^17.4.4",
     "@semantic-release/git": "^10.0.1",
-    "@types/jest": "^27.0.2",
-    "@types/node": "^18.0.0",
-    "@types/object-hash": "^2.2.0",
-    "@types/xml2js": "^0.4.8",
-    "@typescript-eslint/eslint-plugin": "^5.12.0",
-    "@typescript-eslint/parser": "^5.12.0",
-    "commitizen": "^4.2.4",
-    "eslint": "^8.9.0",
-    "eslint-plugin-spellcheck": "^0.0.19",
-    "homebridge": "^1.2.3",
-    "jest": "^27.0.4",
+    "@types/jest": "^29.4.0",
+    "@types/node": "^18.14.6",
+    "@types/object-hash": "^3.0.0",
+    "@types/xml2js": "^0.4.11",
+    "@typescript-eslint/eslint-plugin": "^5.54.0",
+    "@typescript-eslint/parser": "^5.54.0",
+    "commitizen": "^4.3.0",
+    "eslint": "^8.35.0",
+    "eslint-plugin-spellcheck": "^0.0.20",
+    "homebridge": "^1.6.0",
+    "jest": "^29.4.0",
     "json-to-ts": "^1.7.0",
-    "nodemon": "^2.0.6",
-    "rimraf": "^3.0.2",
-    "semantic-release": "^19.0.2",
-    "ts-jest": "^27.0.3",
-    "ts-node": "^10.0.0",
-    "typescript": "^4.0.5"
+    "nodemon": "^2.0.21",
+    "rimraf": "^4.3.0",
+    "semantic-release": "^20.1.1",
+    "ts-jest": "^29.0.5",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.9.5"
   },
   "config": {
     "commitizen": {
@@ -89,6 +90,10 @@
       {
         "name": "master",
         "channel": "next"
+      },
+      {
+        "name": "beta",
+        "prerelease": true
       }
     ],
     "plugins": [