homebridge-econet-rheem 1.3.0 → 1.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/model/econet.d.ts +5 -2
- package/dist/model/econet.js +17 -10
- package/dist/model/econet.js.map +1 -1
- package/dist/model/equipment.js.map +1 -1
- package/dist/model/recoverySimulator.d.ts +28 -0
- package/dist/model/recoverySimulator.js +121 -0
- package/dist/model/recoverySimulator.js.map +1 -0
- package/dist/model/utils.d.ts +3 -0
- package/dist/model/utils.js +21 -0
- package/dist/model/utils.js.map +1 -1
- package/dist/model/waterHeater.d.ts +4 -15
- package/dist/model/waterHeater.js +33 -106
- package/dist/model/waterHeater.js.map +1 -1
- package/dist/platform.js +5 -5
- package/dist/platform.js.map +1 -1
- package/package.json +1 -1
package/dist/model/econet.d.ts
CHANGED
|
@@ -18,6 +18,7 @@ export declare class EconetApi {
|
|
|
18
18
|
readonly log: Logger;
|
|
19
19
|
private readonly email;
|
|
20
20
|
private readonly password;
|
|
21
|
+
readonly storagePath: string;
|
|
21
22
|
private readonly verbose;
|
|
22
23
|
private mqttOptions;
|
|
23
24
|
private userToken;
|
|
@@ -28,11 +29,13 @@ export declare class EconetApi {
|
|
|
28
29
|
private reconnectDelaySeconds;
|
|
29
30
|
private isReconnecting;
|
|
30
31
|
private reconnectCount;
|
|
31
|
-
|
|
32
|
-
|
|
32
|
+
private idleMQTTTimer;
|
|
33
|
+
constructor(log: Logger, email: string, password: string, storagePath: string, verbose: boolean);
|
|
34
|
+
static login(log: Logger, email: string, password: string, storagePath: string, verbose: boolean): Promise<EconetApi>;
|
|
33
35
|
private authenticate;
|
|
34
36
|
subscribe(): void;
|
|
35
37
|
private connect;
|
|
38
|
+
private resetIdleMQTTTimer;
|
|
36
39
|
private reconnect;
|
|
37
40
|
publish(payload: {
|
|
38
41
|
[key: string]: number;
|
package/dist/model/econet.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import mqtt from 'mqtt';
|
|
2
2
|
import { WaterHeater } from './waterHeater.js';
|
|
3
3
|
import { Thermostat } from './thermostat.js';
|
|
4
|
+
import { ONE_HOUR } from './utils.js';
|
|
4
5
|
const HOST = 'rheem.clearblade.com';
|
|
5
6
|
const REST_URL = `https://${HOST}/api/v/1`;
|
|
6
7
|
const CLEAR_BLADE_SYSTEM_KEY = 'e2e699cb0bb0bbb88fc8858cb5a401';
|
|
@@ -47,6 +48,7 @@ export class EconetApi {
|
|
|
47
48
|
log;
|
|
48
49
|
email;
|
|
49
50
|
password;
|
|
51
|
+
storagePath;
|
|
50
52
|
verbose;
|
|
51
53
|
mqttOptions = null;
|
|
52
54
|
userToken = null;
|
|
@@ -57,14 +59,16 @@ export class EconetApi {
|
|
|
57
59
|
reconnectDelaySeconds = DEFAULT_RECONNECT_DELAY_SECONDS;
|
|
58
60
|
isReconnecting = false;
|
|
59
61
|
reconnectCount = 0;
|
|
60
|
-
|
|
62
|
+
idleMQTTTimer = null;
|
|
63
|
+
constructor(log, email, password, storagePath, verbose) {
|
|
61
64
|
this.log = log;
|
|
62
65
|
this.email = email;
|
|
63
66
|
this.password = password;
|
|
67
|
+
this.storagePath = storagePath;
|
|
64
68
|
this.verbose = verbose;
|
|
65
69
|
}
|
|
66
|
-
static async login(log, email, password, verbose) {
|
|
67
|
-
const api = new EconetApi(log, email, password, verbose);
|
|
70
|
+
static async login(log, email, password, storagePath, verbose) {
|
|
71
|
+
const api = new EconetApi(log, email, password, storagePath, verbose);
|
|
68
72
|
await api.authenticate();
|
|
69
73
|
return api;
|
|
70
74
|
}
|
|
@@ -120,6 +124,7 @@ export class EconetApi {
|
|
|
120
124
|
this.log.info('Connected and listening for updates...');
|
|
121
125
|
});
|
|
122
126
|
this.mqttClient.on('message', (topic, message) => {
|
|
127
|
+
this.resetIdleMQTTTimer();
|
|
123
128
|
try {
|
|
124
129
|
const unpackedJson = JSON.parse(message.toString());
|
|
125
130
|
if (this.verbose) {
|
|
@@ -130,13 +135,6 @@ export class EconetApi {
|
|
|
130
135
|
if (equipment) {
|
|
131
136
|
equipment.updateFromMQTT(unpackedJson);
|
|
132
137
|
}
|
|
133
|
-
else if ('@SIGNAL' in unpackedJson) {
|
|
134
|
-
for (const eq of this.equipment.values()) {
|
|
135
|
-
if (eq.deviceId === unpackedJson.device_name) {
|
|
136
|
-
eq.updateFromMQTT(unpackedJson);
|
|
137
|
-
}
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
138
|
}
|
|
141
139
|
catch (e) {
|
|
142
140
|
this.log.error('Failed to parse message:', message.toString());
|
|
@@ -161,6 +159,15 @@ export class EconetApi {
|
|
|
161
159
|
}
|
|
162
160
|
});
|
|
163
161
|
}
|
|
162
|
+
resetIdleMQTTTimer() {
|
|
163
|
+
if (this.idleMQTTTimer) {
|
|
164
|
+
clearTimeout(this.idleMQTTTimer);
|
|
165
|
+
}
|
|
166
|
+
this.idleMQTTTimer = setTimeout(() => {
|
|
167
|
+
this.log.info('Idle connection');
|
|
168
|
+
this.reconnect();
|
|
169
|
+
}, 3 * ONE_HOUR);
|
|
170
|
+
}
|
|
164
171
|
async reconnect() {
|
|
165
172
|
if (!this.shouldReconnect || this.isReconnecting) {
|
|
166
173
|
return;
|
package/dist/model/econet.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"econet.js","sourceRoot":"","sources":["../../src/model/econet.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"econet.js","sourceRoot":"","sources":["../../src/model/econet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"equipment.js","sourceRoot":"","sources":["../../src/model/equipment.ts"],"names":[],"mappings":"AAEA,MAAM,OAAgB,SAAS;IACrB,SAAS,CAAiB;IAC1B,aAAa,CAAiB;IAC9B,WAAW,CAAiB;IAE1B,IAAI,CAAY;
|
|
1
|
+
{"version":3,"file":"equipment.js","sourceRoot":"","sources":["../../src/model/equipment.ts"],"names":[],"mappings":"AAEA,MAAM,OAAgB,SAAS;IACrB,SAAS,CAAiB;IAC1B,aAAa,CAAiB;IAC9B,WAAW,CAAiB;IAE1B,IAAI,CAAY;IAElB,iBAAiB,GAA4C,IAAI,CAAC;IAE1E,YAAY,GAAc;QACxB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;IAClB,CAAC;IAED,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,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,8DAA8D;IACpD,cAAc,CAAC,MAAW;QAClC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;QAC1C,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC;IAC3C,CAAC;CAIF"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { EconetApi } from './econet';
|
|
2
|
+
import { WaterHeater } from './waterHeater';
|
|
3
|
+
export declare class RecoverySimulator {
|
|
4
|
+
private readonly api;
|
|
5
|
+
private readonly onUpdate;
|
|
6
|
+
private readonly recoveryRatesFilePath;
|
|
7
|
+
private recoveryRates;
|
|
8
|
+
private recoveryTimer;
|
|
9
|
+
private readonly serialNumber;
|
|
10
|
+
private setPoint;
|
|
11
|
+
private availability;
|
|
12
|
+
private previousSetPoint;
|
|
13
|
+
private simulatedTemp;
|
|
14
|
+
private recoveryStartTime;
|
|
15
|
+
private recoveryStartTemp;
|
|
16
|
+
constructor(api: EconetApi, waterHeater: WaterHeater, onUpdate: () => void);
|
|
17
|
+
currentTemp(inputTemp: number): number;
|
|
18
|
+
private get isRecovering();
|
|
19
|
+
handleUpdate(waterHeater: WaterHeater): void;
|
|
20
|
+
private get recoveryRate();
|
|
21
|
+
private _startRecoveryTimer;
|
|
22
|
+
private _stopRecoveryTimer;
|
|
23
|
+
private _updateSimulatedTemp;
|
|
24
|
+
private _endRecovery;
|
|
25
|
+
private _recordRecoveryRate;
|
|
26
|
+
private _loadRecoveryRates;
|
|
27
|
+
private _saveRecoveryRates;
|
|
28
|
+
}
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
import path from 'path';
|
|
2
|
+
import { fromCelsius, ONE_HOUR, safeGetItem, safeSetItem } from './utils';
|
|
3
|
+
const DEFAULT_RECOVERY_RATE = 30; // in degrees Celsius per hour
|
|
4
|
+
const RECOVERY_TIMER_INTERVAL = 300000; // 5 minutes
|
|
5
|
+
export class RecoverySimulator {
|
|
6
|
+
api;
|
|
7
|
+
onUpdate;
|
|
8
|
+
recoveryRatesFilePath;
|
|
9
|
+
recoveryRates;
|
|
10
|
+
recoveryTimer = null;
|
|
11
|
+
serialNumber;
|
|
12
|
+
setPoint;
|
|
13
|
+
availability;
|
|
14
|
+
previousSetPoint;
|
|
15
|
+
simulatedTemp;
|
|
16
|
+
recoveryStartTime = null;
|
|
17
|
+
recoveryStartTemp = null;
|
|
18
|
+
constructor(api, waterHeater, onUpdate) {
|
|
19
|
+
this.api = api;
|
|
20
|
+
this.onUpdate = onUpdate;
|
|
21
|
+
this.serialNumber = waterHeater.serialNumber;
|
|
22
|
+
this.availability = waterHeater.availability;
|
|
23
|
+
this.setPoint = waterHeater.setPoint;
|
|
24
|
+
this.previousSetPoint = this.setPoint;
|
|
25
|
+
this.simulatedTemp = this.setPoint;
|
|
26
|
+
this.recoveryRatesFilePath = path.join(api.storagePath, 'recoveryRates.json');
|
|
27
|
+
this.recoveryRates = this._loadRecoveryRates() ?? [fromCelsius(DEFAULT_RECOVERY_RATE, waterHeater.units)];
|
|
28
|
+
}
|
|
29
|
+
currentTemp(inputTemp) {
|
|
30
|
+
if (this.availability === 0 && !this.isRecovering) {
|
|
31
|
+
this.simulatedTemp = inputTemp;
|
|
32
|
+
}
|
|
33
|
+
return this.simulatedTemp;
|
|
34
|
+
}
|
|
35
|
+
get isRecovering() {
|
|
36
|
+
return this.recoveryTimer !== null;
|
|
37
|
+
}
|
|
38
|
+
handleUpdate(waterHeater) {
|
|
39
|
+
const previousSetPoint = this.previousSetPoint;
|
|
40
|
+
this.setPoint = waterHeater.setPoint;
|
|
41
|
+
this.availability = waterHeater.availability;
|
|
42
|
+
this.previousSetPoint = waterHeater.setPoint;
|
|
43
|
+
if (this.availability === 0 && !waterHeater.isRunning) {
|
|
44
|
+
this._stopRecoveryTimer();
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
if (waterHeater.isRunning && !this.isRecovering) {
|
|
48
|
+
if (this.availability === 0 || this.setPoint > previousSetPoint) {
|
|
49
|
+
this._startRecoveryTimer();
|
|
50
|
+
}
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
if (this.isRecovering && this.simulatedTemp >= this.setPoint) {
|
|
54
|
+
this.simulatedTemp = this.setPoint;
|
|
55
|
+
this._endRecovery();
|
|
56
|
+
this.onUpdate();
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
get recoveryRate() {
|
|
61
|
+
return this.recoveryRates.reduce((a, b) => a + b, 0) / this.recoveryRates.length;
|
|
62
|
+
}
|
|
63
|
+
_startRecoveryTimer() {
|
|
64
|
+
if (this.recoveryTimer) {
|
|
65
|
+
clearInterval(this.recoveryTimer);
|
|
66
|
+
}
|
|
67
|
+
this.recoveryStartTime = Date.now();
|
|
68
|
+
this.recoveryStartTemp = this.simulatedTemp;
|
|
69
|
+
this.recoveryTimer = setInterval(() => {
|
|
70
|
+
this._updateSimulatedTemp();
|
|
71
|
+
}, RECOVERY_TIMER_INTERVAL);
|
|
72
|
+
}
|
|
73
|
+
_stopRecoveryTimer() {
|
|
74
|
+
if (this.recoveryTimer) {
|
|
75
|
+
clearInterval(this.recoveryTimer);
|
|
76
|
+
this.recoveryTimer = null;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
_updateSimulatedTemp() {
|
|
80
|
+
if (!this.isRecovering) {
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
const tempIncrease = this.recoveryRate * (RECOVERY_TIMER_INTERVAL / ONE_HOUR);
|
|
84
|
+
this.simulatedTemp = Math.min(this.simulatedTemp + tempIncrease, this.setPoint);
|
|
85
|
+
if (this.simulatedTemp === this.setPoint) {
|
|
86
|
+
this._recordRecoveryRate();
|
|
87
|
+
this._stopRecoveryTimer();
|
|
88
|
+
}
|
|
89
|
+
this.onUpdate();
|
|
90
|
+
}
|
|
91
|
+
_endRecovery() {
|
|
92
|
+
this._recordRecoveryRate();
|
|
93
|
+
this._stopRecoveryTimer();
|
|
94
|
+
}
|
|
95
|
+
_recordRecoveryRate() {
|
|
96
|
+
if (!this.recoveryStartTime || !this.recoveryStartTemp) {
|
|
97
|
+
return;
|
|
98
|
+
}
|
|
99
|
+
const timeElapsed = (Date.now() - this.recoveryStartTime) / ONE_HOUR;
|
|
100
|
+
const tempDifference = this.setPoint - this.recoveryStartTemp;
|
|
101
|
+
if (timeElapsed <= 0) {
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
const rate = tempDifference / timeElapsed;
|
|
105
|
+
this.recoveryRates.push(rate);
|
|
106
|
+
if (this.recoveryRates.length > 3) {
|
|
107
|
+
this.recoveryRates.shift();
|
|
108
|
+
}
|
|
109
|
+
this._saveRecoveryRates();
|
|
110
|
+
}
|
|
111
|
+
_loadRecoveryRates() {
|
|
112
|
+
const key = `whRecoveryRates_${this.serialNumber}`;
|
|
113
|
+
const stored = safeGetItem(this.recoveryRatesFilePath, key);
|
|
114
|
+
return stored ? JSON.parse(stored) : null;
|
|
115
|
+
}
|
|
116
|
+
_saveRecoveryRates() {
|
|
117
|
+
const key = `whRecoveryRates_${this.serialNumber}`;
|
|
118
|
+
safeSetItem(this.recoveryRatesFilePath, key, JSON.stringify(this.recoveryRates));
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
//# sourceMappingURL=recoverySimulator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"recoverySimulator.js","sourceRoot":"","sources":["../../src/model/recoverySimulator.ts"],"names":[],"mappings":"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"}
|
package/dist/model/utils.d.ts
CHANGED
|
@@ -1,3 +1,6 @@
|
|
|
1
1
|
import { TemperatureUnits } from '../model/enums.js';
|
|
2
|
+
export declare const ONE_HOUR = 3600000;
|
|
2
3
|
export declare const toCelsius: (temp: number, units: TemperatureUnits) => number;
|
|
3
4
|
export declare const fromCelsius: (temp: number, units: TemperatureUnits) => number;
|
|
5
|
+
export declare function safeGetItem(filePath: string, key: string): string | null;
|
|
6
|
+
export declare function safeSetItem(filePath: string, key: string, value: string): void;
|
package/dist/model/utils.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import fs from 'fs';
|
|
1
2
|
import { TemperatureUnits } from '../model/enums.js';
|
|
3
|
+
export const ONE_HOUR = 3600000;
|
|
2
4
|
const fahrenheitToCelsius = (fahrenheit) => {
|
|
3
5
|
return Number(((fahrenheit - 32) * 5 / 9).toFixed(1));
|
|
4
6
|
};
|
|
@@ -11,4 +13,23 @@ export const toCelsius = (temp, units) => {
|
|
|
11
13
|
export const fromCelsius = (temp, units) => {
|
|
12
14
|
return units === TemperatureUnits.FAHRENHEIT ? celsiusToFahrenheit(temp) : temp;
|
|
13
15
|
};
|
|
16
|
+
function readStorage(filePath) {
|
|
17
|
+
if (!fs.existsSync(filePath)) {
|
|
18
|
+
return {};
|
|
19
|
+
}
|
|
20
|
+
const data = fs.readFileSync(filePath, 'utf-8');
|
|
21
|
+
return JSON.parse(data);
|
|
22
|
+
}
|
|
23
|
+
function writeStorage(filePath, storage) {
|
|
24
|
+
fs.writeFileSync(filePath, JSON.stringify(storage, null, 2));
|
|
25
|
+
}
|
|
26
|
+
export function safeGetItem(filePath, key) {
|
|
27
|
+
const storage = readStorage(filePath);
|
|
28
|
+
return storage[key] ?? null;
|
|
29
|
+
}
|
|
30
|
+
export function safeSetItem(filePath, key, value) {
|
|
31
|
+
const storage = readStorage(filePath);
|
|
32
|
+
storage[key] = value;
|
|
33
|
+
writeStorage(filePath, storage);
|
|
34
|
+
}
|
|
14
35
|
//# sourceMappingURL=utils.js.map
|
package/dist/model/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/model/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,MAAM,mBAAmB,GAAG,CAAC,UAAkB,EAAU,EAAE;IACzD,OAAO,MAAM,CAAC,CAAC,CAAC,UAAU,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAU,EAAE;IACtD,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC5C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,KAAuB,EAAU,EAAE;IACzE,OAAO,KAAK,KAAK,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAClF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,KAAuB,EAAU,EAAE;IAC3E,OAAO,KAAK,KAAK,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAClF,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/model/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,MAAM,CAAC,MAAM,QAAQ,GAAG,OAAO,CAAC;AAEhC,MAAM,mBAAmB,GAAG,CAAC,UAAkB,EAAU,EAAE;IACzD,OAAO,MAAM,CAAC,CAAC,CAAC,UAAU,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAU,EAAE;IACtD,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC5C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,KAAuB,EAAU,EAAE;IACzE,OAAO,KAAK,KAAK,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAClF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,KAAuB,EAAU,EAAE;IAC3E,OAAO,KAAK,KAAK,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAClF,CAAC,CAAC;AAEF,SAAS,WAAW,CAAC,QAAgB;IACnC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7B,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAChD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,YAAY,CAAC,QAAgB,EAAE,OAA+B;IACrE,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,QAAgB,EAAE,GAAW;IACvD,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;IACtC,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,QAAgB,EAAE,GAAW,EAAE,KAAa;IACtE,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;IACtC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACrB,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AAClC,CAAC"}
|
|
@@ -8,30 +8,19 @@ export declare class WaterHeater extends Equipment {
|
|
|
8
8
|
private lower_limit;
|
|
9
9
|
private upper_limit;
|
|
10
10
|
private set_point;
|
|
11
|
-
private
|
|
12
|
-
private
|
|
13
|
-
private recoveryRates;
|
|
14
|
-
private lastAvailabilityUpdate;
|
|
15
|
-
private lastAvailabilityValue;
|
|
16
|
-
private recoveryTimer;
|
|
17
|
-
private currentTempEstimate;
|
|
18
|
-
private inputTemp;
|
|
11
|
+
private availability_icon;
|
|
12
|
+
private recoverySimulator;
|
|
19
13
|
constructor(api: EconetApi, restUpdate: any);
|
|
20
14
|
get isEnabled(): boolean;
|
|
21
15
|
get isRunning(): boolean;
|
|
22
16
|
get units(): TemperatureUnits;
|
|
23
17
|
get limits(): [number, number];
|
|
18
|
+
get availability(): number;
|
|
24
19
|
currentTemp(inputTemp?: number | null): number;
|
|
25
20
|
get setPoint(): number;
|
|
21
|
+
protected didUpdate(): void;
|
|
26
22
|
protected updateFromREST(update: any): void;
|
|
27
23
|
updateFromMQTT(update: any): void;
|
|
28
24
|
setEnabled(enabled: boolean): void;
|
|
29
25
|
setSetPoint(setPoint: number): void;
|
|
30
|
-
private _availabilityFromIcon;
|
|
31
|
-
private get recoveryRate();
|
|
32
|
-
private _saveRecoveryRates;
|
|
33
|
-
private _loadRecoveryRates;
|
|
34
|
-
private _startRecoveryTimer;
|
|
35
|
-
private _stopRecoveryTimer;
|
|
36
|
-
private _updateCurrentTempEstimate;
|
|
37
26
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Equipment } from './equipment.js';
|
|
2
2
|
import { TemperatureUnits } from './enums.js';
|
|
3
|
+
import { RecoverySimulator } from './recoverySimulator.js';
|
|
3
4
|
export class WaterHeater extends Equipment {
|
|
4
5
|
enabled = false;
|
|
5
6
|
running = false;
|
|
@@ -7,18 +8,14 @@ export class WaterHeater extends Equipment {
|
|
|
7
8
|
lower_limit = 100;
|
|
8
9
|
upper_limit = 150;
|
|
9
10
|
set_point = 0;
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
recoveryRates = [];
|
|
13
|
-
lastAvailabilityUpdate = 0;
|
|
14
|
-
lastAvailabilityValue = 100;
|
|
15
|
-
recoveryTimer = null;
|
|
16
|
-
currentTempEstimate = null;
|
|
17
|
-
inputTemp = null;
|
|
11
|
+
availability_icon = null;
|
|
12
|
+
recoverySimulator;
|
|
18
13
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
19
14
|
constructor(api, restUpdate) {
|
|
20
15
|
super(api);
|
|
21
|
-
this.
|
|
16
|
+
this.recoverySimulator = new RecoverySimulator(api, this, () => {
|
|
17
|
+
super.didUpdate();
|
|
18
|
+
});
|
|
22
19
|
this.updateFromREST(restUpdate);
|
|
23
20
|
}
|
|
24
21
|
get isEnabled() {
|
|
@@ -33,22 +30,38 @@ export class WaterHeater extends Equipment {
|
|
|
33
30
|
get limits() {
|
|
34
31
|
return [this.lower_limit, this.upper_limit];
|
|
35
32
|
}
|
|
33
|
+
get availability() {
|
|
34
|
+
const icon = this.availability_icon;
|
|
35
|
+
if (icon == null) {
|
|
36
|
+
return 100;
|
|
37
|
+
}
|
|
38
|
+
if (icon.includes('empty') || icon.includes('zero')) {
|
|
39
|
+
return 0;
|
|
40
|
+
}
|
|
41
|
+
if (icon.includes('ten')) {
|
|
42
|
+
return 10;
|
|
43
|
+
}
|
|
44
|
+
if (icon.includes('fourty')) {
|
|
45
|
+
return 40;
|
|
46
|
+
}
|
|
47
|
+
if (icon.includes('hundred') || icon.includes('hundread')) {
|
|
48
|
+
return 100;
|
|
49
|
+
}
|
|
50
|
+
return 100;
|
|
51
|
+
}
|
|
36
52
|
currentTemp(inputTemp) {
|
|
37
53
|
if (!inputTemp) {
|
|
38
54
|
return this.set_point;
|
|
39
55
|
}
|
|
40
|
-
this.inputTemp
|
|
41
|
-
const minCurrentTemp = Math.round(this.inputTemp + (this.availability / 100) * (this.set_point - this.inputTemp));
|
|
42
|
-
const recoveryRate = this.recoveryRate;
|
|
43
|
-
if (this.currentTempEstimate == null && recoveryRate != null) {
|
|
44
|
-
this.currentTempEstimate = minCurrentTemp;
|
|
45
|
-
this._startRecoveryTimer();
|
|
46
|
-
}
|
|
47
|
-
return this.currentTempEstimate ?? minCurrentTemp;
|
|
56
|
+
return this.recoverySimulator.currentTemp(inputTemp);
|
|
48
57
|
}
|
|
49
58
|
get setPoint() {
|
|
50
59
|
return this.set_point;
|
|
51
60
|
}
|
|
61
|
+
didUpdate() {
|
|
62
|
+
this.recoverySimulator.handleUpdate(this);
|
|
63
|
+
super.didUpdate();
|
|
64
|
+
}
|
|
52
65
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
53
66
|
updateFromREST(update) {
|
|
54
67
|
super.updateFromREST(update);
|
|
@@ -65,7 +78,7 @@ export class WaterHeater extends Equipment {
|
|
|
65
78
|
this.set_point = update['@SETPOINT'].value || 0;
|
|
66
79
|
}
|
|
67
80
|
if ('@HOTWATER' in update) {
|
|
68
|
-
this.
|
|
81
|
+
this.availability_icon = update['@HOTWATER'];
|
|
69
82
|
}
|
|
70
83
|
this.didUpdate();
|
|
71
84
|
}
|
|
@@ -84,7 +97,8 @@ export class WaterHeater extends Equipment {
|
|
|
84
97
|
this._api.log.debug(`${this.deviceName} set_point = ${this.set_point}`);
|
|
85
98
|
}
|
|
86
99
|
if ('@HOTWATER' in update) {
|
|
87
|
-
this.
|
|
100
|
+
this.availability_icon = update['@HOTWATER'];
|
|
101
|
+
this._api.log.debug(`${this.deviceName} availability = ${this.availability_icon}`);
|
|
88
102
|
}
|
|
89
103
|
this.didUpdate();
|
|
90
104
|
}
|
|
@@ -94,92 +108,5 @@ export class WaterHeater extends Equipment {
|
|
|
94
108
|
setSetPoint(setPoint) {
|
|
95
109
|
this._api.publish({ '@SETPOINT': setPoint }, this.deviceId, this.serialNumber);
|
|
96
110
|
}
|
|
97
|
-
_availabilityFromIcon(icon) {
|
|
98
|
-
this._api.log.debug('Fetching availability for icon: ', icon);
|
|
99
|
-
const prevAvailability = this.lastAvailabilityValue;
|
|
100
|
-
let newAvailability = 100;
|
|
101
|
-
let nextAvailability = 100;
|
|
102
|
-
if (icon.includes('empty') || icon.includes('zero')) {
|
|
103
|
-
newAvailability = 0;
|
|
104
|
-
nextAvailability = 10;
|
|
105
|
-
}
|
|
106
|
-
else if (icon.includes('ten')) {
|
|
107
|
-
newAvailability = 10;
|
|
108
|
-
nextAvailability = 40;
|
|
109
|
-
}
|
|
110
|
-
else if (icon.includes('fourty')) {
|
|
111
|
-
newAvailability = 40;
|
|
112
|
-
}
|
|
113
|
-
else if (icon.includes('hundred') || icon.includes('hundread')) {
|
|
114
|
-
newAvailability = 100;
|
|
115
|
-
}
|
|
116
|
-
else {
|
|
117
|
-
newAvailability = 100;
|
|
118
|
-
}
|
|
119
|
-
this.nextAvailability = nextAvailability;
|
|
120
|
-
const now = Date.now();
|
|
121
|
-
const elapsedMinutes = (now - this.lastAvailabilityUpdate) / 60000;
|
|
122
|
-
if (newAvailability > this.lastAvailabilityValue && elapsedMinutes > 0) {
|
|
123
|
-
const baseTemp = this.set_point;
|
|
124
|
-
const tempIncrease = (baseTemp - baseTemp * (prevAvailability / 100)) * (newAvailability - prevAvailability) / (100 - prevAvailability);
|
|
125
|
-
const newRecoveryRate = tempIncrease / elapsedMinutes;
|
|
126
|
-
this.recoveryRates.push(newRecoveryRate);
|
|
127
|
-
if (this.recoveryRates.length > 3) {
|
|
128
|
-
this.recoveryRates.shift();
|
|
129
|
-
}
|
|
130
|
-
this._saveRecoveryRates();
|
|
131
|
-
this._api.log.debug(`${this.deviceName} recovery rate = ${this.recoveryRate} degrees/minute`);
|
|
132
|
-
this.lastAvailabilityUpdate = now;
|
|
133
|
-
}
|
|
134
|
-
this.availability = newAvailability;
|
|
135
|
-
this.lastAvailabilityValue = newAvailability;
|
|
136
|
-
return newAvailability;
|
|
137
|
-
}
|
|
138
|
-
get recoveryRate() {
|
|
139
|
-
if (this.recoveryRates.length === 0) {
|
|
140
|
-
return null;
|
|
141
|
-
}
|
|
142
|
-
return this.recoveryRates.reduce((a, b) => a + b, 0) / this.recoveryRates.length;
|
|
143
|
-
}
|
|
144
|
-
_saveRecoveryRates() {
|
|
145
|
-
const key = `whRecoveryRates_${this.serialNumber}`;
|
|
146
|
-
localStorage.setItem(key, JSON.stringify(this.recoveryRates));
|
|
147
|
-
}
|
|
148
|
-
_loadRecoveryRates() {
|
|
149
|
-
const key = `whRecoveryRates_${this.serialNumber}`;
|
|
150
|
-
const stored = localStorage.getItem(key);
|
|
151
|
-
return stored ? JSON.parse(stored) : [];
|
|
152
|
-
}
|
|
153
|
-
_startRecoveryTimer() {
|
|
154
|
-
if (this.recoveryTimer) {
|
|
155
|
-
clearInterval(this.recoveryTimer);
|
|
156
|
-
}
|
|
157
|
-
this.recoveryTimer = setInterval(() => {
|
|
158
|
-
this._updateCurrentTempEstimate();
|
|
159
|
-
}, 60000);
|
|
160
|
-
}
|
|
161
|
-
_stopRecoveryTimer() {
|
|
162
|
-
if (this.recoveryTimer) {
|
|
163
|
-
clearInterval(this.recoveryTimer);
|
|
164
|
-
this.recoveryTimer = null;
|
|
165
|
-
}
|
|
166
|
-
}
|
|
167
|
-
_updateCurrentTempEstimate() {
|
|
168
|
-
if (this.currentTempEstimate == null || this.recoveryRate == null || this.inputTemp == null) {
|
|
169
|
-
this._api.log.error('Unable to update current temp estimate');
|
|
170
|
-
this._stopRecoveryTimer();
|
|
171
|
-
return;
|
|
172
|
-
}
|
|
173
|
-
const ceiling = Math.round(this.inputTemp + (this.nextAvailability / 100) * (this.set_point - this.inputTemp));
|
|
174
|
-
const oldEstimate = this.currentTempEstimate;
|
|
175
|
-
const newEstimate = this.currentTempEstimate + this.recoveryRate;
|
|
176
|
-
if (newEstimate > ceiling) {
|
|
177
|
-
this.currentTempEstimate = ceiling;
|
|
178
|
-
this._stopRecoveryTimer();
|
|
179
|
-
}
|
|
180
|
-
if (oldEstimate !== this.currentTempEstimate) {
|
|
181
|
-
this.didUpdate();
|
|
182
|
-
}
|
|
183
|
-
}
|
|
184
111
|
}
|
|
185
112
|
//# sourceMappingURL=waterHeater.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waterHeater.js","sourceRoot":"","sources":["../../src/model/waterHeater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"waterHeater.js","sourceRoot":"","sources":["../../src/model/waterHeater.ts"],"names":[],"mappings":"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"}
|
package/dist/platform.js
CHANGED
|
@@ -3,7 +3,7 @@ import { EconetApi } from './model/econet.js';
|
|
|
3
3
|
import { ThermostatAccessory } from './accessories/thermostatAccessory.js';
|
|
4
4
|
import { WaterHeaterAccessory } from './accessories/waterHeaterAccessory.js';
|
|
5
5
|
import { WATER_HEATER, THERMOSTAT } from './model/econet.js';
|
|
6
|
-
import {
|
|
6
|
+
import { fromCelsius } from './model/utils.js';
|
|
7
7
|
export class EconetRheemPlatform {
|
|
8
8
|
log;
|
|
9
9
|
config;
|
|
@@ -40,7 +40,7 @@ export class EconetRheemPlatform {
|
|
|
40
40
|
return;
|
|
41
41
|
}
|
|
42
42
|
try {
|
|
43
|
-
this.econetApi = await EconetApi.login(this.log, email, password, verbose);
|
|
43
|
+
this.econetApi = await EconetApi.login(this.log, email, password, this.api.user.storagePath(), verbose);
|
|
44
44
|
const equipmentMap = await this.econetApi.getEquipmentByType([THERMOSTAT, WATER_HEATER]);
|
|
45
45
|
const thermostats = equipmentMap.get(THERMOSTAT) || [];
|
|
46
46
|
const waterHeaters = equipmentMap.get(WATER_HEATER) || [];
|
|
@@ -107,14 +107,14 @@ export class EconetRheemPlatform {
|
|
|
107
107
|
const month = new Date().getMonth();
|
|
108
108
|
// Coldest: Jan, Feb, Dec
|
|
109
109
|
if (month === 0 || month === 1 || month === 11) {
|
|
110
|
-
return
|
|
110
|
+
return fromCelsius(10, units);
|
|
111
111
|
}
|
|
112
112
|
// Hottest: Jun, Jul, Aug
|
|
113
113
|
if (month === 5 || month === 6 || month === 7) {
|
|
114
|
-
return
|
|
114
|
+
return fromCelsius(20, units);
|
|
115
115
|
}
|
|
116
116
|
// All other months
|
|
117
|
-
return
|
|
117
|
+
return fromCelsius(15, units);
|
|
118
118
|
}
|
|
119
119
|
}
|
|
120
120
|
//# sourceMappingURL=platform.js.map
|
package/dist/platform.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"displayName": "Homebridge Econet Rheem",
|
|
5
5
|
"description": "Homebridge plugin based on pyeconet for control of Rheem water heaters",
|
|
6
6
|
"type": "module",
|
|
7
|
-
"version": "1.
|
|
7
|
+
"version": "1.4.0",
|
|
8
8
|
"homepage": "https://github.com/mpatfield/homebridge-econet-rheem#readme",
|
|
9
9
|
"repository": {
|
|
10
10
|
"type": "git",
|