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