homebridge-econet-rheem 1.5.19-beta.0 → 1.6.0-alpha.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/CHANGELOG.md +12 -4
- package/README.md +36 -6
- package/config.schema.json +117 -17
- package/dist/homebridge/platform.js +4 -1
- package/dist/homebridge/platform.js.map +1 -1
- package/dist/homebridge/settings.d.ts +3 -6
- package/dist/homebridge/settings.js +3 -6
- package/dist/homebridge/settings.js.map +1 -1
- package/dist/homebridge-ui/public/index.html +1 -1
- package/dist/i18n/en.d.ts +27 -12
- package/dist/i18n/en.js +28 -13
- package/dist/i18n/en.js.map +1 -1
- package/dist/i18n/i18n.d.ts +27 -12
- package/dist/i18n/template.d.ts +27 -12
- package/dist/i18n/zz.d.ts +27 -12
- package/dist/model/api.d.ts +14 -20
- package/dist/model/api.js +72 -210
- package/dist/model/api.js.map +1 -1
- package/dist/model/auth.d.ts +14 -6
- package/dist/model/auth.js +37 -35
- package/dist/model/auth.js.map +1 -1
- package/dist/model/equipment.d.ts +3 -1
- package/dist/model/equipment.js +6 -1
- package/dist/model/equipment.js.map +1 -1
- package/dist/model/mqtt.d.ts +33 -0
- package/dist/model/mqtt.js +221 -0
- package/dist/model/mqtt.js.map +1 -0
- package/dist/model/recoverySimulator.d.ts +2 -3
- package/dist/model/recoverySimulator.js +9 -13
- package/dist/model/recoverySimulator.js.map +1 -1
- package/dist/model/thermostat.d.ts +1 -1
- package/dist/model/thermostat.js +2 -2
- package/dist/model/thermostat.js.map +1 -1
- package/dist/model/types.d.ts +6 -2
- package/dist/model/types.js +0 -21
- package/dist/model/types.js.map +1 -1
- package/dist/model/waterHeater.d.ts +2 -4
- package/dist/model/waterHeater.js +7 -13
- package/dist/model/waterHeater.js.map +1 -1
- package/dist/tools/storage.d.ts +10 -3
- package/dist/tools/storage.js +68 -18
- package/dist/tools/storage.js.map +1 -1
- package/dist/tools/time.d.ts +1 -0
- package/dist/tools/time.js +1 -0
- package/dist/tools/time.js.map +1 -1
- package/package.json +2 -2
package/dist/i18n/zz.d.ts
CHANGED
|
@@ -2,8 +2,8 @@ declare const zz: {
|
|
|
2
2
|
config: {
|
|
3
3
|
continue: string;
|
|
4
4
|
description: {
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
account: string;
|
|
6
|
+
devices: string;
|
|
7
7
|
verbose: string;
|
|
8
8
|
wh_sim_disable: string;
|
|
9
9
|
};
|
|
@@ -11,8 +11,13 @@ declare const zz: {
|
|
|
11
11
|
support: string;
|
|
12
12
|
thankYou: string;
|
|
13
13
|
title: {
|
|
14
|
+
activeKey: string;
|
|
15
|
+
device: string;
|
|
16
|
+
devices: string;
|
|
17
|
+
deviceName: string;
|
|
14
18
|
email: string;
|
|
15
19
|
password: string;
|
|
20
|
+
serialNumber: string;
|
|
16
21
|
verbose: string;
|
|
17
22
|
wh_sim_disable: string;
|
|
18
23
|
};
|
|
@@ -54,16 +59,26 @@ declare const zz: {
|
|
|
54
59
|
retryInSeconds: string;
|
|
55
60
|
};
|
|
56
61
|
mqtt: {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
62
|
+
deviceAuthMissing: string;
|
|
63
|
+
deviceClientError: string;
|
|
64
|
+
deviceConnected: string;
|
|
65
|
+
deviceConnectionClosed: string;
|
|
66
|
+
deviceConnectionError: string;
|
|
67
|
+
deviceIdleConnection: string;
|
|
68
|
+
deviceNotConnected: string;
|
|
69
|
+
deviceParseFailed: string;
|
|
70
|
+
deviceReconnectInMinutes: string;
|
|
71
|
+
deviceReconnectInSeconds: string;
|
|
72
|
+
userAuthMissing: string;
|
|
73
|
+
userClientError: string;
|
|
74
|
+
userConnected: string;
|
|
75
|
+
userConnectionClosed: string;
|
|
76
|
+
userConnectionError: string;
|
|
77
|
+
userIdleConnection: string;
|
|
78
|
+
userNotConnected: string;
|
|
79
|
+
userParseFailed: string;
|
|
80
|
+
userReconnectInMinutes: string;
|
|
81
|
+
userReconnectInSeconds: string;
|
|
67
82
|
unstableConnection: string;
|
|
68
83
|
};
|
|
69
84
|
startup: {
|
package/dist/model/api.d.ts
CHANGED
|
@@ -1,38 +1,32 @@
|
|
|
1
1
|
import { Equipment } from './equipment.js';
|
|
2
2
|
import { Log } from '../tools/log.js';
|
|
3
|
+
type DeviceDetails = {
|
|
4
|
+
serialNumber: string;
|
|
5
|
+
deviceName: string;
|
|
6
|
+
activeKey: string;
|
|
7
|
+
};
|
|
3
8
|
export declare class EconetApi {
|
|
4
9
|
readonly log: Log;
|
|
5
10
|
private readonly email;
|
|
6
11
|
private readonly password;
|
|
7
|
-
readonly
|
|
12
|
+
private readonly devices;
|
|
8
13
|
private readonly debugMQTT;
|
|
9
|
-
private
|
|
14
|
+
private auth?;
|
|
10
15
|
private retryIndex;
|
|
11
16
|
readonly equipments: Map<string, Equipment>;
|
|
12
|
-
private
|
|
13
|
-
private
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
private idleMQTTTimer;
|
|
17
|
-
constructor(log: Log, email: string, password: string, persistPath: string, debugMQTT: boolean);
|
|
18
|
-
static connect(log: Log, email: string, password: string, persistPath: string, debugMQTT: boolean): Promise<EconetApi>;
|
|
17
|
+
private userClient?;
|
|
18
|
+
private deviceClients;
|
|
19
|
+
constructor(log: Log, email: string, password: string, devices: DeviceDetails[], debugMQTT: boolean);
|
|
20
|
+
static connect(log: Log, email: string, password: string, devices: DeviceDetails[], debugMQTT: boolean): Promise<EconetApi>;
|
|
19
21
|
teardown(): void;
|
|
20
22
|
publish(payload: {
|
|
21
23
|
[key: string]: number;
|
|
22
24
|
}, deviceId: string, serialNumber: string): void;
|
|
23
|
-
private get auth();
|
|
24
|
-
private saveTokenData;
|
|
25
25
|
private httpRequest;
|
|
26
26
|
private retryHTTPIfPossible;
|
|
27
27
|
private authenticate;
|
|
28
|
-
private
|
|
29
|
-
private mqttSubscribe;
|
|
30
|
-
private mqttMessageReceived;
|
|
31
|
-
private mqttConnectionClosed;
|
|
32
|
-
private resetIdleMQTTTimer;
|
|
33
|
-
private mqttReconnect;
|
|
28
|
+
private authenticateDevice;
|
|
34
29
|
private getLocations;
|
|
35
|
-
private
|
|
36
|
-
private logDebug;
|
|
37
|
-
private desensitize;
|
|
30
|
+
private setupMQTTConnections;
|
|
38
31
|
}
|
|
32
|
+
export {};
|
package/dist/model/api.js
CHANGED
|
@@ -1,32 +1,23 @@
|
|
|
1
1
|
import axios, { isAxiosError } from 'axios';
|
|
2
|
-
import
|
|
3
|
-
import { Auth } from './auth.js';
|
|
2
|
+
import { DeviceAuth, UserAuth } from './auth.js';
|
|
4
3
|
import { EquipmentType } from './constants.js';
|
|
5
|
-
import
|
|
4
|
+
import { EconetMQTT } from './mqtt.js';
|
|
6
5
|
import { Thermostat } from './thermostat.js';
|
|
7
6
|
import { WaterHeater } from './waterHeater.js';
|
|
8
7
|
import { strings } from '../i18n/i18n.js';
|
|
9
|
-
import {
|
|
10
|
-
import { MINUTE, SECOND } from '../tools/time.js';
|
|
11
|
-
import { LogType } from '../tools/log.js';
|
|
12
|
-
const CLEAR_BLADE_SYSTEM_KEY = 'e2e699cb0bb0bbb88fc8858cb5a401';
|
|
13
|
-
const CLEAR_BLADE_SYSTEM_SECRET = 'E2E699CB0BE6C6FADDB1B0BC9A20';
|
|
8
|
+
import { CLEARBLADE_HOST, CLEARBLADE_KEY, CLEARBLADE_SECRET } from '../homebridge/settings.js';
|
|
9
|
+
import { DELAYS, MINUTE, SECOND } from '../tools/time.js';
|
|
14
10
|
const BASE_HEADERS = {
|
|
15
|
-
'ClearBlade-SystemKey':
|
|
16
|
-
'ClearBlade-SystemSecret':
|
|
11
|
+
'ClearBlade-SystemKey': CLEARBLADE_KEY,
|
|
12
|
+
'ClearBlade-SystemSecret': CLEARBLADE_SECRET,
|
|
17
13
|
'Content-Type': 'application/json; charset=UTF-8',
|
|
18
14
|
};
|
|
19
|
-
const
|
|
20
|
-
const
|
|
21
|
-
const AUTH_URL = `${
|
|
22
|
-
const
|
|
23
|
-
const
|
|
24
|
-
const MQTT_TOPIC_REPORTED = 'user/%s/device/reported';
|
|
25
|
-
const MQTT_TOPIC_DESIRED = 'user/%s/device/desired';
|
|
15
|
+
const BASE_URL_V1 = `https://${CLEARBLADE_HOST}/api/v/1`;
|
|
16
|
+
const BASE_URL_V2 = `https://${CLEARBLADE_HOST}/api/v/2`;
|
|
17
|
+
const AUTH_URL = `${BASE_URL_V1}/user/auth`;
|
|
18
|
+
const AUTH_DEVICE_URL = `${BASE_URL_V2}/devices/${CLEARBLADE_KEY}/auth`;
|
|
19
|
+
const LOCATIONS_URL = `${BASE_URL_V1}/code/${CLEARBLADE_KEY}/getUserDataForApp`;
|
|
26
20
|
const HTTP_TIMEOUT = 10 * SECOND;
|
|
27
|
-
const MQTT_KEEPALIVE = 90;
|
|
28
|
-
const DELAYS = [5 * SECOND, 15 * SECOND, MINUTE, 2 * MINUTE, 5 * MINUTE];
|
|
29
|
-
const IDLE_CONNECTION_TIMER_INTERVAL = 16 * MINUTE;
|
|
30
21
|
const HTTP_RETRY_CODES = [
|
|
31
22
|
'ERR_NETWORK', // General network error in Axios
|
|
32
23
|
'ETIMEDOUT', // Request timed out
|
|
@@ -41,74 +32,57 @@ export class EconetApi {
|
|
|
41
32
|
log;
|
|
42
33
|
email;
|
|
43
34
|
password;
|
|
44
|
-
|
|
35
|
+
devices;
|
|
45
36
|
debugMQTT;
|
|
46
|
-
|
|
37
|
+
auth;
|
|
47
38
|
retryIndex = 0;
|
|
48
39
|
equipments = new Map();
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
reconnectCount = 0;
|
|
53
|
-
idleMQTTTimer = null;
|
|
54
|
-
constructor(log, email, password, persistPath, debugMQTT) {
|
|
40
|
+
userClient;
|
|
41
|
+
deviceClients = [];
|
|
42
|
+
constructor(log, email, password, devices, debugMQTT) {
|
|
55
43
|
this.log = log;
|
|
56
44
|
this.email = email;
|
|
57
45
|
this.password = password;
|
|
58
|
-
this.
|
|
46
|
+
this.devices = devices;
|
|
59
47
|
this.debugMQTT = debugMQTT;
|
|
60
48
|
}
|
|
61
|
-
static async connect(log, email, password,
|
|
62
|
-
const api = new EconetApi(log, email, password,
|
|
63
|
-
api.
|
|
49
|
+
static async connect(log, email, password, devices, debugMQTT) {
|
|
50
|
+
const api = new EconetApi(log, email, password, devices, debugMQTT);
|
|
51
|
+
api.auth = UserAuth.load(email);
|
|
64
52
|
let shouldContinue = true;
|
|
65
53
|
if (!api.auth) {
|
|
66
54
|
shouldContinue = await api.authenticate();
|
|
67
55
|
}
|
|
68
56
|
if (shouldContinue) {
|
|
69
57
|
await api.getLocations();
|
|
70
|
-
api.
|
|
71
|
-
|
|
58
|
+
for (const equipment of api.equipments.values()) {
|
|
59
|
+
const device = devices.find((device) => device.serialNumber === equipment.serialNumber);
|
|
60
|
+
if (device !== undefined && DeviceAuth.load(device.serialNumber, email) === undefined) {
|
|
61
|
+
await api.authenticateDevice(device.serialNumber, device.deviceName, device.activeKey);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
api.setupMQTTConnections();
|
|
72
65
|
}
|
|
73
66
|
return api;
|
|
74
67
|
}
|
|
75
68
|
teardown() {
|
|
76
|
-
this.
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
69
|
+
this.userClient?.teardown();
|
|
70
|
+
this.userClient = undefined;
|
|
71
|
+
while (this.deviceClients.length > 0) {
|
|
72
|
+
const client = this.deviceClients.shift();
|
|
73
|
+
client?.teardown();
|
|
80
74
|
}
|
|
81
75
|
}
|
|
82
76
|
publish(payload, deviceId, serialNumber) {
|
|
83
|
-
if (!this.
|
|
84
|
-
this.log.error(strings.mqtt.
|
|
77
|
+
if (!this.userClient) {
|
|
78
|
+
this.log.error(strings.mqtt.userNotConnected);
|
|
85
79
|
return;
|
|
86
80
|
}
|
|
87
81
|
if (!this.auth?.accountId) {
|
|
88
|
-
this.log.error(strings.mqtt.
|
|
82
|
+
this.log.error(strings.mqtt.userAuthMissing);
|
|
89
83
|
return;
|
|
90
84
|
}
|
|
91
|
-
|
|
92
|
-
const transactionId = `ANDROID_${dateTime}`;
|
|
93
|
-
const data = {
|
|
94
|
-
transactionId,
|
|
95
|
-
device_name: deviceId,
|
|
96
|
-
serial_number: serialNumber,
|
|
97
|
-
...payload,
|
|
98
|
-
};
|
|
99
|
-
const topic = MQTT_TOPIC_DESIRED.replace('%s', this.auth.accountId);
|
|
100
|
-
const message = JSON.stringify(data);
|
|
101
|
-
this.mqttClient.publish(topic, message);
|
|
102
|
-
this.logDebug(this.publish.name, topic, data);
|
|
103
|
-
}
|
|
104
|
-
get auth() {
|
|
105
|
-
return this._auth ?? null;
|
|
106
|
-
}
|
|
107
|
-
async saveTokenData(tokenData) {
|
|
108
|
-
this._auth = new Auth(tokenData);
|
|
109
|
-
if (this._auth) {
|
|
110
|
-
await this._auth.save(this.persistPath, this.email);
|
|
111
|
-
}
|
|
85
|
+
this.userClient.publish(this.auth.accountId, payload, deviceId, serialNumber);
|
|
112
86
|
}
|
|
113
87
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
114
88
|
async httpRequest(caller,
|
|
@@ -134,10 +108,10 @@ export class EconetApi {
|
|
|
134
108
|
res = await axios.get(url, config);
|
|
135
109
|
}
|
|
136
110
|
if (!res.data) {
|
|
137
|
-
this.log.warning(caller,
|
|
111
|
+
this.log.warning(caller, JSON.stringify(res.data));
|
|
138
112
|
throw new Error(strings.http.noDataReceived);
|
|
139
113
|
}
|
|
140
|
-
this.
|
|
114
|
+
this.log.ifVerbose(`${caller}() —`, url.substring(BASE_URL_V1.length + 1), `\n${JSON.stringify(res.data)}`);
|
|
141
115
|
this.retryIndex = 0;
|
|
142
116
|
return res.data;
|
|
143
117
|
}
|
|
@@ -149,12 +123,12 @@ export class EconetApi {
|
|
|
149
123
|
async retryHTTPIfPossible(err, caller, retry) {
|
|
150
124
|
if (!isAxiosError(err)) {
|
|
151
125
|
this.log.warning(err.message);
|
|
152
|
-
return
|
|
126
|
+
return undefined;
|
|
153
127
|
}
|
|
154
128
|
const errorCode = err.code || err.response?.status?.toString() || 'UNKNOWN';
|
|
155
129
|
if (!HTTP_RETRY_CODES.includes(errorCode) || this.retryIndex >= DELAYS.length) {
|
|
156
130
|
this.log.warning(err.message);
|
|
157
|
-
return
|
|
131
|
+
return undefined;
|
|
158
132
|
}
|
|
159
133
|
const retryDelay = DELAYS[Math.min(this.retryIndex, DELAYS.length - 1)];
|
|
160
134
|
if (retryDelay <= MINUTE) {
|
|
@@ -173,117 +147,21 @@ export class EconetApi {
|
|
|
173
147
|
if (!tokenData) {
|
|
174
148
|
return false;
|
|
175
149
|
}
|
|
176
|
-
|
|
150
|
+
this.auth = new UserAuth(tokenData);
|
|
151
|
+
this.auth.save(this.email);
|
|
177
152
|
this.log.always(strings.http.authSuccess);
|
|
178
153
|
return true;
|
|
179
154
|
}
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
this.log.error(strings.mqtt.authMissing);
|
|
186
|
-
return;
|
|
187
|
-
}
|
|
188
|
-
const timeString = Date.now().toString().replace('.', '').slice(0, 13);
|
|
189
|
-
const clientId = `${this.email}${timeString}_android`;
|
|
190
|
-
const options = {
|
|
191
|
-
clientId,
|
|
192
|
-
username: this.auth.token,
|
|
193
|
-
password: CLEAR_BLADE_SYSTEM_KEY,
|
|
194
|
-
rejectUnauthorized: true,
|
|
195
|
-
keepalive: MQTT_KEEPALIVE,
|
|
196
|
-
reconnectPeriod: 0,
|
|
197
|
-
};
|
|
198
|
-
this.mqttClient = mqtt.connect(MQTT_URL, options);
|
|
199
|
-
this.mqttClient.on('connect', () => this.mqttSubscribe(isStartup));
|
|
200
|
-
this.mqttClient.on('message', (topic, message) => this.mqttMessageReceived(topic, message.toString()));
|
|
201
|
-
this.mqttClient.on('close', () => this.mqttConnectionClosed());
|
|
202
|
-
this.mqttClient.on('error', (error) => this.log.ifVerbose(LogType.WARNING, strings.mqtt.clientError, error));
|
|
203
|
-
}
|
|
204
|
-
mqttSubscribe(isStartup) {
|
|
205
|
-
if (!this.mqttClient || !this.auth?.accountId) {
|
|
206
|
-
this.log.error(strings.mqtt.connectionError);
|
|
207
|
-
return;
|
|
208
|
-
}
|
|
209
|
-
this.mqttClient.subscribe(MQTT_TOPIC_REPORTED.replace('%s', this.auth.accountId));
|
|
210
|
-
this.mqttClient.subscribe(MQTT_TOPIC_DESIRED.replace('%s', this.auth.accountId));
|
|
211
|
-
this.log.always(strings.mqtt.connected);
|
|
212
|
-
if (isStartup) {
|
|
213
|
-
const randIndex = Math.floor(Math.random() * strings.startup.welcome.length);
|
|
214
|
-
this.log.always(strings.startup.setupComplete, strings.startup.welcome[randIndex]);
|
|
215
|
-
}
|
|
216
|
-
}
|
|
217
|
-
mqttMessageReceived(topic, message) {
|
|
218
|
-
this.reconnectCount = 0;
|
|
219
|
-
this.resetIdleMQTTTimer();
|
|
220
|
-
try {
|
|
221
|
-
const data = JSON.parse(message);
|
|
222
|
-
const equipment = data.serial_number ? this.equipments.get(data.serial_number) : null;
|
|
223
|
-
if (equipment) {
|
|
224
|
-
this.logDebug(this.mqttMessageReceived.name, topic, data);
|
|
225
|
-
equipment.updateFromMQTT(data);
|
|
226
|
-
if (this.debugMQTT) {
|
|
227
|
-
this.saveMQTT(data);
|
|
228
|
-
}
|
|
229
|
-
}
|
|
230
|
-
}
|
|
231
|
-
catch (e) {
|
|
232
|
-
this.log.warning(strings.mqtt.parseFailed, this.desensitize(message));
|
|
233
|
-
}
|
|
234
|
-
}
|
|
235
|
-
mqttConnectionClosed() {
|
|
236
|
-
this.log.ifVerbose(strings.mqtt.connectionClosed);
|
|
237
|
-
this.mqttReconnect();
|
|
238
|
-
}
|
|
239
|
-
resetIdleMQTTTimer() {
|
|
240
|
-
if (this.idleMQTTTimer) {
|
|
241
|
-
clearTimeout(this.idleMQTTTimer);
|
|
242
|
-
}
|
|
243
|
-
this.idleMQTTTimer = setTimeout(() => {
|
|
244
|
-
this.log.ifVerbose(strings.mqtt.idleConnection);
|
|
245
|
-
this.mqttReconnect();
|
|
246
|
-
}, IDLE_CONNECTION_TIMER_INTERVAL);
|
|
247
|
-
}
|
|
248
|
-
async mqttReconnect() {
|
|
249
|
-
if (!this.shouldReconnect || this.isReconnecting) {
|
|
250
|
-
return;
|
|
251
|
-
}
|
|
252
|
-
this.isReconnecting = true;
|
|
253
|
-
if (this.mqttClient) {
|
|
254
|
-
this.mqttClient.end(true);
|
|
255
|
-
this.mqttClient = null;
|
|
256
|
-
}
|
|
257
|
-
this.reconnectCount++;
|
|
258
|
-
if (this.reconnectCount % DELAYS.length === 0) {
|
|
259
|
-
try {
|
|
260
|
-
this.log.ifVerbose(strings.mqtt.unstableConnection);
|
|
261
|
-
this.log.ifVerbose(strings.http.reauthenticate);
|
|
262
|
-
await this.authenticate();
|
|
263
|
-
}
|
|
264
|
-
catch (error) {
|
|
265
|
-
this.log.ifVerbose(strings.http.reauthFailed, error);
|
|
266
|
-
}
|
|
267
|
-
}
|
|
268
|
-
const reconnectDelay = DELAYS[Math.min(this.reconnectCount, DELAYS.length - 1)];
|
|
269
|
-
if (reconnectDelay < MINUTE) {
|
|
270
|
-
this.log.ifVerbose(strings.mqtt.reconnectInSeconds, reconnectDelay / SECOND);
|
|
271
|
-
}
|
|
272
|
-
else {
|
|
273
|
-
this.log.ifVerbose(strings.mqtt.reconnectInMinutes, reconnectDelay / MINUTE);
|
|
155
|
+
async authenticateDevice(serialNumber, deviceName, activeKey) {
|
|
156
|
+
const data = { deviceName, activeKey };
|
|
157
|
+
const tokenData = await this.httpRequest(this.authenticateDevice.name, data, AUTH_DEVICE_URL);
|
|
158
|
+
if (!tokenData) {
|
|
159
|
+
return false;
|
|
274
160
|
}
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
this.mqttConnect();
|
|
278
|
-
}, reconnectDelay);
|
|
161
|
+
DeviceAuth.save(serialNumber, tokenData, this.email);
|
|
162
|
+
return true;
|
|
279
163
|
}
|
|
280
164
|
async getLocations() {
|
|
281
|
-
// TODO remove when sure below works
|
|
282
|
-
// const data = {
|
|
283
|
-
// location_only: false,
|
|
284
|
-
// type: 'com.econet.econetconsumerandroid',
|
|
285
|
-
// version: '6.0.0-375-01b4870e',
|
|
286
|
-
// };
|
|
287
165
|
const data = { 'resource': 'friedrich' };
|
|
288
166
|
const locationsData = await this.httpRequest(this.getLocations.name, data, LOCATIONS_URL);
|
|
289
167
|
if (!locationsData) {
|
|
@@ -299,7 +177,7 @@ export class EconetApi {
|
|
|
299
177
|
equipment = new Thermostat(this, equipmentData);
|
|
300
178
|
break;
|
|
301
179
|
case EquipmentType.WATER_HEATER:
|
|
302
|
-
equipment =
|
|
180
|
+
equipment = new WaterHeater(this, equipmentData);
|
|
303
181
|
break;
|
|
304
182
|
default:
|
|
305
183
|
this.log.error(strings.equipment.unsupported, equipmentData.device_type);
|
|
@@ -318,47 +196,31 @@ export class EconetApi {
|
|
|
318
196
|
}
|
|
319
197
|
;
|
|
320
198
|
}
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
const valuesObject = objectString ? JSON.parse(objectString) : {};
|
|
325
|
-
for (const [key, value] of Object.entries(data)) {
|
|
326
|
-
if (ignoreKeys.has(key) || value.toString.length === 0) {
|
|
327
|
-
continue;
|
|
328
|
-
}
|
|
329
|
-
let valuesArray = valuesObject[key] ?? [];
|
|
330
|
-
const valuesSet = new Set(valuesArray);
|
|
331
|
-
valuesSet.add(value);
|
|
332
|
-
valuesArray = Array.from(valuesSet);
|
|
333
|
-
valuesObject[key] = valuesArray;
|
|
334
|
-
}
|
|
335
|
-
await storageSet(this.persistPath, STORAGE_KEY_MQTT, JSON.stringify(valuesObject));
|
|
336
|
-
}
|
|
337
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
338
|
-
logDebug(caller, message, data) {
|
|
339
|
-
if (this.log.verbose) {
|
|
340
|
-
this.log.ifVerbose(`${caller}() —`, this.desensitize(message), `\n${this.desensitize(data)}`);
|
|
341
|
-
}
|
|
342
|
-
}
|
|
343
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
344
|
-
desensitize(data) {
|
|
345
|
-
let output;
|
|
346
|
-
if (typeof data === 'string') {
|
|
347
|
-
output = data;
|
|
199
|
+
setupMQTTConnections() {
|
|
200
|
+
if (!this.equipments.size) {
|
|
201
|
+
return;
|
|
348
202
|
}
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
const regex = new RegExp(`"${key}"\\s*:\\s*(".*?"|\\d+|true|false|null)`, 'gi');
|
|
353
|
-
output = output.replace(regex, `"${key}": "${strings.general.redacted}"`);
|
|
354
|
-
});
|
|
203
|
+
if (!this.auth?.token) {
|
|
204
|
+
this.log.error(strings.mqtt.userAuthMissing);
|
|
205
|
+
return;
|
|
355
206
|
}
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
207
|
+
this.userClient = EconetMQTT.connectUserClient(this.auth, this.email, this.equipments, this.log, this.debugMQTT, async () => {
|
|
208
|
+
await this.authenticate();
|
|
209
|
+
});
|
|
210
|
+
for (const equipment of this.equipments.values()) {
|
|
211
|
+
const device = this.devices.find((device) => device.serialNumber === equipment.serialNumber);
|
|
212
|
+
if (device === undefined) {
|
|
213
|
+
continue;
|
|
214
|
+
}
|
|
215
|
+
const auth = DeviceAuth.load(device.serialNumber, this.email);
|
|
216
|
+
if (auth === undefined) {
|
|
217
|
+
this.log.error(strings.mqtt.deviceAuthMissing);
|
|
218
|
+
continue;
|
|
219
|
+
}
|
|
220
|
+
const equipments = [[equipment.serialNumber, equipment]];
|
|
221
|
+
const deviceClient = EconetMQTT.connectDeviceClient(auth, new Map(equipments), this.log, this.debugMQTT);
|
|
222
|
+
this.deviceClients.push(deviceClient);
|
|
360
223
|
}
|
|
361
|
-
return output;
|
|
362
224
|
}
|
|
363
225
|
}
|
|
364
226
|
//# sourceMappingURL=api.js.map
|
package/dist/model/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/model/api.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/model/api.ts"],"names":[],"mappings":"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"}
|
package/dist/model/auth.d.ts
CHANGED
|
@@ -1,11 +1,19 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare class
|
|
1
|
+
import { DeviceTokenData, UserTokenData } from './types.js';
|
|
2
|
+
export declare class UserAuth {
|
|
3
3
|
private readonly data;
|
|
4
|
-
constructor(data:
|
|
4
|
+
constructor(data: UserTokenData);
|
|
5
5
|
get token(): string;
|
|
6
6
|
get userId(): string;
|
|
7
7
|
get accountId(): string;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
save(encryptionKey: string): void;
|
|
9
|
+
static load(encryptionKey: string): UserAuth | undefined;
|
|
10
|
+
}
|
|
11
|
+
export declare class DeviceAuth {
|
|
12
|
+
private readonly data;
|
|
13
|
+
static cache: Map<string, DeviceAuth>;
|
|
14
|
+
private constructor();
|
|
15
|
+
get name(): string;
|
|
16
|
+
get token(): string;
|
|
17
|
+
static save(serialNumber: string, data: DeviceTokenData, encryptionKey: string): void;
|
|
18
|
+
static load(serialNumber: string, encryptionKey: string): DeviceAuth | undefined;
|
|
11
19
|
}
|
package/dist/model/auth.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
3
|
-
export class Auth {
|
|
1
|
+
import { Storage, STORAGE_KEY_USER_AUTH } from '../tools/storage.js';
|
|
2
|
+
export class UserAuth {
|
|
4
3
|
data;
|
|
5
4
|
constructor(data) {
|
|
6
5
|
this.data = data;
|
|
@@ -14,43 +13,46 @@ export class Auth {
|
|
|
14
13
|
get accountId() {
|
|
15
14
|
return this.data.options.account_id;
|
|
16
15
|
}
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
const digest = Auth.digest(encryptionKey);
|
|
26
|
-
const iv = crypto.randomBytes(16);
|
|
27
|
-
const cipher = crypto.createCipheriv('aes-256-cbc', digest, iv);
|
|
28
|
-
const encrypted = Buffer.concat([cipher.update(serailzed, 'utf8'), cipher.final()]);
|
|
29
|
-
const final = iv.toString('hex') + ':' + encrypted.toString('hex');
|
|
30
|
-
await storageSet(filePath, STORAGE_KEY_AUTH, final);
|
|
31
|
-
}
|
|
32
|
-
catch (err) {
|
|
33
|
-
// Nothing
|
|
16
|
+
save(encryptionKey) {
|
|
17
|
+
const serialized = JSON.stringify({ data: this.data });
|
|
18
|
+
Storage.set(STORAGE_KEY_USER_AUTH, serialized, encryptionKey);
|
|
19
|
+
}
|
|
20
|
+
static load(encryptionKey) {
|
|
21
|
+
const decrypted = Storage.get(STORAGE_KEY_USER_AUTH, encryptionKey);
|
|
22
|
+
if (decrypted === undefined) {
|
|
23
|
+
return;
|
|
34
24
|
}
|
|
25
|
+
const obj = JSON.parse(decrypted);
|
|
26
|
+
return new UserAuth(obj.data);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
export class DeviceAuth {
|
|
30
|
+
data;
|
|
31
|
+
static cache = new Map();
|
|
32
|
+
constructor(data) {
|
|
33
|
+
this.data = data;
|
|
34
|
+
}
|
|
35
|
+
get name() {
|
|
36
|
+
return this.data.deviceName;
|
|
37
|
+
}
|
|
38
|
+
get token() {
|
|
39
|
+
return this.data.deviceToken;
|
|
40
|
+
}
|
|
41
|
+
static save(serialNumber, data, encryptionKey) {
|
|
42
|
+
const serialized = JSON.stringify({ data });
|
|
43
|
+
Storage.set(serialNumber, serialized, encryptionKey);
|
|
44
|
+
DeviceAuth.cache.set(serialNumber, new DeviceAuth(data));
|
|
35
45
|
}
|
|
36
|
-
static
|
|
37
|
-
|
|
38
|
-
const
|
|
39
|
-
if (
|
|
40
|
-
return
|
|
46
|
+
static load(serialNumber, encryptionKey) {
|
|
47
|
+
if (!this.cache.has(serialNumber)) {
|
|
48
|
+
const decrypted = Storage.get(serialNumber, encryptionKey);
|
|
49
|
+
if (decrypted === undefined) {
|
|
50
|
+
return;
|
|
41
51
|
}
|
|
42
|
-
const digest = Auth.digest(encryptionKey);
|
|
43
|
-
const [ivHex, encryptedHex] = final.split(':');
|
|
44
|
-
const iv = Buffer.from(ivHex, 'hex');
|
|
45
|
-
const encrypted = Buffer.from(encryptedHex, 'hex');
|
|
46
|
-
const decipher = crypto.createDecipheriv('aes-256-cbc', digest, iv);
|
|
47
|
-
const decrypted = Buffer.concat([decipher.update(encrypted), decipher.final()]).toString('utf8');
|
|
48
52
|
const obj = JSON.parse(decrypted);
|
|
49
|
-
|
|
50
|
-
}
|
|
51
|
-
catch {
|
|
52
|
-
return null;
|
|
53
|
+
this.cache.set(serialNumber, new DeviceAuth(obj.data));
|
|
53
54
|
}
|
|
55
|
+
return this.cache.get(serialNumber);
|
|
54
56
|
}
|
|
55
57
|
}
|
|
56
58
|
//# sourceMappingURL=auth.js.map
|