iobroker.bshb 0.4.0 → 0.4.2
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/README.md +37 -198
- package/build/bshb-controller.js +19 -9
- package/build/bshb-controller.js.map +1 -1
- package/build/bshb-definition.js +1 -1
- package/build/bshb-definition.js.map +1 -1
- package/build/bshb-logger.js.map +1 -1
- package/build/client-cert.js.map +1 -1
- package/build/controller/handler/bshb-air-purity-guardian-handler.js +16 -6
- package/build/controller/handler/bshb-air-purity-guardian-handler.js.map +1 -1
- package/build/controller/handler/bshb-automation-handler.js +43 -33
- package/build/controller/handler/bshb-automation-handler.js.map +1 -1
- package/build/controller/handler/bshb-backup-handler.js +33 -31
- package/build/controller/handler/bshb-backup-handler.js.map +1 -1
- package/build/controller/handler/bshb-climate-handler.js +11 -5
- package/build/controller/handler/bshb-climate-handler.js.map +1 -1
- package/build/controller/handler/bshb-device-handler.js +44 -18
- package/build/controller/handler/bshb-device-handler.js.map +1 -1
- package/build/controller/handler/bshb-device-status-update-handler.js +4 -1
- package/build/controller/handler/bshb-device-status-update-handler.js.map +1 -1
- package/build/controller/handler/bshb-general-update-handler.js +7 -5
- package/build/controller/handler/bshb-general-update-handler.js.map +1 -1
- package/build/controller/handler/bshb-handler.js +21 -11
- package/build/controller/handler/bshb-handler.js.map +1 -1
- package/build/controller/handler/bshb-intrusion-detection-handler.js +21 -7
- package/build/controller/handler/bshb-intrusion-detection-handler.js.map +1 -1
- package/build/controller/handler/bshb-messages-handler.js +4 -1
- package/build/controller/handler/bshb-messages-handler.js.map +1 -1
- package/build/controller/handler/bshb-motion-lights-handler.js +21 -13
- package/build/controller/handler/bshb-motion-lights-handler.js.map +1 -1
- package/build/controller/handler/bshb-open-door-window-handler.js +23 -18
- package/build/controller/handler/bshb-open-door-window-handler.js.map +1 -1
- package/build/controller/handler/bshb-room-handler.js +4 -2
- package/build/controller/handler/bshb-room-handler.js.map +1 -1
- package/build/controller/handler/bshb-scenario-handler.js +13 -10
- package/build/controller/handler/bshb-scenario-handler.js.map +1 -1
- package/build/controller/handler/bshb-user-defined-states-handler.js +14 -9
- package/build/controller/handler/bshb-user-defined-states-handler.js.map +1 -1
- package/build/controller/handler/bshb-water-alarm-handler.js +20 -15
- package/build/controller/handler/bshb-water-alarm-handler.js.map +1 -1
- package/build/definition/function.js.map +1 -1
- package/build/definition/roles.js.map +1 -1
- package/build/definition/states.js +119 -119
- package/build/definition/states.js.map +1 -1
- package/build/definition/units.js.map +1 -1
- package/build/definition/write.js +6 -6
- package/build/definition/write.js.map +1 -1
- package/build/log-level.js.map +1 -1
- package/build/main.js +27 -10
- package/build/main.js.map +1 -1
- package/build/migration.js.map +1 -1
- package/build/rate-limiter.js +5 -3
- package/build/rate-limiter.js.map +1 -1
- package/build/utils.js.map +1 -1
- package/io-package.json +27 -27
- package/package.json +56 -33
package/README.md
CHANGED
|
@@ -36,6 +36,22 @@ use of the adapter. You find a link at the top.
|
|
|
36
36
|
|
|
37
37
|
## Changelog
|
|
38
38
|
|
|
39
|
+
### 0.4.2
|
|
40
|
+
|
|
41
|
+
* (holomekc) #493 undefined object issue
|
|
42
|
+
|
|
43
|
+
It seems that the provided object can be undefined.
|
|
44
|
+
This is a little bit strange to be honest, as the
|
|
45
|
+
api says the callback is non-null, but maybe I
|
|
46
|
+
do not understand it properly. We can safely
|
|
47
|
+
do the check. If _bshbCreated is not set the
|
|
48
|
+
further checks will still pass.
|
|
49
|
+
* Dependencies updated
|
|
50
|
+
|
|
51
|
+
### 0.4.1
|
|
52
|
+
|
|
53
|
+
* Dependencies updated
|
|
54
|
+
|
|
39
55
|
### 0.4.0
|
|
40
56
|
|
|
41
57
|
* (holomekc) Minor bug fixes
|
|
@@ -60,207 +76,30 @@ use of the adapter. You find a link at the top.
|
|
|
60
76
|
|
|
61
77
|
* (holomekc) Support for user defined states
|
|
62
78
|
|
|
63
|
-
###
|
|
64
|
-
|
|
65
|
-
* (holomekc) Support for user defined states
|
|
66
|
-
|
|
67
|
-
### 0.2.4
|
|
68
|
-
|
|
69
|
-
* (holomekc) Update the adapter to the latest requirements
|
|
70
|
-
|
|
71
|
-
### 0.2.3
|
|
72
|
-
|
|
73
|
-
* (holomekc) Update to api version 3.2
|
|
74
|
-
* (holomekc) Add support for climate schedules with two options to activate them
|
|
75
|
-
* (holomekc) Update intrusion detection so that more information is shown
|
|
76
|
-
* (holomekc) Update intrusion detection and climate schedule switches stay active now
|
|
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.
|
|
79
|
-
|
|
80
|
-
### 0.2.1
|
|
81
|
-
|
|
82
|
-
* (holomekc) Support for additional services
|
|
83
|
-
|
|
84
|
-
### 0.1.20
|
|
85
|
-
|
|
86
|
-
* (holomekc) Fixed problems with openDoorsAndWindows
|
|
87
|
-
|
|
88
|
-
### 0.1.19
|
|
89
|
-
|
|
90
|
-
* (holomekc) problems with initial setup fixed
|
|
91
|
-
|
|
92
|
-
### 0.1.18
|
|
93
|
-
|
|
94
|
-
* (holomekc) rateLimit added so that not too many request are executed against controller
|
|
95
|
-
|
|
96
|
-
### 0.1.17
|
|
97
|
-
|
|
98
|
-
* (holomekc) add yale values for door lock
|
|
99
|
-
* (holomekc) update states on startup
|
|
100
|
-
|
|
101
|
-
### 0.1.16
|
|
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.
|
|
105
|
-
Behavior if triggered from iobroker:
|
|
106
|
-
- state: true, ack: false
|
|
107
|
-
- state: true, ack: true
|
|
108
|
-
- state: false, ack: true
|
|
109
|
-
|
|
110
|
-
Behavior if triggered from somewhere else:
|
|
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.
|
|
116
|
-
|
|
117
|
-
### 0.1.15
|
|
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.
|
|
122
|
-
* (holomekc) Fix tests and add "simple" integration test
|
|
123
|
-
* (holomekc) Update structure of project
|
|
124
|
-
* (holomekc) Code formatting
|
|
125
|
-
|
|
126
|
-
### 0.1.14
|
|
127
|
-
|
|
128
|
-
* (holomekc) RoomControlMode types added.
|
|
129
|
-
* (holomekc) Update for js-controller 3.x.x. This serializes objects and arrays. Please check your logics.
|
|
130
|
-
|
|
131
|
-
### 0.1.13
|
|
132
|
-
|
|
133
|
-
* (holomekc) update to api-version 2.1
|
|
134
|
-
* (holomekc) add intrusionDetectionControl folder which contains trigger for alarm system
|
|
135
|
-
|
|
136
|
-
### 0.1.12
|
|
137
|
-
|
|
138
|
-
* (holomekc) states and units
|
|
139
|
-
* (holomekc) update license and copyright
|
|
140
|
-
* (holomekc) fix typo in connectionType
|
|
141
|
-
|
|
142
|
-
### 0.1.11
|
|
143
|
-
|
|
144
|
-
* (holomekc) update dependencies
|
|
145
|
-
* (holomekc) changes due to new ioBroker lib
|
|
146
|
-
* (holomekc) add connection indicator
|
|
147
|
-
* (holomekc) increase delay for timeout for longpolling to 2s
|
|
148
|
-
* (holomekc) low not set as lowbat role in ioBroker anymore
|
|
149
|
-
|
|
150
|
-
### 0.1.10
|
|
151
|
-
|
|
152
|
-
* (holomekc) Add .npmignore to cleanup installation files
|
|
153
|
-
|
|
154
|
-
### 0.1.9
|
|
155
|
-
|
|
156
|
-
* (holomekc) Error in scenario handling fixed
|
|
157
|
-
|
|
158
|
-
### 0.1.8
|
|
159
|
-
|
|
160
|
-
* (holomekc) Minor improvements
|
|
161
|
-
|
|
162
|
-
### 0.1.7
|
|
163
|
-
|
|
164
|
-
* (holomekc) Improved error handling
|
|
165
|
-
|
|
166
|
-
### 0.1.6
|
|
167
|
-
|
|
168
|
-
* (holomekc) Added open doors and windows feature
|
|
169
|
-
|
|
170
|
-
### 0.1.5
|
|
171
|
-
|
|
172
|
-
* (holomekc) functions and rooms are only added for new channels
|
|
173
|
-
* (holomekc) increase timeout for requests which expect to contain more data
|
|
174
|
-
|
|
175
|
-
### 0.1.4
|
|
176
|
-
|
|
177
|
-
* (holomekc) issue fixed in loading configuration
|
|
178
|
-
* (holomekc) minor restructuring
|
|
179
|
-
|
|
180
|
-
### 0.1.3
|
|
181
|
-
|
|
182
|
-
* (holomekc) restructure of handling device detection and updates iobroker <-> bshc via BshbHandler
|
|
183
|
-
* (holomekc) added handler for devices, scenarios and messages
|
|
184
|
-
* (holomekc) messages and scenarios are updated when adapter is running
|
|
185
|
-
|
|
186
|
-
### 0.1.2
|
|
187
|
-
|
|
188
|
-
* (holomekc) Adapter core library updated
|
|
189
|
-
|
|
190
|
-
### 0.1.1
|
|
191
|
-
|
|
192
|
-
* (holomekc) update to new bridge version
|
|
193
|
-
* (holomekc) allows adapter to reconnect in case bshc is restarting
|
|
194
|
-
* (holomekc) remove not needed configuration
|
|
195
|
-
* (holomekc) faults added to all service (channels)
|
|
196
|
-
* (holomekc) faults are always a list: [] = no faults, \[{source: {rootDeviceId: string, deviceServiceId: string,
|
|
197
|
-
deviceId: string}, type: string, category: INFO | WARNING | ERROR}, ...\] = faults
|
|
198
|
-
|
|
199
|
-
### 0.1.0
|
|
200
|
-
|
|
201
|
-
* (holomekc) certificate and private key are handled in ioBroker and can be content or file reference
|
|
202
|
-
* (holomekc) update to newer bridge version
|
|
203
|
-
|
|
204
|
-
### 0.0.14
|
|
205
|
-
|
|
206
|
-
* (holomekc) optimizations and cleanup
|
|
207
|
-
|
|
208
|
-
### 0.0.13
|
|
209
|
-
|
|
210
|
-
* (holomekc) added more definitions
|
|
211
|
-
* (holomekc) optimizations and cleanup
|
|
212
|
-
|
|
213
|
-
### 0.0.12
|
|
214
|
-
|
|
215
|
-
* (holomekc) scenario support. Scenarios are listed as group 'scenarios' and can only be triggered
|
|
216
|
-
* (holomekc) added definitions for Twinguard
|
|
217
|
-
|
|
218
|
-
### 0.0.11
|
|
219
|
-
|
|
220
|
-
* (holomekc) rooms and functions added for known channels
|
|
221
|
-
* (holomekc) trim whitespaces from configuration values
|
|
222
|
-
|
|
223
|
-
### 0.0.10
|
|
224
|
-
|
|
225
|
-
* (holomekc) try to improve configuration description in application itself
|
|
226
|
-
* (holomekc) change id so that it is valid regarding Bosch T&C
|
|
227
|
-
* (holomekc) update to newest bosch-smart-home-bridge version for same reason
|
|
228
|
-
|
|
229
|
-
### 0.0.9
|
|
230
|
-
|
|
231
|
-
* (holomekc) update travis.yml due to jscontroller requires node dependency >=8.0
|
|
232
|
-
|
|
233
|
-
### 0.0.8
|
|
234
|
-
|
|
235
|
-
* (holomekc) fix client name is: ioBroker.bshb
|
|
236
|
-
|
|
237
|
-
### 0.0.7
|
|
238
|
-
|
|
239
|
-
* (holomekc) make sure that bosch-smart-home-bridge version >= 0.0.4
|
|
240
|
-
|
|
241
|
-
### 0.0.6
|
|
242
|
-
|
|
243
|
-
* (holomekc) Just io-package.json changes
|
|
244
|
-
* (holomekc) cleanup
|
|
245
|
-
|
|
246
|
-
### 0.0.5
|
|
247
|
-
|
|
248
|
-
* (holomekc) Just do the steps adapter-check is telling me
|
|
249
|
-
* (holomekc) Therefore, build files are part of git repo. So install via Github should be possible now
|
|
250
|
-
|
|
251
|
-
### 0.0.4
|
|
252
|
-
|
|
253
|
-
* (holomekc) Long polling added to reduce load
|
|
254
|
-
* (holomekc) Set of state values is possible now
|
|
255
|
-
* (holomekc) Code cleanup
|
|
256
|
-
|
|
257
|
-
### < 0.0.4
|
|
79
|
+
### Older entries
|
|
258
80
|
|
|
259
|
-
|
|
260
|
-
* (holomekc) first attempts to creat ioBroker objects, states, etc.
|
|
81
|
+
[here](CHANGELOG_OLD.md)
|
|
261
82
|
|
|
262
83
|
## License
|
|
263
84
|
|
|
264
85
|
The MIT License (MIT)
|
|
265
86
|
|
|
266
|
-
Copyright (c)
|
|
87
|
+
Copyright (c) 2025 Christopher Holomek <holomekc.github@gmail.com>
|
|
88
|
+
|
|
89
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
90
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
91
|
+
in the Software without restriction, including without limitation the rights
|
|
92
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
93
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
94
|
+
furnished to do so, subject to the following conditions:
|
|
95
|
+
|
|
96
|
+
The above copyright notice and this permission notice shall be included in
|
|
97
|
+
all copies or substantial portions of the Software.
|
|
98
|
+
|
|
99
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
100
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
101
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
102
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
103
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
104
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
105
|
+
THE SOFTWARE.
|
package/build/bshb-controller.js
CHANGED
|
@@ -71,7 +71,8 @@ class BshbController {
|
|
|
71
71
|
this.handlers.push(new bshb_open_door_window_handler_1.BshbOpenDoorWindowHandler(this.bshb, this.boschSmartHomeBridge));
|
|
72
72
|
this.handlers.push(new bshb_climate_handler_1.BshbClimateHandler(this.bshb, this.boschSmartHomeBridge));
|
|
73
73
|
this.handlers.push(new bshb_backup_handler_1.BshbBackupHandler(this.bshb, this.boschSmartHomeBridge));
|
|
74
|
-
this.$rateLimit
|
|
74
|
+
this.$rateLimit
|
|
75
|
+
.pipe((0, rate_limiter_1.rateLimit)(this.bshb.config.rateLimit, this.bshb), (0, rxjs_1.concatMap)(data => {
|
|
75
76
|
const observables = [];
|
|
76
77
|
for (let i = 0; i < this.handlers.length; i++) {
|
|
77
78
|
observables.push(this.handlers[i].sendUpdateToBshc(data.id, data.state).pipe(
|
|
@@ -86,7 +87,8 @@ class BshbController {
|
|
|
86
87
|
})));
|
|
87
88
|
}
|
|
88
89
|
return (0, rxjs_1.merge)(...observables);
|
|
89
|
-
}), (0, operators_1.takeUntil)(this.alive))
|
|
90
|
+
}), (0, operators_1.takeUntil)(this.alive))
|
|
91
|
+
.subscribe();
|
|
90
92
|
}
|
|
91
93
|
catch (e) {
|
|
92
94
|
if (e instanceof Error) {
|
|
@@ -119,23 +121,31 @@ class BshbController {
|
|
|
119
121
|
// takeUntil must be last in pipe to prevent issues.
|
|
120
122
|
return new rxjs_1.Observable(subscriber => {
|
|
121
123
|
const retry = new rxjs_1.BehaviorSubject(true);
|
|
122
|
-
retry
|
|
123
|
-
|
|
124
|
+
retry
|
|
125
|
+
.pipe((0, operators_1.catchError)(err => err.pipe((0, operators_1.delay)(pairingDelay))), (0, operators_1.tap)(() => {
|
|
126
|
+
this.boschSmartHomeBridge
|
|
127
|
+
.pairIfNeeded(this.clientName, this.bshb.config.identifier, systemPassword, pairingDelay, -1)
|
|
128
|
+
.pipe((0, operators_1.takeUntil)(this.bshb.alive))
|
|
129
|
+
.subscribe({
|
|
124
130
|
next: response => {
|
|
125
131
|
// Everything is ok. We can stop all.
|
|
126
132
|
this.bshb.log.info('Ok with pairing');
|
|
127
133
|
subscriber.next(response);
|
|
128
134
|
subscriber.complete();
|
|
129
135
|
retry.complete();
|
|
130
|
-
},
|
|
136
|
+
},
|
|
137
|
+
error: err => {
|
|
131
138
|
this.bshb.log.error(err);
|
|
132
139
|
// Something went wrong. Already logged by lib. We just wait and retry.
|
|
133
|
-
(0, rxjs_1.timer)(pairingDelay)
|
|
140
|
+
(0, rxjs_1.timer)(pairingDelay)
|
|
141
|
+
.pipe((0, operators_1.takeUntil)(this.bshb.alive))
|
|
142
|
+
.subscribe(() => {
|
|
134
143
|
retry.next(true);
|
|
135
144
|
});
|
|
136
|
-
}
|
|
145
|
+
},
|
|
137
146
|
});
|
|
138
|
-
}), (0, operators_1.takeUntil)(this.bshb.alive))
|
|
147
|
+
}), (0, operators_1.takeUntil)(this.bshb.alive))
|
|
148
|
+
.subscribe(() => {
|
|
139
149
|
// We do not care
|
|
140
150
|
});
|
|
141
151
|
});
|
|
@@ -168,7 +178,7 @@ class BshbController {
|
|
|
168
178
|
*/
|
|
169
179
|
setStateAck(resultEntry) {
|
|
170
180
|
for (let i = 0; i < this.handlers.length; i++) {
|
|
171
|
-
|
|
181
|
+
const handled = this.handlers[i].handleBshcUpdate(resultEntry);
|
|
172
182
|
if (handled) {
|
|
173
183
|
this.bshb.log.silly(`Handler "${this.handlers[i].constructor.name}" handled update form controller with result entry: ${JSON.stringify(resultEntry)} `);
|
|
174
184
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bshb-controller.js","sourceRoot":"","sources":["../src/bshb-controller.ts"],"names":[],"mappings":";;;AAAA,
|
|
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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bshb-definition.js","sourceRoot":"","sources":["../src/bshb-definition.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,
|
|
1
|
+
{"version":3,"file":"bshb-definition.js","sourceRoot":"","sources":["../src/bshb-definition.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,8CAA2C;AAC3C,oDAAkD;AAClD,8CAA2C;AAC3C,gDAA6C;AAC7C,8CAA2C;AAE3C,MAAa,cAAc;IAClB,MAAM,CAAC,iBAAiB,CAAC,KAAa;QAC3C,MAAM,IAAI,GAAG,oBAAS,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,WAAW,EAAE,CAAC;YACjD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,SAA8B,CAAC;IACxC,CAAC;IAED;;;;;;;OAOG;IACI,MAAM,CAAC,cAAc,CAAC,IAAY,EAAE,GAAW;QACpD,MAAM,SAAS,GAAG,aAAK,CAAC,IAAI,CAAC,CAAC;QAE9B,IAAI,SAAS,KAAK,IAAI,IAAI,OAAO,SAAS,KAAK,WAAW,EAAE,CAAC;YAC3D,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;YAE7B,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE,CAAC;gBACnD,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,aAAa,CAAC,KAAU;QACpC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,OAAO,OAAO,KAAuE,CAAC;IACxF,CAAC;IAED;;;;;;;;OAQG;IACI,MAAM,CAAC,aAAa,CAAC,IAAY,EAAE,GAAW,EAAE,KAAU;QAC/D,2DAA2D;QAC3D,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;YACrB,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,QAAQ,GAAG,aAAK,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,QAAQ,KAAK,IAAI,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;YACzD,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;YAE3B,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,WAAW,EAAE,CAAC;gBACjD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAEM,MAAM,CAAC,aAAa,CAAC,IAAY,EAAE,GAAW;QACnD,MAAM,QAAQ,GAAG,aAAK,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,QAAQ,KAAK,IAAI,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,CAAC;YACzD,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;YAE3B,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,WAAW,EAAE,CAAC;gBACjD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,IAAS,EAAE,GAAW;QAC3C,MAAM,SAAS,GAAG,eAAM,CAAC,IAAI,CAAC,CAAC;QAE/B,IAAI,SAAS,KAAK,IAAI,IAAI,OAAO,SAAS,KAAK,WAAW,EAAE,CAAC;YAC3D,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;YAE7B,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE,CAAC;gBACnD,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAtGD,wCAsGC"}
|
package/build/bshb-logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bshb-logger.js","sourceRoot":"","sources":["../src/bshb-logger.ts"],"names":[],"mappings":";;;AAGA;;;;;GAKG;AACH,MAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"bshb-logger.js","sourceRoot":"","sources":["../src/bshb-logger.ts"],"names":[],"mappings":";;;AAGA;;;;;GAKG;AACH,MAAa,UAAU;IACD;IAApB,YAAoB,OAAa;QAAb,YAAO,GAAP,OAAO,CAAM;IAAG,CAAC;IAErC,IAAI,CAAC,OAAa,EAAE,GAAG,cAAqB;QAC1C,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,OAAa,EAAE,GAAG,cAAqB;QAC3C,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,CAAC,OAAa,EAAE,GAAG,cAAqB;QAC1C,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,OAAa,EAAE,GAAG,cAAqB;QAC3C,+GAA+G;QAC/G,wDAAwD;QACxD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,CAAC,OAAa,EAAE,GAAG,cAAqB;QAC1C,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC5C,CAAC;IAEO,GAAG,CAAC,OAAsD,EAAE,OAAa,EAAE,GAAG,cAAqB;QACzG,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACjC,IAAI,aAAa,GAAG,OAAO,CAAC;gBAC5B,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBAC7B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;wBAC9B,aAAa,IAAI,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjD,CAAC;yBAAM,CAAC;wBACN,aAAa,IAAI,KAAK,GAAG,KAAK,CAAC;oBACjC,CAAC;gBACH,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC;YAC3C,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;YACrC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACjC,IAAI,aAAa,GAAG,EAAE,CAAC;gBACvB,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBAC7B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;wBAC9B,aAAa,IAAI,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjD,CAAC;yBAAM,CAAC;wBACN,aAAa,IAAI,KAAK,GAAG,KAAK,CAAC;oBACjC,CAAC;gBACH,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC;YAC3C,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;YAChC,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAxDD,gCAwDC"}
|
package/build/client-cert.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-cert.js","sourceRoot":"","sources":["../src/client-cert.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,MAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"client-cert.js","sourceRoot":"","sources":["../src/client-cert.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,MAAa,UAAU;IACJ,YAAY,CAAS;IACrB,WAAW,CAAS;IAErC,YAAY,WAAmB,EAAE,UAAkB;QACjD,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAChC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAChC,CAAC;IAED;;OAEG;IACH,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;CACF;AAtBD,gCAsBC"}
|
|
@@ -20,7 +20,8 @@ class BshbAirPurityGuardianHandler extends bshb_handler_1.BshbHandler {
|
|
|
20
20
|
const idPrefix = `airPurityGuardian.${resultEntry.id}`;
|
|
21
21
|
Object.keys(resultEntry).forEach(key => {
|
|
22
22
|
const id = `${idPrefix}.${key}`;
|
|
23
|
-
(0, rxjs_1.from)(this.bshb.getObjectAsync(id))
|
|
23
|
+
(0, rxjs_1.from)(this.bshb.getObjectAsync(id))
|
|
24
|
+
.pipe((0, rxjs_1.switchMap)(obj => {
|
|
24
25
|
if (obj) {
|
|
25
26
|
this.bshb.setState(id, {
|
|
26
27
|
val: this.mapValueToStorage(resultEntry[key]),
|
|
@@ -31,7 +32,8 @@ class BshbAirPurityGuardianHandler extends bshb_handler_1.BshbHandler {
|
|
|
31
32
|
else {
|
|
32
33
|
return this.importState(key, resultEntry);
|
|
33
34
|
}
|
|
34
|
-
}))
|
|
35
|
+
}))
|
|
36
|
+
.subscribe(this.handleBshcUpdateError(`id=${resultEntry.id}`));
|
|
35
37
|
});
|
|
36
38
|
return true;
|
|
37
39
|
}
|
|
@@ -39,11 +41,15 @@ class BshbAirPurityGuardianHandler extends bshb_handler_1.BshbHandler {
|
|
|
39
41
|
}
|
|
40
42
|
sendUpdateToBshc(id, state) {
|
|
41
43
|
const match = this.regex.exec(id);
|
|
42
|
-
|
|
44
|
+
const result = (0, rxjs_1.of)(false);
|
|
43
45
|
if (match) {
|
|
44
46
|
const cachedState = this.cachedStates.get(id);
|
|
45
47
|
const data = {};
|
|
46
|
-
return this.mapValueFromStorage(id, state.val)
|
|
48
|
+
return this.mapValueFromStorage(id, state.val)
|
|
49
|
+
.pipe((0, rxjs_1.map)(mappedValue => (data[cachedState.key] = mappedValue)), (0, rxjs_1.switchMap)(() => this.getBshcClient().updateAirPurityGuardian(cachedState.id, data, {
|
|
50
|
+
timeout: this.long_timeout,
|
|
51
|
+
})))
|
|
52
|
+
.pipe((0, rxjs_1.tap)(this.handleBshcSendError(`id=${match[1]}, value=${state.val}`)), (0, rxjs_1.map)(() => true));
|
|
47
53
|
}
|
|
48
54
|
return result;
|
|
49
55
|
}
|
|
@@ -55,13 +61,17 @@ class BshbAirPurityGuardianHandler extends bshb_handler_1.BshbHandler {
|
|
|
55
61
|
read: true,
|
|
56
62
|
},
|
|
57
63
|
native: {},
|
|
58
|
-
}).pipe((0, rxjs_1.switchMap)(() => this.getBshcClient().getAirPurityGuardian({
|
|
64
|
+
}).pipe((0, rxjs_1.switchMap)(() => this.getBshcClient().getAirPurityGuardian({
|
|
65
|
+
timeout: this.long_timeout,
|
|
66
|
+
})), (0, rxjs_1.mergeMap)(response => (0, rxjs_1.from)(response.parsedResponse)), (0, rxjs_1.mergeMap)(airPurityGuardian => this.addAirPurityGuardian(airPurityGuardian)), (0, rxjs_1.switchMap)(() => (0, rxjs_1.of)(undefined)));
|
|
59
67
|
}
|
|
60
68
|
addAirPurityGuardian(airPurityGuardian) {
|
|
61
69
|
const match = this.roomRegex.exec(airPurityGuardian.id);
|
|
62
70
|
let roomAndFunctions;
|
|
63
71
|
if (match) {
|
|
64
|
-
roomAndFunctions = this.getBshcClient()
|
|
72
|
+
roomAndFunctions = this.getBshcClient()
|
|
73
|
+
.getRoom(match ? match[1] : match[1])
|
|
74
|
+
.pipe((0, rxjs_1.map)(response => response.parsedResponse), (0, operators_1.catchError)(() => (0, rxjs_1.of)(undefined)));
|
|
65
75
|
}
|
|
66
76
|
else {
|
|
67
77
|
roomAndFunctions = (0, rxjs_1.throwError)(() => new Error('No room could be extracted from airPurityGuardian.'));
|
|
@@ -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":";;;AAAA,
|
|
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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"}
|