iobroker.bshb 0.3.0 → 0.4.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/LICENSE +1 -1
- package/README.md +75 -16
- package/admin/jsonConfig.json +24 -6
- package/build/bshb-controller.js +2 -0
- package/build/bshb-controller.js.map +1 -1
- package/build/bshb-definition.js +1 -1
- package/build/controller/handler/bshb-air-purity-guardian-handler.js +2 -2
- package/build/controller/handler/bshb-air-purity-guardian-handler.js.map +1 -1
- package/build/controller/handler/bshb-automation-handler.js +10 -10
- package/build/controller/handler/bshb-automation-handler.js.map +1 -1
- package/build/controller/handler/bshb-backup-handler.js +259 -0
- package/build/controller/handler/bshb-backup-handler.js.map +1 -0
- package/build/controller/handler/bshb-device-handler.js +2 -2
- package/build/controller/handler/bshb-device-handler.js.map +1 -1
- package/build/controller/handler/bshb-device-status-update-handler.js +1 -1
- package/build/controller/handler/bshb-device-status-update-handler.js.map +1 -1
- package/build/controller/handler/bshb-general-update-handler.js +2 -2
- package/build/controller/handler/bshb-general-update-handler.js.map +1 -1
- package/build/controller/handler/bshb-handler.js +4 -4
- package/build/controller/handler/bshb-handler.js.map +1 -1
- package/build/controller/handler/bshb-messages-handler.js +1 -1
- package/build/controller/handler/bshb-messages-handler.js.map +1 -1
- package/build/controller/handler/bshb-open-door-window-handler.js +1 -1
- package/build/controller/handler/bshb-open-door-window-handler.js.map +1 -1
- package/build/controller/handler/bshb-room-handler.js +1 -2
- package/build/controller/handler/bshb-room-handler.js.map +1 -1
- package/build/controller/handler/bshb-scenario-handler.js +3 -3
- package/build/controller/handler/bshb-scenario-handler.js.map +1 -1
- package/build/controller/handler/bshb-user-defined-states-handler.js +3 -3
- package/build/controller/handler/bshb-user-defined-states-handler.js.map +1 -1
- package/build/definition/states.js +19 -0
- package/build/definition/states.js.map +1 -1
- package/build/main.js +27 -25
- package/build/main.js.map +1 -1
- package/build/migration.js +17 -7
- package/build/migration.js.map +1 -1
- package/io-package.json +14 -41
- package/package.json +18 -18
package/LICENSE
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
MIT License
|
|
2
2
|
|
|
3
|
-
Copyright (c)
|
|
3
|
+
Copyright (c) 2025 Christopher Holomek <holomekc.github@gmail.com>
|
|
4
4
|
|
|
5
5
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
6
|
of this software and associated documentation files (the "Software"), to deal
|
package/README.md
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
|
|
2
|
+
|
|
2
3
|
# ioBroker.bshb
|
|
3
4
|
|
|
4
5
|
[](https://www.paypal.com/donate?business=holomekc%40googlemail.com¤cy_code=EUR)
|
|
@@ -18,8 +19,9 @@ This adapter allows to communicate with Bosch Smart Home devices.
|
|
|
18
19
|
|
|
19
20
|
[Bosch Smart Home Controller](https://www.bosch-smarthome.com/de/de/produkte/smart-system-solutions/smart-home-controller)
|
|
20
21
|
|
|
21
|
-
To achieve that it uses the [bosch-smart-home-bridge](https://github.com/holomekc/bosch-smart-home-bridge) library
|
|
22
|
-
which uses the information from
|
|
22
|
+
To achieve that it uses the [bosch-smart-home-bridge](https://github.com/holomekc/bosch-smart-home-bridge) library
|
|
23
|
+
which uses the information from
|
|
24
|
+
official [Bosch Smart Home Controller Local REST API](https://github.com/BoschSmartHome/bosch-shc-api-docs).
|
|
23
25
|
|
|
24
26
|
IoBroker Forum Discussion for the BSHB Adapter:
|
|
25
27
|
https://forum.iobroker.net/topic/25370/test-adapter-bshb-bosch-smart-home-v0-0-x/
|
|
@@ -29,83 +31,116 @@ https://github.com/holomekc/ioBroker.bshb/wiki/Examples
|
|
|
29
31
|
|
|
30
32
|
Work in progress. Feedback appreciated.
|
|
31
33
|
|
|
32
|
-
If you want to support the work I would appreciate a small donation. This is 100% voluntary and not necessary for the
|
|
34
|
+
If you want to support the work I would appreciate a small donation. This is 100% voluntary and not necessary for the
|
|
35
|
+
use of the adapter. You find a link at the top.
|
|
33
36
|
|
|
34
37
|
## Changelog
|
|
35
38
|
|
|
39
|
+
### 0.4.0
|
|
40
|
+
|
|
41
|
+
* (holomekc) Minor bug fixes
|
|
42
|
+
* (holomekc) Support for backups.
|
|
43
|
+
* (holomekc) If you want to use the backup feature make sure that the systempassword is set in the adapter config.
|
|
44
|
+
Furthermore, in the Bosch app set the client permissions to „Operate and manage“. „More“ ➤ „Mobile Devices“ ➤ „OSS
|
|
45
|
+
ioBroker.bshb“
|
|
46
|
+
|
|
36
47
|
### 0.3.0
|
|
48
|
+
|
|
37
49
|
* (holomekc) Support for user automations
|
|
38
50
|
|
|
39
51
|
### 0.2.8
|
|
40
|
-
|
|
52
|
+
|
|
53
|
+
* (holomekc) Improve stability and update dependencies
|
|
41
54
|
|
|
42
55
|
### 0.2.7
|
|
56
|
+
|
|
43
57
|
* (holomekc) Update dependencies and fix rate limiting
|
|
44
58
|
|
|
45
59
|
### 0.2.6
|
|
60
|
+
|
|
46
61
|
* (holomekc) Support for user defined states
|
|
47
62
|
|
|
48
63
|
### 0.2.5
|
|
64
|
+
|
|
49
65
|
* (holomekc) Support for user defined states
|
|
50
66
|
|
|
51
67
|
### 0.2.4
|
|
68
|
+
|
|
52
69
|
* (holomekc) Update the adapter to the latest requirements
|
|
53
70
|
|
|
54
71
|
### 0.2.3
|
|
72
|
+
|
|
55
73
|
* (holomekc) Update to api version 3.2
|
|
56
74
|
* (holomekc) Add support for climate schedules with two options to activate them
|
|
57
75
|
* (holomekc) Update intrusion detection so that more information is shown
|
|
58
76
|
* (holomekc) Update intrusion detection and climate schedule switches stay active now
|
|
59
|
-
* (holomekc) Support for rooms. Configuration to ignore server certificates. Allow ttesting controller 2 and can prevent
|
|
77
|
+
* (holomekc) Support for rooms. Configuration to ignore server certificates. Allow ttesting controller 2 and can prevent
|
|
78
|
+
issues in case certificates expire. Less secure though.
|
|
60
79
|
|
|
61
80
|
### 0.2.1
|
|
81
|
+
|
|
62
82
|
* (holomekc) Support for additional services
|
|
63
83
|
|
|
64
84
|
### 0.1.20
|
|
85
|
+
|
|
65
86
|
* (holomekc) Fixed problems with openDoorsAndWindows
|
|
66
87
|
|
|
67
88
|
### 0.1.19
|
|
89
|
+
|
|
68
90
|
* (holomekc) problems with initial setup fixed
|
|
69
91
|
|
|
70
92
|
### 0.1.18
|
|
93
|
+
|
|
71
94
|
* (holomekc) rateLimit added so that not too many request are executed against controller
|
|
72
95
|
|
|
73
96
|
### 0.1.17
|
|
97
|
+
|
|
74
98
|
* (holomekc) add yale values for door lock
|
|
75
99
|
* (holomekc) update states on startup
|
|
76
100
|
|
|
77
101
|
### 0.1.16
|
|
78
|
-
|
|
102
|
+
|
|
103
|
+
* (holomekc) when scenarioTriggered received the adapter will shortly update the scenario state to true and after 1s
|
|
104
|
+
back to false. This allows to directly listen to triggered scenarios even when not triggered from iobroker.
|
|
79
105
|
Behavior if triggered from iobroker:
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
106
|
+
- state: true, ack: false
|
|
107
|
+
- state: true, ack: true
|
|
108
|
+
- state: false, ack: true
|
|
109
|
+
|
|
84
110
|
Behavior if triggered from somewhere else:
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
* (holomekc) all updates received from controller are send to a new iobroker state "updates". This provides more
|
|
111
|
+
- state: true, ack: true
|
|
112
|
+
- state: false, ack: true
|
|
113
|
+
* (holomekc) all updates received from controller are send to a new iobroker state "updates". This provides more
|
|
114
|
+
flexibility and allow more complex logics. Each update is handled one by one even when a list of multiple update from
|
|
115
|
+
controller received.
|
|
88
116
|
|
|
89
117
|
### 0.1.15
|
|
90
|
-
|
|
118
|
+
|
|
119
|
+
* (holomekc) Restore cache also possible without controller connection to internet. Device services endpoint fails in
|
|
120
|
+
this case. These failures during detection are ignored now with a warning that e.g. detection of new devices is not
|
|
121
|
+
possible in this case. Nevertheless, controlling Bosch devices will still work.
|
|
91
122
|
* (holomekc) Fix tests and add "simple" integration test
|
|
92
123
|
* (holomekc) Update structure of project
|
|
93
124
|
* (holomekc) Code formatting
|
|
94
125
|
|
|
95
126
|
### 0.1.14
|
|
127
|
+
|
|
96
128
|
* (holomekc) RoomControlMode types added.
|
|
97
129
|
* (holomekc) Update for js-controller 3.x.x. This serializes objects and arrays. Please check your logics.
|
|
98
130
|
|
|
99
131
|
### 0.1.13
|
|
132
|
+
|
|
100
133
|
* (holomekc) update to api-version 2.1
|
|
101
134
|
* (holomekc) add intrusionDetectionControl folder which contains trigger for alarm system
|
|
102
135
|
|
|
103
136
|
### 0.1.12
|
|
137
|
+
|
|
104
138
|
* (holomekc) states and units
|
|
105
139
|
* (holomekc) update license and copyright
|
|
106
140
|
* (holomekc) fix typo in connectionType
|
|
107
141
|
|
|
108
142
|
### 0.1.11
|
|
143
|
+
|
|
109
144
|
* (holomekc) update dependencies
|
|
110
145
|
* (holomekc) changes due to new ioBroker lib
|
|
111
146
|
* (holomekc) add connection indicator
|
|
@@ -113,90 +148,114 @@ If you want to support the work I would appreciate a small donation. This is 100
|
|
|
113
148
|
* (holomekc) low not set as lowbat role in ioBroker anymore
|
|
114
149
|
|
|
115
150
|
### 0.1.10
|
|
151
|
+
|
|
116
152
|
* (holomekc) Add .npmignore to cleanup installation files
|
|
117
153
|
|
|
118
154
|
### 0.1.9
|
|
155
|
+
|
|
119
156
|
* (holomekc) Error in scenario handling fixed
|
|
120
157
|
|
|
121
158
|
### 0.1.8
|
|
159
|
+
|
|
122
160
|
* (holomekc) Minor improvements
|
|
123
161
|
|
|
124
162
|
### 0.1.7
|
|
163
|
+
|
|
125
164
|
* (holomekc) Improved error handling
|
|
126
165
|
|
|
127
166
|
### 0.1.6
|
|
167
|
+
|
|
128
168
|
* (holomekc) Added open doors and windows feature
|
|
129
169
|
|
|
130
170
|
### 0.1.5
|
|
131
|
-
|
|
171
|
+
|
|
172
|
+
* (holomekc) functions and rooms are only added for new channels
|
|
132
173
|
* (holomekc) increase timeout for requests which expect to contain more data
|
|
133
174
|
|
|
134
175
|
### 0.1.4
|
|
176
|
+
|
|
135
177
|
* (holomekc) issue fixed in loading configuration
|
|
136
178
|
* (holomekc) minor restructuring
|
|
137
179
|
|
|
138
180
|
### 0.1.3
|
|
181
|
+
|
|
139
182
|
* (holomekc) restructure of handling device detection and updates iobroker <-> bshc via BshbHandler
|
|
140
183
|
* (holomekc) added handler for devices, scenarios and messages
|
|
141
184
|
* (holomekc) messages and scenarios are updated when adapter is running
|
|
142
185
|
|
|
143
186
|
### 0.1.2
|
|
187
|
+
|
|
144
188
|
* (holomekc) Adapter core library updated
|
|
145
189
|
|
|
146
190
|
### 0.1.1
|
|
191
|
+
|
|
147
192
|
* (holomekc) update to new bridge version
|
|
148
193
|
* (holomekc) allows adapter to reconnect in case bshc is restarting
|
|
149
194
|
* (holomekc) remove not needed configuration
|
|
150
195
|
* (holomekc) faults added to all service (channels)
|
|
151
|
-
* (holomekc) faults are always a list: [] = no faults, \[{source: {rootDeviceId: string, deviceServiceId: string,
|
|
196
|
+
* (holomekc) faults are always a list: [] = no faults, \[{source: {rootDeviceId: string, deviceServiceId: string,
|
|
197
|
+
deviceId: string}, type: string, category: INFO | WARNING | ERROR}, ...\] = faults
|
|
152
198
|
|
|
153
199
|
### 0.1.0
|
|
200
|
+
|
|
154
201
|
* (holomekc) certificate and private key are handled in ioBroker and can be content or file reference
|
|
155
202
|
* (holomekc) update to newer bridge version
|
|
156
203
|
|
|
157
204
|
### 0.0.14
|
|
205
|
+
|
|
158
206
|
* (holomekc) optimizations and cleanup
|
|
159
207
|
|
|
160
208
|
### 0.0.13
|
|
209
|
+
|
|
161
210
|
* (holomekc) added more definitions
|
|
162
211
|
* (holomekc) optimizations and cleanup
|
|
163
212
|
|
|
164
213
|
### 0.0.12
|
|
214
|
+
|
|
165
215
|
* (holomekc) scenario support. Scenarios are listed as group 'scenarios' and can only be triggered
|
|
166
216
|
* (holomekc) added definitions for Twinguard
|
|
167
217
|
|
|
168
218
|
### 0.0.11
|
|
219
|
+
|
|
169
220
|
* (holomekc) rooms and functions added for known channels
|
|
170
221
|
* (holomekc) trim whitespaces from configuration values
|
|
171
222
|
|
|
172
223
|
### 0.0.10
|
|
224
|
+
|
|
173
225
|
* (holomekc) try to improve configuration description in application itself
|
|
174
226
|
* (holomekc) change id so that it is valid regarding Bosch T&C
|
|
175
227
|
* (holomekc) update to newest bosch-smart-home-bridge version for same reason
|
|
176
228
|
|
|
177
229
|
### 0.0.9
|
|
230
|
+
|
|
178
231
|
* (holomekc) update travis.yml due to jscontroller requires node dependency >=8.0
|
|
179
232
|
|
|
180
233
|
### 0.0.8
|
|
234
|
+
|
|
181
235
|
* (holomekc) fix client name is: ioBroker.bshb
|
|
182
236
|
|
|
183
237
|
### 0.0.7
|
|
238
|
+
|
|
184
239
|
* (holomekc) make sure that bosch-smart-home-bridge version >= 0.0.4
|
|
185
240
|
|
|
186
241
|
### 0.0.6
|
|
242
|
+
|
|
187
243
|
* (holomekc) Just io-package.json changes
|
|
188
244
|
* (holomekc) cleanup
|
|
189
245
|
|
|
190
246
|
### 0.0.5
|
|
247
|
+
|
|
191
248
|
* (holomekc) Just do the steps adapter-check is telling me
|
|
192
249
|
* (holomekc) Therefore, build files are part of git repo. So install via Github should be possible now
|
|
193
250
|
|
|
194
251
|
### 0.0.4
|
|
252
|
+
|
|
195
253
|
* (holomekc) Long polling added to reduce load
|
|
196
254
|
* (holomekc) Set of state values is possible now
|
|
197
255
|
* (holomekc) Code cleanup
|
|
198
256
|
|
|
199
257
|
### < 0.0.4
|
|
258
|
+
|
|
200
259
|
* (holomekc) certificate generation added
|
|
201
260
|
* (holomekc) first attempts to creat ioBroker objects, states, etc.
|
|
202
261
|
|
package/admin/jsonConfig.json
CHANGED
|
@@ -6,16 +6,22 @@
|
|
|
6
6
|
"type": "text",
|
|
7
7
|
"label": "host",
|
|
8
8
|
"newLine": false,
|
|
9
|
+
"xs": 12,
|
|
9
10
|
"sm": 12,
|
|
10
|
-
"md": 6
|
|
11
|
+
"md": 6,
|
|
12
|
+
"lg": 4,
|
|
13
|
+
"xl": 4
|
|
11
14
|
},
|
|
12
15
|
"identifier": {
|
|
13
16
|
"type": "text",
|
|
14
17
|
"label": "identifier",
|
|
15
18
|
"newLine": false,
|
|
16
19
|
"help": "identifier-detail",
|
|
20
|
+
"xs": 12,
|
|
17
21
|
"sm": 12,
|
|
18
|
-
"md": 6
|
|
22
|
+
"md": 6,
|
|
23
|
+
"lg": 4,
|
|
24
|
+
"xl": 4
|
|
19
25
|
},
|
|
20
26
|
"systemPassword": {
|
|
21
27
|
"type": "password",
|
|
@@ -23,8 +29,11 @@
|
|
|
23
29
|
"newLine": true,
|
|
24
30
|
"help": "systemPassword-detail",
|
|
25
31
|
"visible": true,
|
|
32
|
+
"xs": 12,
|
|
26
33
|
"sm": 12,
|
|
27
|
-
"md": 6
|
|
34
|
+
"md": 6,
|
|
35
|
+
"lg": 4,
|
|
36
|
+
"xl": 4
|
|
28
37
|
},
|
|
29
38
|
"pairingDelay": {
|
|
30
39
|
"type": "number",
|
|
@@ -32,24 +41,33 @@
|
|
|
32
41
|
"newLine": false,
|
|
33
42
|
"help": "pairingDelay-detail",
|
|
34
43
|
"min": 1000,
|
|
44
|
+
"xs": 12,
|
|
35
45
|
"sm": 12,
|
|
36
|
-
"md": 6
|
|
46
|
+
"md": 6,
|
|
47
|
+
"lg": 4,
|
|
48
|
+
"xl": 4
|
|
37
49
|
},
|
|
38
50
|
"rateLimit": {
|
|
39
51
|
"type": "number",
|
|
40
52
|
"label": "rateLimit",
|
|
41
53
|
"newLine": true,
|
|
42
54
|
"min": 0,
|
|
55
|
+
"xs": 12,
|
|
43
56
|
"sm": 12,
|
|
44
|
-
"md": 6
|
|
57
|
+
"md": 6,
|
|
58
|
+
"lg": 4,
|
|
59
|
+
"xl": 4
|
|
45
60
|
},
|
|
46
61
|
"skipServerCertificateCheck": {
|
|
47
62
|
"type": "checkbox",
|
|
48
63
|
"label": "skipServerCertificateCheck",
|
|
49
64
|
"help": "skipServerCertificateCheck-detail",
|
|
50
65
|
"newLine": true,
|
|
66
|
+
"xs": 12,
|
|
51
67
|
"sm": 12,
|
|
52
|
-
"md": 6
|
|
68
|
+
"md": 6,
|
|
69
|
+
"lg": 4,
|
|
70
|
+
"xl": 4
|
|
53
71
|
}
|
|
54
72
|
}
|
|
55
73
|
}
|
package/build/bshb-controller.js
CHANGED
|
@@ -21,6 +21,7 @@ const bshb_climate_handler_1 = require("./controller/handler/bshb-climate-handle
|
|
|
21
21
|
const bshb_user_defined_states_handler_1 = require("./controller/handler/bshb-user-defined-states-handler");
|
|
22
22
|
const rate_limiter_1 = require("./rate-limiter");
|
|
23
23
|
const bshb_automation_handler_1 = require("./controller/handler/bshb-automation-handler");
|
|
24
|
+
const bshb_backup_handler_1 = require("./controller/handler/bshb-backup-handler");
|
|
24
25
|
/**
|
|
25
26
|
* This controller encapsulates bosch-smart-home-bridge and provides it to iobroker.bshb
|
|
26
27
|
*
|
|
@@ -69,6 +70,7 @@ class BshbController {
|
|
|
69
70
|
this.handlers.push(new bshb_device_handler_1.BshbDeviceHandler(this.bshb, this.boschSmartHomeBridge));
|
|
70
71
|
this.handlers.push(new bshb_open_door_window_handler_1.BshbOpenDoorWindowHandler(this.bshb, this.boschSmartHomeBridge));
|
|
71
72
|
this.handlers.push(new bshb_climate_handler_1.BshbClimateHandler(this.bshb, this.boschSmartHomeBridge));
|
|
73
|
+
this.handlers.push(new bshb_backup_handler_1.BshbBackupHandler(this.bshb, this.boschSmartHomeBridge));
|
|
72
74
|
this.$rateLimit.pipe((0, rate_limiter_1.rateLimit)(this.bshb.config.rateLimit, this.bshb), (0, rxjs_1.concatMap)(data => {
|
|
73
75
|
const observables = [];
|
|
74
76
|
for (let i = 0; i < this.handlers.length; i++) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bshb-controller.js","sourceRoot":"","sources":["../src/bshb-controller.ts"],"names":[],"mappings":";;;AAAA,qEAA0F;AAE1F,+CAAyC;AACzC,+BAAqG;AACrG,8CAAiE;AACjE,mCAA8B;AAE9B,sFAA+E;AAC/E,kFAA2E;AAC3E,sFAA+E;AAC/E,sGAA6F;AAC7F,4GAAoG;AACpG,kGAA0F;AAC1F,4GAAmG;AACnG,gGAAwF;AACxF,4FAAoF;AACpF,8EAAuE;AACvE,8GAAqG;AACrG,oFAA6E;AAC7E,4GAAmG;AACnG,iDAAyC;AACzC,0FAAmF;
|
|
1
|
+
{"version":3,"file":"bshb-controller.js","sourceRoot":"","sources":["../src/bshb-controller.ts"],"names":[],"mappings":"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"}
|
package/build/bshb-definition.js
CHANGED
|
@@ -76,8 +76,8 @@ class BshbAirPurityGuardianHandler extends bshb_handler_1.BshbHandler {
|
|
|
76
76
|
const obj = objAndRoom[0];
|
|
77
77
|
const room = objAndRoom[1];
|
|
78
78
|
if (obj && room && obj._bshbCreated) {
|
|
79
|
-
this.addRoomEnum(room.name, 'airPurityGuardian', airPurityGuardian.id
|
|
80
|
-
this.addFunctionEnum(bshb_definition_1.BshbDefinition.determineFunction('airPurityGuardian'), 'airPurityGuardian', airPurityGuardian.id
|
|
79
|
+
this.addRoomEnum(room.name, 'airPurityGuardian', airPurityGuardian.id);
|
|
80
|
+
this.addFunctionEnum(bshb_definition_1.BshbDefinition.determineFunction('airPurityGuardian'), 'airPurityGuardian', airPurityGuardian.id);
|
|
81
81
|
}
|
|
82
82
|
}), (0, rxjs_1.mergeMap)(() => (0, rxjs_1.from)(Object.keys(airPurityGuardian))), (0, rxjs_1.mergeMap)(key => this.importState(key, airPurityGuardian)));
|
|
83
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bshb-air-purity-guardian-handler.js","sourceRoot":"","sources":["../../../src/controller/handler/bshb-air-purity-guardian-handler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"bshb-air-purity-guardian-handler.js","sourceRoot":"","sources":["../../../src/controller/handler/bshb-air-purity-guardian-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,7 @@ class BshbAutomationHandler extends bshb_handler_1.BshbHandler {
|
|
|
34
34
|
this.bshb.log.debug(`Found automation with id=${automationId}, key=${key} and value=${state.val}`);
|
|
35
35
|
if (key === 'trigger') {
|
|
36
36
|
result = this.getBshcClient().triggerAutomation(automationId, { timeout: this.long_timeout })
|
|
37
|
-
.pipe((0, operators_1.delay)(1000), (0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.
|
|
37
|
+
.pipe((0, operators_1.delay)(1000), (0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.setState(id, {
|
|
38
38
|
val: false,
|
|
39
39
|
ack: true
|
|
40
40
|
}))), (0, rxjs_1.tap)(this.handleBshcSendError(`id=${automationId}, value=${state.val}, key=${key}, automationId=${automationId}`)), (0, rxjs_1.map)(() => true));
|
|
@@ -78,7 +78,7 @@ class BshbAutomationHandler extends bshb_handler_1.BshbHandler {
|
|
|
78
78
|
this.bshb.log.debug(`Found automation ${automation.id}, ${automation.name}`);
|
|
79
79
|
const id = 'automations.' + automation.id;
|
|
80
80
|
// we overwrite object here on purpose because we reflect 1-1 the data from controller here.
|
|
81
|
-
return (0, rxjs_1.from)(this.bshb.
|
|
81
|
+
return (0, rxjs_1.from)(this.bshb.setObject(id, {
|
|
82
82
|
type: 'folder',
|
|
83
83
|
common: {
|
|
84
84
|
name: automation.name,
|
|
@@ -91,7 +91,7 @@ class BshbAutomationHandler extends bshb_handler_1.BshbHandler {
|
|
|
91
91
|
id: automation.id,
|
|
92
92
|
name: automation.name
|
|
93
93
|
},
|
|
94
|
-
})).pipe((0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.
|
|
94
|
+
})).pipe((0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.setObject(`${id}.enabled`, {
|
|
95
95
|
type: 'state',
|
|
96
96
|
common: {
|
|
97
97
|
name: 'enabled',
|
|
@@ -104,7 +104,7 @@ class BshbAutomationHandler extends bshb_handler_1.BshbHandler {
|
|
|
104
104
|
id: `${id}.enabled`,
|
|
105
105
|
name: 'enabled'
|
|
106
106
|
},
|
|
107
|
-
}))), (0, rxjs_1.tap)(() => this.bshb.setState(`${id}.enabled`, { val: automation.enabled, ack: true })), (0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.
|
|
107
|
+
}))), (0, rxjs_1.tap)(() => this.bshb.setState(`${id}.enabled`, { val: automation.enabled, ack: true })), (0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.setObject(`${id}.name`, {
|
|
108
108
|
type: 'state',
|
|
109
109
|
common: {
|
|
110
110
|
name: 'name',
|
|
@@ -117,7 +117,7 @@ class BshbAutomationHandler extends bshb_handler_1.BshbHandler {
|
|
|
117
117
|
id: `${id}.name`,
|
|
118
118
|
name: 'name'
|
|
119
119
|
},
|
|
120
|
-
}))), (0, rxjs_1.tap)(() => this.bshb.setState(`${id}.name`, { val: automation.name, ack: true })), (0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.
|
|
120
|
+
}))), (0, rxjs_1.tap)(() => this.bshb.setState(`${id}.name`, { val: automation.name, ack: true })), (0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.setObject(`${id}.trigger`, {
|
|
121
121
|
type: 'state',
|
|
122
122
|
common: {
|
|
123
123
|
name: 'trigger',
|
|
@@ -130,7 +130,7 @@ class BshbAutomationHandler extends bshb_handler_1.BshbHandler {
|
|
|
130
130
|
id: `${id}.trigger`,
|
|
131
131
|
name: 'trigger'
|
|
132
132
|
},
|
|
133
|
-
}))), (0, rxjs_1.tap)(() => this.bshb.setState(`${id}.trigger`, { val: false, ack: true })), (0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.
|
|
133
|
+
}))), (0, rxjs_1.tap)(() => this.bshb.setState(`${id}.trigger`, { val: false, ack: true })), (0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.setObject(`${id}.automationConditions`, {
|
|
134
134
|
type: 'state',
|
|
135
135
|
common: {
|
|
136
136
|
name: 'automationConditions',
|
|
@@ -146,7 +146,7 @@ class BshbAutomationHandler extends bshb_handler_1.BshbHandler {
|
|
|
146
146
|
}))), (0, rxjs_1.tap)(() => this.bshb.setState(`${id}.automationConditions`, {
|
|
147
147
|
val: this.mapValueToStorage(automation.automationConditions),
|
|
148
148
|
ack: true
|
|
149
|
-
})), (0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.
|
|
149
|
+
})), (0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.setObject(`${id}.automationTriggers`, {
|
|
150
150
|
type: 'state',
|
|
151
151
|
common: {
|
|
152
152
|
name: 'automationTriggers',
|
|
@@ -162,7 +162,7 @@ class BshbAutomationHandler extends bshb_handler_1.BshbHandler {
|
|
|
162
162
|
}))), (0, rxjs_1.tap)(() => this.bshb.setState(`${id}.automationTriggers`, {
|
|
163
163
|
val: this.mapValueToStorage(automation.automationTriggers),
|
|
164
164
|
ack: true
|
|
165
|
-
})), (0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.
|
|
165
|
+
})), (0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.setObject(`${id}.automationActions`, {
|
|
166
166
|
type: 'state',
|
|
167
167
|
common: {
|
|
168
168
|
name: 'automationActions',
|
|
@@ -178,7 +178,7 @@ class BshbAutomationHandler extends bshb_handler_1.BshbHandler {
|
|
|
178
178
|
}))), (0, rxjs_1.tap)(() => this.bshb.setState(`${id}.automationActions`, {
|
|
179
179
|
val: this.mapValueToStorage(automation.automationActions),
|
|
180
180
|
ack: true
|
|
181
|
-
})), (0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.
|
|
181
|
+
})), (0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.setObject(`${id}.conditionLogicalOp`, {
|
|
182
182
|
type: 'state',
|
|
183
183
|
common: {
|
|
184
184
|
name: 'conditionLogicalOp',
|
|
@@ -208,7 +208,7 @@ class BshbAutomationHandler extends bshb_handler_1.BshbHandler {
|
|
|
208
208
|
}
|
|
209
209
|
}
|
|
210
210
|
if (!found) {
|
|
211
|
-
return (0, rxjs_1.from)(this.bshb.
|
|
211
|
+
return (0, rxjs_1.from)(this.bshb.delObjectAsync(`automations.${object.native.id}`)).pipe((0, rxjs_1.tap)(() => this.bshb.log.info(`automation with id=${object.native.id} removed because it does not exist anymore.`)), (0, operators_1.catchError)(err => {
|
|
212
212
|
this.bshb.log.error(`Could not delete automation with id=${object.native.id} because: ` + err);
|
|
213
213
|
return (0, rxjs_1.of)(undefined);
|
|
214
214
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bshb-automation-handler.js","sourceRoot":"","sources":["../../../src/controller/handler/bshb-automation-handler.ts"],"names":[],"mappings":";;;AAAA,iDAA2C;AAC3C,+BAA+E;AAC/E,8CAAiD;AAEjD;;;;;GAKG;AACH,MAAa,qBAAsB,SAAQ,0BAAW;IAC1C,eAAe,GAAG,qCAAqC,CAAC;IAEzD,eAAe;QAClB,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,IAAA,UAAG,EAAC;YACrC,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gCAAgC,CAAC;YACrE,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gCAAgC,CAAC;SACvE,CAAC,CAAC,CAAC;IACR,CAAC;IAEM,gBAAgB,CAAC,WAAgB;QACpC,IAAI,WAAW,CAAC,OAAO,CAAC,KAAK,gBAAgB,EAAE,CAAC;YAC5C,IAAI,CAAC,iBAAiB,EAAE,CAAC,SAAS,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,gBAAgB,CAAC,EAAU,EAAE,KAAqB;QACrD,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE5C,IAAI,MAAM,GAAG,IAAA,SAAE,EAAC,KAAK,CAAC,CAAC;QAEvB,IAAI,KAAK,EAAE,CAAC;YACR,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAC9B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAErB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,YAAY,SAAS,GAAG,cAAc,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;YAEnG,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;gBACpB,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,iBAAiB,CAAC,YAAY,EAAE,EAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAC,CAAC;qBACtF,IAAI,CACD,IAAA,iBAAK,EAAC,IAAI,CAAC,EACX,IAAA,gBAAS,EAAC,GAAG,EAAE,CAAC,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"bshb-automation-handler.js","sourceRoot":"","sources":["../../../src/controller/handler/bshb-automation-handler.ts"],"names":[],"mappings":"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"}
|