iobroker.bshb 0.2.6 → 0.2.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. package/README.md +3 -0
  2. package/admin/jsonConfig.json +52 -52
  3. package/build/bshb-controller.js +21 -16
  4. package/build/bshb-controller.js.map +1 -1
  5. package/build/bshb-logger.js +1 -2
  6. package/build/bshb-logger.js.map +1 -1
  7. package/build/controller/handler/bshb-air-purity-guardian-handler.js +3 -3
  8. package/build/controller/handler/bshb-air-purity-guardian-handler.js.map +1 -1
  9. package/build/controller/handler/bshb-climate-handler.js +5 -5
  10. package/build/controller/handler/bshb-climate-handler.js.map +1 -1
  11. package/build/controller/handler/bshb-device-handler.js +5 -6
  12. package/build/controller/handler/bshb-device-handler.js.map +1 -1
  13. package/build/controller/handler/bshb-device-status-update-handler.js +1 -1
  14. package/build/controller/handler/bshb-device-status-update-handler.js.map +1 -1
  15. package/build/controller/handler/bshb-general-update-handler.js +1 -1
  16. package/build/controller/handler/bshb-general-update-handler.js.map +1 -1
  17. package/build/controller/handler/bshb-handler.js +2 -1
  18. package/build/controller/handler/bshb-handler.js.map +1 -1
  19. package/build/controller/handler/bshb-intrusion-detection-handler.js +4 -4
  20. package/build/controller/handler/bshb-intrusion-detection-handler.js.map +1 -1
  21. package/build/controller/handler/bshb-messages-handler.js +1 -1
  22. package/build/controller/handler/bshb-messages-handler.js.map +1 -1
  23. package/build/controller/handler/bshb-motion-lights-handler.js +3 -3
  24. package/build/controller/handler/bshb-motion-lights-handler.js.map +1 -1
  25. package/build/controller/handler/bshb-open-door-window-handler.js +1 -1
  26. package/build/controller/handler/bshb-open-door-window-handler.js.map +1 -1
  27. package/build/controller/handler/bshb-room-handler.js +1 -1
  28. package/build/controller/handler/bshb-room-handler.js.map +1 -1
  29. package/build/controller/handler/bshb-scenario-handler.js +7 -4
  30. package/build/controller/handler/bshb-scenario-handler.js.map +1 -1
  31. package/build/controller/handler/bshb-user-defined-states-handler.js +3 -3
  32. package/build/controller/handler/bshb-user-defined-states-handler.js.map +1 -1
  33. package/build/controller/handler/bshb-water-alarm-handler.js +6 -7
  34. package/build/controller/handler/bshb-water-alarm-handler.js.map +1 -1
  35. package/build/main.js +18 -3
  36. package/build/main.js.map +1 -1
  37. package/build/rate-limiter.js +26 -0
  38. package/build/rate-limiter.js.map +1 -0
  39. package/io-package.json +14 -14
  40. package/package.json +7 -7
package/README.md CHANGED
@@ -33,6 +33,9 @@ If you want to support the work I would appreciate a small donation. This is 100
33
33
 
34
34
  ## Changelog
35
35
 
36
+ ### 0.2.7
37
+ * (holomekc) Update dependencies and fix rate limiting
38
+
36
39
  ### 0.2.6
37
40
  * (holomekc) Support for user defined states
38
41
 
@@ -1,55 +1,55 @@
1
1
  {
2
- "i18n": true,
3
- "type": "panel",
4
- "items": {
5
- "host": {
6
- "type": "text",
7
- "label": "host",
8
- "newLine": false,
9
- "sm": 12,
10
- "md": 6
11
- },
12
- "identifier": {
13
- "type": "text",
14
- "label": "identifier",
15
- "newLine": false,
16
- "help": "identifier-detail",
17
- "sm": 12,
18
- "md": 6
19
- },
20
- "systemPassword": {
21
- "type": "password",
22
- "label": "systemPassword",
23
- "newLine": true,
24
- "help": "systemPassword-detail",
25
- "visible": true,
26
- "sm": 12,
27
- "md": 6
28
- },
29
- "pairingDelay": {
30
- "type": "number",
31
- "label": "pairingDelay",
32
- "newLine": false,
33
- "help": "pairingDelay-detail",
34
- "min": 1000,
35
- "sm": 12,
36
- "md": 6
37
- },
38
- "rateLimit": {
39
- "type": "number",
40
- "label": "rateLimit",
41
- "newLine": true,
42
- "min": 1000,
43
- "sm": 12,
44
- "md": 6
45
- },
46
- "skipServerCertificateCheck": {
47
- "type": "checkbox",
48
- "label": "skipServerCertificateCheck",
49
- "help": "skipServerCertificateCheck-detail",
50
- "newLine": true,
51
- "sm": 12,
52
- "md": 6
53
- }
2
+ "i18n": true,
3
+ "type": "panel",
4
+ "items": {
5
+ "host": {
6
+ "type": "text",
7
+ "label": "host",
8
+ "newLine": false,
9
+ "sm": 12,
10
+ "md": 6
11
+ },
12
+ "identifier": {
13
+ "type": "text",
14
+ "label": "identifier",
15
+ "newLine": false,
16
+ "help": "identifier-detail",
17
+ "sm": 12,
18
+ "md": 6
19
+ },
20
+ "systemPassword": {
21
+ "type": "password",
22
+ "label": "systemPassword",
23
+ "newLine": true,
24
+ "help": "systemPassword-detail",
25
+ "visible": true,
26
+ "sm": 12,
27
+ "md": 6
28
+ },
29
+ "pairingDelay": {
30
+ "type": "number",
31
+ "label": "pairingDelay",
32
+ "newLine": false,
33
+ "help": "pairingDelay-detail",
34
+ "min": 1000,
35
+ "sm": 12,
36
+ "md": 6
37
+ },
38
+ "rateLimit": {
39
+ "type": "number",
40
+ "label": "rateLimit",
41
+ "newLine": true,
42
+ "min": 0,
43
+ "sm": 12,
44
+ "md": 6
45
+ },
46
+ "skipServerCertificateCheck": {
47
+ "type": "checkbox",
48
+ "label": "skipServerCertificateCheck",
49
+ "help": "skipServerCertificateCheck-detail",
50
+ "newLine": true,
51
+ "sm": 12,
52
+ "md": 6
54
53
  }
54
+ }
55
55
  }
@@ -19,6 +19,7 @@ const bshb_room_handler_1 = require("./controller/handler/bshb-room-handler");
19
19
  const bshb_device_status_update_handler_1 = require("./controller/handler/bshb-device-status-update-handler");
20
20
  const bshb_climate_handler_1 = require("./controller/handler/bshb-climate-handler");
21
21
  const bshb_user_defined_states_handler_1 = require("./controller/handler/bshb-user-defined-states-handler");
22
+ const rate_limiter_1 = require("./rate-limiter");
22
23
  /**
23
24
  * This controller encapsulates bosch-smart-home-bridge and provides it to iobroker.bshb
24
25
  *
@@ -30,6 +31,7 @@ class BshbController {
30
31
  boschSmartHomeBridge;
31
32
  clientName = 'ioBroker.bshb';
32
33
  $rateLimit = new rxjs_1.Subject();
34
+ alive = new rxjs_1.Subject();
33
35
  handlers;
34
36
  /**
35
37
  * Create a new instance of {@link BshbController}
@@ -65,14 +67,17 @@ class BshbController {
65
67
  this.handlers.push(new bshb_device_handler_1.BshbDeviceHandler(this.bshb, this.boschSmartHomeBridge));
66
68
  this.handlers.push(new bshb_open_door_window_handler_1.BshbOpenDoorWindowHandler(this.bshb, this.boschSmartHomeBridge));
67
69
  this.handlers.push(new bshb_climate_handler_1.BshbClimateHandler(this.bshb, this.boschSmartHomeBridge));
68
- this.$rateLimit.pipe((0, rxjs_1.concatMap)(data => {
69
- if (this.bshb.config.rateLimit === 0) {
70
- return (0, rxjs_1.of)(data);
70
+ this.$rateLimit.pipe((0, rate_limiter_1.rateLimit)(this.bshb.config.rateLimit, this.bshb), (0, rxjs_1.concatMap)(data => {
71
+ const observables = [];
72
+ for (let i = 0; i < this.handlers.length; i++) {
73
+ observables.push(this.handlers[i].sendUpdateToBshc(data.id, data.state).pipe((0, operators_1.tap)(handled => {
74
+ if (handled) {
75
+ this.bshb.log.silly(`Handler "${this.handlers[i].constructor.name}" send message to controller with state id=${data.id} and value=${data.state.val}`);
76
+ }
77
+ })));
71
78
  }
72
- return (0, rxjs_1.of)(data).pipe((0, operators_1.delay)(this.bshb.config.rateLimit));
73
- })).subscribe(fnc => {
74
- fnc();
75
- });
79
+ return (0, rxjs_1.merge)(...observables);
80
+ }), (0, operators_1.takeUntil)(this.alive)).subscribe();
76
81
  }
77
82
  catch (e) {
78
83
  if (e instanceof Error) {
@@ -109,10 +114,12 @@ class BshbController {
109
114
  this.boschSmartHomeBridge.pairIfNeeded(this.clientName, this.bshb.config.identifier, systemPassword, pairingDelay, -1).pipe((0, operators_1.takeUntil)(this.bshb.alive)).subscribe({
110
115
  next: response => {
111
116
  // Everything is ok. We can stop all.
117
+ this.bshb.log.info('Ok with pairing');
112
118
  subscriber.next(response);
113
119
  subscriber.complete();
114
120
  retry.complete();
115
- }, error: () => {
121
+ }, error: err => {
122
+ this.bshb.log.error(err);
116
123
  // Something went wrong. Already logged by lib. We just wait and retry.
117
124
  (0, rxjs_1.timer)(pairingDelay).pipe((0, operators_1.takeUntil)(this.bshb.alive)).subscribe(() => {
118
125
  retry.next(true);
@@ -130,6 +137,7 @@ class BshbController {
130
137
  * @return observable with no content
131
138
  */
132
139
  startDetection() {
140
+ this.bshb.log.info('Start detection');
133
141
  return (0, rxjs_1.concat)(...this.handlers.map(value => value.handleDetection())).pipe((0, rxjs_1.last)(undefined, void 0));
134
142
  }
135
143
  /**
@@ -141,14 +149,7 @@ class BshbController {
141
149
  * state itself
142
150
  */
143
151
  setState(id, state) {
144
- this.$rateLimit.next(() => {
145
- for (let i = 0; i < this.handlers.length; i++) {
146
- let handled = this.handlers[i].sendUpdateToBshc(id, state);
147
- if (handled) {
148
- this.bshb.log.silly(`Handler "${this.handlers[i].constructor.name}" send message to controller with state id=${id} and value=${state.val}`);
149
- }
150
- }
151
- });
152
+ this.$rateLimit.next({ id: id, state: state });
152
153
  }
153
154
  /**
154
155
  * Changes from bshc controller which results in updates on ioBroker state
@@ -164,6 +165,10 @@ class BshbController {
164
165
  }
165
166
  }
166
167
  }
168
+ close() {
169
+ this.alive.next(true);
170
+ this.alive.complete();
171
+ }
167
172
  }
168
173
  exports.BshbController = BshbController;
169
174
  //# sourceMappingURL=bshb-controller.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"bshb-controller.js","sourceRoot":"","sources":["../src/bshb-controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bshb-controller.js","sourceRoot":"","sources":["../src/bshb-controller.ts"],"names":[],"mappings":"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"}
@@ -13,7 +13,6 @@ class BshbLogger {
13
13
  this.adapter = adapter;
14
14
  }
15
15
  fine(message, ...optionalParams) {
16
- // We ignore fine so far. Because it is very detailed
17
16
  this.log('silly', message, optionalParams);
18
17
  }
19
18
  debug(message, ...optionalParams) {
@@ -23,7 +22,7 @@ class BshbLogger {
23
22
  this.log('info', message, optionalParams);
24
23
  }
25
24
  error(message, ...optionalParams) {
26
- // debug may look strange here but we do not care about the logs of errors during http calls because we handle
25
+ // debug may look strange here, but we do not care about the logs of errors during http calls because we handle
27
26
  // them in the adapter. Errors would only confuse users.
28
27
  this.log('debug', message, optionalParams);
29
28
  }
@@ -1 +1 @@
1
- {"version":3,"file":"bshb-logger.js","sourceRoot":"","sources":["../src/bshb-logger.ts"],"names":[],"mappings":";;;AAGA;;;;;GAKG;AACH,MAAa,UAAU;IAEC;IAApB,YAAoB,OAAa;QAAb,YAAO,GAAP,OAAO,CAAM;IACjC,CAAC;IAED,IAAI,CAAC,OAAa,EAAE,GAAG,cAAqB;QACxC,qDAAqD;QACrD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,OAAa,EAAE,GAAG,cAAqB;QACzC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,CAAC,OAAa,EAAE,GAAG,cAAqB;QACxC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,OAAa,EAAE,GAAG,cAAqB;QACzC,8GAA8G;QAC9G,wDAAwD;QACxD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,CAAC,OAAa,EAAE,GAAG,cAAqB;QACxC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC9C,CAAC;IAEO,GAAG,CAAC,OAAsD,EAAE,OAAa,EAAE,GAAG,cAAqB;QACvG,IAAI,OAAO,EAAE,CAAC;YACV,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,IAAI,aAAa,GAAG,OAAO,CAAC;gBAC5B,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;wBAC5B,aAAa,IAAI,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACnD,CAAC;yBAAM,CAAC;wBACJ,aAAa,IAAI,KAAK,GAAG,KAAK,CAAC;oBACnC,CAAC;gBACL,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC;YAC7C,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;YACvC,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,IAAI,aAAa,GAAG,EAAE,CAAC;gBACvB,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;wBAC5B,aAAa,IAAI,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACnD,CAAC;yBAAM,CAAC;wBACJ,aAAa,IAAI,KAAK,GAAG,KAAK,CAAC;oBACnC,CAAC;gBACL,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC;YAC7C,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;YAClC,CAAC;QACL,CAAC;IACL,CAAC;CACJ;AA3DD,gCA2DC"}
1
+ {"version":3,"file":"bshb-logger.js","sourceRoot":"","sources":["../src/bshb-logger.ts"],"names":[],"mappings":";;;AAGA;;;;;GAKG;AACH,MAAa,UAAU;IAEC;IAApB,YAAoB,OAAa;QAAb,YAAO,GAAP,OAAO,CAAM;IACjC,CAAC;IAED,IAAI,CAAC,OAAa,EAAE,GAAG,cAAqB;QACxC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,OAAa,EAAE,GAAG,cAAqB;QACzC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,CAAC,OAAa,EAAE,GAAG,cAAqB;QACxC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,OAAa,EAAE,GAAG,cAAqB;QACzC,+GAA+G;QAC/G,wDAAwD;QACxD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,CAAC,OAAa,EAAE,GAAG,cAAqB;QACxC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC9C,CAAC;IAEO,GAAG,CAAC,OAAsD,EAAE,OAAa,EAAE,GAAG,cAAqB;QACvG,IAAI,OAAO,EAAE,CAAC;YACV,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,IAAI,aAAa,GAAG,OAAO,CAAC;gBAC5B,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;wBAC5B,aAAa,IAAI,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACnD,CAAC;yBAAM,CAAC;wBACJ,aAAa,IAAI,KAAK,GAAG,KAAK,CAAC;oBACnC,CAAC;gBACL,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC;YAC7C,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;YACvC,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,IAAI,aAAa,GAAG,EAAE,CAAC;gBACvB,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;wBAC5B,aAAa,IAAI,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACnD,CAAC;yBAAM,CAAC;wBACJ,aAAa,IAAI,KAAK,GAAG,KAAK,CAAC;oBACnC,CAAC;gBACL,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC;YAC7C,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;YAClC,CAAC;QACL,CAAC;IACL,CAAC;CACJ;AA1DD,gCA0DC"}
@@ -39,13 +39,13 @@ class BshbAirPurityGuardianHandler extends bshb_handler_1.BshbHandler {
39
39
  }
40
40
  sendUpdateToBshc(id, state) {
41
41
  const match = this.regex.exec(id);
42
+ let result = (0, rxjs_1.of)(false);
42
43
  if (match) {
43
44
  const cachedState = this.cachedStates.get(id);
44
45
  const data = {};
45
- this.mapValueFromStorage(id, state.val).pipe((0, rxjs_1.map)(mappedValue => data[cachedState.key] = mappedValue), (0, rxjs_1.switchMap)(() => this.getBshcClient().updateAirPurityGuardian(cachedState.id, data, { timeout: this.long_timeout }))).subscribe(this.handleBshcSendError(`id=${match[1]}, value=${state.val}`));
46
- return true;
46
+ return this.mapValueFromStorage(id, state.val).pipe((0, rxjs_1.map)(mappedValue => data[cachedState.key] = mappedValue), (0, rxjs_1.switchMap)(() => this.getBshcClient().updateAirPurityGuardian(cachedState.id, data, { timeout: this.long_timeout }))).pipe((0, rxjs_1.tap)(this.handleBshcSendError(`id=${match[1]}, value=${state.val}`)), (0, rxjs_1.map)(() => true));
47
47
  }
48
- return false;
48
+ return result;
49
49
  }
50
50
  detectAirPurityGuardian() {
51
51
  return this.setObjectNotExistsAsync('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":"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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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"}
@@ -24,17 +24,17 @@ class BshbClimateHandler extends bshb_handler_1.BshbHandler {
24
24
  sendUpdateToBshc(id, state) {
25
25
  const matchTextActivate = this.climateTextActivateRegex.exec(id);
26
26
  const matchSwitchActivate = this.climateSwitchActivateRegex.exec(id);
27
+ let result = (0, rxjs_1.of)(false);
27
28
  if (matchTextActivate) {
28
29
  this.bshb.log.debug(`Found climate trigger with deviceId=${matchTextActivate[1]}, value=${state.val}`);
29
- this.mapValueFromStorage(id, state.val).pipe((0, rxjs_1.switchMap)(val => this.getBshcClient().activateClimateSchedules(matchTextActivate[1], val))).subscribe(this.handleBshcSendError(`deviceId=${matchTextActivate[1]}, value=${state.val}`));
30
- return true;
30
+ result = this.mapValueFromStorage(id, state.val).pipe((0, rxjs_1.switchMap)(val => this.getBshcClient().activateClimateSchedules(matchTextActivate[1], val)), (0, rxjs_1.tap)(this.handleBshcSendError(`deviceId=${matchTextActivate[1]}, value=${state.val}`)), (0, rxjs_1.map)(() => true));
31
31
  }
32
32
  else if (matchSwitchActivate) {
33
33
  this.bshb.log.debug(`Found climate trigger with deviceId=${matchSwitchActivate[1]}, id=${matchSwitchActivate[2]}, value=${state.val}`);
34
- this.getBshcClient().activateClimateSchedules(matchSwitchActivate[1], matchSwitchActivate[2])
35
- .subscribe(this.handleBshcSendError(`deviceId=${matchSwitchActivate[1]}, id=${matchSwitchActivate[2]}, value=${state.val}`));
34
+ result = this.getBshcClient().activateClimateSchedules(matchSwitchActivate[1], matchSwitchActivate[2])
35
+ .pipe((0, rxjs_1.tap)(this.handleBshcSendError(`deviceId=${matchSwitchActivate[1]}, id=${matchSwitchActivate[2]}, value=${state.val}`)), (0, rxjs_1.map)(() => true));
36
36
  }
37
- return false;
37
+ return result;
38
38
  }
39
39
  detectClimateSchedules() {
40
40
  return this.getBshcClient().getDevices().pipe((0, rxjs_1.switchMap)(devices => (0, rxjs_1.from)(devices.parsedResponse)), (0, rxjs_1.filter)(device => device.deviceServiceIds.includes('RoomClimateControl')), (0, rxjs_1.mergeMap)(device => this.getBshcClient().getDeviceServices(device.id, 'RoomClimateControl').pipe((0, rxjs_1.map)(d => d.parsedResponse), (0, rxjs_1.map)(data => {
@@ -1 +1 @@
1
- {"version":3,"file":"bshb-climate-handler.js","sourceRoot":"","sources":["../../../src/controller/handler/bshb-climate-handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bshb-climate-handler.js","sourceRoot":"","sources":["../../../src/controller/handler/bshb-climate-handler.ts"],"names":[],"mappings":"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"}
@@ -72,6 +72,7 @@ class BshbDeviceHandler extends bshb_handler_1.BshbHandler {
72
72
  }
73
73
  sendUpdateToBshc(id, state) {
74
74
  let cachedState = this.cachedStates.get(id);
75
+ let result = (0, rxjs_1.of)(false);
75
76
  if (cachedState && utils_1.Utils.isLevelActive(this.bshb.log.level, log_level_1.LogLevel.debug)) {
76
77
  this.bshb.log.debug(`Send update to BSHC for id: ${id}. Cached state: ${JSON.stringify(cachedState)}`);
77
78
  }
@@ -79,17 +80,15 @@ class BshbDeviceHandler extends bshb_handler_1.BshbHandler {
79
80
  const data = {
80
81
  '@type': cachedState.deviceService.state['@type'],
81
82
  };
82
- this.mapValueFromStorage(id, state.val).subscribe(value => {
83
+ result = this.mapValueFromStorage(id, state.val).pipe((0, operators_1.switchMap)(value => {
83
84
  data[cachedState.stateKey] = value;
84
85
  if (utils_1.Utils.isLevelActive(this.bshb.log.level, log_level_1.LogLevel.debug)) {
85
86
  this.bshb.log.debug('Data which will be send: ' + JSON.stringify(data));
86
87
  }
87
- this.getBshcClient().putState(cachedState.deviceService.path, data, { timeout: this.long_timeout })
88
- .subscribe(this.handleBshcSendError(`path=${cachedState.deviceService.path}`));
89
- });
90
- return true;
88
+ return this.getBshcClient().putState(cachedState.deviceService.path, data, { timeout: this.long_timeout });
89
+ }), (0, operators_1.tap)(this.handleBshcSendError(`path=${cachedState.deviceService.path}`)), (0, rxjs_1.map)(() => true));
91
90
  }
92
- return false;
91
+ return result;
93
92
  }
94
93
  restoreCache() {
95
94
  let start = (0, rxjs_1.of)('').pipe((0, operators_1.tap)(() => this.bshb.log.info('Restoring cache started...')));
@@ -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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"}
@@ -11,7 +11,7 @@ class BshbDeviceStatusUpdateHandler extends bshb_handler_1.BshbHandler {
11
11
  }
12
12
  sendUpdateToBshc(id, state) {
13
13
  // Only read. So no sending.
14
- return false;
14
+ return (0, rxjs_1.of)(false);
15
15
  }
16
16
  handleBshcUpdate(resultEntry) {
17
17
  if (resultEntry['@type'] === 'message' && resultEntry.sourceType === 'DEVICE' && resultEntry.sourceId) {
@@ -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,iDAA2C;AAC3C,+BAAoC;AACpC,8CAAyC;AAEzC,MAAa,6BAA8B,SAAQ,0BAAW;IAC1D,eAAe;QACX,mGAAmG;QACnG,OAAO,IAAA,SAAE,EAAC,SAAS,CAAC,CAAC;IACzB,CAAC;IAED,gBAAgB,CAAC,EAAU,EAAE,KAAqB;QAC9C,4BAA4B;QAC5B,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,gBAAgB,CAAC,WAAgB;QAC7B,IAAI,WAAW,CAAC,OAAO,CAAC,KAAK,SAAS,IAAI,WAAW,CAAC,UAAU,KAAK,QAAQ,IAAI,WAAW,CAAC,QAAQ,EAAE,CAAC;YACpG,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,CAAC,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,IAAI,CACrD,IAAA,qBAAS,EAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,4BAA4B,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CACvG,CAAC,SAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,MAAM,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YAEhE,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,IAAI;QACA,OAAO,2BAA2B,CAAC;IACvC,CAAC;CAEJ;AA9BD,sEA8BC"}
1
+ {"version":3,"file":"bshb-device-status-update-handler.js","sourceRoot":"","sources":["../../../src/controller/handler/bshb-device-status-update-handler.ts"],"names":[],"mappings":";;;AAAA,iDAA2C;AAC3C,+BAAoC;AACpC,8CAAyC;AAEzC,MAAa,6BAA8B,SAAQ,0BAAW;IAC1D,eAAe;QACX,mGAAmG;QACnG,OAAO,IAAA,SAAE,EAAC,SAAS,CAAC,CAAC;IACzB,CAAC;IAED,gBAAgB,CAAC,EAAU,EAAE,KAAqB;QAC9C,4BAA4B;QAC5B,OAAO,IAAA,SAAE,EAAC,KAAK,CAAC,CAAC;IACrB,CAAC;IAED,gBAAgB,CAAC,WAAgB;QAC7B,IAAI,WAAW,CAAC,OAAO,CAAC,KAAK,SAAS,IAAI,WAAW,CAAC,UAAU,KAAK,QAAQ,IAAI,WAAW,CAAC,QAAQ,EAAE,CAAC;YACpG,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,CAAC,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,IAAI,CACrD,IAAA,qBAAS,EAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,4BAA4B,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CACvG,CAAC,SAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,MAAM,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YAEhE,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,IAAI;QACA,OAAO,2BAA2B,CAAC;IACvC,CAAC;CAEJ;AA9BD,sEA8BC"}
@@ -27,7 +27,7 @@ class BshbGeneralUpdateHandler extends bshb_handler_1.BshbHandler {
27
27
  }
28
28
  sendUpdateToBshc(id, state) {
29
29
  // not needed
30
- return false;
30
+ return (0, rxjs_1.of)(false);
31
31
  }
32
32
  name() {
33
33
  return 'generalUpdateHandler';
@@ -1 +1 @@
1
- {"version":3,"file":"bshb-general-update-handler.js","sourceRoot":"","sources":["../../../src/controller/handler/bshb-general-update-handler.ts"],"names":[],"mappings":";;;AAAA,iDAA2C;AAC3C,+BAAqD;AAErD,MAAa,wBAAyB,SAAQ,0BAAW;IAErD,gBAAgB,CAAC,WAAgB;QAC7B,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,EAAC,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,IAAI,EAAC,CAAC,CAAC;aAC1F,SAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,MAAM,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACnE,yCAAyC;QACzC,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,eAAe;QACX,OAAO,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE;YAC3C,IAAI,EAAE,OAAO;YACb,MAAM,EAAE;gBACJ,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,KAAK;gBACZ,IAAI,EAAE,IAAI;aACb;YACD,MAAM,EAAE;gBACJ,EAAE,EAAE,SAAS;aAChB;SACJ,CAAC,CAAC,IAAI,CACH,IAAA,gBAAS,EAAC,GAAG,EAAE,CAAC,IAAA,SAAE,EAAC,SAAS,CAAC,CAAC,CACjC,CAAC;IACN,CAAC;IAED,gBAAgB,CAAC,EAAU,EAAE,KAAqB;QAC9C,aAAa;QACb,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,IAAI;QACA,OAAO,sBAAsB,CAAC;IAClC,CAAC;CACJ;AAnCD,4DAmCC"}
1
+ {"version":3,"file":"bshb-general-update-handler.js","sourceRoot":"","sources":["../../../src/controller/handler/bshb-general-update-handler.ts"],"names":[],"mappings":";;;AAAA,iDAA2C;AAC3C,+BAAqD;AAErD,MAAa,wBAAyB,SAAQ,0BAAW;IAErD,gBAAgB,CAAC,WAAgB;QAC7B,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,EAAC,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,IAAI,EAAC,CAAC,CAAC;aAC1F,SAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,MAAM,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACnE,yCAAyC;QACzC,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,eAAe;QACX,OAAO,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE;YAC3C,IAAI,EAAE,OAAO;YACb,MAAM,EAAE;gBACJ,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,KAAK;gBACZ,IAAI,EAAE,IAAI;aACb;YACD,MAAM,EAAE;gBACJ,EAAE,EAAE,SAAS;aAChB;SACJ,CAAC,CAAC,IAAI,CACH,IAAA,gBAAS,EAAC,GAAG,EAAE,CAAC,IAAA,SAAE,EAAC,SAAS,CAAC,CAAC,CACjC,CAAC;IACN,CAAC;IAED,gBAAgB,CAAC,EAAU,EAAE,KAAqB;QAC9C,aAAa;QACb,OAAO,IAAA,SAAE,EAAC,KAAK,CAAC,CAAC;IACrB,CAAC;IAED,IAAI;QACA,OAAO,sBAAsB,CAAC;IAClC,CAAC;CACJ;AAnCD,4DAmCC"}
@@ -37,7 +37,8 @@ class BshbHandler {
37
37
  return (0, rxjs_1.from)(this.bshb.addChannelToEnumAsync(enumObj.type, enumObj.name, enumObj.deviceId, enumObj.deviceServiceId));
38
38
  }
39
39
  })).subscribe({
40
- next: () => { },
40
+ next: () => {
41
+ },
41
42
  error: err => this.bshb.log.warn(utils_1.Utils.handleError('Could not add enum', err))
42
43
  });
43
44
  }
@@ -1 +1 @@
1
- {"version":3,"file":"bshb-handler.js","sourceRoot":"","sources":["../../../src/controller/handler/bshb-handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bshb-handler.js","sourceRoot":"","sources":["../../../src/controller/handler/bshb-handler.ts"],"names":[],"mappings":"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"}
@@ -35,6 +35,7 @@ class BshbIntrusionDetectionHandler extends bshb_handler_1.BshbHandler {
35
35
  }
36
36
  sendUpdateToBshc(id, state) {
37
37
  const match = this.intrusionDetectionControlRegex.exec(id);
38
+ let result = (0, rxjs_1.of)(false);
38
39
  if (match) {
39
40
  this.bshb.log.debug(`Found intrusionDetectionControl trigger with id=${match[1]}, value=${state.val}`);
40
41
  if (state.val) {
@@ -57,13 +58,12 @@ class BshbIntrusionDetectionHandler extends bshb_handler_1.BshbHandler {
57
58
  command = this.getBshcClient().muteIntrusionDetectionSystem({ timeout: this.long_timeout });
58
59
  break;
59
60
  default:
60
- return false;
61
+ return (0, rxjs_1.of)(false);
61
62
  }
62
- command.pipe((0, rxjs_1.tap)(() => this.bshb.setState(id, { val: false, ack: true }))).subscribe(this.handleBshcSendError(`id=${match[1]}, value=${state.val}`));
63
+ result = command.pipe((0, rxjs_1.tap)(() => this.bshb.setState(id, { val: false, ack: true })), (0, rxjs_1.tap)(this.handleBshcSendError(`id=${match[1]}, value=${state.val}`)), (0, rxjs_1.map)(() => true));
63
64
  }
64
- return true;
65
65
  }
66
- return false;
66
+ return result;
67
67
  }
68
68
  flattenData(type, data) {
69
69
  const result = [];