homebridge-carrier-infinity 1.6.7 → 1.6.8

package/dist/api/interface_status.d.ts

@@ -0,0 +1,90 @@
+export default interface RootObject {
+    status: Status;
+}
+export interface Status {
+    '$': _;
+    'atom:link': Atomlink[];
+    timestamp: string[];
+    pingRate: string[];
+    iduStatusPingRate: string[];
+    iduFaultsPingRate: string[];
+    oduStatusPingRate: string[];
+    oduFaultsPingRate: string[];
+    historyPingRate: string[];
+    equipEventsPingRate: string[];
+    rootCausePingRate: string[];
+    serverHasChanges: string[];
+    configHasChanges: string[];
+    dealerHasChanges: string[];
+    dealerLogoHasChanges: string[];
+    oduConfigHasChanges: string[];
+    iduConfigHasChanges: string[];
+    utilityEventsHasChanges: string[];
+    sensorConfigHasChanges: string[];
+    sensorProfileHasChanges: string[];
+    sensorDiagnosticHasChanges: string[];
+    name: string[];
+    oat: string[];
+    mode: string[];
+    cfgem: string[];
+    cfgtype: string[];
+    vacatrunning: string[];
+    filtrlvl: string[];
+    uvlvl: string[];
+    humlvl: string[];
+    ventlvl: string[];
+    humid: string[];
+    vent: string[];
+    localTime: string[];
+    oprstsmsg: string[];
+    isDisconnected: string[];
+    idu: Idu[];
+    odu: Odu[];
+    isActive: string[];
+    zones: Zone2[];
+}
+export interface Zone2 {
+    zone: Zone[];
+}
+export interface Zone {
+    '$': _3;
+    name: string[];
+    enabled: string[];
+    currentActivity: string[];
+    rt: string[];
+    rh: string[];
+    fan: string[];
+    hold: string[];
+    htsp: string[];
+    clsp: string[];
+    otmr: string[];
+    zoneconditioning: string[];
+    damperposition: string[];
+    occupancy: string[];
+    occupancyOverride: string[];
+}
+export interface _3 {
+    id: string;
+}
+export interface Odu {
+    type: string[];
+    opstat: string[];
+    opmode: string[];
+}
+export interface Idu {
+    type: string[];
+    opstat: string[];
+    cfm: string[];
+}
+export interface Atomlink {
+    '$': _2;
+}
+export interface _2 {
+    rel: string;
+    href: string;
+}
+export interface _ {
+    'xmlns:atom': string;
+    version: string;
+}
+//# sourceMappingURL=interface_status.d.ts.map

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

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

package/dist/api/interface_status.js

@@ -0,0 +1,5 @@
+"use strict";
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable spellcheck/spell-checker */
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=interface_status.js.map

package/dist/api/interface_status.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"interface_status.js","sourceRoot":"","sources":["../../src/api/interface_status.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,6CAA6C"}

package/dist/{infinityApi.d.ts → api/models.d.ts}

@@ -1,70 +1,39 @@
-import { AxiosInstance } from 'axios';
 import { Mutex } from 'async-mutex';
 import { Logger } from 'homebridge';
-export declare const SYSTEM_MODE: {
-    OFF: string;
-    COOL: string;
-    HEAT: string;
-    AUTO: string;
-    FAN_ONLY: string;
-};
-export declare const ACTIVITY: {
-    HOME: string;
-    AWAY: string;
-    SLEEP: string;
-    WAKE: string;
-    MANUAL: string;
-    VACATION: string;
-};
-export declare const FAN_MODE: {
-    OFF: string;
-    LOW: string;
-    MED: string;
-    HIGH: string;
-};
-export declare const STATUS: {
-    ON: string;
-    OFF: string;
-};
-export declare class InfinityEvolutionApiConnection {
-    username: string;
-    private password;
-    readonly log: Logger;
-    private token;
-    axios: AxiosInstance;
-    constructor(username: string, password: string, log: Logger);
-    activate(): Promise<void>;
-    forceActivate(): Promise<void>;
-    refreshToken(): Promise<void>;
-    forceRefreshToken(): Promise<void>;
-}
-declare abstract class BaseInfinityEvolutionApiModel {
-    protected readonly api_connection: InfinityEvolutionApiConnection;
-    protected data_object: any;
+import { InfinityRestClient } from './rest_client';
+import Config from './interface_config';
+import Location from './interface_locations';
+import Profile from './interface_profile';
+import Status from './interface_status';
+declare abstract class BaseModel {
+    protected readonly infinity_client: InfinityRestClient;
+    protected data_object: object;
     protected data_object_hash?: string;
     protected HASH_IGNORE_KEYS: Set<string>;
     protected write_lock: Mutex;
     protected log: Logger;
-    constructor(api_connection: InfinityEvolutionApiConnection);
+    constructor(infinity_client: InfinityRestClient);
     abstract getPath(): string;
     protected hashDataObject(): string;
     fetch(): Promise<void>;
     protected forceFetch(): Promise<void>;
 }
-export declare class InfinityEvolutionLocations extends BaseInfinityEvolutionApiModel {
+export declare class LocationsModel extends BaseModel {
+    protected data_object: Location;
     getPath(): string;
     getSystems(): Promise<string[]>;
 }
-declare abstract class BaseInfinityEvolutionSystemApiModel extends BaseInfinityEvolutionApiModel {
-    protected readonly api_connection: InfinityEvolutionApiConnection;
+declare abstract class BaseSystemModel extends BaseModel {
+    protected readonly infinity_client: InfinityRestClient;
     readonly serialNumber: string;
     protected readonly log: Logger;
     private last_updated;
     protected HASH_IGNORE_KEYS: Set<string>;
-    constructor(api_connection: InfinityEvolutionApiConnection, serialNumber: string, log: Logger);
+    constructor(infinity_client: InfinityRestClient, serialNumber: string, log: Logger);
     protected forceFetch(): Promise<void>;
 }
-export declare class InfinityEvolutionSystemProfile extends BaseInfinityEvolutionSystemApiModel {
+export declare class SystemProfileModel extends BaseSystemModel {
+    protected data_object: Profile;
     getPath(): string;
     getName(): Promise<string>;
     getBrand(): Promise<string>;
@@ -72,7 +41,8 @@ export declare class InfinityEvolutionSystemProfile extends BaseInfinityEvolutio
     getFirmware(): Promise<string>;
     getZones(): Promise<Array<string>>;
 }
-export declare class InfinityEvolutionSystemStatus extends BaseInfinityEvolutionSystemApiModel {
+export declare class SystemStatusModel extends BaseSystemModel {
+    protected data_object: Status;
     getPath(): string;
     getUnits(): Promise<string>;
     getOutdoorTemp(): Promise<number>;
@@ -88,7 +58,8 @@ export declare class InfinityEvolutionSystemStatus extends BaseInfinityEvolution
     getZoneCoolSetpoint(zone: string): Promise<number>;
     getZoneHeatSetpoint(zone: string): Promise<number>;
 }
-export declare class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel {
+export declare class SystemConfigModel extends BaseSystemModel {
+    protected data_object: Config;
     getPath(): string;
     getUnits(): Promise<string>;
     getTempBounds(): Promise<[number, number]>;
@@ -113,14 +84,14 @@ export declare class InfinityEvolutionSystemConfig extends BaseInfinityEvolution
     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;
+export declare class SystemModel {
+    protected readonly infinity_client: InfinityRestClient;
     readonly serialNumber: string;
-    status: InfinityEvolutionSystemStatus;
-    config: InfinityEvolutionSystemConfig;
-    profile: InfinityEvolutionSystemProfile;
+    status: SystemStatusModel;
+    config: SystemConfigModel;
+    profile: SystemProfileModel;
     log: Logger;
-    constructor(api_connection: InfinityEvolutionApiConnection, serialNumber: string);
+    constructor(infinity_client: InfinityRestClient, serialNumber: string);
 }
 export {};
-//# sourceMappingURL=infinityApi.d.ts.map
+//# sourceMappingURL=models.d.ts.map

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

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

package/dist/{infinityApi.js → api/models.js}

@@ -32,183 +32,20 @@ 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.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"));
-const oauth_signature_1 = __importDefault(require("oauth-signature"));
+exports.SystemModel = exports.SystemConfigModel = 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");
-exports.SYSTEM_MODE = {
-    OFF: 'off',
-    COOL: 'cool',
-    HEAT: 'heat',
-    AUTO: 'auto',
-    FAN_ONLY: 'fanonly',
-};
-exports.ACTIVITY = {
-    HOME: 'home',
-    AWAY: 'away',
-    SLEEP: 'sleep',
-    WAKE: 'wake',
-    MANUAL: 'manual',
-    VACATION: 'vacation',
-};
-exports.FAN_MODE = {
-    OFF: 'off',
-    LOW: 'low',
-    MED: 'med',
-    HIGH: 'high',
-};
-exports.STATUS = {
-    ON: 'on',
-    OFF: 'off',
-};
-class OAuthHeaders {
-    static genHeader(httpMethod, url, username, token, data) {
-        // Needed for header and sig
-        const sig_header_params = {
-            oauth_consumer_key: settings_1.INFINITY_API_CONSUMER_KEY,
-            oauth_token: username,
-            oauth_signature_method: 'HMAC-SHA1',
-            oauth_timestamp: Math.floor(Date.now() / 1000),
-            // TODO: make nonce bigger
-            oauth_nonce: Math.floor(Math.random() * 100000000000) + 1,
-            oauth_version: '1.0',
-        };
-        // If there is post data, we need to include it
-        const sig_body_params = {};
-        if (data) {
-            const pairs = data.split('&');
-            for (const i in pairs) {
-                const pair = pairs[i].split('=');
-                sig_body_params[pair[0]] = decodeURIComponent(pair[1]);
-            }
-        }
-        const sig_params = Object.assign({}, sig_header_params, sig_body_params);
-        // Make the sig
-        const signature = oauth_signature_1.default.generate(httpMethod, url, sig_params, settings_1.INFINITY_API_CONSUMER_SECRET, token);
-        // Turn into header
-        const header_params = [
-            `realm=${encodeURIComponent(url)}`,
-        ];
-        for (const k in sig_header_params) {
-            header_params.push(`${k}=${sig_params[k]}`);
-        }
-        header_params.push(`oauth_signature=${signature}`);
-        return `OAuth ${header_params.join(',')}`;
-    }
-    static intercept(config, username, token) {
-        if (config.headers === undefined) {
-            config.headers = {};
-        }
-        config.headers.Authorization = this.genHeader(config.method || 'GET', config.url || '/', username, token, config.data);
-        return config;
-    }
-}
-class InfinityEvolutionApiConnection {
-    constructor(username, password, log) {
-        this.username = username;
-        this.password = password;
-        this.log = log;
-        this.token = '';
-        this.axios = axios_1.default.create({
-            baseURL: settings_1.INFINITY_API_BASE_URL,
-            headers: {
-                featureset: 'CONSUMER_PORTAL',
-                Accept: 'application/xml',
-            },
-        });
-        // Axios debug logging and error handling
-        this.axios.interceptors.response.use(
-        // Success
-        response => {
-            var _a, _b;
-            this.log.debug(`${(_a = response.request) === null || _a === void 0 ? void 0 : _a.method} ${response.request.host}${(_b = response.request) === null || _b === void 0 ? void 0 : _b.path}`, `${response.status} ${response.statusText}`);
-            return response;
-        }, 
-        // Failure
-        error => {
-            var _a, _b, _c, _d, _e;
-            if (axios_1.default.isAxiosError(error)) {
-                this.log.debug(`${(_a = error.request) === null || _a === void 0 ? void 0 : _a.method} ${(_b = error.request) === null || _b === void 0 ? void 0 : _b.host}${(_c = error.request) === null || _c === void 0 ? void 0 : _c.path}`, `${(_d = error.response) === null || _d === void 0 ? void 0 : _d.status} ${(_e = error.response) === null || _e === void 0 ? void 0 : _e.statusText}`);
-            }
-            return Promise.reject(error); // this makes http errors raise
-        });
-        // Oauth header add
-        this.axios.interceptors.request.use(config => {
-            return OAuthHeaders.intercept(config, this.username, this.token);
-        });
-    }
-    // Api seems to expect this every min or so. more frequent doesn't seem to
-    // make any difference.
-    async activate() {
-        try {
-            await this.forceActivate();
-        }
-        catch (error) {
-            this.log.error('[API] Failure sending activation signal: ', axios_1.default.isAxiosError(error) ? error.message : error);
-        }
-    }
-    async forceActivate() {
-        await this.axios.post(`/users/${this.username}/activateSystems`, null, {
-            headers: {
-                Accept: 'application/json',
-            },
-        });
-    }
-    async refreshToken() {
-        try {
-            await this.forceRefreshToken();
-        }
-        catch (error) {
-            this.log.error('[API] Could not refresh access token: ', axios_1.default.isAxiosError(error) ? error.message : error);
-        }
-    }
-    // TODO: on some api errors, force a refresh
-    async forceRefreshToken() {
-        var _a;
-        const builder = new xml2js.Builder({ cdata: true, headless: true });
-        const new_xml = builder.buildObject({
-            credentials: {
-                username: this.username,
-                password: this.password,
-            },
-        });
-        const data = `data=${encodeURIComponent(new_xml)}`;
-        const response = await this.axios.post('/users/authenticated', data, {
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
-                Accept: 'application/json',
-            },
-        });
-        if ((_a = response.data.result) === null || _a === void 0 ? void 0 : _a.accessToken) {
-            this.token = response.data.result.accessToken;
-        }
-        else {
-            this.log.debug(response.data);
-            throw new Error('User authentication error.');
-        }
-    }
-}
-__decorate([
-    (0, typescript_memoize_1.MemoizeExpiring)(1 * 60 * 1000)
-], InfinityEvolutionApiConnection.prototype, "activate", null);
-__decorate([
-    (0, typescript_memoize_1.MemoizeExpiring)(24 * 60 * 60 * 1000) // every 24 hrs
-], InfinityEvolutionApiConnection.prototype, "refreshToken", null);
-exports.InfinityEvolutionApiConnection = InfinityEvolutionApiConnection;
-class BaseInfinityEvolutionApiModel {
-    constructor(api_connection) {
-        this.api_connection = api_connection;
-        // TODO make unknown and handle type checking in get methods
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        this.data_object = null;
+const helper_logging_1 = require("../helper_logging");
+const axios_1 = __importDefault(require("axios"));
+const constants_1 = require("./constants");
+class BaseModel {
+    constructor(infinity_client) {
+        this.infinity_client = infinity_client;
         this.HASH_IGNORE_KEYS = new Set();
-        this.log = new helper_logging_1.PrefixLogger(this.api_connection.log, 'API');
+        this.log = new helper_logging_1.PrefixLogger(this.infinity_client.log, 'API');
         this.write_lock = new async_mutex_1.Mutex();
     }
     hashDataObject() {
@@ -236,9 +73,9 @@ class BaseInfinityEvolutionApiModel {
         }
     }
     async forceFetch() {
-        await this.api_connection.refreshToken();
-        await this.api_connection.activate();
-        const response = await this.api_connection.axios.get(this.getPath());
+        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();
@@ -251,10 +88,10 @@ class BaseInfinityEvolutionApiModel {
 }
 __decorate([
     (0, typescript_memoize_1.MemoizeExpiring)(10 * 1000)
-], BaseInfinityEvolutionApiModel.prototype, "fetch", null);
-class InfinityEvolutionLocations extends BaseInfinityEvolutionApiModel {
+], BaseModel.prototype, "fetch", null);
+class LocationsModel extends BaseModel {
     getPath() {
-        return `/users/${this.api_connection.username}/locations`;
+        return `/users/${this.infinity_client.username}/locations`;
     }
     async getSystems() {
         await this.fetch();
@@ -268,11 +105,11 @@ class InfinityEvolutionLocations extends BaseInfinityEvolutionApiModel {
         return systems;
     }
 }
-exports.InfinityEvolutionLocations = InfinityEvolutionLocations;
-class BaseInfinityEvolutionSystemApiModel extends BaseInfinityEvolutionApiModel {
-    constructor(api_connection, serialNumber, log) {
-        super(api_connection);
-        this.api_connection = api_connection;
+exports.LocationsModel = LocationsModel;
+class BaseSystemModel extends BaseModel {
+    constructor(infinity_client, serialNumber, log) {
+        super(infinity_client);
+        this.infinity_client = infinity_client;
         this.serialNumber = serialNumber;
         this.log = log;
         this.last_updated = 0; // TODO use this
@@ -286,7 +123,7 @@ class BaseInfinityEvolutionSystemApiModel extends BaseInfinityEvolutionApiModel
         this.log.debug(`TIMESTAMP ${this.getPath()} reports ${ts} (${this.last_updated})`);
     }
 }
-class InfinityEvolutionSystemProfile extends BaseInfinityEvolutionSystemApiModel {
+class SystemProfileModel extends BaseSystemModel {
     getPath() {
         return `/systems/${this.serialNumber}/profile`;
     }
@@ -308,11 +145,11 @@ class InfinityEvolutionSystemProfile extends BaseInfinityEvolutionSystemApiModel
     }
     async getZones() {
         await this.fetch();
-        return this.data_object.system_profile.zones[0].zone.filter((zone) => zone['present'][0] === exports.STATUS.ON).map((zone) => zone['$'].id);
+        return this.data_object.system_profile.zones[0].zone.filter((zone) => zone['present'][0] === constants_1.STATUS.ON).map((zone) => zone['$'].id);
     }
 }
-exports.InfinityEvolutionSystemProfile = InfinityEvolutionSystemProfile;
-class InfinityEvolutionSystemStatus extends BaseInfinityEvolutionSystemApiModel {
+exports.SystemProfileModel = SystemProfileModel;
+class SystemStatusModel extends BaseSystemModel {
     getPath() {
         return `/systems/${this.serialNumber}/status`;
     }
@@ -335,9 +172,9 @@ class InfinityEvolutionSystemStatus extends BaseInfinityEvolutionSystemApiModel
             case 'gasheat':
             case 'electric':
             case 'hpheat':
-                return exports.SYSTEM_MODE.HEAT;
+                return constants_1.SYSTEM_MODE.HEAT;
             case 'dehumidify':
-                return exports.SYSTEM_MODE.COOL;
+                return constants_1.SYSTEM_MODE.COOL;
             default:
                 return raw_mode;
         }
@@ -352,13 +189,13 @@ class InfinityEvolutionSystemStatus extends BaseInfinityEvolutionSystemApiModel
             case 'active_heat':
             case 'prep_heat':
             case 'pending_heat':
-                return exports.SYSTEM_MODE.HEAT;
+                return constants_1.SYSTEM_MODE.HEAT;
             case 'active_cool':
             case 'prep_cool':
             case 'pending_cool':
-                return exports.SYSTEM_MODE.COOL;
+                return constants_1.SYSTEM_MODE.COOL;
             case 'idle':
-                return exports.SYSTEM_MODE.OFF;
+                return constants_1.SYSTEM_MODE.OFF;
             default:
                 return raw_mode;
         }
@@ -366,7 +203,7 @@ class InfinityEvolutionSystemStatus extends BaseInfinityEvolutionSystemApiModel
     async getZoneFan(zone) {
         const zone_obj = await this.getZone(zone);
         if (zone_obj.damperposition[0] === '0') {
-            return exports.FAN_MODE.OFF;
+            return constants_1.FAN_MODE.OFF;
         }
         else {
             return zone_obj.fan[0];
@@ -391,8 +228,8 @@ class InfinityEvolutionSystemStatus extends BaseInfinityEvolutionSystemApiModel
         return Number((await this.getZone(zone)).htsp[0]);
     }
 }
-exports.InfinityEvolutionSystemStatus = InfinityEvolutionSystemStatus;
-class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel {
+exports.SystemStatusModel = SystemStatusModel;
+class SystemConfigModel extends BaseSystemModel {
     constructor() {
         super(...arguments);
         /* Write APIs */
@@ -428,13 +265,13 @@ class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel
     }
     async getZoneActivity(zone) {
         const zone_obj = await this.getZone(zone);
-        if (zone_obj.hold[0] === exports.STATUS.ON) {
+        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] === exports.STATUS.ON).reverse();
+            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(':');
@@ -447,19 +284,20 @@ 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] === exports.STATUS.ON).reverse();
+            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 === exports.ACTIVITY.VACATION) {
+        if (activity_name === constants_1.ACTIVITY.VACATION) {
             return {
-                '$': { id: exports.ACTIVITY.VACATION },
+                '$': { 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];
@@ -573,7 +411,7 @@ class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel
         const builder = new xml2js.Builder();
         const new_xml = builder.buildObject(this.data_object);
         const data = `data=${encodeURIComponent(new_xml)}`;
-        await this.api_connection.axios.post(this.getPath(), data, {
+        await this.infinity_client.axios.post(this.getPath(), data, {
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded',
             },
@@ -601,7 +439,7 @@ class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel
         this.log.debug(`Setting zone ${zone} activity to ${activity} until ${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['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) {
@@ -611,7 +449,7 @@ class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel
         });
         // Set hold to MANUAL activity
         this.mutations.push(async () => {
-            await this.mutateZoneActivityHold(zone, exports.ACTIVITY.MANUAL, hold_until);
+            await this.mutateZoneActivityHold(zone, constants_1.ACTIVITY.MANUAL, hold_until);
         });
         // Schedule the push event, but don't wait for it to return.
         this.push();
@@ -620,8 +458,8 @@ class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel
         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, exports.ACTIVITY.MANUAL);
-        if (zone_obj['holdActivity'][0] !== exports.ACTIVITY.MANUAL) {
+        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));
             manual_activity_obj['clsp'][0] = prev_activity_obj['clsp'][0];
             manual_activity_obj['htsp'][0] = prev_activity_obj['htsp'][0];
@@ -639,17 +477,17 @@ class InfinityEvolutionSystemConfig extends BaseInfinityEvolutionSystemApiModel
         }
     }
 }
-exports.InfinityEvolutionSystemConfig = InfinityEvolutionSystemConfig;
-class InfinityEvolutionSystemModel {
-    constructor(api_connection, serialNumber) {
-        this.api_connection = api_connection;
+exports.SystemConfigModel = SystemConfigModel;
+class SystemModel {
+    constructor(infinity_client, serialNumber) {
+        this.infinity_client = infinity_client;
         this.serialNumber = serialNumber;
-        this.log = new helper_logging_1.PrefixLogger(this.api_connection.log, this.serialNumber);
+        this.log = new helper_logging_1.PrefixLogger(this.infinity_client.log, this.serialNumber);
         const api_logger = new helper_logging_1.PrefixLogger(this.log, 'API');
-        this.status = new InfinityEvolutionSystemStatus(api_connection, serialNumber, api_logger);
-        this.config = new InfinityEvolutionSystemConfig(api_connection, serialNumber, api_logger);
-        this.profile = new InfinityEvolutionSystemProfile(api_connection, serialNumber, api_logger);
+        this.status = new SystemStatusModel(infinity_client, serialNumber, api_logger);
+        this.config = new SystemConfigModel(infinity_client, serialNumber, api_logger);
+        this.profile = new SystemProfileModel(infinity_client, serialNumber, api_logger);
     }
 }
-exports.InfinityEvolutionSystemModel = InfinityEvolutionSystemModel;
-//# sourceMappingURL=infinityApi.js.map
+exports.SystemModel = SystemModel;
+//# sourceMappingURL=models.js.map