@switchbot/homebridge-switchbot 3.5.0-beta.4 → 3.5.0-beta.40

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 (168) hide show
  1. package/CHANGELOG.md +4 -1
  2. package/config.schema.json +120 -17
  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 +349 -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 +584 -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 +211 -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 +252 -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 +206 -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 +337 -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 +671 -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 +503 -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 +244 -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 +209 -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 +176 -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 +254 -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 +212 -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 +172 -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 +161 -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 +138 -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 +84 -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 +142 -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 +123 -664
  78. package/dist/device/waterdetector.js.map +1 -1
  79. package/dist/homebridge-ui/public/index.html +2 -2
  80. package/dist/index.js +1 -1
  81. package/dist/irdevice/airconditioner.d.ts +8 -48
  82. package/dist/irdevice/airconditioner.d.ts.map +1 -1
  83. package/dist/irdevice/airconditioner.js +309 -419
  84. package/dist/irdevice/airconditioner.js.map +1 -1
  85. package/dist/irdevice/airpurifier.d.ts +7 -38
  86. package/dist/irdevice/airpurifier.d.ts.map +1 -1
  87. package/dist/irdevice/airpurifier.js +72 -304
  88. package/dist/irdevice/airpurifier.js.map +1 -1
  89. package/dist/irdevice/camera.d.ts +6 -35
  90. package/dist/irdevice/camera.d.ts.map +1 -1
  91. package/dist/irdevice/camera.js +34 -278
  92. package/dist/irdevice/camera.js.map +1 -1
  93. package/dist/irdevice/fan.d.ts +6 -39
  94. package/dist/irdevice/fan.d.ts.map +1 -1
  95. package/dist/irdevice/fan.js +67 -311
  96. package/dist/irdevice/fan.js.map +1 -1
  97. package/dist/irdevice/irdevice.d.ts +40 -0
  98. package/dist/irdevice/irdevice.d.ts.map +1 -0
  99. package/dist/irdevice/irdevice.js +512 -0
  100. package/dist/irdevice/irdevice.js.map +1 -0
  101. package/dist/irdevice/light.d.ts +6 -34
  102. package/dist/irdevice/light.d.ts.map +1 -1
  103. package/dist/irdevice/light.js +23 -272
  104. package/dist/irdevice/light.js.map +1 -1
  105. package/dist/irdevice/other.d.ts +18 -47
  106. package/dist/irdevice/other.d.ts.map +1 -1
  107. package/dist/irdevice/other.js +352 -546
  108. package/dist/irdevice/other.js.map +1 -1
  109. package/dist/irdevice/tv.d.ts +7 -39
  110. package/dist/irdevice/tv.d.ts.map +1 -1
  111. package/dist/irdevice/tv.js +82 -321
  112. package/dist/irdevice/tv.js.map +1 -1
  113. package/dist/irdevice/vacuumcleaner.d.ts +6 -35
  114. package/dist/irdevice/vacuumcleaner.d.ts.map +1 -1
  115. package/dist/irdevice/vacuumcleaner.js +41 -284
  116. package/dist/irdevice/vacuumcleaner.js.map +1 -1
  117. package/dist/irdevice/waterheater.d.ts +6 -35
  118. package/dist/irdevice/waterheater.d.ts.map +1 -1
  119. package/dist/irdevice/waterheater.js +42 -287
  120. package/dist/irdevice/waterheater.js.map +1 -1
  121. package/dist/platform.d.ts +14 -1
  122. package/dist/platform.d.ts.map +1 -1
  123. package/dist/platform.js +343 -198
  124. package/dist/platform.js.map +1 -1
  125. package/dist/settings.d.ts +41 -11
  126. package/dist/settings.d.ts.map +1 -1
  127. package/dist/settings.js +0 -552
  128. package/dist/settings.js.map +1 -1
  129. package/dist/utils.d.ts +77 -0
  130. package/dist/utils.d.ts.map +1 -1
  131. package/dist/utils.js +638 -1
  132. package/dist/utils.js.map +1 -1
  133. package/package.json +16 -15
  134. package/src/custom.d.ts +2 -1
  135. package/src/device/blindtilt.ts +375 -782
  136. package/src/device/bot.ts +618 -844
  137. package/src/device/ceilinglight.ts +224 -607
  138. package/src/device/colorbulb.ts +266 -656
  139. package/src/device/contact.ts +231 -553
  140. package/src/device/curtain.ts +357 -810
  141. package/src/device/device.ts +699 -0
  142. package/src/device/fan.ts +552 -0
  143. package/src/device/hub.ts +271 -624
  144. package/src/device/humidifier.ts +239 -618
  145. package/src/device/iosensor.ts +202 -610
  146. package/src/device/lightstrip.ts +275 -596
  147. package/src/device/lock.ts +249 -582
  148. package/src/device/meter.ts +198 -601
  149. package/src/device/meterplus.ts +186 -602
  150. package/src/device/motion.ts +158 -541
  151. package/src/device/plug.ts +94 -480
  152. package/src/device/robotvacuumcleaner.ts +163 -477
  153. package/src/device/waterdetector.ts +141 -689
  154. package/src/homebridge-ui/public/index.html +2 -2
  155. package/src/index.ts +1 -1
  156. package/src/irdevice/airconditioner.ts +330 -446
  157. package/src/irdevice/airpurifier.ts +89 -321
  158. package/src/irdevice/camera.ts +42 -293
  159. package/src/irdevice/fan.ts +78 -327
  160. package/src/irdevice/irdevice.ts +528 -0
  161. package/src/irdevice/light.ts +32 -287
  162. package/src/irdevice/other.ts +396 -615
  163. package/src/irdevice/tv.ts +100 -339
  164. package/src/irdevice/vacuumcleaner.ts +49 -305
  165. package/src/irdevice/waterheater.ts +50 -310
  166. package/src/platform.ts +353 -206
  167. package/src/settings.ts +57 -566
  168. package/src/utils.ts +642 -1
@@ -1,5 +1,8 @@
1
- import { request } from 'undici';
2
- import { sleep } from '../utils.js';
1
+ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
2
+ *
3
+ * contact.ts: @switchbot/homebridge-switchbot.
4
+ */
5
+ import { deviceBase } from './device.js';
3
6
  import { interval, Subject } from 'rxjs';
4
7
  import { skipWhile } from 'rxjs/operators';
5
8
  import { Devices } from '../settings.js';
@@ -8,158 +11,118 @@ import { Devices } from '../settings.js';
8
11
  * An instance of this class is created for each accessory your platform registers
9
12
  * Each accessory may expose multiple services of different service types.
10
13
  */
11
- export class Contact {
14
+ export class Contact extends deviceBase {
12
15
  platform;
13
- accessory;
14
- device;
15
- api;
16
- log;
17
- config;
18
- hap;
19
16
  // Services
20
- motionService;
21
- batteryService;
22
- lightSensorService;
23
- contactSensorservice;
24
- // Characteristic Values
25
- BatteryLevel;
26
- MotionDetected;
27
- StatusLowBattery;
28
- FirmwareRevision;
29
- ContactSensorState;
30
- CurrentAmbientLightLevel;
31
- // OpenAPI Status
32
- OpenAPI_BatteryLevel;
33
- OpenAPI_FirmwareRevision;
34
- OpenAPI_MotionDetected;
35
- OpenAPI_ContactSensorState;
36
- OpenAPI_CurrentAmbientLightLevel;
37
- // BLE Status
38
- BLE_BatteryLevel;
39
- BLE_MotionDetected;
40
- BLE_ContactSensorState;
41
- BLE_CurrentAmbientLightLevel;
42
- // BLE Others
43
- scanning;
44
- BLE_IsConnected;
45
- // Config
46
- set_minLux;
47
- set_maxLux;
48
- scanDuration;
49
- deviceLogging;
50
- deviceRefreshRate;
17
+ ContactSensor;
18
+ MotionSensor;
19
+ LightSensor;
20
+ Battery;
51
21
  // Updates
52
- contactUbpdateInProgress;
22
+ contactUpdateInProgress;
53
23
  doContactUpdate;
54
- // Connection
55
- OpenAPI;
56
- BLE;
57
24
  constructor(platform, accessory, device) {
25
+ super(platform, accessory, device);
58
26
  this.platform = platform;
59
- this.accessory = accessory;
60
- this.device = device;
61
- this.api = this.platform.api;
62
- this.log = this.platform.log;
63
- this.config = this.platform.config;
64
- this.hap = this.api.hap;
65
- // Connection
66
- this.BLE = this.device.connectionType === 'BLE' || this.device.connectionType === 'BLE/OpenAPI';
67
- this.OpenAPI = this.device.connectionType === 'OpenAPI' || this.device.connectionType === 'BLE/OpenAPI';
68
- // default placeholders
69
- this.deviceLogs(device);
70
- this.scan(device);
71
- this.refreshRate(device);
72
- this.deviceContext();
73
- this.deviceConfig(device);
74
27
  // this is subject we use to track when we need to POST changes to the SwitchBot API
75
28
  this.doContactUpdate = new Subject();
76
- this.contactUbpdateInProgress = false;
29
+ this.contactUpdateInProgress = false;
30
+ // Initialize Contact Sensor property
31
+ this.ContactSensor = {
32
+ Service: accessory.getService(this.hap.Service.ContactSensor),
33
+ ContactSensorState: this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED,
34
+ };
35
+ // Initialize Motion Sensor property
36
+ if (!this.device.contact?.hide_motionsensor) {
37
+ this.MotionSensor = {
38
+ Service: accessory.getService(this.hap.Service.MotionSensor),
39
+ MotionDetected: false,
40
+ };
41
+ }
42
+ // Initialize Light Sensor property
43
+ if (!this.device.contact?.hide_lightsensor) {
44
+ this.LightSensor = {
45
+ Service: accessory.getService(this.hap.Service.LightSensor),
46
+ CurrentAmbientLightLevel: 0,
47
+ };
48
+ }
77
49
  // Retrieve initial values and updateHomekit
78
50
  this.refreshStatus();
79
- // set accessory information
80
- accessory
81
- .getService(this.hap.Service.AccessoryInformation)
82
- .setCharacteristic(this.hap.Characteristic.Manufacturer, 'SwitchBot')
83
- .setCharacteristic(this.hap.Characteristic.Model, 'W1201500')
84
- .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId)
85
- .setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.FirmwareRevision);
86
51
  // get the Contact service if it exists, otherwise create a new Contact service
87
52
  // you can create multiple services for each accessory
88
- const contactSensorservice = `${accessory.displayName} Contact Sensor`;
89
- (this.contactSensorservice = accessory.getService(this.hap.Service.ContactSensor)
90
- || accessory.addService(this.hap.Service.ContactSensor)), contactSensorservice;
91
- this.contactSensorservice.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
92
- if (!this.contactSensorservice.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
93
- this.contactSensorservice.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
94
- }
53
+ const ContactSensorService = `${accessory.displayName} Contact Sensor`;
54
+ (this.ContactSensor.Service = accessory.getService(this.hap.Service.ContactSensor)
55
+ || accessory.addService(this.hap.Service.ContactSensor)), ContactSensorService;
56
+ this.ContactSensor.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
95
57
  // Motion Sensor Service
96
58
  if (device.contact?.hide_motionsensor) {
97
- this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Motion Sensor Service`);
98
- this.motionService = this.accessory.getService(this.hap.Service.MotionSensor);
99
- accessory.removeService(this.motionService);
100
- }
101
- else if (!this.motionService) {
102
- this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Motion Sensor Service`);
103
- const motionService = `${accessory.displayName} Motion Sensor`;
104
- (this.motionService = this.accessory.getService(this.hap.Service.MotionSensor)
105
- || this.accessory.addService(this.hap.Service.MotionSensor)), motionService;
106
- this.motionService.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Motion Sensor`);
107
- this.motionService.setCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Motion Sensor`);
59
+ this.debugLog(`${device.deviceType}: ${accessory.displayName} Removing Motion Sensor Service`);
60
+ this.MotionSensor.Service = accessory.getService(this.hap.Service.MotionSensor);
61
+ accessory.removeService(this.MotionSensor.Service);
62
+ }
63
+ else if (!this.MotionSensor?.Service && !device.contact?.hide_motionsensor) {
64
+ this.debugLog(`${device.deviceType}: ${accessory.displayName} Add Motion Sensor Service`);
65
+ const MotionService = `${accessory.displayName} Motion Sensor`;
66
+ (this.MotionSensor.Service = accessory.getService(this.hap.Service.MotionSensor)
67
+ || accessory.addService(this.hap.Service.MotionSensor)), MotionService;
68
+ this.MotionSensor.Service.setCharacteristic(this.hap.Characteristic.Name, MotionService);
108
69
  }
109
70
  else {
110
- this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Motion Sensor Service Not Added`);
71
+ this.debugLog(`${device.deviceType}: ${accessory.displayName} Motion Sensor Service Not Added`);
111
72
  }
112
73
  // Light Sensor Service
113
74
  if (device.contact?.hide_lightsensor) {
114
75
  this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Light Sensor Service`);
115
- this.lightSensorService = this.accessory.getService(this.hap.Service.LightSensor);
116
- accessory.removeService(this.lightSensorService);
76
+ this.LightSensor.Service = accessory.getService(this.hap.Service.LightSensor);
77
+ accessory.removeService(this.LightSensor.Service);
117
78
  }
118
- else if (!this.lightSensorService) {
79
+ else if (!this.LightSensor?.Service && !device.contact?.hide_lightsensor) {
119
80
  this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Light Sensor Service`);
120
- const lightSensorService = `${accessory.displayName} Light Sensor`;
121
- (this.lightSensorService = this.accessory.getService(this.hap.Service.LightSensor)
122
- || this.accessory.addService(this.hap.Service.LightSensor)), lightSensorService;
123
- this.lightSensorService.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Light Sensor`);
124
- this.lightSensorService.setCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Light Sensor`);
81
+ const LightSensorService = `${accessory.displayName} Light Sensor`;
82
+ (this.LightSensor.Service = this.accessory.getService(this.hap.Service.LightSensor)
83
+ || this.accessory.addService(this.hap.Service.LightSensor)), LightSensorService;
84
+ this.LightSensor.Service.setCharacteristic(this.hap.Characteristic.Name, LightSensorService);
125
85
  }
126
86
  else {
127
87
  this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Light Sensor Service Not Added`);
128
88
  }
129
89
  // Battery Service
130
- const batteryService = `${accessory.displayName} Battery`;
131
- (this.batteryService = this.accessory.getService(this.hap.Service.Battery)
132
- || accessory.addService(this.hap.Service.Battery)), batteryService;
133
- this.batteryService.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Battery`);
134
- if (!this.batteryService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
135
- this.batteryService.addCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Battery`);
136
- }
137
- this.batteryService.setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
90
+ const BatteryService = `${accessory.displayName} Battery`;
91
+ (this.Battery.Service = this.accessory.getService(this.hap.Service.Battery)
92
+ || accessory.addService(this.hap.Service.Battery)), BatteryService;
93
+ this.Battery.Service.setCharacteristic(this.hap.Characteristic.Name, BatteryService);
94
+ this.Battery.Service.setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
138
95
  // Retrieve initial values and updateHomekit
139
96
  this.updateHomeKitCharacteristics();
140
97
  // Start an update interval
141
98
  interval(this.deviceRefreshRate * 1000)
142
- .pipe(skipWhile(() => this.contactUbpdateInProgress))
99
+ .pipe(skipWhile(() => this.contactUpdateInProgress))
143
100
  .subscribe(async () => {
144
101
  await this.refreshStatus();
145
102
  });
146
103
  //regisiter webhook event handler
147
- if (this.device.webhook) {
148
- this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
104
+ if (device.webhook) {
105
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
149
106
  this.platform.webhookEventHandler[this.device.deviceId] = async (context) => {
150
107
  try {
151
108
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
152
109
  const { detectionState, brightness, openState } = context;
153
- const { MotionDetected, CurrentAmbientLightLevel, ContactSensorState } = this;
110
+ const { ContactSensorState } = this.ContactSensor;
111
+ const { CurrentAmbientLightLevel } = this.LightSensor || {};
112
+ const { MotionDetected } = this.MotionSensor || {};
154
113
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
155
114
  '(detectionState, brightness, openState) = ' +
156
115
  `Webhook:(${detectionState}, ${brightness}, ${openState}), ` +
157
116
  `current:(${MotionDetected}, ${CurrentAmbientLightLevel}, ${ContactSensorState})`);
158
- this.set_minLux = this.minLux();
159
- this.set_maxLux = this.maxLux();
160
- this.MotionDetected = detectionState === 'DETECTED' ? true : false;
161
- this.CurrentAmbientLightLevel = brightness === 'bright' ? this.set_maxLux : this.set_minLux;
162
- this.ContactSensorState = openState === 'open' ? 1 : 0;
117
+ const set_minLux = await this.minLux();
118
+ const set_maxLux = await this.maxLux();
119
+ this.ContactSensor.ContactSensorState = openState === 'open' ? 1 : 0;
120
+ if (!this.device.contact?.hide_motionsensor) {
121
+ this.MotionSensor.MotionDetected = detectionState === 'DETECTED' ? true : false;
122
+ }
123
+ if (!this.device.contact?.hide_lightsensor) {
124
+ this.LightSensor.CurrentAmbientLightLevel = brightness === 'bright' ? set_maxLux : set_minLux;
125
+ }
163
126
  this.updateHomeKitCharacteristics();
164
127
  }
165
128
  catch (e) {
@@ -169,130 +132,122 @@ export class Contact {
169
132
  };
170
133
  }
171
134
  }
172
- /**
173
- * Parse the device status from the SwitchBot api
174
- */
175
- async parseStatus() {
176
- if (!this.device.enableCloudService && this.OpenAPI) {
177
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} parseStatus enableCloudService: ${this.device.enableCloudService}`);
178
- }
179
- else if (this.BLE) {
180
- await this.BLEparseStatus();
181
- }
182
- else if (this.OpenAPI && this.platform.config.credentials?.token) {
183
- await this.openAPIparseStatus();
184
- }
185
- else {
186
- await this.offlineOff();
187
- this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:` + ` ${this.device.connectionType}, parseStatus will not happen.`);
188
- }
189
- }
190
- async BLEparseStatus() {
135
+ async BLEparseStatus(serviceData) {
191
136
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
192
137
  // Door State
193
- switch (this.BLE_ContactSensorState) {
138
+ switch (serviceData.doorState) {
194
139
  case 'open':
195
140
  case 1:
196
- this.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
141
+ this.ContactSensor.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
197
142
  break;
198
143
  case 'close':
199
144
  case 0:
200
- this.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED;
145
+ this.ContactSensor.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED;
201
146
  break;
202
147
  default:
203
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} timeout no closed, doorstate: ${this.BLE_ContactSensorState}`);
148
+ this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} timeout no closed, doorstate: ${serviceData.doorState}`);
204
149
  }
205
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensorState}`);
206
- if (this.ContactSensorState !== this.accessory.context.ContactSensorState &&
150
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensor.ContactSensorState}`);
151
+ if (this.ContactSensor.ContactSensorState !== this.accessory.context.ContactSensorState &&
207
152
  this.hap.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED) {
208
153
  this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Opened`);
209
154
  }
210
155
  // Movement
211
156
  if (!this.device.contact?.hide_motionsensor) {
212
- this.MotionDetected = Boolean(this.BLE_MotionDetected);
213
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
214
- if (this.MotionDetected !== this.accessory.context.MotionDetected && this.MotionDetected) {
157
+ this.MotionSensor.MotionDetected = Boolean(serviceData.movement);
158
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MotionDetected: ${this.MotionSensor.MotionDetected}`);
159
+ if (this.MotionSensor.MotionDetected !== this.accessory.context.MotionDetected && this.MotionSensor.MotionDetected) {
215
160
  this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Detected Motion`);
216
161
  }
217
162
  }
218
163
  // Light Level
219
164
  if (!this.device.contact?.hide_lightsensor) {
220
- this.set_minLux = this.minLux();
221
- this.set_maxLux = this.maxLux();
222
- switch (this.BLE_CurrentAmbientLightLevel) {
165
+ const set_minLux = await this.minLux();
166
+ const set_maxLux = await this.maxLux();
167
+ switch (serviceData.lightLevel) {
223
168
  case true:
224
- this.CurrentAmbientLightLevel = this.set_minLux;
169
+ this.LightSensor.CurrentAmbientLightLevel = set_minLux;
225
170
  break;
226
171
  default:
227
- this.CurrentAmbientLightLevel = this.set_maxLux;
172
+ this.LightSensor.CurrentAmbientLightLevel = set_maxLux;
228
173
  }
229
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel},` +
230
- ` CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
231
- if (this.CurrentAmbientLightLevel !== this.accessory.context.CurrentAmbientLightLevel) {
232
- this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
174
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${serviceData.lightLevel},` +
175
+ ` CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
176
+ if (this.LightSensor.CurrentAmbientLightLevel !== this.accessory.context.CurrentAmbientLightLevel) {
177
+ this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName}`
178
+ + ` CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
233
179
  }
234
180
  }
235
181
  // Battery
236
- if (this.BLE_BatteryLevel === undefined) {
237
- this.BLE_BatteryLevel === 100;
182
+ if (serviceData.battery === undefined) {
183
+ serviceData.battery === 100;
238
184
  }
239
- this.BatteryLevel = Number(this.BLE_BatteryLevel);
240
- if (this.BatteryLevel < 10) {
241
- this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
185
+ this.Battery.BatteryLevel = Number(serviceData.battery);
186
+ if (this.Battery.BatteryLevel < 10) {
187
+ this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
242
188
  }
243
189
  else {
244
- this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
190
+ this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
245
191
  }
246
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, ` + `StatusLowBattery: ${this.StatusLowBattery}`);
192
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}, `
193
+ + `StatusLowBattery: ${this.Battery.StatusLowBattery}`);
247
194
  }
248
- async openAPIparseStatus() {
195
+ async openAPIparseStatus(deviceStatus) {
249
196
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
250
197
  // Contact State
251
- if (this.OpenAPI_ContactSensorState === 'open') {
252
- this.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
253
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensorState}`);
198
+ if (deviceStatus.body.openState === 'open') {
199
+ this.ContactSensor.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
200
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensor.ContactSensorState}`);
254
201
  }
255
- else if (this.OpenAPI_ContactSensorState === 'close') {
256
- this.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED;
257
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensorState}`);
202
+ else if (deviceStatus.body.openState === 'close') {
203
+ this.ContactSensor.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED;
204
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensor.ContactSensorState}`);
258
205
  }
259
206
  else {
260
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openState: ${this.OpenAPI_ContactSensorState}`);
207
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openState: ${deviceStatus.body.openState}`);
261
208
  }
262
209
  // Motion State
263
210
  if (!this.device.contact?.hide_motionsensor) {
264
- this.MotionDetected = this.OpenAPI_MotionDetected;
265
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
211
+ this.MotionSensor.MotionDetected = deviceStatus.body.moveDetected;
212
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MotionDetected: ${this.MotionSensor.MotionDetected}`);
266
213
  }
267
214
  // Light Level
268
215
  if (!this.device.contact?.hide_lightsensor) {
269
- this.set_minLux = this.minLux();
270
- this.set_maxLux = this.maxLux();
271
- switch (this.OpenAPI_CurrentAmbientLightLevel) {
216
+ const set_minLux = await this.minLux();
217
+ const set_maxLux = await this.maxLux();
218
+ switch (deviceStatus.body.brightness) {
272
219
  case 'dim':
273
- this.CurrentAmbientLightLevel = this.set_minLux;
220
+ this.LightSensor.CurrentAmbientLightLevel = set_minLux;
274
221
  break;
275
222
  case 'bright':
276
223
  default:
277
- this.CurrentAmbientLightLevel = this.set_maxLux;
224
+ this.LightSensor.CurrentAmbientLightLevel = set_maxLux;
278
225
  }
279
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
226
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
227
+ + ` CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
280
228
  }
281
229
  // Battery
282
- if (this.OpenAPI_BatteryLevel === undefined) {
283
- this.OpenAPI_BatteryLevel === 100;
230
+ if (deviceStatus.body.battery === undefined) {
231
+ deviceStatus.body.battery === 100;
284
232
  }
285
- this.BatteryLevel = Number(this.OpenAPI_BatteryLevel);
286
- if (this.BatteryLevel < 10) {
287
- this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
233
+ this.Battery.BatteryLevel = Number(deviceStatus.body.battery);
234
+ if (this.Battery.BatteryLevel < 10) {
235
+ this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
288
236
  }
289
237
  else {
290
- this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
238
+ this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
291
239
  }
292
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, ` + `StatusLowBattery: ${this.StatusLowBattery}`);
240
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}, `
241
+ + `StatusLowBattery: ${this.Battery.StatusLowBattery}`);
293
242
  // FirmwareRevision
294
- this.FirmwareRevision = this.OpenAPI_FirmwareRevision;
295
- this.accessory.context.FirmwareRevision = this.FirmwareRevision;
243
+ if (deviceStatus.body.version) {
244
+ this.accessory.context.version = deviceStatus.body.version;
245
+ this.accessory
246
+ .getService(this.hap.Service.AccessoryInformation)
247
+ .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
248
+ .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
249
+ .updateValue(this.accessory.context.version);
250
+ }
296
251
  }
297
252
  /**
298
253
  * Asks the SwitchBot API for the latest device information
@@ -317,120 +272,59 @@ export class Contact {
317
272
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLERefreshStatus`);
318
273
  const switchbot = await this.platform.connectBLE();
319
274
  // Convert to BLE Address
320
- this.device.bleMac =
321
- this.device.customBLEaddress ||
322
- this.device
323
- .deviceId.match(/.{1,2}/g)
324
- .join(':')
325
- .toLowerCase();
275
+ this.device.bleMac = this.device
276
+ .deviceId.match(/.{1,2}/g)
277
+ .join(':')
278
+ .toLowerCase();
326
279
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
327
280
  this.getCustomBLEAddress(switchbot);
328
281
  // Start to monitor advertisement packets
329
282
  (async () => {
330
- await switchbot.startScan({
331
- model: 'd',
332
- id: this.device.bleMac,
333
- });
283
+ // Start to monitor advertisement packets
284
+ await switchbot.startScan({ model: this.device.bleModel, id: this.device.bleMac });
334
285
  // Set an event handler
335
286
  switchbot.onadvertisement = (ad) => {
336
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, ' ')}`);
337
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.serviceData.model}`);
338
- if (this.device.bleMac === ad.address && ad.serviceData.model === 'd') {
287
+ if (this.device.bleMac === ad.address && ad.model === this.device.bleModel) {
288
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, ' ')}`);
289
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.model}`);
339
290
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
340
- this.BLE_MotionDetected = ad.serviceData.movement;
341
- this.BLE_BatteryLevel = ad.serviceData.battery;
342
- this.BLE_CurrentAmbientLightLevel = ad.serviceData.lightLevel;
343
291
  }
344
292
  else {
345
293
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
346
294
  }
347
295
  };
348
- // Wait 1 seconds
296
+ // Wait 10 seconds
349
297
  await switchbot.wait(this.scanDuration * 1000);
350
298
  // Stop to monitor
351
299
  await switchbot.stopScan();
352
300
  // Update HomeKit
353
- await this.BLEparseStatus();
301
+ await this.BLEparseStatus(switchbot.onadvertisement.serviceData);
354
302
  await this.updateHomeKitCharacteristics();
355
303
  })();
356
- /*if (switchbot !== false) {
357
- await switchbot
358
- .startScan({
359
- model: 'd',
360
- id: this.device.bleMac,
361
- })
362
- .then(async () => {
363
- // Set an event handler
364
- this.scanning = true;
365
- switchbot.onadvertisement = async (ad: ad) => {
366
- this.debugLog(
367
- `${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
368
- ` BLE Address Found: ${ad.address}`,
369
- );
370
- this.BLE_MotionDetected = ad.serviceData.movement;
371
- this.BLE_BatteryLevel = ad.serviceData.battery;
372
- this.BLE_ContactSensorState = ad.serviceData.doorState;
373
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
374
- this.debugLog(
375
- `${this.device.deviceType}: ${this.accessory.displayName} movement: ${ad.serviceData.movement}, doorState: ` +
376
- `${ad.serviceData.doorState}, battery: ${ad.serviceData.battery}`,
377
- );
378
-
379
- if (ad.serviceData) {
380
- this.BLE_IsConnected = true;
381
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
382
- await this.stopScanning(switchbot);
383
- this.scanning = false;
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
- if (this.scanning) {
395
- await this.stopScanning(switchbot);
396
- }
397
- })
398
- .catch(async (e: any) => {
399
- this.apiError(e);
400
- this.errorLog(
401
- `${this.device.deviceType}: ${this.accessory.displayName} failed BLERefreshStatus with ${this.device.connectionType}` +
402
- ` Connection, Error Message: ${JSON.stringify(e.message)}`,
403
- );
404
- await this.BLERefreshConnection(switchbot);
405
- });
406
- } else {
407
- await this.BLERefreshConnection(switchbot);
408
- }*/
304
+ if (switchbot === undefined) {
305
+ await this.BLERefreshConnection(switchbot);
306
+ }
409
307
  }
410
308
  async openAPIRefreshStatus() {
411
309
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
412
310
  try {
413
- const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/status`, {
414
- headers: this.platform.generateHeaders(),
415
- });
311
+ const { body, statusCode } = await this.platform.retryRequest(this.deviceMaxRetries, this.deviceDelayBetweenRetries, `${Devices}/${this.device.deviceId}/status`, { headers: this.platform.generateHeaders() });
416
312
  this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
417
313
  const deviceStatus = await body.json();
418
314
  this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
419
315
  this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
420
316
  if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
421
- this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
317
+ this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
422
318
  + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
423
- this.OpenAPI_ContactSensorState = deviceStatus.body.openState;
424
- this.OpenAPI_MotionDetected = deviceStatus.body.moveDetected;
425
- this.OpenAPI_CurrentAmbientLightLevel = deviceStatus.body.brightness;
426
- this.OpenAPI_BatteryLevel = deviceStatus.body.battery;
427
- this.OpenAPI_FirmwareRevision = deviceStatus.body.version;
428
- this.openAPIparseStatus();
319
+ this.openAPIparseStatus(deviceStatus);
429
320
  this.updateHomeKitCharacteristics();
430
321
  }
431
322
  else {
432
323
  this.statusCode(statusCode);
433
324
  this.statusCode(deviceStatus.statusCode);
325
+ if (deviceStatus.statusCode === 161 || deviceStatus.statusCode === 171) {
326
+ this.offlineOff();
327
+ }
434
328
  }
435
329
  }
436
330
  catch (e) {
@@ -443,77 +337,54 @@ export class Contact {
443
337
  * Updates the status for each of the HomeKit Characteristics
444
338
  */
445
339
  async updateHomeKitCharacteristics() {
446
- if (this.ContactSensorState === undefined) {
447
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensorState}`);
340
+ if (this.ContactSensor.ContactSensorState === undefined) {
341
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensor.ContactSensorState}`);
448
342
  }
449
343
  else {
450
- this.accessory.context.ContactSensorState = this.ContactSensorState;
451
- this.contactSensorservice.updateCharacteristic(this.hap.Characteristic.ContactSensorState, this.ContactSensorState);
452
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic ContactSensorState: ${this.ContactSensorState}`);
344
+ this.accessory.context.ContactSensorState = this.ContactSensor.ContactSensorState;
345
+ this.ContactSensor.Service.updateCharacteristic(this.hap.Characteristic.ContactSensorState, this.ContactSensor.ContactSensorState);
346
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
347
+ + ` ContactSensorState: ${this.ContactSensor.ContactSensorState}`);
453
348
  }
454
349
  if (!this.device.contact?.hide_motionsensor) {
455
- if (this.MotionDetected === undefined) {
456
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
350
+ if (this.MotionSensor.MotionDetected === undefined) {
351
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MotionDetected: ${this.MotionSensor.MotionDetected}`);
457
352
  }
458
353
  else {
459
- this.accessory.context.MotionDetected = this.MotionDetected;
460
- this.motionService?.updateCharacteristic(this.hap.Characteristic.MotionDetected, this.MotionDetected);
461
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic MotionDetected: ${this.MotionDetected}`);
354
+ this.accessory.context.MotionDetected = this.MotionSensor.MotionDetected;
355
+ this.MotionSensor.Service.updateCharacteristic(this.hap.Characteristic.MotionDetected, this.MotionSensor.MotionDetected);
356
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
357
+ + ` MotionDetected: ${this.MotionSensor.MotionDetected}`);
462
358
  }
463
359
  }
464
360
  if (!this.device.contact?.hide_lightsensor) {
465
- if (this.CurrentAmbientLightLevel === undefined) {
466
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
361
+ if (this.LightSensor?.CurrentAmbientLightLevel === undefined) {
362
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
363
+ + ` CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
467
364
  }
468
365
  else {
469
- this.accessory.context.CurrentAmbientLightLevel = this.CurrentAmbientLightLevel;
470
- this.lightSensorService?.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, this.CurrentAmbientLightLevel);
366
+ this.accessory.context.CurrentAmbientLightLevel = this.LightSensor.CurrentAmbientLightLevel;
367
+ this.LightSensor.Service.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, this.LightSensor.CurrentAmbientLightLevel);
471
368
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` +
472
- ` updateCharacteristic CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
369
+ ` updateCharacteristic CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
473
370
  }
474
371
  }
475
- if (this.BatteryLevel === undefined) {
476
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
477
- }
478
- else {
479
- this.accessory.context.BatteryLevel = this.BatteryLevel;
480
- this.batteryService?.updateCharacteristic(this.hap.Characteristic.BatteryLevel, this.BatteryLevel);
481
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
482
- }
483
- if (this.StatusLowBattery === undefined) {
484
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
372
+ if (this.Battery.BatteryLevel === undefined) {
373
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}`);
485
374
  }
486
375
  else {
487
- this.accessory.context.StatusLowBattery = this.StatusLowBattery;
488
- this.batteryService?.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, this.StatusLowBattery);
489
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
376
+ this.accessory.context.BatteryLevel = this.Battery.BatteryLevel;
377
+ this.Battery.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, this.Battery.BatteryLevel);
378
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.Battery.BatteryLevel}`);
490
379
  }
491
- }
492
- async stopScanning(switchbot) {
493
- switchbot.stopScan();
494
- if (this.BLE_IsConnected) {
495
- await this.BLEparseStatus();
496
- await this.updateHomeKitCharacteristics();
380
+ if (this.Battery.StatusLowBattery === undefined) {
381
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.Battery.StatusLowBattery}`);
497
382
  }
498
383
  else {
499
- await this.BLERefreshConnection(switchbot);
500
- }
501
- }
502
- async getCustomBLEAddress(switchbot) {
503
- if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
504
- (async () => {
505
- // Start to monitor advertisement packets
506
- await switchbot.startScan({
507
- model: 'd',
508
- });
509
- // Set an event handler
510
- switchbot.onadvertisement = (ad) => {
511
- this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, ' ')}`);
512
- };
513
- await sleep(10000);
514
- // Stop to monitor
515
- switchbot.stopScan();
516
- })();
384
+ this.accessory.context.StatusLowBattery = this.Battery.StatusLowBattery;
385
+ this.Battery.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, this.Battery.StatusLowBattery);
386
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
387
+ + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
517
388
  }
518
389
  }
519
390
  async BLERefreshConnection(switchbot) {
@@ -524,243 +395,47 @@ export class Contact {
524
395
  await this.openAPIRefreshStatus();
525
396
  }
526
397
  }
527
- minLux() {
398
+ async minLux() {
399
+ let set_minLux;
528
400
  if (this.device.contact?.set_minLux) {
529
- this.set_minLux = this.device.contact.set_minLux;
401
+ set_minLux = this.device.contact.set_minLux;
530
402
  }
531
403
  else {
532
- this.set_minLux = 1;
404
+ set_minLux = 1;
533
405
  }
534
- return this.set_minLux;
406
+ return set_minLux;
535
407
  }
536
- maxLux() {
408
+ async maxLux() {
409
+ let set_maxLux;
537
410
  if (this.device.contact?.set_maxLux) {
538
- this.set_maxLux = this.device.contact.set_maxLux;
539
- }
540
- else {
541
- this.set_maxLux = 6001;
542
- }
543
- return this.set_maxLux;
544
- }
545
- async scan(device) {
546
- if (device.scanDuration) {
547
- this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
548
- if (this.BLE) {
549
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
550
- }
411
+ set_maxLux = this.device.contact.set_maxLux;
551
412
  }
552
413
  else {
553
- this.scanDuration = this.accessory.context.scanDuration = 1;
554
- if (this.BLE) {
555
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
556
- }
557
- }
558
- }
559
- async statusCode(statusCode) {
560
- switch (statusCode) {
561
- case 151:
562
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command not supported by this deviceType, statusCode: ${statusCode}`);
563
- break;
564
- case 152:
565
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found, statusCode: ${statusCode}`);
566
- break;
567
- case 160:
568
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported, statusCode: ${statusCode}`);
569
- break;
570
- case 161:
571
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline, statusCode: ${statusCode}`);
572
- this.offlineOff();
573
- break;
574
- case 171:
575
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Hub Device is offline, statusCode: ${statusCode}. ` +
576
- `Hub: ${this.device.hubDeviceId}`);
577
- this.offlineOff();
578
- break;
579
- case 190:
580
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
581
- ` Or command format is invalid, statusCode: ${statusCode}`);
582
- break;
583
- case 100:
584
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent, statusCode: ${statusCode}`);
585
- break;
586
- case 200:
587
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Request successful, statusCode: ${statusCode}`);
588
- break;
589
- case 400:
590
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Bad Request, The client has issued an invalid request. `
591
- + `This is commonly used to specify validation errors in a request payload, statusCode: ${statusCode}`);
592
- break;
593
- case 401:
594
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unauthorized, Authorization for the API is required, `
595
- + `but the request has not been authenticated, statusCode: ${statusCode}`);
596
- break;
597
- case 403:
598
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Forbidden, The request has been authenticated but does not `
599
- + `have appropriate permissions, or a requested resource is not found, statusCode: ${statusCode}`);
600
- break;
601
- case 404:
602
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Found, Specifies the requested path does not exist, `
603
- + `statusCode: ${statusCode}`);
604
- break;
605
- case 406:
606
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Acceptable, The client has requested a MIME type via `
607
- + `the Accept header for a value not supported by the server, statusCode: ${statusCode}`);
608
- break;
609
- case 415:
610
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unsupported Media Type, The client has defined a contentType `
611
- + `header that is not supported by the server, statusCode: ${statusCode}`);
612
- break;
613
- case 422:
614
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unprocessable Entity, The client has made a valid request, `
615
- + `but the server cannot process it. This is often used for APIs for which certain limits have been exceeded, statusCode: ${statusCode}`);
616
- break;
617
- case 429:
618
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Too Many Requests, The client has exceeded the number of `
619
- + `requests allowed for a given time window, statusCode: ${statusCode}`);
620
- break;
621
- case 500:
622
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Internal Server Error, An unexpected error on the SmartThings `
623
- + `servers has occurred. These errors should be rare, statusCode: ${statusCode}`);
624
- break;
625
- default:
626
- this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode: ` +
627
- `${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`);
414
+ set_maxLux = 6001;
628
415
  }
416
+ return set_maxLux;
629
417
  }
630
418
  async offlineOff() {
631
419
  if (this.device.offline) {
632
- await this.deviceContext();
633
- await this.updateHomeKitCharacteristics();
420
+ this.ContactSensor.Service.updateCharacteristic(this.hap.Characteristic.ContactSensorState, this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED);
421
+ if (!this.device.contact?.hide_motionsensor) {
422
+ this.MotionSensor.Service.updateCharacteristic(this.hap.Characteristic.MotionDetected, false);
423
+ }
424
+ if (!this.device.contact?.hide_lightsensor) {
425
+ this.LightSensor.Service.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, 100);
426
+ }
634
427
  }
635
428
  }
636
429
  async apiError(e) {
637
- this.contactSensorservice.updateCharacteristic(this.hap.Characteristic.ContactSensorState, e);
430
+ this.ContactSensor.Service.updateCharacteristic(this.hap.Characteristic.ContactSensorState, e);
638
431
  if (!this.device.contact?.hide_motionsensor) {
639
- this.motionService?.updateCharacteristic(this.hap.Characteristic.MotionDetected, e);
432
+ this.MotionSensor.Service.updateCharacteristic(this.hap.Characteristic.MotionDetected, e);
640
433
  }
641
434
  if (!this.device.contact?.hide_lightsensor) {
642
- this.lightSensorService?.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, e);
643
- }
644
- this.batteryService?.updateCharacteristic(this.hap.Characteristic.BatteryLevel, e);
645
- this.batteryService?.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, e);
646
- }
647
- async deviceContext() {
648
- if (this.MotionDetected === undefined) {
649
- this.MotionDetected = false;
650
- }
651
- else {
652
- this.MotionDetected = this.accessory.context.MotionDetected;
653
- }
654
- if (this.ContactSensorState === undefined) {
655
- this.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED;
656
- }
657
- else {
658
- this.ContactSensorState = this.accessory.context.ContactSensorState;
659
- }
660
- if (this.FirmwareRevision === undefined) {
661
- this.FirmwareRevision = this.platform.version;
662
- this.accessory.context.FirmwareRevision = this.FirmwareRevision;
663
- }
664
- }
665
- async refreshRate(device) {
666
- if (device.refreshRate) {
667
- this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
668
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
669
- }
670
- else if (this.platform.config.options.refreshRate) {
671
- this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options.refreshRate;
672
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
673
- }
674
- }
675
- async deviceConfig(device) {
676
- let config = {};
677
- if (device.contact) {
678
- config = device.contact;
679
- }
680
- if (device.connectionType !== undefined) {
681
- config['connectionType'] = device.connectionType;
682
- }
683
- if (device.external !== undefined) {
684
- config['external'] = device.external;
685
- }
686
- if (device.logging !== undefined) {
687
- config['logging'] = device.logging;
688
- }
689
- if (device.refreshRate !== undefined) {
690
- config['refreshRate'] = device.refreshRate;
691
- }
692
- if (device.scanDuration !== undefined) {
693
- config['scanDuration'] = device.scanDuration;
694
- }
695
- if (device.webhook !== undefined) {
696
- config['webhook'] = device.webhook;
435
+ this.LightSensor.Service.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, e);
697
436
  }
698
- if (Object.entries(config).length !== 0) {
699
- this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
700
- }
701
- }
702
- async deviceLogs(device) {
703
- if (this.platform.debugMode) {
704
- this.deviceLogging = this.accessory.context.logging = 'debugMode';
705
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
706
- }
707
- else if (device.logging) {
708
- this.deviceLogging = this.accessory.context.logging = device.logging;
709
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
710
- }
711
- else if (this.platform.config.options?.logging) {
712
- this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
713
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
714
- }
715
- else {
716
- this.deviceLogging = this.accessory.context.logging = 'standard';
717
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
718
- }
719
- }
720
- /**
721
- * Logging for Device
722
- */
723
- infoLog(...log) {
724
- if (this.enablingDeviceLogging()) {
725
- this.platform.log.info(String(...log));
726
- }
727
- }
728
- warnLog(...log) {
729
- if (this.enablingDeviceLogging()) {
730
- this.platform.log.warn(String(...log));
731
- }
732
- }
733
- debugWarnLog(...log) {
734
- if (this.enablingDeviceLogging()) {
735
- if (this.deviceLogging?.includes('debug')) {
736
- this.platform.log.warn('[DEBUG]', String(...log));
737
- }
738
- }
739
- }
740
- errorLog(...log) {
741
- if (this.enablingDeviceLogging()) {
742
- this.platform.log.error(String(...log));
743
- }
744
- }
745
- debugErrorLog(...log) {
746
- if (this.enablingDeviceLogging()) {
747
- if (this.deviceLogging?.includes('debug')) {
748
- this.platform.log.error('[DEBUG]', String(...log));
749
- }
750
- }
751
- }
752
- debugLog(...log) {
753
- if (this.enablingDeviceLogging()) {
754
- if (this.deviceLogging === 'debug') {
755
- this.platform.log.info('[DEBUG]', String(...log));
756
- }
757
- else {
758
- this.platform.log.debug(String(...log));
759
- }
760
- }
761
- }
762
- enablingDeviceLogging() {
763
- return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
437
+ this.Battery.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, e);
438
+ this.Battery.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, e);
764
439
  }
765
440
  }
766
441
  //# sourceMappingURL=contact.js.map