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

package/dist/accessory_comfort_activity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accessory_comfort_activity.d.ts","sourceRoot":"","sources":["../src/accessory_comfort_activity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AA4DjD,qBAAa,wBAAyB,SAAQ,aAAa;IAEzD,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;gBAKnD,QAAQ,EAAE,iCAAiC,EAC3C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;CA2ClC"}
+{"version":3,"file":"accessory_comfort_activity.d.ts","sourceRoot":"","sources":["../src/accessory_comfort_activity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAuDjD,qBAAa,wBAAyB,SAAQ,aAAa;IAEzD,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;gBAKnD,QAAQ,EAAE,iCAAiC,EAC3C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;CA2ClC"}

package/dist/accessory_comfort_activity.js

@@ -4,6 +4,7 @@ exports.ComfortActivityAccessory = void 0;
 const characteristics_base_1 = require("./characteristics_base");
 const accessory_base_1 = require("./accessory_base");
 const constants_1 = require("./api/constants");
+const rxjs_1 = require("rxjs");
 class Activity extends characteristics_base_1.ThermostatCharacteristicWrapper {
     constructor(platform, context, activity_name) {
         super(platform, context);
@@ -11,13 +12,12 @@ class Activity extends characteristics_base_1.ThermostatCharacteristicWrapper {
         this.context = context;
         this.activity_name = activity_name;
         this.ctype = this.Characteristic.On;
-        this.get = async () => {
-            return (await this.getActivity()) === this.activity_name;
-        };
+        this.value = this.system.getZoneActivity(this.context.zone).pipe((0, rxjs_1.map)(a => a === this.activity_name), (0, rxjs_1.distinctUntilChanged)());
         this.set = async (value) => {
             // Turning off an activity is only allowed for the active activity
             // (otherwise an off on one activity could remove a hold of another)
-            if (!value && await this.getActivity() !== this.activity_name) {
+            if (value === false
+                && await (0, rxjs_1.firstValueFrom)(this.system.getZoneActivity(this.context.zone)) !== this.activity_name) {
                 throw new this.platform.api.hap.HapStatusError(-70412 /* this.platform.api.hap.HAPStatus.NOT_ALLOWED_IN_CURRENT_STATE */);
             }
             return await this.system.config.setZoneActivityHold(this.context.zone, 
@@ -35,14 +35,11 @@ class HoldActivity extends characteristics_base_1.ThermostatCharacteristicWrappe
     constructor() {
         super(...arguments);
         this.ctype = this.Characteristic.On;
-        this.get = async () => {
-            const zone = await this.system.config.getZoneHoldStatus(this.context.zone);
-            return zone[0] === constants_1.STATUS.ON;
-        };
+        this.value = this.system.config.getZone(this.context.zone).hold_status.pipe((0, rxjs_1.map)(data => data[0] === constants_1.STATUS.ON));
         this.set = async (value) => {
             return await this.system.config.setZoneActivityHold(this.context.zone, 
             // Turning on sets hold for current activity, turning off removes any hold
-            value ? await this.getActivity() : '', await this.getHoldTime());
+            value ? await (0, rxjs_1.firstValueFrom)(this.system.getZoneActivity(this.context.zone)) : '', await this.getHoldTime());
         };
     }
 }

package/dist/accessory_comfort_activity.js.map

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

package/dist/accessory_oat.d.ts

@@ -3,7 +3,7 @@ import { CharacteristicWrapper, MultiWrapper } from './characteristics_base';
 import { BaseAccessory } from './accessory_base';
 declare class OATSensorTemp extends CharacteristicWrapper {
     ctype: typeof import("hap-nodejs/dist/lib/definitions").CurrentTemperature;
-    get: () => Promise<import("hap-nodejs").CharacteristicValue>;
+    value: import("rxjs").Observable<import("hap-nodejs").CharacteristicValue>;
 }
 export declare class OutdoorTempSensorService extends MultiWrapper {
     WRAPPERS: (typeof OATSensorTemp)[];

package/dist/accessory_oat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accessory_oat.d.ts","sourceRoot":"","sources":["../src/accessory_oat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAwB,qBAAqB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEnG,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,cAAM,aAAc,SAAQ,qBAAqB;IAC/C,KAAK,sEAA0C;IAC/C,GAAG,0DAKD;CACH;AAED,qBAAa,wBAAyB,SAAQ,YAAY;IACxD,QAAQ,2BAAmB;CAC5B;AAED,qBAAa,2BAA4B,SAAQ,aAAa;IAE5D,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;gBAKnD,QAAQ,EAAE,iCAAiC,EAC3C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;CAqBlC"}
+{"version":3,"file":"accessory_oat.d.ts","sourceRoot":"","sources":["../src/accessory_oat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAwB,qBAAqB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEnG,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,cAAM,aAAc,SAAQ,qBAAqB;IAC/C,KAAK,sEAA0C;IAC/C,KAAK,sEAGH;CACH;AAED,qBAAa,wBAAyB,SAAQ,YAAY;IACxD,QAAQ,2BAAmB;CAC5B;AAED,qBAAa,2BAA4B,SAAQ,aAAa;IAE5D,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;gBAKnD,QAAQ,EAAE,iCAAiC,EAC3C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;CAqBlC"}

package/dist/accessory_oat.js

@@ -4,13 +4,14 @@ exports.OutdoorTemperatureAccessory = exports.OutdoorTempSensorService = void 0;
 const characteristics_base_1 = require("./characteristics_base");
 const helpers_1 = require("./helpers");
 const accessory_base_1 = require("./accessory_base");
+const rxjs_1 = require("rxjs");
 class OATSensorTemp extends characteristics_base_1.CharacteristicWrapper {
     constructor() {
         super(...arguments);
         this.ctype = this.Characteristic.CurrentTemperature;
-        this.get = async () => {
-            return (0, helpers_1.convertSystemTemp2CharTemp)(await this.system.status.getOutdoorTemp(), 'F');
-        };
+        this.value = this.system.status.outdoor_temp.pipe(
+        // The oat from the api is always in F (#97)
+        (0, rxjs_1.map)(data => (0, helpers_1.convertSystemTemp2CharTemp)(data, 'F')));
     }
 }
 class OutdoorTempSensorService extends characteristics_base_1.MultiWrapper {

package/dist/accessory_oat.js.map

@@ -1 +1 @@
-{"version":3,"file":"accessory_oat.js","sourceRoot":"","sources":["../src/accessory_oat.ts"],"names":[],"mappings":";;;AACA,iEAAmG;AACnG,uCAAuD;AACvD,qDAAiD;AAEjD,MAAM,aAAc,SAAQ,4CAAqB;IAAjD;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC;QAC/C,QAAG,GAAG,KAAK,IAAI,EAAE;YACf,OAAO,IAAA,oCAA0B,EAC/B,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,EACzC,GAAG,CACJ,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,MAAa,wBAAyB,SAAQ,mCAAY;IAA1D;;QACE,aAAQ,GAAG,CAAC,aAAa,CAAC,CAAC;IAC7B,CAAC;CAAA;AAFD,4DAEC;AAED,MAAa,2BAA4B,SAAQ,8BAAa;IAElD,EAAE,CAAC,OAA+B;QAC1C,OAAO,OAAO,OAAO,CAAC,YAAY,EAAE,CAAC;IACvC,CAAC;IAED,YACE,QAA2C,EAC3C,OAA+B;QAE/B,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAEzB,IAAI,wBAAwB,CAC1B,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,SAAS,CAAC,OAAO,CACvB,CAAC,IAAI,CACJ,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC;YAClE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,CACnE,CAAC;QAEF,IAAI,2CAAoB,CACtB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,SAAS,CAAC,OAAO,CACvB,CAAC,IAAI,CACJ,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC;YACrE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,CACtE,CAAC;IAEJ,CAAC;CACF;AA7BD,kEA6BC"}
+{"version":3,"file":"accessory_oat.js","sourceRoot":"","sources":["../src/accessory_oat.ts"],"names":[],"mappings":";;;AACA,iEAAmG;AACnG,uCAAuD;AACvD,qDAAiD;AACjD,+BAA2B;AAE3B,MAAM,aAAc,SAAQ,4CAAqB;IAAjD;;QACE,UAAK,GAAG,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC;QAC/C,UAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI;QAC1C,4CAA4C;QAC5C,IAAA,UAAG,EAAC,IAAI,CAAC,EAAE,CAAC,IAAA,oCAA0B,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CACnD,CAAC;IACJ,CAAC;CAAA;AAED,MAAa,wBAAyB,SAAQ,mCAAY;IAA1D;;QACE,aAAQ,GAAG,CAAC,aAAa,CAAC,CAAC;IAC7B,CAAC;CAAA;AAFD,4DAEC;AAED,MAAa,2BAA4B,SAAQ,8BAAa;IAElD,EAAE,CAAC,OAA+B;QAC1C,OAAO,OAAO,OAAO,CAAC,YAAY,EAAE,CAAC;IACvC,CAAC;IAED,YACE,QAA2C,EAC3C,OAA+B;QAE/B,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAEzB,IAAI,wBAAwB,CAC1B,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,SAAS,CAAC,OAAO,CACvB,CAAC,IAAI,CACJ,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC;YAClE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,CACnE,CAAC;QAEF,IAAI,2CAAoB,CACtB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,SAAS,CAAC,OAAO,CACvB,CAAC,IAAI,CACJ,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC;YACrE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,CACtE,CAAC;IAEJ,CAAC;CACF;AA7BD,kEA6BC"}

package/dist/accessory_thermostat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accessory_thermostat.d.ts","sourceRoot":"","sources":["../src/accessory_thermostat.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAS/D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,qBAAa,mBAAoB,SAAQ,aAAa;IACpD,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,WAAW,CAAC,CAAU;IAE9B,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;gBAKnD,QAAQ,EAAE,iCAAiC,EAC3C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IA2DjC,eAAe,IAAI,IAAI;CAexB"}
+{"version":3,"file":"accessory_thermostat.d.ts","sourceRoot":"","sources":["../src/accessory_thermostat.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAM/D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,qBAAa,mBAAoB,SAAQ,aAAa;IACpD,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,WAAW,CAAC,CAAU;IAE9B,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;gBAKnD,QAAQ,EAAE,iCAAiC,EAC3C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IA6CjC,eAAe,IAAI,IAAI;CAYxB"}

package/dist/accessory_thermostat.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ThermostatAccessory = void 0;
 const characteristics_filter_1 = require("./characteristics_filter");
-const helpers_1 = require("./helpers");
 const characteristics_humidity_1 = require("./characteristics_humidity");
 const characteristics_fan_1 = require("./characteristics_fan");
 const characteristics_ac_1 = require("./characteristics_ac");
 const accessory_base_1 = require("./accessory_base");
+const characteristics_base_1 = require("./characteristics_base");
 class ThermostatAccessory extends accessory_base_1.BaseAccessory {
     ID(context) {
         return `${context.serialNumber}:${Number(context.zone) - 1}`;
@@ -14,29 +14,11 @@ class ThermostatAccessory extends accessory_base_1.BaseAccessory {
     constructor(platform, context) {
         super(platform, context);
         // Create services
-        this.accessory.getService(this.platform.Service.AccessoryInformation)
-            .setCharacteristic(this.platform.Characteristic.SerialNumber, this.accessory.context.serialNumber);
         this.service = this.accessory.getService(this.platform.Service.Thermostat) || this.accessory.addService(this.platform.Service.Thermostat);
-        // Create accessory api bridge
-        this.system.status.fetch().then();
-        this.system.config.fetch().then(async () => {
-            this.service.setCharacteristic(this.platform.Characteristic.Name, await this.system.config.getZoneName(this.accessory.context.zone));
-            const temp_bounds = await this.system.config.getTempBounds();
-            const bound_props = {
-                minValue: Number((0, helpers_1.convertSystemTemp2CharTemp)(temp_bounds[0], await this.system.config.getUnits())),
-                maxValue: Number((0, helpers_1.convertSystemTemp2CharTemp)(temp_bounds[1], await this.system.config.getUnits())),
-            };
-            this.service.getCharacteristic(this.platform.Characteristic.TargetTemperature).setProps(bound_props);
-            this.service.getCharacteristic(this.platform.Characteristic.CoolingThresholdTemperature).setProps(bound_props);
-            this.service.getCharacteristic(this.platform.Characteristic.HeatingThresholdTemperature).setProps(bound_props);
-            // setting name explicitly is needed to not lose the word 'thermostat'
-            this.service.setCharacteristic(this.platform.Characteristic.Name, this.accessory.displayName);
-        });
-        this.system.profile.fetch().then(async () => {
-            this.accessory.getService(this.platform.Service.AccessoryInformation)
-                .setCharacteristic(this.platform.Characteristic.Manufacturer, `${await this.system.profile.getBrand()} Home`)
-                .setCharacteristic(this.platform.Characteristic.Model, await this.system.profile.getModel());
-        });
+        this.service.setCharacteristic(this.platform.Characteristic.Name, this.context.name);
+        // Accessory service handler
+        new characteristics_base_1.AccessoryInformation(this.platform, this.accessory.context).wrap(this.accessory.getService(this.platform.Service.AccessoryInformation) ||
+            this.accessory.addService(this.platform.Service.AccessoryInformation));
         // Create handlers
         new characteristics_ac_1.ACService(this.platform, this.accessory.context).wrap(this.service);
         // Fan Control
@@ -54,10 +36,7 @@ class ThermostatAccessory extends accessory_base_1.BaseAccessory {
     }
     setupFanService() {
         this.fan_service = this.fan_service || this.accessory.addService(this.platform.Service.Fanv2);
-        this.system.config.fetch().then(async () => {
-            var _a;
-            (_a = this.fan_service) === null || _a === void 0 ? void 0 : _a.setCharacteristic(this.platform.Characteristic.Name, await this.system.config.getZoneName(this.accessory.context.zone) + ' Fan');
-        });
+        this.fan_service.setCharacteristic(this.platform.Characteristic.Name, `${this.context.zone_name} Fan`);
         new characteristics_fan_1.FanService(this.platform, this.accessory.context).wrap(this.fan_service);
     }
 }

package/dist/accessory_thermostat.js.map

@@ -1 +1 @@
-{"version":3,"file":"accessory_thermostat.js","sourceRoot":"","sources":["../src/accessory_thermostat.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"accessory_thermostat.js","sourceRoot":"","sources":["../src/accessory_thermostat.ts"],"names":[],"mappings":";;;AAIA,qEAAyD;AACzD,yEAAiE;AACjE,+DAAmD;AACnD,6DAAiD;AACjD,qDAAiD;AACjD,iEAA8D;AAE9D,MAAa,mBAAoB,SAAQ,8BAAa;IAI1C,EAAE,CAAC,OAA+B;QAC1C,OAAO,GAAG,OAAO,CAAC,YAAY,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC;IAC7D,CAAC;IAED,YACE,QAA2C,EAC3C,OAA+B;QAE/B,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACzB,kBAAkB;QAClB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CACtC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAChG,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAErF,4BAA4B;QAC5B,IAAI,2CAAoB,CACtB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,SAAS,CAAC,OAAO,CACvB,CAAC,IAAI,CACJ,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC;YACrE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,CACtE,CAAC;QAEF,kBAAkB;QAClB,IAAI,8BAAS,CACX,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,SAAS,CAAC,OAAO,CACvB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAErB,cAAc;QACd,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC1E,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE;YAC1C,IAAI,CAAC,eAAe,EAAE,CAAC;SACxB;aAAM,IAAI,IAAI,CAAC,WAAW,EAAE;YAC3B,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAChD;QAED,iBAAiB;QACjB,IAAI,sCAAa,CACf,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,SAAS,CAAC,OAAO,CACvB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAErB,mBAAmB;QACnB,IAAI,8CAAmB,CACrB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,SAAS,CAAC,OAAO,CACvB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;IAED,eAAe;QACb,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC9F,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAChC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EACjC,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,MAAM,CAChC,CAAC;QAEF,IAAI,gCAAU,CACZ,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,SAAS,CAAC,OAAO,CACvB,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC3B,CAAC;CACF;AAnED,kDAmEC"}

package/dist/api/helpers.d.ts

@@ -0,0 +1,5 @@
+import Config, { Zone as CZone, Activity3 as CActivity } from './interface_config';
+import { Zone as SZone } from './interface_status';
+export declare function findZoneByID<T extends CZone | SZone>(data: T[], zone: string | number): T;
+export declare function getZoneActivityConfig(data: Config, zone: string, activity_name: string): CActivity;
+//# sourceMappingURL=helpers.d.ts.map

package/dist/api/helpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/api/helpers.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,EAAE,EAAC,IAAI,IAAI,KAAK,EAAE,SAAS,IAAI,SAAS,EAAC,MAAM,oBAAoB,CAAC;AACjF,OAAO,EAAC,IAAI,IAAI,KAAK,EAAC,MAAM,oBAAoB,CAAC;AAYjD,wBAAgB,YAAY,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,CAAC,CAEzF;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,SAAS,CAclG"}

package/dist/api/helpers.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getZoneActivityConfig = exports.findZoneByID = void 0;
+const constants_1 = require("./constants");
+function findByID(data, id) {
+    const zone_obj = data.find((z) => z['$'].id === id);
+    if (zone_obj === undefined) {
+        throw new RangeError(`Item with id='${id}' not found in list.`);
+    }
+    return zone_obj;
+}
+function findZoneByID(data, zone) {
+    return findByID(data, zone.toString());
+}
+exports.findZoneByID = findZoneByID;
+function getZoneActivityConfig(data, zone, activity_name) {
+    // Vacation is stored somewhere else...
+    if (activity_name === constants_1.ACTIVITY.VACATION) {
+        return {
+            '$': { id: constants_1.ACTIVITY.VACATION },
+            clsp: data.config.vacmaxt,
+            htsp: data.config.vacmint,
+            fan: data.config.vacfan,
+            previousFan: [],
+        };
+    }
+    const zone_obj = findZoneByID(data.config.zones[0].zone, zone);
+    return findByID(zone_obj.activities[0].activity, activity_name);
+}
+exports.getZoneActivityConfig = getZoneActivityConfig;
+//# sourceMappingURL=helpers.js.map

package/dist/api/helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/api/helpers.ts"],"names":[],"mappings":";;;AAAA,2CAAuC;AAIvC,SAAS,QAAQ,CAAsC,IAAS,EAAE,EAAU;IAC1E,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CACxB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,CACxB,CAAC;IACF,IAAI,QAAQ,KAAK,SAAS,EAAE;QAC1B,MAAM,IAAI,UAAU,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,CAAC;KACjE;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAgB,YAAY,CAA0B,IAAS,EAAE,IAAqB;IACpF,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;AACzC,CAAC;AAFD,oCAEC;AAED,SAAgB,qBAAqB,CAAC,IAAY,EAAE,IAAY,EAAE,aAAqB;IACrF,uCAAuC;IACvC,IAAI,aAAa,KAAK,oBAAQ,CAAC,QAAQ,EAAE;QACvC,OAAO;YACL,GAAG,EAAE,EAAC,EAAE,EAAE,oBAAQ,CAAC,QAAQ,EAAC;YAC5B,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YACzB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YACzB,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;YACvB,WAAW,EAAE,EAAE;SAChB,CAAC;KACH;IAED,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/D,OAAO,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;AAClE,CAAC;AAdD,sDAcC"}

package/dist/api/helpers_rxjs.d.ts

@@ -0,0 +1,3 @@
+import { OperatorFunction } from 'rxjs';
+export declare function distinctUntilChangedWithEpsilon<T>(epsilon?: number): OperatorFunction<T, T>;
+//# sourceMappingURL=helpers_rxjs.d.ts.map

package/dist/api/helpers_rxjs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"helpers_rxjs.d.ts","sourceRoot":"","sources":["../../src/api/helpers_rxjs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,gBAAgB,EAAE,MAAM,MAAM,CAAC;AAE9D,wBAAgB,+BAA+B,CAAC,CAAC,EAAE,OAAO,SAAiB,GAAG,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CASnG"}

package/dist/api/helpers_rxjs.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.distinctUntilChangedWithEpsilon = void 0;
+const rxjs_1 = require("rxjs");
+function distinctUntilChangedWithEpsilon(epsilon = Number.EPSILON) {
+    return (0, rxjs_1.distinctUntilChanged)((prev, cur) => {
+        if (typeof prev !== 'number' || typeof cur !== 'number') {
+            // Use strict equality if either value is non-numeric
+            return prev === cur;
+        }
+        // Otherwise, use the epsilon comparison for numeric values
+        return Math.abs(prev - cur) < epsilon;
+    });
+}
+exports.distinctUntilChangedWithEpsilon = distinctUntilChangedWithEpsilon;
+//# sourceMappingURL=helpers_rxjs.js.map

package/dist/api/helpers_rxjs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"helpers_rxjs.js","sourceRoot":"","sources":["../../src/api/helpers_rxjs.ts"],"names":[],"mappings":";;;AAAA,+BAA8D;AAE9D,SAAgB,+BAA+B,CAAI,OAAO,GAAG,MAAM,CAAC,OAAO;IACzE,OAAO,IAAA,2BAAoB,EAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QACxC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACvD,qDAAqD;YACrD,OAAO,IAAI,KAAK,GAAG,CAAC;SACrB;QACD,2DAA2D;QAC3D,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,GAAG,OAAO,CAAC;IACxC,CAAC,CAAC,CAAC;AACL,CAAC;AATD,0EASC"}

package/dist/api/models.d.ts

@@ -1,88 +1,108 @@
+/// <reference types="node" />
 import { Mutex } from 'async-mutex';
 import { Logger } from 'homebridge';
 import { InfinityRestClient } from './rest_client';
-import Config from './interface_config';
+import Config, { Zone as CZone } from './interface_config';
 import Location from './interface_locations';
 import Profile from './interface_profile';
-import Status from './interface_status';
-declare abstract class BaseModel {
+import Status, { Zone as SZone } from './interface_status';
+import { Observable, ReplaySubject } from 'rxjs';
+import EventEmitter from 'events';
+export type TempWithUnit = [number, string];
+declare abstract class BaseModel<T extends object> {
     protected readonly infinity_client: InfinityRestClient;
-    protected data_object: object;
-    protected data_object_hash?: string;
+    protected clean_data$: ReplaySubject<T>;
+    data$: Observable<T>;
     protected HASH_IGNORE_KEYS: Set<string>;
     protected write_lock: Mutex;
     protected log: Logger;
+    events: EventEmitter;
     constructor(infinity_client: InfinityRestClient);
     abstract getPath(): string;
-    protected hashDataObject(): string;
-    fetch(): Promise<void>;
-    protected forceFetch(): Promise<void>;
+    protected isUnchanged(x: T, y: T): boolean;
+    protected hash(data: T): string;
+    protected fetchObservable(): Observable<T>;
+    protected forceFetch(): Promise<T>;
 }
-export declare class LocationsModel extends BaseModel {
-    protected data_object: Location;
+export declare class LocationsModel extends BaseModel<Location> {
     getPath(): string;
-    getSystems(): Promise<string[]>;
+    system_serials: Observable<string[]>;
 }
-declare abstract class BaseSystemModel extends BaseModel {
+declare abstract class BaseSystemModel<T extends object> extends BaseModel<T> {
     protected readonly infinity_client: InfinityRestClient;
     readonly serialNumber: string;
     protected readonly log: Logger;
-    private last_updated;
+    protected last_fetched_ts: number;
+    protected last_fetched_hash: string;
     protected HASH_IGNORE_KEYS: Set<string>;
     constructor(infinity_client: InfinityRestClient, serialNumber: string, log: Logger);
-    protected forceFetch(): Promise<void>;
+    protected forceFetch(): Promise<T>;
 }
-export declare class SystemProfileModel extends BaseSystemModel {
-    protected data_object: Profile;
+export declare class SystemProfileModel extends BaseSystemModel<Profile> {
     getPath(): string;
-    getName(): Promise<string>;
-    getBrand(): Promise<string>;
-    getModel(): Promise<string>;
-    getFirmware(): Promise<string>;
-    getZones(): Promise<Array<string>>;
+    name: Observable<string>;
+    brand: Observable<string>;
+    model: Observable<string>;
+    firmware: Observable<string>;
+    zone_ids: Observable<string[]>;
 }
-export declare class SystemStatusModel extends BaseSystemModel {
-    protected data_object: Status;
+export declare class SystemStatusModel extends BaseSystemModel<Status> {
     getPath(): string;
-    getUnits(): Promise<string>;
-    getOutdoorTemp(): Promise<number>;
-    getFilterUsed(): Promise<number>;
-    getMode(): Promise<string>;
-    private getZone;
-    getZoneConditioning(zone: string): Promise<string>;
-    getZoneFan(zone: string): Promise<string>;
-    getZoneOpen(zone: string): Promise<boolean>;
-    getZoneTemp(zone: string): Promise<number>;
-    getZoneHumidity(zone: string): Promise<number>;
-    getZoneActivity(zone: string): Promise<string>;
-    getZoneCoolSetpoint(zone: string): Promise<number>;
-    getZoneHeatSetpoint(zone: string): Promise<number>;
+    outdoor_temp: Observable<number>;
+    filter_used: Observable<number>;
+    temp_units: Observable<string>;
+    mode: Observable<string>;
+    private raw_zone_data$;
+    getZone(zone: string): SystemStatusZoneModel;
 }
-export declare class SystemConfigModel extends BaseSystemModel {
-    protected data_object: Config;
+export declare class SystemStatusZoneModel {
+    private zone;
+    private temp_units$;
+    constructor(zone: Observable<SZone>, temp_units$: Observable<string>);
+    mode: Observable<string>;
+    fan: Observable<string>;
+    activity: Observable<string>;
+    blowing: Observable<boolean>;
+    closed: Observable<boolean>;
+    temp: Observable<TempWithUnit>;
+    cool_setpoint: Observable<TempWithUnit>;
+    heat_setpoint: Observable<TempWithUnit>;
+    humidity: Observable<number>;
+}
+export declare class SystemConfigModel extends BaseSystemModel<Config> {
+    protected readonly infinity_client: InfinityRestClient;
+    readonly serialNumber: string;
+    protected readonly log: Logger;
+    private dirty_data$;
+    data$: Observable<Config>;
+    private last_pushed_ts;
+    constructor(infinity_client: InfinityRestClient, serialNumber: string, log: Logger);
     getPath(): string;
-    getUnits(): Promise<string>;
-    getTempBounds(): Promise<[number, number]>;
-    getMode(): Promise<string>;
-    private getZone;
-    getZoneName(zone: string): Promise<string>;
-    getZoneHoldStatus(zone: string): Promise<[string, string]>;
-    getZoneActivity(zone: string): Promise<string>;
-    private getZoneActivityConfig;
-    getZoneActivityFan(zone: string, activity: string): Promise<string>;
-    getZoneActivityCoolSetpoint(zone: string, activity: string): Promise<number>;
-    getZoneActivityHeatSetpoint(zone: string, activity: string): Promise<number>;
-    getZoneNextActivityTime(zone: string): Promise<string>;
-    mutations: (() => Promise<void>)[];
+    mode: Observable<string>;
+    temp_units: Observable<string>;
+    temp_bounds: Observable<TempWithUnit[]>;
+    private raw_zone_data$;
+    getZone(zone: string): SystemConfigZoneModel;
     private push;
-    private mutate;
     private forcePush;
     setMode(mode: string): Promise<void>;
-    private mutateMode;
     setZoneActivityHold(zone: string, activity: string, hold_until: string | null): Promise<void>;
-    private mutateZoneActivityHold;
-    setZoneActivityManualHold(zone: string, clsp: number | null, htsp: number | null, hold_until: string | null, fan?: string | null): Promise<void>;
-    private mutateZoneActivityManualHold;
+    setZoneActivityManualSync(zone: string, sync_from_activity_name: string): Promise<void>;
+    setZoneActivityManualSetpoints(zone: string, clsp: number | null, htsp: number | null): Promise<void>;
+    setZoneActivityManualFan(zone: string, fan: string): Promise<void>;
+}
+export declare class SystemConfigZoneModel {
+    private zone;
+    private temp_units$;
+    constructor(zone: Observable<CZone>, temp_units$: Observable<string>);
+    name: Observable<string>;
+    hold_status: Observable<[string, string]>;
+    activity: Observable<string>;
+    next_activity_time: Observable<string>;
+    private current_activity_config$;
+    fan: Observable<string>;
+    cool_setpoint: Observable<TempWithUnit>;
+    heat_setpoint: Observable<TempWithUnit>;
 }
 export declare class SystemModel {
     protected readonly infinity_client: InfinityRestClient;
@@ -91,7 +111,9 @@ export declare class SystemModel {
     config: SystemConfigModel;
     profile: SystemProfileModel;
     log: Logger;
+    data$: Observable<[Status, Config, Profile]>;
     constructor(infinity_client: InfinityRestClient, serialNumber: string);
+    getZoneActivity(zone: string): Observable<string>;
 }
 export {};
 //# sourceMappingURL=models.d.ts.map

package/dist/api/models.d.ts.map

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