@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,31 +1,42 @@
1
- import { CharacteristicValue, PlatformAccessory, Service, API, Logging, HAP } from 'homebridge';
1
+ /* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
2
+ *
3
+ * airpurifier.ts: @switchbot/homebridge-switchbot.
4
+ */
2
5
  import { request } from 'undici';
3
- import { SwitchBotPlatform } from '../platform.js';
4
- import { Devices, irDevicesConfig, irdevice, SwitchBotPlatformConfig } from '../settings.js';
6
+ import { Devices } from '../settings.js';
7
+ import { irdeviceBase } from './irdevice.js';
8
+
9
+ import type { SwitchBotPlatform } from '../platform.js';
10
+ import type { irDevicesConfig, irdevice } from '../settings.js';
11
+ import type { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
5
12
 
6
13
  /**
7
14
  * Platform Accessory
8
15
  * An instance of this class is created for each accessory your platform registers
9
16
  * Each accessory may expose multiple services of different service types.
10
17
  */
11
- export class AirPurifier {
12
- public readonly api: API;
13
- public readonly log: Logging;
14
- public readonly config!: SwitchBotPlatformConfig;
15
- protected readonly hap: HAP;
18
+ export class AirPurifier extends irdeviceBase {
16
19
  // Services
17
- airPurifierService!: Service;
20
+ private AirPurifier: {
21
+ Name: CharacteristicValue;
22
+ Service: Service;
23
+ Active: CharacteristicValue;
24
+ RotationSpeed: CharacteristicValue;
25
+ CurrentAirPurifierState: CharacteristicValue;
26
+ TargetAirPurifierState: CharacteristicValue;
27
+ };
28
+
29
+ private TemperatureSensor: {
30
+ Name: CharacteristicValue;
31
+ Service: Service;
32
+ CurrentTemperature: CharacteristicValue;
33
+ };
18
34
 
19
35
  // Characteristic Values
20
- Active!: CharacteristicValue;
21
36
  APActive!: CharacteristicValue;
22
37
  CurrentAPTemp!: CharacteristicValue;
23
38
  CurrentAPMode!: CharacteristicValue;
24
- RotationSpeed!: CharacteristicValue;
25
- FirmwareRevision!: CharacteristicValue;
26
39
  CurrentAPFanSpeed!: CharacteristicValue;
27
- CurrentTemperature!: CharacteristicValue;
28
- CurrentAirPurifierState!: CharacteristicValue;
29
40
  CurrentHeaterCoolerState!: CharacteristicValue;
30
41
 
31
42
  // Others
@@ -38,60 +49,68 @@ export class AirPurifier {
38
49
  CurrentFanSpeed!: number;
39
50
  static PURIFYING_AIR: number;
40
51
 
41
- // Config
42
- disablePushOn?: boolean;
43
- disablePushOff?: boolean;
44
- deviceLogging!: string;
45
-
46
52
  constructor(
47
- private readonly platform: SwitchBotPlatform,
48
- private accessory: PlatformAccessory,
49
- public device: irdevice & irDevicesConfig,
53
+ readonly platform: SwitchBotPlatform,
54
+ accessory: PlatformAccessory,
55
+ device: irdevice & irDevicesConfig,
50
56
  ) {
51
- this.api = this.platform.api;
52
- this.log = this.platform.log;
53
- this.config = this.platform.config;
54
- this.hap = this.api.hap;
55
- // default placeholders
56
- this.deviceLogs(device);
57
- this.deviceContext();
58
- this.disablePushOnChanges(device);
59
- this.disablePushOffChanges(device);
60
- this.deviceConfig(device);
61
-
62
- // set accessory information
63
- accessory
64
- .getService(this.hap.Service.AccessoryInformation)!
65
- .setCharacteristic(this.hap.Characteristic.Manufacturer, 'SwitchBot')
66
- .setCharacteristic(this.hap.Characteristic.Model, device.remoteType)
67
- .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId)
68
- .setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.FirmwareRevision);
69
-
70
- // get the Television service if it exists, otherwise create a new Television service
71
- // you can create multiple services for each accessory
72
- const airPurifierService = `${accessory.displayName} Air Purifier`;
73
- (this.airPurifierService = accessory.getService(this.hap.Service.AirPurifier)
74
- || accessory.addService(this.hap.Service.AirPurifier)), airPurifierService;
75
-
76
- this.airPurifierService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
77
- if (!this.airPurifierService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
78
- this.airPurifierService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
79
- }
80
- // handle on / off events using the Active characteristic
81
- this.airPurifierService.getCharacteristic(this.hap.Characteristic.Active).onSet(this.ActiveSet.bind(this));
82
-
83
- this.airPurifierService.getCharacteristic(this.hap.Characteristic.CurrentAirPurifierState).onGet(() => {
84
- return this.CurrentAirPurifierStateGet();
85
- });
57
+ super(platform, accessory, device);
58
+
59
+ // Initialize AirPurifier Service
60
+ accessory.context.AirPurifier = accessory.context.AirPurifier ?? {};
61
+ this.AirPurifier = {
62
+ Name: accessory.context.AirPurifier.Name ?? `${accessory.displayName} Air Purifier`,
63
+ Service: accessory.getService(this.hap.Service.AirPurifier) ?? accessory.addService(this.hap.Service.AirPurifier) as Service,
64
+ Active: accessory.context.Active ?? this.hap.Characteristic.Active.INACTIVE,
65
+ RotationSpeed: accessory.context.RotationSpeed ?? 0,
66
+ CurrentAirPurifierState: accessory.context.CurrentAirPurifierState ?? this.hap.Characteristic.CurrentAirPurifierState.INACTIVE,
67
+ TargetAirPurifierState: accessory.context.TargetAirPurifierState ?? this.hap.Characteristic.TargetAirPurifierState.AUTO,
68
+ };
69
+ accessory.context.AirPurifier = this.AirPurifier as object;
70
+
71
+ this.AirPurifier.Service
72
+ .setCharacteristic(this.hap.Characteristic.Name, this.AirPurifier.Name)
73
+ .getCharacteristic(this.hap.Characteristic.Active)
74
+ .onGet(() => {
75
+ return this.AirPurifier.Active;
76
+ })
77
+ .onSet(this.ActiveSet.bind(this));
78
+
79
+ this.AirPurifier.Service
80
+ .getCharacteristic(this.hap.Characteristic.CurrentAirPurifierState)
81
+ .onGet(() => {
82
+ return this.CurrentAirPurifierStateGet();
83
+ });
86
84
 
87
- this.airPurifierService.getCharacteristic(this.hap.Characteristic.TargetAirPurifierState).onSet(this.TargetAirPurifierStateSet.bind(this));
85
+ this.AirPurifier.Service
86
+ .getCharacteristic(this.hap.Characteristic.TargetAirPurifierState)
87
+ .onGet(() => {
88
+ return this.AirPurifier.TargetAirPurifierState;
89
+ })
90
+ .onSet(this.TargetAirPurifierStateSet.bind(this));
91
+
92
+ // Initialize TemperatureSensor Service
93
+ accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
94
+ this.TemperatureSensor = {
95
+ Name: accessory.context.TemperatureSensor.Name ?? `${accessory.displayName} Temperature Sensor`,
96
+ Service: accessory.getService(this.hap.Service.TemperatureSensor) ?? accessory.addService(this.hap.Service.TemperatureSensor) as Service,
97
+ CurrentTemperature: accessory.context.CurrentTemperature || 24,
98
+ };
99
+ accessory.context.TemperatureSensor = this.TemperatureSensor as object;
100
+
101
+ this.TemperatureSensor.Service
102
+ .setCharacteristic(this.hap.Characteristic.Name, this.TemperatureSensor.Name)
103
+ .getCharacteristic(this.hap.Characteristic.CurrentTemperature)
104
+ .onGet(() => {
105
+ return this.TemperatureSensor.CurrentTemperature;
106
+ });
88
107
  }
89
108
 
90
109
  async ActiveSet(value: CharacteristicValue): Promise<void> {
91
110
  this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Set Active: ${value}`);
92
111
 
93
- this.Active = value;
94
- if (this.Active === this.hap.Characteristic.Active.ACTIVE) {
112
+ this.AirPurifier.Active = value;
113
+ if (this.AirPurifier.Active === this.hap.Characteristic.Active.ACTIVE) {
95
114
  this.pushAirPurifierOnChanges();
96
115
  } else {
97
116
  this.pushAirPurifierOffChanges();
@@ -115,12 +134,12 @@ export class AirPurifier {
115
134
  }
116
135
 
117
136
  async CurrentAirPurifierStateGet(): Promise<number> {
118
- if (this.Active === 1) {
119
- this.CurrentAirPurifierState = this.hap.Characteristic.CurrentAirPurifierState.PURIFYING_AIR;
137
+ if (this.AirPurifier.Active === 1) {
138
+ this.AirPurifier.CurrentAirPurifierState = this.hap.Characteristic.CurrentAirPurifierState.PURIFYING_AIR;
120
139
  } else {
121
- this.CurrentAirPurifierState = this.hap.Characteristic.CurrentAirPurifierState.INACTIVE;
140
+ this.AirPurifier.CurrentAirPurifierState = this.hap.Characteristic.CurrentAirPurifierState.INACTIVE;
122
141
  }
123
- return this.CurrentAirPurifierState;
142
+ return this.AirPurifier.CurrentAirPurifierState;
124
143
  }
125
144
 
126
145
  /**
@@ -136,10 +155,10 @@ export class AirPurifier {
136
155
  */
137
156
  async pushAirPurifierOnChanges(): Promise<void> {
138
157
  this.debugLog(
139
- `${this.device.remoteType}: ${this.accessory.displayName} pushAirPurifierOnChanges Active: ${this.Active},` +
158
+ `${this.device.remoteType}: ${this.accessory.displayName} pushAirPurifierOnChanges Active: ${this.AirPurifier.Active},` +
140
159
  ` disablePushOn: ${this.disablePushOn}`,
141
160
  );
142
- if (this.Active === this.hap.Characteristic.Active.ACTIVE && !this.disablePushOn) {
161
+ if (this.AirPurifier.Active === this.hap.Characteristic.Active.ACTIVE && !this.disablePushOn) {
143
162
  const commandType: string = await this.commandType();
144
163
  const command: string = await this.commandOn();
145
164
  const bodyChange = JSON.stringify({
@@ -153,10 +172,10 @@ export class AirPurifier {
153
172
 
154
173
  async pushAirPurifierOffChanges(): Promise<void> {
155
174
  this.debugLog(
156
- `${this.device.remoteType}: ${this.accessory.displayName} pushAirPurifierOffChanges Active: ${this.Active},` +
175
+ `${this.device.remoteType}: ${this.accessory.displayName} pushAirPurifierOffChanges Active: ${this.AirPurifier.Active},` +
157
176
  ` disablePushOff: ${this.disablePushOff}`,
158
177
  );
159
- if (this.Active === this.hap.Characteristic.Active.INACTIVE && !this.disablePushOn) {
178
+ if (this.AirPurifier.Active === this.hap.Characteristic.Active.INACTIVE && !this.disablePushOn) {
160
179
  const commandType: string = await this.commandType();
161
180
  const command: string = await this.commandOff();
162
181
  const bodyChange = JSON.stringify({
@@ -170,7 +189,7 @@ export class AirPurifier {
170
189
 
171
190
  async pushAirPurifierStatusChanges(): Promise<void> {
172
191
  this.debugLog(
173
- `${this.device.remoteType}: ${this.accessory.displayName} pushAirPurifierStatusChanges Active: ${this.Active},` +
192
+ `${this.device.remoteType}: ${this.accessory.displayName} pushAirPurifierStatusChanges Active: ${this.AirPurifier.Active},` +
174
193
  ` disablePushOff: ${this.disablePushOff}, disablePushOn: ${this.disablePushOn}`,
175
194
  );
176
195
  if (!this.Busy) {
@@ -185,21 +204,21 @@ export class AirPurifier {
185
204
 
186
205
  async pushAirPurifierDetailsChanges(): Promise<void> {
187
206
  this.debugLog(
188
- `${this.device.remoteType}: ${this.accessory.displayName} pushAirPurifierDetailsChanges Active: ${this.Active},` +
207
+ `${this.device.remoteType}: ${this.accessory.displayName} pushAirPurifierDetailsChanges Active: ${this.AirPurifier.Active},` +
189
208
  ` disablePushOff: ${this.disablePushOff}, disablePushOn: ${this.disablePushOn}`,
190
209
  );
191
- this.CurrentAPTemp = this.CurrentTemperature || 24;
210
+ this.CurrentAPTemp = this.TemperatureSensor!.CurrentTemperature || 24;
192
211
  this.CurrentAPMode = this.CurrentMode || 1;
193
212
  this.CurrentAPFanSpeed = this.CurrentFanSpeed || 1;
194
- this.APActive = this.Active === 1 ? 'on' : 'off';
213
+ this.APActive = this.AirPurifier.Active === 1 ? 'on' : 'off';
195
214
  const parameter = `${this.CurrentAPTemp},${this.CurrentAPMode},${this.CurrentAPFanSpeed},${this.APActive}`;
196
215
  const bodyChange = JSON.stringify({
197
216
  command: 'setAll',
198
217
  parameter: `${parameter}`,
199
218
  commandType: 'command',
200
219
  });
201
- if (this.Active === 1) {
202
- if ((Number(this.CurrentTemperature) || 24) < (this.LastTemperature || 30)) {
220
+ if (this.AirPurifier.Active === 1) {
221
+ if ((Number(this.TemperatureSensor!.CurrentTemperature) || 24) < (this.LastTemperature || 30)) {
203
222
  this.CurrentHeaterCoolerState = this.hap.Characteristic.CurrentHeaterCoolerState.COOLING;
204
223
  } else {
205
224
  this.CurrentHeaterCoolerState = this.hap.Characteristic.CurrentHeaterCoolerState.HEATING;
@@ -225,8 +244,10 @@ export class AirPurifier {
225
244
  this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
226
245
  this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
227
246
  if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
228
- this.debugErrorLog(`${this.device.remoteType}: ${this.accessory.displayName} `
247
+ this.debugSuccessLog(`${this.device.remoteType}: ${this.accessory.displayName} `
229
248
  + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
249
+ this.successLog(`${this.device.remoteType}: ${this.accessory.displayName}`
250
+ + ` request to SwitchBot API, body: ${JSON.stringify(JSON.parse(bodyChange))} sent successfully`);
230
251
  this.updateHomeKitCharacteristics();
231
252
  } else {
232
253
  this.statusCode(statusCode);
@@ -249,280 +270,49 @@ export class AirPurifier {
249
270
 
250
271
  async updateHomeKitCharacteristics(): Promise<void> {
251
272
  // Active
252
- if (this.Active === undefined) {
253
- this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Active: ${this.Active}`);
273
+ if (this.AirPurifier.Active === undefined) {
274
+ this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Active: ${this.AirPurifier.Active}`);
254
275
  } else {
255
- this.accessory.context.Active = this.Active;
256
- this.airPurifierService?.updateCharacteristic(this.hap.Characteristic.Active, this.Active);
257
- this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.Active}`);
276
+ this.accessory.context.Active = this.AirPurifier.Active;
277
+ this.AirPurifier.Service.updateCharacteristic(this.hap.Characteristic.Active, this.AirPurifier.Active);
278
+ this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.AirPurifier.Active}`);
258
279
  }
259
280
  // CurrentAirPurifierState
260
- if (this.CurrentAirPurifierState === undefined) {
261
- this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} CurrentAirPurifierState: ${this.CurrentAirPurifierState}`);
281
+ if (this.AirPurifier.CurrentAirPurifierState === undefined) {
282
+ this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} CurrentAirPurifierState: ${this.AirPurifier.CurrentAirPurifierState}`);
262
283
  } else {
263
- this.accessory.context.CurrentAirPurifierState = this.CurrentAirPurifierState;
264
- this.airPurifierService?.updateCharacteristic(this.hap.Characteristic.CurrentAirPurifierState, this.CurrentAirPurifierState);
265
- this.debugLog(
266
- `${this.device.remoteType}: ${this.accessory.displayName}` + ` updateCharacteristic CurrentAirPurifierState: ${this.CurrentAirPurifierState}`,
267
- );
284
+ this.accessory.context.CurrentAirPurifierState = this.AirPurifier.CurrentAirPurifierState;
285
+ this.AirPurifier.Service.updateCharacteristic(this.hap.Characteristic.CurrentAirPurifierState, this.AirPurifier.CurrentAirPurifierState);
286
+ this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
287
+ + ` CurrentAirPurifierState: ${this.AirPurifier.CurrentAirPurifierState}`);
268
288
  }
269
289
  // CurrentHeaterCoolerState
270
290
  if (this.CurrentHeaterCoolerState === undefined) {
271
291
  this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} CurrentHeaterCoolerState: ${this.CurrentHeaterCoolerState}`);
272
292
  } else {
273
293
  this.accessory.context.CurrentHeaterCoolerState = this.CurrentHeaterCoolerState;
274
- this.airPurifierService?.updateCharacteristic(this.hap.Characteristic.CurrentHeaterCoolerState, this.CurrentHeaterCoolerState);
294
+ this.AirPurifier.Service.updateCharacteristic(this.hap.Characteristic.CurrentHeaterCoolerState, this.CurrentHeaterCoolerState);
275
295
  this.debugLog(
276
296
  `${this.device.remoteType}: ${this.accessory.displayName}` +
277
297
  ` updateCharacteristic CurrentHeaterCoolerState: ${this.CurrentHeaterCoolerState}`,
278
298
  );
279
299
  }
280
- }
281
-
282
- async disablePushOnChanges(device: irdevice & irDevicesConfig): Promise<void> {
283
- if (device.disablePushOn === undefined) {
284
- this.disablePushOn = false;
285
- } else {
286
- this.disablePushOn = device.disablePushOn;
287
- }
288
- }
289
-
290
- async disablePushOffChanges(device: irdevice & irDevicesConfig): Promise<void> {
291
- if (device.disablePushOff === undefined) {
292
- this.disablePushOff = false;
293
- } else {
294
- this.disablePushOff = device.disablePushOff;
295
- }
296
- }
297
-
298
- async commandType(): Promise<string> {
299
- let commandType: string;
300
- if (this.device.customize) {
301
- commandType = 'customize';
302
- } else {
303
- commandType = 'command';
304
- }
305
- return commandType;
306
- }
307
-
308
- async commandOn(): Promise<string> {
309
- let command: string;
310
- if (this.device.customize && this.device.customOn) {
311
- command = this.device.customOn;
300
+ // CurrentTemperature
301
+ if (this.TemperatureSensor.CurrentTemperature === undefined) {
302
+ this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}`);
312
303
  } else {
313
- command = 'turnOn';
314
- }
315
- return command;
316
- }
317
-
318
- async commandOff(): Promise<string> {
319
- let command: string;
320
- if (this.device.customize && this.device.customOff) {
321
- command = this.device.customOff;
322
- } else {
323
- command = 'turnOff';
324
- }
325
- return command;
326
- }
327
-
328
- async statusCode(statusCode: number): Promise<void> {
329
- switch (statusCode) {
330
- case 151:
331
- this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Command not supported by this deviceType, statusCode: ${statusCode}`);
332
- break;
333
- case 152:
334
- this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Device not found, statusCode: ${statusCode}`);
335
- break;
336
- case 160:
337
- this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Command is not supported, statusCode: ${statusCode}`);
338
- break;
339
- case 161:
340
- this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Device is offline, statusCode: ${statusCode}`);
341
- break;
342
- case 171:
343
- this.errorLog(
344
- `${this.device.remoteType}: ${this.accessory.displayName} Hub Device is offline, statusCode: ${statusCode}. ` +
345
- `Hub: ${this.device.hubDeviceId}`,
346
- );
347
- break;
348
- case 190:
349
- this.errorLog(
350
- `${this.device.remoteType}: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
351
- ` Or command format is invalid, statusCode: ${statusCode}`,
352
- );
353
- break;
354
- case 100:
355
- this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Command successfully sent, statusCode: ${statusCode}`);
356
- break;
357
- case 200:
358
- this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Request successful, statusCode: ${statusCode}`);
359
- break;
360
- case 400:
361
- this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Bad Request, The client has issued an invalid request. `
362
- + `This is commonly used to specify validation errors in a request payload, statusCode: ${statusCode}`);
363
- break;
364
- case 401:
365
- this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Unauthorized, Authorization for the API is required, `
366
- + `but the request has not been authenticated, statusCode: ${statusCode}`);
367
- break;
368
- case 403:
369
- this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Forbidden, The request has been authenticated but does not `
370
- + `have appropriate permissions, or a requested resource is not found, statusCode: ${statusCode}`);
371
- break;
372
- case 404:
373
- this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Not Found, Specifies the requested path does not exist, `
374
- + `statusCode: ${statusCode}`);
375
- break;
376
- case 406:
377
- this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Not Acceptable, The client has requested a MIME type via `
378
- + `the Accept header for a value not supported by the server, statusCode: ${statusCode}`);
379
- break;
380
- case 415:
381
- this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Unsupported Media Type, The client has defined a contentType `
382
- + `header that is not supported by the server, statusCode: ${statusCode}`);
383
- break;
384
- case 422:
385
- this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Unprocessable Entity, The client has made a valid request, but `
386
- + `the server cannot process it. This is often used for APIs for which certain limits have been exceeded, statusCode: ${statusCode}`);
387
- break;
388
- case 429:
389
- this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Too Many Requests, The client has exceeded the number of `
390
- + `requests allowed for a given time window, statusCode: ${statusCode}`);
391
- break;
392
- case 500:
393
- this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Internal Server Error, An unexpected error on the SmartThings `
394
- + `servers has occurred. These errors should be rare, statusCode: ${statusCode}`);
395
- break;
396
- default:
397
- this.infoLog(
398
- `${this.device.remoteType}: ${this.accessory.displayName} Unknown statusCode: ` +
399
- `${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`,
400
- );
304
+ this.accessory.context.CurrentTemperature = this.TemperatureSensor.CurrentTemperature;
305
+ this.TemperatureSensor.Service.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, this.TemperatureSensor.CurrentTemperature);
306
+ this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic`
307
+ + ` CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}`);
401
308
  }
402
309
  }
403
310
 
404
311
  async apiError(e: any): Promise<void> {
405
- this.airPurifierService.updateCharacteristic(this.hap.Characteristic.CurrentHeaterCoolerState, e);
406
- this.airPurifierService.updateCharacteristic(this.hap.Characteristic.CurrentAirPurifierState, e);
407
- this.airPurifierService.updateCharacteristic(this.hap.Characteristic.TargetAirPurifierState, e);
408
- this.airPurifierService.updateCharacteristic(this.hap.Characteristic.Active, e);
409
- }
410
-
411
- private deviceContext() {
412
- if (this.Active === undefined) {
413
- this.Active = this.hap.Characteristic.Active.INACTIVE;
414
- } else {
415
- this.Active = this.accessory.context.Active;
416
- }
417
- if (this.CurrentTemperature === undefined) {
418
- this.CurrentTemperature = 24;
419
- } else {
420
- this.CurrentTemperature = this.accessory.context.CurrentTemperature;
421
- }
422
- if (this.FirmwareRevision === undefined) {
423
- this.FirmwareRevision = this.platform.version;
424
- this.accessory.context.FirmwareRevision = this.FirmwareRevision;
425
- }
426
- }
427
-
428
- async deviceConfig(device: irdevice & irDevicesConfig): Promise<void> {
429
- let config = {};
430
- if (device.irpur) {
431
- config = device.irpur;
432
- }
433
- if (device.logging !== undefined) {
434
- config['logging'] = device.logging;
435
- }
436
- if (device.connectionType !== undefined) {
437
- config['connectionType'] = device.connectionType;
438
- }
439
- if (device.external !== undefined) {
440
- config['external'] = device.external;
441
- }
442
- if (device.customOn !== undefined) {
443
- config['customOn'] = device.customOn;
444
- }
445
- if (device.customOff !== undefined) {
446
- config['customOff'] = device.customOff;
447
- }
448
- if (device.customize !== undefined) {
449
- config['customize'] = device.customize;
450
- }
451
- if (device.disablePushOn !== undefined) {
452
- config['disablePushOn'] = device.disablePushOn;
453
- }
454
- if (device.disablePushOff !== undefined) {
455
- config['disablePushOff'] = device.disablePushOff;
456
- }
457
- if (Object.entries(config).length !== 0) {
458
- this.debugWarnLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
459
- }
460
- }
461
-
462
- async deviceLogs(device: irdevice & irDevicesConfig): Promise<void> {
463
- if (this.platform.debugMode) {
464
- this.deviceLogging = this.accessory.context.logging = 'debugMode';
465
- this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
466
- } else if (device.logging) {
467
- this.deviceLogging = this.accessory.context.logging = device.logging;
468
- this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
469
- } else if (this.platform.config.options?.logging) {
470
- this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
471
- this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
472
- } else {
473
- this.deviceLogging = this.accessory.context.logging = 'standard';
474
- this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
475
- }
476
- }
477
-
478
- /**
479
- * Logging for Device
480
- */
481
- infoLog(...log: any[]): void {
482
- if (this.enablingDeviceLogging()) {
483
- this.platform.log.info(String(...log));
484
- }
485
- }
486
-
487
- warnLog(...log: any[]): void {
488
- if (this.enablingDeviceLogging()) {
489
- this.platform.log.warn(String(...log));
490
- }
491
- }
492
-
493
- debugWarnLog(...log: any[]): void {
494
- if (this.enablingDeviceLogging()) {
495
- if (this.deviceLogging?.includes('debug')) {
496
- this.platform.log.warn('[DEBUG]', String(...log));
497
- }
498
- }
499
- }
500
-
501
- errorLog(...log: any[]): void {
502
- if (this.enablingDeviceLogging()) {
503
- this.platform.log.error(String(...log));
504
- }
505
- }
506
-
507
- debugErrorLog(...log: any[]): void {
508
- if (this.enablingDeviceLogging()) {
509
- if (this.deviceLogging?.includes('debug')) {
510
- this.platform.log.error('[DEBUG]', String(...log));
511
- }
512
- }
513
- }
514
-
515
- debugLog(...log: any[]): void {
516
- if (this.enablingDeviceLogging()) {
517
- if (this.deviceLogging === 'debug') {
518
- this.platform.log.info('[DEBUG]', String(...log));
519
- } else {
520
- this.platform.log.debug(String(...log));
521
- }
522
- }
523
- }
524
-
525
- enablingDeviceLogging(): boolean {
526
- return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
312
+ this.AirPurifier.Service.updateCharacteristic(this.hap.Characteristic.CurrentHeaterCoolerState, e);
313
+ this.AirPurifier.Service.updateCharacteristic(this.hap.Characteristic.CurrentAirPurifierState, e);
314
+ this.AirPurifier.Service.updateCharacteristic(this.hap.Characteristic.TargetAirPurifierState, e);
315
+ this.AirPurifier.Service.updateCharacteristic(this.hap.Characteristic.Active, e);
316
+ this.TemperatureSensor.Service.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, e);
527
317
  }
528
318
  }