homebridge-econet-rheem 1.5.10 → 1.5.12-beta.0

package/dist/model/api.js

@@ -0,0 +1,367 @@
+import axios, { isAxiosError } from 'axios';
+import mqtt from 'mqtt';
+import { Auth } from './auth.js';
+import { EquipmentType } from './constants.js';
+import * as Types from './types.js';
+import { Thermostat } from './thermostat.js';
+import { WaterHeater } from './waterHeater.js';
+import strings from '../lang/en.js';
+import { safeGetItem, safeSetItem } from '../tools/storage.js';
+import { MINUTE, SECOND } from '../tools/time.js';
+const CLEAR_BLADE_SYSTEM_KEY = 'e2e699cb0bb0bbb88fc8858cb5a401';
+const CLEAR_BLADE_SYSTEM_SECRET = 'E2E699CB0BE6C6FADDB1B0BC9A20';
+const BASE_HEADERS = {
+    'ClearBlade-SystemKey': CLEAR_BLADE_SYSTEM_KEY,
+    'ClearBlade-SystemSecret': CLEAR_BLADE_SYSTEM_SECRET,
+    'Content-Type': 'application/json; charset=UTF-8',
+};
+const HOST = 'rheem.clearblade.com';
+const BASE_URL = `https://${HOST}/api/v/1`;
+const AUTH_URL = `${BASE_URL}/user/auth`;
+const LOCATIONS_URL = `${BASE_URL}/code/${CLEAR_BLADE_SYSTEM_KEY}/getUserDataForApp`;
+const MQTT_URL = `mqtts://${HOST}:1884`;
+const MQTT_TOPIC_REPORTED = 'user/%s/device/reported';
+const MQTT_TOPIC_DESIRED = 'user/%s/device/desired';
+const HTTP_TIMEOUT = 10 * SECOND;
+const MQTT_KEEPALIVE = 90;
+const DELAYS = [5 * SECOND, 15 * SECOND, MINUTE, 2 * MINUTE, 5 * MINUTE];
+const IDLE_CONNECTION_TIMER_INTERVAL = 16 * MINUTE;
+const HTTP_RETRY_CODES = [
+    'ERR_NETWORK', // General network error in Axios
+    'ETIMEDOUT', // Request timed out
+    'ECONNREFUSED', // Connection refused by server
+    '429', // Too Many Requests (rate limit)
+    '500', // Internal Server Error
+    '502', // Bad Gateway
+    '503', // Service Unavailable
+    '504', // Gateway Timeout
+];
+const RETRYABLE_CODES = [
+    3, // MQTT: Server unavailable
+    'ECONNREFUSED', 'ETIMEDOUT', 'ECONNRESET', 'ENOTFOUND',
+    'EHOSTUNREACH', 'ENETUNREACH', 'EAI_AGAIN', 'EPIPE',
+];
+export class EconetApi {
+    log;
+    email;
+    password;
+    storageFilePath;
+    verbose;
+    debugMQTT;
+    _auth;
+    retryIndex = 0;
+    equipments = new Map();
+    mqttClient = null;
+    shouldReconnect = false;
+    isReconnecting = false;
+    reconnectCount = 0;
+    idleMQTTTimer = null;
+    constructor(log, email, password, storageFilePath, verbose, debugMQTT) {
+        this.log = log;
+        this.email = email;
+        this.password = password;
+        this.storageFilePath = storageFilePath;
+        this.verbose = verbose;
+        this.debugMQTT = debugMQTT;
+        this.auth = Auth.load(this.storageFilePath, email);
+    }
+    static async connect(log, email, password, storageFilePath, verbose, debugMQTT) {
+        const api = new EconetApi(log, email, password, storageFilePath, verbose, debugMQTT);
+        let shouldContinue = true;
+        if (!api.auth) {
+            shouldContinue = await api.authenticate();
+        }
+        if (shouldContinue) {
+            await api.getLocations();
+            api.shouldReconnect = true;
+            api.mqttConnect(true);
+        }
+        return api;
+    }
+    teardown() {
+        this.shouldReconnect = false;
+        if (this.mqttClient) {
+            this.mqttClient.end(true);
+            this.mqttClient = null;
+        }
+    }
+    publish(payload, deviceId, serialNumber) {
+        if (!this.mqttClient || !this.mqttClient.connected) {
+            this.log.error(strings.clientNotConnected);
+            return;
+        }
+        if (!this.auth?.accountId) {
+            this.log.error(strings.authMissing);
+            return;
+        }
+        const dateTime = new Date().toISOString().replace(/\.\d{3}Z$/, '');
+        const transactionId = `ANDROID_${dateTime}`;
+        const data = {
+            transactionId,
+            device_name: deviceId,
+            serial_number: serialNumber,
+            ...payload,
+        };
+        const topic = MQTT_TOPIC_DESIRED.replace('%s', this.auth.accountId);
+        const message = JSON.stringify(data);
+        this.mqttClient.publish(topic, message);
+        if (this.verbose) {
+            this.log.info(strings.topicPublish, topic, message);
+        }
+    }
+    get auth() {
+        return this._auth ?? null;
+    }
+    set auth(value) {
+        this._auth = value;
+        if (this._auth) {
+            this._auth.save(this.storageFilePath, this.email);
+        }
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    async do(caller, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    data, shouldRetry, url, ...parameters) {
+        parameters.forEach(param => {
+            url = url.replace('%s', param ?? '');
+        });
+        let config;
+        if (this.auth?.token) {
+            const headers = { ...BASE_HEADERS, 'ClearBlade-UserToken': this.auth?.token };
+            config = { headers: headers, timeout: HTTP_TIMEOUT };
+        }
+        else {
+            config = { headers: BASE_HEADERS, timeout: HTTP_TIMEOUT };
+        }
+        try {
+            let res;
+            if (data) {
+                res = await axios.post(url, data, config);
+            }
+            else {
+                res = await axios.get(url, config);
+            }
+            if (!res.data) {
+                this.logHTTP("debug" /* LogLevel.DEBUG */, caller, JSON.stringify(res.data));
+                throw new Error(strings.noDataReceived);
+            }
+            this.logIfVerbose(caller, res.data);
+            this.retryIndex = 0;
+            return res.data;
+        }
+        catch (err) {
+            if (shouldRetry) {
+                return this.retryIfPossible(err, caller, () => this.do(caller, data, shouldRetry, url, ...parameters));
+            }
+            else {
+                this.logHTTP("warn" /* LogLevel.WARN */, caller, err.message);
+                return null;
+            }
+        }
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    async retryIfPossible(err, caller, retry) {
+        if (!isAxiosError(err)) {
+            this.logHTTP("warn" /* LogLevel.WARN */, caller, err.message);
+            return null;
+        }
+        const errorCode = err.code || err.response?.status?.toString() || 'UNKNOWN';
+        if (!HTTP_RETRY_CODES.includes(errorCode) || this.retryIndex >= DELAYS.length) {
+            this.logHTTP("warn" /* LogLevel.WARN */, caller, err.message);
+            return null;
+        }
+        const reconnectDelay = DELAYS[Math.min(this.reconnectCount, DELAYS.length - 1)];
+        if (reconnectDelay <= MINUTE) {
+            this.log.warn(strings.httpRetrySeconds, reconnectDelay / SECOND);
+        }
+        else {
+            this.log.warn(strings.httpRetryMinutes, reconnectDelay / MINUTE);
+        }
+        await new Promise(resolve => setTimeout(resolve, reconnectDelay));
+        this.retryIndex += 1;
+        return await retry();
+    }
+    async authenticate() {
+        const data = { email: this.email, password: this.password };
+        const tokenData = await this.do(this.authenticate.name, data, true, AUTH_URL);
+        if (!tokenData) {
+            return false;
+        }
+        this.auth = new Auth(tokenData);
+        this.log.info(strings.authSuccess);
+        return true;
+    }
+    mqttConnect(isStartup = false) {
+        if (!this.equipments.size) {
+            return;
+        }
+        if (!this.auth?.token) {
+            this.log.error(strings.authMissing);
+            return;
+        }
+        const timeString = Date.now().toString().replace('.', '').slice(0, 13);
+        const clientId = `${this.email}${timeString}_android`;
+        const options = {
+            clientId,
+            username: this.auth.token,
+            password: CLEAR_BLADE_SYSTEM_KEY,
+            rejectUnauthorized: true,
+            keepalive: MQTT_KEEPALIVE,
+            reconnectPeriod: 0,
+        };
+        this.mqttClient = mqtt.connect(MQTT_URL, options);
+        this.mqttClient.on('connect', () => {
+            if (!this.mqttClient || !this.auth?.accountId) {
+                this.log.error(strings.connectionError);
+                return;
+            }
+            this.mqttClient.subscribe(MQTT_TOPIC_REPORTED.replace('%s', this.auth.accountId));
+            this.mqttClient.subscribe(MQTT_TOPIC_DESIRED.replace('%s', this.auth.accountId));
+            this.log.info(strings.connected);
+            if (isStartup) {
+                const randIndex = Math.floor(Math.random() * strings.welcomeMessages.length);
+                this.log.info(strings.setupComplete, strings.welcomeMessages[randIndex]);
+            }
+        });
+        this.mqttClient.on('message', (topic, message) => {
+            this.reconnectCount = 0;
+            this.resetIdleMQTTTimer();
+            try {
+                const data = JSON.parse(message.toString());
+                if (this.verbose) {
+                    this.log.info(strings.topicUpdate, topic, JSON.stringify(data));
+                }
+                const serial = data.serial_number;
+                const equipment = this.equipments.get(serial);
+                if (equipment) {
+                    equipment.updateFromMQTT(data);
+                    if (this.debugMQTT) {
+                        this.saveMQTT(data);
+                    }
+                }
+            }
+            catch (e) {
+                this.log.error(strings.parseFailed, message.toString());
+            }
+        });
+        this.mqttClient.on('offline', () => {
+            this.log.debug(strings.clientOffline);
+        });
+        this.mqttClient.on('close', () => {
+            this.log.info(strings.connectionClosed);
+            this.mqttReconnect();
+        });
+        this.mqttClient.on('error', (err) => {
+            if (err.code !== undefined && RETRYABLE_CODES.includes(err.code)) {
+                if (this.verbose) {
+                    this.log.error(strings.clientError, err);
+                }
+                this.mqttReconnect();
+            }
+            else {
+                this.log.error(strings.clientError, err);
+            }
+        });
+    }
+    resetIdleMQTTTimer() {
+        if (this.idleMQTTTimer) {
+            clearTimeout(this.idleMQTTTimer);
+        }
+        this.idleMQTTTimer = setTimeout(() => {
+            this.log.info(strings.idleConnection);
+            this.mqttReconnect();
+        }, IDLE_CONNECTION_TIMER_INTERVAL);
+    }
+    async mqttReconnect() {
+        if (!this.shouldReconnect || this.isReconnecting) {
+            return;
+        }
+        this.isReconnecting = true;
+        if (this.mqttClient) {
+            this.mqttClient.end(true);
+            this.mqttClient = null;
+        }
+        this.reconnectCount++;
+        if (this.reconnectCount % DELAYS.length === 0) {
+            try {
+                this.log.error(strings.unstableConnection);
+                this.log.info(strings.reauthenticate);
+                await this.authenticate();
+            }
+            catch (error) {
+                this.log.error(strings.reauthFailed, error);
+            }
+        }
+        const reconnectDelay = DELAYS[Math.min(this.reconnectCount, DELAYS.length - 1)];
+        if (reconnectDelay <= MINUTE) {
+            this.log.info(strings.reconnectInSeconds, reconnectDelay / SECOND);
+        }
+        else {
+            this.log.info(strings.reconnectInMinutes, reconnectDelay / MINUTE);
+        }
+        setTimeout(() => {
+            this.isReconnecting = false;
+            this.mqttConnect();
+        }, reconnectDelay);
+    }
+    async getLocations() {
+        const data = {
+            location_only: false,
+            type: 'com.econet.econetconsumerandroid',
+            version: '6.0.0-375-01b4870e',
+        };
+        const locationsData = await this.do(this.getLocations.name, data, true, LOCATIONS_URL);
+        if (!locationsData) {
+            return;
+        }
+        locationsData.results.locations.forEach(location => {
+            location.equiptments.forEach(equipmentData => {
+                let equipment = null;
+                switch (equipmentData.device_type) {
+                    case EquipmentType.THERMOSTAT:
+                        equipment = new Thermostat(this, equipmentData);
+                        break;
+                    case EquipmentType.WATER_HEATER:
+                        equipment = new WaterHeater(this, equipmentData, this.storageFilePath);
+                        break;
+                    default:
+                        this.log.error(strings.unsupportedEquipment, equipmentData.device_type);
+                }
+                if (equipment) {
+                    this.equipments.set(equipment.serialNumber, equipment);
+                }
+            });
+        });
+    }
+    saveMQTT(data) {
+        const ignoreKeys = new Set(['transactionId', 'device_name', 'serial_number']);
+        for (const [key, value] of Object.entries(data)) {
+            if (ignoreKeys.has(key) || value.toString.length === 0) {
+                continue;
+            }
+            let valuesString = safeGetItem(this.storageFilePath, key);
+            let valuesArray = valuesString ? JSON.parse(valuesString) : [];
+            const valuesSet = new Set(valuesArray);
+            valuesSet.add(value);
+            valuesArray = Array.from(valuesSet);
+            valuesString = JSON.stringify(valuesArray);
+            safeSetItem(this.storageFilePath, key, valuesString);
+        }
+    }
+    logHTTP(level, caller, message) {
+        this.log.log(level, '[HTTP %s()] %s', caller, message);
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    logIfVerbose(caller, data) {
+        if (!this.verbose) {
+            return;
+        }
+        let message = JSON.stringify(data);
+        Types.SENSITIVE_KEYS.forEach(key => {
+            const regex = new RegExp(`"${key}"\\s*:\\s*(".*?"|\\d+|true|false|null)`, 'gi');
+            message = message.replace(regex, `"${key}": "${strings.redacted}"`);
+        });
+        this.logHTTP("info" /* LogLevel.INFO */, caller, message);
+    }
+}
+//# sourceMappingURL=api.js.map

package/dist/model/api.js.map

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

package/dist/model/auth.d.ts

@@ -0,0 +1,11 @@
+import { TokenData } from './types.js';
+export declare class Auth {
+    private readonly data;
+    constructor(data: TokenData);
+    get token(): string;
+    get userId(): string;
+    get accountId(): string;
+    private static digest;
+    save(filePath: string, encryptionKey: string): void;
+    static load(filePath: string, encryptionKey: string): Auth | null;
+}

package/dist/model/auth.js

@@ -0,0 +1,52 @@
+import crypto from 'crypto';
+import { safeGetItem, safeSetItem } from '../tools/storage.js';
+const STORAGE_AUTH_KEY = 'auth';
+export class Auth {
+    data;
+    constructor(data) {
+        this.data = data;
+    }
+    get token() {
+        return this.data.user_token;
+    }
+    get userId() {
+        return this.data.user_id;
+    }
+    get accountId() {
+        return this.data.options.account_id;
+    }
+    static digest(encryptionKey) {
+        return crypto.createHash('sha256').update(encryptionKey).digest();
+    }
+    save(filePath, encryptionKey) {
+        const serailzed = JSON.stringify({
+            data: this.data,
+        });
+        const digest = Auth.digest(encryptionKey);
+        const iv = crypto.randomBytes(16);
+        const cipher = crypto.createCipheriv('aes-256-cbc', digest, iv);
+        const encrypted = Buffer.concat([cipher.update(serailzed, 'utf8'), cipher.final()]);
+        const final = iv.toString('hex') + ':' + encrypted.toString('hex');
+        safeSetItem(filePath, STORAGE_AUTH_KEY, final);
+    }
+    static load(filePath, encryptionKey) {
+        const final = safeGetItem(filePath, STORAGE_AUTH_KEY);
+        if (!final) {
+            return null;
+        }
+        try {
+            const digest = Auth.digest(encryptionKey);
+            const [ivHex, encryptedHex] = final.split(':');
+            const iv = Buffer.from(ivHex, 'hex');
+            const encrypted = Buffer.from(encryptedHex, 'hex');
+            const decipher = crypto.createDecipheriv('aes-256-cbc', digest, iv);
+            const decrypted = Buffer.concat([decipher.update(encrypted), decipher.final()]).toString('utf8');
+            const obj = JSON.parse(decrypted);
+            return new Auth(obj.data);
+        }
+        catch {
+            return null;
+        }
+    }
+}
+//# sourceMappingURL=auth.js.map

package/dist/model/auth.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/model/auth.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAI5B,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAE/D,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAEhC,MAAM,OAAO,IAAI;IAGI;IADnB,YACmB,IAAe;QAAf,SAAI,GAAJ,IAAI,CAAW;IAChC,CAAC;IAEH,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;IAC9B,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;IAC3B,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;IACtC,CAAC;IAEO,MAAM,CAAC,MAAM,CAAC,aAAqB;QACzC,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE,CAAC;IACpE,CAAC;IAED,IAAI,CAAC,QAAgB,EAAE,aAAqB;QAE1C,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YAC/B,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAC1C,MAAM,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QAChE,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACpF,MAAM,KAAK,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEnE,WAAW,CAAC,QAAQ,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,QAAgB,EAAE,aAAqB;QAEjD,MAAM,KAAK,GAAG,WAAW,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;QACtD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YAEH,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YAC1C,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/C,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACrC,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;YACnD,MAAM,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAC,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;YACpE,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAEjG,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAyC,CAAC;YAC1E,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAE5B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;CACF"}

package/dist/model/{enums.d.ts → constants.d.ts}

@@ -1,3 +1,7 @@
+export declare enum EquipmentType {
+    THERMOSTAT = "HVAC",
+    WATER_HEATER = "WH"
+}
 export declare enum ThermostatOperationMode {
     OFF = 1,
     HEATING = 2,

package/dist/model/{enums.js → constants.js}

@@ -1,3 +1,8 @@
+export var EquipmentType;
+(function (EquipmentType) {
+    EquipmentType["THERMOSTAT"] = "HVAC";
+    EquipmentType["WATER_HEATER"] = "WH";
+})(EquipmentType || (EquipmentType = {}));
 export var ThermostatOperationMode;
 (function (ThermostatOperationMode) {
     ThermostatOperationMode[ThermostatOperationMode["OFF"] = 1] = "OFF";
@@ -13,4 +18,4 @@ export var TemperatureUnits;
     TemperatureUnits[TemperatureUnits["FAHRENHEIT"] = 1] = "FAHRENHEIT";
     TemperatureUnits[TemperatureUnits["CELSIUS"] = 2] = "CELSIUS";
 })(TemperatureUnits || (TemperatureUnits = {}));
-//# sourceMappingURL=enums.js.map
+//# sourceMappingURL=constants.js.map

package/dist/model/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/model/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,oCAAmB,CAAA;IACnB,oCAAmB,CAAA;AACrB,CAAC,EAHW,aAAa,KAAb,aAAa,QAGxB;AAED,MAAM,CAAN,IAAY,uBAQX;AARD,WAAY,uBAAuB;IACjC,mEAAO,CAAA;IACP,2EAAW,CAAA;IACX,2EAAW,CAAA;IACX,qEAAQ,CAAA;IACR,6EAAY,CAAA;IACZ,yFAAkB,CAAA;IAClB,4EAAY,CAAA;AACd,CAAC,EARW,uBAAuB,KAAvB,uBAAuB,QAQlC;AAED,MAAM,CAAN,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,mEAAc,CAAA;IACd,6DAAW,CAAA;AACb,CAAC,EAHW,gBAAgB,KAAhB,gBAAgB,QAG3B"}

package/dist/model/equipment.d.ts

@@ -1,24 +1,24 @@
-import { EconetApi } from './econet.js';
-import { TemperatureUnits } from './enums.js';
+import { EconetApi } from './api.js';
+import { EquipmentType, TemperatureUnits } from './constants.js';
+import { EquipmentData, MQTTData } from './types.js';
 export declare abstract class Equipment {
+    readonly api: EconetApi;
     private device_id?;
     private serial_number?;
     private device_name?;
-    private alertCount;
+    private alert_count;
     private temp_units;
-    private running;
-    protected _api: EconetApi;
+    protected running: boolean;
     private _onUpdateCallback;
-    constructor(api: EconetApi);
+    constructor(api: EconetApi, data: EquipmentData);
+    abstract get type(): EquipmentType;
     get deviceId(): string;
     get serialNumber(): string;
     get deviceName(): string;
     get hasAlert(): boolean;
     get units(): TemperatureUnits;
-    protected abstract get runningKey(): string;
     get isRunning(): boolean;
     setOnUpdateCallback(callback: (serialNumber: string) => void): void;
     protected didUpdate(): void;
-    protected updateFromREST(update: any): void;
-    updateFromMQTT(update: any): void;
+    updateFromMQTT(update: MQTTData): void;
 }

package/dist/model/equipment.js

@@ -1,15 +1,21 @@
-import { TemperatureUnits } from './enums.js';
+import { TemperatureUnits } from './constants.js';
+import strings from '../lang/en.js';
 export class Equipment {
+    api;
     device_id;
     serial_number;
     device_name;
-    alertCount = 0;
+    alert_count = 0;
     temp_units = TemperatureUnits.CELSIUS;
     running = false;
-    _api;
     _onUpdateCallback = null;
-    constructor(api) {
-        this._api = api;
+    constructor(api, data) {
+        this.api = api;
+        this.device_id = data.device_name;
+        this.serial_number = data.serial_number;
+        this.device_name = data['@NAME'].value;
+        this.alert_count = data['@ALERTCOUNT'];
+        this.temp_units = data['@SETPOINT'].constraints.units.includes('F') ? TemperatureUnits.FAHRENHEIT : TemperatureUnits.CELSIUS;
     }
     get deviceId() {
         return this.device_id || 'undefined';
@@ -21,7 +27,7 @@ export class Equipment {
         return this.device_name || 'undefined';
     }
     get hasAlert() {
-        return this.alertCount > 0;
+        return this.alert_count > 0;
     }
     get units() {
         return this.temp_units;
@@ -37,30 +43,10 @@ export class Equipment {
             this._onUpdateCallback(this.serialNumber);
         }
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    updateFromREST(update) {
-        this.device_id = update.device_name;
-        this.serial_number = update.serial_number;
-        this.device_name = update['@NAME'].value ?? '';
-        if ('@ALERTCOUNT' in update) {
-            this.alertCount = update['@ALERTCOUNT'] ?? 0;
-        }
-        if ('@SETPOINT' in update) {
-            this.temp_units = update['@SETPOINT'].constraints.units.includes('F') ? TemperatureUnits.FAHRENHEIT : TemperatureUnits.CELSIUS;
-        }
-        if (this.runningKey in update) {
-            this.running = update[this.runningKey].replace(/\s/g, '').length > 0;
-        }
-    }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     updateFromMQTT(update) {
-        if ('@ALERTCOUNT' in update) {
-            this.alertCount = update['@ALERTCOUNT'] ?? 0;
-            this._api.log.debug(`${this.deviceName} alert count = ${this.alertCount}`);
-        }
-        if (this.runningKey in update) {
-            this.running = update[this.runningKey].replace(/\s/g, '').length > 0;
-            this._api.log.debug(`${this.deviceName} running = ${this.running}`);
+        if (update['@ALERTCOUNT']) {
+            this.alert_count = update['@ALERTCOUNT'];
+            this.api.log.debug(strings.alertCount, this.deviceName, this.alert_count);
         }
     }
 }

package/dist/model/equipment.js.map

@@ -1 +1 @@
-{"version":3,"file":"equipment.js","sourceRoot":"","sources":["../../src/model/equipment.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"equipment.js","sourceRoot":"","sources":["../../src/model/equipment.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGjE,OAAO,OAAO,MAAM,eAAe,CAAC;AAEpC,MAAM,OAAgB,SAAS;IAUR;IATb,SAAS,CAAiB;IAC1B,aAAa,CAAiB;IAC9B,WAAW,CAAiB;IAC5B,WAAW,GAAW,CAAC,CAAC;IACxB,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAC;IACpC,OAAO,GAAY,KAAK,CAAC;IAE3B,iBAAiB,GAA4C,IAAI,CAAC;IAE1E,YAAqB,GAAc,EAAE,IAAmB;QAAnC,QAAG,GAAH,GAAG,CAAW;QACjC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC;QAClC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC;QACvC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;QACvC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC;IAC/H,CAAC;IAID,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,IAAI,WAAW,CAAC;IACvC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,aAAa,IAAI,WAAW,CAAC;IAC3C,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC;IACzC,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,mBAAmB,CAAC,QAAwC;QAC1D,IAAI,CAAC,iBAAiB,GAAG,QAAQ,CAAC;IACpC,CAAC;IAES,SAAS;QACjB,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,cAAc,CAAC,MAAgB;QAE7B,IAAI,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;YACzC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAC5E,CAAC;IACH,CAAC;CACF"}

package/dist/model/recoverySimulator.d.ts

@@ -1,9 +1,9 @@
-import { EconetApi } from './econet.js';
+import { EconetApi } from './api.js';
 import { WaterHeater } from './waterHeater.js';
 export declare class RecoverySimulator {
     private readonly api;
+    readonly waterHeater: WaterHeater;
     private readonly onUpdate;
-    private readonly recoveryRatesFilePath;
     private readonly minRecoveryRate;
     private readonly defaultRecoveryRate;
     private recoveryRates;