@switchbot/homebridge-switchbot 3.5.0-beta.9 → 3.5.0
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.
- package/.vscode/settings.json +4 -1
- package/CHANGELOG.md +4 -1
- package/config.schema.json +166 -24
- package/dist/device/blindtilt.d.ts +21 -96
- package/dist/device/blindtilt.d.ts.map +1 -1
- package/dist/device/blindtilt.js +439 -817
- package/dist/device/blindtilt.js.map +1 -1
- package/dist/device/bot.d.ts +27 -72
- package/dist/device/bot.d.ts.map +1 -1
- package/dist/device/bot.js +835 -865
- package/dist/device/bot.js.map +1 -1
- package/dist/device/ceilinglight.d.ts +15 -69
- package/dist/device/ceilinglight.d.ts.map +1 -1
- package/dist/device/ceilinglight.js +287 -653
- package/dist/device/ceilinglight.js.map +1 -1
- package/dist/device/colorbulb.d.ts +15 -76
- package/dist/device/colorbulb.d.ts.map +1 -1
- package/dist/device/colorbulb.js +354 -732
- package/dist/device/colorbulb.js.map +1 -1
- package/dist/device/contact.d.ts +14 -66
- package/dist/device/contact.d.ts.map +1 -1
- package/dist/device/contact.js +268 -576
- package/dist/device/contact.js.map +1 -1
- package/dist/device/curtain.d.ts +18 -89
- package/dist/device/curtain.d.ts.map +1 -1
- package/dist/device/curtain.js +431 -851
- package/dist/device/curtain.js.map +1 -1
- package/dist/device/device.d.ts +60 -0
- package/dist/device/device.d.ts.map +1 -0
- package/dist/device/device.js +739 -0
- package/dist/device/device.js.map +1 -0
- package/dist/device/fan.d.ts +63 -0
- package/dist/device/fan.d.ts.map +1 -0
- package/dist/device/fan.js +698 -0
- package/dist/device/fan.js.map +1 -0
- package/dist/device/hub.d.ts +15 -60
- package/dist/device/hub.d.ts.map +1 -1
- package/dist/device/hub.js +257 -631
- package/dist/device/hub.js.map +1 -1
- package/dist/device/humidifier.d.ts +11 -66
- package/dist/device/humidifier.d.ts.map +1 -1
- package/dist/device/humidifier.js +266 -629
- package/dist/device/humidifier.js.map +1 -1
- package/dist/device/iosensor.d.ts +12 -64
- package/dist/device/iosensor.d.ts.map +1 -1
- package/dist/device/iosensor.js +215 -615
- package/dist/device/iosensor.js.map +1 -1
- package/dist/device/lightstrip.d.ts +12 -70
- package/dist/device/lightstrip.d.ts.map +1 -1
- package/dist/device/lightstrip.js +336 -645
- package/dist/device/lightstrip.js.map +1 -1
- package/dist/device/lock.d.ts +17 -63
- package/dist/device/lock.d.ts.map +1 -1
- package/dist/device/lock.js +290 -595
- package/dist/device/lock.js.map +1 -1
- package/dist/device/meter.d.ts +15 -64
- package/dist/device/meter.d.ts.map +1 -1
- package/dist/device/meter.js +211 -608
- package/dist/device/meter.js.map +1 -1
- package/dist/device/meterplus.d.ts +15 -65
- package/dist/device/meterplus.d.ts.map +1 -1
- package/dist/device/meterplus.js +205 -615
- package/dist/device/meterplus.js.map +1 -1
- package/dist/device/motion.d.ts +12 -69
- package/dist/device/motion.d.ts.map +1 -1
- package/dist/device/motion.js +202 -563
- package/dist/device/motion.js.map +1 -1
- package/dist/device/plug.d.ts +10 -57
- package/dist/device/plug.d.ts.map +1 -1
- package/dist/device/plug.js +125 -484
- package/dist/device/plug.js.map +1 -1
- package/dist/device/robotvacuumcleaner.d.ts +13 -63
- package/dist/device/robotvacuumcleaner.d.ts.map +1 -1
- package/dist/device/robotvacuumcleaner.js +233 -549
- package/dist/device/robotvacuumcleaner.js.map +1 -1
- package/dist/device/waterdetector.d.ts +11 -63
- package/dist/device/waterdetector.d.ts.map +1 -1
- package/dist/device/waterdetector.js +170 -493
- package/dist/device/waterdetector.js.map +1 -1
- package/dist/homebridge-ui/public/index.html +22 -16
- package/dist/homebridge-ui/server.js +1 -1
- package/dist/homebridge-ui/server.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/irdevice/airconditioner.d.ts +10 -50
- package/dist/irdevice/airconditioner.d.ts.map +1 -1
- package/dist/irdevice/airconditioner.js +340 -468
- package/dist/irdevice/airconditioner.js.map +1 -1
- package/dist/irdevice/airpurifier.d.ts +8 -39
- package/dist/irdevice/airpurifier.d.ts.map +1 -1
- package/dist/irdevice/airpurifier.js +105 -319
- package/dist/irdevice/airpurifier.js.map +1 -1
- package/dist/irdevice/camera.d.ts +7 -36
- package/dist/irdevice/camera.d.ts.map +1 -1
- package/dist/irdevice/camera.js +44 -285
- package/dist/irdevice/camera.js.map +1 -1
- package/dist/irdevice/fan.d.ts +7 -43
- package/dist/irdevice/fan.d.ts.map +1 -1
- package/dist/irdevice/fan.js +92 -350
- package/dist/irdevice/fan.js.map +1 -1
- package/dist/irdevice/irdevice.d.ts +40 -0
- package/dist/irdevice/irdevice.d.ts.map +1 -0
- package/dist/irdevice/irdevice.js +369 -0
- package/dist/irdevice/irdevice.js.map +1 -0
- package/dist/irdevice/light.d.ts +12 -45
- package/dist/irdevice/light.d.ts.map +1 -1
- package/dist/irdevice/light.js +118 -362
- package/dist/irdevice/light.js.map +1 -1
- package/dist/irdevice/other.d.ts +19 -48
- package/dist/irdevice/other.d.ts.map +1 -1
- package/dist/irdevice/other.js +438 -570
- package/dist/irdevice/other.js.map +1 -1
- package/dist/irdevice/tv.d.ts +8 -40
- package/dist/irdevice/tv.d.ts.map +1 -1
- package/dist/irdevice/tv.js +91 -339
- package/dist/irdevice/tv.js.map +1 -1
- package/dist/irdevice/vacuumcleaner.d.ts +7 -36
- package/dist/irdevice/vacuumcleaner.d.ts.map +1 -1
- package/dist/irdevice/vacuumcleaner.js +45 -285
- package/dist/irdevice/vacuumcleaner.js.map +1 -1
- package/dist/irdevice/waterheater.d.ts +7 -36
- package/dist/irdevice/waterheater.d.ts.map +1 -1
- package/dist/irdevice/waterheater.js +47 -291
- package/dist/irdevice/waterheater.js.map +1 -1
- package/dist/platform.d.ts +22 -8
- package/dist/platform.d.ts.map +1 -1
- package/dist/platform.js +342 -191
- package/dist/platform.js.map +1 -1
- package/dist/settings.d.ts +64 -17
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +16 -552
- package/dist/settings.js.map +1 -1
- package/dist/utils.d.ts +77 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +638 -1
- package/dist/utils.js.map +1 -1
- package/eslint.config.js +96 -0
- package/package.json +20 -16
- package/src/custom.d.ts +2 -1
- package/src/device/blindtilt.ts +472 -888
- package/src/device/bot.ts +893 -968
- package/src/device/ceilinglight.ts +304 -709
- package/src/device/colorbulb.ts +370 -803
- package/src/device/contact.ts +301 -611
- package/src/device/curtain.ts +460 -908
- package/src/device/device.ts +755 -0
- package/src/device/fan.ts +749 -0
- package/src/device/hub.ts +294 -664
- package/src/device/humidifier.ts +299 -696
- package/src/device/iosensor.ts +251 -644
- package/src/device/lightstrip.ts +362 -712
- package/src/device/lock.ts +328 -653
- package/src/device/meter.ts +247 -637
- package/src/device/meterplus.ts +240 -644
- package/src/device/motion.ts +230 -598
- package/src/device/plug.ts +139 -525
- package/src/device/robotvacuumcleaner.ts +258 -593
- package/src/device/waterdetector.ts +191 -522
- package/src/homebridge-ui/public/index.html +22 -16
- package/src/homebridge-ui/server.ts +1 -1
- package/src/index.ts +4 -3
- package/src/irdevice/airconditioner.ts +370 -527
- package/src/irdevice/airpurifier.ts +132 -356
- package/src/irdevice/camera.ts +58 -311
- package/src/irdevice/fan.ts +109 -379
- package/src/irdevice/irdevice.ts +382 -0
- package/src/irdevice/light.ts +157 -412
- package/src/irdevice/other.ts +507 -648
- package/src/irdevice/tv.ts +121 -375
- package/src/irdevice/vacuumcleaner.ts +59 -311
- package/src/irdevice/waterheater.ts +61 -320
- package/src/platform.ts +395 -259
- package/src/settings.ts +118 -609
- package/src/utils.ts +642 -1
- package/.github/npm-version-script.cjs +0 -81
- package/src/device/waterdetector.json +0 -11
package/dist/device/colorbulb.js
CHANGED
|
@@ -1,130 +1,86 @@
|
|
|
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 {
|
|
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
|
-
|
|
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
|
-
|
|
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
|
-
//
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
.getService(this.hap.Service.
|
|
92
|
-
.
|
|
93
|
-
.
|
|
94
|
-
.
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
this.accessory.
|
|
103
|
-
|
|
104
|
-
this.accessory.context.adaptiveLighting
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
34
|
+
// Initialize LightBulb property
|
|
35
|
+
accessory.context.LightBulb = accessory.context.LightBulb ?? {};
|
|
36
|
+
this.LightBulb = {
|
|
37
|
+
Name: accessory.context.LightBulb.Name ?? accessory.displayName,
|
|
38
|
+
Service: accessory.getService(this.hap.Service.Lightbulb) ?? accessory.addService(this.hap.Service.Lightbulb),
|
|
39
|
+
On: accessory.context.On ?? false,
|
|
40
|
+
Hue: accessory.context.Hue ?? 0,
|
|
41
|
+
Saturation: accessory.context.Saturation ?? 0,
|
|
42
|
+
Brightness: accessory.context.Brightness ?? 0,
|
|
43
|
+
ColorTemperature: accessory.context.ColorTemperature ?? 140,
|
|
44
|
+
};
|
|
45
|
+
accessory.context.LightBulb = this.LightBulb;
|
|
46
|
+
// Adaptive Lighting
|
|
47
|
+
if (this.adaptiveLightingShift === -1 && accessory.context.adaptiveLighting) {
|
|
48
|
+
accessory.removeService(this.LightBulb.Service);
|
|
49
|
+
this.LightBulb.Service = accessory.addService(this.hap.Service.Lightbulb);
|
|
50
|
+
accessory.context.adaptiveLighting = false;
|
|
51
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} adaptiveLighting: ${accessory.context.adaptiveLighting}`);
|
|
52
|
+
}
|
|
53
|
+
if (this.adaptiveLightingShift !== -1) {
|
|
54
|
+
this.AdaptiveLightingController = new platform.api.hap.AdaptiveLightingController(this.LightBulb.Service, {
|
|
55
|
+
customTemperatureAdjustment: this.adaptiveLightingShift,
|
|
56
|
+
});
|
|
57
|
+
accessory.configureController(this.AdaptiveLightingController);
|
|
58
|
+
accessory.context.adaptiveLighting = true;
|
|
59
|
+
this.debugLog(`${device.deviceType}: ${this.accessory.displayName} adaptiveLighting: ${accessory.context.adaptiveLighting},`
|
|
60
|
+
+ ` adaptiveLightingShift: ${this.adaptiveLightingShift}`);
|
|
61
|
+
}
|
|
62
|
+
this.debugLog(`${device.deviceType}: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
|
|
63
|
+
// Initialize LightBulb Characteristics
|
|
64
|
+
this.LightBulb.Service
|
|
65
|
+
.setCharacteristic(this.hap.Characteristic.Name, this.LightBulb.Name)
|
|
66
|
+
.getCharacteristic(this.hap.Characteristic.On)
|
|
67
|
+
.onGet(() => {
|
|
68
|
+
return this.LightBulb.On;
|
|
69
|
+
})
|
|
70
|
+
.onSet(this.OnSet.bind(this));
|
|
71
|
+
this.LightBulb.Service
|
|
115
72
|
.getCharacteristic(this.hap.Characteristic.Brightness)
|
|
116
73
|
.setProps({
|
|
117
|
-
minStep:
|
|
74
|
+
minStep: device.colorbulb?.set_minStep ?? 1,
|
|
118
75
|
minValue: 0,
|
|
119
76
|
maxValue: 100,
|
|
120
77
|
validValueRanges: [0, 100],
|
|
121
78
|
})
|
|
122
79
|
.onGet(() => {
|
|
123
|
-
return this.Brightness;
|
|
80
|
+
return this.LightBulb.Brightness;
|
|
124
81
|
})
|
|
125
82
|
.onSet(this.BrightnessSet.bind(this));
|
|
126
|
-
|
|
127
|
-
this.lightBulbService
|
|
83
|
+
this.LightBulb.Service
|
|
128
84
|
.getCharacteristic(this.hap.Characteristic.ColorTemperature)
|
|
129
85
|
.setProps({
|
|
130
86
|
minValue: 140,
|
|
@@ -132,11 +88,10 @@ export class ColorBulb {
|
|
|
132
88
|
validValueRanges: [140, 500],
|
|
133
89
|
})
|
|
134
90
|
.onGet(() => {
|
|
135
|
-
return this.ColorTemperature;
|
|
91
|
+
return this.LightBulb.ColorTemperature;
|
|
136
92
|
})
|
|
137
93
|
.onSet(this.ColorTemperatureSet.bind(this));
|
|
138
|
-
|
|
139
|
-
this.lightBulbService
|
|
94
|
+
this.LightBulb.Service
|
|
140
95
|
.getCharacteristic(this.hap.Characteristic.Hue)
|
|
141
96
|
.setProps({
|
|
142
97
|
minValue: 0,
|
|
@@ -144,11 +99,10 @@ export class ColorBulb {
|
|
|
144
99
|
validValueRanges: [0, 360],
|
|
145
100
|
})
|
|
146
101
|
.onGet(() => {
|
|
147
|
-
return this.Hue;
|
|
102
|
+
return this.LightBulb.Hue;
|
|
148
103
|
})
|
|
149
104
|
.onSet(this.HueSet.bind(this));
|
|
150
|
-
|
|
151
|
-
this.lightBulbService
|
|
105
|
+
this.LightBulb.Service
|
|
152
106
|
.getCharacteristic(this.hap.Characteristic.Saturation)
|
|
153
107
|
.setProps({
|
|
154
108
|
minValue: 0,
|
|
@@ -156,19 +110,11 @@ export class ColorBulb {
|
|
|
156
110
|
validValueRanges: [0, 100],
|
|
157
111
|
})
|
|
158
112
|
.onGet(() => {
|
|
159
|
-
return this.Saturation;
|
|
113
|
+
return this.LightBulb.Saturation;
|
|
160
114
|
})
|
|
161
115
|
.onSet(this.SaturationSet.bind(this));
|
|
162
|
-
|
|
163
|
-
|
|
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
|
-
}
|
|
116
|
+
// Retrieve initial values and updateHomekit
|
|
117
|
+
this.refreshStatus();
|
|
172
118
|
// Update Homekit
|
|
173
119
|
this.updateHomeKitCharacteristics();
|
|
174
120
|
// Start an update interval
|
|
@@ -178,170 +124,118 @@ export class ColorBulb {
|
|
|
178
124
|
await this.refreshStatus();
|
|
179
125
|
});
|
|
180
126
|
//regisiter webhook event handler
|
|
181
|
-
|
|
182
|
-
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
|
|
183
|
-
this.platform.webhookEventHandler[this.device.deviceId] = async (context) => {
|
|
184
|
-
try {
|
|
185
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
|
|
186
|
-
const { powerState, brightness, color, colorTemperature } = context;
|
|
187
|
-
const { On, Brightness, Hue, Saturation, ColorTemperature } = this;
|
|
188
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
|
|
189
|
-
'(powerState, brightness, color, colorTemperature) = ' +
|
|
190
|
-
`Webhook:(${powerState}, ${brightness}, ${color}, ${colorTemperature}), ` +
|
|
191
|
-
`current:(${On}, ${Brightness}, ${Hue}, ${Saturation}, ${ColorTemperature})`);
|
|
192
|
-
this.On = powerState === 'ON' ? true : false;
|
|
193
|
-
this.Brightness = brightness;
|
|
194
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} color: ${JSON.stringify(color)}`);
|
|
195
|
-
const [red, green, blue] = color.split(':');
|
|
196
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} red: ${JSON.stringify(red)}`);
|
|
197
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} green: ${JSON.stringify(green)}`);
|
|
198
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} blue: ${JSON.stringify(blue)}`);
|
|
199
|
-
const [hue, saturation] = rgb2hs(Number(red), Number(green), Number(blue));
|
|
200
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` + ` hs: ${JSON.stringify(rgb2hs(Number(red), Number(green), Number(blue)))}`);
|
|
201
|
-
// 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}`);
|
|
205
|
-
}
|
|
206
|
-
else {
|
|
207
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
|
|
208
|
-
}
|
|
209
|
-
// 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}`);
|
|
213
|
-
}
|
|
214
|
-
else {
|
|
215
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
|
|
216
|
-
}
|
|
217
|
-
this.ColorTemperature = colorTemperature;
|
|
218
|
-
if (this.accessory.context.ColorTemperature !== this.ColorTemperature) {
|
|
219
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
|
|
220
|
-
}
|
|
221
|
-
else {
|
|
222
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
|
|
223
|
-
}
|
|
224
|
-
this.updateHomeKitCharacteristics();
|
|
225
|
-
}
|
|
226
|
-
catch (e) {
|
|
227
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
228
|
-
+ `failed to handle webhook. Received: ${JSON.stringify(context)} Error: ${e}`);
|
|
229
|
-
}
|
|
230
|
-
};
|
|
231
|
-
}
|
|
127
|
+
this.registerWebhook(accessory, device);
|
|
232
128
|
// Watch for Bulb change events
|
|
233
129
|
// We put in a debounce of 100ms so we don't make duplicate calls
|
|
234
130
|
this.doColorBulbUpdate
|
|
235
131
|
.pipe(tap(() => {
|
|
236
132
|
this.colorBulbUpdateInProgress = true;
|
|
237
|
-
}), debounceTime(this.
|
|
133
|
+
}), debounceTime(this.devicePushRate * 1000))
|
|
238
134
|
.subscribe(async () => {
|
|
239
135
|
try {
|
|
240
136
|
await this.pushChanges();
|
|
241
137
|
}
|
|
242
138
|
catch (e) {
|
|
243
139
|
this.apiError(e);
|
|
244
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with ${this.device.connectionType} Connection,`
|
|
245
|
-
` Error Message: ${JSON.stringify(e.message)}`);
|
|
140
|
+
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with ${this.device.connectionType} Connection,`
|
|
141
|
+
+ ` Error Message: ${JSON.stringify(e.message)}`);
|
|
246
142
|
}
|
|
247
143
|
this.colorBulbUpdateInProgress = false;
|
|
248
144
|
});
|
|
249
145
|
}
|
|
250
146
|
/**
|
|
251
|
-
* Parse the device status from the
|
|
147
|
+
* Parse the device status from the SwitchBotBLE API
|
|
252
148
|
*/
|
|
253
|
-
async
|
|
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() {
|
|
149
|
+
async BLEparseStatus(serviceData) {
|
|
269
150
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
|
|
270
151
|
// State
|
|
271
|
-
switch (
|
|
152
|
+
switch (serviceData.power) {
|
|
272
153
|
case true:
|
|
273
|
-
this.On = true;
|
|
154
|
+
this.LightBulb.On = true;
|
|
274
155
|
break;
|
|
275
156
|
default:
|
|
276
|
-
this.On = false;
|
|
157
|
+
this.LightBulb.On = false;
|
|
277
158
|
}
|
|
278
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
|
|
159
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
|
|
279
160
|
// Brightness
|
|
280
|
-
this.Brightness = Number(
|
|
281
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
|
|
161
|
+
this.LightBulb.Brightness = Number(serviceData.brightness);
|
|
162
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.LightBulb.Brightness}`);
|
|
282
163
|
// Color, Hue & Brightness
|
|
283
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} red: ${
|
|
284
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} green: ${
|
|
285
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} blue: ${
|
|
286
|
-
const [hue, saturation] = rgb2hs(Number(
|
|
287
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
|
|
288
|
-
` hs: ${JSON.stringify(rgb2hs(Number(
|
|
289
|
-
this.BLE_Hue = hue;
|
|
290
|
-
this.BLE_Saturation = saturation;
|
|
164
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} red: ${serviceData.red}`);
|
|
165
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} green: ${serviceData.green}`);
|
|
166
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} blue: ${serviceData.blue}`);
|
|
167
|
+
const [hue, saturation] = rgb2hs(Number(serviceData.red), Number(serviceData.green), Number(serviceData.blue));
|
|
168
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
|
|
169
|
+
+ ` hs: ${JSON.stringify(rgb2hs(Number(serviceData.red), Number(serviceData.green), Number(serviceData.blue)))}`);
|
|
291
170
|
// Hue
|
|
292
|
-
this.Hue =
|
|
293
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
|
|
171
|
+
this.LightBulb.Hue = hue;
|
|
172
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.LightBulb.Hue}`);
|
|
294
173
|
// Saturation
|
|
295
|
-
this.Saturation =
|
|
296
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
|
|
174
|
+
this.LightBulb.Saturation = saturation;
|
|
175
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.LightBulb.Saturation}`);
|
|
297
176
|
// ColorTemperature
|
|
298
|
-
if (
|
|
299
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${
|
|
300
|
-
this.ColorTemperature =
|
|
301
|
-
this.ColorTemperature = Math.max(Math.min(this.ColorTemperature, 500), 140);
|
|
302
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
|
|
177
|
+
if (serviceData.color_temperature) {
|
|
178
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${serviceData.color_temperature}`);
|
|
179
|
+
this.LightBulb.ColorTemperature = serviceData.color_temperature;
|
|
180
|
+
this.LightBulb.ColorTemperature = Math.max(Math.min(this.LightBulb.ColorTemperature, 500), 140);
|
|
181
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.LightBulb.ColorTemperature}`);
|
|
303
182
|
}
|
|
304
183
|
}
|
|
305
|
-
|
|
184
|
+
/**
|
|
185
|
+
* Parse the device status from the SwitchBot OpenAPI
|
|
186
|
+
*/
|
|
187
|
+
async openAPIparseStatus(deviceStatus) {
|
|
306
188
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
|
|
307
|
-
switch (
|
|
189
|
+
switch (deviceStatus.body.power) {
|
|
308
190
|
case 'on':
|
|
309
|
-
this.On = true;
|
|
191
|
+
this.LightBulb.On = true;
|
|
310
192
|
break;
|
|
311
193
|
default:
|
|
312
|
-
this.On = false;
|
|
194
|
+
this.LightBulb.On = false;
|
|
313
195
|
}
|
|
314
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
|
|
196
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
|
|
315
197
|
// Brightness
|
|
316
|
-
this.Brightness = Number(
|
|
317
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
|
|
198
|
+
this.LightBulb.Brightness = Number(deviceStatus.body.brightness);
|
|
199
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.LightBulb.Brightness}`);
|
|
318
200
|
// Color, Hue & Brightness
|
|
319
|
-
if (
|
|
320
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} color: ${JSON.stringify(
|
|
321
|
-
const [red, green, blue] =
|
|
201
|
+
if (deviceStatus.body.color) {
|
|
202
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} color: ${JSON.stringify(deviceStatus.body.color)}`);
|
|
203
|
+
const [red, green, blue] = deviceStatus.body.color.split(':');
|
|
322
204
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} red: ${JSON.stringify(red)}`);
|
|
323
205
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} green: ${JSON.stringify(green)}`);
|
|
324
206
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} blue: ${JSON.stringify(blue)}`);
|
|
325
207
|
const [hue, saturation] = rgb2hs(Number(red), Number(green), Number(blue));
|
|
326
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
|
|
208
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
|
|
209
|
+
+ ` hs: ${JSON.stringify(rgb2hs(Number(red), Number(green), Number(blue)))}`);
|
|
327
210
|
// Hue
|
|
328
|
-
this.Hue = hue;
|
|
329
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
|
|
211
|
+
this.LightBulb.Hue = hue;
|
|
212
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.LightBulb.Hue}`);
|
|
330
213
|
// Saturation
|
|
331
|
-
this.Saturation = saturation;
|
|
332
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
|
|
214
|
+
this.LightBulb.Saturation = saturation;
|
|
215
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.LightBulb.Saturation}`);
|
|
333
216
|
}
|
|
334
217
|
// ColorTemperature
|
|
335
|
-
if (!Number.isNaN(
|
|
336
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${
|
|
337
|
-
const mired = Math.round(1000000 /
|
|
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
|
-
//
|
|
343
|
-
|
|
344
|
-
this.
|
|
218
|
+
if (!Number.isNaN(deviceStatus.body.colorTemperature)) {
|
|
219
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${deviceStatus.body.colorTemperature}`);
|
|
220
|
+
const mired = Math.round(1000000 / deviceStatus.body.colorTemperature);
|
|
221
|
+
this.LightBulb.ColorTemperature = Number(mired);
|
|
222
|
+
this.LightBulb.ColorTemperature = Math.max(Math.min(this.LightBulb.ColorTemperature, 500), 140);
|
|
223
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.LightBulb.ColorTemperature}`);
|
|
224
|
+
}
|
|
225
|
+
// Firmware Version
|
|
226
|
+
const version = deviceStatus.body.version?.toString();
|
|
227
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
|
|
228
|
+
if (deviceStatus.body.version) {
|
|
229
|
+
const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
|
|
230
|
+
this.accessory
|
|
231
|
+
.getService(this.hap.Service.AccessoryInformation)
|
|
232
|
+
.setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
|
|
233
|
+
.setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
|
|
234
|
+
.getCharacteristic(this.hap.Characteristic.FirmwareRevision)
|
|
235
|
+
.updateValue(deviceVersion);
|
|
236
|
+
this.accessory.context.deviceVersion = deviceVersion;
|
|
237
|
+
this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
|
|
238
|
+
}
|
|
345
239
|
}
|
|
346
240
|
/**
|
|
347
241
|
* Asks the SwitchBot API for the latest device information
|
|
@@ -358,8 +252,8 @@ export class ColorBulb {
|
|
|
358
252
|
}
|
|
359
253
|
else {
|
|
360
254
|
await this.offlineOff();
|
|
361
|
-
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
|
|
362
|
-
` ${this.device.connectionType}, refreshStatus will not happen.`);
|
|
255
|
+
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
|
|
256
|
+
+ ` ${this.device.connectionType}, refreshStatus will not happen.`);
|
|
363
257
|
}
|
|
364
258
|
}
|
|
365
259
|
async BLERefreshStatus() {
|
|
@@ -375,113 +269,42 @@ export class ColorBulb {
|
|
|
375
269
|
// Start to monitor advertisement packets
|
|
376
270
|
(async () => {
|
|
377
271
|
// Start to monitor advertisement packets
|
|
378
|
-
await switchbot.startScan({
|
|
379
|
-
model: 'u',
|
|
380
|
-
id: this.device.bleMac,
|
|
381
|
-
});
|
|
272
|
+
await switchbot.startScan({ model: this.device.bleModel, id: this.device.bleMac });
|
|
382
273
|
// Set an event handler
|
|
383
274
|
switchbot.onadvertisement = (ad) => {
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
275
|
+
if (this.device.bleMac === ad.address && ad.model === this.device.bleModel) {
|
|
276
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, ' ')}`);
|
|
277
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.model}`);
|
|
387
278
|
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
279
|
}
|
|
397
280
|
else {
|
|
398
281
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
|
|
399
282
|
}
|
|
400
283
|
};
|
|
401
|
-
// Wait
|
|
284
|
+
// Wait 10 seconds
|
|
402
285
|
await switchbot.wait(this.scanDuration * 1000);
|
|
403
286
|
// Stop to monitor
|
|
404
287
|
await switchbot.stopScan();
|
|
405
288
|
// Update HomeKit
|
|
406
|
-
await this.BLEparseStatus();
|
|
289
|
+
await this.BLEparseStatus(switchbot.onadvertisement.serviceData);
|
|
407
290
|
await this.updateHomeKitCharacteristics();
|
|
408
291
|
})();
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
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
|
-
}*/
|
|
292
|
+
if (switchbot === undefined) {
|
|
293
|
+
await this.BLERefreshConnection(switchbot);
|
|
294
|
+
}
|
|
465
295
|
}
|
|
466
296
|
async openAPIRefreshStatus() {
|
|
467
297
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
|
|
468
298
|
try {
|
|
469
|
-
const { body, statusCode } = await
|
|
470
|
-
headers: this.platform.generateHeaders(),
|
|
471
|
-
});
|
|
299
|
+
const { body, statusCode } = await this.platform.retryRequest(this.deviceMaxRetries, this.deviceDelayBetweenRetries, `${Devices}/${this.device.deviceId}/status`, { headers: this.platform.generateHeaders() });
|
|
472
300
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
|
|
473
301
|
const deviceStatus = await body.json();
|
|
474
302
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
|
|
475
303
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
|
|
476
304
|
if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
|
|
477
|
-
this.
|
|
305
|
+
this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
478
306
|
+ `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
|
|
479
|
-
this.
|
|
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();
|
|
307
|
+
this.openAPIparseStatus(deviceStatus);
|
|
485
308
|
this.updateHomeKitCharacteristics();
|
|
486
309
|
}
|
|
487
310
|
else {
|
|
@@ -491,8 +314,79 @@ export class ColorBulb {
|
|
|
491
314
|
}
|
|
492
315
|
catch (e) {
|
|
493
316
|
this.apiError(e);
|
|
494
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIRefreshStatus with ${this.device.connectionType}`
|
|
495
|
-
` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
317
|
+
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIRefreshStatus with ${this.device.connectionType}`
|
|
318
|
+
+ ` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
319
|
+
}
|
|
320
|
+
}
|
|
321
|
+
async registerWebhook(accessory, device) {
|
|
322
|
+
if (device.webhook) {
|
|
323
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} is listening webhook.`);
|
|
324
|
+
this.platform.webhookEventHandler[device.deviceId] = async (context) => {
|
|
325
|
+
try {
|
|
326
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
|
|
327
|
+
const { powerState, brightness, color, colorTemperature } = context;
|
|
328
|
+
const { On, Brightness, Hue, Saturation, ColorTemperature } = this.LightBulb;
|
|
329
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} ` +
|
|
330
|
+
'(powerState, brightness, color, colorTemperature) = ' +
|
|
331
|
+
`Webhook:(${powerState}, ${brightness}, ${color}, ${colorTemperature}), `
|
|
332
|
+
+ `current:(${On}, ${Brightness}, ${Hue}, ${Saturation}, ${ColorTemperature})`);
|
|
333
|
+
// On
|
|
334
|
+
this.LightBulb.On = powerState === 'ON' ? true : false;
|
|
335
|
+
if (accessory.context.Brightness !== this.LightBulb.On) {
|
|
336
|
+
this.infoLog(`${device.deviceType}: ${accessory.displayName} On: ${this.LightBulb.On}`);
|
|
337
|
+
}
|
|
338
|
+
else {
|
|
339
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} On: ${this.LightBulb.On}`);
|
|
340
|
+
}
|
|
341
|
+
// Brightness
|
|
342
|
+
this.LightBulb.Brightness = brightness;
|
|
343
|
+
if (accessory.context.Brightness !== this.LightBulb.Brightness) {
|
|
344
|
+
this.infoLog(`${device.deviceType}: ${accessory.displayName} Brightness: ${this.LightBulb.Brightness}`);
|
|
345
|
+
}
|
|
346
|
+
else {
|
|
347
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} Brightness: ${this.LightBulb.Brightness}`);
|
|
348
|
+
}
|
|
349
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} color: ${JSON.stringify(color)}`);
|
|
350
|
+
const [red, green, blue] = color.split(':');
|
|
351
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} red: ${JSON.stringify(red)}`);
|
|
352
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} green: ${JSON.stringify(green)}`);
|
|
353
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} blue: ${JSON.stringify(blue)}`);
|
|
354
|
+
const [hue, saturation] = rgb2hs(Number(red), Number(green), Number(blue));
|
|
355
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName}`
|
|
356
|
+
+ ` hs: ${JSON.stringify(rgb2hs(Number(red), Number(green), Number(blue)))}`);
|
|
357
|
+
// Hue
|
|
358
|
+
this.LightBulb.Hue = hue;
|
|
359
|
+
if (accessory.context.Hue !== this.LightBulb.Hue) {
|
|
360
|
+
this.infoLog(`${device.deviceType}: ${accessory.displayName} Hue: ${this.LightBulb.Hue}`);
|
|
361
|
+
}
|
|
362
|
+
else {
|
|
363
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} Hue: ${this.LightBulb.Hue}`);
|
|
364
|
+
}
|
|
365
|
+
// Saturation
|
|
366
|
+
this.LightBulb.Saturation = saturation;
|
|
367
|
+
if (accessory.context.Saturation !== this.LightBulb.Saturation) {
|
|
368
|
+
this.infoLog(`${device.deviceType}: ${accessory.displayName} Saturation: ${this.LightBulb.Saturation}`);
|
|
369
|
+
}
|
|
370
|
+
else {
|
|
371
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} Saturation: ${this.LightBulb.Saturation}`);
|
|
372
|
+
}
|
|
373
|
+
this.LightBulb.ColorTemperature = colorTemperature;
|
|
374
|
+
if (accessory.context.ColorTemperature !== this.LightBulb.ColorTemperature) {
|
|
375
|
+
this.infoLog(`${device.deviceType}: ${accessory.displayName} ColorTemperature: ${this.LightBulb.ColorTemperature}`);
|
|
376
|
+
}
|
|
377
|
+
else {
|
|
378
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} ColorTemperature: ${this.LightBulb.ColorTemperature}`);
|
|
379
|
+
}
|
|
380
|
+
this.updateHomeKitCharacteristics();
|
|
381
|
+
}
|
|
382
|
+
catch (e) {
|
|
383
|
+
this.errorLog(`${device.deviceType}: ${accessory.displayName} `
|
|
384
|
+
+ `failed to handle webhook. Received: ${JSON.stringify(context)} Error: ${e}`);
|
|
385
|
+
}
|
|
386
|
+
};
|
|
387
|
+
}
|
|
388
|
+
else {
|
|
389
|
+
this.debugWarnLog(`${device.deviceType}: ${accessory.displayName} is not listening webhook.`);
|
|
496
390
|
}
|
|
497
391
|
}
|
|
498
392
|
/**
|
|
@@ -509,15 +403,17 @@ export class ColorBulb {
|
|
|
509
403
|
async pushChanges() {
|
|
510
404
|
if (!this.device.enableCloudService && this.OpenAPI) {
|
|
511
405
|
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} pushChanges enableCloudService: ${this.device.enableCloudService}`);
|
|
512
|
-
|
|
513
|
-
|
|
406
|
+
}
|
|
407
|
+
else if (this.BLE) {
|
|
408
|
+
await this.BLEpushChanges();
|
|
514
409
|
}
|
|
515
410
|
else if (this.OpenAPI && this.platform.config.credentials?.token) {
|
|
516
411
|
await this.openAPIpushChanges();
|
|
517
412
|
}
|
|
518
413
|
else {
|
|
519
414
|
await this.offlineOff();
|
|
520
|
-
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
|
|
415
|
+
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
|
|
416
|
+
+ ` ${this.device.connectionType}, pushChanges will not happen.`);
|
|
521
417
|
}
|
|
522
418
|
// Refresh the status from the API
|
|
523
419
|
interval(15000)
|
|
@@ -529,8 +425,9 @@ export class ColorBulb {
|
|
|
529
425
|
}
|
|
530
426
|
async BLEpushChanges() {
|
|
531
427
|
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
|
|
428
|
+
if (this.LightBulb.On !== this.accessory.context.On) {
|
|
429
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges`
|
|
430
|
+
+ ` On: ${this.LightBulb.On}, OnCached: ${this.accessory.context.On}`);
|
|
534
431
|
const switchbot = await this.platform.connectBLE();
|
|
535
432
|
// Convert to BLE Address
|
|
536
433
|
this.device.bleMac = this.device
|
|
@@ -544,11 +441,11 @@ export class ColorBulb {
|
|
|
544
441
|
id: this.device.bleMac,
|
|
545
442
|
})
|
|
546
443
|
.then(async (device_list) => {
|
|
547
|
-
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
|
|
548
|
-
return await this.
|
|
549
|
-
max: this.
|
|
444
|
+
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
|
|
445
|
+
return await this.retryBLE({
|
|
446
|
+
max: await this.maxRetryBLE(),
|
|
550
447
|
fn: async () => {
|
|
551
|
-
if (this.On) {
|
|
448
|
+
if (this.LightBulb.On) {
|
|
552
449
|
return await device_list[0].turnOn({ id: this.device.bleMac });
|
|
553
450
|
}
|
|
554
451
|
else {
|
|
@@ -559,34 +456,37 @@ export class ColorBulb {
|
|
|
559
456
|
})
|
|
560
457
|
.then(() => {
|
|
561
458
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
|
|
562
|
-
this.
|
|
459
|
+
this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
460
|
+
+ `On: ${this.LightBulb.On} sent over BLE, sent successfully`);
|
|
461
|
+
this.LightBulb.On = false;
|
|
563
462
|
})
|
|
564
463
|
.catch(async (e) => {
|
|
565
464
|
this.apiError(e);
|
|
566
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushChanges with ${this.device.connectionType}`
|
|
567
|
-
` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
465
|
+
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushChanges with ${this.device.connectionType}`
|
|
466
|
+
+ ` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
568
467
|
await this.BLEPushConnection();
|
|
569
468
|
});
|
|
570
469
|
// Push Brightness Update
|
|
571
|
-
if (this.On) {
|
|
470
|
+
if (this.LightBulb.On) {
|
|
572
471
|
await this.BLEpushBrightnessChanges();
|
|
573
472
|
}
|
|
574
473
|
// Push ColorTemperature Update
|
|
575
|
-
if (this.On) {
|
|
474
|
+
if (this.LightBulb.On) {
|
|
576
475
|
await this.BLEpushColorTemperatureChanges();
|
|
577
476
|
}
|
|
578
477
|
// Push Hue & Saturation Update
|
|
579
|
-
if (this.On) {
|
|
478
|
+
if (this.LightBulb.On) {
|
|
580
479
|
await this.BLEpushRGBChanges();
|
|
581
480
|
}
|
|
582
481
|
}
|
|
583
482
|
else {
|
|
584
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges
|
|
483
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges, On: ${this.LightBulb.On},`
|
|
484
|
+
+ ` OnCached: ${this.accessory.context.On}`);
|
|
585
485
|
}
|
|
586
486
|
}
|
|
587
487
|
async BLEpushBrightnessChanges() {
|
|
588
488
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushBrightnessChanges`);
|
|
589
|
-
if (this.Brightness !== this.accessory.context.Brightness) {
|
|
489
|
+
if (this.LightBulb.Brightness !== this.accessory.context.Brightness) {
|
|
590
490
|
const switchbot = await this.platform.connectBLE();
|
|
591
491
|
// Convert to BLE Address
|
|
592
492
|
this.device.bleMac = this.device
|
|
@@ -600,29 +500,28 @@ export class ColorBulb {
|
|
|
600
500
|
id: this.device.bleMac,
|
|
601
501
|
})
|
|
602
502
|
.then(async (device_list) => {
|
|
603
|
-
this.infoLog(`${this.accessory.displayName} Target Brightness: ${this.Brightness}`);
|
|
604
|
-
return await device_list[0].setBrightness(this.Brightness);
|
|
503
|
+
this.infoLog(`${this.accessory.displayName} Target Brightness: ${this.LightBulb.Brightness}`);
|
|
504
|
+
return await device_list[0].setBrightness(this.LightBulb.Brightness);
|
|
605
505
|
})
|
|
606
506
|
.then(() => {
|
|
607
507
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
|
|
608
|
-
this.On = false;
|
|
508
|
+
this.LightBulb.On = false;
|
|
609
509
|
})
|
|
610
510
|
.catch(async (e) => {
|
|
611
511
|
this.apiError(e);
|
|
612
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushBrightnessChanges with ${this.device.connectionType}`
|
|
613
|
-
` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
512
|
+
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushBrightnessChanges with ${this.device.connectionType}`
|
|
513
|
+
+ ` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
614
514
|
await this.BLEPushConnection();
|
|
615
515
|
});
|
|
616
516
|
}
|
|
617
517
|
else {
|
|
618
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushBrightnessChanges.`
|
|
619
|
-
`Brightness: ${this.Brightness}, `
|
|
620
|
-
`BrightnessCached: ${this.accessory.context.Brightness}`);
|
|
518
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushBrightnessChanges.`
|
|
519
|
+
+ `Brightness: ${this.LightBulb.Brightness}, BrightnessCached: ${this.accessory.context.Brightness}`);
|
|
621
520
|
}
|
|
622
521
|
}
|
|
623
522
|
async BLEpushColorTemperatureChanges() {
|
|
624
523
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushColorTemperatureChanges`);
|
|
625
|
-
if (this.ColorTemperature !== this.accessory.context.ColorTemperature) {
|
|
524
|
+
if (this.LightBulb.ColorTemperature !== this.accessory.context.ColorTemperature) {
|
|
626
525
|
const switchbot = await this.platform.connectBLE();
|
|
627
526
|
// Convert to BLE Address
|
|
628
527
|
this.device.bleMac = this.device
|
|
@@ -636,31 +535,31 @@ export class ColorBulb {
|
|
|
636
535
|
id: this.device.bleMac,
|
|
637
536
|
})
|
|
638
537
|
.then(async (device_list) => {
|
|
639
|
-
this.infoLog(`${this.accessory.displayName} Target ColorTemperature: ${this.ColorTemperature}`);
|
|
640
|
-
return await device_list[0].setColorTemperature(this.ColorTemperature);
|
|
538
|
+
this.infoLog(`${this.accessory.displayName} Target ColorTemperature: ${this.LightBulb.ColorTemperature}`);
|
|
539
|
+
return await device_list[0].setColorTemperature(this.LightBulb.ColorTemperature);
|
|
641
540
|
})
|
|
642
541
|
.then(() => {
|
|
643
542
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
|
|
644
|
-
this.On = false;
|
|
543
|
+
this.LightBulb.On = false;
|
|
645
544
|
})
|
|
646
545
|
.catch(async (e) => {
|
|
647
546
|
this.apiError(e);
|
|
648
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushColorTemperatureChanges with `
|
|
649
|
-
`${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
547
|
+
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushColorTemperatureChanges with `
|
|
548
|
+
+ `${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
650
549
|
await this.BLEPushConnection();
|
|
651
550
|
});
|
|
652
551
|
}
|
|
653
552
|
else {
|
|
654
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushColorTemperatureChanges.`
|
|
655
|
-
`ColorTemperature: ${this.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`);
|
|
553
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushColorTemperatureChanges.`
|
|
554
|
+
+ `ColorTemperature: ${this.LightBulb.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`);
|
|
656
555
|
}
|
|
657
556
|
}
|
|
658
557
|
async BLEpushRGBChanges() {
|
|
659
558
|
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));
|
|
559
|
+
if (this.LightBulb.Hue !== this.accessory.context.Hue || this.LightBulb.Saturation !== this.accessory.context.Saturation) {
|
|
560
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${JSON.stringify(this.LightBulb.Hue)}`);
|
|
561
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${JSON.stringify(this.LightBulb.Saturation)}`);
|
|
562
|
+
const [red, green, blue] = hs2rgb(Number(this.LightBulb.Hue), Number(this.LightBulb.Saturation));
|
|
664
563
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} rgb: ${JSON.stringify([red, green, blue])}`);
|
|
665
564
|
const switchbot = await this.platform.connectBLE();
|
|
666
565
|
// Convert to BLE Address
|
|
@@ -675,30 +574,30 @@ export class ColorBulb {
|
|
|
675
574
|
id: this.device.bleMac,
|
|
676
575
|
})
|
|
677
576
|
.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);
|
|
577
|
+
this.infoLog(`${this.accessory.displayName} Target RGB: ${(this.LightBulb.Brightness, red, green, blue)}`);
|
|
578
|
+
return await device_list[0].setRGB(this.LightBulb.Brightness, red, green, blue);
|
|
680
579
|
})
|
|
681
580
|
.then(() => {
|
|
682
581
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
|
|
683
|
-
this.On = false;
|
|
582
|
+
this.LightBulb.On = false;
|
|
684
583
|
})
|
|
685
584
|
.catch(async (e) => {
|
|
686
585
|
this.apiError(e);
|
|
687
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushRGBChanges with ${this.device.connectionType}`
|
|
688
|
-
` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
586
|
+
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushRGBChanges with ${this.device.connectionType}`
|
|
587
|
+
+ ` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
689
588
|
await this.BLEPushConnection();
|
|
690
589
|
});
|
|
691
590
|
}
|
|
692
591
|
else {
|
|
693
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushRGBChanges. Hue: ${this.Hue}, `
|
|
694
|
-
|
|
592
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushRGBChanges. Hue: ${this.LightBulb.Hue}, HueCached: `
|
|
593
|
+
+ `${this.accessory.context.Hue}, Saturation: ${this.LightBulb.Saturation}, SaturationCached: ${this.accessory.context.Saturation}`);
|
|
695
594
|
}
|
|
696
595
|
}
|
|
697
596
|
async openAPIpushChanges() {
|
|
698
597
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges`);
|
|
699
|
-
if (this.On !== this.accessory.context.On) {
|
|
598
|
+
if (this.LightBulb.On !== this.accessory.context.On) {
|
|
700
599
|
let command = '';
|
|
701
|
-
if (this.On) {
|
|
600
|
+
if (this.LightBulb.On) {
|
|
702
601
|
command = 'turnOn';
|
|
703
602
|
}
|
|
704
603
|
else {
|
|
@@ -724,6 +623,8 @@ export class ColorBulb {
|
|
|
724
623
|
if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
|
|
725
624
|
this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
726
625
|
+ `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
|
|
626
|
+
this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
627
|
+
+ `request to SwitchBot API, body: ${JSON.stringify(JSON.parse(bodyChange))} sent successfully`);
|
|
727
628
|
}
|
|
728
629
|
else {
|
|
729
630
|
this.statusCode(statusCode);
|
|
@@ -732,34 +633,33 @@ export class ColorBulb {
|
|
|
732
633
|
}
|
|
733
634
|
catch (e) {
|
|
734
635
|
this.apiError(e);
|
|
735
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIpushChanges with ${this.device.connectionType}`
|
|
736
|
-
` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
636
|
+
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIpushChanges with ${this.device.connectionType}`
|
|
637
|
+
+ ` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
737
638
|
}
|
|
738
639
|
}
|
|
739
640
|
else {
|
|
740
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No openAPIpushChanges
|
|
741
|
-
`On: ${this.On}, `
|
|
742
|
-
`OnCached: ${this.accessory.context.On}`);
|
|
641
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No openAPIpushChanges,`
|
|
642
|
+
+ `On: ${this.LightBulb.On}, OnCached: ${this.accessory.context.On}`);
|
|
743
643
|
}
|
|
744
644
|
// Push Hue & Saturation Update
|
|
745
|
-
if (this.On) {
|
|
645
|
+
if (this.LightBulb.On) {
|
|
746
646
|
await this.pushHueSaturationChanges();
|
|
747
647
|
}
|
|
748
648
|
// Push ColorTemperature Update
|
|
749
|
-
if (this.On) {
|
|
649
|
+
if (this.LightBulb.On) {
|
|
750
650
|
await this.pushColorTemperatureChanges();
|
|
751
651
|
}
|
|
752
652
|
// Push Brightness Update
|
|
753
|
-
if (this.On) {
|
|
653
|
+
if (this.LightBulb.On) {
|
|
754
654
|
await this.pushBrightnessChanges();
|
|
755
655
|
}
|
|
756
656
|
}
|
|
757
657
|
async pushHueSaturationChanges() {
|
|
758
658
|
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));
|
|
659
|
+
if (this.LightBulb.Hue !== this.accessory.context.Hue || this.LightBulb.Saturation !== this.accessory.context.Saturation) {
|
|
660
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${JSON.stringify(this.LightBulb.Hue)}`);
|
|
661
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${JSON.stringify(this.LightBulb.Saturation)}`);
|
|
662
|
+
const [red, green, blue] = hs2rgb(Number(this.LightBulb.Hue), Number(this.LightBulb.Saturation));
|
|
763
663
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} rgb: ${JSON.stringify([red, green, blue])}`);
|
|
764
664
|
const bodyChange = JSON.stringify({
|
|
765
665
|
command: 'setColor',
|
|
@@ -781,6 +681,8 @@ export class ColorBulb {
|
|
|
781
681
|
if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
|
|
782
682
|
this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
783
683
|
+ `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
|
|
684
|
+
this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
685
|
+
+ `request to SwitchBot API, body: ${JSON.stringify(JSON.parse(bodyChange))} sent successfully`);
|
|
784
686
|
}
|
|
785
687
|
else {
|
|
786
688
|
this.statusCode(statusCode);
|
|
@@ -789,20 +691,20 @@ export class ColorBulb {
|
|
|
789
691
|
}
|
|
790
692
|
catch (e) {
|
|
791
693
|
this.apiError(e);
|
|
792
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushHueSaturationChanges with ${this.device.connectionType}`
|
|
793
|
-
` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
694
|
+
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushHueSaturationChanges with ${this.device.connectionType}`
|
|
695
|
+
+ ` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
794
696
|
}
|
|
795
697
|
}
|
|
796
698
|
else {
|
|
797
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushHueSaturationChanges. Hue: ${this.Hue}, `
|
|
798
|
-
|
|
699
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushHueSaturationChanges. Hue: ${this.LightBulb.Hue}, HueCached: `
|
|
700
|
+
+ `${this.accessory.context.Hue}, Saturation: ${this.LightBulb.Saturation}, SaturationCached: ${this.accessory.context.Saturation}`);
|
|
799
701
|
}
|
|
800
702
|
}
|
|
801
703
|
async pushColorTemperatureChanges() {
|
|
802
704
|
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.
|
|
705
|
+
if (this.LightBulb.ColorTemperature !== this.accessory.context.ColorTemperature) {
|
|
706
|
+
const kelvin = Math.round(1000000 / Number(this.LightBulb.ColorTemperature));
|
|
707
|
+
this.accessory.context.kelvin = kelvin;
|
|
806
708
|
const bodyChange = JSON.stringify({
|
|
807
709
|
command: 'setColorTemperature',
|
|
808
710
|
parameter: `${kelvin}`,
|
|
@@ -823,6 +725,8 @@ export class ColorBulb {
|
|
|
823
725
|
if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
|
|
824
726
|
this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
825
727
|
+ `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
|
|
728
|
+
this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
729
|
+
+ `request to SwitchBot API, body: ${JSON.stringify(JSON.parse(bodyChange))} sent successfully`);
|
|
826
730
|
}
|
|
827
731
|
else {
|
|
828
732
|
this.statusCode(statusCode);
|
|
@@ -831,21 +735,21 @@ export class ColorBulb {
|
|
|
831
735
|
}
|
|
832
736
|
catch (e) {
|
|
833
737
|
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)}`);
|
|
738
|
+
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushColorTemperatureChanges with ${this.device.connectionType}`
|
|
739
|
+
+ ` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
836
740
|
}
|
|
837
741
|
}
|
|
838
742
|
else {
|
|
839
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushColorTemperatureChanges.`
|
|
840
|
-
`ColorTemperature: ${this.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`);
|
|
743
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushColorTemperatureChanges.`
|
|
744
|
+
+ `ColorTemperature: ${this.LightBulb.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`);
|
|
841
745
|
}
|
|
842
746
|
}
|
|
843
747
|
async pushBrightnessChanges() {
|
|
844
748
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushBrightnessChanges`);
|
|
845
|
-
if (this.Brightness !== this.accessory.context.Brightness) {
|
|
749
|
+
if (this.LightBulb.Brightness !== this.accessory.context.Brightness) {
|
|
846
750
|
const bodyChange = JSON.stringify({
|
|
847
751
|
command: 'setBrightness',
|
|
848
|
-
parameter: `${this.Brightness}`,
|
|
752
|
+
parameter: `${this.LightBulb.Brightness}`,
|
|
849
753
|
commandType: 'command',
|
|
850
754
|
});
|
|
851
755
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
|
|
@@ -863,6 +767,8 @@ export class ColorBulb {
|
|
|
863
767
|
if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
|
|
864
768
|
this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
865
769
|
+ `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
|
|
770
|
+
this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
771
|
+
+ `request to SwitchBot API, body: ${JSON.stringify(JSON.parse(bodyChange))} sent successfully`);
|
|
866
772
|
}
|
|
867
773
|
else {
|
|
868
774
|
this.statusCode(statusCode);
|
|
@@ -871,151 +777,153 @@ export class ColorBulb {
|
|
|
871
777
|
}
|
|
872
778
|
catch (e) {
|
|
873
779
|
this.apiError(e);
|
|
874
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushBrightnessChanges with ${this.device.connectionType}`
|
|
875
|
-
` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
780
|
+
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushBrightnessChanges with ${this.device.connectionType}`
|
|
781
|
+
+ ` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
876
782
|
}
|
|
877
783
|
}
|
|
878
784
|
else {
|
|
879
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushBrightnessChanges.`
|
|
880
|
-
`Brightness: ${this.Brightness}, `
|
|
881
|
-
`BrightnessCached: ${this.accessory.context.Brightness}`);
|
|
785
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushBrightnessChanges.`
|
|
786
|
+
+ `Brightness: ${this.LightBulb.Brightness}, BrightnessCached: ${this.accessory.context.Brightness}`);
|
|
882
787
|
}
|
|
883
788
|
}
|
|
884
789
|
/**
|
|
885
790
|
* Handle requests to set the value of the "On" characteristic
|
|
886
791
|
*/
|
|
887
792
|
async OnSet(value) {
|
|
888
|
-
if (this.On === this.accessory.context.On) {
|
|
793
|
+
if (this.LightBulb.On === this.accessory.context.On) {
|
|
889
794
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set On: ${value}`);
|
|
890
795
|
}
|
|
891
796
|
else {
|
|
892
797
|
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set On: ${value}`);
|
|
893
798
|
}
|
|
894
|
-
this.On = value;
|
|
799
|
+
this.LightBulb.On = value;
|
|
895
800
|
this.doColorBulbUpdate.next();
|
|
896
801
|
}
|
|
897
802
|
/**
|
|
898
803
|
* Handle requests to set the value of the "Brightness" characteristic
|
|
899
804
|
*/
|
|
900
805
|
async BrightnessSet(value) {
|
|
901
|
-
if (this.Brightness === this.accessory.context.Brightness) {
|
|
806
|
+
if (this.LightBulb.Brightness === this.accessory.context.Brightness) {
|
|
902
807
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set Brightness: ${value}`);
|
|
903
808
|
}
|
|
904
|
-
else if (this.On) {
|
|
809
|
+
else if (this.LightBulb.On) {
|
|
905
810
|
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Brightness: ${value}`);
|
|
906
811
|
}
|
|
907
812
|
else {
|
|
908
813
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Brightness: ${value}`);
|
|
909
814
|
}
|
|
910
|
-
this.Brightness = value;
|
|
815
|
+
this.LightBulb.Brightness = value;
|
|
911
816
|
this.doColorBulbUpdate.next();
|
|
912
817
|
}
|
|
913
818
|
/**
|
|
914
819
|
* Handle requests to set the value of the "ColorTemperature" characteristic
|
|
915
820
|
*/
|
|
916
821
|
async ColorTemperatureSet(value) {
|
|
917
|
-
if (this.ColorTemperature === this.accessory.context.ColorTemperature) {
|
|
822
|
+
if (this.LightBulb.ColorTemperature === this.accessory.context.ColorTemperature) {
|
|
918
823
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set ColorTemperature: ${value}`);
|
|
919
824
|
}
|
|
920
|
-
else if (this.On) {
|
|
825
|
+
else if (this.LightBulb.On) {
|
|
921
826
|
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set ColorTemperature: ${value}`);
|
|
922
827
|
}
|
|
923
828
|
else {
|
|
924
829
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set ColorTemperature: ${value}`);
|
|
925
830
|
}
|
|
831
|
+
const minKelvin = 2000;
|
|
832
|
+
const maxKelvin = 9000;
|
|
926
833
|
// Convert mired to kelvin to nearest 100 (SwitchBot seems to need this)
|
|
927
834
|
const kelvin = Math.round(1000000 / Number(value) / 100) * 100;
|
|
928
835
|
// Check and increase/decrease kelvin to range of device
|
|
929
|
-
const k = Math.min(Math.max(kelvin,
|
|
930
|
-
if (!this.accessory.context.On || this.
|
|
836
|
+
const k = Math.min(Math.max(kelvin, minKelvin), maxKelvin);
|
|
837
|
+
if (!this.accessory.context.On || this.accessory.context.kelvin === k) {
|
|
931
838
|
return;
|
|
932
839
|
}
|
|
933
840
|
// Updating the hue/sat to the corresponding values mimics native adaptive lighting
|
|
934
841
|
const hs = m2hs(value);
|
|
935
|
-
this.
|
|
936
|
-
this.
|
|
937
|
-
this.ColorTemperature = value;
|
|
842
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Hue, hs[0]);
|
|
843
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Saturation, hs[1]);
|
|
844
|
+
this.LightBulb.ColorTemperature = value;
|
|
938
845
|
this.doColorBulbUpdate.next();
|
|
939
846
|
}
|
|
940
847
|
/**
|
|
941
848
|
* Handle requests to set the value of the "Hue" characteristic
|
|
942
849
|
*/
|
|
943
850
|
async HueSet(value) {
|
|
944
|
-
if (this.Hue === this.accessory.context.Hue) {
|
|
851
|
+
if (this.LightBulb.Hue === this.accessory.context.Hue) {
|
|
945
852
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set Hue: ${value}`);
|
|
946
853
|
}
|
|
947
|
-
else if (this.On) {
|
|
854
|
+
else if (this.LightBulb.On) {
|
|
948
855
|
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Hue: ${value}`);
|
|
949
856
|
}
|
|
950
857
|
else {
|
|
951
858
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Hue: ${value}`);
|
|
952
859
|
}
|
|
953
|
-
this.
|
|
954
|
-
this.Hue = value;
|
|
860
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.ColorTemperature, 140);
|
|
861
|
+
this.LightBulb.Hue = value;
|
|
955
862
|
this.doColorBulbUpdate.next();
|
|
956
863
|
}
|
|
957
864
|
/**
|
|
958
865
|
* Handle requests to set the value of the "Saturation" characteristic
|
|
959
866
|
*/
|
|
960
867
|
async SaturationSet(value) {
|
|
961
|
-
if (this.Saturation === this.accessory.context.Saturation) {
|
|
868
|
+
if (this.LightBulb.Saturation === this.accessory.context.Saturation) {
|
|
962
869
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set Saturation: ${value}`);
|
|
963
870
|
}
|
|
964
|
-
else if (this.On) {
|
|
871
|
+
else if (this.LightBulb.On) {
|
|
965
872
|
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Saturation: ${value}`);
|
|
966
873
|
}
|
|
967
874
|
else {
|
|
968
875
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Saturation: ${value}`);
|
|
969
876
|
}
|
|
970
|
-
this.
|
|
971
|
-
this.Saturation = value;
|
|
877
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.ColorTemperature, 140);
|
|
878
|
+
this.LightBulb.Saturation = value;
|
|
972
879
|
this.doColorBulbUpdate.next();
|
|
973
880
|
}
|
|
974
881
|
async updateHomeKitCharacteristics() {
|
|
975
882
|
// On
|
|
976
|
-
if (this.On === undefined) {
|
|
977
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
|
|
883
|
+
if (this.LightBulb.On === undefined) {
|
|
884
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
|
|
978
885
|
}
|
|
979
886
|
else {
|
|
980
|
-
this.accessory.context.On = this.On;
|
|
981
|
-
this.
|
|
982
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
|
|
887
|
+
this.accessory.context.On = this.LightBulb.On;
|
|
888
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.On, this.LightBulb.On);
|
|
889
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.LightBulb.On}`);
|
|
983
890
|
}
|
|
984
891
|
// Brightness
|
|
985
|
-
if (this.Brightness === undefined) {
|
|
986
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
|
|
892
|
+
if (this.LightBulb.Brightness === undefined) {
|
|
893
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.LightBulb.Brightness}`);
|
|
987
894
|
}
|
|
988
895
|
else {
|
|
989
|
-
this.accessory.context.Brightness = this.Brightness;
|
|
990
|
-
this.
|
|
991
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Brightness: ${this.Brightness}`);
|
|
896
|
+
this.accessory.context.Brightness = this.LightBulb.Brightness;
|
|
897
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Brightness, this.LightBulb.Brightness);
|
|
898
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Brightness: ${this.LightBulb.Brightness}`);
|
|
992
899
|
}
|
|
993
900
|
// ColorTemperature
|
|
994
|
-
if (this.ColorTemperature === undefined) {
|
|
995
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
|
|
901
|
+
if (this.LightBulb.ColorTemperature === undefined) {
|
|
902
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.LightBulb.ColorTemperature}`);
|
|
996
903
|
}
|
|
997
904
|
else {
|
|
998
|
-
this.accessory.context.ColorTemperature = this.ColorTemperature;
|
|
999
|
-
this.
|
|
1000
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic
|
|
905
|
+
this.accessory.context.ColorTemperature = this.LightBulb.ColorTemperature;
|
|
906
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.ColorTemperature, this.LightBulb.ColorTemperature);
|
|
907
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
|
|
908
|
+
+ ` ColorTemperature: ${this.LightBulb.ColorTemperature}`);
|
|
1001
909
|
}
|
|
1002
910
|
// Hue
|
|
1003
|
-
if (this.Hue === undefined) {
|
|
1004
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
|
|
911
|
+
if (this.LightBulb.Hue === undefined) {
|
|
912
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.LightBulb.Hue}`);
|
|
1005
913
|
}
|
|
1006
914
|
else {
|
|
1007
|
-
this.accessory.context.Hue = this.Hue;
|
|
1008
|
-
this.
|
|
1009
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Hue: ${this.Hue}`);
|
|
915
|
+
this.accessory.context.Hue = this.LightBulb.Hue;
|
|
916
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Hue, this.LightBulb.Hue);
|
|
917
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Hue: ${this.LightBulb.Hue}`);
|
|
1010
918
|
}
|
|
1011
919
|
// Saturation
|
|
1012
|
-
if (this.Saturation === undefined) {
|
|
1013
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
|
|
920
|
+
if (this.LightBulb.Saturation === undefined) {
|
|
921
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.LightBulb.Saturation}`);
|
|
1014
922
|
}
|
|
1015
923
|
else {
|
|
1016
|
-
this.accessory.context.Saturation = this.Saturation;
|
|
1017
|
-
this.
|
|
1018
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Saturation: ${this.Saturation}`);
|
|
924
|
+
this.accessory.context.Saturation = this.LightBulb.Saturation;
|
|
925
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Saturation, this.LightBulb.Saturation);
|
|
926
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Saturation: ${this.LightBulb.Saturation}`);
|
|
1019
927
|
}
|
|
1020
928
|
}
|
|
1021
929
|
async adaptiveLighting(device) {
|
|
@@ -1028,34 +936,6 @@ export class ColorBulb {
|
|
|
1028
936
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
|
|
1029
937
|
}
|
|
1030
938
|
}
|
|
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
939
|
async BLEPushConnection() {
|
|
1060
940
|
if (this.platform.config.credentials?.token && this.device.connectionType === 'BLE/OpenAPI') {
|
|
1061
941
|
this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection to Push Changes`);
|
|
@@ -1070,275 +950,17 @@ export class ColorBulb {
|
|
|
1070
950
|
await this.openAPIRefreshStatus();
|
|
1071
951
|
}
|
|
1072
952
|
}
|
|
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
|
-
minStep(device) {
|
|
1093
|
-
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
|
-
}
|
|
1107
|
-
}
|
|
1108
|
-
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`);
|
|
1184
|
-
}
|
|
1185
|
-
}
|
|
1186
953
|
async offlineOff() {
|
|
1187
954
|
if (this.device.offline) {
|
|
1188
|
-
|
|
1189
|
-
await this.updateHomeKitCharacteristics();
|
|
955
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.On, false);
|
|
1190
956
|
}
|
|
1191
957
|
}
|
|
1192
958
|
apiError(e) {
|
|
1193
|
-
this.
|
|
1194
|
-
this.
|
|
1195
|
-
this.
|
|
1196
|
-
this.
|
|
1197
|
-
this.
|
|
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';
|
|
959
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.On, e);
|
|
960
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Hue, e);
|
|
961
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Brightness, e);
|
|
962
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Saturation, e);
|
|
963
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.ColorTemperature, e);
|
|
1342
964
|
}
|
|
1343
965
|
}
|
|
1344
966
|
//# sourceMappingURL=colorbulb.js.map
|