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/model/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/model/auth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/model/auth.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAErE,MAAM,OAAO,QAAQ;IAEU;IAA7B,YAA6B,IAAmB;QAAnB,SAAI,GAAJ,IAAI,CAAe;IAChD,CAAC;IAED,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;IAED,IAAI,CAAC,aAAqB;QACxB,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACvD,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,aAAqB;QAE/B,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,aAAa,CAAC,CAAC;QACpE,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,OAAO;QACT,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAA4B,CAAC;QAC7D,OAAO,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;CACF;AAED,MAAM,OAAO,UAAU;IAIgB;IAFrC,MAAM,CAAC,KAAK,GAAG,IAAI,GAAG,EAAsB,CAAC;IAE7C,YAAqC,IAAqB;QAArB,SAAI,GAAJ,IAAI,CAAiB;IAC1D,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;IAC9B,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,YAAoB,EAAE,IAAqB,EAAE,aAAqB;QAC5E,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5C,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;QAErD,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,YAAoB,EAAE,aAAqB;QAErD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;YAElC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;YAC3D,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC5B,OAAO;YACT,CAAC;YAED,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAA8B,CAAC;YAC/D,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QACzD,CAAC;QAED,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACtC,CAAC"}
|
|
@@ -6,6 +6,7 @@ export declare abstract class Equipment {
|
|
|
6
6
|
private readonly api;
|
|
7
7
|
private device_id?;
|
|
8
8
|
private serial_number?;
|
|
9
|
+
private mac_address?;
|
|
9
10
|
private device_name?;
|
|
10
11
|
private alert_count;
|
|
11
12
|
private temp_units;
|
|
@@ -15,6 +16,7 @@ export declare abstract class Equipment {
|
|
|
15
16
|
abstract get type(): EquipmentType;
|
|
16
17
|
get deviceId(): string;
|
|
17
18
|
get serialNumber(): string;
|
|
19
|
+
get macAddress(): string;
|
|
18
20
|
get deviceName(): string;
|
|
19
21
|
get hasAlert(): boolean;
|
|
20
22
|
get units(): TemperatureUnits;
|
|
@@ -22,7 +24,7 @@ export declare abstract class Equipment {
|
|
|
22
24
|
protected get log(): Log;
|
|
23
25
|
setOnUpdateCallback(callback: (serialNumber: string) => void): void;
|
|
24
26
|
protected didUpdate(): void;
|
|
25
|
-
|
|
27
|
+
updateFromUserMQTT(update: MQTTData): void;
|
|
26
28
|
publish(payload: {
|
|
27
29
|
[key: string]: number;
|
|
28
30
|
}, deviceId: string, serialNumber: string): void;
|
package/dist/model/equipment.js
CHANGED
|
@@ -4,6 +4,7 @@ export class Equipment {
|
|
|
4
4
|
api;
|
|
5
5
|
device_id;
|
|
6
6
|
serial_number;
|
|
7
|
+
mac_address;
|
|
7
8
|
device_name;
|
|
8
9
|
alert_count = 0;
|
|
9
10
|
temp_units = TemperatureUnits.CELSIUS;
|
|
@@ -13,6 +14,7 @@ export class Equipment {
|
|
|
13
14
|
this.api = api;
|
|
14
15
|
this.device_id = data.device_name;
|
|
15
16
|
this.serial_number = data.serial_number;
|
|
17
|
+
this.mac_address = data.mac_address;
|
|
16
18
|
this.device_name = data['@NAME']?.value ?? strings.general.brand;
|
|
17
19
|
this.alert_count = data['@ALERTCOUNT'] ?? 0;
|
|
18
20
|
this.temp_units = data['@SETPOINT']?.constraints?.units?.includes('F') ? TemperatureUnits.FAHRENHEIT : TemperatureUnits.CELSIUS;
|
|
@@ -23,6 +25,9 @@ export class Equipment {
|
|
|
23
25
|
get serialNumber() {
|
|
24
26
|
return this.serial_number || strings.general.undefined;
|
|
25
27
|
}
|
|
28
|
+
get macAddress() {
|
|
29
|
+
return this.mac_address || strings.general.undefined;
|
|
30
|
+
}
|
|
26
31
|
get deviceName() {
|
|
27
32
|
return this.device_name || strings.general.undefined;
|
|
28
33
|
}
|
|
@@ -46,7 +51,7 @@ export class Equipment {
|
|
|
46
51
|
this._onUpdateCallback(this.serialNumber);
|
|
47
52
|
}
|
|
48
53
|
}
|
|
49
|
-
|
|
54
|
+
updateFromUserMQTT(update) {
|
|
50
55
|
if (update['@ALERTCOUNT'] !== undefined) {
|
|
51
56
|
this.alert_count = update['@ALERTCOUNT'];
|
|
52
57
|
this.log.ifVerbose(strings.debug.alertCount, this.deviceName, this.alert_count);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"equipment.js","sourceRoot":"","sources":["../../src/model/equipment.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGjE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAI1C,MAAM,OAAgB,SAAS;
|
|
1
|
+
{"version":3,"file":"equipment.js","sourceRoot":"","sources":["../../src/model/equipment.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGjE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAI1C,MAAM,OAAgB,SAAS;IAWA;IAVrB,SAAS,CAAiB;IAC1B,aAAa,CAAiB;IAC9B,WAAW,CAAiB;IAC5B,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,YAA6B,GAAc,EAAE,IAAmB;QAAnC,QAAG,GAAH,GAAG,CAAW;QACzC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC;QAClC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;QACjE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC;IAClI,CAAC;IAID,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC;IACrD,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC;IACzD,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC;IACvD,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC;IACvD,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,IAAc,GAAG;QACf,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,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,kBAAkB,CAAC,MAAgB;QAEjC,IAAI,MAAM,CAAC,aAAa,CAAC,KAAK,SAAS,EAAE,CAAC;YACxC,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;YACzC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAClF,CAAC;IACH,CAAC;IAED,OAAO,CAAC,OAAkC,EAAE,QAAgB,EAAE,YAAoB;QAChF,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;IACpD,CAAC;CACF"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { DeviceAuth, UserAuth } from './auth.js';
|
|
2
|
+
import { Equipment } from './equipment.js';
|
|
3
|
+
import { Log } from '../tools/log.js';
|
|
4
|
+
export declare class EconetMQTT {
|
|
5
|
+
private readonly type;
|
|
6
|
+
private readonly token;
|
|
7
|
+
private readonly topics;
|
|
8
|
+
private readonly clientId;
|
|
9
|
+
private readonly equipments;
|
|
10
|
+
private readonly log;
|
|
11
|
+
private readonly debug;
|
|
12
|
+
private readonly onUnstable;
|
|
13
|
+
private client?;
|
|
14
|
+
private idleTimer?;
|
|
15
|
+
private shouldReconnect;
|
|
16
|
+
private isReconnecting;
|
|
17
|
+
private reconnectCount;
|
|
18
|
+
static connectUserClient(auth: UserAuth, email: string, equipments: Map<string, Equipment>, log: Log, debug: boolean, onUnstable: () => (Promise<void>)): EconetMQTT;
|
|
19
|
+
static connectDeviceClient(auth: DeviceAuth, equipments: Map<string, Equipment>, log: Log, debug: boolean): EconetMQTT;
|
|
20
|
+
private constructor();
|
|
21
|
+
private connect;
|
|
22
|
+
publish(accountId: string, payload: {
|
|
23
|
+
[key: string]: number;
|
|
24
|
+
}, deviceId: string, serialNumber: string): void;
|
|
25
|
+
teardown(): void;
|
|
26
|
+
private subscribe;
|
|
27
|
+
private messageReceived;
|
|
28
|
+
private connectionClosed;
|
|
29
|
+
private resetIdleTimer;
|
|
30
|
+
private reconnect;
|
|
31
|
+
private string;
|
|
32
|
+
private saveData;
|
|
33
|
+
}
|
|
@@ -0,0 +1,221 @@
|
|
|
1
|
+
import mqtt from 'mqtt';
|
|
2
|
+
import { strings } from '../i18n/i18n.js';
|
|
3
|
+
import { CLEARBLADE_HOST, CLEARBLADE_KEY } from '../homebridge/settings.js';
|
|
4
|
+
import { LogType } from '../tools/log.js';
|
|
5
|
+
import { Storage, STORAGE_KEY_MQTT } from '../tools/storage.js';
|
|
6
|
+
import { DELAYS, MINUTE, SECOND } from '../tools/time.js';
|
|
7
|
+
const BROKER_URL = `mqtts://${CLEARBLADE_HOST}:1884`;
|
|
8
|
+
const TOPIC_REPORTED = 'user/%s/device/reported';
|
|
9
|
+
const TOPIC_DESIRED = 'user/%s/device/desired';
|
|
10
|
+
const TOPIC_DEVICE = 'device/%s/%s/4736/reported'; // TODO always 4736?
|
|
11
|
+
const KEEPALIVE = 90;
|
|
12
|
+
const IDLE_CONNECTION_TIMER_INTERVAL = 16 * MINUTE;
|
|
13
|
+
var Type;
|
|
14
|
+
(function (Type) {
|
|
15
|
+
Type[Type["USER"] = 0] = "USER";
|
|
16
|
+
Type[Type["DEVICE"] = 1] = "DEVICE";
|
|
17
|
+
})(Type || (Type = {}));
|
|
18
|
+
export class EconetMQTT {
|
|
19
|
+
type;
|
|
20
|
+
token;
|
|
21
|
+
topics;
|
|
22
|
+
clientId;
|
|
23
|
+
equipments;
|
|
24
|
+
log;
|
|
25
|
+
debug;
|
|
26
|
+
onUnstable;
|
|
27
|
+
client;
|
|
28
|
+
idleTimer;
|
|
29
|
+
shouldReconnect = true;
|
|
30
|
+
isReconnecting = false;
|
|
31
|
+
reconnectCount = 0;
|
|
32
|
+
static connectUserClient(auth, email, equipments, log, debug, onUnstable) {
|
|
33
|
+
const topics = [
|
|
34
|
+
TOPIC_REPORTED.replace('%s', auth.accountId),
|
|
35
|
+
TOPIC_DESIRED.replace('%s', auth.accountId),
|
|
36
|
+
];
|
|
37
|
+
const timeString = Date.now().toString().replace('.', '').slice(0, 13);
|
|
38
|
+
const clientId = `${email}${timeString}_android`;
|
|
39
|
+
const mqtt = new EconetMQTT(Type.USER, auth.token, topics, clientId, equipments, log, debug, onUnstable);
|
|
40
|
+
mqtt.connect(true);
|
|
41
|
+
return mqtt;
|
|
42
|
+
}
|
|
43
|
+
static connectDeviceClient(auth, equipments, log, debug) {
|
|
44
|
+
const equipment = equipments.entries().next().value?.[1];
|
|
45
|
+
if (equipment === undefined) {
|
|
46
|
+
throw new Error('Device client requires equipment');
|
|
47
|
+
}
|
|
48
|
+
const topics = [
|
|
49
|
+
TOPIC_DEVICE.replace('%s', equipment.macAddress).replace('%s', equipment.serialNumber),
|
|
50
|
+
];
|
|
51
|
+
const mqtt = new EconetMQTT(Type.DEVICE, auth.token, topics, undefined, equipments, log, debug);
|
|
52
|
+
mqtt.connect();
|
|
53
|
+
return mqtt;
|
|
54
|
+
}
|
|
55
|
+
constructor(type, token, topics, clientId, equipments, log, debug, onUnstable = undefined) {
|
|
56
|
+
this.type = type;
|
|
57
|
+
this.token = token;
|
|
58
|
+
this.topics = topics;
|
|
59
|
+
this.clientId = clientId;
|
|
60
|
+
this.equipments = equipments;
|
|
61
|
+
this.log = log;
|
|
62
|
+
this.debug = debug;
|
|
63
|
+
this.onUnstable = onUnstable;
|
|
64
|
+
}
|
|
65
|
+
connect(showStartupMessage = false) {
|
|
66
|
+
const options = {
|
|
67
|
+
clientId: this.clientId,
|
|
68
|
+
username: this.token,
|
|
69
|
+
password: CLEARBLADE_KEY,
|
|
70
|
+
rejectUnauthorized: true,
|
|
71
|
+
keepalive: KEEPALIVE,
|
|
72
|
+
reconnectPeriod: 0,
|
|
73
|
+
};
|
|
74
|
+
this.client = mqtt.connect(BROKER_URL, options);
|
|
75
|
+
this.client.on('connect', () => this.subscribe(showStartupMessage));
|
|
76
|
+
this.client.on('message', (topic, message) => this.messageReceived(topic, message.toString()));
|
|
77
|
+
this.client.on('close', () => this.connectionClosed());
|
|
78
|
+
this.client.on('error', (error) => this.log.ifVerbose(LogType.WARNING, this.string('deviceClientError', 'userClientError'), error));
|
|
79
|
+
}
|
|
80
|
+
publish(accountId, payload, deviceId, serialNumber) {
|
|
81
|
+
if (!this.client || !this.client.connected) {
|
|
82
|
+
this.log.error(this.string('deviceNotConnected', 'userNotConnected'));
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
const dateTime = new Date().toISOString().replace(/\.\d{3}Z$/, '');
|
|
86
|
+
const transactionId = `ANDROID_${dateTime}`;
|
|
87
|
+
const data = {
|
|
88
|
+
transactionId,
|
|
89
|
+
device_name: deviceId,
|
|
90
|
+
serial_number: serialNumber,
|
|
91
|
+
...payload,
|
|
92
|
+
};
|
|
93
|
+
const topic = TOPIC_DESIRED.replace('%s', accountId);
|
|
94
|
+
const message = JSON.stringify(data);
|
|
95
|
+
this.client.publish(topic, message);
|
|
96
|
+
this.log.ifVerbose(`${this.publish.name}() —`, topic, `\n${JSON.stringify(data)}`);
|
|
97
|
+
}
|
|
98
|
+
teardown() {
|
|
99
|
+
this.shouldReconnect = false;
|
|
100
|
+
if (this.client) {
|
|
101
|
+
this.client.end(true);
|
|
102
|
+
this.client = undefined;
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
subscribe(showStartupMessage) {
|
|
106
|
+
if (!this.client) {
|
|
107
|
+
this.log.error(this.string('deviceConnectionError', 'userConnectionError'));
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
for (const topic of this.topics) {
|
|
111
|
+
this.client.subscribe(topic);
|
|
112
|
+
}
|
|
113
|
+
this.log.always(this.string('deviceConnected', 'userConnected'));
|
|
114
|
+
if (showStartupMessage) {
|
|
115
|
+
const randIndex = Math.floor(Math.random() * strings.startup.welcome.length);
|
|
116
|
+
this.log.always(strings.startup.setupComplete, strings.startup.welcome[randIndex]);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
messageReceived(topic, message) {
|
|
120
|
+
this.reconnectCount = 0;
|
|
121
|
+
this.resetIdleTimer();
|
|
122
|
+
try {
|
|
123
|
+
const data = JSON.parse(message);
|
|
124
|
+
switch (this.type) {
|
|
125
|
+
case Type.DEVICE: {
|
|
126
|
+
//const equipment = this.equipments.entries().next()!;
|
|
127
|
+
// TODO equipment.updateFromDeviceMQTT(data);
|
|
128
|
+
break;
|
|
129
|
+
}
|
|
130
|
+
case Type.USER: {
|
|
131
|
+
const equipment = data.serial_number ? this.equipments.get(data.serial_number) : undefined;
|
|
132
|
+
if (equipment === undefined) {
|
|
133
|
+
return;
|
|
134
|
+
}
|
|
135
|
+
equipment.updateFromUserMQTT(data);
|
|
136
|
+
break;
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
this.log.ifVerbose(`${this.messageReceived.name}() —`, topic, `\n${JSON.stringify(data)}`);
|
|
140
|
+
if (this.debug) {
|
|
141
|
+
this.saveData(data);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
catch (e) {
|
|
145
|
+
this.log.warning(this.string('deviceParseFailed', 'userParseFailed'), JSON.stringify(message));
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
connectionClosed() {
|
|
149
|
+
this.log.ifVerbose(this.string('deviceConnectionClosed', 'deviceConnectionClosed'));
|
|
150
|
+
this.reconnect();
|
|
151
|
+
}
|
|
152
|
+
resetIdleTimer() {
|
|
153
|
+
if (this.idleTimer) {
|
|
154
|
+
clearTimeout(this.idleTimer);
|
|
155
|
+
}
|
|
156
|
+
this.idleTimer = setTimeout(() => {
|
|
157
|
+
this.log.ifVerbose(this.string('deviceIdleConnection', 'userIdleConnection'));
|
|
158
|
+
this.reconnect();
|
|
159
|
+
}, IDLE_CONNECTION_TIMER_INTERVAL);
|
|
160
|
+
}
|
|
161
|
+
async reconnect() {
|
|
162
|
+
if (!this.shouldReconnect || this.isReconnecting) {
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
165
|
+
this.isReconnecting = true;
|
|
166
|
+
if (this.client) {
|
|
167
|
+
this.client.end(true);
|
|
168
|
+
this.client = undefined;
|
|
169
|
+
}
|
|
170
|
+
this.reconnectCount++;
|
|
171
|
+
if (this.type === Type.USER && this.reconnectCount % DELAYS.length === 0) {
|
|
172
|
+
try {
|
|
173
|
+
this.log.ifVerbose(strings.mqtt.unstableConnection);
|
|
174
|
+
this.log.ifVerbose(strings.http.reauthenticate);
|
|
175
|
+
await this.onUnstable?.();
|
|
176
|
+
}
|
|
177
|
+
catch (error) {
|
|
178
|
+
this.log.ifVerbose(strings.http.reauthFailed, error);
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
const reconnectDelay = DELAYS[Math.min(this.reconnectCount, DELAYS.length - 1)];
|
|
182
|
+
if (reconnectDelay < MINUTE) {
|
|
183
|
+
this.log.ifVerbose(this.string('deviceReconnectInSeconds', 'userReconnectInSeconds'), reconnectDelay / SECOND);
|
|
184
|
+
}
|
|
185
|
+
else {
|
|
186
|
+
this.log.ifVerbose(this.string('deviceReconnectInMinutes', 'userReconnectInMinutes'), reconnectDelay / MINUTE);
|
|
187
|
+
}
|
|
188
|
+
setTimeout(() => {
|
|
189
|
+
this.isReconnecting = false;
|
|
190
|
+
this.connect();
|
|
191
|
+
}, reconnectDelay);
|
|
192
|
+
}
|
|
193
|
+
string(deviceLog, userLog) {
|
|
194
|
+
switch (this.type) {
|
|
195
|
+
case Type.DEVICE:
|
|
196
|
+
return strings.mqtt[deviceLog];
|
|
197
|
+
case Type.USER:
|
|
198
|
+
return strings.mqtt[userLog];
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
saveData(data) {
|
|
202
|
+
const objectString = Storage.get(STORAGE_KEY_MQTT);
|
|
203
|
+
const valuesObject = objectString ? JSON.parse(objectString) : {};
|
|
204
|
+
let changed = false;
|
|
205
|
+
for (const [key, value] of Object.entries(data)) {
|
|
206
|
+
if (key === 'transactionId' || value.toString.length === 0) {
|
|
207
|
+
continue;
|
|
208
|
+
}
|
|
209
|
+
let valuesArray = valuesObject[key] ?? [];
|
|
210
|
+
const valuesSet = new Set(valuesArray);
|
|
211
|
+
valuesSet.add(value);
|
|
212
|
+
valuesArray = Array.from(valuesSet);
|
|
213
|
+
valuesObject[key] = valuesArray;
|
|
214
|
+
changed = true;
|
|
215
|
+
}
|
|
216
|
+
if (changed) {
|
|
217
|
+
Storage.set(STORAGE_KEY_MQTT, JSON.stringify(valuesObject));
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
//# sourceMappingURL=mqtt.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mqtt.js","sourceRoot":"","sources":["../../src/model/mqtt.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { WaterHeater } from './waterHeater.js';
|
|
2
2
|
export declare class RecoverySimulator {
|
|
3
|
-
readonly waterHeater
|
|
3
|
+
private readonly waterHeater;
|
|
4
4
|
private readonly onUpdate;
|
|
5
5
|
private readonly minRecoveryRate;
|
|
6
6
|
private readonly defaultRecoveryRate;
|
|
@@ -13,8 +13,7 @@ export declare class RecoverySimulator {
|
|
|
13
13
|
private simulatedTemp;
|
|
14
14
|
private recoveryStartTime;
|
|
15
15
|
private recoveryStartTemp;
|
|
16
|
-
|
|
17
|
-
private constructor();
|
|
16
|
+
constructor(waterHeater: WaterHeater, onUpdate: () => void);
|
|
18
17
|
currentTemp(inputTemp: number): number;
|
|
19
18
|
private get isRecovering();
|
|
20
19
|
handleUpdate(waterHeater: WaterHeater): void;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { TemperatureUnits } from './constants.js';
|
|
2
2
|
import { HOUR, MINUTE } from '../tools/time.js';
|
|
3
|
-
import {
|
|
3
|
+
import { Storage, STORAGE_KEY_RECOVERY_RATES } from '../tools/storage.js';
|
|
4
4
|
// in degrees Celsius per hour
|
|
5
5
|
const DEFAULT_RECOVERY_RATE = 20;
|
|
6
6
|
const MINIMUM_RECOVERY_RATE = 1;
|
|
@@ -19,11 +19,6 @@ export class RecoverySimulator {
|
|
|
19
19
|
simulatedTemp;
|
|
20
20
|
recoveryStartTime = null;
|
|
21
21
|
recoveryStartTemp = null;
|
|
22
|
-
static async create(waterHeater, onUpdate) {
|
|
23
|
-
const simulator = new RecoverySimulator(waterHeater, onUpdate);
|
|
24
|
-
simulator.recoveryRates = await simulator._loadRecoveryRates() ?? [simulator.defaultRecoveryRate];
|
|
25
|
-
return simulator;
|
|
26
|
-
}
|
|
27
22
|
constructor(waterHeater, onUpdate) {
|
|
28
23
|
this.waterHeater = waterHeater;
|
|
29
24
|
this.onUpdate = onUpdate;
|
|
@@ -34,6 +29,7 @@ export class RecoverySimulator {
|
|
|
34
29
|
this.simulatedTemp = this.setPoint;
|
|
35
30
|
this.minRecoveryRate = MINIMUM_RECOVERY_RATE * (waterHeater.units === TemperatureUnits.FAHRENHEIT ? 1.8 : 1);
|
|
36
31
|
this.defaultRecoveryRate = DEFAULT_RECOVERY_RATE * (waterHeater.units === TemperatureUnits.FAHRENHEIT ? 1.8 : 1);
|
|
32
|
+
this.recoveryRates = this._loadRecoveryRates() ?? [this.defaultRecoveryRate];
|
|
37
33
|
}
|
|
38
34
|
currentTemp(inputTemp) {
|
|
39
35
|
if (this.availability === 0 && !this.isRecovering) {
|
|
@@ -122,18 +118,18 @@ export class RecoverySimulator {
|
|
|
122
118
|
}
|
|
123
119
|
this._saveRecoveryRates();
|
|
124
120
|
}
|
|
125
|
-
|
|
126
|
-
const objectString =
|
|
121
|
+
getStoredRecoveryRates() {
|
|
122
|
+
const objectString = Storage.get(STORAGE_KEY_RECOVERY_RATES);
|
|
127
123
|
return objectString ? JSON.parse(objectString) : {};
|
|
128
124
|
}
|
|
129
|
-
|
|
130
|
-
const ratesObject =
|
|
125
|
+
_loadRecoveryRates() {
|
|
126
|
+
const ratesObject = this.getStoredRecoveryRates();
|
|
131
127
|
return ratesObject[this.serialNumber];
|
|
132
128
|
}
|
|
133
|
-
|
|
134
|
-
const ratesObject =
|
|
129
|
+
_saveRecoveryRates() {
|
|
130
|
+
const ratesObject = this.getStoredRecoveryRates();
|
|
135
131
|
ratesObject[this.serialNumber] = this.recoveryRates;
|
|
136
|
-
|
|
132
|
+
Storage.set(STORAGE_KEY_RECOVERY_RATES, JSON.stringify(ratesObject));
|
|
137
133
|
}
|
|
138
134
|
}
|
|
139
135
|
//# sourceMappingURL=recoverySimulator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recoverySimulator.js","sourceRoot":"","sources":["../../src/model/recoverySimulator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGlD,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"recoverySimulator.js","sourceRoot":"","sources":["../../src/model/recoverySimulator.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ export declare class Thermostat extends Equipment {
|
|
|
24
24
|
get heatSetPointLimits(): [number, number];
|
|
25
25
|
get deadband(): number;
|
|
26
26
|
get mode(): ThermostatOperationMode;
|
|
27
|
-
|
|
27
|
+
updateFromUserMQTT(data: MQTTData): void;
|
|
28
28
|
private _modeFromString;
|
|
29
29
|
private _stringFromMode;
|
|
30
30
|
setMode(mode: ThermostatOperationMode): void;
|
package/dist/model/thermostat.js
CHANGED
|
@@ -74,8 +74,8 @@ export class Thermostat extends Equipment {
|
|
|
74
74
|
get mode() {
|
|
75
75
|
return this.current_mode;
|
|
76
76
|
}
|
|
77
|
-
|
|
78
|
-
super.
|
|
77
|
+
updateFromUserMQTT(data) {
|
|
78
|
+
super.updateFromUserMQTT(data);
|
|
79
79
|
if (data['@HUMIDITY'] !== undefined) {
|
|
80
80
|
this.current_humidity = data['@HUMIDITY'];
|
|
81
81
|
this.log.ifVerbose(strings.debug.humidityState, this.deviceName, this.current_humidity);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thermostat.js","sourceRoot":"","sources":["../../src/model/thermostat.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"thermostat.js","sourceRoot":"","sources":["../../src/model/thermostat.ts"],"names":[],"mappings":"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"}
|
package/dist/model/types.d.ts
CHANGED
|
@@ -1,16 +1,19 @@
|
|
|
1
1
|
import { ThermostatOperationMode } from './constants.js';
|
|
2
|
-
export declare const SENSITIVE_KEYS: string[];
|
|
3
2
|
export type ValueOrObject<T> = T | {
|
|
4
3
|
value: T;
|
|
5
4
|
};
|
|
6
5
|
export declare function getValue<T>(input: ValueOrObject<T>): T;
|
|
7
|
-
export type
|
|
6
|
+
export type UserTokenData = {
|
|
8
7
|
user_id: string;
|
|
9
8
|
user_token: string;
|
|
10
9
|
options: {
|
|
11
10
|
account_id: string;
|
|
12
11
|
};
|
|
13
12
|
};
|
|
13
|
+
export type DeviceTokenData = {
|
|
14
|
+
deviceName: string;
|
|
15
|
+
deviceToken: string;
|
|
16
|
+
};
|
|
14
17
|
export type StringValue = {
|
|
15
18
|
value: string;
|
|
16
19
|
};
|
|
@@ -37,6 +40,7 @@ export type EquipmentData = {
|
|
|
37
40
|
device_type?: string;
|
|
38
41
|
device_name?: string;
|
|
39
42
|
serial_number?: string;
|
|
43
|
+
mac_address?: string;
|
|
40
44
|
'@NAME'?: StringValue;
|
|
41
45
|
'@ALERTCOUNT'?: number;
|
|
42
46
|
'@SETPOINT'?: Setpoint;
|
package/dist/model/types.js
CHANGED
|
@@ -1,24 +1,3 @@
|
|
|
1
|
-
export const SENSITIVE_KEYS = [
|
|
2
|
-
'address',
|
|
3
|
-
'coordinates',
|
|
4
|
-
'email',
|
|
5
|
-
'last_name',
|
|
6
|
-
'loc',
|
|
7
|
-
'mac_address',
|
|
8
|
-
'macAddress',
|
|
9
|
-
'name',
|
|
10
|
-
'phone_number',
|
|
11
|
-
'serial_number',
|
|
12
|
-
'serialNumber',
|
|
13
|
-
'street',
|
|
14
|
-
'user_id',
|
|
15
|
-
'user_token',
|
|
16
|
-
'zipcode',
|
|
17
|
-
'location_id',
|
|
18
|
-
'@USER_SHARED_WITH_ME',
|
|
19
|
-
'city',
|
|
20
|
-
'@LOCATION_INFO',
|
|
21
|
-
];
|
|
22
1
|
export function getValue(input) {
|
|
23
2
|
return typeof input === 'object' && input !== null && 'value' in input
|
|
24
3
|
? input.value
|
package/dist/model/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/model/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/model/types.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,QAAQ,CAAI,KAAuB;IACjD,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK;QACpE,CAAC,CAAC,KAAK,CAAC,KAAK;QACb,CAAC,CAAE,KAAW,CAAC;AACnB,CAAC"}
|
|
@@ -3,15 +3,13 @@ import { EquipmentType } from './constants.js';
|
|
|
3
3
|
import { Equipment } from './equipment.js';
|
|
4
4
|
import { MQTTData, WaterHeaterData } from './types.js';
|
|
5
5
|
export declare class WaterHeater extends Equipment {
|
|
6
|
-
readonly persistPath: string;
|
|
7
6
|
private enabled;
|
|
8
7
|
private lower_limit;
|
|
9
8
|
private upper_limit;
|
|
10
9
|
private set_point;
|
|
11
10
|
private availability_icon;
|
|
12
11
|
private recoverySimulator;
|
|
13
|
-
|
|
14
|
-
private constructor();
|
|
12
|
+
constructor(api: EconetApi, data: WaterHeaterData);
|
|
15
13
|
get type(): EquipmentType;
|
|
16
14
|
get isEnabled(): boolean;
|
|
17
15
|
get limits(): [number, number];
|
|
@@ -19,7 +17,7 @@ export declare class WaterHeater extends Equipment {
|
|
|
19
17
|
currentTemp(inputTemp?: number | null): number;
|
|
20
18
|
get setPoint(): number;
|
|
21
19
|
protected didUpdate(): void;
|
|
22
|
-
|
|
20
|
+
updateFromUserMQTT(data: MQTTData): void;
|
|
23
21
|
setEnabled(enabled: boolean): void;
|
|
24
22
|
setSetPoint(setPoint: number): void;
|
|
25
23
|
}
|