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

package/dist/api/models.js

@@ -15,12 +15,6 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
@@ -32,53 +26,69 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SystemModel = exports.SystemConfigModel = exports.SystemStatusModel = exports.SystemProfileModel = exports.LocationsModel = void 0;
+exports.SystemModel = exports.SystemConfigZoneModel = exports.SystemConfigModel = exports.SystemStatusZoneModel = exports.SystemStatusModel = exports.SystemProfileModel = exports.LocationsModel = void 0;
 const helpers_1 = require("../helpers");
-const typescript_memoize_1 = require("typescript-memoize");
 const async_mutex_1 = require("async-mutex");
 const xml2js = __importStar(require("xml2js"));
 const object_hash_1 = __importDefault(require("object-hash"));
 const helper_logging_1 = require("../helper_logging");
 const axios_1 = __importDefault(require("axios"));
 const constants_1 = require("./constants");
+const rxjs_1 = require("rxjs");
+const events_1 = __importDefault(require("events"));
+const helpers_2 = require("./helpers");
+const helpers_rxjs_1 = require("./helpers_rxjs");
 class BaseModel {
     constructor(infinity_client) {
         this.infinity_client = infinity_client;
+        // Raw clean api data for use inside class and in children.
+        this.clean_data$ = new rxjs_1.ReplaySubject(1);
+        // Protected form for use outside the class
+        this.data$ = this.clean_data$.asObservable();
         this.HASH_IGNORE_KEYS = new Set();
         this.log = new helper_logging_1.PrefixLogger(this.infinity_client.log, 'API');
+        this.events = new events_1.default();
         this.write_lock = new async_mutex_1.Mutex();
-    }
-    hashDataObject() {
-        return (0, object_hash_1.default)(this.data_object, { excludeKeys: (key) => {
+        // Set up the triggers for updating our api data
+        const ticks = (0, rxjs_1.merge)(
+        // Immediate Fetch
+        (0, rxjs_1.of)(1), 
+        // Periodic Fetch
+        (0, rxjs_1.interval)(5 * 60 * 1000), 
+        // On Demand Fetch
+        (0, rxjs_1.fromEvent)(this.events, 'onGet'), (0, rxjs_1.fromEvent)(this.events, 'post_push_refresh')).pipe((0, rxjs_1.throttleTime)(10000));
+        // Use these 'ticks' triggers to update the data.
+        ticks.pipe((0, rxjs_1.switchMap)(() => this.fetchObservable()), (0, rxjs_1.distinctUntilChanged)((prev, cur) => this.isUnchanged(prev, cur))).subscribe(this.clean_data$);
+    }
+    isUnchanged(x, y) {
+        return this.hash(x) === this.hash(y);
+    }
+    hash(data) {
+        return (0, object_hash_1.default)(data, { excludeKeys: (key) => {
                 return this.HASH_IGNORE_KEYS.has(key);
             } });
     }
-    async fetch() {
-        // If push is ongoing, skip this update fetch. The push will do a fetch.
-        try {
-            await (0, async_mutex_1.tryAcquire)(this.write_lock).runExclusive(async () => {
-                await this.forceFetch();
+    fetchObservable() {
+        return new rxjs_1.Observable((observer) => {
+            this.forceFetch()
+                .then((data) => {
+                observer.next(data);
+                observer.complete();
+            })
+                // An observable can never return an error, or it completes.
+                // Log errors, swallow them, and send no new value.
+                .catch((error) => {
+                this.log.error('Failed to fetch updates: ', axios_1.default.isAxiosError(error) ? error.message : error);
+                observer.complete();
             });
-        }
-        catch (e) {
-            if (e === async_mutex_1.E_ALREADY_LOCKED) {
-                return;
-            }
-            else if (e === async_mutex_1.E_TIMEOUT || e === async_mutex_1.E_CANCELED) {
-                this.log.error(`Deadlock on fetch ${e}. Report bug: https://bit.ly/3igbU7D`);
-            }
-            else {
-                this.log.error('Failed to fetch updates: ', axios_1.default.isAxiosError(e) ? e.message : e);
-            }
-        }
+        });
     }
     async forceFetch() {
         await this.infinity_client.refreshToken();
         await this.infinity_client.activate();
         const response = await this.infinity_client.axios.get(this.getPath());
         if (response.data) {
-            this.data_object = await xml2js.parseStringPromise(response.data);
-            this.data_object_hash = this.hashDataObject();
+            return await xml2js.parseStringPromise(response.data);
         }
         else {
             this.log.debug(response.data);
@@ -86,24 +96,23 @@ class BaseModel {
         }
     }
 }
-__decorate([
-    (0, typescript_memoize_1.MemoizeExpiring)(10 * 1000)
-], BaseModel.prototype, "fetch", null);
 class LocationsModel extends BaseModel {
+    constructor() {
+        super(...arguments);
+        this.system_serials = this.data$.pipe((0, rxjs_1.map)(data => {
+            const systems = [];
+            for (const location of data.locations.location) {
+                for (const system of location.systems[0].system || []) {
+                    const link_parts = system['atom:link'][0]['$']['href'].split('/');
+                    systems.push(link_parts[link_parts.length - 1]);
+                }
+            }
+            return systems;
+        }), (0, rxjs_1.distinctUntilChanged)());
+    }
     getPath() {
         return `/users/${this.infinity_client.username}/locations`;
     }
-    async getSystems() {
-        await this.fetch();
-        const systems = [];
-        for (const location of this.data_object.locations.location) {
-            for (const system of location.systems[0].system || []) {
-                const link_parts = system['atom:link'][0]['$']['href'].split('/');
-                systems.push(link_parts[link_parts.length - 1]);
-            }
-        }
-        return systems;
-    }
 }
 exports.LocationsModel = LocationsModel;
 class BaseSystemModel extends BaseModel {
@@ -112,372 +121,346 @@ class BaseSystemModel extends BaseModel {
         this.infinity_client = infinity_client;
         this.serialNumber = serialNumber;
         this.log = log;
-        this.last_updated = 0; // TODO use this
-        this.HASH_IGNORE_KEYS = new Set(['timestamp', 'localTime']);
+        // TODO: these 'last' values are problematic, since they can be race-y.
+        this.last_fetched_ts = 0;
+        this.last_fetched_hash = '';
+        this.HASH_IGNORE_KEYS = new Set(['timestamp', 'localTime', 'previousMode']);
     }
     async forceFetch() {
-        await super.forceFetch();
-        const top_level_key = Object.keys(this.data_object)[0];
-        const ts = this.data_object[top_level_key].timestamp[0];
-        this.last_updated = Date.parse(ts);
-        this.log.debug(`TIMESTAMP ${this.getPath()} reports ${ts} (${this.last_updated})`);
+        const data_object = await super.forceFetch();
+        const top_level_key = Object.keys(data_object)[0];
+        const ts = data_object[top_level_key].timestamp[0];
+        this.last_fetched_ts = Date.parse(ts);
+        this.last_fetched_hash = this.hash(data_object);
+        this.log.debug(`TIMESTAMP ${this.getPath()} reports ${ts} (${this.last_fetched_ts})`);
+        this.log.debug(`HASH ${this.getPath()} hashes to (${this.last_fetched_hash})`);
+        return data_object;
     }
 }
 class SystemProfileModel extends BaseSystemModel {
+    constructor() {
+        super(...arguments);
+        this.name = this.data$.pipe((0, rxjs_1.map)(data => data.system_profile.name[0]), (0, rxjs_1.distinctUntilChanged)());
+        this.brand = this.data$.pipe((0, rxjs_1.map)(data => data.system_profile.brand[0]), (0, rxjs_1.distinctUntilChanged)());
+        this.model = this.data$.pipe((0, rxjs_1.map)(data => data.system_profile.model[0]), (0, rxjs_1.distinctUntilChanged)());
+        this.firmware = this.data$.pipe((0, rxjs_1.map)(data => data.system_profile.firmware[0]), (0, rxjs_1.distinctUntilChanged)());
+        this.zone_ids = this.data$.pipe((0, rxjs_1.map)(data => {
+            return data.system_profile.zones[0].zone.filter((zone) => zone['present'][0] === constants_1.STATUS.ON).map((zone) => zone['$'].id);
+        }), (0, rxjs_1.distinctUntilChanged)());
+    }
     getPath() {
         return `/systems/${this.serialNumber}/profile`;
     }
-    async getName() {
-        await this.fetch();
-        return this.data_object.system_profile.name[0];
-    }
-    async getBrand() {
-        await this.fetch();
-        return this.data_object.system_profile.brand[0];
-    }
-    async getModel() {
-        await this.fetch();
-        return this.data_object.system_profile.model[0];
-    }
-    async getFirmware() {
-        await this.fetch();
-        return this.data_object.system_profile.firmware[0];
-    }
-    async getZones() {
-        await this.fetch();
-        return this.data_object.system_profile.zones[0].zone.filter((zone) => zone['present'][0] === constants_1.STATUS.ON).map((zone) => zone['$'].id);
-    }
 }
 exports.SystemProfileModel = SystemProfileModel;
 class SystemStatusModel extends BaseSystemModel {
+    constructor() {
+        super(...arguments);
+        this.outdoor_temp = this.data$.pipe((0, rxjs_1.map)(data => Number(data.status.oat[0])), (0, rxjs_1.distinctUntilChanged)());
+        this.filter_used = this.data$.pipe((0, rxjs_1.map)(data => Number(data.status.filtrlvl[0])), (0, rxjs_1.distinctUntilChanged)());
+        this.temp_units = this.data$.pipe((0, rxjs_1.map)(data => data.status.cfgem[0]), (0, rxjs_1.distinctUntilChanged)());
+        this.mode = this.data$.pipe((0, rxjs_1.map)(data => {
+            const raw_mode = data.status.mode[0];
+            switch (raw_mode) {
+                case 'gasheat':
+                case 'electric':
+                case 'hpheat':
+                    return constants_1.SYSTEM_MODE.HEAT;
+                case 'dehumidify':
+                    return constants_1.SYSTEM_MODE.COOL;
+                default:
+                    return raw_mode;
+            }
+        }), (0, rxjs_1.distinctUntilChanged)());
+        this.raw_zone_data$ = this.data$.pipe((0, rxjs_1.map)(data => data.status.zones[0].zone), (0, rxjs_1.distinctUntilChanged)());
+    }
     getPath() {
         return `/systems/${this.serialNumber}/status`;
     }
-    async getUnits() {
-        await this.fetch();
-        return this.data_object.status.cfgem[0];
-    }
-    async getOutdoorTemp() {
-        await this.fetch();
-        return Number(this.data_object.status.oat[0]);
-    }
-    async getFilterUsed() {
-        await this.fetch();
-        return Number(this.data_object.status.filtrlvl[0]);
+    getZone(zone) {
+        // TODO save SystemStatusZoneModel to dedup
+        return new SystemStatusZoneModel(this.raw_zone_data$.pipe((0, rxjs_1.map)(data => (0, helpers_2.findZoneByID)(data, zone))), this.temp_units);
     }
-    async getMode() {
-        await this.fetch();
-        const raw_mode = this.data_object.status.mode[0];
-        switch (raw_mode) {
-            case 'gasheat':
-            case 'electric':
-            case 'hpheat':
-                return constants_1.SYSTEM_MODE.HEAT;
-            case 'dehumidify':
-                return constants_1.SYSTEM_MODE.COOL;
-            default:
-                return raw_mode;
-        }
-    }
-    async getZone(zone) {
-        await this.fetch();
-        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];
-        switch (raw_mode) {
-            case 'active_heat':
-            case 'prep_heat':
-            case 'pending_heat':
-                return constants_1.SYSTEM_MODE.HEAT;
-            case 'active_cool':
-            case 'prep_cool':
-            case 'pending_cool':
-                return constants_1.SYSTEM_MODE.COOL;
-            case 'idle':
+}
+exports.SystemStatusModel = SystemStatusModel;
+class SystemStatusZoneModel {
+    constructor(zone, temp_units$) {
+        this.zone = zone;
+        this.temp_units$ = temp_units$;
+        this.mode = this.zone.pipe((0, rxjs_1.map)(zone => {
+            if (zone.damperposition[0] === '0') {
                 return constants_1.SYSTEM_MODE.OFF;
-            default:
-                return raw_mode;
-        }
-    }
-    async getZoneFan(zone) {
-        const zone_obj = await this.getZone(zone);
-        if (zone_obj.damperposition[0] === '0') {
-            return constants_1.FAN_MODE.OFF;
-        }
-        else {
-            return zone_obj.fan[0];
-        }
-    }
-    async getZoneOpen(zone) {
-        return (await this.getZone(zone)).damperposition[0] !== '0';
-    }
-    async getZoneTemp(zone) {
-        return Number((await this.getZone(zone)).rt[0]);
-    }
-    async getZoneHumidity(zone) {
-        return Number((await this.getZone(zone)).rh[0]);
-    }
-    async getZoneActivity(zone) {
-        return (await this.getZone(zone)).currentActivity[0];
-    }
-    async getZoneCoolSetpoint(zone) {
-        return Number((await this.getZone(zone)).clsp[0]);
-    }
-    async getZoneHeatSetpoint(zone) {
-        return Number((await this.getZone(zone)).htsp[0]);
+            }
+            const raw_mode = zone.zoneconditioning[0];
+            switch (raw_mode) {
+                case 'active_heat':
+                case 'prep_heat':
+                case 'pending_heat':
+                    return constants_1.SYSTEM_MODE.HEAT;
+                case 'active_cool':
+                case 'prep_cool':
+                case 'pending_cool':
+                    return constants_1.SYSTEM_MODE.COOL;
+                case 'idle':
+                    return constants_1.SYSTEM_MODE.OFF;
+                default:
+                    return raw_mode;
+            }
+        }), (0, rxjs_1.distinctUntilChanged)());
+        this.fan = this.zone.pipe((0, rxjs_1.map)(zone => {
+            if (zone.damperposition[0] === '0') {
+                return constants_1.FAN_MODE.OFF;
+            }
+            else {
+                return zone.fan[0];
+            }
+        }), (0, rxjs_1.distinctUntilChanged)());
+        this.activity = this.zone.pipe((0, rxjs_1.map)(zone => zone.currentActivity[0]), (0, rxjs_1.distinctUntilChanged)());
+        // The zone is blowing if the mode is on or the fan is on
+        this.blowing = (0, rxjs_1.combineLatest)([this.mode, this.fan]).pipe((0, rxjs_1.debounceTime)(50), (0, rxjs_1.map)(([mode, fan]) => mode !== constants_1.SYSTEM_MODE.OFF || fan !== constants_1.FAN_MODE.OFF), (0, rxjs_1.distinctUntilChanged)());
+        // This helps with some edge cases around zoned systems
+        this.closed = this.zone.pipe((0, rxjs_1.map)(zone => zone.damperposition[0] === '0'), (0, rxjs_1.distinctUntilChanged)());
+        this.temp = (0, rxjs_1.combineLatest)([this.zone, this.temp_units$]).pipe((0, rxjs_1.debounceTime)(50), (0, rxjs_1.map)(([zone, temp_units]) => [Number(zone.rt[0]), temp_units]), (0, helpers_rxjs_1.distinctUntilChangedWithEpsilon)());
+        this.cool_setpoint = (0, rxjs_1.combineLatest)([this.zone, this.temp_units$]).pipe((0, rxjs_1.debounceTime)(50), (0, rxjs_1.map)(([zone, temp_units]) => [Number(zone.clsp[0]), temp_units]), (0, helpers_rxjs_1.distinctUntilChangedWithEpsilon)());
+        this.heat_setpoint = (0, rxjs_1.combineLatest)([this.zone, this.temp_units$]).pipe((0, rxjs_1.debounceTime)(50), (0, rxjs_1.map)(([zone, temp_units]) => [Number(zone.htsp[0]), temp_units]), (0, helpers_rxjs_1.distinctUntilChangedWithEpsilon)());
+        this.humidity = this.zone.pipe((0, rxjs_1.map)(zone => Number(zone.rh[0])), (0, rxjs_1.distinctUntilChanged)());
     }
 }
-exports.SystemStatusModel = SystemStatusModel;
+exports.SystemStatusZoneModel = SystemStatusZoneModel;
 class SystemConfigModel extends BaseSystemModel {
-    constructor() {
-        super(...arguments);
-        /* Write APIs */
-        this.mutations = [];
+    constructor(infinity_client, serialNumber, log) {
+        super(infinity_client, serialNumber, log);
+        this.infinity_client = infinity_client;
+        this.serialNumber = serialNumber;
+        this.log = log;
+        // This will always hold the 'dirty' version of the config. This is what is
+        // changed by set methods.
+        this.dirty_data$ = new rxjs_1.ReplaySubject(1);
+        // This combines the clean and dirty data and is what is used by api observers.
+        this.data$ = (0, rxjs_1.merge)(this.clean_data$.pipe(
+        // When a push is active, do not pass clean data unless it is from after
+        // the push.
+        // TODO add an OR to allow if the clean data matches the last dirty
+        (0, rxjs_1.filter)((data) => Date.parse(data.config.timestamp[0]) >= this.last_pushed_ts)), this.dirty_data$);
+        // Indicates the local data$ has been modified, and clean_data$ should only be
+        // used after if it is from after this time.
+        this.last_pushed_ts = 0;
+        this.mode = this.data$.pipe((0, rxjs_1.map)(data => data.config.mode[0]), (0, rxjs_1.distinctUntilChanged)());
+        this.temp_units = this.data$.pipe((0, rxjs_1.map)(data => data.config.cfgem[0]), (0, rxjs_1.distinctUntilChanged)());
+        this.temp_bounds = this.data$.pipe((0, rxjs_1.map)(data => [
+            [Number(data.config.utilityEvent[0].minLimit[0]), data.config.cfgem[0]],
+            [Number(data.config.utilityEvent[0].maxLimit[0]), data.config.cfgem[0]],
+        ]), (0, rxjs_1.distinctUntilChanged)());
+        this.raw_zone_data$ = this.data$.pipe((0, rxjs_1.map)(data => data.config.zones[0].zone), (0, rxjs_1.distinctUntilChanged)());
+        // Send changes from the dirty Subject back to the carrier api.
+        this.dirty_data$.pipe(
+        // Wait x seconds after last change before sending.
+        (0, rxjs_1.debounceTime)(3 * 1000)).subscribe(async (data) => this.push(data));
+        this.clean_data$.subscribe(() => this.log.debug('New config data observed from api'));
+        this.dirty_data$.subscribe(() => this.log.debug('New config data observed from local'));
+        this.data$.subscribe(() => this.log.debug('Propagating new config data to HK...'));
     }
     getPath() {
         return `/systems/${this.serialNumber}/config`;
     }
-    async getUnits() {
-        await this.fetch();
-        return this.data_object.config.cfgem[0];
-    }
-    async getTempBounds() {
-        await this.fetch();
-        const utility_events = this.data_object.config.utilityEvent[0];
-        return [Number(utility_events.minLimit[0]), Number(utility_events.maxLimit[0])];
-    }
-    async getMode() {
-        await this.fetch();
-        return this.data_object.config.mode[0];
+    getZone(zone) {
+        // TODO save SystemConfigZoneModel to dedup
+        return new SystemConfigZoneModel(this.raw_zone_data$.pipe((0, rxjs_1.map)(data => (0, helpers_2.findZoneByID)(data, zone))), this.temp_units);
     }
-    async getZone(zone) {
-        await this.fetch();
-        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] === constants_1.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] === constants_1.STATUS.ON).reverse();
-            for (const i in today_schedule) {
-                const time = today_schedule[i].time[0];
-                const split = time.split(':');
-                if (
-                // The hour is past
-                Number(split[0]) < now.getHours() ||
-                    // The hour is now, the minute is past
-                    (Number(split[0]) === now.getHours() && Number(split[1]) < now.getMinutes())) {
-                    return today_schedule[i].activity[0];
-                }
-            }
-            // 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] === constants_1.STATUS.ON).reverse();
-            return yesterday_schedule[0].activity[0];
-        }
-    }
-    async getZoneActivityConfig(zone, activity_name) {
-        await this.fetch();
-        // Vacation is stored somewhere else...
-        if (activity_name === constants_1.ACTIVITY.VACATION) {
-            return {
-                '$': { id: constants_1.ACTIVITY.VACATION },
-                clsp: this.data_object.config.vacmaxt,
-                htsp: this.data_object.config.vacmint,
-                fan: this.data_object.config.vacfan,
-                previousFan: [],
-            };
-        }
-        const activities_obj = (await this.getZone(zone)).activities[0];
-        return activities_obj['activity'].find((activity) => activity['$'].id === activity_name);
-    }
-    async getZoneActivityFan(zone, activity) {
-        const activity_obj = await this.getZoneActivityConfig(zone, activity);
-        return activity_obj.fan[0];
-    }
-    async getZoneActivityCoolSetpoint(zone, activity) {
-        const activity_obj = await this.getZoneActivityConfig(zone, activity);
-        return Number(activity_obj.clsp[0]);
-    }
-    async getZoneActivityHeatSetpoint(zone, activity) {
-        const activity_obj = await this.getZoneActivityConfig(zone, activity);
-        return Number(activity_obj.htsp[0]);
-    }
-    async getZoneNextActivityTime(zone) {
+    /* Write APIs */
+    async push(data) {
+        this.log.info('Start pushing changes to carrier api...');
+        // Pause clean data use until we see an update from after now.
         const now = new Date();
-        const program_obj = (await this.getZone(zone)).program[0];
-        const day_obj = program_obj['day'][now.getDay()];
-        for (const i in day_obj['period']) {
-            const time = day_obj['period'][i].time[0];
-            const split = time.split(':');
-            if (
-            // The hour is nigh
-            Number(split[0]) > now.getHours() ||
-                // The hour is now, the minute is nigh
-                (Number(split[0]) === now.getHours() && Number(split[1]) > now.getMinutes())) {
-                return time;
-            }
-        }
-        // If we got to the end without finding the next activity, it means the next activity is the first from tomorrow
-        const tomorrow_obj = program_obj['day'][(now.getDay() + 1) % 7];
-        return tomorrow_obj['period'][0].time[0];
-    }
-    async push() {
-        // Wait a bit so we can catch other mutations that came in around the
-        // same time.
-        await new Promise(r => setTimeout(r, 2000));
-        // We only ever need 2 pushes ongoing at a time. One active, and one pending.
-        // The first one will handle mutations available at its start, and the next
-        // one will cover mutations that arrived during the previous's run.
-        // First, to make sure we only ever have one 'pending' push, cancel any other
-        // possible 'pending' pushes, and make this one become the 'pending' push.
-        this.write_lock.cancel();
-        // Then, grab the lock. so this push can move from 'pending' to 'active'.
-        try {
-            await this.write_lock.runExclusive(async () => {
-                // 1. Do mutations
-                const mutated_hash = await this.mutate();
-                if (mutated_hash === null) {
-                    return;
-                }
-                // 2. Push
-                await this.forcePush();
-                this.log.info('... pushing changes complete.');
-                // 3. Confirm
-                await new Promise(r => setTimeout(r, 5000));
-                await this.forceFetch();
-                if (mutated_hash === this.data_object_hash) {
-                    this.log.debug('Successful propagation to carrier api is confirmed.');
-                }
-                else {
-                    this.log.warn('Changes do not (yet?) appear to have propagated to the carrier api.');
-                }
-            });
-        }
-        catch (e) {
-            if (e === async_mutex_1.E_CANCELED) {
-                return;
-            }
-            else if (e === async_mutex_1.E_TIMEOUT || e === async_mutex_1.E_ALREADY_LOCKED) {
-                this.log.error(`Deadlock on push ${e}. Report bug: https://bit.ly/3igbU7D`);
-            }
-            else {
-                this.log.error('Failed to push updates: ', axios_1.default.isAxiosError(e) ? e.message : e);
-            }
-        }
-    }
-    async mutate() {
-        // short circuit if no mutations in queue
-        if (this.mutations.length === 0) {
-            return null;
-        }
-        // Refresh config.
-        const old_hash = this.data_object_hash;
-        await this.forceFetch();
-        if (old_hash !== this.data_object_hash) {
-            this.log.warn('Cached config was stale before mutation and push.');
-        }
-        // Take config mutations of the queue and run them.
-        // TODO make mutations non-async. these need to happen in order. and async
-        // in a loop is an anti-pattern.
-        while (this.mutations.length > 0) {
-            const m = this.mutations.shift();
-            if (m) {
-                await m();
-            }
-        }
-        const mutated_hash = this.hashDataObject();
+        this.last_pushed_ts = now.valueOf();
         // If nothing actually changed, no need to push.
-        if (old_hash === mutated_hash) {
-            this.log.warn('Config doesn\'t appear to have changed. No changes sent.');
-            return null;
+        const dirty_hash = this.hash(data);
+        // TODO add back in this check
+        // if (this.last_fetched_hash === dirty_hash) {
+        //   this.log.warn(`Config (hash=${dirty_hash}) doesn't appear to have changed. No changes sent.`);
+        //   this.last_pushed_ts = 0;  // revert to clean config
+        //   return;
+        // }
+        // Make sure the config base revision is not outdated
+        // TODO explicitly track and check base rev of dirty
+        // TODO use old config directly, instead of these vars?
+        // TODO make this just check that fields we dont play with haven't changed
+        // aka hash not changed minus things we modify
+        const prev_last_fetched_hash = this.last_fetched_hash;
+        const prev_last_fetched_ts = this.last_fetched_ts;
+        const new_clean_data = await this.forceFetch();
+        if (this.last_fetched_hash !== prev_last_fetched_hash ||
+            this.last_fetched_ts !== prev_last_fetched_ts) {
+            this.log.error('Aborting Push: API shows a newer, modified config.');
+            this.last_pushed_ts = 0; // revert to clean config
+            this.clean_data$.next(new_clean_data); // share new config
+            return;
         }
-        return mutated_hash;
+        // Send the update
+        await this.forcePush(data);
+        // Wait for a bit, and confirm if we see the api update on the server
+        this.clean_data$.pipe(
+        // Check for the next x seconds
+        (0, rxjs_1.timeout)(15 * 1000), 
+        // Stop looking when we see the first successful update appear
+        (0, rxjs_1.filter)((new_clean_data) => dirty_hash === this.hash(new_clean_data)), (0, rxjs_1.take)(1)).subscribe({
+            next: (data) => {
+                this.log.info(`Successful propagation to carrier api is confirmed for ${this.hash(data)}`);
+                this.events.emit('post_push_refresh');
+            },
+            // As a fail-safe, revert to clean config if update failed
+            error: () => {
+                this.log.error('Changes do not (yet?) appear to have propagated to the carrier api.');
+                this.last_pushed_ts = 0; // revert to clean config
+                this.events.emit('post_push_refresh');
+            },
+        });
+        // Poll for updates for the verification above
+        this.events.emit('post_push_refresh');
     }
-    async forcePush() {
-        this.log.info('Pushing changes to carrier api...');
+    async forcePush(data) {
+        this.log.info('... sending changes to carrier api...');
         const builder = new xml2js.Builder();
-        const new_xml = builder.buildObject(this.data_object);
-        const data = `data=${encodeURIComponent(new_xml)}`;
-        await this.infinity_client.axios.post(this.getPath(), data, {
+        const new_xml = builder.buildObject(data);
+        const post_data = `data=${encodeURIComponent(new_xml)}`;
+        await this.infinity_client.axios.post(this.getPath(), post_data, {
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded',
             },
         });
+        this.log.debug(`TIMESTAMP UPDATED CONFIG reports ${data.config.timestamp[0]} (${this.last_pushed_ts})`);
+        this.log.debug(`HASH UPDATED CONFIG hashes to (${this.hash(data)})`);
+        this.log.info('... done sending changes to carrier api.');
     }
     async setMode(mode) {
-        this.mutations.push(async () => {
-            this.mutateMode(mode);
-        });
-        // Schedule the push event, but don't wait for it to return.
-        this.push();
-    }
-    mutateMode(mode) {
         this.log.debug('Setting mode to ' + mode);
-        this.data_object.config.mode[0] = mode;
+        const data = await (0, rxjs_1.firstValueFrom)(this.data$);
+        data.config.mode[0] = mode;
+        this.dirty_data$.next(data);
     }
     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) {
         this.log.debug(`Setting zone ${zone} activity to ${activity} until ${hold_until}`);
-        const zone_obj = await this.getZone(zone);
+        // Get data from zone object and make changes
+        const data = await (0, rxjs_1.firstValueFrom)(this.data$);
+        const zone_obj = (0, helpers_2.findZoneByID)(data.config.zones[0].zone, zone);
         zone_obj['holdActivity'][0] = activity;
         zone_obj['hold'][0] = activity ? constants_1.STATUS.ON : constants_1.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.mutateZoneActivityHold(zone, constants_1.ACTIVITY.MANUAL, hold_until);
-        });
-        // Schedule the push event, but don't wait for it to return.
-        this.push();
-    }
-    async mutateZoneActivityManualHold(zone, clsp, htsp, fan = null) {
-        this.log.debug(`Setting zone ${zone} to`, clsp ? `clsp=${clsp}` : '', htsp ? `htsp=${htsp}` : '', fan ? `fan=${fan}` : '', '.');
-        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, constants_1.ACTIVITY.MANUAL);
-        if (zone_obj['holdActivity'][0] !== constants_1.ACTIVITY.MANUAL) {
-            const prev_activity_obj = await this.getZoneActivityConfig(zone, await this.getZoneActivity(zone));
+        // Push changes
+        this.dirty_data$.next(data);
+    }
+    // This makes the manual activity match another named activity. This is useful
+    // before switching to the manual activity to make sure only the setpoint you
+    // intend to change is changed.
+    async setZoneActivityManualSync(zone, sync_from_activity_name) {
+        // Get data from zone / activity
+        const data = await (0, rxjs_1.firstValueFrom)(this.data$);
+        const zone_obj = (0, helpers_2.findZoneByID)(data.config.zones[0].zone, zone);
+        const manual_activity_obj = (0, helpers_2.getZoneActivityConfig)(data, zone, constants_1.ACTIVITY.MANUAL);
+        // Modify MANUAL activity to match current activity, but only if we have
+        // not already made the switch to manual.
+        if (sync_from_activity_name &&
+            sync_from_activity_name !== constants_1.ACTIVITY.MANUAL &&
+            zone_obj.holdActivity[0] !== constants_1.ACTIVITY.MANUAL) {
+            const prev_activity_obj = (0, helpers_2.getZoneActivityConfig)(data, zone, sync_from_activity_name);
             manual_activity_obj['clsp'][0] = prev_activity_obj['clsp'][0];
             manual_activity_obj['htsp'][0] = prev_activity_obj['htsp'][0];
             manual_activity_obj['fan'][0] = prev_activity_obj['fan'][0];
+            // Push changes
+            this.dirty_data$.next(data);
         }
+    }
+    async setZoneActivityManualSetpoints(zone, clsp, htsp) {
+        this.log.debug(`Setting zone ${zone} to`, clsp ? `clsp=${clsp}` : '', htsp ? `htsp=${htsp}` : '', '.');
+        // Get data from zone / activity
+        const data = await (0, rxjs_1.firstValueFrom)(this.data$);
+        const manual_activity_obj = (0, helpers_2.getZoneActivityConfig)(data, zone, constants_1.ACTIVITY.MANUAL);
         // 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(), 
+        [htsp, clsp] = (0, helpers_1.processSetpointDeadband)(htsp || parseFloat(manual_activity_obj['htsp'][0]), clsp || parseFloat(manual_activity_obj['clsp'][0]), data.config.cfgem[0], 
+        // TODO: rethink setpoint deadband
         // when setpoints are too close, make clsp sticky when no change made to htsp
         htsp === null);
         manual_activity_obj['htsp'][0] = htsp.toFixed(1);
         manual_activity_obj['clsp'][0] = clsp.toFixed(1);
-        // Set fan on manual activity
-        if (fan) {
-            manual_activity_obj['fan'][0] = fan;
-        }
+        // Push changes
+        this.dirty_data$.next(data);
+    }
+    async setZoneActivityManualFan(zone, fan) {
+        this.log.debug(`Setting zone ${zone} to fan=${fan}.`);
+        // Get data from zone / activity
+        const data = await (0, rxjs_1.firstValueFrom)(this.data$);
+        const manual_activity_obj = (0, helpers_2.getZoneActivityConfig)(data, zone, constants_1.ACTIVITY.MANUAL);
+        manual_activity_obj['fan'][0] = fan;
+        // Push changes
+        this.dirty_data$.next(data);
     }
 }
 exports.SystemConfigModel = SystemConfigModel;
+class SystemConfigZoneModel {
+    constructor(zone, temp_units$) {
+        this.zone = zone;
+        this.temp_units$ = temp_units$;
+        this.name = this.zone.pipe((0, rxjs_1.map)(zone => zone.name[0]), (0, rxjs_1.distinctUntilChanged)());
+        this.hold_status = this.zone.pipe((0, rxjs_1.map)(zone => [zone.hold[0], zone.otmr[0]]), (0, rxjs_1.distinctUntilChanged)());
+        // TODO Add a unit test to this
+        this.activity = this.zone.pipe((0, rxjs_1.map)(zone => {
+            if (zone.hold[0] === constants_1.STATUS.ON) {
+                return zone.holdActivity[0];
+            }
+            else {
+                const now = new Date();
+                const program_obj = zone.program[0];
+                const today_schedule = program_obj.day[now.getDay()].period.filter(period => period.enabled[0] === constants_1.STATUS.ON).reverse();
+                for (const i in today_schedule) {
+                    const time = today_schedule[i].time[0];
+                    const split = time.split(':');
+                    if (
+                    // The hour is past
+                    Number(split[0]) < now.getHours() ||
+                        // The hour is now, the minute is past
+                        (Number(split[0]) === now.getHours() && Number(split[1]) < now.getMinutes())) {
+                        return today_schedule[i].activity[0];
+                    }
+                }
+                // 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] === constants_1.STATUS.ON).reverse();
+                return yesterday_schedule[0].activity[0];
+            }
+        }), (0, rxjs_1.distinctUntilChanged)());
+        // TODO this could be made better, and more similar to above.
+        // maybe merge into one fxn?
+        // TODO: this doesnt seem to work right, add tests
+        this.next_activity_time = this.zone.pipe((0, rxjs_1.map)(zone => {
+            const now = new Date();
+            const program_obj = zone.program[0];
+            const day_obj = program_obj['day'][now.getDay()];
+            for (const i in day_obj['period']) {
+                const time = day_obj['period'][i].time[0];
+                const split = time.split(':');
+                if (
+                // The hour is nigh
+                Number(split[0]) > now.getHours() ||
+                    // The hour is now, the minute is nigh
+                    (Number(split[0]) === now.getHours() && Number(split[1]) > now.getMinutes())) {
+                    return time;
+                }
+            }
+            // If we got to the end without finding the next activity, it means the next activity is the first from tomorrow
+            const tomorrow_obj = program_obj['day'][(now.getDay() + 1) % 7];
+            return tomorrow_obj['period'][0].time[0];
+        }), (0, rxjs_1.distinctUntilChanged)());
+        this.current_activity_config$ = (0, rxjs_1.combineLatest)([
+            this.zone,
+            this.activity
+        ]).pipe((0, rxjs_1.debounceTime)(50), (0, rxjs_1.map)(([zone, activity_name]) => {
+            return zone.activities[0].activity.find((a) => a['$'].id === activity_name);
+        }), (0, rxjs_1.distinctUntilChanged)());
+        this.fan = this.current_activity_config$.pipe((0, rxjs_1.map)(activity => activity.fan[0]), (0, rxjs_1.distinctUntilChanged)());
+        this.cool_setpoint = (0, rxjs_1.combineLatest)([this.current_activity_config$, this.temp_units$]).pipe((0, rxjs_1.debounceTime)(50), (0, rxjs_1.map)(([activity, temp_units]) => [Number(activity.clsp[0]), temp_units]), (0, helpers_rxjs_1.distinctUntilChangedWithEpsilon)());
+        this.heat_setpoint = (0, rxjs_1.combineLatest)([this.current_activity_config$, this.temp_units$]).pipe((0, rxjs_1.debounceTime)(50), (0, rxjs_1.map)(([activity, temp_units]) => [Number(activity.htsp[0]), temp_units]), (0, helpers_rxjs_1.distinctUntilChangedWithEpsilon)());
+    }
+}
+exports.SystemConfigZoneModel = SystemConfigZoneModel;
 class SystemModel {
     constructor(infinity_client, serialNumber) {
         this.infinity_client = infinity_client;
@@ -488,6 +471,19 @@ class SystemModel {
         this.config = new SystemConfigModel(infinity_client, serialNumber, api_logger);
         this.profile = new SystemProfileModel(infinity_client, serialNumber, api_logger);
     }
+    getZoneActivity(zone) {
+        return (0, rxjs_1.combineLatest)([
+            this.status.getZone(zone).activity,
+            this.config.getZone(zone).activity,
+        ]).pipe((0, rxjs_1.debounceTime)(50), (0, rxjs_1.map)(([s_activity, c_activity]) => {
+            // Vacation scheduling is weird, and changes infrequently. Just get it from status.
+            if (s_activity === constants_1.ACTIVITY.VACATION) {
+                return constants_1.ACTIVITY.VACATION;
+            }
+            // Config has more up to date activity settings.
+            return c_activity;
+        }), (0, rxjs_1.distinctUntilChanged)());
+    }
 }
 exports.SystemModel = SystemModel;
 //# sourceMappingURL=models.js.map