iobroker.bshb 0.4.1 → 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 +13 -5
- package/build/bshb-controller.js +11 -11
- package/build/bshb-controller.js.map +1 -1
- package/build/bshb-definition.js +14 -14
- package/build/bshb-definition.js.map +1 -1
- package/build/bshb-logger.js +15 -15
- package/build/bshb-logger.js.map +1 -1
- package/build/controller/handler/bshb-air-purity-guardian-handler.js +22 -22
- package/build/controller/handler/bshb-air-purity-guardian-handler.js.map +1 -1
- package/build/controller/handler/bshb-automation-handler.js +60 -61
- package/build/controller/handler/bshb-automation-handler.js.map +1 -1
- package/build/controller/handler/bshb-backup-handler.js +53 -51
- package/build/controller/handler/bshb-backup-handler.js.map +1 -1
- package/build/controller/handler/bshb-climate-handler.js +37 -38
- package/build/controller/handler/bshb-climate-handler.js.map +1 -1
- package/build/controller/handler/bshb-device-handler.js +100 -112
- package/build/controller/handler/bshb-device-handler.js.map +1 -1
- package/build/controller/handler/bshb-device-status-update-handler.js +4 -6
- package/build/controller/handler/bshb-device-status-update-handler.js.map +1 -1
- package/build/controller/handler/bshb-general-update-handler.js +8 -8
- package/build/controller/handler/bshb-handler.js +17 -15
- package/build/controller/handler/bshb-handler.js.map +1 -1
- package/build/controller/handler/bshb-intrusion-detection-handler.js +45 -45
- package/build/controller/handler/bshb-intrusion-detection-handler.js.map +1 -1
- package/build/controller/handler/bshb-messages-handler.js +13 -13
- package/build/controller/handler/bshb-messages-handler.js.map +1 -1
- package/build/controller/handler/bshb-motion-lights-handler.js +18 -18
- package/build/controller/handler/bshb-motion-lights-handler.js.map +1 -1
- package/build/controller/handler/bshb-open-door-window-handler.js +58 -60
- package/build/controller/handler/bshb-open-door-window-handler.js.map +1 -1
- package/build/controller/handler/bshb-room-handler.js +25 -25
- package/build/controller/handler/bshb-room-handler.js.map +1 -1
- package/build/controller/handler/bshb-scenario-handler.js +20 -21
- package/build/controller/handler/bshb-scenario-handler.js.map +1 -1
- package/build/controller/handler/bshb-user-defined-states-handler.js +19 -20
- package/build/controller/handler/bshb-user-defined-states-handler.js.map +1 -1
- package/build/controller/handler/bshb-water-alarm-handler.js +29 -30
- package/build/controller/handler/bshb-water-alarm-handler.js.map +1 -1
- package/build/definition/function.js +14 -14
- package/build/definition/roles.js +94 -94
- package/build/definition/states.js +146 -146
- package/build/definition/units.js +20 -20
- package/build/main.js +68 -78
- package/build/main.js.map +1 -1
- package/build/migration.js +4 -4
- package/build/migration.js.map +1 -1
- package/build/rate-limiter.js +1 -1
- package/build/rate-limiter.js.map +1 -1
- package/build/utils.js +9 -9
- package/io-package.json +14 -14
- package/package.json +13 -13
package/README.md
CHANGED
|
@@ -36,7 +36,19 @@ use of the adapter. You find a link at the top.
|
|
|
36
36
|
|
|
37
37
|
## Changelog
|
|
38
38
|
|
|
39
|
-
|
|
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
|
|
40
52
|
|
|
41
53
|
* Dependencies updated
|
|
42
54
|
|
|
@@ -64,10 +76,6 @@ use of the adapter. You find a link at the top.
|
|
|
64
76
|
|
|
65
77
|
* (holomekc) Support for user defined states
|
|
66
78
|
|
|
67
|
-
### 0.2.5
|
|
68
|
-
|
|
69
|
-
* (holomekc) Support for user defined states
|
|
70
|
-
|
|
71
79
|
### Older entries
|
|
72
80
|
|
|
73
81
|
[here](CHANGELOG_OLD.md)
|
package/build/bshb-controller.js
CHANGED
|
@@ -31,7 +31,7 @@ const bshb_backup_handler_1 = require("./controller/handler/bshb-backup-handler"
|
|
|
31
31
|
class BshbController {
|
|
32
32
|
bshb;
|
|
33
33
|
boschSmartHomeBridge;
|
|
34
|
-
clientName =
|
|
34
|
+
clientName = 'ioBroker.bshb';
|
|
35
35
|
$rateLimit = new rxjs_1.Subject();
|
|
36
36
|
alive = new rxjs_1.Subject();
|
|
37
37
|
handlers;
|
|
@@ -72,15 +72,15 @@ class BshbController {
|
|
|
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
74
|
this.$rateLimit
|
|
75
|
-
.pipe((0, rate_limiter_1.rateLimit)(this.bshb.config.rateLimit, this.bshb), (0, rxjs_1.concatMap)(
|
|
75
|
+
.pipe((0, rate_limiter_1.rateLimit)(this.bshb.config.rateLimit, this.bshb), (0, rxjs_1.concatMap)(data => {
|
|
76
76
|
const observables = [];
|
|
77
77
|
for (let i = 0; i < this.handlers.length; i++) {
|
|
78
78
|
observables.push(this.handlers[i].sendUpdateToBshc(data.id, data.state).pipe(
|
|
79
79
|
// Protect controller
|
|
80
|
-
(0, operators_1.catchError)(
|
|
80
|
+
(0, operators_1.catchError)(err => {
|
|
81
81
|
this.bshb.log.silly(`Handler "${this.handlers[i].constructor.name}" failed with ${err}. This might happen when the controller answers with an error.`);
|
|
82
82
|
return (0, rxjs_1.of)(true);
|
|
83
|
-
}), (0, operators_1.tap)(
|
|
83
|
+
}), (0, operators_1.tap)(handled => {
|
|
84
84
|
if (handled) {
|
|
85
85
|
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
86
|
}
|
|
@@ -119,22 +119,22 @@ class BshbController {
|
|
|
119
119
|
// Here we retry the pairIfNeeded without attempts configured. So we try once. If something is not ok we wait
|
|
120
120
|
// for pairing delay before we try again. We use takeUntil to make sure that we stop streams if adapter shuts-down
|
|
121
121
|
// takeUntil must be last in pipe to prevent issues.
|
|
122
|
-
return new rxjs_1.Observable(
|
|
122
|
+
return new rxjs_1.Observable(subscriber => {
|
|
123
123
|
const retry = new rxjs_1.BehaviorSubject(true);
|
|
124
124
|
retry
|
|
125
|
-
.pipe((0, operators_1.catchError)(
|
|
125
|
+
.pipe((0, operators_1.catchError)(err => err.pipe((0, operators_1.delay)(pairingDelay))), (0, operators_1.tap)(() => {
|
|
126
126
|
this.boschSmartHomeBridge
|
|
127
127
|
.pairIfNeeded(this.clientName, this.bshb.config.identifier, systemPassword, pairingDelay, -1)
|
|
128
128
|
.pipe((0, operators_1.takeUntil)(this.bshb.alive))
|
|
129
129
|
.subscribe({
|
|
130
|
-
next:
|
|
130
|
+
next: response => {
|
|
131
131
|
// Everything is ok. We can stop all.
|
|
132
|
-
this.bshb.log.info(
|
|
132
|
+
this.bshb.log.info('Ok with pairing');
|
|
133
133
|
subscriber.next(response);
|
|
134
134
|
subscriber.complete();
|
|
135
135
|
retry.complete();
|
|
136
136
|
},
|
|
137
|
-
error:
|
|
137
|
+
error: err => {
|
|
138
138
|
this.bshb.log.error(err);
|
|
139
139
|
// Something went wrong. Already logged by lib. We just wait and retry.
|
|
140
140
|
(0, rxjs_1.timer)(pairingDelay)
|
|
@@ -156,8 +156,8 @@ class BshbController {
|
|
|
156
156
|
* @return observable with no content
|
|
157
157
|
*/
|
|
158
158
|
startDetection() {
|
|
159
|
-
this.bshb.log.info(
|
|
160
|
-
return (0, rxjs_1.concat)(...this.handlers.map(
|
|
159
|
+
this.bshb.log.info('Start detection');
|
|
160
|
+
return (0, rxjs_1.concat)(...this.handlers.map(value => value.handleDetection())).pipe((0, rxjs_1.last)(undefined, void 0));
|
|
161
161
|
}
|
|
162
162
|
/**
|
|
163
163
|
* Changes on a state which results in a call to bshc controller
|
|
@@ -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
|
@@ -15,7 +15,7 @@ const write_1 = require("./definition/write");
|
|
|
15
15
|
class BshbDefinition {
|
|
16
16
|
static determineFunction(value) {
|
|
17
17
|
const func = function_1.FUNCTIONS[value];
|
|
18
|
-
if (func !== null && typeof func !==
|
|
18
|
+
if (func !== null && typeof func !== 'undefined') {
|
|
19
19
|
return func;
|
|
20
20
|
}
|
|
21
21
|
return undefined;
|
|
@@ -30,9 +30,9 @@ class BshbDefinition {
|
|
|
30
30
|
*/
|
|
31
31
|
static determineWrite(type, key) {
|
|
32
32
|
const writeType = write_1.WRITE[type];
|
|
33
|
-
if (writeType !== null && typeof writeType !==
|
|
33
|
+
if (writeType !== null && typeof writeType !== 'undefined') {
|
|
34
34
|
const write = writeType[key];
|
|
35
|
-
if (write !== null && typeof write !==
|
|
35
|
+
if (write !== null && typeof write !== 'undefined') {
|
|
36
36
|
return write;
|
|
37
37
|
}
|
|
38
38
|
}
|
|
@@ -45,7 +45,7 @@ class BshbDefinition {
|
|
|
45
45
|
*/
|
|
46
46
|
static determineType(value) {
|
|
47
47
|
if (Array.isArray(value)) {
|
|
48
|
-
return
|
|
48
|
+
return 'array';
|
|
49
49
|
}
|
|
50
50
|
return typeof value;
|
|
51
51
|
}
|
|
@@ -60,26 +60,26 @@ class BshbDefinition {
|
|
|
60
60
|
*/
|
|
61
61
|
static determineRole(type, key, value) {
|
|
62
62
|
// faults are always a list. Does not matter which service.
|
|
63
|
-
if (key ===
|
|
64
|
-
return
|
|
63
|
+
if (key === 'faults') {
|
|
64
|
+
return 'list';
|
|
65
65
|
}
|
|
66
66
|
const roleType = roles_1.ROLES[type];
|
|
67
|
-
if (roleType !== null && typeof roleType !==
|
|
67
|
+
if (roleType !== null && typeof roleType !== 'undefined') {
|
|
68
68
|
const role = roleType[key];
|
|
69
|
-
if (role !== null && typeof role !==
|
|
69
|
+
if (role !== null && typeof role !== 'undefined') {
|
|
70
70
|
return role;
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
if (Array.isArray(value)) {
|
|
74
|
-
return
|
|
74
|
+
return 'list';
|
|
75
75
|
}
|
|
76
|
-
return
|
|
76
|
+
return 'state';
|
|
77
77
|
}
|
|
78
78
|
static determineUnit(type, key) {
|
|
79
79
|
const unitType = units_1.UNITS[type];
|
|
80
|
-
if (unitType !== null && typeof unitType !==
|
|
80
|
+
if (unitType !== null && typeof unitType !== 'undefined') {
|
|
81
81
|
const unit = unitType[key];
|
|
82
|
-
if (unit !== null && typeof unit !==
|
|
82
|
+
if (unit !== null && typeof unit !== 'undefined') {
|
|
83
83
|
return unit;
|
|
84
84
|
}
|
|
85
85
|
}
|
|
@@ -87,9 +87,9 @@ class BshbDefinition {
|
|
|
87
87
|
}
|
|
88
88
|
static determineStates(type, key) {
|
|
89
89
|
const stateType = states_1.STATES[type];
|
|
90
|
-
if (stateType !== null && typeof stateType !==
|
|
90
|
+
if (stateType !== null && typeof stateType !== 'undefined') {
|
|
91
91
|
const state = stateType[key];
|
|
92
|
-
if (state !== null && typeof state !==
|
|
92
|
+
if (state !== null && typeof state !== 'undefined') {
|
|
93
93
|
return state;
|
|
94
94
|
}
|
|
95
95
|
}
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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
CHANGED
|
@@ -13,32 +13,32 @@ class BshbLogger {
|
|
|
13
13
|
this.adapter = adapter;
|
|
14
14
|
}
|
|
15
15
|
fine(message, ...optionalParams) {
|
|
16
|
-
this.log(
|
|
16
|
+
this.log('silly', message, optionalParams);
|
|
17
17
|
}
|
|
18
18
|
debug(message, ...optionalParams) {
|
|
19
|
-
this.log(
|
|
19
|
+
this.log('debug', message, optionalParams);
|
|
20
20
|
}
|
|
21
21
|
info(message, ...optionalParams) {
|
|
22
|
-
this.log(
|
|
22
|
+
this.log('info', message, optionalParams);
|
|
23
23
|
}
|
|
24
24
|
error(message, ...optionalParams) {
|
|
25
25
|
// debug may look strange here, but we do not care about the logs of errors during http calls because we handle
|
|
26
26
|
// them in the adapter. Errors would only confuse users.
|
|
27
|
-
this.log(
|
|
27
|
+
this.log('debug', message, optionalParams);
|
|
28
28
|
}
|
|
29
29
|
warn(message, ...optionalParams) {
|
|
30
|
-
this.log(
|
|
30
|
+
this.log('warn', message, optionalParams);
|
|
31
31
|
}
|
|
32
32
|
log(msgType, message, ...optionalParams) {
|
|
33
33
|
if (message) {
|
|
34
34
|
if (optionalParams[0].length > 0) {
|
|
35
35
|
let concatMessage = message;
|
|
36
|
-
optionalParams.forEach(
|
|
37
|
-
if (typeof value ===
|
|
38
|
-
concatMessage +=
|
|
36
|
+
optionalParams.forEach(value => {
|
|
37
|
+
if (typeof value === 'object') {
|
|
38
|
+
concatMessage += ' - ' + JSON.stringify(value);
|
|
39
39
|
}
|
|
40
40
|
else {
|
|
41
|
-
concatMessage +=
|
|
41
|
+
concatMessage += ' - ' + value;
|
|
42
42
|
}
|
|
43
43
|
});
|
|
44
44
|
this.adapter.log[msgType](concatMessage);
|
|
@@ -49,19 +49,19 @@ class BshbLogger {
|
|
|
49
49
|
}
|
|
50
50
|
else {
|
|
51
51
|
if (optionalParams[0].length > 0) {
|
|
52
|
-
let concatMessage =
|
|
53
|
-
optionalParams.forEach(
|
|
54
|
-
if (typeof value ===
|
|
55
|
-
concatMessage +=
|
|
52
|
+
let concatMessage = '';
|
|
53
|
+
optionalParams.forEach(value => {
|
|
54
|
+
if (typeof value === 'object') {
|
|
55
|
+
concatMessage += ' - ' + JSON.stringify(value);
|
|
56
56
|
}
|
|
57
57
|
else {
|
|
58
|
-
concatMessage +=
|
|
58
|
+
concatMessage += ' - ' + value;
|
|
59
59
|
}
|
|
60
60
|
});
|
|
61
61
|
this.adapter.log[msgType](concatMessage);
|
|
62
62
|
}
|
|
63
63
|
else {
|
|
64
|
-
this.adapter.log[msgType](
|
|
64
|
+
this.adapter.log[msgType]('');
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
}
|
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;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,
|
|
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"}
|
|
@@ -11,17 +11,17 @@ class BshbAirPurityGuardianHandler extends bshb_handler_1.BshbHandler {
|
|
|
11
11
|
cachedStates = new Map();
|
|
12
12
|
handleDetection() {
|
|
13
13
|
return this.detectAirPurityGuardian().pipe((0, rxjs_1.tap)({
|
|
14
|
-
subscribe: () => this.bshb.log.info(
|
|
15
|
-
finalize: () => this.bshb.log.info(
|
|
14
|
+
subscribe: () => this.bshb.log.info('Start detecting air purity guardian...'),
|
|
15
|
+
finalize: () => this.bshb.log.info('Detecting air purity guardian finished'),
|
|
16
16
|
}));
|
|
17
17
|
}
|
|
18
18
|
handleBshcUpdate(resultEntry) {
|
|
19
|
-
if (resultEntry[
|
|
19
|
+
if (resultEntry['@type'] === 'airPurityGuardian') {
|
|
20
20
|
const idPrefix = `airPurityGuardian.${resultEntry.id}`;
|
|
21
|
-
Object.keys(resultEntry).forEach(
|
|
21
|
+
Object.keys(resultEntry).forEach(key => {
|
|
22
22
|
const id = `${idPrefix}.${key}`;
|
|
23
23
|
(0, rxjs_1.from)(this.bshb.getObjectAsync(id))
|
|
24
|
-
.pipe((0, rxjs_1.switchMap)(
|
|
24
|
+
.pipe((0, rxjs_1.switchMap)(obj => {
|
|
25
25
|
if (obj) {
|
|
26
26
|
this.bshb.setState(id, {
|
|
27
27
|
val: this.mapValueToStorage(resultEntry[key]),
|
|
@@ -46,7 +46,7 @@ class BshbAirPurityGuardianHandler extends bshb_handler_1.BshbHandler {
|
|
|
46
46
|
const cachedState = this.cachedStates.get(id);
|
|
47
47
|
const data = {};
|
|
48
48
|
return this.mapValueFromStorage(id, state.val)
|
|
49
|
-
.pipe((0, rxjs_1.map)(
|
|
49
|
+
.pipe((0, rxjs_1.map)(mappedValue => (data[cachedState.key] = mappedValue)), (0, rxjs_1.switchMap)(() => this.getBshcClient().updateAirPurityGuardian(cachedState.id, data, {
|
|
50
50
|
timeout: this.long_timeout,
|
|
51
51
|
})))
|
|
52
52
|
.pipe((0, rxjs_1.tap)(this.handleBshcSendError(`id=${match[1]}, value=${state.val}`)), (0, rxjs_1.map)(() => true));
|
|
@@ -54,16 +54,16 @@ class BshbAirPurityGuardianHandler extends bshb_handler_1.BshbHandler {
|
|
|
54
54
|
return result;
|
|
55
55
|
}
|
|
56
56
|
detectAirPurityGuardian() {
|
|
57
|
-
return this.setObjectNotExistsAsync(
|
|
58
|
-
type:
|
|
57
|
+
return this.setObjectNotExistsAsync('airPurityGuardian', {
|
|
58
|
+
type: 'folder',
|
|
59
59
|
common: {
|
|
60
|
-
name:
|
|
60
|
+
name: 'airPurityGuardian',
|
|
61
61
|
read: true,
|
|
62
62
|
},
|
|
63
63
|
native: {},
|
|
64
64
|
}).pipe((0, rxjs_1.switchMap)(() => this.getBshcClient().getAirPurityGuardian({
|
|
65
65
|
timeout: this.long_timeout,
|
|
66
|
-
})), (0, rxjs_1.mergeMap)(
|
|
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)));
|
|
67
67
|
}
|
|
68
68
|
addAirPurityGuardian(airPurityGuardian) {
|
|
69
69
|
const match = this.roomRegex.exec(airPurityGuardian.id);
|
|
@@ -71,28 +71,28 @@ class BshbAirPurityGuardianHandler extends bshb_handler_1.BshbHandler {
|
|
|
71
71
|
if (match) {
|
|
72
72
|
roomAndFunctions = this.getBshcClient()
|
|
73
73
|
.getRoom(match ? match[1] : match[1])
|
|
74
|
-
.pipe((0, rxjs_1.map)(
|
|
74
|
+
.pipe((0, rxjs_1.map)(response => response.parsedResponse), (0, operators_1.catchError)(() => (0, rxjs_1.of)(undefined)));
|
|
75
75
|
}
|
|
76
76
|
else {
|
|
77
|
-
roomAndFunctions = (0, rxjs_1.throwError)(() => new Error(
|
|
77
|
+
roomAndFunctions = (0, rxjs_1.throwError)(() => new Error('No room could be extracted from airPurityGuardian.'));
|
|
78
78
|
}
|
|
79
79
|
return (0, rxjs_1.zip)(this.setObjectNotExistsAsync(`airPurityGuardian.${airPurityGuardian.id}`, {
|
|
80
|
-
type:
|
|
80
|
+
type: 'channel',
|
|
81
81
|
common: {
|
|
82
82
|
name: airPurityGuardian.name,
|
|
83
83
|
},
|
|
84
84
|
native: {},
|
|
85
|
-
}), roomAndFunctions).pipe((0, rxjs_1.tap)(
|
|
85
|
+
}), roomAndFunctions).pipe((0, rxjs_1.tap)(objAndRoom => {
|
|
86
86
|
const obj = objAndRoom[0];
|
|
87
87
|
const room = objAndRoom[1];
|
|
88
88
|
if (obj && room && obj._bshbCreated) {
|
|
89
|
-
this.addRoomEnum(room.name,
|
|
90
|
-
this.addFunctionEnum(bshb_definition_1.BshbDefinition.determineFunction(
|
|
89
|
+
this.addRoomEnum(room.name, 'airPurityGuardian', airPurityGuardian.id);
|
|
90
|
+
this.addFunctionEnum(bshb_definition_1.BshbDefinition.determineFunction('airPurityGuardian'), 'airPurityGuardian', airPurityGuardian.id);
|
|
91
91
|
}
|
|
92
|
-
}), (0, rxjs_1.mergeMap)(() => (0, rxjs_1.from)(Object.keys(airPurityGuardian))), (0, rxjs_1.mergeMap)(
|
|
92
|
+
}), (0, rxjs_1.mergeMap)(() => (0, rxjs_1.from)(Object.keys(airPurityGuardian))), (0, rxjs_1.mergeMap)(key => this.importState(key, airPurityGuardian)));
|
|
93
93
|
}
|
|
94
94
|
importState(key, airPurityGuardian) {
|
|
95
|
-
if (key ===
|
|
95
|
+
if (key === '@type' || key === 'name' || key === 'id') {
|
|
96
96
|
return (0, rxjs_1.of)(undefined);
|
|
97
97
|
}
|
|
98
98
|
const id = `airPurityGuardian.${airPurityGuardian.id}.${key}`;
|
|
@@ -102,19 +102,19 @@ class BshbAirPurityGuardianHandler extends bshb_handler_1.BshbHandler {
|
|
|
102
102
|
key: key,
|
|
103
103
|
});
|
|
104
104
|
return this.setObjectNotExistsAsync(id, {
|
|
105
|
-
type:
|
|
105
|
+
type: 'state',
|
|
106
106
|
common: {
|
|
107
107
|
name: key,
|
|
108
108
|
type: bshb_definition_1.BshbDefinition.determineType(value),
|
|
109
|
-
role: bshb_definition_1.BshbDefinition.determineRole(
|
|
109
|
+
role: bshb_definition_1.BshbDefinition.determineRole('airPurityGuardian', key, value),
|
|
110
110
|
read: true,
|
|
111
111
|
write: true,
|
|
112
112
|
},
|
|
113
113
|
native: {},
|
|
114
|
-
}).pipe((0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.getStateAsync(id))), (0, rxjs_1.switchMap)(
|
|
114
|
+
}).pipe((0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.bshb.getStateAsync(id))), (0, rxjs_1.switchMap)(state => this.setInitialStateValueIfNotSet(id, state, value)));
|
|
115
115
|
}
|
|
116
116
|
name() {
|
|
117
|
-
return
|
|
117
|
+
return 'airPurityGuardianHander';
|
|
118
118
|
}
|
|
119
119
|
}
|
|
120
120
|
exports.BshbAirPurityGuardianHandler = BshbAirPurityGuardianHandler;
|
|
@@ -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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"}
|