@switchbot/homebridge-switchbot 3.5.0-beta.6 → 3.5.0-beta.60

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 (177) hide show
  1. package/.vscode/settings.json +4 -1
  2. package/CHANGELOG.md +4 -1
  3. package/config.schema.json +120 -17
  4. package/dist/device/blindtilt.d.ts +23 -96
  5. package/dist/device/blindtilt.d.ts.map +1 -1
  6. package/dist/device/blindtilt.js +408 -779
  7. package/dist/device/blindtilt.js.map +1 -1
  8. package/dist/device/bot.d.ts +26 -72
  9. package/dist/device/bot.d.ts.map +1 -1
  10. package/dist/device/bot.js +696 -822
  11. package/dist/device/bot.js.map +1 -1
  12. package/dist/device/ceilinglight.d.ts +14 -68
  13. package/dist/device/ceilinglight.d.ts.map +1 -1
  14. package/dist/device/ceilinglight.js +237 -606
  15. package/dist/device/ceilinglight.js.map +1 -1
  16. package/dist/device/colorbulb.d.ts +14 -75
  17. package/dist/device/colorbulb.d.ts.map +1 -1
  18. package/dist/device/colorbulb.js +279 -658
  19. package/dist/device/colorbulb.js.map +1 -1
  20. package/dist/device/contact.d.ts +15 -66
  21. package/dist/device/contact.d.ts.map +1 -1
  22. package/dist/device/contact.js +242 -544
  23. package/dist/device/contact.js.map +1 -1
  24. package/dist/device/curtain.d.ts +19 -88
  25. package/dist/device/curtain.d.ts.map +1 -1
  26. package/dist/device/curtain.js +402 -805
  27. package/dist/device/curtain.js.map +1 -1
  28. package/dist/device/device.d.ts +59 -0
  29. package/dist/device/device.d.ts.map +1 -0
  30. package/dist/device/device.js +684 -0
  31. package/dist/device/device.js.map +1 -0
  32. package/dist/device/fan.d.ts +51 -0
  33. package/dist/device/fan.d.ts.map +1 -0
  34. package/dist/device/fan.js +535 -0
  35. package/dist/device/fan.js.map +1 -0
  36. package/dist/device/hub.d.ts +16 -60
  37. package/dist/device/hub.d.ts.map +1 -1
  38. package/dist/device/hub.js +246 -613
  39. package/dist/device/hub.js.map +1 -1
  40. package/dist/device/humidifier.d.ts +11 -66
  41. package/dist/device/humidifier.d.ts.map +1 -1
  42. package/dist/device/humidifier.js +232 -593
  43. package/dist/device/humidifier.js.map +1 -1
  44. package/dist/device/iosensor.d.ts +11 -64
  45. package/dist/device/iosensor.d.ts.map +1 -1
  46. package/dist/device/iosensor.js +185 -600
  47. package/dist/device/iosensor.js.map +1 -1
  48. package/dist/device/lightstrip.d.ts +11 -69
  49. package/dist/device/lightstrip.d.ts.map +1 -1
  50. package/dist/device/lightstrip.js +277 -586
  51. package/dist/device/lightstrip.js.map +1 -1
  52. package/dist/device/lock.d.ts +16 -63
  53. package/dist/device/lock.d.ts.map +1 -1
  54. package/dist/device/lock.js +241 -560
  55. package/dist/device/lock.js.map +1 -1
  56. package/dist/device/meter.d.ts +14 -64
  57. package/dist/device/meter.d.ts.map +1 -1
  58. package/dist/device/meter.js +181 -593
  59. package/dist/device/meter.js.map +1 -1
  60. package/dist/device/meterplus.d.ts +14 -65
  61. package/dist/device/meterplus.d.ts.map +1 -1
  62. package/dist/device/meterplus.js +170 -593
  63. package/dist/device/meterplus.js.map +1 -1
  64. package/dist/device/motion.d.ts +13 -69
  65. package/dist/device/motion.d.ts.map +1 -1
  66. package/dist/device/motion.js +178 -531
  67. package/dist/device/motion.js.map +1 -1
  68. package/dist/device/plug.d.ts +9 -57
  69. package/dist/device/plug.d.ts.map +1 -1
  70. package/dist/device/plug.js +92 -458
  71. package/dist/device/plug.js.map +1 -1
  72. package/dist/device/robotvacuumcleaner.d.ts +12 -63
  73. package/dist/device/robotvacuumcleaner.d.ts.map +1 -1
  74. package/dist/device/robotvacuumcleaner.js +197 -521
  75. package/dist/device/robotvacuumcleaner.js.map +1 -1
  76. package/dist/device/waterdetector.d.ts +10 -65
  77. package/dist/device/waterdetector.d.ts.map +1 -1
  78. package/dist/device/waterdetector.js +139 -495
  79. package/dist/device/waterdetector.js.map +1 -1
  80. package/dist/homebridge-ui/public/index.html +22 -16
  81. package/dist/homebridge-ui/server.js +1 -1
  82. package/dist/homebridge-ui/server.js.map +1 -1
  83. package/dist/index.d.ts +1 -1
  84. package/dist/index.d.ts.map +1 -1
  85. package/dist/index.js +2 -2
  86. package/dist/index.js.map +1 -1
  87. package/dist/irdevice/airconditioner.d.ts +9 -49
  88. package/dist/irdevice/airconditioner.d.ts.map +1 -1
  89. package/dist/irdevice/airconditioner.js +309 -419
  90. package/dist/irdevice/airconditioner.js.map +1 -1
  91. package/dist/irdevice/airpurifier.d.ts +8 -39
  92. package/dist/irdevice/airpurifier.d.ts.map +1 -1
  93. package/dist/irdevice/airpurifier.js +72 -304
  94. package/dist/irdevice/airpurifier.js.map +1 -1
  95. package/dist/irdevice/camera.d.ts +7 -36
  96. package/dist/irdevice/camera.d.ts.map +1 -1
  97. package/dist/irdevice/camera.js +34 -278
  98. package/dist/irdevice/camera.js.map +1 -1
  99. package/dist/irdevice/fan.d.ts +10 -43
  100. package/dist/irdevice/fan.d.ts.map +1 -1
  101. package/dist/irdevice/fan.js +100 -338
  102. package/dist/irdevice/fan.js.map +1 -1
  103. package/dist/irdevice/irdevice.d.ts +40 -0
  104. package/dist/irdevice/irdevice.d.ts.map +1 -0
  105. package/dist/irdevice/irdevice.js +330 -0
  106. package/dist/irdevice/irdevice.js.map +1 -0
  107. package/dist/irdevice/light.d.ts +12 -45
  108. package/dist/irdevice/light.d.ts.map +1 -1
  109. package/dist/irdevice/light.js +87 -357
  110. package/dist/irdevice/light.js.map +1 -1
  111. package/dist/irdevice/other.d.ts +19 -48
  112. package/dist/irdevice/other.d.ts.map +1 -1
  113. package/dist/irdevice/other.js +352 -546
  114. package/dist/irdevice/other.js.map +1 -1
  115. package/dist/irdevice/tv.d.ts +8 -40
  116. package/dist/irdevice/tv.d.ts.map +1 -1
  117. package/dist/irdevice/tv.js +82 -321
  118. package/dist/irdevice/tv.js.map +1 -1
  119. package/dist/irdevice/vacuumcleaner.d.ts +7 -36
  120. package/dist/irdevice/vacuumcleaner.d.ts.map +1 -1
  121. package/dist/irdevice/vacuumcleaner.js +41 -284
  122. package/dist/irdevice/vacuumcleaner.js.map +1 -1
  123. package/dist/irdevice/waterheater.d.ts +7 -36
  124. package/dist/irdevice/waterheater.d.ts.map +1 -1
  125. package/dist/irdevice/waterheater.js +42 -287
  126. package/dist/irdevice/waterheater.js.map +1 -1
  127. package/dist/platform.d.ts +19 -6
  128. package/dist/platform.d.ts.map +1 -1
  129. package/dist/platform.js +310 -169
  130. package/dist/platform.js.map +1 -1
  131. package/dist/settings.d.ts +62 -19
  132. package/dist/settings.d.ts.map +1 -1
  133. package/dist/settings.js +16 -552
  134. package/dist/settings.js.map +1 -1
  135. package/dist/utils.d.ts +77 -0
  136. package/dist/utils.d.ts.map +1 -1
  137. package/dist/utils.js +638 -1
  138. package/dist/utils.js.map +1 -1
  139. package/eslint.config.js +96 -0
  140. package/package.json +19 -15
  141. package/src/custom.d.ts +2 -1
  142. package/src/device/blindtilt.ts +442 -814
  143. package/src/device/bot.ts +754 -915
  144. package/src/device/ceilinglight.ts +255 -633
  145. package/src/device/colorbulb.ts +294 -685
  146. package/src/device/contact.ts +277 -571
  147. package/src/device/curtain.ts +431 -835
  148. package/src/device/device.ts +709 -0
  149. package/src/device/fan.ts +591 -0
  150. package/src/device/hub.ts +286 -644
  151. package/src/device/humidifier.ts +266 -646
  152. package/src/device/iosensor.ts +220 -625
  153. package/src/device/lightstrip.ts +305 -620
  154. package/src/device/lock.ts +280 -600
  155. package/src/device/meter.ts +216 -617
  156. package/src/device/meterplus.ts +205 -619
  157. package/src/device/motion.ts +206 -556
  158. package/src/device/plug.ts +107 -490
  159. package/src/device/robotvacuumcleaner.ts +223 -550
  160. package/src/device/waterdetector.ts +160 -519
  161. package/src/homebridge-ui/public/index.html +22 -16
  162. package/src/homebridge-ui/server.ts +1 -1
  163. package/src/index.ts +4 -3
  164. package/src/irdevice/airconditioner.ts +333 -447
  165. package/src/irdevice/airpurifier.ts +92 -322
  166. package/src/irdevice/camera.ts +45 -294
  167. package/src/irdevice/fan.ts +115 -353
  168. package/src/irdevice/irdevice.ts +346 -0
  169. package/src/irdevice/light.ts +110 -385
  170. package/src/irdevice/other.ts +399 -616
  171. package/src/irdevice/tv.ts +103 -340
  172. package/src/irdevice/vacuumcleaner.ts +52 -306
  173. package/src/irdevice/waterheater.ts +53 -311
  174. package/src/platform.ts +355 -216
  175. package/src/settings.ts +116 -611
  176. package/src/utils.ts +642 -1
  177. package/src/device/waterdetector.json +0 -11
@@ -1,117 +1,72 @@
1
+ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
2
+ *
3
+ * blindtilt.ts: @switchbot/homebridge-switchbot.
4
+ */
1
5
  import { request } from 'undici';
2
- import { sleep } from '../utils.js';
6
+ import { deviceBase } from './device.js';
3
7
  import { interval, Subject } from 'rxjs';
8
+ import { Devices } from '../settings.js';
9
+ import { hs2rgb, rgb2hs, m2hs } from '../utils.js';
4
10
  import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
5
- import { hs2rgb, rgb2hs, m2hs, Devices } from '../settings.js';
6
11
  /**
7
12
  * Platform Accessory
8
13
  * An instance of this class is created for each accessory your platform registers
9
14
  * Each accessory may expose multiple services of different service types.
10
15
  */
11
- export class ColorBulb {
16
+ export class ColorBulb extends deviceBase {
12
17
  platform;
13
- accessory;
14
- device;
15
- api;
16
- log;
17
- config;
18
- hap;
19
18
  // Services
20
- lightBulbService;
21
- // Characteristic Values
22
- On;
23
- Hue;
24
- Saturation;
25
- Brightness;
26
- FirmwareRevision;
27
- ColorTemperature;
28
- // OpenAPI Status
29
- OpenAPI_On;
30
- OpenAPI_RGB;
31
- OpenAPI_Brightness;
32
- OpenAPI_FirmwareRevision;
33
- OpenAPI_ColorTemperature;
34
- // BLE Status
35
- BLE_ColorTemperature;
36
- BLE_Power;
37
- BLE_Red;
38
- BLE_Blue;
39
- BLE_Green;
40
- BLE_On;
41
- BLE_Delay;
42
- BLE_WifiRssi;
43
- BLE_Brightness;
44
- BLE_Saturation;
45
- BLE_Hue;
46
- // BLE Others
47
- BLE_IsConnected;
48
- // Config
49
- set_minStep;
50
- scanDuration;
51
- deviceLogging;
52
- deviceRefreshRate;
53
- adaptiveLightingShift;
19
+ LightBulb;
54
20
  // Adaptive Lighting
55
21
  AdaptiveLightingController;
56
- minKelvin;
57
- maxKelvin;
58
- // Others
59
- cacheKelvin;
22
+ adaptiveLightingShift;
60
23
  // Updates
61
24
  colorBulbUpdateInProgress;
62
25
  doColorBulbUpdate;
63
- // Connection
64
- OpenAPI;
65
- BLE;
66
26
  constructor(platform, accessory, device) {
27
+ super(platform, accessory, device);
67
28
  this.platform = platform;
68
- this.accessory = accessory;
69
- this.device = device;
70
- this.api = this.platform.api;
71
- this.log = this.platform.log;
72
- this.config = this.platform.config;
73
- this.hap = this.api.hap;
74
- // Connection
75
- this.BLE = this.device.connectionType === 'BLE' || this.device.connectionType === 'BLE/OpenAPI';
76
- this.OpenAPI = this.device.connectionType === 'OpenAPI' || this.device.connectionType === 'BLE/OpenAPI';
77
29
  // default placeholders
78
- this.deviceLogs(device);
79
- this.scan(device);
80
- this.refreshRate(device);
81
30
  this.adaptiveLighting(device);
82
- this.deviceContext();
83
- this.deviceConfig(device);
84
31
  // this is subject we use to track when we need to POST changes to the SwitchBot API
85
32
  this.doColorBulbUpdate = new Subject();
86
33
  this.colorBulbUpdateInProgress = false;
87
- // Retrieve initial values and updateHomekit
88
- this.refreshStatus();
89
- // set accessory information
90
- accessory
91
- .getService(this.hap.Service.AccessoryInformation)
92
- .setCharacteristic(this.hap.Characteristic.Manufacturer, 'SwitchBot')
93
- .setCharacteristic(this.hap.Characteristic.Model, 'W1401400')
94
- .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId)
95
- .setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.FirmwareRevision);
96
- // get the Lightbulb service if it exists, otherwise create a new Lightbulb service
97
- // you can create multiple services for each accessory
98
- const lightBulbService = `${accessory.displayName} ${device.deviceType}`;
99
- (this.lightBulbService = accessory.getService(this.hap.Service.Lightbulb)
100
- || accessory.addService(this.hap.Service.Lightbulb)), lightBulbService;
101
- if (this.adaptiveLightingShift === -1 && this.accessory.context.adaptiveLighting) {
102
- this.accessory.removeService(this.lightBulbService);
103
- this.lightBulbService = this.accessory.addService(this.hap.Service.Lightbulb);
104
- this.accessory.context.adaptiveLighting = false;
105
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLighting: ${this.accessory.context.adaptiveLighting}`);
106
- }
107
- this.lightBulbService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
108
- if (!this.lightBulbService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
109
- this.lightBulbService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
110
- }
111
- // handle on / off events using the On characteristic
112
- this.lightBulbService.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
113
- // handle Brightness events using the Brightness characteristic
114
- this.lightBulbService
34
+ // Initialize LightBulb property
35
+ this.LightBulb = {
36
+ Name: accessory.context.LightBulbName ?? accessory.displayName,
37
+ Service: accessory.getService(this.hap.Service.Lightbulb) ?? accessory.addService(this.hap.Service.Lightbulb),
38
+ On: accessory.context.On ?? false,
39
+ Hue: accessory.context.Hue ?? 0,
40
+ Saturation: accessory.context.Saturation ?? 0,
41
+ Brightness: accessory.context.Brightness ?? 0,
42
+ ColorTemperature: accessory.context.ColorTemperature ?? 140,
43
+ };
44
+ // Adaptive Lighting
45
+ if (this.adaptiveLightingShift === -1 && accessory.context.adaptiveLighting) {
46
+ accessory.removeService(this.LightBulb.Service);
47
+ this.LightBulb.Service = accessory.addService(this.hap.Service.Lightbulb);
48
+ accessory.context.adaptiveLighting = false;
49
+ this.debugLog(`${device.deviceType}: ${accessory.displayName} adaptiveLighting: ${accessory.context.adaptiveLighting}`);
50
+ }
51
+ if (this.adaptiveLightingShift !== -1) {
52
+ this.AdaptiveLightingController = new platform.api.hap.AdaptiveLightingController(this.LightBulb.Service, {
53
+ customTemperatureAdjustment: this.adaptiveLightingShift,
54
+ });
55
+ accessory.configureController(this.AdaptiveLightingController);
56
+ accessory.context.adaptiveLighting = true;
57
+ this.debugLog(`${device.deviceType}: ${this.accessory.displayName} adaptiveLighting: ${accessory.context.adaptiveLighting},`
58
+ + ` adaptiveLightingShift: ${this.adaptiveLightingShift}`);
59
+ }
60
+ this.debugLog(`${device.deviceType}: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
61
+ // Initialize LightBulb Characteristics
62
+ this.LightBulb.Service
63
+ .setCharacteristic(this.hap.Characteristic.Name, this.LightBulb.Name)
64
+ .getCharacteristic(this.hap.Characteristic.On)
65
+ .onGet(() => {
66
+ return this.LightBulb.On;
67
+ })
68
+ .onSet(this.OnSet.bind(this));
69
+ this.LightBulb.Service
115
70
  .getCharacteristic(this.hap.Characteristic.Brightness)
116
71
  .setProps({
117
72
  minStep: this.minStep(device),
@@ -120,11 +75,10 @@ export class ColorBulb {
120
75
  validValueRanges: [0, 100],
121
76
  })
122
77
  .onGet(() => {
123
- return this.Brightness;
78
+ return this.LightBulb.Brightness;
124
79
  })
125
80
  .onSet(this.BrightnessSet.bind(this));
126
- // handle ColorTemperature events using the ColorTemperature characteristic
127
- this.lightBulbService
81
+ this.LightBulb.Service
128
82
  .getCharacteristic(this.hap.Characteristic.ColorTemperature)
129
83
  .setProps({
130
84
  minValue: 140,
@@ -132,11 +86,10 @@ export class ColorBulb {
132
86
  validValueRanges: [140, 500],
133
87
  })
134
88
  .onGet(() => {
135
- return this.ColorTemperature;
89
+ return this.LightBulb.ColorTemperature;
136
90
  })
137
91
  .onSet(this.ColorTemperatureSet.bind(this));
138
- // handle Hue events using the Hue characteristic
139
- this.lightBulbService
92
+ this.LightBulb.Service
140
93
  .getCharacteristic(this.hap.Characteristic.Hue)
141
94
  .setProps({
142
95
  minValue: 0,
@@ -144,11 +97,10 @@ export class ColorBulb {
144
97
  validValueRanges: [0, 360],
145
98
  })
146
99
  .onGet(() => {
147
- return this.Hue;
100
+ return this.LightBulb.Hue;
148
101
  })
149
102
  .onSet(this.HueSet.bind(this));
150
- // handle Hue events using the Hue characteristic
151
- this.lightBulbService
103
+ this.LightBulb.Service
152
104
  .getCharacteristic(this.hap.Characteristic.Saturation)
153
105
  .setProps({
154
106
  minValue: 0,
@@ -156,19 +108,12 @@ export class ColorBulb {
156
108
  validValueRanges: [0, 100],
157
109
  })
158
110
  .onGet(() => {
159
- return this.Saturation;
111
+ return this.LightBulb.Saturation;
160
112
  })
161
113
  .onSet(this.SaturationSet.bind(this));
162
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
163
- if (this.adaptiveLightingShift !== -1) {
164
- this.AdaptiveLightingController = new platform.api.hap.AdaptiveLightingController(this.lightBulbService, {
165
- customTemperatureAdjustment: this.adaptiveLightingShift,
166
- });
167
- this.accessory.configureController(this.AdaptiveLightingController);
168
- this.accessory.context.adaptiveLighting = true;
169
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLighting: ${this.accessory.context.adaptiveLighting},` +
170
- ` adaptiveLightingShift: ${this.adaptiveLightingShift}`);
171
- }
114
+ accessory.context.LightBulbName = this.LightBulb.Name;
115
+ // Retrieve initial values and updateHomekit
116
+ this.refreshStatus();
172
117
  // Update Homekit
173
118
  this.updateHomeKitCharacteristics();
174
119
  // Start an update interval
@@ -178,19 +123,33 @@ export class ColorBulb {
178
123
  await this.refreshStatus();
179
124
  });
180
125
  //regisiter webhook event handler
181
- if (this.device.webhook) {
182
- this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
126
+ if (device.webhook) {
127
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
183
128
  this.platform.webhookEventHandler[this.device.deviceId] = async (context) => {
184
129
  try {
185
130
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
186
131
  const { powerState, brightness, color, colorTemperature } = context;
187
- const { On, Brightness, Hue, Saturation, ColorTemperature } = this;
132
+ const { On, Brightness, Hue, Saturation, ColorTemperature } = this.LightBulb;
188
133
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
189
134
  '(powerState, brightness, color, colorTemperature) = ' +
190
135
  `Webhook:(${powerState}, ${brightness}, ${color}, ${colorTemperature}), ` +
191
136
  `current:(${On}, ${Brightness}, ${Hue}, ${Saturation}, ${ColorTemperature})`);
192
- this.On = powerState === 'ON' ? true : false;
193
- this.Brightness = brightness;
137
+ // On
138
+ this.LightBulb.On = powerState === 'ON' ? true : false;
139
+ if (this.accessory.context.Brightness !== this.LightBulb.On) {
140
+ this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
141
+ }
142
+ else {
143
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
144
+ }
145
+ // Brightness
146
+ this.LightBulb.Brightness = brightness;
147
+ if (this.accessory.context.Brightness !== this.LightBulb.Brightness) {
148
+ this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.LightBulb.Brightness}`);
149
+ }
150
+ else {
151
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.LightBulb.Brightness}`);
152
+ }
194
153
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} color: ${JSON.stringify(color)}`);
195
154
  const [red, green, blue] = color.split(':');
196
155
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} red: ${JSON.stringify(red)}`);
@@ -199,27 +158,27 @@ export class ColorBulb {
199
158
  const [hue, saturation] = rgb2hs(Number(red), Number(green), Number(blue));
200
159
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` + ` hs: ${JSON.stringify(rgb2hs(Number(red), Number(green), Number(blue)))}`);
201
160
  // Hue
202
- this.Hue = hue;
203
- if (this.accessory.context.Hue !== this.Hue) {
204
- this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
161
+ this.LightBulb.Hue = hue;
162
+ if (this.accessory.context.Hue !== this.LightBulb.Hue) {
163
+ this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.LightBulb.Hue}`);
205
164
  }
206
165
  else {
207
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
166
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.LightBulb.Hue}`);
208
167
  }
209
168
  // Saturation
210
- this.Saturation = saturation;
211
- if (this.accessory.context.Saturation !== this.Saturation) {
212
- this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
169
+ this.LightBulb.Saturation = saturation;
170
+ if (this.accessory.context.Saturation !== this.LightBulb.Saturation) {
171
+ this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.LightBulb.Saturation}`);
213
172
  }
214
173
  else {
215
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
174
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.LightBulb.Saturation}`);
216
175
  }
217
- this.ColorTemperature = colorTemperature;
218
- if (this.accessory.context.ColorTemperature !== this.ColorTemperature) {
219
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
176
+ this.LightBulb.ColorTemperature = colorTemperature;
177
+ if (this.accessory.context.ColorTemperature !== this.LightBulb.ColorTemperature) {
178
+ this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.LightBulb.ColorTemperature}`);
220
179
  }
221
180
  else {
222
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
181
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.LightBulb.ColorTemperature}`);
223
182
  }
224
183
  this.updateHomeKitCharacteristics();
225
184
  }
@@ -248,100 +207,94 @@ export class ColorBulb {
248
207
  });
249
208
  }
250
209
  /**
251
- * Parse the device status from the SwitchBot api
210
+ * Parse the device status from the SwitchBotBLE API
252
211
  */
253
- async parseStatus() {
254
- if (!this.device.enableCloudService && this.OpenAPI) {
255
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} parseStatus enableCloudService: ${this.device.enableCloudService}`);
256
- }
257
- else if (this.BLE) {
258
- await this.BLEparseStatus();
259
- }
260
- else if (this.OpenAPI && this.platform.config.credentials?.token) {
261
- await this.openAPIparseStatus();
262
- }
263
- else {
264
- await this.offlineOff();
265
- this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:` + ` ${this.device.connectionType}, parseStatus will not happen.`);
266
- }
267
- }
268
- async BLEparseStatus() {
212
+ async BLEparseStatus(serviceData) {
269
213
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
270
214
  // State
271
- switch (this.BLE_On) {
215
+ switch (serviceData.power) {
272
216
  case true:
273
- this.On = true;
217
+ this.LightBulb.On = true;
274
218
  break;
275
219
  default:
276
- this.On = false;
220
+ this.LightBulb.On = false;
277
221
  }
278
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
222
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
279
223
  // Brightness
280
- this.Brightness = Number(this.BLE_Brightness);
281
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
224
+ this.LightBulb.Brightness = Number(serviceData.brightness);
225
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.LightBulb.Brightness}`);
282
226
  // Color, Hue & Brightness
283
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} red: ${this.BLE_Red}`);
284
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} green: ${this.BLE_Green}`);
285
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} blue: ${this.BLE_Blue}`);
286
- const [hue, saturation] = rgb2hs(Number(this.BLE_Red), Number(this.BLE_Green), Number(this.BLE_Blue));
227
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} red: ${serviceData.red}`);
228
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} green: ${serviceData.green}`);
229
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} blue: ${serviceData.blue}`);
230
+ const [hue, saturation] = rgb2hs(Number(serviceData.red), Number(serviceData.green), Number(serviceData.blue));
287
231
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` +
288
- ` hs: ${JSON.stringify(rgb2hs(Number(this.BLE_Red), Number(this.BLE_Green), Number(this.BLE_Blue)))}`);
289
- this.BLE_Hue = hue;
290
- this.BLE_Saturation = saturation;
232
+ ` hs: ${JSON.stringify(rgb2hs(Number(serviceData.red), Number(serviceData.green), Number(serviceData.blue)))}`);
291
233
  // Hue
292
- this.Hue = this.BLE_Hue;
293
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
234
+ this.LightBulb.Hue = hue;
235
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.LightBulb.Hue}`);
294
236
  // Saturation
295
- this.Saturation = this.BLE_Saturation;
296
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
237
+ this.LightBulb.Saturation = saturation;
238
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.LightBulb.Saturation}`);
297
239
  // ColorTemperature
298
- if (this.BLE_ColorTemperature) {
299
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.BLE_ColorTemperature}`);
300
- this.ColorTemperature = this.BLE_ColorTemperature;
301
- this.ColorTemperature = Math.max(Math.min(this.ColorTemperature, 500), 140);
302
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
240
+ if (serviceData.color_temperature) {
241
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${serviceData.color_temperature}`);
242
+ this.LightBulb.ColorTemperature = serviceData.color_temperature;
243
+ this.LightBulb.ColorTemperature = Math.max(Math.min(this.LightBulb.ColorTemperature, 500), 140);
244
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.LightBulb.ColorTemperature}`);
303
245
  }
304
246
  }
305
- async openAPIparseStatus() {
247
+ /**
248
+ * Parse the device status from the SwitchBot OpenAPI
249
+ */
250
+ async openAPIparseStatus(deviceStatus) {
306
251
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
307
- switch (this.OpenAPI_On) {
252
+ switch (deviceStatus.body.power) {
308
253
  case 'on':
309
- this.On = true;
254
+ this.LightBulb.On = true;
310
255
  break;
311
256
  default:
312
- this.On = false;
257
+ this.LightBulb.On = false;
313
258
  }
314
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
259
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
315
260
  // Brightness
316
- this.Brightness = Number(this.OpenAPI_Brightness);
317
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
261
+ this.LightBulb.Brightness = Number(deviceStatus.body.brightness);
262
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.LightBulb.Brightness}`);
318
263
  // Color, Hue & Brightness
319
- if (this.OpenAPI_RGB) {
320
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} color: ${JSON.stringify(this.OpenAPI_RGB)}`);
321
- const [red, green, blue] = this.OpenAPI_RGB.split(':');
264
+ if (deviceStatus.body.color) {
265
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} color: ${JSON.stringify(deviceStatus.body.color)}`);
266
+ const [red, green, blue] = deviceStatus.body.color.split(':');
322
267
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} red: ${JSON.stringify(red)}`);
323
268
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} green: ${JSON.stringify(green)}`);
324
269
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} blue: ${JSON.stringify(blue)}`);
325
270
  const [hue, saturation] = rgb2hs(Number(red), Number(green), Number(blue));
326
271
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` + ` hs: ${JSON.stringify(rgb2hs(Number(red), Number(green), Number(blue)))}`);
327
272
  // Hue
328
- this.Hue = hue;
329
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
273
+ this.LightBulb.Hue = hue;
274
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.LightBulb.Hue}`);
330
275
  // Saturation
331
- this.Saturation = saturation;
332
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
276
+ this.LightBulb.Saturation = saturation;
277
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.LightBulb.Saturation}`);
333
278
  }
334
279
  // ColorTemperature
335
- if (!Number.isNaN(this.OpenAPI_ColorTemperature)) {
336
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.OpenAPI_ColorTemperature}`);
337
- const mired = Math.round(1000000 / this.OpenAPI_ColorTemperature);
338
- this.ColorTemperature = Number(mired);
339
- this.ColorTemperature = Math.max(Math.min(this.ColorTemperature, 500), 140);
340
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
341
- }
342
- // FirmwareRevision
343
- this.FirmwareRevision = this.OpenAPI_FirmwareRevision;
344
- this.accessory.context.FirmwareRevision = this.FirmwareRevision;
280
+ if (!Number.isNaN(deviceStatus.body.colorTemperature)) {
281
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${deviceStatus.body.colorTemperature}`);
282
+ const mired = Math.round(1000000 / deviceStatus.body.colorTemperature);
283
+ this.LightBulb.ColorTemperature = Number(mired);
284
+ this.LightBulb.ColorTemperature = Math.max(Math.min(this.LightBulb.ColorTemperature, 500), 140);
285
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.LightBulb.ColorTemperature}`);
286
+ }
287
+ // Firmware Version
288
+ const version = deviceStatus.body.version?.toString();
289
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
290
+ if (deviceStatus.body.version) {
291
+ this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
292
+ this.accessory
293
+ .getService(this.hap.Service.AccessoryInformation)
294
+ .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
295
+ .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
296
+ .updateValue(this.accessory.context.version);
297
+ }
345
298
  }
346
299
  /**
347
300
  * Asks the SwitchBot API for the latest device information
@@ -375,113 +328,42 @@ export class ColorBulb {
375
328
  // Start to monitor advertisement packets
376
329
  (async () => {
377
330
  // Start to monitor advertisement packets
378
- await switchbot.startScan({
379
- model: 'u',
380
- id: this.device.bleMac,
381
- });
331
+ await switchbot.startScan({ model: this.device.bleModel, id: this.device.bleMac });
382
332
  // Set an event handler
383
333
  switchbot.onadvertisement = (ad) => {
384
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, ' ')}`);
385
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.serviceData.model}`);
386
- if (this.device.bleMac === ad.address && ad.serviceData.model === 'u') {
334
+ if (this.device.bleMac === ad.address && ad.model === this.device.bleModel) {
335
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, ' ')}`);
336
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.model}`);
387
337
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
388
- this.BLE_ColorTemperature = ad.serviceData.color_temperature;
389
- this.BLE_Power = ad.serviceData.power;
390
- this.BLE_On = ad.serviceData.state;
391
- this.BLE_Red = ad.serviceData.red;
392
- this.BLE_Green = ad.serviceData.green;
393
- this.BLE_Blue = ad.serviceData.blue;
394
- this.BLE_Brightness = ad.serviceData.brightness;
395
- this.BLE_Delay = ad.serviceData.delay;
396
338
  }
397
339
  else {
398
340
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
399
341
  }
400
342
  };
401
- // Wait 1 seconds
343
+ // Wait 10 seconds
402
344
  await switchbot.wait(this.scanDuration * 1000);
403
345
  // Stop to monitor
404
346
  await switchbot.stopScan();
405
347
  // Update HomeKit
406
- await this.BLEparseStatus();
348
+ await this.BLEparseStatus(switchbot.onadvertisement.serviceData);
407
349
  await this.updateHomeKitCharacteristics();
408
350
  })();
409
- /*if (switchbot !== false) {
410
- switchbot
411
- .startScan({
412
- model: 'u',
413
- id: this.device.bleMac,
414
- })
415
- .then(async () => {
416
- // Set an event handler
417
- switchbot.onadvertisement = async (ad: ad) => {
418
- this.debugLog(
419
- `${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
420
- ` BLE Address Found: ${ad.address}`,
421
- );
422
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
423
- this.BLE_Power = ad.serviceData.power;
424
- this.BLE_On = ad.serviceData.state;
425
- this.BLE_Red = ad.serviceData.red;
426
- this.BLE_Green = ad.serviceData.green;
427
- this.BLE_Blue = ad.serviceData.blue;
428
- this.BLE_ColorTemperature = ad.serviceData.color_temperature;
429
- this.BLE_Brightness = ad.serviceData.brightness;
430
- this.BLE_Delay = ad.serviceData.delay;
431
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
432
- this.debugLog(
433
- `${this.device.deviceType}: ${this.accessory.displayName} state: ${ad.serviceData.state}, ` +
434
- `delay: ${ad.serviceData.delay}, timer: ${ad.serviceData.timer}, syncUtcTime: ${ad.serviceData.syncUtcTime} ` +
435
- `wifiRssi: ${ad.serviceData.wifiRssi}, overload: ${ad.serviceData.overload}, currentPower: ${ad.serviceData.currentPower}`,
436
- );
437
-
438
- if (ad.serviceData) {
439
- this.BLE_IsConnected = true;
440
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
441
- await this.stopScanning(switchbot);
442
- } else {
443
- this.BLE_IsConnected = false;
444
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
445
- }
446
- };
447
- // Wait
448
- return await sleep(this.scanDuration * 1000);
449
- })
450
- .then(async () => {
451
- // Stop to monitor
452
- await this.stopScanning(switchbot);
453
- })
454
- .catch(async (e: any) => {
455
- this.apiError(e);
456
- this.errorLog(
457
- `${this.device.deviceType}: ${this.accessory.displayName} failed BLERefreshStatus with ${this.device.connectionType}` +
458
- ` Connection, Error Message: ${JSON.stringify(e.message)}`,
459
- );
460
- await this.BLERefreshConnection(switchbot);
461
- });
462
- } else {
463
- await this.BLERefreshConnection(switchbot);
464
- }*/
351
+ if (switchbot === undefined) {
352
+ await this.BLERefreshConnection(switchbot);
353
+ }
465
354
  }
466
355
  async openAPIRefreshStatus() {
467
356
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
468
357
  try {
469
- const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/status`, {
470
- headers: this.platform.generateHeaders(),
471
- });
358
+ const { body, statusCode } = await this.platform.retryRequest(this.deviceMaxRetries, this.deviceDelayBetweenRetries, `${Devices}/${this.device.deviceId}/status`, { headers: this.platform.generateHeaders() });
472
359
  this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
473
360
  const deviceStatus = await body.json();
474
361
  this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
475
362
  this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
476
363
  if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
477
- this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
364
+ this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
478
365
  + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
479
- this.OpenAPI_On = deviceStatus.body.power;
480
- this.OpenAPI_RGB = deviceStatus.body.color;
481
- this.OpenAPI_Brightness = deviceStatus.body.brightness;
482
- this.OpenAPI_ColorTemperature = deviceStatus.body.colorTemperature;
483
- this.OpenAPI_FirmwareRevision = deviceStatus.body.version;
484
- this.openAPIparseStatus();
366
+ this.openAPIparseStatus(deviceStatus);
485
367
  this.updateHomeKitCharacteristics();
486
368
  }
487
369
  else {
@@ -529,8 +411,9 @@ export class ColorBulb {
529
411
  }
530
412
  async BLEpushChanges() {
531
413
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges`);
532
- if (this.On !== this.accessory.context.On) {
533
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges On: ${this.On} OnCached: ${this.accessory.context.On}`);
414
+ if (this.LightBulb.On !== this.accessory.context.On) {
415
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges`
416
+ + ` On: ${this.LightBulb.On}, OnCached: ${this.accessory.context.On}`);
534
417
  const switchbot = await this.platform.connectBLE();
535
418
  // Convert to BLE Address
536
419
  this.device.bleMac = this.device
@@ -544,11 +427,11 @@ export class ColorBulb {
544
427
  id: this.device.bleMac,
545
428
  })
546
429
  .then(async (device_list) => {
547
- this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
548
- return await this.retry({
549
- max: this.maxRetry(),
430
+ this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
431
+ return await this.retryBLE({
432
+ max: await this.maxRetryBLE(),
550
433
  fn: async () => {
551
- if (this.On) {
434
+ if (this.LightBulb.On) {
552
435
  return await device_list[0].turnOn({ id: this.device.bleMac });
553
436
  }
554
437
  else {
@@ -559,7 +442,9 @@ export class ColorBulb {
559
442
  })
560
443
  .then(() => {
561
444
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
562
- this.On = false;
445
+ this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
446
+ + `On: ${this.LightBulb.On} sent over BLE, sent successfully`);
447
+ this.LightBulb.On = false;
563
448
  })
564
449
  .catch(async (e) => {
565
450
  this.apiError(e);
@@ -568,25 +453,26 @@ export class ColorBulb {
568
453
  await this.BLEPushConnection();
569
454
  });
570
455
  // Push Brightness Update
571
- if (this.On) {
456
+ if (this.LightBulb.On) {
572
457
  await this.BLEpushBrightnessChanges();
573
458
  }
574
459
  // Push ColorTemperature Update
575
- if (this.On) {
460
+ if (this.LightBulb.On) {
576
461
  await this.BLEpushColorTemperatureChanges();
577
462
  }
578
463
  // Push Hue & Saturation Update
579
- if (this.On) {
464
+ if (this.LightBulb.On) {
580
465
  await this.BLEpushRGBChanges();
581
466
  }
582
467
  }
583
468
  else {
584
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges.` + `On: ${this.On}, ` + `OnCached: ${this.accessory.context.On}`);
469
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges.`
470
+ + `On: ${this.LightBulb.On}, ` + `OnCached: ${this.accessory.context.On}`);
585
471
  }
586
472
  }
587
473
  async BLEpushBrightnessChanges() {
588
474
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushBrightnessChanges`);
589
- if (this.Brightness !== this.accessory.context.Brightness) {
475
+ if (this.LightBulb.Brightness !== this.accessory.context.Brightness) {
590
476
  const switchbot = await this.platform.connectBLE();
591
477
  // Convert to BLE Address
592
478
  this.device.bleMac = this.device
@@ -600,12 +486,12 @@ export class ColorBulb {
600
486
  id: this.device.bleMac,
601
487
  })
602
488
  .then(async (device_list) => {
603
- this.infoLog(`${this.accessory.displayName} Target Brightness: ${this.Brightness}`);
604
- return await device_list[0].setBrightness(this.Brightness);
489
+ this.infoLog(`${this.accessory.displayName} Target Brightness: ${this.LightBulb.Brightness}`);
490
+ return await device_list[0].setBrightness(this.LightBulb.Brightness);
605
491
  })
606
492
  .then(() => {
607
493
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
608
- this.On = false;
494
+ this.LightBulb.On = false;
609
495
  })
610
496
  .catch(async (e) => {
611
497
  this.apiError(e);
@@ -616,13 +502,13 @@ export class ColorBulb {
616
502
  }
617
503
  else {
618
504
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushBrightnessChanges.` +
619
- `Brightness: ${this.Brightness}, ` +
505
+ `Brightness: ${this.LightBulb.Brightness}, ` +
620
506
  `BrightnessCached: ${this.accessory.context.Brightness}`);
621
507
  }
622
508
  }
623
509
  async BLEpushColorTemperatureChanges() {
624
510
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushColorTemperatureChanges`);
625
- if (this.ColorTemperature !== this.accessory.context.ColorTemperature) {
511
+ if (this.LightBulb.ColorTemperature !== this.accessory.context.ColorTemperature) {
626
512
  const switchbot = await this.platform.connectBLE();
627
513
  // Convert to BLE Address
628
514
  this.device.bleMac = this.device
@@ -636,12 +522,12 @@ export class ColorBulb {
636
522
  id: this.device.bleMac,
637
523
  })
638
524
  .then(async (device_list) => {
639
- this.infoLog(`${this.accessory.displayName} Target ColorTemperature: ${this.ColorTemperature}`);
640
- return await device_list[0].setColorTemperature(this.ColorTemperature);
525
+ this.infoLog(`${this.accessory.displayName} Target ColorTemperature: ${this.LightBulb.ColorTemperature}`);
526
+ return await device_list[0].setColorTemperature(this.LightBulb.ColorTemperature);
641
527
  })
642
528
  .then(() => {
643
529
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
644
- this.On = false;
530
+ this.LightBulb.On = false;
645
531
  })
646
532
  .catch(async (e) => {
647
533
  this.apiError(e);
@@ -652,15 +538,15 @@ export class ColorBulb {
652
538
  }
653
539
  else {
654
540
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushColorTemperatureChanges.` +
655
- `ColorTemperature: ${this.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`);
541
+ `ColorTemperature: ${this.LightBulb.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`);
656
542
  }
657
543
  }
658
544
  async BLEpushRGBChanges() {
659
545
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushRGBChanges`);
660
- if (this.Hue !== this.accessory.context.Hue || this.Saturation !== this.accessory.context.Saturation) {
661
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${JSON.stringify(this.Hue)}`);
662
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${JSON.stringify(this.Saturation)}`);
663
- const [red, green, blue] = hs2rgb(Number(this.Hue), Number(this.Saturation));
546
+ if (this.LightBulb.Hue !== this.accessory.context.Hue || this.LightBulb.Saturation !== this.accessory.context.Saturation) {
547
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${JSON.stringify(this.LightBulb.Hue)}`);
548
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${JSON.stringify(this.LightBulb.Saturation)}`);
549
+ const [red, green, blue] = hs2rgb(Number(this.LightBulb.Hue), Number(this.LightBulb.Saturation));
664
550
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} rgb: ${JSON.stringify([red, green, blue])}`);
665
551
  const switchbot = await this.platform.connectBLE();
666
552
  // Convert to BLE Address
@@ -675,12 +561,12 @@ export class ColorBulb {
675
561
  id: this.device.bleMac,
676
562
  })
677
563
  .then(async (device_list) => {
678
- this.infoLog(`${this.accessory.displayName} Target RGB: ${(this.Brightness, red, green, blue)}`);
679
- return await device_list[0].setRGB(this.Brightness, red, green, blue);
564
+ this.infoLog(`${this.accessory.displayName} Target RGB: ${(this.LightBulb.Brightness, red, green, blue)}`);
565
+ return await device_list[0].setRGB(this.LightBulb.Brightness, red, green, blue);
680
566
  })
681
567
  .then(() => {
682
568
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
683
- this.On = false;
569
+ this.LightBulb.On = false;
684
570
  })
685
571
  .catch(async (e) => {
686
572
  this.apiError(e);
@@ -690,15 +576,15 @@ export class ColorBulb {
690
576
  });
691
577
  }
692
578
  else {
693
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushRGBChanges. Hue: ${this.Hue}, ` +
694
- `HueCached: ${this.accessory.context.Hue}, Saturation: ${this.Saturation}, SaturationCached: ${this.accessory.context.Saturation}`);
579
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushRGBChanges. Hue: ${this.LightBulb.Hue}, ` +
580
+ `HueCached: ${this.accessory.context.Hue}, Saturation: ${this.LightBulb.Saturation}, SaturationCached: ${this.accessory.context.Saturation}`);
695
581
  }
696
582
  }
697
583
  async openAPIpushChanges() {
698
584
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges`);
699
- if (this.On !== this.accessory.context.On) {
585
+ if (this.LightBulb.On !== this.accessory.context.On) {
700
586
  let command = '';
701
- if (this.On) {
587
+ if (this.LightBulb.On) {
702
588
  command = 'turnOn';
703
589
  }
704
590
  else {
@@ -724,6 +610,8 @@ export class ColorBulb {
724
610
  if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
725
611
  this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
726
612
  + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
613
+ this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
614
+ + `request to SwitchBot API, body: ${JSON.stringify(bodyChange)} sent successfully`);
727
615
  }
728
616
  else {
729
617
  this.statusCode(statusCode);
@@ -738,28 +626,28 @@ export class ColorBulb {
738
626
  }
739
627
  else {
740
628
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No openAPIpushChanges.` +
741
- `On: ${this.On}, ` +
629
+ `On: ${this.LightBulb.On}, ` +
742
630
  `OnCached: ${this.accessory.context.On}`);
743
631
  }
744
632
  // Push Hue & Saturation Update
745
- if (this.On) {
633
+ if (this.LightBulb.On) {
746
634
  await this.pushHueSaturationChanges();
747
635
  }
748
636
  // Push ColorTemperature Update
749
- if (this.On) {
637
+ if (this.LightBulb.On) {
750
638
  await this.pushColorTemperatureChanges();
751
639
  }
752
640
  // Push Brightness Update
753
- if (this.On) {
641
+ if (this.LightBulb.On) {
754
642
  await this.pushBrightnessChanges();
755
643
  }
756
644
  }
757
645
  async pushHueSaturationChanges() {
758
646
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushHueSaturationChanges`);
759
- if (this.Hue !== this.accessory.context.Hue || this.Saturation !== this.accessory.context.Saturation) {
760
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${JSON.stringify(this.Hue)}`);
761
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${JSON.stringify(this.Saturation)}`);
762
- const [red, green, blue] = hs2rgb(Number(this.Hue), Number(this.Saturation));
647
+ if (this.LightBulb.Hue !== this.accessory.context.Hue || this.LightBulb.Saturation !== this.accessory.context.Saturation) {
648
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${JSON.stringify(this.LightBulb.Hue)}`);
649
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${JSON.stringify(this.LightBulb.Saturation)}`);
650
+ const [red, green, blue] = hs2rgb(Number(this.LightBulb.Hue), Number(this.LightBulb.Saturation));
763
651
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} rgb: ${JSON.stringify([red, green, blue])}`);
764
652
  const bodyChange = JSON.stringify({
765
653
  command: 'setColor',
@@ -781,6 +669,8 @@ export class ColorBulb {
781
669
  if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
782
670
  this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
783
671
  + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
672
+ this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
673
+ + `request to SwitchBot API, body: ${JSON.stringify(deviceStatus)} sent successfully`);
784
674
  }
785
675
  else {
786
676
  this.statusCode(statusCode);
@@ -794,15 +684,15 @@ export class ColorBulb {
794
684
  }
795
685
  }
796
686
  else {
797
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushHueSaturationChanges. Hue: ${this.Hue}, ` +
798
- `HueCached: ${this.accessory.context.Hue}, Saturation: ${this.Saturation}, SaturationCached: ${this.accessory.context.Saturation}`);
687
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushHueSaturationChanges. Hue: ${this.LightBulb.Hue}, ` +
688
+ `HueCached: ${this.accessory.context.Hue}, Saturation: ${this.LightBulb.Saturation}, SaturationCached: ${this.accessory.context.Saturation}`);
799
689
  }
800
690
  }
801
691
  async pushColorTemperatureChanges() {
802
692
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushColorTemperatureChanges`);
803
- if (this.ColorTemperature !== this.accessory.context.ColorTemperature) {
804
- const kelvin = Math.round(1000000 / Number(this.ColorTemperature));
805
- this.cacheKelvin = kelvin;
693
+ if (this.LightBulb.ColorTemperature !== this.accessory.context.ColorTemperature) {
694
+ const kelvin = Math.round(1000000 / Number(this.LightBulb.ColorTemperature));
695
+ this.accessory.context.kelvin = kelvin;
806
696
  const bodyChange = JSON.stringify({
807
697
  command: 'setColorTemperature',
808
698
  parameter: `${kelvin}`,
@@ -823,6 +713,8 @@ export class ColorBulb {
823
713
  if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
824
714
  this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
825
715
  + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
716
+ this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
717
+ + `request to SwitchBot API, body: ${JSON.stringify(deviceStatus)} sent successfully`);
826
718
  }
827
719
  else {
828
720
  this.statusCode(statusCode);
@@ -831,21 +723,21 @@ export class ColorBulb {
831
723
  }
832
724
  catch (e) {
833
725
  this.apiError(e);
834
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushColorTemperatureChanges with ${this.device.connectionType}` +
835
- ` Connection, Error Message: ${JSON.stringify(e.message)}`);
726
+ this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushColorTemperatureChanges with ${this.device.connectionType}`
727
+ + ` Connection, Error Message: ${JSON.stringify(e.message)}`);
836
728
  }
837
729
  }
838
730
  else {
839
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushColorTemperatureChanges.` +
840
- `ColorTemperature: ${this.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`);
731
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushColorTemperatureChanges.`
732
+ + `ColorTemperature: ${this.LightBulb.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`);
841
733
  }
842
734
  }
843
735
  async pushBrightnessChanges() {
844
736
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushBrightnessChanges`);
845
- if (this.Brightness !== this.accessory.context.Brightness) {
737
+ if (this.LightBulb.Brightness !== this.accessory.context.Brightness) {
846
738
  const bodyChange = JSON.stringify({
847
739
  command: 'setBrightness',
848
- parameter: `${this.Brightness}`,
740
+ parameter: `${this.LightBulb.Brightness}`,
849
741
  commandType: 'command',
850
742
  });
851
743
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
@@ -863,6 +755,8 @@ export class ColorBulb {
863
755
  if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
864
756
  this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
865
757
  + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
758
+ this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
759
+ + `request to SwitchBot API, body: ${JSON.stringify(deviceStatus)} sent successfully`);
866
760
  }
867
761
  else {
868
762
  this.statusCode(statusCode);
@@ -877,7 +771,7 @@ export class ColorBulb {
877
771
  }
878
772
  else {
879
773
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushBrightnessChanges.` +
880
- `Brightness: ${this.Brightness}, ` +
774
+ `Brightness: ${this.LightBulb.Brightness}, ` +
881
775
  `BrightnessCached: ${this.accessory.context.Brightness}`);
882
776
  }
883
777
  }
@@ -885,137 +779,140 @@ export class ColorBulb {
885
779
  * Handle requests to set the value of the "On" characteristic
886
780
  */
887
781
  async OnSet(value) {
888
- if (this.On === this.accessory.context.On) {
782
+ if (this.LightBulb.On === this.accessory.context.On) {
889
783
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set On: ${value}`);
890
784
  }
891
785
  else {
892
786
  this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set On: ${value}`);
893
787
  }
894
- this.On = value;
788
+ this.LightBulb.On = value;
895
789
  this.doColorBulbUpdate.next();
896
790
  }
897
791
  /**
898
792
  * Handle requests to set the value of the "Brightness" characteristic
899
793
  */
900
794
  async BrightnessSet(value) {
901
- if (this.Brightness === this.accessory.context.Brightness) {
795
+ if (this.LightBulb.Brightness === this.accessory.context.Brightness) {
902
796
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set Brightness: ${value}`);
903
797
  }
904
- else if (this.On) {
798
+ else if (this.LightBulb.On) {
905
799
  this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Brightness: ${value}`);
906
800
  }
907
801
  else {
908
802
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Brightness: ${value}`);
909
803
  }
910
- this.Brightness = value;
804
+ this.LightBulb.Brightness = value;
911
805
  this.doColorBulbUpdate.next();
912
806
  }
913
807
  /**
914
808
  * Handle requests to set the value of the "ColorTemperature" characteristic
915
809
  */
916
810
  async ColorTemperatureSet(value) {
917
- if (this.ColorTemperature === this.accessory.context.ColorTemperature) {
811
+ if (this.LightBulb.ColorTemperature === this.accessory.context.ColorTemperature) {
918
812
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set ColorTemperature: ${value}`);
919
813
  }
920
- else if (this.On) {
814
+ else if (this.LightBulb.On) {
921
815
  this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set ColorTemperature: ${value}`);
922
816
  }
923
817
  else {
924
818
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set ColorTemperature: ${value}`);
925
819
  }
820
+ const minKelvin = 2000;
821
+ const maxKelvin = 9000;
926
822
  // Convert mired to kelvin to nearest 100 (SwitchBot seems to need this)
927
823
  const kelvin = Math.round(1000000 / Number(value) / 100) * 100;
928
824
  // Check and increase/decrease kelvin to range of device
929
- const k = Math.min(Math.max(kelvin, this.minKelvin), this.maxKelvin);
930
- if (!this.accessory.context.On || this.cacheKelvin === k) {
825
+ const k = Math.min(Math.max(kelvin, minKelvin), maxKelvin);
826
+ if (!this.accessory.context.On || this.accessory.context.kelvin === k) {
931
827
  return;
932
828
  }
933
829
  // Updating the hue/sat to the corresponding values mimics native adaptive lighting
934
830
  const hs = m2hs(value);
935
- this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Hue, hs[0]);
936
- this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Saturation, hs[1]);
937
- this.ColorTemperature = value;
831
+ this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Hue, hs[0]);
832
+ this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Saturation, hs[1]);
833
+ this.LightBulb.ColorTemperature = value;
938
834
  this.doColorBulbUpdate.next();
939
835
  }
940
836
  /**
941
837
  * Handle requests to set the value of the "Hue" characteristic
942
838
  */
943
839
  async HueSet(value) {
944
- if (this.Hue === this.accessory.context.Hue) {
840
+ if (this.LightBulb.Hue === this.accessory.context.Hue) {
945
841
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set Hue: ${value}`);
946
842
  }
947
- else if (this.On) {
843
+ else if (this.LightBulb.On) {
948
844
  this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Hue: ${value}`);
949
845
  }
950
846
  else {
951
847
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Hue: ${value}`);
952
848
  }
953
- this.lightBulbService.updateCharacteristic(this.hap.Characteristic.ColorTemperature, 140);
954
- this.Hue = value;
849
+ this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.ColorTemperature, 140);
850
+ this.LightBulb.Hue = value;
955
851
  this.doColorBulbUpdate.next();
956
852
  }
957
853
  /**
958
854
  * Handle requests to set the value of the "Saturation" characteristic
959
855
  */
960
856
  async SaturationSet(value) {
961
- if (this.Saturation === this.accessory.context.Saturation) {
857
+ if (this.LightBulb.Saturation === this.accessory.context.Saturation) {
962
858
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set Saturation: ${value}`);
963
859
  }
964
- else if (this.On) {
860
+ else if (this.LightBulb.On) {
965
861
  this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Saturation: ${value}`);
966
862
  }
967
863
  else {
968
864
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Saturation: ${value}`);
969
865
  }
970
- this.lightBulbService.updateCharacteristic(this.hap.Characteristic.ColorTemperature, 140);
971
- this.Saturation = value;
866
+ this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.ColorTemperature, 140);
867
+ this.LightBulb.Saturation = value;
972
868
  this.doColorBulbUpdate.next();
973
869
  }
974
870
  async updateHomeKitCharacteristics() {
975
871
  // On
976
- if (this.On === undefined) {
977
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
872
+ if (this.LightBulb.On === undefined) {
873
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
978
874
  }
979
875
  else {
980
- this.accessory.context.On = this.On;
981
- this.lightBulbService.updateCharacteristic(this.hap.Characteristic.On, this.On);
982
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
876
+ this.accessory.context.On = this.LightBulb.On;
877
+ this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.On, this.LightBulb.On);
878
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.LightBulb.On}`);
983
879
  }
984
880
  // Brightness
985
- if (this.Brightness === undefined) {
986
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
881
+ if (this.LightBulb.Brightness === undefined) {
882
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.LightBulb.Brightness}`);
987
883
  }
988
884
  else {
989
- this.accessory.context.Brightness = this.Brightness;
990
- this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Brightness, this.Brightness);
991
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Brightness: ${this.Brightness}`);
885
+ this.accessory.context.Brightness = this.LightBulb.Brightness;
886
+ this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Brightness, this.LightBulb.Brightness);
887
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Brightness: ${this.LightBulb.Brightness}`);
992
888
  }
993
889
  // ColorTemperature
994
- if (this.ColorTemperature === undefined) {
995
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
890
+ if (this.LightBulb.ColorTemperature === undefined) {
891
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.LightBulb.ColorTemperature}`);
996
892
  }
997
893
  else {
998
- this.accessory.context.ColorTemperature = this.ColorTemperature;
999
- this.lightBulbService.updateCharacteristic(this.hap.Characteristic.ColorTemperature, this.ColorTemperature);
1000
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic ColorTemperature: ${this.ColorTemperature}`);
894
+ this.accessory.context.ColorTemperature = this.LightBulb.ColorTemperature;
895
+ this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.ColorTemperature, this.LightBulb.ColorTemperature);
896
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
897
+ + ` ColorTemperature: ${this.LightBulb.ColorTemperature}`);
1001
898
  }
1002
899
  // Hue
1003
- if (this.Hue === undefined) {
1004
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
900
+ if (this.LightBulb.Hue === undefined) {
901
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.LightBulb.Hue}`);
1005
902
  }
1006
903
  else {
1007
- this.accessory.context.Hue = this.Hue;
1008
- this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Hue, this.Hue);
1009
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Hue: ${this.Hue}`);
904
+ this.accessory.context.Hue = this.LightBulb.Hue;
905
+ this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Hue, this.LightBulb.Hue);
906
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Hue: ${this.LightBulb.Hue}`);
1010
907
  }
1011
908
  // Saturation
1012
- if (this.Saturation === undefined) {
1013
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
909
+ if (this.LightBulb.Saturation === undefined) {
910
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.LightBulb.Saturation}`);
1014
911
  }
1015
912
  else {
1016
- this.accessory.context.Saturation = this.Saturation;
1017
- this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Saturation, this.Saturation);
1018
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Saturation: ${this.Saturation}`);
913
+ this.accessory.context.Saturation = this.LightBulb.Saturation;
914
+ this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Saturation, this.LightBulb.Saturation);
915
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Saturation: ${this.LightBulb.Saturation}`);
1019
916
  }
1020
917
  }
1021
918
  async adaptiveLighting(device) {
@@ -1028,34 +925,6 @@ export class ColorBulb {
1028
925
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
1029
926
  }
1030
927
  }
1031
- async stopScanning(switchbot) {
1032
- switchbot.stopScan();
1033
- if (this.BLE_IsConnected) {
1034
- await this.BLEparseStatus();
1035
- await this.updateHomeKitCharacteristics();
1036
- }
1037
- else {
1038
- await this.BLERefreshConnection(switchbot);
1039
- }
1040
- }
1041
- async getCustomBLEAddress(switchbot) {
1042
- if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
1043
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} customBLEaddress: ${this.device.customBLEaddress}`);
1044
- (async () => {
1045
- // Start to monitor advertisement packets
1046
- await switchbot.startScan({
1047
- model: 'u',
1048
- });
1049
- // Set an event handler
1050
- switchbot.onadvertisement = (ad) => {
1051
- this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, ' ')}`);
1052
- };
1053
- await sleep(10000);
1054
- // Stop to monitor
1055
- switchbot.stopScan();
1056
- })();
1057
- }
1058
- }
1059
928
  async BLEPushConnection() {
1060
929
  if (this.platform.config.credentials?.token && this.device.connectionType === 'BLE/OpenAPI') {
1061
930
  this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection to Push Changes`);
@@ -1070,275 +939,27 @@ export class ColorBulb {
1070
939
  await this.openAPIRefreshStatus();
1071
940
  }
1072
941
  }
1073
- async retry({ max, fn }) {
1074
- return fn().catch(async (e) => {
1075
- if (max === 0) {
1076
- throw e;
1077
- }
1078
- this.infoLog(e);
1079
- this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Retrying`);
1080
- await sleep(1000);
1081
- return this.retry({ max: max - 1, fn });
1082
- });
1083
- }
1084
- maxRetry() {
1085
- if (this.device.maxRetry) {
1086
- return this.device.maxRetry;
1087
- }
1088
- else {
1089
- return 5;
1090
- }
1091
- }
1092
942
  minStep(device) {
943
+ let set_minStep;
1093
944
  if (device.colorbulb?.set_minStep) {
1094
- this.set_minStep = device.colorbulb?.set_minStep;
1095
- }
1096
- else {
1097
- this.set_minStep = 1;
1098
- }
1099
- return this.set_minStep;
1100
- }
1101
- async scan(device) {
1102
- if (device.scanDuration) {
1103
- this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
1104
- if (this.BLE) {
1105
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
1106
- }
945
+ set_minStep = device.colorbulb?.set_minStep;
1107
946
  }
1108
947
  else {
1109
- this.scanDuration = this.accessory.context.scanDuration = 1;
1110
- if (this.BLE) {
1111
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
1112
- }
1113
- }
1114
- }
1115
- async statusCode(statusCode) {
1116
- switch (statusCode) {
1117
- case 151:
1118
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command not supported by this deviceType, statusCode: ${statusCode}`);
1119
- break;
1120
- case 152:
1121
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found, statusCode: ${statusCode}`);
1122
- break;
1123
- case 160:
1124
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported, statusCode: ${statusCode}`);
1125
- break;
1126
- case 161:
1127
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline, statusCode: ${statusCode}`);
1128
- this.offlineOff();
1129
- break;
1130
- case 171:
1131
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Hub Device is offline, statusCode: ${statusCode}. ` +
1132
- `Hub: ${this.device.hubDeviceId}`);
1133
- this.offlineOff();
1134
- break;
1135
- case 190:
1136
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
1137
- ` Or command format is invalid, statusCode: ${statusCode}`);
1138
- break;
1139
- case 100:
1140
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent, statusCode: ${statusCode}`);
1141
- break;
1142
- case 200:
1143
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Request successful, statusCode: ${statusCode}`);
1144
- break;
1145
- case 400:
1146
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Bad Request, The client has issued an invalid request. `
1147
- + `This is commonly used to specify validation errors in a request payload, statusCode: ${statusCode}`);
1148
- break;
1149
- case 401:
1150
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unauthorized, Authorization for the API is required, `
1151
- + `but the request has not been authenticated, statusCode: ${statusCode}`);
1152
- break;
1153
- case 403:
1154
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Forbidden, The request has been authenticated but does not `
1155
- + `have appropriate permissions, or a requested resource is not found, statusCode: ${statusCode}`);
1156
- break;
1157
- case 404:
1158
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Found, Specifies the requested path does not exist, `
1159
- + `statusCode: ${statusCode}`);
1160
- break;
1161
- case 406:
1162
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Acceptable, The client has requested a MIME type via `
1163
- + `the Accept header for a value not supported by the server, statusCode: ${statusCode}`);
1164
- break;
1165
- case 415:
1166
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unsupported Media Type, The client has defined a contentType `
1167
- + `header that is not supported by the server, statusCode: ${statusCode}`);
1168
- break;
1169
- case 422:
1170
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unprocessable Entity, The client has made a valid request, `
1171
- + `but the server cannot process it. This is often used for APIs for which certain limits have been exceeded, statusCode: ${statusCode}`);
1172
- break;
1173
- case 429:
1174
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Too Many Requests, The client has exceeded the number of `
1175
- + `requests allowed for a given time window, statusCode: ${statusCode}`);
1176
- break;
1177
- case 500:
1178
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Internal Server Error, An unexpected error on the SmartThings `
1179
- + `servers has occurred. These errors should be rare, statusCode: ${statusCode}`);
1180
- break;
1181
- default:
1182
- this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode: ` +
1183
- `${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`);
948
+ set_minStep = 1;
1184
949
  }
950
+ return set_minStep;
1185
951
  }
1186
952
  async offlineOff() {
1187
953
  if (this.device.offline) {
1188
- await this.deviceContext();
1189
- await this.updateHomeKitCharacteristics();
954
+ this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.On, false);
1190
955
  }
1191
956
  }
1192
957
  apiError(e) {
1193
- this.lightBulbService.updateCharacteristic(this.hap.Characteristic.On, e);
1194
- this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Hue, e);
1195
- this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Brightness, e);
1196
- this.lightBulbService.updateCharacteristic(this.hap.Characteristic.Saturation, e);
1197
- this.lightBulbService.updateCharacteristic(this.hap.Characteristic.ColorTemperature, e);
1198
- }
1199
- async deviceContext() {
1200
- if (this.On === undefined) {
1201
- this.On = false;
1202
- }
1203
- else {
1204
- this.On = this.accessory.context.On;
1205
- }
1206
- if (this.Hue === undefined) {
1207
- this.Hue = 0;
1208
- }
1209
- else {
1210
- this.Hue = this.accessory.context.Hue;
1211
- }
1212
- if (this.Brightness === undefined) {
1213
- this.Brightness = 0;
1214
- }
1215
- else {
1216
- this.Brightness = this.accessory.context.Brightness;
1217
- }
1218
- if (this.Saturation === undefined) {
1219
- this.Saturation = 0;
1220
- }
1221
- else {
1222
- this.Saturation = this.accessory.context.Saturation;
1223
- }
1224
- if (this.ColorTemperature === undefined) {
1225
- this.ColorTemperature = 140;
1226
- }
1227
- else {
1228
- this.ColorTemperature = this.accessory.context.ColorTemperature;
1229
- }
1230
- this.minKelvin = 2000;
1231
- this.maxKelvin = 9000;
1232
- if (this.FirmwareRevision === undefined) {
1233
- this.FirmwareRevision = this.platform.version;
1234
- this.accessory.context.FirmwareRevision = this.FirmwareRevision;
1235
- }
1236
- }
1237
- async refreshRate(device) {
1238
- if (device.refreshRate) {
1239
- this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
1240
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
1241
- }
1242
- else if (this.platform.config.options.refreshRate) {
1243
- this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options.refreshRate;
1244
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
1245
- }
1246
- }
1247
- async deviceConfig(device) {
1248
- let config = {};
1249
- if (device.colorbulb) {
1250
- config = device.colorbulb;
1251
- }
1252
- if (device.connectionType !== undefined) {
1253
- config['connectionType'] = device.connectionType;
1254
- }
1255
- if (device.external !== undefined) {
1256
- config['external'] = device.external;
1257
- }
1258
- if (device.logging !== undefined) {
1259
- config['logging'] = device.logging;
1260
- }
1261
- if (device.refreshRate !== undefined) {
1262
- config['refreshRate'] = device.refreshRate;
1263
- }
1264
- if (device.scanDuration !== undefined) {
1265
- config['scanDuration'] = device.scanDuration;
1266
- }
1267
- if (device.offline !== undefined) {
1268
- config['offline'] = device.offline;
1269
- }
1270
- if (device.maxRetry !== undefined) {
1271
- config['maxRetry'] = device.maxRetry;
1272
- }
1273
- if (device.webhook !== undefined) {
1274
- config['webhook'] = device.webhook;
1275
- }
1276
- if (Object.entries(config).length !== 0) {
1277
- this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
1278
- }
1279
- }
1280
- async deviceLogs(device) {
1281
- if (this.platform.debugMode) {
1282
- this.deviceLogging = this.accessory.context.logging = 'debugMode';
1283
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
1284
- }
1285
- else if (device.logging) {
1286
- this.deviceLogging = this.accessory.context.logging = device.logging;
1287
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
1288
- }
1289
- else if (this.platform.config.options?.logging) {
1290
- this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
1291
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
1292
- }
1293
- else {
1294
- this.deviceLogging = this.accessory.context.logging = 'standard';
1295
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
1296
- }
1297
- }
1298
- /**
1299
- * Logging for Device
1300
- */
1301
- infoLog(...log) {
1302
- if (this.enablingDeviceLogging()) {
1303
- this.platform.log.info(String(...log));
1304
- }
1305
- }
1306
- warnLog(...log) {
1307
- if (this.enablingDeviceLogging()) {
1308
- this.platform.log.warn(String(...log));
1309
- }
1310
- }
1311
- debugWarnLog(...log) {
1312
- if (this.enablingDeviceLogging()) {
1313
- if (this.deviceLogging?.includes('debug')) {
1314
- this.platform.log.warn('[DEBUG]', String(...log));
1315
- }
1316
- }
1317
- }
1318
- errorLog(...log) {
1319
- if (this.enablingDeviceLogging()) {
1320
- this.platform.log.error(String(...log));
1321
- }
1322
- }
1323
- debugErrorLog(...log) {
1324
- if (this.enablingDeviceLogging()) {
1325
- if (this.deviceLogging?.includes('debug')) {
1326
- this.platform.log.error('[DEBUG]', String(...log));
1327
- }
1328
- }
1329
- }
1330
- debugLog(...log) {
1331
- if (this.enablingDeviceLogging()) {
1332
- if (this.deviceLogging === 'debug') {
1333
- this.platform.log.info('[DEBUG]', String(...log));
1334
- }
1335
- else {
1336
- this.platform.log.debug(String(...log));
1337
- }
1338
- }
1339
- }
1340
- enablingDeviceLogging() {
1341
- return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
958
+ this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.On, e);
959
+ this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Hue, e);
960
+ this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Brightness, e);
961
+ this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Saturation, e);
962
+ this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.ColorTemperature, e);
1342
963
  }
1343
964
  }
1344
965
  //# sourceMappingURL=colorbulb.js.map