@switchbot/homebridge-switchbot 3.5.0-beta.7 → 3.5.0-beta.70
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 +120 -17
- package/dist/device/blindtilt.d.ts +23 -96
- package/dist/device/blindtilt.d.ts.map +1 -1
- package/dist/device/blindtilt.js +425 -778
- package/dist/device/blindtilt.js.map +1 -1
- package/dist/device/bot.d.ts +26 -72
- package/dist/device/bot.d.ts.map +1 -1
- package/dist/device/bot.js +803 -837
- package/dist/device/bot.js.map +1 -1
- package/dist/device/ceilinglight.d.ts +14 -68
- package/dist/device/ceilinglight.d.ts.map +1 -1
- package/dist/device/ceilinglight.js +241 -606
- package/dist/device/ceilinglight.js.map +1 -1
- package/dist/device/colorbulb.d.ts +14 -75
- package/dist/device/colorbulb.d.ts.map +1 -1
- package/dist/device/colorbulb.js +283 -658
- package/dist/device/colorbulb.js.map +1 -1
- package/dist/device/contact.d.ts +15 -66
- package/dist/device/contact.d.ts.map +1 -1
- package/dist/device/contact.js +254 -545
- package/dist/device/contact.js.map +1 -1
- package/dist/device/curtain.d.ts +19 -88
- package/dist/device/curtain.d.ts.map +1 -1
- package/dist/device/curtain.js +412 -806
- package/dist/device/curtain.js.map +1 -1
- package/dist/device/device.d.ts +59 -0
- package/dist/device/device.d.ts.map +1 -0
- package/dist/device/device.js +711 -0
- package/dist/device/device.js.map +1 -0
- package/dist/device/fan.d.ts +51 -0
- package/dist/device/fan.d.ts.map +1 -0
- package/dist/device/fan.js +540 -0
- package/dist/device/fan.js.map +1 -0
- package/dist/device/hub.d.ts +16 -60
- package/dist/device/hub.d.ts.map +1 -1
- package/dist/device/hub.js +261 -616
- 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 +240 -594
- package/dist/device/humidifier.js.map +1 -1
- package/dist/device/iosensor.d.ts +11 -64
- package/dist/device/iosensor.d.ts.map +1 -1
- package/dist/device/iosensor.js +196 -600
- package/dist/device/iosensor.js.map +1 -1
- package/dist/device/lightstrip.d.ts +11 -69
- package/dist/device/lightstrip.d.ts.map +1 -1
- package/dist/device/lightstrip.js +281 -586
- package/dist/device/lightstrip.js.map +1 -1
- package/dist/device/lock.d.ts +16 -63
- package/dist/device/lock.d.ts.map +1 -1
- package/dist/device/lock.js +252 -560
- package/dist/device/lock.js.map +1 -1
- package/dist/device/meter.d.ts +14 -64
- package/dist/device/meter.d.ts.map +1 -1
- package/dist/device/meter.js +191 -593
- package/dist/device/meter.js.map +1 -1
- package/dist/device/meterplus.d.ts +14 -65
- package/dist/device/meterplus.d.ts.map +1 -1
- package/dist/device/meterplus.js +180 -593
- package/dist/device/meterplus.js.map +1 -1
- package/dist/device/motion.d.ts +13 -69
- package/dist/device/motion.d.ts.map +1 -1
- package/dist/device/motion.js +188 -532
- package/dist/device/motion.js.map +1 -1
- package/dist/device/plug.d.ts +9 -57
- package/dist/device/plug.d.ts.map +1 -1
- package/dist/device/plug.js +96 -458
- package/dist/device/plug.js.map +1 -1
- package/dist/device/robotvacuumcleaner.d.ts +12 -63
- package/dist/device/robotvacuumcleaner.d.ts.map +1 -1
- package/dist/device/robotvacuumcleaner.js +202 -521
- package/dist/device/robotvacuumcleaner.js.map +1 -1
- package/dist/device/waterdetector.d.ts +10 -63
- package/dist/device/waterdetector.d.ts.map +1 -1
- package/dist/device/waterdetector.js +146 -475
- 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 +324 -452
- 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 +93 -307
- 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 +39 -281
- package/dist/irdevice/camera.js.map +1 -1
- package/dist/irdevice/fan.d.ts +10 -43
- package/dist/irdevice/fan.d.ts.map +1 -1
- package/dist/irdevice/fan.js +113 -341
- 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 +330 -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 +87 -335
- 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 +19 -6
- package/dist/platform.d.ts.map +1 -1
- package/dist/platform.js +310 -172
- package/dist/platform.js.map +1 -1
- package/dist/settings.d.ts +62 -19
- 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 +19 -15
- package/src/custom.d.ts +2 -1
- package/src/device/blindtilt.ts +462 -817
- package/src/device/bot.ts +862 -931
- package/src/device/ceilinglight.ts +259 -633
- package/src/device/colorbulb.ts +300 -688
- package/src/device/contact.ts +288 -571
- package/src/device/curtain.ts +441 -838
- package/src/device/device.ts +734 -0
- package/src/device/fan.ts +596 -0
- package/src/device/hub.ts +299 -645
- package/src/device/humidifier.ts +274 -647
- package/src/device/iosensor.ts +233 -626
- package/src/device/lightstrip.ts +309 -620
- package/src/device/lock.ts +292 -601
- package/src/device/meter.ts +228 -619
- package/src/device/meterplus.ts +216 -619
- package/src/device/motion.ts +218 -559
- package/src/device/plug.ts +111 -490
- package/src/device/robotvacuumcleaner.ts +228 -550
- package/src/device/waterdetector.ts +169 -501
- 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 +350 -477
- package/src/irdevice/airpurifier.ts +120 -330
- package/src/irdevice/camera.ts +53 -301
- package/src/irdevice/fan.ts +130 -360
- package/src/irdevice/irdevice.ts +346 -0
- package/src/irdevice/light.ts +157 -412
- package/src/irdevice/other.ts +507 -648
- package/src/irdevice/tv.ts +117 -367
- package/src/irdevice/vacuumcleaner.ts +59 -311
- package/src/irdevice/waterheater.ts +61 -320
- package/src/platform.ts +355 -219
- package/src/settings.ts +116 -611
- package/src/utils.ts +642 -1
- 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,74 +104,70 @@ 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
|
-
if (
|
|
176
|
-
this.
|
|
152
|
+
if (device.webhook) {
|
|
153
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
|
|
177
154
|
this.platform.webhookEventHandler[this.device.deviceId] = async (context) => {
|
|
178
155
|
try {
|
|
179
156
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
|
|
180
157
|
if (context.scale === 'CELSIUS') {
|
|
181
158
|
const { temperature, humidity } = context;
|
|
182
|
-
const {
|
|
159
|
+
const { CurrentRelativeHumidity } = this.HumiditySensor || { CurrentRelativeHumidity: undefined };
|
|
160
|
+
const { CurrentTemperature } = this.TemperatureSensor || { CurrentTemperature: undefined };
|
|
183
161
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
|
|
184
162
|
'(temperature, humidity) = ' +
|
|
185
163
|
`Webhook:(${temperature}, ${humidity}), ` +
|
|
186
164
|
`current:(${CurrentTemperature}, ${CurrentRelativeHumidity})`);
|
|
187
|
-
this.
|
|
188
|
-
|
|
165
|
+
if (this.device.meter?.hide_humidity) {
|
|
166
|
+
this.HumiditySensor!.CurrentRelativeHumidity = humidity;
|
|
167
|
+
}
|
|
168
|
+
if (this.device.meter?.hide_temperature) {
|
|
169
|
+
this.TemperatureSensor!.CurrentTemperature = temperature;
|
|
170
|
+
}
|
|
189
171
|
this.updateHomeKitCharacteristics();
|
|
190
172
|
}
|
|
191
173
|
} catch (e: any) {
|
|
@@ -196,90 +178,74 @@ export class MeterPlus {
|
|
|
196
178
|
}
|
|
197
179
|
}
|
|
198
180
|
|
|
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> {
|
|
181
|
+
async BLEparseStatus(serviceData: serviceData): Promise<void> {
|
|
218
182
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
|
|
219
183
|
|
|
220
184
|
// Battery
|
|
221
|
-
this.BatteryLevel = Number(
|
|
222
|
-
if (this.BatteryLevel < 15) {
|
|
223
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
|
|
185
|
+
this.Battery.BatteryLevel = Number(serviceData.battery);
|
|
186
|
+
if (this.Battery.BatteryLevel < 15) {
|
|
187
|
+
this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
|
|
224
188
|
} else {
|
|
225
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
189
|
+
this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
226
190
|
}
|
|
227
|
-
this.debugLog(`${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, StatusLowBattery: ${this.StatusLowBattery}`);
|
|
191
|
+
this.debugLog(`${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}, StatusLowBattery: ${this.Battery.StatusLowBattery}`);
|
|
228
192
|
|
|
229
193
|
// Humidity
|
|
230
194
|
if (!this.device.meter?.hide_humidity) {
|
|
231
|
-
this.CurrentRelativeHumidity =
|
|
232
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Humidity: ${this.CurrentRelativeHumidity}%`);
|
|
195
|
+
this.HumiditySensor!.CurrentRelativeHumidity = serviceData.humidity!;
|
|
196
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Humidity: ${this.HumiditySensor!.CurrentRelativeHumidity}%`);
|
|
233
197
|
}
|
|
234
198
|
|
|
235
199
|
// Current Temperature
|
|
236
200
|
if (!this.device.meter?.hide_temperature) {
|
|
237
|
-
|
|
238
|
-
this.CurrentTemperature =
|
|
239
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Temperature: ${this.CurrentTemperature}°c`);
|
|
201
|
+
serviceData.temperature!.c < 0 ? 0 : serviceData.temperature!.c > 100 ? 100 : serviceData.temperature!.c;
|
|
202
|
+
this.TemperatureSensor!.CurrentTemperature = serviceData.temperature!.c;
|
|
203
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Temperature: ${this.TemperatureSensor!.CurrentTemperature}°c`);
|
|
240
204
|
}
|
|
241
205
|
}
|
|
242
206
|
|
|
243
|
-
async openAPIparseStatus(): Promise<void> {
|
|
207
|
+
async openAPIparseStatus(deviceStatus: deviceStatus): Promise<void> {
|
|
244
208
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
|
|
245
209
|
|
|
246
210
|
// BatteryLevel
|
|
247
|
-
this.BatteryLevel = Number(
|
|
248
|
-
if (this.BatteryLevel <
|
|
249
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
|
|
211
|
+
this.Battery.BatteryLevel = Number(deviceStatus.body.battery);
|
|
212
|
+
if (this.Battery.BatteryLevel < 10) {
|
|
213
|
+
this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
|
|
250
214
|
} else {
|
|
251
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
215
|
+
this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
252
216
|
}
|
|
253
|
-
|
|
217
|
+
if (Number.isNaN(this.Battery.BatteryLevel)) {
|
|
218
|
+
this.Battery.BatteryLevel = 100;
|
|
219
|
+
}
|
|
220
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel},`
|
|
221
|
+
+ ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
|
|
254
222
|
|
|
255
223
|
// CurrentRelativeHumidity
|
|
256
224
|
if (!this.device.meter?.hide_humidity) {
|
|
257
|
-
this.CurrentRelativeHumidity =
|
|
258
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Humidity: ${this.CurrentRelativeHumidity}%`);
|
|
225
|
+
this.HumiditySensor!.CurrentRelativeHumidity = deviceStatus.body.humidity!;
|
|
226
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Humidity: ${this.HumiditySensor!.CurrentRelativeHumidity}%`);
|
|
259
227
|
}
|
|
260
228
|
|
|
261
229
|
// CurrentTemperature
|
|
262
230
|
if (!this.device.meter?.hide_temperature) {
|
|
263
|
-
this.CurrentTemperature =
|
|
264
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Temperature: ${this.CurrentTemperature}°c`);
|
|
231
|
+
this.TemperatureSensor!.CurrentTemperature = deviceStatus.body.temperature!;
|
|
232
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Temperature: ${this.TemperatureSensor!.CurrentTemperature}°c`);
|
|
233
|
+
}
|
|
234
|
+
|
|
235
|
+
// Firmware Version
|
|
236
|
+
const version = deviceStatus.body.version?.toString();
|
|
237
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
|
|
238
|
+
if (deviceStatus.body.version) {
|
|
239
|
+
const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
|
|
240
|
+
this.accessory
|
|
241
|
+
.getService(this.hap.Service.AccessoryInformation)!
|
|
242
|
+
.setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
|
|
243
|
+
.setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
|
|
244
|
+
.getCharacteristic(this.hap.Characteristic.FirmwareRevision)
|
|
245
|
+
.updateValue(deviceVersion);
|
|
246
|
+
this.accessory.context.deviceVersion = deviceVersion;
|
|
247
|
+
this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
|
|
265
248
|
}
|
|
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
249
|
}
|
|
284
250
|
|
|
285
251
|
/**
|
|
@@ -313,108 +279,44 @@ export class MeterPlus {
|
|
|
313
279
|
this.getCustomBLEAddress(switchbot);
|
|
314
280
|
// Start to monitor advertisement packets
|
|
315
281
|
(async () => {
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
id: this.device.bleMac,
|
|
319
|
-
});
|
|
282
|
+
// Start to monitor advertisement packets
|
|
283
|
+
await switchbot.startScan({ model: this.device.bleModel, id: this.device.bleMac });
|
|
320
284
|
// Set an event handler
|
|
321
285
|
switchbot.onadvertisement = (ad: any) => {
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
286
|
+
if (this.device.bleMac === ad.address && ad.model === this.device.bleModel) {
|
|
287
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, ' ')}`);
|
|
288
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.model}`);
|
|
325
289
|
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
290
|
} else {
|
|
332
291
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
|
|
333
292
|
}
|
|
334
293
|
};
|
|
335
|
-
// Wait
|
|
294
|
+
// Wait 10 seconds
|
|
336
295
|
await switchbot.wait(this.scanDuration * 1000);
|
|
337
296
|
// Stop to monitor
|
|
338
297
|
await switchbot.stopScan();
|
|
339
298
|
// Update HomeKit
|
|
340
|
-
await this.BLEparseStatus();
|
|
299
|
+
await this.BLEparseStatus(switchbot.onadvertisement.serviceData);
|
|
341
300
|
await this.updateHomeKitCharacteristics();
|
|
342
301
|
})();
|
|
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 {
|
|
302
|
+
if (switchbot === undefined) {
|
|
396
303
|
await this.BLERefreshConnection(switchbot);
|
|
397
|
-
}
|
|
304
|
+
}
|
|
398
305
|
}
|
|
399
306
|
|
|
400
307
|
async openAPIRefreshStatus(): Promise<void> {
|
|
401
308
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
|
|
402
309
|
try {
|
|
403
|
-
const { body, statusCode } = await
|
|
404
|
-
headers: this.platform.generateHeaders()
|
|
405
|
-
});
|
|
310
|
+
const { body, statusCode } = await this.platform.retryRequest(this.deviceMaxRetries, this.deviceDelayBetweenRetries,
|
|
311
|
+
`${Devices}/${this.device.deviceId}/status`, { headers: this.platform.generateHeaders() });
|
|
406
312
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
|
|
407
313
|
const deviceStatus: any = await body.json();
|
|
408
314
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
|
|
409
315
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
|
|
410
316
|
if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
|
|
411
|
-
this.
|
|
317
|
+
this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
412
318
|
+ `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();
|
|
319
|
+
this.openAPIparseStatus(deviceStatus);
|
|
418
320
|
this.updateHomeKitCharacteristics();
|
|
419
321
|
} else {
|
|
420
322
|
this.statusCode(statusCode);
|
|
@@ -438,67 +340,73 @@ export class MeterPlus {
|
|
|
438
340
|
|
|
439
341
|
// CurrentRelativeHumidity
|
|
440
342
|
if (!this.device.meter?.hide_humidity) {
|
|
441
|
-
if (this.CurrentRelativeHumidity === undefined) {
|
|
442
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}
|
|
343
|
+
if (this.HumiditySensor!.CurrentRelativeHumidity === undefined) {
|
|
344
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
|
|
345
|
+
+ ` CurrentRelativeHumidity: ${this.HumiditySensor!.CurrentRelativeHumidity}`);
|
|
443
346
|
} else {
|
|
347
|
+
this.accessory.context.CurrentRelativeHumidity = this.HumiditySensor!.CurrentRelativeHumidity;
|
|
348
|
+
this.HumiditySensor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity,
|
|
349
|
+
this.HumiditySensor!.CurrentRelativeHumidity);
|
|
350
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
|
|
351
|
+
+ ` updateCharacteristic CurrentRelativeHumidity: ${this.HumiditySensor!.CurrentRelativeHumidity}`);
|
|
444
352
|
if (this.device.mqttURL) {
|
|
445
|
-
mqttmessage.push(`"humidity": ${this.CurrentRelativeHumidity}`);
|
|
353
|
+
mqttmessage.push(`"humidity": ${this.HumiditySensor!.CurrentRelativeHumidity}`);
|
|
446
354
|
}
|
|
447
355
|
if (this.device.history) {
|
|
448
|
-
entry['humidity'] = this.CurrentRelativeHumidity;
|
|
356
|
+
entry['humidity'] = this.HumiditySensor!.CurrentRelativeHumidity;
|
|
449
357
|
}
|
|
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
358
|
}
|
|
457
359
|
}
|
|
360
|
+
|
|
458
361
|
// CurrentTemperature
|
|
459
362
|
if (!this.device.meter?.hide_temperature) {
|
|
460
|
-
if (this.CurrentTemperature === undefined) {
|
|
461
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
|
|
363
|
+
if (this.TemperatureSensor!.CurrentTemperature === undefined) {
|
|
364
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentTemperature: ${this.TemperatureSensor!.CurrentTemperature}`);
|
|
462
365
|
} else {
|
|
366
|
+
this.accessory.context.CurrentTemperature = this.TemperatureSensor!.CurrentTemperature;
|
|
367
|
+
this.TemperatureSensor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, this.TemperatureSensor!.CurrentTemperature);
|
|
368
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
|
|
369
|
+
+ ` CurrentTemperature: ${this.TemperatureSensor!.CurrentTemperature}`);
|
|
463
370
|
if (this.device.mqttURL) {
|
|
464
|
-
mqttmessage.push(`"temperature": ${this.CurrentTemperature}`);
|
|
371
|
+
mqttmessage.push(`"temperature": ${this.TemperatureSensor!.CurrentTemperature}`);
|
|
465
372
|
}
|
|
466
373
|
if (this.device.history) {
|
|
467
|
-
entry['temp'] = this.CurrentTemperature;
|
|
374
|
+
entry['temp'] = this.TemperatureSensor!.CurrentTemperature;
|
|
468
375
|
}
|
|
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
376
|
}
|
|
473
377
|
}
|
|
378
|
+
|
|
474
379
|
// BatteryLevel
|
|
475
|
-
if (this.BatteryLevel === undefined) {
|
|
476
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
|
|
380
|
+
if (this.Battery.BatteryLevel === undefined) {
|
|
381
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}`);
|
|
477
382
|
} else {
|
|
383
|
+
this.accessory.context.BatteryLevel = this.Battery.BatteryLevel;
|
|
384
|
+
this.Battery!.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, this.Battery.BatteryLevel);
|
|
385
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.Battery.BatteryLevel}`);
|
|
478
386
|
if (this.device.mqttURL) {
|
|
479
|
-
mqttmessage.push(`"battery": ${this.BatteryLevel}`);
|
|
387
|
+
mqttmessage.push(`"battery": ${this.Battery.BatteryLevel}`);
|
|
480
388
|
}
|
|
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
389
|
}
|
|
485
390
|
// StatusLowBattery
|
|
486
|
-
if (this.StatusLowBattery === undefined) {
|
|
487
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
|
|
391
|
+
if (this.Battery.StatusLowBattery === undefined) {
|
|
392
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.Battery.StatusLowBattery}`);
|
|
488
393
|
} else {
|
|
394
|
+
this.accessory.context.StatusLowBattery = this.Battery.StatusLowBattery;
|
|
395
|
+
this.Battery!.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, this.Battery.StatusLowBattery);
|
|
396
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
|
|
397
|
+
+ ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
|
|
489
398
|
if (this.device.mqttURL) {
|
|
490
|
-
mqttmessage.push(`"lowBattery": ${this.StatusLowBattery}`);
|
|
399
|
+
mqttmessage.push(`"lowBattery": ${this.Battery.StatusLowBattery}`);
|
|
491
400
|
}
|
|
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
401
|
}
|
|
496
402
|
|
|
497
|
-
// MQTT
|
|
403
|
+
// MQTT Publish
|
|
498
404
|
if (this.device.mqttURL) {
|
|
499
405
|
this.mqttPublish(`{${mqttmessage.join(',')}}`);
|
|
500
406
|
}
|
|
501
|
-
|
|
407
|
+
|
|
408
|
+
// History Service
|
|
409
|
+
if (!this.device.meter?.hide_humidity && (Number(this.HumiditySensor!.CurrentRelativeHumidity) > 0)) {
|
|
502
410
|
// reject unreliable data
|
|
503
411
|
if (this.device.history) {
|
|
504
412
|
this.historyService?.addEntry(entry);
|
|
@@ -506,84 +414,6 @@ export class MeterPlus {
|
|
|
506
414
|
}
|
|
507
415
|
}
|
|
508
416
|
|
|
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
417
|
async BLERefreshConnection(switchbot: any): Promise<void> {
|
|
588
418
|
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot:`
|
|
589
419
|
+ ` ${JSON.stringify(switchbot)}`);
|
|
@@ -593,259 +423,26 @@ export class MeterPlus {
|
|
|
593
423
|
}
|
|
594
424
|
}
|
|
595
425
|
|
|
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
426
|
async offlineOff(): Promise<void> {
|
|
699
427
|
if (this.device.offline) {
|
|
700
|
-
|
|
701
|
-
|
|
428
|
+
if (!this.device.meter?.hide_humidity) {
|
|
429
|
+
this.HumiditySensor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity, 50);
|
|
430
|
+
}
|
|
431
|
+
if (!this.device.meter?.hide_temperature) {
|
|
432
|
+
this.TemperatureSensor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, 30);
|
|
433
|
+
}
|
|
434
|
+
this.Battery.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, 100);
|
|
702
435
|
}
|
|
703
436
|
}
|
|
704
437
|
|
|
705
438
|
async apiError(e: any): Promise<void> {
|
|
706
439
|
if (!this.device.meter?.hide_humidity) {
|
|
707
|
-
this.
|
|
440
|
+
this.HumiditySensor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity, e);
|
|
708
441
|
}
|
|
709
442
|
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;
|
|
443
|
+
this.TemperatureSensor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, e);
|
|
761
444
|
}
|
|
762
|
-
|
|
763
|
-
|
|
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));
|
|
807
|
-
}
|
|
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';
|
|
445
|
+
this.Battery!.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, e);
|
|
446
|
+
this.Battery!.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, e);
|
|
850
447
|
}
|
|
851
448
|
}
|