@switchbot/homebridge-switchbot 3.5.0-beta.3 → 3.5.0-beta.30

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