@switchbot/homebridge-switchbot 3.5.0-beta.7 → 3.5.0-beta.70

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
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 +425 -778
  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 +803 -837
  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 +241 -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 +283 -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 +254 -545
  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 +412 -806
  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 +711 -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 +540 -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 +261 -616
  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 +240 -594
  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 +196 -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 +281 -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 +252 -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 +191 -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 +180 -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 +188 -532
  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 +96 -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 +202 -521
  75. package/dist/device/robotvacuumcleaner.js.map +1 -1
  76. package/dist/device/waterdetector.d.ts +10 -63
  77. package/dist/device/waterdetector.d.ts.map +1 -1
  78. package/dist/device/waterdetector.js +146 -475
  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 +10 -50
  88. package/dist/irdevice/airconditioner.d.ts.map +1 -1
  89. package/dist/irdevice/airconditioner.js +324 -452
  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 +93 -307
  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 +39 -281
  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 +113 -341
  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 +118 -362
  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 +438 -570
  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 +87 -335
  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 +45 -285
  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 +47 -291
  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 -172
  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 +462 -817
  143. package/src/device/bot.ts +862 -931
  144. package/src/device/ceilinglight.ts +259 -633
  145. package/src/device/colorbulb.ts +300 -688
  146. package/src/device/contact.ts +288 -571
  147. package/src/device/curtain.ts +441 -838
  148. package/src/device/device.ts +734 -0
  149. package/src/device/fan.ts +596 -0
  150. package/src/device/hub.ts +299 -645
  151. package/src/device/humidifier.ts +274 -647
  152. package/src/device/iosensor.ts +233 -626
  153. package/src/device/lightstrip.ts +309 -620
  154. package/src/device/lock.ts +292 -601
  155. package/src/device/meter.ts +228 -619
  156. package/src/device/meterplus.ts +216 -619
  157. package/src/device/motion.ts +218 -559
  158. package/src/device/plug.ts +111 -490
  159. package/src/device/robotvacuumcleaner.ts +228 -550
  160. package/src/device/waterdetector.ts +169 -501
  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 +350 -477
  165. package/src/irdevice/airpurifier.ts +120 -330
  166. package/src/irdevice/camera.ts +53 -301
  167. package/src/irdevice/fan.ts +130 -360
  168. package/src/irdevice/irdevice.ts +346 -0
  169. package/src/irdevice/light.ts +157 -412
  170. package/src/irdevice/other.ts +507 -648
  171. package/src/irdevice/tv.ts +117 -367
  172. package/src/irdevice/vacuumcleaner.ts +59 -311
  173. package/src/irdevice/waterheater.ts +61 -320
  174. package/src/platform.ts +355 -219
  175. package/src/settings.ts +116 -611
  176. package/src/utils.ts +642 -1
  177. package/src/device/waterdetector.json +0 -11
@@ -1,79 +1,42 @@
1
+ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
2
+ *
3
+ * plug.ts: @switchbot/homebridge-switchbot.
4
+ */
1
5
  import { request } from 'undici';
2
- import { sleep } from '../utils.js';
3
- import { interval, Subject } from 'rxjs';
4
- import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
5
6
  import { Devices } from '../settings.js';
6
- export class Plug {
7
+ import { deviceBase } from './device.js';
8
+ import { Subject, debounceTime, interval, skipWhile, take, tap } from 'rxjs';
9
+ export class Plug extends deviceBase {
7
10
  platform;
8
- accessory;
9
- device;
10
- api;
11
- log;
12
- config;
13
- hap;
14
11
  // Services
15
- outletService;
16
- // Characteristic Values
17
- On;
18
- FirmwareRevision;
19
- // OpenAPI Others
20
- OpenAPI_On;
21
- OpenAPI_FirmwareRevision;
22
- // BLE Others
23
- BLE_IsConnected;
24
- BLE_On;
25
- // Config
26
- scanDuration;
27
- deviceLogging;
28
- deviceRefreshRate;
12
+ Outlet;
29
13
  // Updates
30
14
  plugUpdateInProgress;
31
15
  doPlugUpdate;
32
- // Connection
33
- OpenAPI;
34
- BLE;
35
16
  constructor(platform, accessory, device) {
17
+ super(platform, accessory, device);
36
18
  this.platform = platform;
37
- this.accessory = accessory;
38
- this.device = device;
39
- this.api = this.platform.api;
40
- this.log = this.platform.log;
41
- this.config = this.platform.config;
42
- this.hap = this.api.hap;
43
- // Connection
44
- this.BLE = this.device.connectionType === 'BLE' || this.device.connectionType === 'BLE/OpenAPI';
45
- this.OpenAPI = this.device.connectionType === 'OpenAPI' || this.device.connectionType === 'BLE/OpenAPI';
46
- // default placeholders
47
- this.deviceLogs(device);
48
- this.scan(device);
49
- this.refreshRate(device);
50
- this.deviceContext();
51
- this.deviceConfig(device);
52
19
  // this is subject we use to track when we need to POST changes to the SwitchBot API
53
20
  this.doPlugUpdate = new Subject();
54
21
  this.plugUpdateInProgress = false;
22
+ // Initialize Outlet Service
23
+ accessory.context.Outlet = accessory.context.Outlet ?? {};
24
+ this.Outlet = {
25
+ Name: accessory.context.Outlet.Name ?? accessory.displayName,
26
+ Service: accessory.getService(this.hap.Service.Outlet) ?? accessory.addService(this.hap.Service.Outlet),
27
+ On: accessory.context.On || false,
28
+ };
29
+ accessory.context.Outlet = this.Outlet;
30
+ // Initialize Outlet Characteristics
31
+ this.Outlet.Service
32
+ .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
33
+ .getCharacteristic(this.hap.Characteristic.On)
34
+ .onGet(() => {
35
+ return this.Outlet.On;
36
+ })
37
+ .onSet(this.OnSet.bind(this));
55
38
  // Retrieve initial values and updateHomekit
56
39
  this.refreshStatus();
57
- // set accessory information
58
- accessory
59
- .getService(this.hap.Service.AccessoryInformation)
60
- .setCharacteristic(this.hap.Characteristic.Manufacturer, 'SwitchBot')
61
- .setCharacteristic(this.hap.Characteristic.Model, this.model(device))
62
- .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId)
63
- .setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.FirmwareRevision);
64
- // get the Outlet service if it exists, otherwise create a new Outlet service
65
- // you can create multiple services for each accessory
66
- const outletService = `${accessory.displayName} ${device.deviceType}`;
67
- (this.outletService = accessory.getService(this.hap.Service.Outlet)
68
- || accessory.addService(this.hap.Service.Outlet)), outletService;
69
- this.outletService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
70
- if (!this.outletService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
71
- this.outletService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
72
- }
73
- // each service must implement at-minimum the "required characteristics" for the given service type
74
- // see https://developers.homebridge.io/#/service/Outlet
75
- // create handlers for required characteristics
76
- this.outletService.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
77
40
  // Update Homekit
78
41
  this.updateHomeKitCharacteristics();
79
42
  // Start an update interval
@@ -83,18 +46,18 @@ export class Plug {
83
46
  await this.refreshStatus();
84
47
  });
85
48
  //regisiter webhook event handler
86
- if (this.device.webhook) {
87
- this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
49
+ if (device.webhook) {
50
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
88
51
  this.platform.webhookEventHandler[this.device.deviceId] = async (context) => {
89
52
  try {
90
53
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
91
54
  const { powerState } = context;
92
- const { On } = this;
55
+ const { On } = this.Outlet;
93
56
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
94
57
  '(powerState) = ' +
95
58
  `Webhook:(${powerState}), ` +
96
59
  `current:(${On})`);
97
- this.On = powerState === 'ON' ? true : false;
60
+ this.Outlet.On = powerState === 'ON' ? true : false;
98
61
  this.updateHomeKitCharacteristics();
99
62
  }
100
63
  catch (e) {
@@ -121,49 +84,42 @@ export class Plug {
121
84
  this.plugUpdateInProgress = false;
122
85
  });
123
86
  }
124
- /**
125
- * Parse the device status from the SwitchBot api
126
- */
127
- async parseStatus() {
128
- if (!this.device.enableCloudService && this.OpenAPI) {
129
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} parseStatus enableCloudService: ${this.device.enableCloudService}`);
130
- }
131
- else if (this.BLE) {
132
- await this.BLEparseStatus();
133
- }
134
- else if (this.OpenAPI && this.platform.config.credentials?.token) {
135
- await this.openAPIparseStatus();
136
- }
137
- else {
138
- await this.offlineOff();
139
- this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:` + ` ${this.device.connectionType}, parseStatus will not happen.`);
140
- }
141
- }
142
- async BLEparseStatus() {
87
+ async BLEparseStatus(serviceData) {
143
88
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
144
89
  // State
145
- switch (this.BLE_On) {
90
+ switch (serviceData.state) {
146
91
  case 'on':
147
- this.On = true;
92
+ this.Outlet.On = true;
148
93
  break;
149
94
  default:
150
- this.On = false;
95
+ this.Outlet.On = false;
151
96
  }
152
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
97
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.Outlet.On}`);
153
98
  }
154
- async openAPIparseStatus() {
99
+ async openAPIparseStatus(deviceStatus) {
155
100
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
156
- switch (this.OpenAPI_On) {
101
+ switch (deviceStatus.body.power) {
157
102
  case 'on':
158
- this.On = true;
103
+ this.Outlet.On = true;
159
104
  break;
160
105
  default:
161
- this.On = false;
106
+ this.Outlet.On = false;
107
+ }
108
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.Outlet.On}`);
109
+ // Firmware Version
110
+ const version = deviceStatus.body.version?.toString();
111
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
112
+ if (deviceStatus.body.version) {
113
+ const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
114
+ this.accessory
115
+ .getService(this.hap.Service.AccessoryInformation)
116
+ .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
117
+ .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
118
+ .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
119
+ .updateValue(deviceVersion);
120
+ this.accessory.context.deviceVersion = deviceVersion;
121
+ this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
162
122
  }
163
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
164
- // FirmwareRevision
165
- this.FirmwareRevision = this.OpenAPI_FirmwareRevision;
166
- this.accessory.context.FirmwareRevision = this.FirmwareRevision;
167
123
  }
168
124
  /**
169
125
  * Asks the SwitchBot API for the latest device information
@@ -196,94 +152,43 @@ export class Plug {
196
152
  this.getCustomBLEAddress(switchbot);
197
153
  // Start to monitor advertisement packets
198
154
  (async () => {
199
- await switchbot.startScan({
200
- model: this.BLEmodel(),
201
- id: this.device.bleMac,
202
- });
155
+ // Start to monitor advertisement packets
156
+ await switchbot.startScan({ model: this.device.bleModel, id: this.device.bleMac });
203
157
  // Set an event handler
204
158
  switchbot.onadvertisement = (ad) => {
205
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, ' ')}`);
206
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.serviceData.model}`);
207
- if (this.device.bleMac === ad.address && ad.serviceData.model === this.BLEmodel()) {
159
+ if (this.device.bleMac === ad.address && ad.model === this.device.bleModel) {
160
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, ' ')}`);
161
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.model}`);
208
162
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
209
- this.BLE_On = ad.serviceData.state;
210
163
  }
211
164
  else {
212
165
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
213
166
  }
214
167
  };
215
- // Wait 1 seconds
168
+ // Wait 10 seconds
216
169
  await switchbot.wait(this.scanDuration * 1000);
217
170
  // Stop to monitor
218
171
  await switchbot.stopScan();
219
172
  // Update HomeKit
220
- await this.BLEparseStatus();
173
+ await this.BLEparseStatus(switchbot.onadvertisement.serviceData);
221
174
  await this.updateHomeKitCharacteristics();
222
175
  })();
223
- /*if (switchbot !== false) {
224
- switchbot
225
- .startScan({
226
- model: this.BLEmodel(),
227
- id: this.device.bleMac,
228
- })
229
- .then(async () => {
230
- // Set an event handler
231
- switchbot.onadvertisement = async (ad: ad) => {
232
- this.debugLog(
233
- `${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
234
- ` BLE Address Found: ${ad.address}`,
235
- );
236
- this.BLE_On = ad.serviceData.state;
237
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
238
- this.debugLog(
239
- `${this.device.deviceType}: ${this.accessory.displayName} state: ${ad.serviceData.state}, ` +
240
- `delay: ${ad.serviceData.delay}, timer: ${ad.serviceData.timer}, syncUtcTime: ${ad.serviceData.syncUtcTime} ` +
241
- `wifiRssi: ${ad.serviceData.wifiRssi}, overload: ${ad.serviceData.overload}, currentPower: ${ad.serviceData.currentPower}`,
242
- );
243
-
244
- if (ad.serviceData) {
245
- this.BLE_IsConnected = true;
246
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
247
- await this.stopScanning(switchbot);
248
- } else {
249
- this.BLE_IsConnected = false;
250
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
251
- }
252
- };
253
- // Wait
254
- return await sleep(this.scanDuration * 1000);
255
- })
256
- .then(async () => {
257
- // Stop to monitor
258
- await this.stopScanning(switchbot);
259
- })
260
- .catch(async (e: any) => {
261
- this.apiError(e);
262
- this.errorLog(
263
- `${this.device.deviceType}: ${this.accessory.displayName} failed BLERefreshStatus with ${this.device.connectionType}` +
264
- ` Connection, Error Message: ${JSON.stringify(e.message)}`,
265
- );
266
- await this.BLERefreshConnection(switchbot);
267
- });
268
- } else {
269
- await this.BLERefreshConnection(switchbot);
270
- }*/
176
+ if (switchbot === undefined) {
177
+ await this.BLERefreshConnection(switchbot);
178
+ }
271
179
  }
272
180
  async openAPIRefreshStatus() {
273
181
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
274
182
  try {
275
- const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/status`, {
276
- headers: this.platform.generateHeaders(),
277
- });
183
+ const { body, statusCode } = await this.platform.retryRequest(this.deviceMaxRetries, this.deviceDelayBetweenRetries, `${Devices}/${this.device.deviceId}/status`, { headers: this.platform.generateHeaders() });
278
184
  this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
279
185
  const deviceStatus = await body.json();
280
186
  this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
281
187
  this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
282
188
  if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
283
- this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
189
+ this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
284
190
  + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
285
- this.OpenAPI_On = deviceStatus.body.power;
286
- this.openAPIparseStatus();
191
+ this.openAPIparseStatus(deviceStatus);
287
192
  this.updateHomeKitCharacteristics();
288
193
  }
289
194
  else {
@@ -330,8 +235,9 @@ export class Plug {
330
235
  }
331
236
  async BLEpushChanges() {
332
237
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges`);
333
- if (this.On !== this.accessory.context.On) {
334
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges On: ${this.On} OnCached: ${this.accessory.context.On}`);
238
+ if (this.Outlet.On !== this.accessory.context.On) {
239
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges`
240
+ + ` On: ${this.Outlet.On} OnCached: ${this.accessory.context.On}`);
335
241
  const switchbot = await this.platform.connectBLE();
336
242
  // Convert to BLE Address
337
243
  this.device.bleMac = this.device
@@ -341,15 +247,15 @@ export class Plug {
341
247
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
342
248
  switchbot
343
249
  .discover({
344
- model: this.BLEmodel(),
250
+ model: this.device.bleModel,
345
251
  id: this.device.bleMac,
346
252
  })
347
253
  .then(async (device_list) => {
348
- this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
349
- return await this.retry({
350
- max: this.maxRetry(),
254
+ this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.Outlet.On}`);
255
+ return await this.retryBLE({
256
+ max: await this.maxRetryBLE(),
351
257
  fn: async () => {
352
- if (this.On) {
258
+ if (this.Outlet.On) {
353
259
  return await device_list[0].turnOn({ id: this.device.bleMac });
354
260
  }
355
261
  else {
@@ -360,7 +266,9 @@ export class Plug {
360
266
  })
361
267
  .then(() => {
362
268
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
363
- this.On = false;
269
+ this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
270
+ + `On: ${this.Outlet.On} sent over BLE, sent successfully`);
271
+ this.Outlet.On = false;
364
272
  })
365
273
  .catch(async (e) => {
366
274
  this.apiError(e);
@@ -370,14 +278,15 @@ export class Plug {
370
278
  });
371
279
  }
372
280
  else {
373
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges.` + `On: ${this.On}, ` + `OnCached: ${this.accessory.context.On}`);
281
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges,`
282
+ + ` On: ${this.Outlet.On}, OnCached: ${this.accessory.context.On}`);
374
283
  }
375
284
  }
376
285
  async openAPIpushChanges() {
377
286
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges`);
378
- if (this.On !== this.accessory.context.On) {
287
+ if (this.Outlet.On !== this.accessory.context.On) {
379
288
  let command = '';
380
- if (this.On) {
289
+ if (this.Outlet.On) {
381
290
  command = 'turnOn';
382
291
  }
383
292
  else {
@@ -403,6 +312,8 @@ export class Plug {
403
312
  if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
404
313
  this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
405
314
  + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
315
+ this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
316
+ + `request to SwitchBot API, body: ${JSON.stringify(JSON.parse(bodyChange))} sent successfully`);
406
317
  }
407
318
  else {
408
319
  this.statusCode(statusCode);
@@ -411,73 +322,37 @@ export class Plug {
411
322
  }
412
323
  catch (e) {
413
324
  this.apiError(e);
414
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIpushChanges with ${this.device.connectionType}` +
415
- ` Connection, Error Message: ${JSON.stringify(e.message)}`);
325
+ this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIpushChanges with ${this.device.connectionType}`
326
+ + ` Connection, Error Message: ${JSON.stringify(e.message)}`);
416
327
  }
417
328
  }
418
329
  else {
419
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No openAPIpushChanges.` +
420
- `On: ${this.On}, ` +
421
- `OnCached: ${this.accessory.context.On}`);
330
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No openAPIpushChanges.`
331
+ + `On: ${this.Outlet.On}, OnCached: ${this.accessory.context.On}`);
422
332
  }
423
333
  }
424
334
  /**
425
335
  * Handle requests to set the value of the "On" characteristic
426
336
  */
427
337
  async OnSet(value) {
428
- if (this.On === this.accessory.context.On) {
338
+ if (this.Outlet.On === this.accessory.context.On) {
429
339
  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set On: ${value}`);
430
340
  }
431
341
  else {
432
342
  this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set On: ${value}`);
433
343
  }
434
- this.On = value;
344
+ this.Outlet.On = value;
435
345
  this.doPlugUpdate.next();
436
346
  }
437
347
  async updateHomeKitCharacteristics() {
438
348
  // On
439
- if (this.On === undefined) {
440
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
349
+ if (this.Outlet.On === undefined) {
350
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.Outlet.On}`);
441
351
  }
442
352
  else {
443
- this.accessory.context.On = this.On;
444
- this.outletService.updateCharacteristic(this.hap.Characteristic.On, this.On);
445
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
446
- }
447
- }
448
- async stopScanning(switchbot) {
449
- switchbot.stopScan();
450
- if (this.BLE_IsConnected) {
451
- await this.BLEparseStatus();
452
- await this.updateHomeKitCharacteristics();
453
- }
454
- else {
455
- await this.BLERefreshConnection(switchbot);
456
- }
457
- }
458
- BLEmodel() {
459
- if (this.device.deviceType === 'Plug Mini (US)' || this.device.configDeviceType === 'Plug Mini (US)') {
460
- return 'g';
461
- }
462
- else {
463
- return 'j';
464
- }
465
- }
466
- async getCustomBLEAddress(switchbot) {
467
- if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
468
- (async () => {
469
- // Start to monitor advertisement packets
470
- await switchbot.startScan({
471
- model: this.BLEmodel(),
472
- });
473
- // Set an event handler
474
- switchbot.onadvertisement = (ad) => {
475
- this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, ' ')}`);
476
- };
477
- await sleep(10000);
478
- // Stop to monitor
479
- switchbot.stopScan();
480
- })();
353
+ this.accessory.context.On = this.Outlet.On;
354
+ this.Outlet.Service.updateCharacteristic(this.hap.Characteristic.On, this.Outlet.On);
355
+ this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.Outlet.On}`);
481
356
  }
482
357
  }
483
358
  async BLEPushConnection() {
@@ -494,250 +369,13 @@ export class Plug {
494
369
  await this.openAPIRefreshStatus();
495
370
  }
496
371
  }
497
- async retry({ max, fn }) {
498
- return fn().catch(async (e) => {
499
- if (max === 0) {
500
- throw e;
501
- }
502
- this.infoLog(e);
503
- this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Retrying`);
504
- await sleep(1000);
505
- return this.retry({ max: max - 1, fn });
506
- });
507
- }
508
- maxRetry() {
509
- if (this.device.maxRetry) {
510
- return this.device.maxRetry;
511
- }
512
- else {
513
- return 5;
514
- }
515
- }
516
- model(device) {
517
- let model;
518
- if (device.deviceType === 'Plug Mini (US)') {
519
- model = 'W1901400';
520
- model = 'W1901401';
521
- }
522
- else if (device.deviceType === 'Plug Mini (JP)') {
523
- model = 'W2001400';
524
- }
525
- else {
526
- model = 'SP11';
527
- }
528
- return model;
529
- }
530
- async scan(device) {
531
- if (device.scanDuration) {
532
- this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
533
- if (this.BLE) {
534
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
535
- }
536
- }
537
- else {
538
- this.scanDuration = this.accessory.context.scanDuration = 1;
539
- if (this.BLE) {
540
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
541
- }
542
- }
543
- }
544
- async statusCode(statusCode) {
545
- switch (statusCode) {
546
- case 151:
547
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command not supported by this deviceType, statusCode: ${statusCode}`);
548
- break;
549
- case 152:
550
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found, statusCode: ${statusCode}`);
551
- break;
552
- case 160:
553
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported, statusCode: ${statusCode}`);
554
- break;
555
- case 161:
556
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline, statusCode: ${statusCode}`);
557
- this.offlineOff();
558
- break;
559
- case 171:
560
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Hub Device is offline, statusCode: ${statusCode}. ` +
561
- `Hub: ${this.device.hubDeviceId}`);
562
- this.offlineOff();
563
- break;
564
- case 190:
565
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
566
- ` Or command format is invalid, statusCode: ${statusCode}`);
567
- break;
568
- case 100:
569
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent, statusCode: ${statusCode}`);
570
- break;
571
- case 200:
572
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Request successful, statusCode: ${statusCode}`);
573
- break;
574
- case 400:
575
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Bad Request, The client has issued an invalid request. `
576
- + `This is commonly used to specify validation errors in a request payload, statusCode: ${statusCode}`);
577
- break;
578
- case 401:
579
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unauthorized, Authorization for the API is required, `
580
- + `but the request has not been authenticated, statusCode: ${statusCode}`);
581
- break;
582
- case 403:
583
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Forbidden, The request has been authenticated but does not `
584
- + `have appropriate permissions, or a requested resource is not found, statusCode: ${statusCode}`);
585
- break;
586
- case 404:
587
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Found, Specifies the requested path does not exist, `
588
- + `statusCode: ${statusCode}`);
589
- break;
590
- case 406:
591
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Acceptable, The client has requested a MIME type via `
592
- + `the Accept header for a value not supported by the server, statusCode: ${statusCode}`);
593
- break;
594
- case 415:
595
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unsupported Media Type, The client has defined a contentType `
596
- + `header that is not supported by the server, statusCode: ${statusCode}`);
597
- break;
598
- case 422:
599
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unprocessable Entity, The client has made a valid request, `
600
- + `but the server cannot process it. This is often used for APIs for which certain limits have been exceeded, statusCode: ${statusCode}`);
601
- break;
602
- case 429:
603
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Too Many Requests, The client has exceeded the number of `
604
- + `requests allowed for a given time window, statusCode: ${statusCode}`);
605
- break;
606
- case 500:
607
- this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Internal Server Error, An unexpected error on the SmartThings `
608
- + `servers has occurred. These errors should be rare, statusCode: ${statusCode}`);
609
- break;
610
- default:
611
- this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode: ` +
612
- `${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`);
613
- }
614
- }
615
372
  async offlineOff() {
616
373
  if (this.device.offline) {
617
- await this.deviceContext();
618
- await this.updateHomeKitCharacteristics();
374
+ this.Outlet.Service.updateCharacteristic(this.hap.Characteristic.On, false);
619
375
  }
620
376
  }
621
377
  async apiError(e) {
622
- this.outletService.updateCharacteristic(this.hap.Characteristic.On, e);
623
- }
624
- async deviceContext() {
625
- if (this.On === undefined) {
626
- this.On = false;
627
- }
628
- else {
629
- this.On = this.accessory.context.On;
630
- }
631
- if (this.FirmwareRevision === undefined) {
632
- this.FirmwareRevision = this.platform.version;
633
- this.accessory.context.FirmwareRevision = this.FirmwareRevision;
634
- }
635
- }
636
- async refreshRate(device) {
637
- if (device.refreshRate) {
638
- this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
639
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
640
- }
641
- else if (this.platform.config.options.refreshRate) {
642
- this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options.refreshRate;
643
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
644
- }
645
- }
646
- async deviceConfig(device) {
647
- let config = {};
648
- if (device.plug) {
649
- config = device.plug;
650
- }
651
- if (device.connectionType !== undefined) {
652
- config['connectionType'] = device.connectionType;
653
- }
654
- if (device.external !== undefined) {
655
- config['external'] = device.external;
656
- }
657
- if (device.logging !== undefined) {
658
- config['logging'] = device.logging;
659
- }
660
- if (device.refreshRate !== undefined) {
661
- config['refreshRate'] = device.refreshRate;
662
- }
663
- if (device.scanDuration !== undefined) {
664
- config['scanDuration'] = device.scanDuration;
665
- }
666
- if (device.offline !== undefined) {
667
- config['offline'] = device.offline;
668
- }
669
- if (device.maxRetry !== undefined) {
670
- config['maxRetry'] = device.maxRetry;
671
- }
672
- if (device.webhook !== undefined) {
673
- config['webhook'] = device.webhook;
674
- }
675
- if (Object.entries(config).length !== 0) {
676
- this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
677
- }
678
- }
679
- async deviceLogs(device) {
680
- if (this.platform.debugMode) {
681
- this.deviceLogging = this.accessory.context.logging = 'debugMode';
682
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
683
- }
684
- else if (device.logging) {
685
- this.deviceLogging = this.accessory.context.logging = device.logging;
686
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
687
- }
688
- else if (this.platform.config.options?.logging) {
689
- this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
690
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
691
- }
692
- else {
693
- this.deviceLogging = this.accessory.context.logging = 'standard';
694
- this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
695
- }
696
- }
697
- /**
698
- * Logging for Device
699
- */
700
- infoLog(...log) {
701
- if (this.enablingDeviceLogging()) {
702
- this.platform.log.info(String(...log));
703
- }
704
- }
705
- warnLog(...log) {
706
- if (this.enablingDeviceLogging()) {
707
- this.platform.log.warn(String(...log));
708
- }
709
- }
710
- debugWarnLog(...log) {
711
- if (this.enablingDeviceLogging()) {
712
- if (this.deviceLogging?.includes('debug')) {
713
- this.platform.log.warn('[DEBUG]', String(...log));
714
- }
715
- }
716
- }
717
- errorLog(...log) {
718
- if (this.enablingDeviceLogging()) {
719
- this.platform.log.error(String(...log));
720
- }
721
- }
722
- debugErrorLog(...log) {
723
- if (this.enablingDeviceLogging()) {
724
- if (this.deviceLogging?.includes('debug')) {
725
- this.platform.log.error('[DEBUG]', String(...log));
726
- }
727
- }
728
- }
729
- debugLog(...log) {
730
- if (this.enablingDeviceLogging()) {
731
- if (this.deviceLogging === 'debug') {
732
- this.platform.log.info('[DEBUG]', String(...log));
733
- }
734
- else {
735
- this.platform.log.debug(String(...log));
736
- }
737
- }
738
- }
739
- enablingDeviceLogging() {
740
- return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
378
+ this.Outlet.Service.updateCharacteristic(this.hap.Characteristic.On, e);
741
379
  }
742
380
  }
743
381
  //# sourceMappingURL=plug.js.map