@switchbot/homebridge-switchbot 3.5.0-beta.9 → 3.5.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/.vscode/settings.json +4 -1
- package/CHANGELOG.md +4 -1
- package/config.schema.json +166 -24
- package/dist/device/blindtilt.d.ts +21 -96
- package/dist/device/blindtilt.d.ts.map +1 -1
- package/dist/device/blindtilt.js +439 -817
- package/dist/device/blindtilt.js.map +1 -1
- package/dist/device/bot.d.ts +27 -72
- package/dist/device/bot.d.ts.map +1 -1
- package/dist/device/bot.js +835 -865
- package/dist/device/bot.js.map +1 -1
- package/dist/device/ceilinglight.d.ts +15 -69
- package/dist/device/ceilinglight.d.ts.map +1 -1
- package/dist/device/ceilinglight.js +287 -653
- package/dist/device/ceilinglight.js.map +1 -1
- package/dist/device/colorbulb.d.ts +15 -76
- package/dist/device/colorbulb.d.ts.map +1 -1
- package/dist/device/colorbulb.js +354 -732
- package/dist/device/colorbulb.js.map +1 -1
- package/dist/device/contact.d.ts +14 -66
- package/dist/device/contact.d.ts.map +1 -1
- package/dist/device/contact.js +268 -576
- package/dist/device/contact.js.map +1 -1
- package/dist/device/curtain.d.ts +18 -89
- package/dist/device/curtain.d.ts.map +1 -1
- package/dist/device/curtain.js +431 -851
- package/dist/device/curtain.js.map +1 -1
- package/dist/device/device.d.ts +60 -0
- package/dist/device/device.d.ts.map +1 -0
- package/dist/device/device.js +739 -0
- package/dist/device/device.js.map +1 -0
- package/dist/device/fan.d.ts +63 -0
- package/dist/device/fan.d.ts.map +1 -0
- package/dist/device/fan.js +698 -0
- package/dist/device/fan.js.map +1 -0
- package/dist/device/hub.d.ts +15 -60
- package/dist/device/hub.d.ts.map +1 -1
- package/dist/device/hub.js +257 -631
- package/dist/device/hub.js.map +1 -1
- package/dist/device/humidifier.d.ts +11 -66
- package/dist/device/humidifier.d.ts.map +1 -1
- package/dist/device/humidifier.js +266 -629
- package/dist/device/humidifier.js.map +1 -1
- package/dist/device/iosensor.d.ts +12 -64
- package/dist/device/iosensor.d.ts.map +1 -1
- package/dist/device/iosensor.js +215 -615
- package/dist/device/iosensor.js.map +1 -1
- package/dist/device/lightstrip.d.ts +12 -70
- package/dist/device/lightstrip.d.ts.map +1 -1
- package/dist/device/lightstrip.js +336 -645
- package/dist/device/lightstrip.js.map +1 -1
- package/dist/device/lock.d.ts +17 -63
- package/dist/device/lock.d.ts.map +1 -1
- package/dist/device/lock.js +290 -595
- package/dist/device/lock.js.map +1 -1
- package/dist/device/meter.d.ts +15 -64
- package/dist/device/meter.d.ts.map +1 -1
- package/dist/device/meter.js +211 -608
- package/dist/device/meter.js.map +1 -1
- package/dist/device/meterplus.d.ts +15 -65
- package/dist/device/meterplus.d.ts.map +1 -1
- package/dist/device/meterplus.js +205 -615
- package/dist/device/meterplus.js.map +1 -1
- package/dist/device/motion.d.ts +12 -69
- package/dist/device/motion.d.ts.map +1 -1
- package/dist/device/motion.js +202 -563
- package/dist/device/motion.js.map +1 -1
- package/dist/device/plug.d.ts +10 -57
- package/dist/device/plug.d.ts.map +1 -1
- package/dist/device/plug.js +125 -484
- package/dist/device/plug.js.map +1 -1
- package/dist/device/robotvacuumcleaner.d.ts +13 -63
- package/dist/device/robotvacuumcleaner.d.ts.map +1 -1
- package/dist/device/robotvacuumcleaner.js +233 -549
- package/dist/device/robotvacuumcleaner.js.map +1 -1
- package/dist/device/waterdetector.d.ts +11 -63
- package/dist/device/waterdetector.d.ts.map +1 -1
- package/dist/device/waterdetector.js +170 -493
- package/dist/device/waterdetector.js.map +1 -1
- package/dist/homebridge-ui/public/index.html +22 -16
- package/dist/homebridge-ui/server.js +1 -1
- package/dist/homebridge-ui/server.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/irdevice/airconditioner.d.ts +10 -50
- package/dist/irdevice/airconditioner.d.ts.map +1 -1
- package/dist/irdevice/airconditioner.js +340 -468
- package/dist/irdevice/airconditioner.js.map +1 -1
- package/dist/irdevice/airpurifier.d.ts +8 -39
- package/dist/irdevice/airpurifier.d.ts.map +1 -1
- package/dist/irdevice/airpurifier.js +105 -319
- package/dist/irdevice/airpurifier.js.map +1 -1
- package/dist/irdevice/camera.d.ts +7 -36
- package/dist/irdevice/camera.d.ts.map +1 -1
- package/dist/irdevice/camera.js +44 -285
- package/dist/irdevice/camera.js.map +1 -1
- package/dist/irdevice/fan.d.ts +7 -43
- package/dist/irdevice/fan.d.ts.map +1 -1
- package/dist/irdevice/fan.js +92 -350
- package/dist/irdevice/fan.js.map +1 -1
- package/dist/irdevice/irdevice.d.ts +40 -0
- package/dist/irdevice/irdevice.d.ts.map +1 -0
- package/dist/irdevice/irdevice.js +369 -0
- package/dist/irdevice/irdevice.js.map +1 -0
- package/dist/irdevice/light.d.ts +12 -45
- package/dist/irdevice/light.d.ts.map +1 -1
- package/dist/irdevice/light.js +118 -362
- package/dist/irdevice/light.js.map +1 -1
- package/dist/irdevice/other.d.ts +19 -48
- package/dist/irdevice/other.d.ts.map +1 -1
- package/dist/irdevice/other.js +438 -570
- package/dist/irdevice/other.js.map +1 -1
- package/dist/irdevice/tv.d.ts +8 -40
- package/dist/irdevice/tv.d.ts.map +1 -1
- package/dist/irdevice/tv.js +91 -339
- package/dist/irdevice/tv.js.map +1 -1
- package/dist/irdevice/vacuumcleaner.d.ts +7 -36
- package/dist/irdevice/vacuumcleaner.d.ts.map +1 -1
- package/dist/irdevice/vacuumcleaner.js +45 -285
- package/dist/irdevice/vacuumcleaner.js.map +1 -1
- package/dist/irdevice/waterheater.d.ts +7 -36
- package/dist/irdevice/waterheater.d.ts.map +1 -1
- package/dist/irdevice/waterheater.js +47 -291
- package/dist/irdevice/waterheater.js.map +1 -1
- package/dist/platform.d.ts +22 -8
- package/dist/platform.d.ts.map +1 -1
- package/dist/platform.js +342 -191
- package/dist/platform.js.map +1 -1
- package/dist/settings.d.ts +64 -17
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +16 -552
- package/dist/settings.js.map +1 -1
- package/dist/utils.d.ts +77 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +638 -1
- package/dist/utils.js.map +1 -1
- package/eslint.config.js +96 -0
- package/package.json +20 -16
- package/src/custom.d.ts +2 -1
- package/src/device/blindtilt.ts +472 -888
- package/src/device/bot.ts +893 -968
- package/src/device/ceilinglight.ts +304 -709
- package/src/device/colorbulb.ts +370 -803
- package/src/device/contact.ts +301 -611
- package/src/device/curtain.ts +460 -908
- package/src/device/device.ts +755 -0
- package/src/device/fan.ts +749 -0
- package/src/device/hub.ts +294 -664
- package/src/device/humidifier.ts +299 -696
- package/src/device/iosensor.ts +251 -644
- package/src/device/lightstrip.ts +362 -712
- package/src/device/lock.ts +328 -653
- package/src/device/meter.ts +247 -637
- package/src/device/meterplus.ts +240 -644
- package/src/device/motion.ts +230 -598
- package/src/device/plug.ts +139 -525
- package/src/device/robotvacuumcleaner.ts +258 -593
- package/src/device/waterdetector.ts +191 -522
- package/src/homebridge-ui/public/index.html +22 -16
- package/src/homebridge-ui/server.ts +1 -1
- package/src/index.ts +4 -3
- package/src/irdevice/airconditioner.ts +370 -527
- package/src/irdevice/airpurifier.ts +132 -356
- package/src/irdevice/camera.ts +58 -311
- package/src/irdevice/fan.ts +109 -379
- package/src/irdevice/irdevice.ts +382 -0
- package/src/irdevice/light.ts +157 -412
- package/src/irdevice/other.ts +507 -648
- package/src/irdevice/tv.ts +121 -375
- package/src/irdevice/vacuumcleaner.ts +59 -311
- package/src/irdevice/waterheater.ts +61 -320
- package/src/platform.ts +395 -259
- package/src/settings.ts +118 -609
- package/src/utils.ts +642 -1
- package/.github/npm-version-script.cjs +0 -81
- package/src/device/waterdetector.json +0 -11
package/src/device/meterplus.ts
CHANGED
|
@@ -1,114 +1,100 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
9
|
-
|
|
1
|
+
/* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
|
|
2
|
+
*
|
|
3
|
+
* meterplus.ts: @switchbot/homebridge-switchbot.
|
|
4
|
+
*/
|
|
5
|
+
import { Units } from 'homebridge';
|
|
6
|
+
import { Devices } from '../settings.js';
|
|
7
|
+
import { deviceBase } from './device.js';
|
|
8
|
+
import { Subject, interval, skipWhile } from 'rxjs';
|
|
9
|
+
|
|
10
|
+
import type { SwitchBotPlatform } from '../platform.js';
|
|
11
|
+
import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
|
|
12
|
+
import type { device, devicesConfig, serviceData, deviceStatus } from '../settings.js';
|
|
10
13
|
|
|
11
14
|
/**
|
|
12
15
|
* Platform Accessory
|
|
13
16
|
* An instance of this class is created for each accessory your platform registers
|
|
14
17
|
* Each accessory may expose multiple services of different service types.
|
|
15
18
|
*/
|
|
16
|
-
export class MeterPlus {
|
|
17
|
-
public readonly api: API;
|
|
18
|
-
public readonly log: Logging;
|
|
19
|
-
public readonly config!: SwitchBotPlatformConfig;
|
|
20
|
-
protected readonly hap: HAP;
|
|
19
|
+
export class MeterPlus extends deviceBase {
|
|
21
20
|
// Services
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
BLE_CurrentRelativeHumidity!: serviceData['humidity'];
|
|
45
|
-
|
|
46
|
-
// BLE Others
|
|
47
|
-
BLE_IsConnected?: boolean;
|
|
48
|
-
|
|
49
|
-
//MQTT stuff
|
|
50
|
-
mqttClient: MqttClient | null = null;
|
|
51
|
-
|
|
52
|
-
// EVE history service handler
|
|
53
|
-
historyService?: any;
|
|
54
|
-
|
|
55
|
-
// Config
|
|
56
|
-
scanDuration!: number;
|
|
57
|
-
deviceLogging!: string;
|
|
58
|
-
deviceRefreshRate!: number;
|
|
59
|
-
|
|
60
|
-
// Connection
|
|
61
|
-
private readonly OpenAPI: boolean;
|
|
62
|
-
private readonly BLE: boolean;
|
|
21
|
+
private Battery: {
|
|
22
|
+
Name: CharacteristicValue;
|
|
23
|
+
Service: Service;
|
|
24
|
+
BatteryLevel: CharacteristicValue;
|
|
25
|
+
StatusLowBattery: CharacteristicValue;
|
|
26
|
+
};
|
|
27
|
+
|
|
28
|
+
private HumiditySensor?: {
|
|
29
|
+
Name: CharacteristicValue;
|
|
30
|
+
Service: Service;
|
|
31
|
+
CurrentRelativeHumidity: CharacteristicValue;
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
private TemperatureSensor?: {
|
|
35
|
+
Name: CharacteristicValue;
|
|
36
|
+
Service: Service;
|
|
37
|
+
CurrentTemperature: CharacteristicValue;
|
|
38
|
+
};
|
|
39
|
+
|
|
40
|
+
// Updates
|
|
41
|
+
meterUpdateInProgress!: boolean;
|
|
42
|
+
doMeterUpdate: Subject<void>;
|
|
63
43
|
|
|
64
44
|
constructor(
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
45
|
+
readonly platform: SwitchBotPlatform,
|
|
46
|
+
accessory: PlatformAccessory,
|
|
47
|
+
device: device & devicesConfig,
|
|
68
48
|
) {
|
|
69
|
-
|
|
70
|
-
this
|
|
71
|
-
this.
|
|
72
|
-
this.
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
this.
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
49
|
+
super(platform, accessory, device);
|
|
50
|
+
// this is subject we use to track when we need to POST changes to the SwitchBot API
|
|
51
|
+
this.doMeterUpdate = new Subject();
|
|
52
|
+
this.meterUpdateInProgress = false;
|
|
53
|
+
|
|
54
|
+
// Initialize Battery Service
|
|
55
|
+
accessory.context.Battery = accessory.context.Battery ?? {};
|
|
56
|
+
this.Battery = {
|
|
57
|
+
Name: accessory.context.Battery.Name ?? `${accessory.displayName} Battery`,
|
|
58
|
+
Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery) as Service,
|
|
59
|
+
BatteryLevel: accessory.context.BatteryLevel ?? 100,
|
|
60
|
+
StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
|
|
61
|
+
};
|
|
62
|
+
accessory.context.Battery = this.Battery as object;
|
|
63
|
+
|
|
64
|
+
// Initialize Battery Characteristics
|
|
65
|
+
this.Battery.Service
|
|
66
|
+
.setCharacteristic(this.hap.Characteristic.Name, this.Battery.Name)
|
|
67
|
+
.setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE)
|
|
68
|
+
.getCharacteristic(this.hap.Characteristic.BatteryLevel)
|
|
69
|
+
.onGet(() => {
|
|
70
|
+
return this.Battery.BatteryLevel;
|
|
71
|
+
});
|
|
87
72
|
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
.
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
.setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId)
|
|
94
|
-
.setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.FirmwareRevision);
|
|
73
|
+
this.Battery.Service
|
|
74
|
+
.getCharacteristic(this.hap.Characteristic.StatusLowBattery)
|
|
75
|
+
.onGet(() => {
|
|
76
|
+
return this.Battery.StatusLowBattery;
|
|
77
|
+
});
|
|
95
78
|
|
|
96
|
-
// Temperature Sensor Service
|
|
79
|
+
// Initialize Temperature Sensor Service
|
|
97
80
|
if (device.meter?.hide_temperature) {
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Temperature Sensor Service`);
|
|
103
|
-
const temperatureService = `${accessory.displayName} Temperature Sensor`;
|
|
104
|
-
(this.temperatureService = this.accessory.getService(this.hap.Service.TemperatureSensor)
|
|
105
|
-
|| this.accessory.addService(this.hap.Service.TemperatureSensor)), temperatureService;
|
|
106
|
-
|
|
107
|
-
this.temperatureService.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Temperature Sensor`);
|
|
108
|
-
if (!this.temperatureService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
|
|
109
|
-
this.temperatureService.addCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Temperature Sensor`);
|
|
81
|
+
if (this.TemperatureSensor) {
|
|
82
|
+
this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);
|
|
83
|
+
this.TemperatureSensor.Service = this.accessory.getService(this.hap.Service.TemperatureSensor) as Service;
|
|
84
|
+
accessory.removeService(this.TemperatureSensor.Service);
|
|
110
85
|
}
|
|
111
|
-
|
|
86
|
+
} else {
|
|
87
|
+
accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
|
|
88
|
+
this.TemperatureSensor = {
|
|
89
|
+
Name: accessory.context.TemperatureSensor.Name ?? `${accessory.displayName} Temperature Sensor`,
|
|
90
|
+
Service: accessory.getService(this.hap.Service.TemperatureSensor) ?? this.accessory.addService(this.hap.Service.TemperatureSensor) as Service,
|
|
91
|
+
CurrentTemperature: accessory.context.CurrentTemperature ?? 30,
|
|
92
|
+
};
|
|
93
|
+
accessory.context.TemperatureSensor = this.TemperatureSensor as object;
|
|
94
|
+
|
|
95
|
+
// Initialize Temperature Sensor Characteristics
|
|
96
|
+
this.TemperatureSensor.Service
|
|
97
|
+
.setCharacteristic(this.hap.Characteristic.Name, this.TemperatureSensor.Name)
|
|
112
98
|
.getCharacteristic(this.hap.Characteristic.CurrentTemperature)
|
|
113
99
|
.setProps({
|
|
114
100
|
unit: Units['CELSIUS'],
|
|
@@ -118,168 +104,122 @@ export class MeterPlus {
|
|
|
118
104
|
minStep: 0.1,
|
|
119
105
|
})
|
|
120
106
|
.onGet(() => {
|
|
121
|
-
return this.CurrentTemperature!;
|
|
107
|
+
return this.TemperatureSensor!.CurrentTemperature!;
|
|
122
108
|
});
|
|
123
|
-
} else {
|
|
124
|
-
this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Temperature Sensor Service Not Added`);
|
|
125
109
|
}
|
|
126
|
-
|
|
127
|
-
// Humidity Sensor Service
|
|
110
|
+
// Initialize Humidity Sensor Service
|
|
128
111
|
if (device.meter?.hide_humidity) {
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Humidity Sensor Service`);
|
|
134
|
-
const humidityService = `${accessory.displayName} Humidity Sensor`;
|
|
135
|
-
(this.humidityService = this.accessory.getService(this.hap.Service.HumiditySensor)
|
|
136
|
-
|| this.accessory.addService(this.hap.Service.HumiditySensor)), humidityService;
|
|
137
|
-
|
|
138
|
-
this.humidityService.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Humidity Sensor`);
|
|
139
|
-
if (!this.humidityService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
|
|
140
|
-
this.humidityService.addCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Humidity Sensor`);
|
|
112
|
+
if (this.HumiditySensor) {
|
|
113
|
+
this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Humidity Sensor Service`);
|
|
114
|
+
this.HumiditySensor.Service = this.accessory.getService(this.hap.Service.HumiditySensor) as Service;
|
|
115
|
+
accessory.removeService(this.HumiditySensor.Service);
|
|
141
116
|
}
|
|
142
|
-
|
|
117
|
+
} else {
|
|
118
|
+
accessory.context.HumiditySensor = accessory.context.HumiditySensor ?? {};
|
|
119
|
+
this.HumiditySensor = {
|
|
120
|
+
Name: accessory.context.HumiditySensor.Name ?? `${accessory.displayName} Humidity Sensor`,
|
|
121
|
+
Service: accessory.getService(this.hap.Service.HumiditySensor) ?? this.accessory.addService(this.hap.Service.HumiditySensor) as Service,
|
|
122
|
+
CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity ?? 50,
|
|
123
|
+
};
|
|
124
|
+
accessory.context.HumiditySensor = this.HumiditySensor as object;
|
|
125
|
+
|
|
126
|
+
// Initialize Humidity Sensor Characteristics
|
|
127
|
+
this.HumiditySensor!.Service
|
|
128
|
+
.setCharacteristic(this.hap.Characteristic.Name, this.HumiditySensor.Name)
|
|
143
129
|
.getCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity)
|
|
144
130
|
.setProps({
|
|
145
131
|
minStep: 0.1,
|
|
146
132
|
})
|
|
147
133
|
.onGet(() => {
|
|
148
|
-
return this.CurrentRelativeHumidity!;
|
|
134
|
+
return this.HumiditySensor!.CurrentRelativeHumidity!;
|
|
149
135
|
});
|
|
150
|
-
} else {
|
|
151
|
-
this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Humidity Sensor Service Not Added`);
|
|
152
136
|
}
|
|
153
137
|
|
|
154
|
-
//
|
|
155
|
-
|
|
156
|
-
(this.batteryService = this.accessory.getService(this.hap.Service.Battery)
|
|
157
|
-
|| accessory.addService(this.hap.Service.Battery)), batteryService;
|
|
158
|
-
|
|
159
|
-
this.batteryService.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Battery`);
|
|
160
|
-
if (!this.batteryService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
|
|
161
|
-
this.batteryService.addCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Battery`);
|
|
162
|
-
}
|
|
163
|
-
this.batteryService.setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
|
|
138
|
+
// Retrieve initial values and updateHomekit
|
|
139
|
+
this.refreshStatus();
|
|
164
140
|
|
|
165
141
|
// Retrieve initial values and updateHomekit
|
|
166
142
|
this.updateHomeKitCharacteristics();
|
|
167
143
|
|
|
168
144
|
// Start an update interval
|
|
169
145
|
interval(this.deviceRefreshRate * 1000)
|
|
146
|
+
.pipe(skipWhile(() => this.meterUpdateInProgress))
|
|
170
147
|
.subscribe(async () => {
|
|
171
148
|
await this.refreshStatus();
|
|
172
149
|
});
|
|
173
150
|
|
|
174
151
|
//regisiter webhook event handler
|
|
175
|
-
|
|
176
|
-
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
|
|
177
|
-
this.platform.webhookEventHandler[this.device.deviceId] = async (context) => {
|
|
178
|
-
try {
|
|
179
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
|
|
180
|
-
if (context.scale === 'CELSIUS') {
|
|
181
|
-
const { temperature, humidity } = context;
|
|
182
|
-
const { CurrentTemperature, CurrentRelativeHumidity } = this;
|
|
183
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
|
|
184
|
-
'(temperature, humidity) = ' +
|
|
185
|
-
`Webhook:(${temperature}, ${humidity}), ` +
|
|
186
|
-
`current:(${CurrentTemperature}, ${CurrentRelativeHumidity})`);
|
|
187
|
-
this.CurrentRelativeHumidity = humidity;
|
|
188
|
-
this.CurrentTemperature = temperature;
|
|
189
|
-
this.updateHomeKitCharacteristics();
|
|
190
|
-
}
|
|
191
|
-
} catch (e: any) {
|
|
192
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
193
|
-
+ `failed to handle webhook. Received: ${JSON.stringify(context)} Error: ${e}`);
|
|
194
|
-
}
|
|
195
|
-
};
|
|
196
|
-
}
|
|
152
|
+
this.registerWebhook(accessory, device);
|
|
197
153
|
}
|
|
198
154
|
|
|
199
|
-
|
|
200
|
-
* Parse the device status from the SwitchBot api
|
|
201
|
-
*/
|
|
202
|
-
async parseStatus(): Promise<void> {
|
|
203
|
-
if (!this.device.enableCloudService && this.OpenAPI) {
|
|
204
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} parseStatus enableCloudService: ${this.device.enableCloudService}`);
|
|
205
|
-
} else if (this.BLE) {
|
|
206
|
-
await this.BLEparseStatus();
|
|
207
|
-
} else if (this.OpenAPI && this.platform.config.credentials?.token) {
|
|
208
|
-
await this.openAPIparseStatus();
|
|
209
|
-
} else {
|
|
210
|
-
await this.offlineOff();
|
|
211
|
-
this.debugWarnLog(
|
|
212
|
-
`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:` + ` ${this.device.connectionType}, parseStatus will not happen.`,
|
|
213
|
-
);
|
|
214
|
-
}
|
|
215
|
-
}
|
|
216
|
-
|
|
217
|
-
async BLEparseStatus(): Promise<void> {
|
|
155
|
+
async BLEparseStatus(serviceData: serviceData): Promise<void> {
|
|
218
156
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
|
|
219
157
|
|
|
220
158
|
// Battery
|
|
221
|
-
this.BatteryLevel = Number(
|
|
222
|
-
if (this.BatteryLevel < 15) {
|
|
223
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
|
|
159
|
+
this.Battery.BatteryLevel = Number(serviceData.battery);
|
|
160
|
+
if (this.Battery.BatteryLevel < 15) {
|
|
161
|
+
this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
|
|
224
162
|
} else {
|
|
225
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
163
|
+
this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
226
164
|
}
|
|
227
|
-
this.debugLog(`${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, StatusLowBattery: ${this.StatusLowBattery}`);
|
|
165
|
+
this.debugLog(`${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}, StatusLowBattery: ${this.Battery.StatusLowBattery}`);
|
|
228
166
|
|
|
229
167
|
// Humidity
|
|
230
168
|
if (!this.device.meter?.hide_humidity) {
|
|
231
|
-
this.CurrentRelativeHumidity =
|
|
232
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Humidity: ${this.CurrentRelativeHumidity}%`);
|
|
169
|
+
this.HumiditySensor!.CurrentRelativeHumidity = serviceData.humidity!;
|
|
170
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Humidity: ${this.HumiditySensor!.CurrentRelativeHumidity}%`);
|
|
233
171
|
}
|
|
234
172
|
|
|
235
173
|
// Current Temperature
|
|
236
174
|
if (!this.device.meter?.hide_temperature) {
|
|
237
|
-
|
|
238
|
-
this.CurrentTemperature =
|
|
239
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Temperature: ${this.CurrentTemperature}°c`);
|
|
175
|
+
serviceData.temperature!.c < 0 ? 0 : serviceData.temperature!.c > 100 ? 100 : serviceData.temperature!.c;
|
|
176
|
+
this.TemperatureSensor!.CurrentTemperature = serviceData.temperature!.c;
|
|
177
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Temperature: ${this.TemperatureSensor!.CurrentTemperature}°c`);
|
|
240
178
|
}
|
|
241
179
|
}
|
|
242
180
|
|
|
243
|
-
async openAPIparseStatus(): Promise<void> {
|
|
181
|
+
async openAPIparseStatus(deviceStatus: deviceStatus): Promise<void> {
|
|
244
182
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
|
|
245
183
|
|
|
246
184
|
// BatteryLevel
|
|
247
|
-
this.BatteryLevel = Number(
|
|
248
|
-
if (this.BatteryLevel <
|
|
249
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
|
|
185
|
+
this.Battery.BatteryLevel = Number(deviceStatus.body.battery);
|
|
186
|
+
if (this.Battery.BatteryLevel < 10) {
|
|
187
|
+
this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
|
|
250
188
|
} else {
|
|
251
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
189
|
+
this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
190
|
+
}
|
|
191
|
+
if (Number.isNaN(this.Battery.BatteryLevel)) {
|
|
192
|
+
this.Battery.BatteryLevel = 100;
|
|
252
193
|
}
|
|
253
|
-
this.debugLog(`${this.
|
|
194
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel},`
|
|
195
|
+
+ ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
|
|
254
196
|
|
|
255
197
|
// CurrentRelativeHumidity
|
|
256
198
|
if (!this.device.meter?.hide_humidity) {
|
|
257
|
-
this.CurrentRelativeHumidity =
|
|
258
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Humidity: ${this.CurrentRelativeHumidity}%`);
|
|
199
|
+
this.HumiditySensor!.CurrentRelativeHumidity = deviceStatus.body.humidity!;
|
|
200
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Humidity: ${this.HumiditySensor!.CurrentRelativeHumidity}%`);
|
|
259
201
|
}
|
|
260
202
|
|
|
261
203
|
// CurrentTemperature
|
|
262
204
|
if (!this.device.meter?.hide_temperature) {
|
|
263
|
-
this.CurrentTemperature =
|
|
264
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Temperature: ${this.CurrentTemperature}°c`);
|
|
205
|
+
this.TemperatureSensor!.CurrentTemperature = deviceStatus.body.temperature!;
|
|
206
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Temperature: ${this.TemperatureSensor!.CurrentTemperature}°c`);
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
// Firmware Version
|
|
210
|
+
const version = deviceStatus.body.version?.toString();
|
|
211
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
|
|
212
|
+
if (deviceStatus.body.version) {
|
|
213
|
+
const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
|
|
214
|
+
this.accessory
|
|
215
|
+
.getService(this.hap.Service.AccessoryInformation)!
|
|
216
|
+
.setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
|
|
217
|
+
.setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
|
|
218
|
+
.getCharacteristic(this.hap.Characteristic.FirmwareRevision)
|
|
219
|
+
.updateValue(deviceVersion);
|
|
220
|
+
this.accessory.context.deviceVersion = deviceVersion;
|
|
221
|
+
this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
|
|
265
222
|
}
|
|
266
|
-
|
|
267
|
-
// Battery
|
|
268
|
-
this.BatteryLevel = Number(this.OpenAPI_BatteryLevel);
|
|
269
|
-
if (this.BatteryLevel < 10) {
|
|
270
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
|
|
271
|
-
} else {
|
|
272
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
273
|
-
}
|
|
274
|
-
if (Number.isNaN(this.BatteryLevel)) {
|
|
275
|
-
this.BatteryLevel = 100;
|
|
276
|
-
}
|
|
277
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel},`
|
|
278
|
-
+ ` StatusLowBattery: ${this.StatusLowBattery}`);
|
|
279
|
-
|
|
280
|
-
// FirmwareRevision
|
|
281
|
-
this.FirmwareRevision = this.OpenAPI_FirmwareRevision!;
|
|
282
|
-
this.accessory.context.FirmwareRevision = this.FirmwareRevision;
|
|
283
223
|
}
|
|
284
224
|
|
|
285
225
|
/**
|
|
@@ -294,10 +234,8 @@ export class MeterPlus {
|
|
|
294
234
|
await this.openAPIRefreshStatus();
|
|
295
235
|
} else {
|
|
296
236
|
await this.offlineOff();
|
|
297
|
-
this.debugWarnLog(
|
|
298
|
-
|
|
299
|
-
` ${this.device.connectionType}, refreshStatus will not happen.`,
|
|
300
|
-
);
|
|
237
|
+
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
|
|
238
|
+
+ ` ${this.device.connectionType}, refreshStatus will not happen.`);
|
|
301
239
|
}
|
|
302
240
|
}
|
|
303
241
|
|
|
@@ -313,108 +251,44 @@ export class MeterPlus {
|
|
|
313
251
|
this.getCustomBLEAddress(switchbot);
|
|
314
252
|
// Start to monitor advertisement packets
|
|
315
253
|
(async () => {
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
id: this.device.bleMac,
|
|
319
|
-
});
|
|
254
|
+
// Start to monitor advertisement packets
|
|
255
|
+
await switchbot.startScan({ model: this.device.bleModel, id: this.device.bleMac });
|
|
320
256
|
// Set an event handler
|
|
321
257
|
switchbot.onadvertisement = (ad: any) => {
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
258
|
+
if (this.device.bleMac === ad.address && ad.model === this.device.bleModel) {
|
|
259
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, ' ')}`);
|
|
260
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.model}`);
|
|
325
261
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
|
|
326
|
-
this.BLE_CurrentRelativeHumidity = ad.serviceData.humidity < 0 ? 0 : ad.serviceData.humidity > 100 ? 100 : ad.serviceData.humidity;
|
|
327
|
-
this.BLE_CurrentTemperature = ad.serviceData.temperature;
|
|
328
|
-
this.BLE_Celsius = ad.serviceData.temperature!.c;
|
|
329
|
-
this.BLE_Fahrenheit = ad.serviceData.temperature!.f;
|
|
330
|
-
this.BLE_BatteryLevel = ad.serviceData.battery;
|
|
331
262
|
} else {
|
|
332
263
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
|
|
333
264
|
}
|
|
334
265
|
};
|
|
335
|
-
// Wait
|
|
266
|
+
// Wait 10 seconds
|
|
336
267
|
await switchbot.wait(this.scanDuration * 1000);
|
|
337
268
|
// Stop to monitor
|
|
338
269
|
await switchbot.stopScan();
|
|
339
270
|
// Update HomeKit
|
|
340
|
-
await this.BLEparseStatus();
|
|
271
|
+
await this.BLEparseStatus(switchbot.onadvertisement.serviceData);
|
|
341
272
|
await this.updateHomeKitCharacteristics();
|
|
342
273
|
})();
|
|
343
|
-
|
|
344
|
-
switchbot
|
|
345
|
-
.startScan({
|
|
346
|
-
model: 'i',
|
|
347
|
-
id: this.device.bleMac,
|
|
348
|
-
})
|
|
349
|
-
.then(async () => {
|
|
350
|
-
// Set an event handler
|
|
351
|
-
switchbot.onadvertisement = async (ad: ad) => {
|
|
352
|
-
this.debugLog(
|
|
353
|
-
`${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
|
|
354
|
-
` BLE Address Found: ${ad.address}`,
|
|
355
|
-
);
|
|
356
|
-
if (ad.serviceData.humidity! > 0) {
|
|
357
|
-
// reject unreliable data
|
|
358
|
-
this.BLE_CurrentRelativeHumidity = ad.serviceData.humidity;
|
|
359
|
-
}
|
|
360
|
-
this.BLE_CurrentTemperature = ad.serviceData.temperature;
|
|
361
|
-
this.BLE_Celsius = ad.serviceData.temperature!.c;
|
|
362
|
-
this.BLE_Fahrenheit = ad.serviceData.temperature!.f;
|
|
363
|
-
this.BLE_BatteryLevel = ad.serviceData.battery;
|
|
364
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
|
|
365
|
-
this.debugLog(
|
|
366
|
-
`${this.device.deviceType}: ${this.accessory.displayName} model: ${ad.serviceData.model}, modelName: ${ad.serviceData.modelName}, ` +
|
|
367
|
-
`temperature: ${JSON.stringify(ad.serviceData.temperature?.c)}, humidity: ${ad.serviceData.humidity}, ` +
|
|
368
|
-
`battery: ${ad.serviceData.battery}`,
|
|
369
|
-
);
|
|
370
|
-
|
|
371
|
-
if (ad.serviceData) {
|
|
372
|
-
this.BLE_IsConnected = true;
|
|
373
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
|
|
374
|
-
await this.stopScanning(switchbot);
|
|
375
|
-
} else {
|
|
376
|
-
this.BLE_IsConnected = false;
|
|
377
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
|
|
378
|
-
}
|
|
379
|
-
};
|
|
380
|
-
// Wait
|
|
381
|
-
return await sleep(this.scanDuration * 1000);
|
|
382
|
-
})
|
|
383
|
-
.then(async () => {
|
|
384
|
-
// Stop to monitor
|
|
385
|
-
await this.stopScanning(switchbot);
|
|
386
|
-
})
|
|
387
|
-
.catch(async (e: any) => {
|
|
388
|
-
this.apiError(e);
|
|
389
|
-
this.errorLog(
|
|
390
|
-
`${this.device.deviceType}: ${this.accessory.displayName} failed BLERefreshStatus with ${this.device.connectionType}` +
|
|
391
|
-
` Connection, Error Message: ${JSON.stringify(e.message)}`,
|
|
392
|
-
);
|
|
393
|
-
await this.BLERefreshConnection(switchbot);
|
|
394
|
-
});
|
|
395
|
-
} else {
|
|
274
|
+
if (switchbot === undefined) {
|
|
396
275
|
await this.BLERefreshConnection(switchbot);
|
|
397
|
-
}
|
|
276
|
+
}
|
|
398
277
|
}
|
|
399
278
|
|
|
400
279
|
async openAPIRefreshStatus(): Promise<void> {
|
|
401
280
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
|
|
402
281
|
try {
|
|
403
|
-
const { body, statusCode } = await
|
|
404
|
-
headers: this.platform.generateHeaders()
|
|
405
|
-
});
|
|
282
|
+
const { body, statusCode } = await this.platform.retryRequest(this.deviceMaxRetries, this.deviceDelayBetweenRetries,
|
|
283
|
+
`${Devices}/${this.device.deviceId}/status`, { headers: this.platform.generateHeaders() });
|
|
406
284
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
|
|
407
285
|
const deviceStatus: any = await body.json();
|
|
408
286
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
|
|
409
287
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
|
|
410
288
|
if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
|
|
411
|
-
this.
|
|
289
|
+
this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
412
290
|
+ `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
|
|
413
|
-
this.
|
|
414
|
-
this.OpenAPI_CurrentTemperature = deviceStatus.body.temperature!;
|
|
415
|
-
this.OpenAPI_BatteryLevel = deviceStatus.body.battery;
|
|
416
|
-
this.OpenAPI_FirmwareRevision = deviceStatus.body.version;
|
|
417
|
-
this.openAPIparseStatus();
|
|
291
|
+
this.openAPIparseStatus(deviceStatus);
|
|
418
292
|
this.updateHomeKitCharacteristics();
|
|
419
293
|
} else {
|
|
420
294
|
this.statusCode(statusCode);
|
|
@@ -422,10 +296,37 @@ export class MeterPlus {
|
|
|
422
296
|
}
|
|
423
297
|
} catch (e: any) {
|
|
424
298
|
this.apiError(e);
|
|
425
|
-
this.errorLog(
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
299
|
+
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIRefreshStatus with ${this.device.connectionType}`
|
|
300
|
+
+ ` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
301
|
+
}
|
|
302
|
+
}
|
|
303
|
+
|
|
304
|
+
async registerWebhook(accessory: PlatformAccessory, device: device & devicesConfig) {
|
|
305
|
+
if (device.webhook) {
|
|
306
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} is listening webhook.`);
|
|
307
|
+
this.platform.webhookEventHandler[device.deviceId] = async (context) => {
|
|
308
|
+
try {
|
|
309
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
|
|
310
|
+
if (context.scale === 'CELSIUS') {
|
|
311
|
+
const { temperature, humidity } = context;
|
|
312
|
+
const { CurrentRelativeHumidity } = this.HumiditySensor ?? { CurrentRelativeHumidity: undefined };
|
|
313
|
+
const { CurrentTemperature } = this.TemperatureSensor ?? { CurrentTemperature: undefined };
|
|
314
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} (temperature, humidity) = Webhook:(${temperature}, ${humidity}), `
|
|
315
|
+
+ `current:(${CurrentTemperature}, ${CurrentRelativeHumidity})`);
|
|
316
|
+
if (!device.meter?.hide_humidity) {
|
|
317
|
+
this.HumiditySensor!.CurrentRelativeHumidity = humidity;
|
|
318
|
+
}
|
|
319
|
+
if (!device.meter?.hide_temperature) {
|
|
320
|
+
this.TemperatureSensor!.CurrentTemperature = temperature;
|
|
321
|
+
}
|
|
322
|
+
this.updateHomeKitCharacteristics();
|
|
323
|
+
}
|
|
324
|
+
} catch (e: any) {
|
|
325
|
+
this.errorLog(`${device.deviceType}: ${accessory.displayName} failed to handle webhook. Received: ${JSON.stringify(context)} Error: ${e}`);
|
|
326
|
+
}
|
|
327
|
+
};
|
|
328
|
+
} else {
|
|
329
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} is not listening webhook.`);
|
|
429
330
|
}
|
|
430
331
|
}
|
|
431
332
|
|
|
@@ -438,67 +339,73 @@ export class MeterPlus {
|
|
|
438
339
|
|
|
439
340
|
// CurrentRelativeHumidity
|
|
440
341
|
if (!this.device.meter?.hide_humidity) {
|
|
441
|
-
if (this.CurrentRelativeHumidity === undefined) {
|
|
442
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}
|
|
342
|
+
if (this.HumiditySensor!.CurrentRelativeHumidity === undefined) {
|
|
343
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
|
|
344
|
+
+ ` CurrentRelativeHumidity: ${this.HumiditySensor!.CurrentRelativeHumidity}`);
|
|
443
345
|
} else {
|
|
346
|
+
this.accessory.context.CurrentRelativeHumidity = this.HumiditySensor!.CurrentRelativeHumidity;
|
|
347
|
+
this.HumiditySensor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity,
|
|
348
|
+
this.HumiditySensor!.CurrentRelativeHumidity);
|
|
349
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
|
|
350
|
+
+ ` updateCharacteristic CurrentRelativeHumidity: ${this.HumiditySensor!.CurrentRelativeHumidity}`);
|
|
444
351
|
if (this.device.mqttURL) {
|
|
445
|
-
mqttmessage.push(`"humidity": ${this.CurrentRelativeHumidity}`);
|
|
352
|
+
mqttmessage.push(`"humidity": ${this.HumiditySensor!.CurrentRelativeHumidity}`);
|
|
446
353
|
}
|
|
447
354
|
if (this.device.history) {
|
|
448
|
-
entry['humidity'] = this.CurrentRelativeHumidity;
|
|
355
|
+
entry['humidity'] = this.HumiditySensor!.CurrentRelativeHumidity;
|
|
449
356
|
}
|
|
450
|
-
this.accessory.context.CurrentRelativeHumidity = this.CurrentRelativeHumidity;
|
|
451
|
-
this.humidityService?.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity, this.CurrentRelativeHumidity);
|
|
452
|
-
this.debugLog(
|
|
453
|
-
`${this.device.deviceType}: ${this.accessory.displayName}` +
|
|
454
|
-
` updateCharacteristic CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`,
|
|
455
|
-
);
|
|
456
357
|
}
|
|
457
358
|
}
|
|
359
|
+
|
|
458
360
|
// CurrentTemperature
|
|
459
361
|
if (!this.device.meter?.hide_temperature) {
|
|
460
|
-
if (this.CurrentTemperature === undefined) {
|
|
461
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
|
|
362
|
+
if (this.TemperatureSensor!.CurrentTemperature === undefined) {
|
|
363
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentTemperature: ${this.TemperatureSensor!.CurrentTemperature}`);
|
|
462
364
|
} else {
|
|
365
|
+
this.accessory.context.CurrentTemperature = this.TemperatureSensor!.CurrentTemperature;
|
|
366
|
+
this.TemperatureSensor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, this.TemperatureSensor!.CurrentTemperature);
|
|
367
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
|
|
368
|
+
+ ` CurrentTemperature: ${this.TemperatureSensor!.CurrentTemperature}`);
|
|
463
369
|
if (this.device.mqttURL) {
|
|
464
|
-
mqttmessage.push(`"temperature": ${this.CurrentTemperature}`);
|
|
370
|
+
mqttmessage.push(`"temperature": ${this.TemperatureSensor!.CurrentTemperature}`);
|
|
465
371
|
}
|
|
466
372
|
if (this.device.history) {
|
|
467
|
-
entry['temp'] = this.CurrentTemperature;
|
|
373
|
+
entry['temp'] = this.TemperatureSensor!.CurrentTemperature;
|
|
468
374
|
}
|
|
469
|
-
this.accessory.context.CurrentTemperature = this.CurrentTemperature;
|
|
470
|
-
this.temperatureService?.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, this.CurrentTemperature);
|
|
471
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic CurrentTemperature: ${this.CurrentTemperature}`);
|
|
472
375
|
}
|
|
473
376
|
}
|
|
377
|
+
|
|
474
378
|
// BatteryLevel
|
|
475
|
-
if (this.BatteryLevel === undefined) {
|
|
476
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
|
|
379
|
+
if (this.Battery.BatteryLevel === undefined) {
|
|
380
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}`);
|
|
477
381
|
} else {
|
|
382
|
+
this.accessory.context.BatteryLevel = this.Battery.BatteryLevel;
|
|
383
|
+
this.Battery!.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, this.Battery.BatteryLevel);
|
|
384
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.Battery.BatteryLevel}`);
|
|
478
385
|
if (this.device.mqttURL) {
|
|
479
|
-
mqttmessage.push(`"battery": ${this.BatteryLevel}`);
|
|
386
|
+
mqttmessage.push(`"battery": ${this.Battery.BatteryLevel}`);
|
|
480
387
|
}
|
|
481
|
-
this.accessory.context.BatteryLevel = this.BatteryLevel;
|
|
482
|
-
this.batteryService?.updateCharacteristic(this.hap.Characteristic.BatteryLevel, this.BatteryLevel);
|
|
483
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
|
|
484
388
|
}
|
|
485
389
|
// StatusLowBattery
|
|
486
|
-
if (this.StatusLowBattery === undefined) {
|
|
487
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
|
|
390
|
+
if (this.Battery.StatusLowBattery === undefined) {
|
|
391
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.Battery.StatusLowBattery}`);
|
|
488
392
|
} else {
|
|
393
|
+
this.accessory.context.StatusLowBattery = this.Battery.StatusLowBattery;
|
|
394
|
+
this.Battery!.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, this.Battery.StatusLowBattery);
|
|
395
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
|
|
396
|
+
+ ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
|
|
489
397
|
if (this.device.mqttURL) {
|
|
490
|
-
mqttmessage.push(`"lowBattery": ${this.StatusLowBattery}`);
|
|
398
|
+
mqttmessage.push(`"lowBattery": ${this.Battery.StatusLowBattery}`);
|
|
491
399
|
}
|
|
492
|
-
this.accessory.context.StatusLowBattery = this.StatusLowBattery;
|
|
493
|
-
this.batteryService?.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, this.StatusLowBattery);
|
|
494
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
|
|
495
400
|
}
|
|
496
401
|
|
|
497
|
-
// MQTT
|
|
402
|
+
// MQTT Publish
|
|
498
403
|
if (this.device.mqttURL) {
|
|
499
404
|
this.mqttPublish(`{${mqttmessage.join(',')}}`);
|
|
500
405
|
}
|
|
501
|
-
|
|
406
|
+
|
|
407
|
+
// History Service
|
|
408
|
+
if (!this.device.meter?.hide_humidity && (Number(this.HumiditySensor!.CurrentRelativeHumidity) > 0)) {
|
|
502
409
|
// reject unreliable data
|
|
503
410
|
if (this.device.history) {
|
|
504
411
|
this.historyService?.addEntry(entry);
|
|
@@ -506,84 +413,6 @@ export class MeterPlus {
|
|
|
506
413
|
}
|
|
507
414
|
}
|
|
508
415
|
|
|
509
|
-
/*
|
|
510
|
-
* Publish MQTT message for topics of
|
|
511
|
-
* 'homebridge-switchbot/meter/xx:xx:xx:xx:xx:xx'
|
|
512
|
-
*/
|
|
513
|
-
mqttPublish(message: any) {
|
|
514
|
-
const mac = this.device.deviceId
|
|
515
|
-
?.toLowerCase()
|
|
516
|
-
.match(/[\s\S]{1,2}/g)
|
|
517
|
-
?.join(':');
|
|
518
|
-
const options = this.device.mqttPubOptions || {};
|
|
519
|
-
this.mqttClient?.publish(`homebridge-switchbot/meter/${mac}`, `${message}`, options);
|
|
520
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MQTT message: ${message} options:${JSON.stringify(options)}`);
|
|
521
|
-
}
|
|
522
|
-
|
|
523
|
-
/*
|
|
524
|
-
* Setup MQTT hadler if URL is specified.
|
|
525
|
-
*/
|
|
526
|
-
async setupMqtt(device: device & devicesConfig): Promise<void> {
|
|
527
|
-
if (device.mqttURL) {
|
|
528
|
-
try {
|
|
529
|
-
const { connectAsync } = asyncmqtt;
|
|
530
|
-
this.mqttClient = await connectAsync(device.mqttURL, device.mqttOptions || {});
|
|
531
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MQTT connection has been established successfully.`);
|
|
532
|
-
this.mqttClient.on('error', (e: Error) => {
|
|
533
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Failed to publish MQTT messages. ${e}`);
|
|
534
|
-
});
|
|
535
|
-
} catch (e) {
|
|
536
|
-
this.mqttClient = null;
|
|
537
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Failed to establish MQTT connection. ${e}`);
|
|
538
|
-
}
|
|
539
|
-
}
|
|
540
|
-
}
|
|
541
|
-
|
|
542
|
-
/*
|
|
543
|
-
* Setup EVE history graph feature if enabled.
|
|
544
|
-
*/
|
|
545
|
-
async setupHistoryService(device: device & devicesConfig): Promise<void> {
|
|
546
|
-
const mac = this.device
|
|
547
|
-
.deviceId!.match(/.{1,2}/g)!
|
|
548
|
-
.join(':')
|
|
549
|
-
.toLowerCase();
|
|
550
|
-
this.historyService = device.history
|
|
551
|
-
? new this.platform.fakegatoAPI('room', this.accessory, {
|
|
552
|
-
log: this.platform.log,
|
|
553
|
-
storage: 'fs',
|
|
554
|
-
filename: `${hostname().split('.')[0]}_${mac}_persist.json`,
|
|
555
|
-
})
|
|
556
|
-
: null;
|
|
557
|
-
}
|
|
558
|
-
|
|
559
|
-
async stopScanning(switchbot: any) {
|
|
560
|
-
switchbot.stopScan();
|
|
561
|
-
if (this.BLE_IsConnected) {
|
|
562
|
-
await this.BLEparseStatus();
|
|
563
|
-
await this.updateHomeKitCharacteristics();
|
|
564
|
-
} else {
|
|
565
|
-
await this.BLERefreshConnection(switchbot);
|
|
566
|
-
}
|
|
567
|
-
}
|
|
568
|
-
|
|
569
|
-
async getCustomBLEAddress(switchbot: any) {
|
|
570
|
-
if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
|
|
571
|
-
(async () => {
|
|
572
|
-
// Start to monitor advertisement packets
|
|
573
|
-
await switchbot.startScan({
|
|
574
|
-
model: 'i',
|
|
575
|
-
});
|
|
576
|
-
// Set an event handler
|
|
577
|
-
switchbot.onadvertisement = (ad: any) => {
|
|
578
|
-
this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, ' ')}`);
|
|
579
|
-
};
|
|
580
|
-
await sleep(10000);
|
|
581
|
-
// Stop to monitor
|
|
582
|
-
switchbot.stopScan();
|
|
583
|
-
})();
|
|
584
|
-
}
|
|
585
|
-
}
|
|
586
|
-
|
|
587
416
|
async BLERefreshConnection(switchbot: any): Promise<void> {
|
|
588
417
|
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot:`
|
|
589
418
|
+ ` ${JSON.stringify(switchbot)}`);
|
|
@@ -593,259 +422,26 @@ export class MeterPlus {
|
|
|
593
422
|
}
|
|
594
423
|
}
|
|
595
424
|
|
|
596
|
-
model(device: device & devicesConfig): CharacteristicValue {
|
|
597
|
-
let model: string;
|
|
598
|
-
if (device.deviceType === 'Meter Plus (JP)') {
|
|
599
|
-
model = 'W2201500';
|
|
600
|
-
} else {
|
|
601
|
-
model = 'W2301500';
|
|
602
|
-
}
|
|
603
|
-
return model;
|
|
604
|
-
}
|
|
605
|
-
|
|
606
|
-
async scan(device: device & devicesConfig): Promise<void> {
|
|
607
|
-
if (device.scanDuration) {
|
|
608
|
-
this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
|
|
609
|
-
if (this.BLE) {
|
|
610
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
|
|
611
|
-
}
|
|
612
|
-
} else {
|
|
613
|
-
this.scanDuration = this.accessory.context.scanDuration = 1;
|
|
614
|
-
if (this.BLE) {
|
|
615
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
|
|
616
|
-
}
|
|
617
|
-
}
|
|
618
|
-
}
|
|
619
|
-
|
|
620
|
-
async statusCode(statusCode: number): Promise<void> {
|
|
621
|
-
switch (statusCode) {
|
|
622
|
-
case 151:
|
|
623
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command not supported by this deviceType, statusCode: ${statusCode}`);
|
|
624
|
-
break;
|
|
625
|
-
case 152:
|
|
626
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found, statusCode: ${statusCode}`);
|
|
627
|
-
break;
|
|
628
|
-
case 160:
|
|
629
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported, statusCode: ${statusCode}`);
|
|
630
|
-
break;
|
|
631
|
-
case 161:
|
|
632
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline, statusCode: ${statusCode}`);
|
|
633
|
-
this.offlineOff();
|
|
634
|
-
break;
|
|
635
|
-
case 171:
|
|
636
|
-
this.errorLog(
|
|
637
|
-
`${this.device.deviceType}: ${this.accessory.displayName} Hub Device is offline, statusCode: ${statusCode}. ` +
|
|
638
|
-
`Hub: ${this.device.hubDeviceId}`,
|
|
639
|
-
);
|
|
640
|
-
this.offlineOff();
|
|
641
|
-
break;
|
|
642
|
-
case 190:
|
|
643
|
-
this.errorLog(
|
|
644
|
-
`${this.device.deviceType}: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
|
|
645
|
-
` Or command format is invalid, statusCode: ${statusCode}`,
|
|
646
|
-
);
|
|
647
|
-
break;
|
|
648
|
-
case 100:
|
|
649
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent, statusCode: ${statusCode}`);
|
|
650
|
-
break;
|
|
651
|
-
case 200:
|
|
652
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Request successful, statusCode: ${statusCode}`);
|
|
653
|
-
break;
|
|
654
|
-
case 400:
|
|
655
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Bad Request, The client has issued an invalid request. `
|
|
656
|
-
+ `This is commonly used to specify validation errors in a request payload, statusCode: ${statusCode}`);
|
|
657
|
-
break;
|
|
658
|
-
case 401:
|
|
659
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unauthorized, Authorization for the API is required, `
|
|
660
|
-
+ `but the request has not been authenticated, statusCode: ${statusCode}`);
|
|
661
|
-
break;
|
|
662
|
-
case 403:
|
|
663
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Forbidden, The request has been authenticated but does not `
|
|
664
|
-
+ `have appropriate permissions, or a requested resource is not found, statusCode: ${statusCode}`);
|
|
665
|
-
break;
|
|
666
|
-
case 404:
|
|
667
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Found, Specifies the requested path does not exist, `
|
|
668
|
-
+ `statusCode: ${statusCode}`);
|
|
669
|
-
break;
|
|
670
|
-
case 406:
|
|
671
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Acceptable, The client has requested a MIME type via `
|
|
672
|
-
+ `the Accept header for a value not supported by the server, statusCode: ${statusCode}`);
|
|
673
|
-
break;
|
|
674
|
-
case 415:
|
|
675
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unsupported Media Type, The client has defined a contentType `
|
|
676
|
-
+ `header that is not supported by the server, statusCode: ${statusCode}`);
|
|
677
|
-
break;
|
|
678
|
-
case 422:
|
|
679
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unprocessable Entity, The client has made a valid request, `
|
|
680
|
-
+ `but the server cannot process it. This is often used for APIs for which certain limits have been exceeded, statusCode: ${statusCode}`);
|
|
681
|
-
break;
|
|
682
|
-
case 429:
|
|
683
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Too Many Requests, The client has exceeded the number of `
|
|
684
|
-
+ `requests allowed for a given time window, statusCode: ${statusCode}`);
|
|
685
|
-
break;
|
|
686
|
-
case 500:
|
|
687
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Internal Server Error, An unexpected error on the SmartThings `
|
|
688
|
-
+ `servers has occurred. These errors should be rare, statusCode: ${statusCode}`);
|
|
689
|
-
break;
|
|
690
|
-
default:
|
|
691
|
-
this.infoLog(
|
|
692
|
-
`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode: ` +
|
|
693
|
-
`${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`,
|
|
694
|
-
);
|
|
695
|
-
}
|
|
696
|
-
}
|
|
697
|
-
|
|
698
425
|
async offlineOff(): Promise<void> {
|
|
699
426
|
if (this.device.offline) {
|
|
700
|
-
|
|
701
|
-
|
|
427
|
+
if (!this.device.meter?.hide_humidity) {
|
|
428
|
+
this.HumiditySensor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity, 50);
|
|
429
|
+
}
|
|
430
|
+
if (!this.device.meter?.hide_temperature) {
|
|
431
|
+
this.TemperatureSensor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, 30);
|
|
432
|
+
}
|
|
433
|
+
this.Battery.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, 100);
|
|
702
434
|
}
|
|
703
435
|
}
|
|
704
436
|
|
|
705
437
|
async apiError(e: any): Promise<void> {
|
|
706
438
|
if (!this.device.meter?.hide_humidity) {
|
|
707
|
-
this.
|
|
439
|
+
this.HumiditySensor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity, e);
|
|
708
440
|
}
|
|
709
441
|
if (!this.device.meter?.hide_temperature) {
|
|
710
|
-
this.
|
|
711
|
-
}
|
|
712
|
-
this.batteryService?.updateCharacteristic(this.hap.Characteristic.BatteryLevel, e);
|
|
713
|
-
this.batteryService?.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, e);
|
|
714
|
-
}
|
|
715
|
-
|
|
716
|
-
async deviceContext() {
|
|
717
|
-
if (this.CurrentRelativeHumidity === undefined) {
|
|
718
|
-
this.CurrentRelativeHumidity = 0;
|
|
719
|
-
} else {
|
|
720
|
-
this.CurrentRelativeHumidity = this.accessory.context.CurrentRelativeHumidity;
|
|
721
|
-
}
|
|
722
|
-
if (this.CurrentTemperature === undefined) {
|
|
723
|
-
this.CurrentTemperature = 0;
|
|
724
|
-
} else {
|
|
725
|
-
this.CurrentTemperature = this.accessory.context.CurrentTemperature;
|
|
726
|
-
}
|
|
727
|
-
if (this.BatteryLevel === undefined) {
|
|
728
|
-
this.BatteryLevel = 100;
|
|
729
|
-
} else {
|
|
730
|
-
this.BatteryLevel = this.accessory.context.BatteryLevel;
|
|
731
|
-
}
|
|
732
|
-
if (this.StatusLowBattery === undefined) {
|
|
733
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
734
|
-
this.accessory.context.StatusLowBattery = this.StatusLowBattery;
|
|
735
|
-
} else {
|
|
736
|
-
this.StatusLowBattery = this.accessory.context.StatusLowBattery;
|
|
737
|
-
}
|
|
738
|
-
if (this.FirmwareRevision === undefined) {
|
|
739
|
-
this.FirmwareRevision = this.platform.version;
|
|
740
|
-
this.accessory.context.FirmwareRevision = this.FirmwareRevision;
|
|
741
|
-
}
|
|
742
|
-
}
|
|
743
|
-
|
|
744
|
-
async refreshRate(device: device & devicesConfig): Promise<void> {
|
|
745
|
-
if (device.refreshRate) {
|
|
746
|
-
this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
|
|
747
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
|
|
748
|
-
} else if (this.platform.config.options!.refreshRate) {
|
|
749
|
-
this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options!.refreshRate;
|
|
750
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
|
|
751
|
-
}
|
|
752
|
-
}
|
|
753
|
-
|
|
754
|
-
async deviceConfig(device: device & devicesConfig): Promise<void> {
|
|
755
|
-
let config = {};
|
|
756
|
-
if (device.meter) {
|
|
757
|
-
config = device.meter;
|
|
758
|
-
}
|
|
759
|
-
if (device.connectionType !== undefined) {
|
|
760
|
-
config['connectionType'] = device.connectionType;
|
|
761
|
-
}
|
|
762
|
-
if (device.external !== undefined) {
|
|
763
|
-
config['external'] = device.external;
|
|
764
|
-
}
|
|
765
|
-
if (device.mqttURL !== undefined) {
|
|
766
|
-
config['mqttURL'] = device.mqttURL;
|
|
767
|
-
}
|
|
768
|
-
if (device.logging !== undefined) {
|
|
769
|
-
config['logging'] = device.logging;
|
|
770
|
-
}
|
|
771
|
-
if (device.refreshRate !== undefined) {
|
|
772
|
-
config['refreshRate'] = device.refreshRate;
|
|
773
|
-
}
|
|
774
|
-
if (device.scanDuration !== undefined) {
|
|
775
|
-
config['scanDuration'] = device.scanDuration;
|
|
776
|
-
}
|
|
777
|
-
if (device.webhook !== undefined) {
|
|
778
|
-
config['webhook'] = device.webhook;
|
|
779
|
-
}
|
|
780
|
-
if (Object.entries(config).length !== 0) {
|
|
781
|
-
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
|
|
782
|
-
}
|
|
783
|
-
}
|
|
784
|
-
|
|
785
|
-
async deviceLogs(device: device & devicesConfig): Promise<void> {
|
|
786
|
-
if (this.platform.debugMode) {
|
|
787
|
-
this.deviceLogging = this.accessory.context.logging = 'debugMode';
|
|
788
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
|
|
789
|
-
} else if (device.logging) {
|
|
790
|
-
this.deviceLogging = this.accessory.context.logging = device.logging;
|
|
791
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
|
|
792
|
-
} else if (this.platform.config.options?.logging) {
|
|
793
|
-
this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
|
|
794
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
|
|
795
|
-
} else {
|
|
796
|
-
this.deviceLogging = this.accessory.context.logging = 'standard';
|
|
797
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
|
|
798
|
-
}
|
|
799
|
-
}
|
|
800
|
-
|
|
801
|
-
/**
|
|
802
|
-
* Logging for Device
|
|
803
|
-
*/
|
|
804
|
-
infoLog(...log: any[]): void {
|
|
805
|
-
if (this.enablingDeviceLogging()) {
|
|
806
|
-
this.platform.log.info(String(...log));
|
|
442
|
+
this.TemperatureSensor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, e);
|
|
807
443
|
}
|
|
808
|
-
|
|
809
|
-
|
|
810
|
-
warnLog(...log: any[]): void {
|
|
811
|
-
if (this.enablingDeviceLogging()) {
|
|
812
|
-
this.platform.log.warn(String(...log));
|
|
813
|
-
}
|
|
814
|
-
}
|
|
815
|
-
|
|
816
|
-
debugWarnLog(...log: any[]): void {
|
|
817
|
-
if (this.enablingDeviceLogging()) {
|
|
818
|
-
if (this.deviceLogging?.includes('debug')) {
|
|
819
|
-
this.platform.log.warn('[DEBUG]', String(...log));
|
|
820
|
-
}
|
|
821
|
-
}
|
|
822
|
-
}
|
|
823
|
-
|
|
824
|
-
errorLog(...log: any[]): void {
|
|
825
|
-
if (this.enablingDeviceLogging()) {
|
|
826
|
-
this.platform.log.error(String(...log));
|
|
827
|
-
}
|
|
828
|
-
}
|
|
829
|
-
|
|
830
|
-
debugErrorLog(...log: any[]): void {
|
|
831
|
-
if (this.enablingDeviceLogging()) {
|
|
832
|
-
if (this.deviceLogging?.includes('debug')) {
|
|
833
|
-
this.platform.log.error('[DEBUG]', String(...log));
|
|
834
|
-
}
|
|
835
|
-
}
|
|
836
|
-
}
|
|
837
|
-
|
|
838
|
-
debugLog(...log: any[]): void {
|
|
839
|
-
if (this.enablingDeviceLogging()) {
|
|
840
|
-
if (this.deviceLogging === 'debug') {
|
|
841
|
-
this.platform.log.info('[DEBUG]', String(...log));
|
|
842
|
-
} else {
|
|
843
|
-
this.platform.log.debug(String(...log));
|
|
844
|
-
}
|
|
845
|
-
}
|
|
846
|
-
}
|
|
847
|
-
|
|
848
|
-
enablingDeviceLogging(): boolean {
|
|
849
|
-
return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
|
|
444
|
+
this.Battery!.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, e);
|
|
445
|
+
this.Battery!.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, e);
|
|
850
446
|
}
|
|
851
447
|
}
|