iobroker.bshb 0.5.0 → 0.5.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 +8 -8
- package/build/bshb-controller.js +7 -8
- package/build/bshb-controller.js.map +1 -1
- package/build/controller/handler/bshb-air-purity-guardian-handler.js +1 -2
- package/build/controller/handler/bshb-air-purity-guardian-handler.js.map +1 -1
- package/build/controller/handler/bshb-automation-handler.js +2 -3
- package/build/controller/handler/bshb-automation-handler.js.map +1 -1
- package/build/controller/handler/bshb-device-handler.js +35 -36
- package/build/controller/handler/bshb-device-handler.js.map +1 -1
- package/build/controller/handler/bshb-device-status-update-handler.js +1 -2
- package/build/controller/handler/bshb-device-status-update-handler.js.map +1 -1
- package/build/controller/handler/bshb-handler.js +2 -3
- package/build/controller/handler/bshb-handler.js.map +1 -1
- package/build/controller/handler/bshb-messages-handler.js +2 -3
- package/build/controller/handler/bshb-messages-handler.js.map +1 -1
- package/build/controller/handler/bshb-open-door-window-handler.js +7 -8
- package/build/controller/handler/bshb-open-door-window-handler.js.map +1 -1
- package/build/controller/handler/bshb-room-handler.js +4 -5
- package/build/controller/handler/bshb-room-handler.js.map +1 -1
- package/build/controller/handler/bshb-scenario-handler.js +2 -3
- package/build/controller/handler/bshb-scenario-handler.js.map +1 -1
- package/build/controller/handler/bshb-user-defined-states-handler.js +1 -2
- package/build/controller/handler/bshb-user-defined-states-handler.js.map +1 -1
- package/build/main.js +5 -6
- package/build/main.js.map +1 -1
- package/build/rate-limiter.js +3 -4
- package/build/rate-limiter.js.map +1 -1
- package/io-package.json +28 -28
- package/package.json +28 -28
package/README.md
CHANGED
|
@@ -36,6 +36,14 @@ use of the adapter. You find a link at the top.
|
|
|
36
36
|
|
|
37
37
|
## Changelog
|
|
38
38
|
|
|
39
|
+
### 0.5.2
|
|
40
|
+
|
|
41
|
+
* Dependencies updated
|
|
42
|
+
|
|
43
|
+
### 0.5.1
|
|
44
|
+
|
|
45
|
+
* Dependencies updated
|
|
46
|
+
|
|
39
47
|
### 0.5.0
|
|
40
48
|
|
|
41
49
|
* (holomekc) Minor cleanup
|
|
@@ -61,14 +69,6 @@ use of the adapter. You find a link at the top.
|
|
|
61
69
|
|
|
62
70
|
* (holomekc) Support for user automations
|
|
63
71
|
|
|
64
|
-
### 0.2.8
|
|
65
|
-
|
|
66
|
-
* (holomekc) Improve stability and update dependencies
|
|
67
|
-
|
|
68
|
-
### 0.2.7
|
|
69
|
-
|
|
70
|
-
* (holomekc) Update dependencies and fix rate limiting
|
|
71
|
-
|
|
72
72
|
### Older entries
|
|
73
73
|
|
|
74
74
|
[here](CHANGELOG_OLD.md)
|
package/build/bshb-controller.js
CHANGED
|
@@ -4,7 +4,6 @@ exports.BshbController = void 0;
|
|
|
4
4
|
const bosch_smart_home_bridge_1 = require("bosch-smart-home-bridge");
|
|
5
5
|
const bshb_logger_1 = require("./bshb-logger");
|
|
6
6
|
const rxjs_1 = require("rxjs");
|
|
7
|
-
const operators_1 = require("rxjs/operators");
|
|
8
7
|
const utils_1 = require("./utils");
|
|
9
8
|
const bshb_scenario_handler_1 = require("./controller/handler/bshb-scenario-handler");
|
|
10
9
|
const bshb_device_handler_1 = require("./controller/handler/bshb-device-handler");
|
|
@@ -77,17 +76,17 @@ class BshbController {
|
|
|
77
76
|
for (let i = 0; i < this.handlers.length; i++) {
|
|
78
77
|
observables.push(this.handlers[i].sendUpdateToBshc(data.id, data.state).pipe(
|
|
79
78
|
// Protect controller
|
|
80
|
-
(0,
|
|
79
|
+
(0, rxjs_1.catchError)(err => {
|
|
81
80
|
this.bshb.log.silly(`Handler "${this.handlers[i].constructor.name}" failed with ${err}. This might happen when the controller answers with an error.`);
|
|
82
81
|
return (0, rxjs_1.of)(true);
|
|
83
|
-
}), (0,
|
|
82
|
+
}), (0, rxjs_1.tap)(handled => {
|
|
84
83
|
if (handled) {
|
|
85
84
|
this.bshb.log.silly(`Handler "${this.handlers[i].constructor.name}" send message to controller with state id=${data.id} and value=${data.state.val}`);
|
|
86
85
|
}
|
|
87
86
|
})));
|
|
88
87
|
}
|
|
89
88
|
return (0, rxjs_1.merge)(...observables);
|
|
90
|
-
}), (0,
|
|
89
|
+
}), (0, rxjs_1.takeUntil)(this.alive))
|
|
91
90
|
.subscribe();
|
|
92
91
|
}
|
|
93
92
|
catch (e) {
|
|
@@ -122,10 +121,10 @@ class BshbController {
|
|
|
122
121
|
return new rxjs_1.Observable(subscriber => {
|
|
123
122
|
const retry = new rxjs_1.BehaviorSubject(true);
|
|
124
123
|
retry
|
|
125
|
-
.pipe((0,
|
|
124
|
+
.pipe((0, rxjs_1.catchError)(err => err.pipe((0, rxjs_1.delay)(pairingDelay))), (0, rxjs_1.tap)(() => {
|
|
126
125
|
this.boschSmartHomeBridge
|
|
127
126
|
.pairIfNeeded(this.clientName, this.bshb.config.identifier, systemPassword, pairingDelay, -1)
|
|
128
|
-
.pipe((0,
|
|
127
|
+
.pipe((0, rxjs_1.takeUntil)(this.bshb.alive))
|
|
129
128
|
.subscribe({
|
|
130
129
|
next: response => {
|
|
131
130
|
// Everything is ok. We can stop all.
|
|
@@ -138,13 +137,13 @@ class BshbController {
|
|
|
138
137
|
this.bshb.log.error(err);
|
|
139
138
|
// Something went wrong. Already logged by lib. We just wait and retry.
|
|
140
139
|
(0, rxjs_1.timer)(pairingDelay)
|
|
141
|
-
.pipe((0,
|
|
140
|
+
.pipe((0, rxjs_1.takeUntil)(this.bshb.alive))
|
|
142
141
|
.subscribe(() => {
|
|
143
142
|
retry.next(true);
|
|
144
143
|
});
|
|
145
144
|
},
|
|
146
145
|
});
|
|
147
|
-
}), (0,
|
|
146
|
+
}), (0, rxjs_1.takeUntil)(this.bshb.alive))
|
|
148
147
|
.subscribe(() => {
|
|
149
148
|
// We do not care
|
|
150
149
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bshb-controller.js","sourceRoot":"","sources":["../src/bshb-controller.ts"],"names":[],"mappings":";;;AAAA,qEAA4F;AAE5F,+CAA2C;AAC3C,+
|
|
1
|
+
{"version":3,"file":"bshb-controller.js","sourceRoot":"","sources":["../src/bshb-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,6 @@ exports.BshbAirPurityGuardianHandler = void 0;
|
|
|
4
4
|
const bshb_handler_1 = require("./bshb-handler");
|
|
5
5
|
const rxjs_1 = require("rxjs");
|
|
6
6
|
const bshb_definition_1 = require("../../bshb-definition");
|
|
7
|
-
const operators_1 = require("rxjs/operators");
|
|
8
7
|
class BshbAirPurityGuardianHandler extends bshb_handler_1.BshbHandler {
|
|
9
8
|
regex = /bshb\.\d+\.airPurityGuardian\.(.*)/;
|
|
10
9
|
roomRegex = /^airPurityGuardian_(.*)$/;
|
|
@@ -71,7 +70,7 @@ class BshbAirPurityGuardianHandler extends bshb_handler_1.BshbHandler {
|
|
|
71
70
|
if (match) {
|
|
72
71
|
roomAndFunctions = this.getBshcClient()
|
|
73
72
|
.getRoom(match ? match[1] : match[1])
|
|
74
|
-
.pipe((0, rxjs_1.map)(response => response.parsedResponse), (0,
|
|
73
|
+
.pipe((0, rxjs_1.map)(response => response.parsedResponse), (0, rxjs_1.catchError)(() => (0, rxjs_1.of)(undefined)));
|
|
75
74
|
}
|
|
76
75
|
else {
|
|
77
76
|
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,iDAA6C;AAC7C,+
|
|
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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"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.BshbAutomationHandler = void 0;
|
|
4
4
|
const bshb_handler_1 = require("./bshb-handler");
|
|
5
5
|
const rxjs_1 = require("rxjs");
|
|
6
|
-
const operators_1 = require("rxjs/operators");
|
|
7
6
|
/**
|
|
8
7
|
* This handler is used to detect automations of bshc
|
|
9
8
|
*
|
|
@@ -35,7 +34,7 @@ class BshbAutomationHandler extends bshb_handler_1.BshbHandler {
|
|
|
35
34
|
if (key === 'trigger') {
|
|
36
35
|
result = this.getBshcClient()
|
|
37
36
|
.triggerAutomation(automationId, { timeout: this.long_timeout })
|
|
38
|
-
.pipe((0,
|
|
37
|
+
.pipe((0, rxjs_1.delay)(1000), (0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.setState(id, {
|
|
39
38
|
val: false,
|
|
40
39
|
ack: true,
|
|
41
40
|
}))), (0, rxjs_1.tap)(this.handleBshcSendError(`id=${automationId}, value=${state.val}, key=${key}, automationId=${automationId}`)), (0, rxjs_1.map)(() => true));
|
|
@@ -218,7 +217,7 @@ class BshbAutomationHandler extends bshb_handler_1.BshbHandler {
|
|
|
218
217
|
}
|
|
219
218
|
}
|
|
220
219
|
if (!found) {
|
|
221
|
-
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,
|
|
220
|
+
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, rxjs_1.catchError)(err => {
|
|
222
221
|
this.bshb.log.error(`Could not delete automation with id=${object.native.id} because: ` + err);
|
|
223
222
|
return (0, rxjs_1.of)(undefined);
|
|
224
223
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bshb-automation-handler.js","sourceRoot":"","sources":["../../../src/controller/handler/bshb-automation-handler.ts"],"names":[],"mappings":";;;AAAA,iDAA6C;AAC7C,+
|
|
1
|
+
{"version":3,"file":"bshb-automation-handler.js","sourceRoot":"","sources":["../../../src/controller/handler/bshb-automation-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.BshbDeviceHandler = void 0;
|
|
4
4
|
const bshb_handler_1 = require("./bshb-handler");
|
|
5
5
|
const rxjs_1 = require("rxjs");
|
|
6
|
-
const operators_1 = require("rxjs/operators");
|
|
7
6
|
const bshb_definition_1 = require("../../bshb-definition");
|
|
8
7
|
const utils_1 = require("../../utils");
|
|
9
8
|
const log_level_1 = require("../../log-level");
|
|
@@ -20,7 +19,7 @@ class BshbDeviceHandler extends bshb_handler_1.BshbHandler {
|
|
|
20
19
|
cachedDeviceServices = new Map();
|
|
21
20
|
handleDetection() {
|
|
22
21
|
const cache = this.restoreCache();
|
|
23
|
-
const devices = this.detectDevices().pipe((0,
|
|
22
|
+
const devices = this.detectDevices().pipe((0, rxjs_1.catchError)(err => {
|
|
24
23
|
// skip errors here
|
|
25
24
|
this.bshb.log.warn('Failure during detection in BshbDeviceHandler. Continue with cached data. This only works if the adapter has been started successfully at least once. New devices may not be recognized. ' +
|
|
26
25
|
err);
|
|
@@ -40,7 +39,7 @@ class BshbDeviceHandler extends bshb_handler_1.BshbHandler {
|
|
|
40
39
|
}
|
|
41
40
|
const id = BshbDeviceHandler.getId(cachedDeviceService.device, cachedDeviceService.deviceService, stateKey);
|
|
42
41
|
(0, rxjs_1.from)(this.bshb.getObjectAsync(id))
|
|
43
|
-
.pipe((0,
|
|
42
|
+
.pipe((0, rxjs_1.switchMap)(obj => {
|
|
44
43
|
if (obj) {
|
|
45
44
|
this.bshb.setState(id, {
|
|
46
45
|
val: this.mapValueToStorage(resultEntry.state[stateKey]),
|
|
@@ -53,7 +52,7 @@ class BshbDeviceHandler extends bshb_handler_1.BshbHandler {
|
|
|
53
52
|
// setState is also handled in state creation, so no additional setState necessary.
|
|
54
53
|
return this.importSimpleState(BshbDeviceHandler.getId(cachedDeviceService.device, cachedDeviceService.deviceService), cachedDeviceService.device, cachedDeviceService.deviceService, stateKey, resultEntry.state[stateKey]);
|
|
55
54
|
}
|
|
56
|
-
}), (0,
|
|
55
|
+
}), (0, rxjs_1.tap)(() => {
|
|
57
56
|
this.handleBshcUpdateSpecialCases(id, cachedDeviceService.device, cachedDeviceService.deviceService, resultEntry.state[stateKey]);
|
|
58
57
|
}))
|
|
59
58
|
.subscribe(this.handleBshcUpdateError(`path=${resultEntry.path}`));
|
|
@@ -92,25 +91,25 @@ class BshbDeviceHandler extends bshb_handler_1.BshbHandler {
|
|
|
92
91
|
const data = {
|
|
93
92
|
'@type': cachedState.deviceService.state['@type'],
|
|
94
93
|
};
|
|
95
|
-
result = this.mapValueFromStorage(id, state.val).pipe((0,
|
|
94
|
+
result = this.mapValueFromStorage(id, state.val).pipe((0, rxjs_1.switchMap)(value => {
|
|
96
95
|
data[cachedState.stateKey] = value;
|
|
97
96
|
if (utils_1.Utils.isLevelActive(this.bshb.log.level, log_level_1.LogLevel.debug)) {
|
|
98
97
|
this.bshb.log.debug('Data which will be send: ' + JSON.stringify(data));
|
|
99
98
|
}
|
|
100
99
|
return this.getBshcClient().putState(cachedState.deviceService.path, data, { timeout: this.long_timeout });
|
|
101
|
-
}), (0,
|
|
100
|
+
}), (0, rxjs_1.tap)(this.handleBshcSendError(`path=${cachedState.deviceService.path}`)), (0, rxjs_1.map)(() => true));
|
|
102
101
|
}
|
|
103
102
|
return result;
|
|
104
103
|
}
|
|
105
104
|
restoreCache() {
|
|
106
|
-
const start = (0, rxjs_1.of)('').pipe((0,
|
|
107
|
-
const preparation = start.pipe((0,
|
|
105
|
+
const start = (0, rxjs_1.of)('').pipe((0, rxjs_1.tap)(() => this.bshb.log.info('Restoring cache started...')));
|
|
106
|
+
const preparation = start.pipe((0, rxjs_1.switchMap)(() => this.setObjectNotExistsAsync('info.cache', {
|
|
108
107
|
type: 'folder',
|
|
109
108
|
common: {
|
|
110
109
|
name: 'cache',
|
|
111
110
|
},
|
|
112
111
|
native: {},
|
|
113
|
-
})), (0,
|
|
112
|
+
})), (0, rxjs_1.switchMap)(() => this.setObjectNotExistsAsync('info.cache.rooms', {
|
|
114
113
|
type: 'state',
|
|
115
114
|
common: {
|
|
116
115
|
name: 'rooms',
|
|
@@ -123,30 +122,30 @@ class BshbDeviceHandler extends bshb_handler_1.BshbHandler {
|
|
|
123
122
|
})));
|
|
124
123
|
const rooms = preparation.pipe(
|
|
125
124
|
// Restore rooms cache
|
|
126
|
-
(0,
|
|
125
|
+
(0, rxjs_1.tap)(() => this.bshb.log.info('Restoring cache: rooms')), (0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.getStateAsync('info.cache.rooms'))), (0, rxjs_1.filter)(this.isDefined), (0, rxjs_1.switchMap)(roomState => this.mapValueFromStorage('info.cache.rooms', roomState.val)), (0, rxjs_1.tap)(roomState => {
|
|
127
126
|
for (const [key, value] of Object.entries(roomState)) {
|
|
128
127
|
this.bshb.log.debug('Restore cache room: ' + key);
|
|
129
128
|
this.cachedRooms.set(key, value);
|
|
130
129
|
}
|
|
131
130
|
}));
|
|
132
|
-
const devices = rooms.pipe((0,
|
|
131
|
+
const devices = rooms.pipe((0, rxjs_1.tap)(() => this.bshb.log.info('Restoring cache: devices, device service and states')),
|
|
133
132
|
// Restore devices, services and states
|
|
134
133
|
// First get all objects and create stream
|
|
135
|
-
(0,
|
|
134
|
+
(0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.getDevicesAsync())), (0, rxjs_1.switchMap)(result => (0, rxjs_1.from)(result)), (0, rxjs_1.filter)(obj => obj.native.device && obj.native.device.id),
|
|
136
135
|
// Restore device
|
|
137
|
-
(0,
|
|
136
|
+
(0, rxjs_1.tap)(obj => {
|
|
138
137
|
this.bshb.log.debug('Restore cache device: ' + obj.native.device.id);
|
|
139
138
|
this.cachedDevices.set(this.bshb.namespace + '.' + obj.native.device.id, obj.native.device);
|
|
140
139
|
}));
|
|
141
140
|
const deviceServices = devices.pipe(
|
|
142
141
|
// We use device.id because it is the ioBroker id but Object does not provide id without namespace.
|
|
143
|
-
(0, rxjs_1.mergeMap)(obj => (0, rxjs_1.from)(this.bshb.getChannelsOfAsync(obj.native.device.id))), (0,
|
|
142
|
+
(0, rxjs_1.mergeMap)(obj => (0, rxjs_1.from)(this.bshb.getChannelsOfAsync(obj.native.device.id))), (0, rxjs_1.switchMap)(result => (0, rxjs_1.from)(result)), (0, rxjs_1.filter)(obj => obj.native.device &&
|
|
144
143
|
obj.native.device.id &&
|
|
145
144
|
obj.native.deviceService &&
|
|
146
145
|
obj.native.deviceService.id &&
|
|
147
146
|
obj.native.deviceService.path),
|
|
148
147
|
// Restore device service
|
|
149
|
-
(0,
|
|
148
|
+
(0, rxjs_1.tap)(channelObj => {
|
|
150
149
|
const id = BshbDeviceHandler.getId(channelObj.native.device, channelObj.native.deviceService);
|
|
151
150
|
this.bshb.log.silly('Restore cache device service: ' + id);
|
|
152
151
|
this.cachedDeviceServices.set(channelObj.native.deviceService.path, {
|
|
@@ -154,11 +153,11 @@ class BshbDeviceHandler extends bshb_handler_1.BshbHandler {
|
|
|
154
153
|
deviceService: channelObj.native.deviceService,
|
|
155
154
|
});
|
|
156
155
|
}));
|
|
157
|
-
const states = deviceServices.pipe((0, rxjs_1.mergeMap)(obj => (0, rxjs_1.from)(this.bshb.getStatesOfAsync(obj.native.device.id, obj.native.deviceService.id))), (0,
|
|
156
|
+
const states = deviceServices.pipe((0, rxjs_1.mergeMap)(obj => (0, rxjs_1.from)(this.bshb.getStatesOfAsync(obj.native.device.id, obj.native.deviceService.id))), (0, rxjs_1.switchMap)(result => (0, rxjs_1.from)(result)), (0, rxjs_1.filter)(obj => obj.native.device &&
|
|
158
157
|
obj.native.device.id &&
|
|
159
158
|
obj.native.deviceService &&
|
|
160
159
|
obj.native.deviceService.id &&
|
|
161
|
-
obj.native.state), (0,
|
|
160
|
+
obj.native.state), (0, rxjs_1.tap)(stateObj => {
|
|
162
161
|
const id = BshbDeviceHandler.getId(stateObj.native.device, stateObj.native.deviceService, stateObj.native.state);
|
|
163
162
|
this.bshb.log.silly('Restore cache state: ' + id);
|
|
164
163
|
this.cachedStates.set(this.bshb.namespace + '.' + id, {
|
|
@@ -168,9 +167,9 @@ class BshbDeviceHandler extends bshb_handler_1.BshbHandler {
|
|
|
168
167
|
stateKey: stateObj.native.state,
|
|
169
168
|
});
|
|
170
169
|
}));
|
|
171
|
-
return states.pipe((0,
|
|
170
|
+
return states.pipe((0, rxjs_1.tap)({
|
|
172
171
|
complete: () => this.bshb.log.info('Restoring cache finished'),
|
|
173
|
-
}), (0,
|
|
172
|
+
}), (0, rxjs_1.switchMap)(() => (0, rxjs_1.of)(undefined)), (0, rxjs_1.catchError)(err => {
|
|
174
173
|
this.bshb.log.warn('Restoring Cache failed. We continue anyway. ' + err);
|
|
175
174
|
return (0, rxjs_1.of)(undefined);
|
|
176
175
|
}));
|
|
@@ -184,13 +183,13 @@ class BshbDeviceHandler extends bshb_handler_1.BshbHandler {
|
|
|
184
183
|
detectDevices() {
|
|
185
184
|
const rooms = this.getBshcClient()
|
|
186
185
|
.getRooms({ timeout: this.long_timeout })
|
|
187
|
-
.pipe((0,
|
|
186
|
+
.pipe((0, rxjs_1.tap)(() => this.bshb.log.info('Start detecting devices...')), (0, rxjs_1.switchMap)(response => {
|
|
188
187
|
this.bshb.log.debug(`Found ${response.parsedResponse.length} rooms.`);
|
|
189
188
|
return (0, rxjs_1.from)(response.parsedResponse);
|
|
190
|
-
}), (0,
|
|
189
|
+
}), (0, rxjs_1.switchMap)(room => {
|
|
191
190
|
this.cachedRooms.set(room.id, room);
|
|
192
191
|
return (0, rxjs_1.of)(undefined);
|
|
193
|
-
}), (0,
|
|
192
|
+
}), (0, rxjs_1.tap)({
|
|
194
193
|
complete: () => {
|
|
195
194
|
const result = {};
|
|
196
195
|
this.cachedRooms.forEach((value, key) => {
|
|
@@ -205,7 +204,7 @@ class BshbDeviceHandler extends bshb_handler_1.BshbHandler {
|
|
|
205
204
|
}));
|
|
206
205
|
const devices = this.getBshcClient()
|
|
207
206
|
.getDevices({ timeout: this.long_timeout })
|
|
208
|
-
.pipe((0,
|
|
207
|
+
.pipe((0, rxjs_1.switchMap)(response => (0, rxjs_1.from)(response.parsedResponse)), (0, rxjs_1.mergeMap)(device => {
|
|
209
208
|
const name = this.getDeviceName(device);
|
|
210
209
|
this.bshb.log.debug(`Device ${device.id} detected.`);
|
|
211
210
|
const deviceStatusId = `${device.id}.status`;
|
|
@@ -215,11 +214,11 @@ class BshbDeviceHandler extends bshb_handler_1.BshbHandler {
|
|
|
215
214
|
name: name,
|
|
216
215
|
},
|
|
217
216
|
native: { device: device },
|
|
218
|
-
}).pipe((0,
|
|
217
|
+
}).pipe((0, rxjs_1.tap)(obj => {
|
|
219
218
|
if (obj && obj._bshbCreated) {
|
|
220
219
|
this.addRoom(device.id, '', undefined, device.roomId);
|
|
221
220
|
}
|
|
222
|
-
}), (0,
|
|
221
|
+
}), (0, rxjs_1.switchMap)(() => this.setObjectNotExistsAsync(deviceStatusId, {
|
|
223
222
|
type: 'state',
|
|
224
223
|
common: {
|
|
225
224
|
name: 'status',
|
|
@@ -236,7 +235,7 @@ class BshbDeviceHandler extends bshb_handler_1.BshbHandler {
|
|
|
236
235
|
},
|
|
237
236
|
},
|
|
238
237
|
native: {},
|
|
239
|
-
})), (0,
|
|
238
|
+
})), (0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.getStateAsync(deviceStatusId))), (0, rxjs_1.switchMap)(state => this.setInitialStateValueIfNotSet(deviceStatusId, state, device.status)), (0, rxjs_1.switchMap)(() => {
|
|
240
239
|
this.cachedDevices.set(this.bshb.namespace + '.' + device.id, device);
|
|
241
240
|
const rootDeviceName = 'BSHC';
|
|
242
241
|
// root device. This should be the bosch smart home controller only. It does not exist as a
|
|
@@ -254,27 +253,27 @@ class BshbDeviceHandler extends bshb_handler_1.BshbHandler {
|
|
|
254
253
|
},
|
|
255
254
|
},
|
|
256
255
|
});
|
|
257
|
-
}), (0,
|
|
256
|
+
}), (0, rxjs_1.tap)(() => {
|
|
258
257
|
this.cachedDevices.set(this.bshb.namespace + '.' + device.rootDeviceId, {
|
|
259
258
|
device: {
|
|
260
259
|
id: device.rootDeviceId,
|
|
261
260
|
},
|
|
262
261
|
});
|
|
263
262
|
}));
|
|
264
|
-
}), (0,
|
|
265
|
-
return (0, rxjs_1.concat)(rooms, devices, this.checkDeviceServices()).pipe((0,
|
|
263
|
+
}), (0, rxjs_1.switchMap)(() => (0, rxjs_1.of)(undefined)));
|
|
264
|
+
return (0, rxjs_1.concat)(rooms, devices, this.checkDeviceServices()).pipe((0, rxjs_1.tap)({
|
|
266
265
|
complete: () => this.bshb.log.info('Detecting devices finished'),
|
|
267
266
|
}));
|
|
268
267
|
}
|
|
269
268
|
checkDeviceServices() {
|
|
270
269
|
return this.getBshcClient()
|
|
271
270
|
.getDevicesServices({ timeout: this.long_timeout })
|
|
272
|
-
.pipe((0,
|
|
271
|
+
.pipe((0, rxjs_1.switchMap)(response => {
|
|
273
272
|
this.bshb.log.debug(`Found ${response.parsedResponse ? response.parsedResponse.length : '0'} device services.`);
|
|
274
273
|
return (0, rxjs_1.from)(response.parsedResponse);
|
|
275
274
|
}), (0, rxjs_1.mergeMap)(deviceService => {
|
|
276
275
|
this.bshb.log.debug(`Check device service ${deviceService.id}`);
|
|
277
|
-
return (0, rxjs_1.from)(this.bshb.getObjectAsync(deviceService.deviceId)).pipe((0,
|
|
276
|
+
return (0, rxjs_1.from)(this.bshb.getObjectAsync(deviceService.deviceId)).pipe((0, rxjs_1.switchMap)(ioBrokerDevice => {
|
|
278
277
|
if (!ioBrokerDevice) {
|
|
279
278
|
this.bshb.log.error('Found device but value is undefined. This should not happen: deviceId=' + deviceService.deviceId);
|
|
280
279
|
return (0, rxjs_1.of)(undefined);
|
|
@@ -283,7 +282,7 @@ class BshbDeviceHandler extends bshb_handler_1.BshbHandler {
|
|
|
283
282
|
return this.importChannels(ioBrokerDevice.native.device, deviceService);
|
|
284
283
|
}
|
|
285
284
|
}));
|
|
286
|
-
}), (0,
|
|
285
|
+
}), (0, rxjs_1.switchMap)(() => (0, rxjs_1.of)(undefined)));
|
|
287
286
|
}
|
|
288
287
|
importChannels(device, deviceService) {
|
|
289
288
|
let id;
|
|
@@ -300,17 +299,17 @@ class BshbDeviceHandler extends bshb_handler_1.BshbHandler {
|
|
|
300
299
|
name: name,
|
|
301
300
|
},
|
|
302
301
|
native: { device: device, deviceService: deviceService },
|
|
303
|
-
}).pipe((0,
|
|
302
|
+
}).pipe((0, rxjs_1.tap)(obj => {
|
|
304
303
|
if (obj && obj._bshbCreated) {
|
|
305
304
|
this.addRoom(device.id, deviceService.id, undefined, device.roomId);
|
|
306
305
|
this.addFunction(device.id, deviceService.id);
|
|
307
306
|
}
|
|
308
307
|
}),
|
|
309
308
|
// add fault holder
|
|
310
|
-
(0,
|
|
309
|
+
(0, rxjs_1.switchMap)(() => this.importSimpleState(id, device, deviceService, 'faults', BshbDeviceHandler.getFaults(deviceService), false)), (0, rxjs_1.tap)(() => this.cachedDeviceServices.set(deviceService.path, {
|
|
311
310
|
device: device,
|
|
312
311
|
deviceService: deviceService,
|
|
313
|
-
})), (0,
|
|
312
|
+
})), (0, rxjs_1.switchMap)(() => this.importStates(id, device, deviceService)));
|
|
314
313
|
}
|
|
315
314
|
importStates(idPrefix, device, deviceService) {
|
|
316
315
|
// device service has a state
|
|
@@ -358,7 +357,7 @@ class BshbDeviceHandler extends bshb_handler_1.BshbHandler {
|
|
|
358
357
|
states: states,
|
|
359
358
|
},
|
|
360
359
|
native: { device: device, deviceService: deviceService, state: stateKey },
|
|
361
|
-
}).pipe((0,
|
|
360
|
+
}).pipe((0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.getStateAsync(id))), (0, rxjs_1.switchMap)(state => this.setInitialStateValueIfNotSet(id, state, stateValue)));
|
|
362
361
|
}
|
|
363
362
|
addRoom(deviceId, deviceServiceId, itemId, roomId) {
|
|
364
363
|
if (roomId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bshb-device-handler.js","sourceRoot":"","sources":["../../../src/controller/handler/bshb-device-handler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"bshb-device-handler.js","sourceRoot":"","sources":["../../../src/controller/handler/bshb-device-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.BshbDeviceStatusUpdateHandler = void 0;
|
|
4
4
|
const bshb_handler_1 = require("./bshb-handler");
|
|
5
5
|
const rxjs_1 = require("rxjs");
|
|
6
|
-
const operators_1 = require("rxjs/operators");
|
|
7
6
|
class BshbDeviceStatusUpdateHandler extends bshb_handler_1.BshbHandler {
|
|
8
7
|
handleDetection() {
|
|
9
8
|
// No detection needed here. This is part of the device handler. Initial values also handled there.
|
|
@@ -19,7 +18,7 @@ class BshbDeviceStatusUpdateHandler extends bshb_handler_1.BshbHandler {
|
|
|
19
18
|
const statusId = `${resultEntry.sourceId}.status`;
|
|
20
19
|
this.getBshcClient()
|
|
21
20
|
.getDevice(resultEntry.sourceId)
|
|
22
|
-
.pipe((0,
|
|
21
|
+
.pipe((0, rxjs_1.switchMap)(result => this.setInitialStateValueIfNotSet(statusId, null, result.parsedResponse.status)))
|
|
23
22
|
.subscribe(this.handleBshcUpdateError(`id=${resultEntry.id}`));
|
|
24
23
|
return true;
|
|
25
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bshb-device-status-update-handler.js","sourceRoot":"","sources":["../../../src/controller/handler/bshb-device-status-update-handler.ts"],"names":[],"mappings":";;;AAAA,iDAA6C;AAC7C,+
|
|
1
|
+
{"version":3,"file":"bshb-device-status-update-handler.js","sourceRoot":"","sources":["../../../src/controller/handler/bshb-device-status-update-handler.ts"],"names":[],"mappings":";;;AAAA,iDAA6C;AAC7C,+BAAiD;AAEjD,MAAa,6BAA8B,SAAQ,0BAAW;IAC5D,eAAe;QACb,mGAAmG;QACnG,OAAO,IAAA,SAAE,EAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IAED,gBAAgB,CAAC,GAAW,EAAE,MAAsB;QAClD,4BAA4B;QAC5B,OAAO,IAAA,SAAE,EAAC,KAAK,CAAC,CAAC;IACnB,CAAC;IAED,gBAAgB,CAAC,WAAgB;QAC/B,IAAI,WAAW,CAAC,OAAO,CAAC,KAAK,SAAS,IAAI,WAAW,CAAC,UAAU,KAAK,QAAQ,IAAI,WAAW,CAAC,QAAQ,EAAE,CAAC;YACtG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;YAE7E,MAAM,QAAQ,GAAG,GAAG,WAAW,CAAC,QAAQ,SAAS,CAAC;YAElD,IAAI,CAAC,aAAa,EAAE;iBACjB,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC;iBAC/B,IAAI,CAAC,IAAA,gBAAS,EAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,4BAA4B,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;iBAC1G,SAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,MAAM,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YAEjE,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI;QACF,OAAO,2BAA2B,CAAC;IACrC,CAAC;CACF;AA9BD,sEA8BC"}
|