homebridge-carrier-infinity 1.5.13 → 1.6.0

package/config.schema.json

@@ -55,6 +55,12 @@
         "type": "boolean",
         "default": false,
         "required": true
+      },
+      "showZoneComfortActivityControls": {
+        "title": "Show Per-Zone Touch-n-Go Switches",
+        "type": "boolean",
+        "default": true,
+        "required": true
       }
     }
   },
@@ -89,6 +95,11 @@
           "type": "help",
           "helpvalue": "<h5>Temperature Control</h5><em class='primary-text'>Temperature and mode controls for your thermostats are always shown.</em>"
         },
+        {
+          "type": "help",
+          "helpvalue": "<h5>Activity Control</h5><em class='primary-text'>Show Touch-n-Go controls for comfort activities and manual holds.</em>"
+        },
+        "showZoneComfortActivityControls",
         {
           "type": "help",
           "helpvalue": "<h5>Fan Control</h5><em class='primary-text'>The Fan control is a slider with the following steps: <ol start=0><li>Auto (0%)</li><li>Always On Low (33%)</li><li>Always On Medium (66%)</li><li>Always On High (100%)</li></ol><a href='https://github.com/grivkees/homebridge-carrier-infinity/wiki/Configuration#fan-control'>More details</a>.</em>"

package/dist/accessory_base.d.ts

@@ -0,0 +1,10 @@
+import { PlatformAccessory, Service, WithUUID } from 'homebridge';
+import { CarrierInfinityHomebridgePlatform } from './platform';
+export declare abstract class BaseAccessory {
+    protected readonly platform: CarrierInfinityHomebridgePlatform;
+    readonly accessory: PlatformAccessory;
+    constructor(platform: CarrierInfinityHomebridgePlatform, context: Record<string, string>);
+    protected abstract ID(context: Record<string, string>): string;
+    protected useService(type: WithUUID<typeof Service>, name: string, sub_type?: string): Service;
+}
+//# sourceMappingURL=accessory_base.d.ts.map

package/dist/accessory_base.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"accessory_base.d.ts","sourceRoot":"","sources":["../src/accessory_base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAG/D,8BAAsB,aAAa;IAI/B,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,iCAAiC;IAHhE,SAAgB,SAAS,EAAE,iBAAiB,CAAC;gBAGxB,QAAQ,EAAE,iCAAiC,EAC9D,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAkBjC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;IAE9D,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO;CAW/F"}

package/dist/accessory_base.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseAccessory = void 0;
+const settings_1 = require("./settings");
+class BaseAccessory {
+    constructor(platform, context) {
+        this.platform = platform;
+        const uuid = this.platform.api.hap.uuid.generate(this.ID(context));
+        let accessory = this.platform.restored_accessories[uuid];
+        if (!accessory) {
+            this.platform.log.info(`[${context.name}] Added`);
+            accessory = new this.platform.api.platformAccessory(context.name, uuid);
+            accessory.context = context;
+            this.platform.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+        }
+        else {
+            this.platform.log.info(`[${context.name}] Loaded`);
+            accessory.context = context;
+            this.platform.api.updatePlatformAccessories([accessory]);
+        }
+        this.accessory = accessory;
+        this.platform.accessories[uuid] = this;
+    }
+    useService(type, name, sub_type) {
+        // Find existing cached service
+        let service;
+        if (sub_type) {
+            service = this.accessory.getServiceById(type, sub_type);
+        }
+        else {
+            service = this.accessory.getService(type);
+        }
+        // Or create a new instance
+        return service || this.accessory.addService(type, name, sub_type);
+    }
+}
+exports.BaseAccessory = BaseAccessory;
+//# sourceMappingURL=accessory_base.js.map

package/dist/accessory_base.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"accessory_base.js","sourceRoot":"","sources":["../src/accessory_base.ts"],"names":[],"mappings":";;;AAEA,yCAAwD;AAExD,MAAsB,aAAa;IAGjC,YACqB,QAA2C,EAC9D,OAA+B;QADZ,aAAQ,GAAR,QAAQ,CAAmC;QAG9D,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;QACnE,IAAI,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QACzD,IAAI,CAAC,SAAS,EAAE;YACd,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,SAAS,CAAC,CAAC;YAClD,SAAS,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACxE,SAAS,CAAC,OAAO,GAAG,OAAO,CAAC;YAC5B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,2BAA2B,CAAC,sBAAW,EAAE,wBAAa,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;SACxF;aAAM;YACL,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,UAAU,CAAC,CAAC;YACnD,SAAS,CAAC,OAAO,GAAG,OAAO,CAAC;YAC5B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;SAC1D;QACD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACzC,CAAC;IAIS,UAAU,CAAC,IAA8B,EAAE,IAAY,EAAE,QAAiB;QAClF,+BAA+B;QAC/B,IAAI,OAA4B,CAAC;QACjC,IAAI,QAAQ,EAAE;YACZ,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;SACzD;aAAM;YACL,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;SAC3C;QACD,2BAA2B;QAC3B,OAAO,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IACpE,CAAC;CACF;AApCD,sCAoCC"}

package/dist/accessory_comfort_activity.d.ts

@@ -0,0 +1,7 @@
+import { CarrierInfinityHomebridgePlatform } from './platform';
+import { BaseAccessory } from './accessory_base';
+export declare class ComfortActivityAccessory extends BaseAccessory {
+    protected ID(context: Record<string, string>): string;
+    constructor(platform: CarrierInfinityHomebridgePlatform, context: Record<string, string>);
+}
+//# sourceMappingURL=accessory_comfort_activity.d.ts.map

package/dist/accessory_comfort_activity.d.ts.map

@@ -0,0 +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"}

package/dist/accessory_comfort_activity.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ComfortActivityAccessory = void 0;
+const base_1 = require("./base");
+const accessory_base_1 = require("./accessory_base");
+const infinityApi_1 = require("./infinityApi");
+class Activity extends base_1.ThermostatCharacteristicWrapper {
+    constructor(platform, context, activity_name) {
+        super(platform, context);
+        this.platform = platform;
+        this.context = context;
+        this.activity_name = activity_name;
+        this.ctype = this.Characteristic.On;
+        this.get = async () => {
+            return (await this.getActivity()) === this.activity_name;
+        };
+        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) {
+                return;
+            }
+            return await this.system.config.setZoneActivityHold(this.context.zone, 
+            // Turning on sets activity, turning off removes hold
+            value ? this.activity_name : '', await this.getHoldTime());
+        };
+    }
+}
+// HoldActivity works a bit differently. It indicates that a hold of some
+// kind is active. This could be an activity hold, or the 'manual'
+// psudo-activity. To match thermostat behavior, you can't switch directly to
+// the manual activity. Instead activating this switch turns on a hold for the
+// current activity. To hold to the manual activity, just change the temp.
+class HoldActivity extends base_1.ThermostatCharacteristicWrapper {
+    constructor() {
+        super(...arguments);
+        this.ctype = this.Characteristic.On;
+        this.get = async () => {
+            const zone = await this.system.config.getZoneHoldStatus(this.context.zone);
+            return zone[0] === infinityApi_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());
+        };
+    }
+}
+class ComfortActivityAccessory extends accessory_base_1.BaseAccessory {
+    ID(context) {
+        return `ComfortActivity:${context.serialNumber}:${context.zone}`;
+    }
+    constructor(platform, context) {
+        super(platform, context);
+        // Make this first to make it the primary service and show up first
+        new HoldActivity(this.platform, this.accessory.context).wrap(this.useService(this.platform.Service.Switch, 'Manual Hold', 'hold'));
+        [
+            infinityApi_1.ACTIVITY.WAKE,
+            infinityApi_1.ACTIVITY.AWAY,
+            infinityApi_1.ACTIVITY.HOME,
+            infinityApi_1.ACTIVITY.SLEEP,
+        ].forEach((activity) => {
+            new Activity(this.platform, this.accessory.context, activity).wrap(this.useService(this.platform.Service.Switch, `${activity[0].toUpperCase()}${activity.slice(1)}`, activity));
+        });
+        new base_1.AccessoryInformation(this.platform, this.accessory.context).wrap(this.accessory.getService(this.platform.Service.AccessoryInformation) ||
+            this.accessory.addService(this.platform.Service.AccessoryInformation));
+    }
+}
+exports.ComfortActivityAccessory = ComfortActivityAccessory;
+//# sourceMappingURL=accessory_comfort_activity.js.map

package/dist/accessory_comfort_activity.js.map

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

package/dist/accessory_envsensor.d.ts

@@ -1,8 +1,7 @@
-import { PlatformAccessory } from 'homebridge';
 import { CarrierInfinityHomebridgePlatform } from './platform';
-export declare class EnvSensorAccessory {
-    private readonly platform;
-    private readonly accessory;
-    constructor(platform: CarrierInfinityHomebridgePlatform, accessory: PlatformAccessory);
+import { BaseAccessory } from './accessory_base';
+export declare class EnvSensorAccessory extends BaseAccessory {
+    protected ID(context: Record<string, string>): string;
+    constructor(platform: CarrierInfinityHomebridgePlatform, context: Record<string, string>);
 }
 //# sourceMappingURL=accessory_envsensor.d.ts.map

package/dist/accessory_envsensor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accessory_envsensor.d.ts","sourceRoot":"","sources":["../src/accessory_envsensor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAI/D,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBADT,QAAQ,EAAE,iCAAiC,EAC3C,SAAS,EAAE,iBAAiB;CAmBhD"}
+{"version":3,"file":"accessory_envsensor.d.ts","sourceRoot":"","sources":["../src/accessory_envsensor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAG/D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,qBAAa,kBAAmB,SAAQ,aAAa;IACnD,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_envsensor.js

@@ -3,10 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnvSensorAccessory = void 0;
 const base_1 = require("./base");
 const characteristics_humidity_1 = require("./characteristics_humidity");
-class EnvSensorAccessory {
-    constructor(platform, accessory) {
-        this.platform = platform;
-        this.accessory = accessory;
+const accessory_base_1 = require("./accessory_base");
+class EnvSensorAccessory extends accessory_base_1.BaseAccessory {
+    ID(context) {
+        return `ENVSENSOR:${context.serialNumber}:${Number(context.zone) - 1}`;
+    }
+    constructor(platform, context) {
+        super(platform, context);
         new characteristics_humidity_1.ThermostatRHService(this.platform, this.accessory.context).wrap(this.accessory.getService(this.platform.Service.HumiditySensor) ||
             this.accessory.addService(this.platform.Service.HumiditySensor));
         new base_1.AccessoryInformation(this.platform, this.accessory.context).wrap(this.accessory.getService(this.platform.Service.AccessoryInformation) ||

package/dist/accessory_envsensor.js.map

@@ -1 +1 @@
-{"version":3,"file":"accessory_envsensor.js","sourceRoot":"","sources":["../src/accessory_envsensor.ts"],"names":[],"mappings":";;;AAEA,iCAA8C;AAC9C,yEAAiE;AAEjE,MAAa,kBAAkB;IAC7B,YACmB,QAA2C,EAC3C,SAA4B;QAD5B,aAAQ,GAAR,QAAQ,CAAmC;QAC3C,cAAS,GAAT,SAAS,CAAmB;QAE7C,IAAI,8CAAmB,CACrB,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,cAAc,CAAC;YAC/D,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,CAChE,CAAC;QAEF,IAAI,2BAAoB,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;AAtBD,gDAsBC"}
+{"version":3,"file":"accessory_envsensor.js","sourceRoot":"","sources":["../src/accessory_envsensor.ts"],"names":[],"mappings":";;;AACA,iCAA8C;AAC9C,yEAAiE;AACjE,qDAAiD;AAEjD,MAAa,kBAAmB,SAAQ,8BAAa;IACzC,EAAE,CAAC,OAA+B;QAC1C,OAAO,aAAa,OAAO,CAAC,YAAY,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC;IACvE,CAAC;IAED,YACE,QAA2C,EAC3C,OAA+B;QAE/B,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAEzB,IAAI,8CAAmB,CACrB,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,cAAc,CAAC;YAC/D,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,CAChE,CAAC;QAEF,IAAI,2BAAoB,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;AA5BD,gDA4BC"}

package/dist/accessory_oat.d.ts

@@ -1,17 +1,16 @@
-import { PlatformAccessory } from 'homebridge';
 import { CarrierInfinityHomebridgePlatform } from './platform';
 import { CharacteristicWrapper, MultiWrapper } from './base';
+import { BaseAccessory } from './accessory_base';
 declare class OATSensorTemp extends CharacteristicWrapper {
     ctype: typeof import("hap-nodejs/dist/lib/definitions").CurrentTemperature;
-    get: () => Promise<import("homebridge").CharacteristicValue>;
+    get: () => Promise<import("hap-nodejs").CharacteristicValue>;
 }
 export declare class OutdoorTempSensorService extends MultiWrapper {
     WRAPPERS: (typeof OATSensorTemp)[];
 }
-export declare class OutdoorTemperatureAccessory {
-    private readonly platform;
-    private readonly accessory;
-    constructor(platform: CarrierInfinityHomebridgePlatform, accessory: PlatformAccessory);
+export declare class OutdoorTemperatureAccessory extends BaseAccessory {
+    protected ID(context: Record<string, string>): string;
+    constructor(platform: CarrierInfinityHomebridgePlatform, context: Record<string, string>);
 }
 export {};
 //# sourceMappingURL=accessory_oat.d.ts.map

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,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAwB,qBAAqB,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGnF,cAAM,aAAc,SAAQ,qBAAqB;IAC/C,KAAK,sEAA0C;IAC/C,GAAG,0DAKD;CACH;AAED,qBAAa,wBAAyB,SAAQ,YAAY;IACxD,QAAQ,2BAAmB;CAC5B;AAED,qBAAa,2BAA2B;IAEpC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBADT,QAAQ,EAAE,iCAAiC,EAC3C,SAAS,EAAE,iBAAiB;CAmBhD"}
+{"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,QAAQ,CAAC;AAEnF,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"}

package/dist/accessory_oat.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OutdoorTemperatureAccessory = exports.OutdoorTempSensorService = void 0;
 const base_1 = require("./base");
 const helpers_1 = require("./helpers");
+const accessory_base_1 = require("./accessory_base");
 class OATSensorTemp extends base_1.CharacteristicWrapper {
     constructor() {
         super(...arguments);
@@ -19,10 +20,12 @@ class OutdoorTempSensorService extends base_1.MultiWrapper {
     }
 }
 exports.OutdoorTempSensorService = OutdoorTempSensorService;
-class OutdoorTemperatureAccessory {
-    constructor(platform, accessory) {
-        this.platform = platform;
-        this.accessory = accessory;
+class OutdoorTemperatureAccessory extends accessory_base_1.BaseAccessory {
+    ID(context) {
+        return `OAT:${context.serialNumber}`;
+    }
+    constructor(platform, context) {
+        super(platform, context);
         new OutdoorTempSensorService(this.platform, this.accessory.context).wrap(this.accessory.getService(this.platform.Service.TemperatureSensor) ||
             this.accessory.addService(this.platform.Service.TemperatureSensor));
         new base_1.AccessoryInformation(this.platform, this.accessory.context).wrap(this.accessory.getService(this.platform.Service.AccessoryInformation) ||

package/dist/accessory_oat.js.map

@@ -1 +1 @@
-{"version":3,"file":"accessory_oat.js","sourceRoot":"","sources":["../src/accessory_oat.ts"],"names":[],"mappings":";;;AAEA,iCAAmF;AACnF,uCAAuD;AAEvD,MAAM,aAAc,SAAQ,4BAAqB;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,mBAAY;IAA1D;;QACE,aAAQ,GAAG,CAAC,aAAa,CAAC,CAAC;IAC7B,CAAC;CAAA;AAFD,4DAEC;AAED,MAAa,2BAA2B;IACtC,YACmB,QAA2C,EAC3C,SAA4B;QAD5B,aAAQ,GAAR,QAAQ,CAAmC;QAC3C,cAAS,GAAT,SAAS,CAAmB;QAE7C,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,2BAAoB,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;AAtBD,kEAsBC"}
+{"version":3,"file":"accessory_oat.js","sourceRoot":"","sources":["../src/accessory_oat.ts"],"names":[],"mappings":";;;AACA,iCAAmF;AACnF,uCAAuD;AACvD,qDAAiD;AAEjD,MAAM,aAAc,SAAQ,4BAAqB;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,mBAAY;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,2BAAoB,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

@@ -0,0 +1,13 @@
+import { CarrierInfinityHomebridgePlatform } from './platform';
+import { BaseAccessory } from './accessory_base';
+export declare class ThermostatAccessory extends BaseAccessory {
+    private service;
+    private fan_service?;
+    private system_status;
+    private system_config;
+    private system_profile;
+    protected ID(context: Record<string, string>): string;
+    constructor(platform: CarrierInfinityHomebridgePlatform, context: Record<string, string>);
+    setupFanService(): void;
+}
+//# sourceMappingURL=accessory_thermostat.d.ts.map

package/dist/accessory_thermostat.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"accessory_thermostat.d.ts","sourceRoot":"","sources":["../src/accessory_thermostat.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAc/D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,qBAAa,mBAAoB,SAAQ,aAAa;IACpD,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,WAAW,CAAC,CAAU;IAC9B,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,cAAc,CAAiC;IAEvD,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;IA+DjC,eAAe,IAAI,IAAI;CAexB"}

package/dist/{platformAccessory.js → accessory_thermostat.js}

@@ -1,19 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InfinityEvolutionPlatformAccessory = void 0;
+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");
-class InfinityEvolutionPlatformAccessory {
-    constructor(platform, accessory) {
-        this.platform = platform;
-        this.accessory = accessory;
+const accessory_base_1 = require("./accessory_base");
+class ThermostatAccessory extends accessory_base_1.BaseAccessory {
+    constructor(platform, context) {
+        super(platform, context);
         const system = this.platform.systems[this.accessory.context.serialNumber];
         // Create services
         this.accessory.getService(this.platform.Service.AccessoryInformation)
-            .setCharacteristic(this.platform.Characteristic.SerialNumber, accessory.context.serialNumber);
+            .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 = system.status;
@@ -29,7 +29,8 @@ class InfinityEvolutionPlatformAccessory {
             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);
-            this.service.setCharacteristic(this.platform.Characteristic.Name, await this.system_config.getZoneName(this.accessory.context.zone) + ' Thermostat');
+            // setting name explicitly is needed to not lose the word 'thermostat'
+            this.service.setCharacteristic(this.platform.Characteristic.Name, this.accessory.displayName);
         });
         this.system_profile = system.profile;
         this.system_profile.fetch().then(async () => {
@@ -52,6 +53,9 @@ class InfinityEvolutionPlatformAccessory {
         // Humidity Control
         new characteristics_humidity_1.ThermostatRHService(this.platform, this.accessory.context).wrap(this.service);
     }
+    ID(context) {
+        return `${context.serialNumber}:${Number(context.zone) - 1}`;
+    }
     setupFanService() {
         this.fan_service = this.fan_service || this.accessory.addService(this.platform.Service.Fanv2);
         this.system_config.fetch().then(async () => {
@@ -61,5 +65,5 @@ class InfinityEvolutionPlatformAccessory {
         new characteristics_fan_1.FanService(this.platform, this.accessory.context).wrap(this.fan_service);
     }
 }
-exports.InfinityEvolutionPlatformAccessory = InfinityEvolutionPlatformAccessory;
-//# sourceMappingURL=platformAccessory.js.map
+exports.ThermostatAccessory = ThermostatAccessory;
+//# sourceMappingURL=accessory_thermostat.js.map

package/dist/accessory_thermostat.js.map

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

package/dist/base.d.ts

@@ -21,6 +21,7 @@ export declare abstract class CharacteristicWrapper extends Wrapper {
     protected props: {};
     protected get: (() => Promise<CharacteristicValue>) | undefined;
     protected set: ((value: CharacteristicValue) => Promise<void>) | undefined;
+    protected default_value: CharacteristicValue | null;
     wrap(service: Service): void;
 }
 export declare abstract class ThermostatCharacteristicWrapper extends CharacteristicWrapper {

package/dist/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,4BAA4B,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3E,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAM/D,cAAM,OAAO;aAOO,QAAQ,EAAE,iCAAiC;IAC3D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,cAAc;IAP5C,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAiC;IACxE,SAAgB,cAAc,EAAE,OAAO,cAAc,CAAwC;IAC7F,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,4BAA4B,CAAoD;IAC3G,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAqB;gBAGjC,QAAQ,EAAE,iCAAiC,EACxC,OAAO,EAAE,cAAc;IAI5C,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAG7B;AAED,8BAAsB,YAAa,SAAQ,OAAO;IAChD,SAAS,CAAC,QAAQ,EAAE,OAAO,OAAO,EAAE,CAAM;IAE1C,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAQ7B;AAED,8BAAsB,qBAAsB,SAAQ,OAAO;IACzD,SAAgB,KAAK,EAAE,QAAQ,CAAC,UAAU,cAAc,CAAC,CAAC;IAC1D,SAAS,CAAC,KAAK,KAAM;IACrB,SAAS,CAAC,GAAG,EAAE,CAAC,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAC,GAAG,SAAS,CAAC;IAChE,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC;IAE3E,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAqB7B;AAED,8BAAsB,+BAAgC,SAAQ,qBAAqB;IAG3E,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAS9B,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;CAqBrC;AAED,qBAAa,oBAAqB,SAAQ,OAAO;IAC/C,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAQ7B"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,4BAA4B,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3E,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAM/D,cAAM,OAAO;aAOO,QAAQ,EAAE,iCAAiC;IAC3D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,cAAc;IAP5C,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAiC;IACxE,SAAgB,cAAc,EAAE,OAAO,cAAc,CAAwC;IAC7F,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,4BAA4B,CAAoD;IAC3G,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAqB;gBAGjC,QAAQ,EAAE,iCAAiC,EACxC,OAAO,EAAE,cAAc;IAI5C,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAG7B;AAED,8BAAsB,YAAa,SAAQ,OAAO;IAChD,SAAS,CAAC,QAAQ,EAAE,OAAO,OAAO,EAAE,CAAM;IAE1C,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAQ7B;AAED,8BAAsB,qBAAsB,SAAQ,OAAO;IACzD,SAAgB,KAAK,EAAE,QAAQ,CAAC,UAAU,cAAc,CAAC,CAAC;IAC1D,SAAS,CAAC,KAAK,KAAM;IACrB,SAAS,CAAC,GAAG,EAAE,CAAC,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAC,GAAG,SAAS,CAAC;IAChE,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC;IAE3E,SAAS,CAAC,aAAa,EAAE,mBAAmB,GAAG,IAAI,CAAQ;IAE3D,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAsB7B;AAED,8BAAsB,+BAAgC,SAAQ,qBAAqB;IAG3E,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAS9B,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;CAqBrC;AAED,qBAAa,oBAAqB,SAAQ,OAAO;IAC/C,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAQ7B"}

package/dist/base.js

@@ -35,6 +35,8 @@ class CharacteristicWrapper extends Wrapper {
     constructor() {
         super(...arguments);
         this.props = {};
+        // used exclusively if no char value is set yet (first accessory load)
+        this.default_value = null;
     }
     wrap(service) {
         const characteristic = service.getCharacteristic(this.ctype);
@@ -50,7 +52,8 @@ class CharacteristicWrapper extends Wrapper {
                     }
                 });
                 // and return immediately
-                return characteristic.value;
+                // try 1) existing value, if falsy, 2) default value, if null, 3) keep existing value
+                return characteristic.value || this.default_value || characteristic.value;
             });
         }
         if (this.set) {

package/dist/base.js.map

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

package/dist/characteristics_ac.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"characteristics_ac.d.ts","sourceRoot":"","sources":["../src/characteristics_ac.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,+BAA+B,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AA2EvE,cAAM,WAAY,SAAQ,+BAA+B;IACvD,KAAK,sEAA0C;IAC/C,GAAG,qCAKD;CACH;AAmGD,qBAAa,SAAU,SAAQ,YAAY;IACzC,QAAQ,yBAQN;CACH"}
+{"version":3,"file":"characteristics_ac.d.ts","sourceRoot":"","sources":["../src/characteristics_ac.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,+BAA+B,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AA2EvE,cAAM,WAAY,SAAQ,+BAA+B;IACvD,KAAK,sEAA0C;IAC/C,GAAG,qCAKD;CACH;AAqGD,qBAAa,SAAU,SAAQ,YAAY;IACzC,QAAQ,yBAQN;CACH"}

package/dist/characteristics_ac.js

@@ -98,7 +98,7 @@ class CoolSetpoint extends base_1.ThermostatCharacteristicWrapper {
             return (0, helpers_1.convertSystemTemp2CharTemp)(await this.system.config.getZoneActivityCoolSetpoint(this.context.zone, await this.getActivity()), await this.system.config.getUnits());
         };
         this.set = async (value) => {
-            return await this.system.config.setZoneActivity(this.context.zone, (0, helpers_1.convertCharTemp2SystemTemp)(value, await this.system.config.getUnits()), null, await this.getHoldTime());
+            return await this.system.config.setZoneActivityManualHold(this.context.zone, (0, helpers_1.convertCharTemp2SystemTemp)(value, await this.system.config.getUnits()), null, await this.getHoldTime());
         };
     }
 }
@@ -106,11 +106,12 @@ class HeatSetpoint extends base_1.ThermostatCharacteristicWrapper {
     constructor() {
         super(...arguments);
         this.ctype = this.Characteristic.HeatingThresholdTemperature;
+        this.default_value = 10;
         this.get = async () => {
             return (0, helpers_1.convertSystemTemp2CharTemp)(await this.system.config.getZoneActivityHeatSetpoint(this.context.zone, await this.getActivity()), await this.system.config.getUnits());
         };
         this.set = async (value) => {
-            return await this.system.config.setZoneActivity(this.context.zone, null, (0, helpers_1.convertCharTemp2SystemTemp)(value, await this.system.config.getUnits()), await this.getHoldTime());
+            return await this.system.config.setZoneActivityManualHold(this.context.zone, null, (0, helpers_1.convertCharTemp2SystemTemp)(value, await this.system.config.getUnits()), await this.getHoldTime());
         };
     }
 }
@@ -140,9 +141,9 @@ class GeneralSetpoint extends base_1.ThermostatCharacteristicWrapper {
             const mode = await this.system.config.getMode();
             switch (mode) {
                 case infinityApi_1.SYSTEM_MODE.COOL:
-                    return await this.system.config.setZoneActivity(this.context.zone, svalue, null, await this.getHoldTime());
+                    return await this.system.config.setZoneActivityManualHold(this.context.zone, svalue, null, await this.getHoldTime());
                 case infinityApi_1.SYSTEM_MODE.HEAT:
-                    return await this.system.config.setZoneActivity(this.context.zone, null, svalue, await this.getHoldTime());
+                    return await this.system.config.setZoneActivityManualHold(this.context.zone, null, svalue, await this.getHoldTime());
                 case infinityApi_1.SYSTEM_MODE.AUTO:
                     // For auto mode, Cool/Heat setpoints are used
                     return;

package/dist/characteristics_ac.js.map

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

package/dist/characteristics_fan.js

@@ -59,7 +59,7 @@ class FanStatus extends base_1.ThermostatCharacteristicWrapper {
             // 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.setZoneActivity(this.context.zone, null, null, await this.getHoldTime(), infinityApi_1.FAN_MODE.OFF);
+                return await this.system.config.setZoneActivityManualHold(this.context.zone, null, null, await this.getHoldTime(), infinityApi_1.FAN_MODE.OFF);
             }
         };
     }
@@ -110,7 +110,7 @@ class FanSpeed extends base_1.ThermostatCharacteristicWrapper {
                 await this.system.config.setMode(infinityApi_1.SYSTEM_MODE.FAN_ONLY);
             }
             // set fan speed
-            return await this.system.config.setZoneActivity(this.context.zone, null, null, await this.getHoldTime(), (0, helpers_1.convertCharFan2SystemFan)(value));
+            return await this.system.config.setZoneActivityManualHold(this.context.zone, null, null, await this.getHoldTime(), (0, helpers_1.convertCharFan2SystemFan)(value));
         };
     }
 }
@@ -129,7 +129,7 @@ class TargetFanState extends base_1.ThermostatCharacteristicWrapper {
                 await this.system.config.setMode(infinityApi_1.SYSTEM_MODE.FAN_ONLY);
             }
             // set fan speed to switch between auto and manual
-            return await this.system.config.setZoneActivity(this.context.zone, null, null, await this.getHoldTime(), value === this.Characteristic.TargetFanState.AUTO ?
+            return await this.system.config.setZoneActivityManualHold(this.context.zone, null, null, await this.getHoldTime(), value === this.Characteristic.TargetFanState.AUTO ?
                 infinityApi_1.FAN_MODE.OFF : // fan off is auto
                 infinityApi_1.FAN_MODE.MED);
         };

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/index.d.ts

@@ -1,7 +1,7 @@
 import { API } from 'homebridge';
-declare const _default: (api: API) => void;
 /**
  * This method registers the platform with Homebridge
  */
+declare const _default: (api: API) => void;
 export = _default;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;8BAQlB,GAAG;AAHlB;;GAEG;AACH,kBAEE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAKjC;;GAEG;8BACY,GAAG;AAAlB,kBAEE"}

package/dist/infinityApi.d.ts

@@ -22,6 +22,10 @@ export declare const FAN_MODE: {
     MED: string;
     HIGH: string;
 };
+export declare const STATUS: {
+    ON: string;
+    OFF: string;
+};
 export declare class InfinityEvolutionApiConnection {
     username: string;
     private password;
@@ -87,6 +91,7 @@ export declare class InfinityEvolutionSystemConfig extends BaseInfinityEvolution
     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>;
@@ -99,8 +104,10 @@ export declare class InfinityEvolutionSystemConfig extends BaseInfinityEvolution
     private forcePush;
     setMode(mode: string): Promise<void>;
     private mutateMode;
-    setZoneActivity(zone: string, clsp: number | null, htsp: number | null, hold_until: string | null, fan?: string | null): Promise<void>;
-    private mutateZoneActivity;
+    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;
 }
 export declare class InfinityEvolutionSystemModel {
     protected readonly api_connection: InfinityEvolutionApiConnection;

package/dist/infinityApi.d.ts.map

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

package/dist/infinityApi.js

@@ -32,7 +32,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InfinityEvolutionSystemModel = exports.InfinityEvolutionSystemConfig = exports.InfinityEvolutionSystemStatus = exports.InfinityEvolutionSystemProfile = exports.InfinityEvolutionLocations = exports.InfinityEvolutionApiConnection = exports.FAN_MODE = exports.ACTIVITY = exports.SYSTEM_MODE = void 0;
+exports.InfinityEvolutionSystemModel = exports.InfinityEvolutionSystemConfig = exports.InfinityEvolutionSystemStatus = exports.InfinityEvolutionSystemProfile = exports.InfinityEvolutionLocations = exports.InfinityEvolutionApiConnection = exports.STATUS = exports.FAN_MODE = exports.ACTIVITY = exports.SYSTEM_MODE = void 0;
 const helpers_1 = require("./helpers");
 const settings_1 = require("./settings");
 const axios_1 = __importDefault(require("axios"));
@@ -62,6 +62,10 @@ exports.FAN_MODE = {
     MED: 'med',
     HIGH: 'high',
 };
+exports.STATUS = {
+    ON: 'on',
+    OFF: 'off',
+};
 class OAuthHeaders {
     static genHeader(httpMethod, url, username, token, data) {
         // Needed for header and sig
@@ -264,7 +268,7 @@ class InfinityEvolutionSystemProfile extends BaseInfinityEvolutionSystemApiModel
     }
     async getZones() {
         await this.fetch();
-        return this.data_object.system_profile.zones[0].zone.filter((zone) => zone['present'][0] === 'on').map((zone) => zone['$'].id);
+        return this.data_object.system_profile.zones[0].zone.filter((zone) => zone['present'][0] === exports.STATUS.ON).map((zone) => zone['$'].id);
     }
 }
 exports.InfinityEvolutionSystemProfile = InfinityEvolutionSystemProfile;
@@ -300,7 +304,7 @@ class InfinityEvolutionSystemStatus extends BaseInfinityEvolutionSystemApiModel
     }
     async getZone(zone) {
         await this.fetch();
-        return this.data_object.status.zones[0].zone[zone];
+        return this.data_object.status.zones[0].zone.find((z) => z['$'].id === zone.toString());
     }
     async getZoneConditioning(zone) {
         const raw_mode = (await this.getZone(zone)).zoneconditioning[0];
@@ -370,21 +374,25 @@ class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel
     }
     async getZone(zone) {
         await this.fetch();
-        return this.data_object.config.zones[0].zone[zone.toString()];
+        return this.data_object.config.zones[0].zone.find((z) => z['$'].id === zone.toString());
     }
     async getZoneName(zone) {
         const zone_obj = await this.getZone(zone);
         return zone_obj['name'][0];
     }
+    async getZoneHoldStatus(zone) {
+        const zone_obj = await this.getZone(zone);
+        return [zone_obj['hold'][0], zone_obj['otmr'][0]];
+    }
     async getZoneActivity(zone) {
         const zone_obj = await this.getZone(zone);
-        if (zone_obj.hold[0] === 'on') {
+        if (zone_obj.hold[0] === exports.STATUS.ON) {
             return zone_obj.holdActivity[0];
         }
         else {
             const now = new Date();
             const program_obj = (await this.getZone(zone)).program[0];
-            const today_schedule = program_obj.day[now.getDay()].period.filter(period => period.enabled[0] === 'on').reverse();
+            const today_schedule = program_obj.day[now.getDay()].period.filter(period => period.enabled[0] === exports.STATUS.ON).reverse();
             for (const i in today_schedule) {
                 const time = today_schedule[i].time[0];
                 const split = time.split(':');
@@ -397,7 +405,7 @@ class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel
                 }
             }
             // If we got to the end without finding the next activity, it means the activity is the last from yesterday
-            const yesterday_schedule = program_obj['day'][(now.getDay() + 8) % 7].period.filter(period => period.enabled[0] === 'on').reverse();
+            const yesterday_schedule = program_obj['day'][(now.getDay() + 8) % 7].period.filter(period => period.enabled[0] === exports.STATUS.ON).reverse();
             return yesterday_schedule[0].activity[0];
         }
     }
@@ -542,14 +550,32 @@ class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel
     mutateMode(mode) {
         this.data_object.config.mode[0] = mode;
     }
-    async setZoneActivity(zone, clsp, htsp, hold_until, fan = null) {
+    async setZoneActivityHold(zone, activity, hold_until) {
+        this.mutations.push(async () => {
+            await this.mutateZoneActivityHold(zone, activity, hold_until);
+        });
+        // Schedule the push event, but don't wait for it to return.
+        this.push();
+    }
+    async mutateZoneActivityHold(zone, activity, hold_until) {
+        const zone_obj = await this.getZone(zone);
+        zone_obj['holdActivity'][0] = activity;
+        zone_obj['hold'][0] = activity ? exports.STATUS.ON : exports.STATUS.OFF;
+        zone_obj['otmr'][0] = activity ? hold_until || '' : '';
+    }
+    async setZoneActivityManualHold(zone, clsp, htsp, hold_until, fan = null) {
+        // Modify MANUAL activity to the requested setpoints
+        this.mutations.push(async () => {
+            await this.mutateZoneActivityManualHold(zone, clsp, htsp, fan);
+        });
+        // Set hold to MANUAL activity
         this.mutations.push(async () => {
-            await this.mutateZoneActivity(zone, clsp, htsp, hold_until, fan);
+            await this.mutateZoneActivityHold(zone, exports.ACTIVITY.MANUAL, hold_until);
         });
         // Schedule the push event, but don't wait for it to return.
         this.push();
     }
-    async mutateZoneActivity(zone, clsp, htsp, hold_until, fan = null) {
+    async mutateZoneActivityManualHold(zone, clsp, htsp, fan = null) {
         const zone_obj = await this.getZone(zone);
         // When moving to manual activity, default to prev activity settings.
         const manual_activity_obj = await this.getZoneActivityConfig(zone, exports.ACTIVITY.MANUAL);
@@ -559,10 +585,6 @@ class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel
             manual_activity_obj['htsp'][0] = prev_activity_obj['htsp'][0];
             manual_activity_obj['fan'][0] = prev_activity_obj['fan'][0];
         }
-        // Always set to manual activity
-        zone_obj['holdActivity'][0] = exports.ACTIVITY.MANUAL;
-        zone_obj['hold'][0] = 'on';
-        zone_obj['otmr'][0] = hold_until || '';
         // Set setpoints on manual activity
         [htsp, clsp] = (0, helpers_1.processSetpointDeadband)(htsp || parseFloat(manual_activity_obj['htsp'][0]), clsp || parseFloat(manual_activity_obj['clsp'][0]), await this.getUnits(), 
         // when setpoints are too close, make clsp sticky when no change made to htsp

package/dist/infinityApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"infinityApi.js","sourceRoot":"","sources":["../src/infinityApi.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAoD;AACpD,yCAA4G;AAE5G,kDAAiE;AACjE,sEAA6C;AAC7C,2DAAqD;AACrD,6CAA8E;AAC9E,+CAAiC;AAEjC,8DAA+B;AAElB,QAAA,WAAW,GAAG;IACzB,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,SAAS;CACpB,CAAC;AAEW,QAAA,QAAQ,GAAG;IACtB,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;CACrB,CAAC;AAEW,QAAA,QAAQ,GAAG;IACtB,GAAG,EAAE,KAAK;IACV,GAAG,EAAE,KAAK;IACV,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,MAAM;CACb,CAAC;AAsCF,MAAM,YAAY;IAChB,MAAM,CAAC,SAAS,CAAC,UAAkB,EAAE,GAAW,EAAE,QAAgB,EAAE,KAAa,EAAE,IAAmB;QACpG,4BAA4B;QAC5B,MAAM,iBAAiB,GAAG;YACxB,kBAAkB,EAAG,oCAAyB;YAC9C,WAAW,EAAG,QAAQ;YACtB,sBAAsB,EAAG,WAAW;YACpC,eAAe,EAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;YAC/C,0BAA0B;YAC1B,WAAW,EAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC;YAC1D,aAAa,EAAG,KAAK;SACtB,CAAC;QAEF,+CAA+C;QAC/C,MAAM,eAAe,GAAG,EAAE,CAAC;QAC3B,IAAI,IAAI,EAAE;YACR,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC9B,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;gBACrB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACjC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;aACxD;SACF;QACD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,iBAAiB,EAAE,eAAe,CAAC,CAAC;QAGzE,eAAe;QACf,MAAM,SAAS,GAAG,yBAAc,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,uCAA4B,EAAE,KAAK,CAAC,CAAC;QAC5G,mBAAmB;QACnB,MAAM,aAAa,GAAG;YACpB,SAAS,kBAAkB,CAAC,GAAG,CAAC,EAAE;SACnC,CAAC;QACF,KAAK,MAAM,CAAC,IAAI,iBAAiB,EAAE;YACjC,aAAa,CAAC,IAAI,CAChB,GAAG,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,CACxB,CAAC;SACH;QACD,aAAa,CAAC,IAAI,CAAC,mBAAmB,SAAS,EAAE,CAAC,CAAC;QACnD,OAAO,SAAS,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,MAA0B,EAAE,QAAgB,EAAE,KAAa;QAC1E,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE;YAChC,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC;SACrB;QACD,MAAM,CAAC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,IAAI,KAAK,EAAE,MAAM,CAAC,GAAG,IAAI,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QACvH,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAED,MAAa,8BAA8B;IAIzC,YACS,QAAgB,EACf,QAAgB,EACR,GAAW;QAFpB,aAAQ,GAAR,QAAQ,CAAQ;QACf,aAAQ,GAAR,QAAQ,CAAQ;QACR,QAAG,GAAH,GAAG,CAAQ;QANrB,UAAK,GAAG,EAAE,CAAC;QAOjB,IAAI,CAAC,KAAK,GAAG,eAAK,CAAC,MAAM,CAAC;YACxB,OAAO,EAAE,gCAAqB;YAC9B,OAAO,EAAE;gBACP,UAAU,EAAE,iBAAiB;gBAC7B,MAAM,EAAE,iBAAiB;aAC1B;SACF,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3G,CAAC;IAGD,KAAK,CAAC,YAAY;QAChB,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;IACjC,CAAC;IAED,4CAA4C;IACpC,KAAK,CAAC,iBAAiB;;QAC7B,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,EAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC;QAClE,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC;YAClC,WAAW,EAAE;gBACX,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;aACxB;SACF,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,QAAQ,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC;QAEnD,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CACpC,sBAAsB,EACtB,IAAI,EACJ;gBACE,OAAO,EAAE;oBACP,cAAc,EAAE,mCAAmC;oBACnD,MAAM,EAAE,kBAAkB;iBAC3B;aACF,CACF,CAAC;YAEF,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE;gBACvB,MAAM,IAAI,KAAK,CAAC,oCAAoC,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;aACvF;iBAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE;gBAC/B,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;aAC/C;iBAAM;gBACL,MAAM,IAAI,KAAK,CAAC,6CAA6C,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;aAChG;SACF;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,eAAK,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;gBAC7B,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,sCAAsC,EAAE,KAAK,CAAC,OAAO,EACrD,YAAY,EAAE,MAAA,KAAK,CAAC,QAAQ,0CAAE,MAAM,EACpC,UAAU,EAAE,MAAA,KAAK,CAAC,QAAQ,0CAAE,IAAI,CACjC,CAAC;aACH;iBAAM;gBACL,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAC;aAC/D;SACF;IACH,CAAC;CACF;AA9CC;IADC,IAAA,oCAAe,EAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,eAAe;kEAGpD;AArBH,wEAiEC;AAED,MAAe,6BAA6B;IAQ1C,YACqB,cAA8C;QAA9C,mBAAc,GAAd,cAAc,CAAgC;QARnE,4DAA4D;QAC5D,8DAA8D;QACpD,gBAAW,GAAQ,IAAI,CAAC;QAExB,qBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;QAM7C,IAAI,CAAC,UAAU,GAAG,IAAI,mBAAK,EAAE,CAAC;IAChC,CAAC;IAIS,cAAc;QACtB,OAAO,IAAA,qBAAI,EACT,IAAI,CAAC,WAAW,EAChB,EAAC,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE;gBACpB,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACxC,CAAC,EAAC,CACH,CAAC;IACJ,CAAC;IAGD,KAAK,CAAC,KAAK;QACT,wEAAwE;QACxE,IAAI;YACF,MAAM,IAAA,wBAAU,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE;gBACxD,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;YAC1B,CAAC,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,KAAK,8BAAgB,EAAE;gBAC1B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,CAAC,sCAAsC,CAAC,CAAC;aAC7F;SACF;IACH,CAAC;IAES,KAAK,CAAC,UAAU;QACxB,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC;QACzC,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACrE,IAAI,CAAC,WAAW,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClE,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;SAC/C;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,eAAK,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;gBAC7B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;aACnF;iBAAM;gBACL,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,qCAAqC,EAAE,KAAK,CAAC,CAAC;aAC7E;SACF;IACH,CAAC;CACF;AA3BC;IADC,IAAA,oCAAe,EAAC,EAAE,GAAG,IAAI,CAAC;0DAY1B;AAkBH,MAAa,0BAA2B,SAAQ,6BAA6B;IAC3E,OAAO;QACL,OAAO,UAAU,IAAI,CAAC,cAAc,CAAC,QAAQ,YAAY,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC1D,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE;gBAC/C,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAClE,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;aACjD;SACF;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AAhBD,gEAgBC;AAED,MAAe,mCAAoC,SAAQ,6BAA6B;IAItF,YACqB,cAA8C,EACjD,YAAoB;QAEpC,KAAK,CAAC,cAAc,CAAC,CAAC;QAHH,mBAAc,GAAd,cAAc,CAAgC;QACjD,iBAAY,GAAZ,YAAY,CAAQ;QAL9B,iBAAY,GAAG,CAAC,CAAC,CAAE,gBAAgB;QACjC,qBAAgB,GAAG,IAAI,GAAG,CAAS,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;IAOzE,CAAC;IAES,KAAK,CAAC,UAAU;QACxB,MAAM,KAAK,CAAC,UAAU,EAAE,CAAC;QACzB,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QACvD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/E,CAAC;CACF;AAED,MAAa,8BAA+B,SAAQ,mCAAmC;IACrF,OAAO;QACL,OAAO,YAAY,IAAI,CAAC,YAAY,UAAU,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CACzD,CAAC,IAA2B,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAC7D,CAAC,GAAG,CACH,CAAC,IAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CACpC,CAAC;IACJ,CAAC;CACF;AAjCD,wEAiCC;AAED,MAAa,6BAA8B,SAAQ,mCAAmC;IACpF,OAAO;QACL,OAAO,YAAY,IAAI,CAAC,YAAY,SAAS,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjD,QAAO,QAAQ,EAAE;YACf,KAAK,SAAS,CAAC;YACf,KAAK,UAAU,CAAC;YAChB,KAAK,QAAQ;gBACX,OAAO,mBAAW,CAAC,IAAI,CAAC;YAC1B,KAAK,YAAY;gBACf,OAAO,mBAAW,CAAC,IAAI,CAAC;YAC1B;gBACE,OAAO,QAAQ,CAAC;SACnB;IACH,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,IAAY;QAChC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,IAAY;QACpC,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAiB,CAAC,CAAC,CAAC,CAAC;QACjE,QAAO,QAAQ,EAAE;YACf,KAAK,aAAa,CAAC;YACnB,KAAK,WAAW;gBACd,OAAO,mBAAW,CAAC,IAAI,CAAC;YAC1B,KAAK,aAAa,CAAC;YACnB,KAAK,WAAW;gBACd,OAAO,mBAAW,CAAC,IAAI,CAAC;YAC1B,KAAK,MAAM;gBACT,OAAO,mBAAW,CAAC,GAAG,CAAC;YACzB;gBACE,OAAO,QAAQ,CAAC;SACnB;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAY;QAC3B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,QAAQ,CAAC,cAAe,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YACvC,OAAO,gBAAQ,CAAC,GAAG,CAAC;SACrB;aAAM;YACL,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SACxB;IACH,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAY;QAC5B,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,cAAe,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAY;QAC5B,OAAO,MAAM,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,IAAY;QAChC,OAAO,MAAM,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,IAAY;QAChC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,eAAgB,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,IAAY;QACpC,OAAO,MAAM,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,IAAY;QACpC,OAAO,MAAM,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;CACF;AAxFD,sEAwFC;AAED,MAAa,6BAA8B,SAAQ,mCAAmC;IAAtF;;QA+GE,gBAAgB;QAChB,cAAS,GAA4B,EAAE,CAAC;IAmK1C,CAAC;IAlRC,OAAO;QACL,OAAO,YAAY,IAAI,CAAC,YAAY,SAAS,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/D,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACzC,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,IAAY;QAChC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAY;QAC5B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1C,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,IAAY;QAChC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE;YAC7B,OAAO,QAAQ,CAAC,YAAa,CAAC,CAAC,CAAC,CAAC;SAClC;aAAM;YACL,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAQ,CAAC,CAAC,CAAC,CAAC;YAC3D,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;YACnH,KAAK,MAAM,CAAC,IAAI,cAAc,EAAE;gBAC9B,MAAM,IAAI,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACvC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC9B;gBACE,mBAAmB;gBACnB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ,EAAE;oBACjC,sCAAsC;oBACtC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,QAAQ,EAAE,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,EAC5E;oBACA,OAAO,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;iBACtC;aACF;YACD,2GAA2G;YAC3G,MAAM,kBAAkB,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;YACpI,OAAO,kBAAkB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;SAC1C;IACH,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,IAAY,EAAE,aAAqB;QACrE,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,uCAAuC;QACvC,IAAI,aAAa,KAAK,gBAAQ,CAAC,QAAQ,EAAE;YACvC,OAAO;gBACL,GAAG,EAAE,EAAC,EAAE,EAAE,gBAAQ,CAAC,QAAQ,EAAC;gBAC5B,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO;gBACrC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO;gBACrC,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM;aACpC,CAAC;SACH;QAED,MAAM,cAAc,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,UAAW,CAAC,CAAC,CAAC,CAAC;QACjE,OAAO,cAAc,CAAC,UAAU,CAAC,CAAC,IAAI,CACpC,CAAC,QAAsB,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,aAAa,CAC/D,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,IAAY,EAAE,QAAgB;QACrD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACtE,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,2BAA2B,CAAC,IAAY,EAAE,QAAgB;QAC9D,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACtE,OAAO,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,2BAA2B,CAAC,IAAY,EAAE,QAAgB;QAC9D,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACtE,OAAO,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,IAAY;QACxC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAQ,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;QACjD,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,EAAE;YACjC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC9B;YACE,mBAAmB;YACnB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ,EAAE;gBACjC,sCAAsC;gBACtC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,QAAQ,EAAE,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,EAC5E;gBACA,OAAO,IAAI,CAAC;aACb;SACF;QACD,gHAAgH;QAChH,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAChE,OAAO,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC3C,CAAC;IAKO,KAAK,CAAC,IAAI;QAChB,qEAAqE;QACrE,aAAa;QACb,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;QAC5C,6EAA6E;QAC7E,2EAA2E;QAC3E,mEAAmE;QACnE,6EAA6E;QAC7E,0EAA0E;QAC1E,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QACzB,yEAAyE;QACzE,IAAI;YACF,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE;gBAC9C,kBAAkB;gBAChB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;gBACzC,IAAI,YAAY,KAAK,IAAI,EAAE;oBACzB,OAAO;iBACR;gBACD,UAAU;gBACV,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;gBACvB,aAAa;gBACb,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;gBAC5C,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;gBACxB,IAAI,YAAY,KAAK,IAAI,CAAC,gBAAgB,EAAE;oBAC1C,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;iBAC3E;qBAAM;oBACL,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,kEAAkE,CAAC,CAAC;iBAClG;YACH,CAAC,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,KAAK,wBAAU,EAAE;gBACpB,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC,sCAAsC,CAAC,CAAC;aAC5F;SACF;IACH,CAAC;IAEO,KAAK,CAAC,MAAM;QAClB,yCAAyC;QACzC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,OAAO,IAAI,CAAC;SACb;QAED,kBAAkB;QAClB,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACvC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxB,IAAI,QAAQ,KAAK,IAAI,CAAC,gBAAgB,EAAE;YACtC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAC1B,mDAAmD,CACpD,CAAC;SACH;QAED,mDAAmD;QACnD,0EAA0E;QAC1E,gCAAgC;QAChC,OAAM,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YACjC,IAAI,CAAC,EAAE;gBACL,MAAM,CAAC,EAAE,CAAC;aACX;SACF;QACD,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAE3C,gDAAgD;QAChD,IAAI,QAAQ,KAAK,YAAY,EAAE;YAC7B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAC1B,0DAA0D,CAC3D,CAAC;YACF,OAAO,IAAI,CAAC;SACb;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;IAEO,KAAK,CAAC,SAAS;QACrB,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;QAClE,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACtD,MAAM,IAAI,GAAG,QAAQ,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC;QACnD,IAAI;YACF,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAClC,IAAI,CAAC,OAAO,EAAE,EACd,IAAI,EACJ;gBACE,OAAO,EAAE;oBACP,cAAc,EAAE,mCAAmC;iBACpD;aACF,CACF,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,eAAK,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;gBAC7B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,kCAAkC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;aAClF;iBAAM;gBACL,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;aAC5E;SACF;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAY;QACxB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAC7B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,4DAA4D;QAC5D,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IAEO,UAAU,CAAC,IAAY;QAC7B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,IAAY,EACZ,IAAmB,EACnB,IAAmB,EACnB,UAAyB,EACzB,MAAqB,IAAI;QAEzB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAC7B,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QACH,4DAA4D;QAC5D,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAC9B,IAAY,EACZ,IAAmB,EACnB,IAAmB,EACnB,UAAyB,EACzB,MAAqB,IAAI;QAEzB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1C,qEAAqE;QACrE,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,gBAAQ,CAAC,MAAM,CAAC,CAAC;QACpF,IAAI,QAAQ,CAAC,cAAc,CAAE,CAAC,CAAC,CAAC,KAAK,gBAAQ,CAAC,MAAM,EAAE;YACpD,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CACxD,IAAI,EACJ,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CACjC,CAAC;YACF,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9D,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9D,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC7D;QACD,gCAAgC;QAChC,QAAQ,CAAC,cAAc,CAAE,CAAC,CAAC,CAAC,GAAG,gBAAQ,CAAC,MAAM,CAAC;QAC/C,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;QAC3B,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,IAAI,EAAE,CAAC;QACvC,mCAAmC;QACnC,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,IAAA,iCAAuB,EACpC,IAAI,IAAI,UAAU,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAClD,IAAI,IAAI,UAAU,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAClD,MAAM,IAAI,CAAC,QAAQ,EAAE;QACrB,6EAA6E;QAC7E,IAAI,KAAK,IAAI,CACd,CAAC;QACF,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACjD,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACjD,6BAA6B;QAC7B,IAAI,GAAG,EAAE;YACP,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;SACrC;IACH,CAAC;CACF;AAnRD,sEAmRC;AAED,MAAa,4BAA4B;IAKvC,YACqB,cAA8C,EACjD,YAAoB;QADjB,mBAAc,GAAd,cAAc,CAAgC;QACjD,iBAAY,GAAZ,YAAY,CAAQ;QAEpC,IAAI,CAAC,MAAM,GAAG,IAAI,6BAA6B,CAC7C,cAAc,EACd,YAAY,CACb,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,IAAI,6BAA6B,CAC7C,cAAc,EACd,YAAY,CACb,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,IAAI,8BAA8B,CAC/C,cAAc,EACd,YAAY,CACb,CAAC;IACJ,CAAC;CACF;AAtBD,oEAsBC"}
+{"version":3,"file":"infinityApi.js","sourceRoot":"","sources":["../src/infinityApi.ts"],"names":[],"mappings":"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"}

package/dist/platform.d.ts

@@ -1,19 +1,18 @@
 import { API, DynamicPlatformPlugin, Logger, PlatformAccessory, PlatformConfig, Service, Characteristic } from 'homebridge';
 import { InfinityEvolutionApiConnection, InfinityEvolutionSystemModel } from './infinityApi';
+import { BaseAccessory } from './accessory_base';
 export declare class CarrierInfinityHomebridgePlatform implements DynamicPlatformPlugin {
     readonly log: Logger;
     readonly config: PlatformConfig;
     readonly api: API;
     readonly Service: typeof Service;
     readonly Characteristic: typeof Characteristic;
-    readonly accessories: PlatformAccessory[];
+    readonly restored_accessories: Record<string, PlatformAccessory>;
+    readonly accessories: Record<string, BaseAccessory>;
     api_connection: InfinityEvolutionApiConnection;
     systems: Record<string, InfinityEvolutionSystemModel>;
     constructor(log: Logger, config: PlatformConfig, api: API);
     configureAccessory(accessory: PlatformAccessory): void;
-    registerAccessory(system: InfinityEvolutionSystemModel, zone: string): Promise<PlatformAccessory>;
-    registerEnvSensorAccessory(system: InfinityEvolutionSystemModel, zone: string): Promise<PlatformAccessory>;
-    registerOutdoorTempAccessory(system: InfinityEvolutionSystemModel): Promise<PlatformAccessory>;
-    discoverDevices(): Promise<void>;
+    discoverSystems(): Promise<void>;
 }
 //# sourceMappingURL=platform.d.ts.map

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,EAAc,qBAAqB,EAAE,MAAM,EAAE,iBAAiB,EAAE,cAAc,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAKxI,OAAO,EACL,8BAA8B,EAE9B,4BAA4B,EAC7B,MAAM,eAAe,CAAC;AAGvB,qBAAa,iCAAkC,YAAW,qBAAqB;aAY3D,GAAG,EAAE,MAAM;aACX,MAAM,EAAE,cAAc;aACtB,GAAG,EAAE,GAAG;IAb1B,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAwB;IAC/D,SAAgB,cAAc,EAAE,OAAO,cAAc,CAA+B;IAGpF,SAAgB,WAAW,EAAE,iBAAiB,EAAE,CAAM;IAG/C,cAAc,EAAE,8BAA8B,CAAC;IAC/C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAM;gBAGhD,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,GAAG;IAgB1B,kBAAkB,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI;IAIhD,iBAAiB,CAAC,MAAM,EAAE,4BAA4B,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAwBjG,0BAA0B,CAAC,MAAM,EAAE,4BAA4B,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAsB1G,4BAA4B,CAAC,MAAM,EAAE,4BAA4B,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAqB9F,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;CA4BvC"}
+{"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,EACL,8BAA8B,EAE9B,4BAA4B,EAC7B,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,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,cAAc,EAAE,8BAA8B,CAAC;IAC/C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAM;gBAGhD,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,GAAG;IAgB1B,kBAAkB,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI;IAIhD,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;CAoEvC"}

package/dist/platform.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CarrierInfinityHomebridgePlatform = void 0;
 const settings_1 = require("./settings");
-const platformAccessory_1 = require("./platformAccessory");
+const accessory_thermostat_1 = require("./accessory_thermostat");
 const accessory_oat_1 = require("./accessory_oat");
 const infinityApi_1 = require("./infinityApi");
 const accessory_envsensor_1 = require("./accessory_envsensor");
+const accessory_comfort_activity_1 = require("./accessory_comfort_activity");
 class CarrierInfinityHomebridgePlatform {
     constructor(log, config, api) {
         this.log = log;
@@ -14,7 +15,9 @@ class CarrierInfinityHomebridgePlatform {
         this.Service = this.api.hap.Service;
         this.Characteristic = this.api.hap.Characteristic;
         // this is used to track restored cached accessories
-        this.accessories = [];
+        this.restored_accessories = {};
+        // this is used to track plugin accessories objects
+        this.accessories = {};
         this.systems = {};
         if (!config.username || !config.password) {
             this.log.warn('Username and password do not appear to be set in config. This is not going to work.');
@@ -22,104 +25,66 @@ class CarrierInfinityHomebridgePlatform {
         this.api_connection = new infinityApi_1.InfinityEvolutionApiConnection(config['username'], config['password'], this.log);
         this.api_connection.refreshToken().then();
         this.api.on('didFinishLaunching', () => {
-            this.discoverDevices().then().catch(error => {
+            this.discoverSystems().then().catch(error => {
                 this.log.error('Could not discover devices: ' + error.message);
             });
         });
     }
     configureAccessory(accessory) {
-        this.accessories.push(accessory);
+        this.restored_accessories[accessory.UUID] = accessory;
     }
-    async registerAccessory(system, zone) {
-        this.log.info(`Discovered device serial:${system.serialNumber} zone:${zone}`);
-        let is_new = false;
-        const uuid = this.api.hap.uuid.generate(`${system.serialNumber}:${zone}`);
-        let accessory = this.accessories.find(accessory => accessory.UUID === uuid);
-        if (!accessory) {
-            const name = await system.config.getZoneName(zone);
-            this.log.info('Adding new accessory:', name);
-            accessory = new this.api.platformAccessory(name, uuid);
-            is_new = true;
-        }
-        accessory.context.serialNumber = system.serialNumber;
-        accessory.context.zone = zone;
-        accessory.context.holdBehavior = this.config['holdBehavior'];
-        accessory.context.holdArgument = this.config['holdArgument'];
-        new platformAccessory_1.InfinityEvolutionPlatformAccessory(this, accessory);
-        if (is_new) {
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
-        }
-        else {
-            this.api.updatePlatformAccessories([accessory]);
-        }
-        return accessory;
-    }
-    async registerEnvSensorAccessory(system, zone) {
-        this.log.info(`Discovered environmental sensor device serial:${system.serialNumber}`);
-        let is_new = false;
-        const uuid = this.api.hap.uuid.generate(`ENVSENSOR:${system.serialNumber}:${zone}`);
-        let accessory = this.accessories.find(accessory => accessory.UUID === uuid);
-        if (!accessory) {
-            const name = `${await system.config.getZoneName(zone)} Environmental Sensor`;
-            this.log.info('Adding new accessory: ', name);
-            accessory = new this.api.platformAccessory(name, uuid, 10 /* SENSOR */);
-            is_new = true;
-        }
-        accessory.context.serialNumber = system.serialNumber;
-        accessory.context.zone = zone;
-        new accessory_envsensor_1.EnvSensorAccessory(this, accessory);
-        if (is_new) {
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
-        }
-        else {
-            this.api.updatePlatformAccessories([accessory]);
-        }
-        return accessory;
-    }
-    async registerOutdoorTempAccessory(system) {
-        this.log.info(`Discovered outdoor temp sensor device serial:${system.serialNumber}`);
-        let is_new = false;
-        const uuid = this.api.hap.uuid.generate(`OAT:${system.serialNumber}`);
-        let accessory = this.accessories.find(accessory => accessory.UUID === uuid);
-        if (!accessory) {
-            const name = 'Outdoor Temperature';
-            this.log.info('Adding new accessory: ', name);
-            accessory = new this.api.platformAccessory(name, uuid, 10 /* SENSOR */);
-            is_new = true;
-        }
-        accessory.context.serialNumber = system.serialNumber;
-        new accessory_oat_1.OutdoorTemperatureAccessory(this, accessory);
-        if (is_new) {
-            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
-        }
-        else {
-            this.api.updatePlatformAccessories([accessory]);
-        }
-        return accessory;
-    }
-    async discoverDevices() {
+    async discoverSystems() {
         const systems = await new infinityApi_1.InfinityEvolutionLocations(this.api_connection).getSystems();
-        const accessories = [];
         for (const serialNumber of systems) {
+            // Create system api object, and save for later reference
             const system = new infinityApi_1.InfinityEvolutionSystemModel(this.api_connection, serialNumber);
-            this.systems[serialNumber] = system; // save ref for lookup by accessories
+            this.systems[serialNumber] = system;
+            // Add system based accessories
+            const context_system = { serialNumber: system.serialNumber };
+            this.log.info(`Discovered system ${JSON.stringify(context_system)}}`);
+            // -> System Accessory: Outdoor Temp Sensor
+            if (this.config['showOutdoorTemperatureSensor']) {
+                new accessory_oat_1.OutdoorTemperatureAccessory(this, { ...context_system, name: 'Outdoor Temperature' });
+            }
+            // Add system+zone based accessories
             const zones = await system.profile.getZones();
-            // TODO: messed up here. This is the zone index, not the zone id. index = id - 1
-            for (const zone in zones) {
-                accessories.push(await this.registerAccessory(system, zone));
+            for (const zone of zones) { // 'of' makes sure we go through zone ids, not index
+                const context_zone = { ...context_system, zone: zone };
+                this.log.info(`Discovered zone ${JSON.stringify(context_zone)}`);
+                // -> Zone Accessory: Thermostat
+                new accessory_thermostat_1.ThermostatAccessory(this, {
+                    ...context_zone,
+                    name: `${await system.config.getZoneName(zone)} Thermostat`,
+                    holdBehavior: this.config['holdBehavior'],
+                    holdArgument: this.config['holdArgument'],
+                });
+                // -> Zone Accessory: Env Sensor
                 if (this.config['showIndoorHumiditySensors']) {
-                    accessories.push(await this.registerEnvSensorAccessory(system, zone));
+                    new accessory_envsensor_1.EnvSensorAccessory(this, {
+                        ...context_zone,
+                        name: `${await system.config.getZoneName(zone)} 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`,
+                        holdBehavior: this.config['holdBehavior'],
+                        holdArgument: this.config['holdArgument'],
+                    });
                 }
             }
-            if (this.config['showOutdoorTemperatureSensor']) {
-                accessories.push(await this.registerOutdoorTempAccessory(system));
+        }
+        // Clean up cached accessories that were not discovered from the api
+        for (const id in this.restored_accessories) {
+            if (!this.accessories[id]) {
+                const accessory = this.restored_accessories[id];
+                this.log.info(`[${accessory.context.name}] Removed (stale)`);
+                this.api.unregisterPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+                delete this.restored_accessories[id];
             }
         }
-        const old_accessories = this.accessories.filter(accessory => !accessories.includes(accessory));
-        old_accessories.forEach(accessory => {
-            this.log.info(`Removing old device "${accessory.displayName}" (serial:${accessory.context.serialNumber} zone:${accessory.context.zone})`);
-        });
-        this.api.unregisterPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, old_accessories);
     }
 }
 exports.CarrierInfinityHomebridgePlatform = CarrierInfinityHomebridgePlatform;

package/dist/platform.js.map

@@ -1 +1 @@
-{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":";;;AAEA,yCAAwD;AACxD,2DAAyE;AACzE,mDAA8D;AAC9D,+CAIuB;AACvB,+DAA2D;AAE3D,MAAa,iCAAiC;IAW5C,YACkB,GAAW,EACX,MAAsB,EACtB,GAAQ;QAFR,QAAG,GAAH,GAAG,CAAQ;QACX,WAAM,GAAN,MAAM,CAAgB;QACtB,QAAG,GAAH,GAAG,CAAK;QAbV,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,gBAAW,GAAwB,EAAE,CAAC;QAI/C,YAAO,GAAiD,EAAE,CAAC;QAOhE,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YACxC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,qFAAqF,CAAC,CAAC;SACtG;QAED,IAAI,CAAC,cAAc,GAAG,IAAI,4CAA8B,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3G,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,CAAC;QAE1C,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;YACjE,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB,CAAC,SAA4B;QAC7C,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,MAAoC,EAAE,IAAY;QACxE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,MAAM,CAAC,YAAY,SAAS,IAAI,EAAE,CAAC,CAAC;QAC9E,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,YAAY,IAAI,IAAI,EAAE,CAAC,CAAC;QAC1E,IAAI,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAC5E,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACnD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;YAC7C,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACvD,MAAM,GAAG,IAAI,CAAC;SACf;QACD,SAAS,CAAC,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACrD,SAAS,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;QAC9B,SAAS,CAAC,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAC7D,SAAS,CAAC,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAC7D,IAAI,sDAAkC,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACxD,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,GAAG,CAAC,2BAA2B,CAAC,sBAAW,EAAE,wBAAa,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;SAC/E;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;SACjD;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,0BAA0B,CAAC,MAAoC,EAAE,IAAY;QACjF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iDAAiD,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;QACtF,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,MAAM,CAAC,YAAY,IAAI,IAAI,EAAE,CAAC,CAAC;QACpF,IAAI,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAC5E,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,uBAAuB,CAAC;YAC7E,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;YAC9C,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,kBAAoB,CAAC;YAC1E,MAAM,GAAG,IAAI,CAAC;SACf;QACD,SAAS,CAAC,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACrD,SAAS,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;QAC9B,IAAI,wCAAkB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACxC,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,GAAG,CAAC,2BAA2B,CAAC,sBAAW,EAAE,wBAAa,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;SAC/E;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;SACjD;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,4BAA4B,CAAC,MAAoC;QACrE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gDAAgD,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;QACrF,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;QACtE,IAAI,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAC5E,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAI,GAAG,qBAAqB,CAAC;YACnC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;YAC9C,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,kBAAoB,CAAC;YAC1E,MAAM,GAAG,IAAI,CAAC;SACf;QACD,SAAS,CAAC,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACrD,IAAI,2CAA2B,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACjD,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,GAAG,CAAC,2BAA2B,CAAC,sBAAW,EAAE,wBAAa,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;SAC/E;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;SACjD;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,MAAM,OAAO,GAAG,MAAM,IAAI,wCAA0B,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,UAAU,EAAE,CAAC;QACvF,MAAM,WAAW,GAAwB,EAAE,CAAC;QAC5C,KAAK,MAAM,YAAY,IAAI,OAAO,EAAE;YAClC,MAAM,MAAM,GAAG,IAAI,0CAA4B,CAAC,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;YACnF,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC,CAAE,qCAAqC;YAC3E,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YAC9C,gFAAgF;YAChF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACxB,WAAW,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;gBAC7D,IAAI,IAAI,CAAC,MAAM,CAAC,2BAA2B,CAAC,EAAE;oBAC5C,WAAW,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;iBACvE;aACF;YACD,IAAI,IAAI,CAAC,MAAM,CAAC,8BAA8B,CAAC,EAAE;gBAC/C,WAAW,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,4BAA4B,CAAC,MAAM,CAAC,CAAC,CAAC;aACnE;SACF;QACD,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAC7C,SAAS,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAC9C,CAAC;QACF,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAClC,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,wBAAwB,SAAS,CAAC,WAAW,aAAa,SAAS,CAAC,OAAO,CAAC,YAAY,SAAS,SAAS,CAAC,OAAO,CAAC,IAAI,GAAG,CAC3H,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,6BAA6B,CAAC,sBAAW,EAAE,wBAAa,EAAE,eAAe,CAAC,CAAC;IACtF,CAAC;CACF;AAjID,8EAiIC"}
+{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Homebridge Carrier Infinity",
   "name": "homebridge-carrier-infinity",
-  "version": "1.5.13",
+  "version": "1.6.0",
   "description": "Standalone homebridge plugin for Carrier Infinity / Bryant Evolution / ICP Brands Ion thermostats.",
   "license": "MIT",
   "repository": {
@@ -19,11 +19,22 @@
   "scripts": {
     "commit": "git-cz",
     "lint": "eslint src/**.ts --max-warnings=0",
-    "watch": "npm run build && npm link && nodemon",
+    "watch": "npm run build && (sudo hb-service link || true) && nodemon",
     "build": "rimraf ./dist && tsc",
     "prepublishOnly": "npm run lint && npm run build",
     "test": "jest"
   },
+  "nodemonConfig": {
+    "watch": [
+      "src"
+    ],
+    "ext": "ts",
+    "exec": "tsc && sudo hb-service restart",
+    "delay": 5000,
+    "env": {
+      "NODE_OPTIONS": "--trace-warnings"
+    }
+  },
   "keywords": [
     "homebridge-plugin",
     "homebridge",
@@ -44,12 +55,12 @@
     "xml2js": "^0.4.23"
   },
   "devDependencies": {
-    "@commitlint/cli": "^16.2.1",
-    "@commitlint/config-conventional": "^16.2.1",
-    "@commitlint/cz-commitlint": "^16.2.1",
+    "@commitlint/cli": "^17.0.3",
+    "@commitlint/config-conventional": "^17.0.3",
+    "@commitlint/cz-commitlint": "^17.0.3",
     "@semantic-release/git": "^10.0.1",
     "@types/jest": "^27.0.2",
-    "@types/node": "^17.0.21",
+    "@types/node": "^18.0.0",
     "@types/object-hash": "^2.2.0",
     "@types/xml2js": "^0.4.8",
     "@typescript-eslint/eslint-plugin": "^5.12.0",

package/dist/platformAccessory.d.ts

@@ -1,14 +0,0 @@
-import { PlatformAccessory } from 'homebridge';
-import { CarrierInfinityHomebridgePlatform } from './platform';
-export declare class InfinityEvolutionPlatformAccessory {
-    private readonly platform;
-    private readonly accessory;
-    private service;
-    private fan_service?;
-    private system_status;
-    private system_config;
-    private system_profile;
-    constructor(platform: CarrierInfinityHomebridgePlatform, accessory: PlatformAccessory);
-    setupFanService(): void;
-}
-//# sourceMappingURL=platformAccessory.d.ts.map

package/dist/platformAccessory.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"platformAccessory.d.ts","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAExD,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAe/D,qBAAa,kCAAkC;IAQ3C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAR5B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,WAAW,CAAC,CAAU;IAC9B,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,cAAc,CAAiC;gBAGpC,QAAQ,EAAE,iCAAiC,EAC3C,SAAS,EAAE,iBAAiB;IAgE/C,eAAe,IAAI,IAAI;CAexB"}

package/dist/platformAccessory.js.map

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