iobroker.tibberlink 0.2.4 → 0.2.6
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 +4 -0
- package/build/lib/tibberCalculator.js +2 -4
- package/build/lib/tibberCalculator.js.map +1 -1
- package/build/lib/tibberHelper.js +29 -26
- package/build/lib/tibberHelper.js.map +1 -1
- package/build/lib/tibberPulse.js +7 -7
- package/build/lib/tibberPulse.js.map +1 -1
- package/build/lib/tools.js +1 -0
- package/build/lib/tools.js.map +1 -1
- package/build/main.js +3 -3
- package/build/main.js.map +1 -1
- package/io-package.json +27 -1
- package/package.json +5 -5
package/README.md
CHANGED
|
@@ -35,6 +35,10 @@ This adapter uses Sentry libraries to automatically report exceptions and code e
|
|
|
35
35
|
## Changelog
|
|
36
36
|
! Note that missing version entries are typically dependency updates for improved security.
|
|
37
37
|
|
|
38
|
+
### 0.2.6 (2023-09-04)
|
|
39
|
+
* (HombachC) fix error with boolean states
|
|
40
|
+
### 0.2.5 (2023-09-03)
|
|
41
|
+
* (HombachC) optimize code to mitigate set state timing for long JSON states (#68)
|
|
38
42
|
### 0.2.4 (2023-08-30)
|
|
39
43
|
* (HombachC) enable correct price poll also for adapter running in different timezones (#63)
|
|
40
44
|
### 0.2.3 (2023-08-27)
|
|
@@ -8,10 +8,8 @@ class TibberCalculator extends tibberHelper_1.TibberHelper {
|
|
|
8
8
|
}
|
|
9
9
|
async setupCalculatorStates(homeId, channel) {
|
|
10
10
|
try {
|
|
11
|
-
|
|
12
|
-
this.
|
|
13
|
-
this.checkAndSetValueNumber(this.getStatePrefix(homeId, "Calculations." + channel, "TriggerPrice"), 0.0, "pricelevel to trigger this channel at");
|
|
14
|
-
this.checkAndSetValueBoolean(this.getStatePrefix(homeId, "Calculations." + channel, "Active"), false, "Whether the calculation channel is active");
|
|
11
|
+
this.checkAndSetValueNumber(this.getStatePrefix(homeId, `Calculations.${channel}`, "TriggerPrice"), 0.0, "pricelevel to trigger this channel at", true);
|
|
12
|
+
this.checkAndSetValueBoolean(this.getStatePrefix(homeId, `Calculations.${channel}`, "Active"), false, "Whether the calculation channel is active");
|
|
15
13
|
}
|
|
16
14
|
catch (error) {
|
|
17
15
|
this.adapter.log.warn(this.generateErrorMessage(error, "setup of states for calculator"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tibberCalculator.js","sourceRoot":"","sources":["../../src/lib/tibberCalculator.ts"],"names":[],"mappings":";;;AACA,iDAA8C;AAE9C,MAAa,gBAAiB,SAAQ,2BAAY;
|
|
1
|
+
{"version":3,"file":"tibberCalculator.js","sourceRoot":"","sources":["../../src/lib/tibberCalculator.ts"],"names":[],"mappings":";;;AACA,iDAA8C;AAE9C,MAAa,gBAAiB,SAAQ,2BAAY;IACjD,YAAY,OAA8B;QACzC,KAAK,CAAC,OAAO,CAAC,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,MAAc,EAAE,OAAe;QAC1D,IAAI;YACH,IAAI,CAAC,sBAAsB,CAC1B,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,gBAAgB,OAAO,EAAE,EAAE,cAAc,CAAC,EACtE,GAAG,EACH,uCAAuC,EACvC,IAAI,CACJ,CAAC;YACF,IAAI,CAAC,uBAAuB,CAC3B,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,gBAAgB,OAAO,EAAE,EAAE,QAAQ,CAAC,EAChE,KAAK,EACL,2CAA2C,CAC3C,CAAC;SACF;QAAC,OAAO,KAAK,EAAE;YACf,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,gCAAgC,CAAC,CAAC,CAAC;SAC1F;IACF,CAAC;CACD;AAtBD,4CAsBC"}
|
|
@@ -8,29 +8,10 @@ class TibberHelper {
|
|
|
8
8
|
getStatePrefix(homeId, space, name) {
|
|
9
9
|
const statePrefix = {
|
|
10
10
|
key: name,
|
|
11
|
-
value:
|
|
11
|
+
value: `Homes.${homeId}.${space}.${name}`,
|
|
12
12
|
};
|
|
13
13
|
return statePrefix;
|
|
14
14
|
}
|
|
15
|
-
async checkAndSetValue(stateName, value, description) {
|
|
16
|
-
if (value != undefined) {
|
|
17
|
-
if (value.trim().length > 0) {
|
|
18
|
-
await this.adapter.setObjectNotExistsAsync(stateName.value, {
|
|
19
|
-
type: "state",
|
|
20
|
-
common: {
|
|
21
|
-
name: stateName.key,
|
|
22
|
-
type: "string",
|
|
23
|
-
role: "text",
|
|
24
|
-
desc: description,
|
|
25
|
-
read: true,
|
|
26
|
-
write: false,
|
|
27
|
-
},
|
|
28
|
-
native: {},
|
|
29
|
-
});
|
|
30
|
-
await this.adapter.setStateAsync(stateName.value, value, true);
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
15
|
async getStateValue(stateName) {
|
|
35
16
|
try {
|
|
36
17
|
const stateObject = await this.getState(stateName);
|
|
@@ -86,7 +67,29 @@ class TibberHelper {
|
|
|
86
67
|
return true;
|
|
87
68
|
}
|
|
88
69
|
}
|
|
89
|
-
async
|
|
70
|
+
async checkAndSetValue(stateName, value, description) {
|
|
71
|
+
if (value != undefined) {
|
|
72
|
+
if (value.trim().length > 0) {
|
|
73
|
+
await this.adapter.setObjectNotExistsAsync(stateName.value, {
|
|
74
|
+
type: "state",
|
|
75
|
+
common: {
|
|
76
|
+
name: stateName.key,
|
|
77
|
+
type: "string",
|
|
78
|
+
role: "text",
|
|
79
|
+
desc: description,
|
|
80
|
+
read: true,
|
|
81
|
+
write: false,
|
|
82
|
+
},
|
|
83
|
+
native: {},
|
|
84
|
+
});
|
|
85
|
+
await this.adapter.setStateAsync(stateName.value, { val: value, ack: true });
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
async checkAndSetValueNumber(stateName, value, description, writeable) {
|
|
90
|
+
if (writeable === undefined) {
|
|
91
|
+
writeable = false;
|
|
92
|
+
}
|
|
90
93
|
if (value || value === 0) {
|
|
91
94
|
await this.adapter.setObjectNotExistsAsync(stateName.value, {
|
|
92
95
|
type: "state",
|
|
@@ -96,11 +99,11 @@ class TibberHelper {
|
|
|
96
99
|
role: "value",
|
|
97
100
|
desc: description,
|
|
98
101
|
read: true,
|
|
99
|
-
write:
|
|
102
|
+
write: writeable,
|
|
100
103
|
},
|
|
101
104
|
native: {},
|
|
102
105
|
});
|
|
103
|
-
await this.adapter.setStateAsync(stateName.value, value, true);
|
|
106
|
+
await this.adapter.setStateAsync(stateName.value, { val: value, ack: true });
|
|
104
107
|
}
|
|
105
108
|
}
|
|
106
109
|
async checkAndSetValueNumberUnit(stateName, value, unit, description) {
|
|
@@ -118,11 +121,11 @@ class TibberHelper {
|
|
|
118
121
|
},
|
|
119
122
|
native: {},
|
|
120
123
|
});
|
|
121
|
-
await this.adapter.setStateAsync(stateName.value, value, true);
|
|
124
|
+
await this.adapter.setStateAsync(stateName.value, { val: value, ack: true });
|
|
122
125
|
}
|
|
123
126
|
}
|
|
124
127
|
async checkAndSetValueBoolean(stateName, value, description) {
|
|
125
|
-
if (value) {
|
|
128
|
+
if (value !== undefined && value !== null) {
|
|
126
129
|
await this.adapter.setObjectNotExistsAsync(stateName.value, {
|
|
127
130
|
type: "state",
|
|
128
131
|
common: {
|
|
@@ -135,7 +138,7 @@ class TibberHelper {
|
|
|
135
138
|
},
|
|
136
139
|
native: {},
|
|
137
140
|
});
|
|
138
|
-
await this.adapter.setStateAsync(stateName.value, value, true);
|
|
141
|
+
await this.adapter.setStateAsync(stateName.value, { val: value, ack: true });
|
|
139
142
|
}
|
|
140
143
|
}
|
|
141
144
|
generateErrorMessage(error, context) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tibberHelper.js","sourceRoot":"","sources":["../../src/lib/tibberHelper.ts"],"names":[],"mappings":";;;AAEA,MAAa,YAAY;IAGxB,YAAY,OAA8B;QACzC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IAES,cAAc,CAAC,MAAc,EAAE,KAAa,EAAE,IAAY;QACnE,MAAM,WAAW,GAAG;YACnB,GAAG,EAAE,IAAI;YACT,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"tibberHelper.js","sourceRoot":"","sources":["../../src/lib/tibberHelper.ts"],"names":[],"mappings":"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"}
|
package/build/lib/tibberPulse.js
CHANGED
|
@@ -41,7 +41,7 @@ class TibberPulse extends tibberHelper_1.TibberHelper {
|
|
|
41
41
|
this.adapter.log.debug(`Tibber Feed: ${data.toString()}`);
|
|
42
42
|
this.adapter.setState("info.connection", false, true);
|
|
43
43
|
if (this.adapter.config.FeedActive) {
|
|
44
|
-
this.adapter.log.warn("
|
|
44
|
+
this.adapter.log.warn("A feed was disconnected. I try to reconnect in 6s");
|
|
45
45
|
this.reconnect();
|
|
46
46
|
}
|
|
47
47
|
});
|
|
@@ -66,11 +66,11 @@ class TibberPulse extends tibberHelper_1.TibberHelper {
|
|
|
66
66
|
if (this.tibberConfig.homeId !== undefined) {
|
|
67
67
|
this.checkAndSetValue(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "timestamp"), liveMeasurement.timestamp, "Timestamp when usage occurred");
|
|
68
68
|
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "power"), power, "W", "Powerlevel measured at the moment +/-");
|
|
69
|
-
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "lastMeterConsumption"),
|
|
70
|
-
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedConsumption"),
|
|
71
|
-
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedProduction"),
|
|
72
|
-
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedConsumptionLastHour"),
|
|
73
|
-
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedProductionLastHour"),
|
|
69
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "lastMeterConsumption"), Math.round(1000 * liveMeasurement.lastMeterConsumption) / 1000, "kWh", "Latest consumption meter state");
|
|
70
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedConsumption"), Math.round(1000 * liveMeasurement.accumulatedConsumption) / 1000, "kWh", "Energy consumed since midnight");
|
|
71
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedProduction"), Math.round(1000 * liveMeasurement.accumulatedProduction) / 1000, "kWh", "Energy produced since midnight");
|
|
72
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedConsumptionLastHour"), Math.round(1000 * liveMeasurement.accumulatedConsumptionLastHour) / 1000, "kWh", "Energy consumed since since last hour shift");
|
|
73
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedProductionLastHour"), Math.round(1000 * liveMeasurement.accumulatedProductionLastHour) / 1000, "kWh", "Energy produced since last hour shift");
|
|
74
74
|
this.checkAndSetValueNumber(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedCost"), liveMeasurement.accumulatedCost, "Accumulated cost since midnight; requires active Tibber power deal");
|
|
75
75
|
this.checkAndSetValueNumber(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedReward"), liveMeasurement.accumulatedReward, "Accumulated reward since midnight; requires active Tibber power deal");
|
|
76
76
|
this.checkAndSetValue(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "currency"), liveMeasurement.currency, "Currency of displayed cost; requires active Tibber power deal");
|
|
@@ -81,7 +81,7 @@ class TibberPulse extends tibberHelper_1.TibberHelper {
|
|
|
81
81
|
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "powerProduction"), liveMeasurement.powerProduction, "W", "Net production (A-) at the moment");
|
|
82
82
|
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "minPowerProduction"), liveMeasurement.minPowerProduction, "W", "Min net production since midnight");
|
|
83
83
|
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "maxPowerProduction"), liveMeasurement.maxPowerProduction, "W", "Max net production since midnight");
|
|
84
|
-
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "lastMeterProduction"),
|
|
84
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "lastMeterProduction"), Math.round(1000 * liveMeasurement.lastMeterProduction) / 1000, "kWh", "Latest production meter state");
|
|
85
85
|
this.checkAndSetValueNumber(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "powerFactor"), liveMeasurement.powerFactor, "Power factor (active power / apparent power)");
|
|
86
86
|
this.checkAndSetValueNumber(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "signalStrength"), liveMeasurement.signalStrength, "Device signal strength (Pulse - dB; Watty - percent)");
|
|
87
87
|
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "voltagePhase1"), liveMeasurement.voltagePhase1, "V", "Voltage on phase 1; on some meters this value is not part of every data frame therefore the value is null at some timestamps");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tibberPulse.js","sourceRoot":"","sources":["../../src/lib/tibberPulse.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tibberPulse.js","sourceRoot":"","sources":["../../src/lib/tibberPulse.ts"],"names":[],"mappings":"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"}
|
package/build/lib/tools.js
CHANGED
|
@@ -77,6 +77,7 @@ async function translateYandex(text, targetLang, apiKey) {
|
|
|
77
77
|
*/
|
|
78
78
|
async function translateGoogle(text, targetLang) {
|
|
79
79
|
try {
|
|
80
|
+
// prettier-ignore
|
|
80
81
|
const url = `http://translate.googleapis.com/translate_a/single?client=gtx&sl=en&tl=${targetLang}&dt=t&q=${encodeURIComponent(text)}&ie=UTF-8&oe=UTF-8`;
|
|
81
82
|
const response = await axios_1.default.request({ url, timeout: 15000 });
|
|
82
83
|
if (isArray(response.data)) {
|
package/build/lib/tools.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/lib/tools.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B;;;GAGG;AACH,SAAgB,QAAQ,CAAC,EAAW;IACnC,6BAA6B;IAC7B,2BAA2B;IAC3B,yBAAyB;IACzB,gCAAgC;IAChC,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,iBAAiB,CAAC;AACjE,CAAC;AAND,4BAMC;AAED;;;GAGG;AACH,SAAgB,OAAO,CAAC,EAAW;IAClC,IAAI,KAAK,CAAC,OAAO,IAAI,IAAI;QAAE,OAAO,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACpD,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,gBAAgB,CAAC;AAChE,CAAC;AAHD,0BAGC;AAED;;;;;GAKG;AACI,KAAK,UAAU,aAAa,CAAC,IAAY,EAAE,UAAkB,EAAE,YAAqB;IAC1F,IAAI,UAAU,KAAK,IAAI,EAAE;QACxB,OAAO,IAAI,CAAC;KACZ;SAAM,IAAI,CAAC,IAAI,EAAE;QACjB,OAAO,EAAE,CAAC;KACV;IACD,IAAI,YAAY,EAAE;QACjB,OAAO,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;KACvD;SAAM;QACN,OAAO,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;KACzC;AACF,CAAC;AAXD,sCAWC;AAED;;;;;GAKG;AACH,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,UAAkB,EAAE,MAAc;IAC9E,IAAI,UAAU,KAAK,OAAO,EAAE;QAC3B,UAAU,GAAG,IAAI,CAAC;KAClB;IACD,IAAI;QACH,MAAM,GAAG,GAAG,+DAA+D,MAAM,SAAS,kBAAkB,CAAC,IAAI,CAAC,YAAY,UAAU,EAAE,CAAC;QAC3I,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,OAAO,CAAM,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QACnE,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YACjC,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAC7B;QACD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;KAC1D;IAAC,OAAO,CAAM,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,MAAM,CAAC,EAAE,CAAC,CAAC;KAChE;AACF,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,UAAkB;IAC9D,IAAI;QACH,MAAM,GAAG,GAAG,0EAA0E,UAAU,WAAW,kBAAkB,CAAC,IAAI,CAAC,oBAAoB,CAAC;QACxJ,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,OAAO,CAAM,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QACnE,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAC3B,0BAA0B;YAC1B,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;QACD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;KAC1D;IAAC,OAAO,CAAM,EAAE;QAChB,IAAI,CAAC,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,qCAAqC,CAAC,CAAC;SAC5F;aAAM;YACN,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,MAAM,CAAC,EAAE,CAAC,CAAC;SAChE;KACD;AACF,CAAC"}
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/lib/tools.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B;;;GAGG;AACH,SAAgB,QAAQ,CAAC,EAAW;IACnC,6BAA6B;IAC7B,2BAA2B;IAC3B,yBAAyB;IACzB,gCAAgC;IAChC,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,iBAAiB,CAAC;AACjE,CAAC;AAND,4BAMC;AAED;;;GAGG;AACH,SAAgB,OAAO,CAAC,EAAW;IAClC,IAAI,KAAK,CAAC,OAAO,IAAI,IAAI;QAAE,OAAO,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACpD,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,gBAAgB,CAAC;AAChE,CAAC;AAHD,0BAGC;AAED;;;;;GAKG;AACI,KAAK,UAAU,aAAa,CAAC,IAAY,EAAE,UAAkB,EAAE,YAAqB;IAC1F,IAAI,UAAU,KAAK,IAAI,EAAE;QACxB,OAAO,IAAI,CAAC;KACZ;SAAM,IAAI,CAAC,IAAI,EAAE;QACjB,OAAO,EAAE,CAAC;KACV;IACD,IAAI,YAAY,EAAE;QACjB,OAAO,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;KACvD;SAAM;QACN,OAAO,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;KACzC;AACF,CAAC;AAXD,sCAWC;AAED;;;;;GAKG;AACH,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,UAAkB,EAAE,MAAc;IAC9E,IAAI,UAAU,KAAK,OAAO,EAAE;QAC3B,UAAU,GAAG,IAAI,CAAC;KAClB;IACD,IAAI;QACH,MAAM,GAAG,GAAG,+DAA+D,MAAM,SAAS,kBAAkB,CAAC,IAAI,CAAC,YAAY,UAAU,EAAE,CAAC;QAC3I,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,OAAO,CAAM,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QACnE,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YACjC,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAC7B;QACD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;KAC1D;IAAC,OAAO,CAAM,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,MAAM,CAAC,EAAE,CAAC,CAAC;KAChE;AACF,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,UAAkB;IAC9D,IAAI;QACH,kBAAkB;QAClB,MAAM,GAAG,GAAG,0EAA0E,UAAU,WAAW,kBAAkB,CAAC,IAAI,CAAC,oBAAoB,CAAC;QACxJ,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,OAAO,CAAM,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QACnE,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAC3B,0BAA0B;YAC1B,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;QACD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;KAC1D;IAAC,OAAO,CAAM,EAAE;QAChB,IAAI,CAAC,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,qCAAqC,CAAC,CAAC;SAC5F;aAAM;YACN,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,MAAM,CAAC,EAAE,CAAC,CAAC;SAChE;KACD;AACF,CAAC"}
|
package/build/main.js
CHANGED
|
@@ -109,7 +109,7 @@ class Tibberlink extends utils.Adapter {
|
|
|
109
109
|
this.setStateAsync("info.LastSentryLogDay", { val: today.getDate(), ack: true });
|
|
110
110
|
}
|
|
111
111
|
}
|
|
112
|
-
if (!(this.homeInfoList.length > 0)) { // if no homeIDs available - adapter can't do that much
|
|
112
|
+
if (!(this.homeInfoList.length > 0)) { // if no homeIDs available - adapter can't do that much and restarts
|
|
113
113
|
this.log.warn("Got no homes in your account - probably by a Tibber Server Error- adapter restarts in 2 minutes");
|
|
114
114
|
const adapterrestart = this.setInterval(() => {
|
|
115
115
|
this.restart();
|
|
@@ -124,7 +124,7 @@ class Tibberlink extends utils.Adapter {
|
|
|
124
124
|
if (this.config.CalCh01Configured) {
|
|
125
125
|
try {
|
|
126
126
|
await tibberCalculator.setupCalculatorStates(this.homeInfoList[index].ID, 1);
|
|
127
|
-
this.log.debug("
|
|
127
|
+
this.log.debug("Setting up calculation channel 1 states");
|
|
128
128
|
}
|
|
129
129
|
catch (error) {
|
|
130
130
|
this.log.warn(tibberAPICaller.generateErrorMessage(error, "setup of calculation states for channel 01"));
|
|
@@ -185,7 +185,7 @@ class Tibberlink extends utils.Adapter {
|
|
|
185
185
|
if (this.config.FeedActive) {
|
|
186
186
|
const tibberPulseInstances = new Array(this.homeInfoList.length); // array for TibberPulse-instances
|
|
187
187
|
for (const index in this.homeInfoList) {
|
|
188
|
-
this.log.debug(`
|
|
188
|
+
this.log.debug(`Trying to establish feed of live data for home: ${this.homeInfoList[index].ID}`);
|
|
189
189
|
if (this.homeInfoList[index].RealTime) {
|
|
190
190
|
try {
|
|
191
191
|
// define the fields for datafeed
|
package/build/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
package/io-package.json
CHANGED
|
@@ -1,8 +1,34 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "tibberlink",
|
|
4
|
-
"version": "0.2.
|
|
4
|
+
"version": "0.2.6",
|
|
5
5
|
"news": {
|
|
6
|
+
"0.2.6": {
|
|
7
|
+
"en": "fix error with boolean states",
|
|
8
|
+
"de": "Fehler behoben mit booleschen States",
|
|
9
|
+
"ru": "исправить ошибку с boolean состояния",
|
|
10
|
+
"pt": "corrigir erro com estados booleanos",
|
|
11
|
+
"nl": "vergissing met boolean staten",
|
|
12
|
+
"fr": "corriger l'erreur avec les états booléens",
|
|
13
|
+
"it": "errore di correzione con stati booleani",
|
|
14
|
+
"es": "error de fijación con estados booleanos",
|
|
15
|
+
"pl": "ustępowanie błędów w państwie booleańskim",
|
|
16
|
+
"uk": "виправити помилку з болеанськими станами",
|
|
17
|
+
"zh-cn": "f 假释国错误"
|
|
18
|
+
},
|
|
19
|
+
"0.2.5": {
|
|
20
|
+
"en": "optimize code to mitigate set state timing for long JSON states (#68)",
|
|
21
|
+
"de": "optimieren Sie den Code zur Minderung des eingestellten Zustandszeitpunkts für lange JSON-Staaten (#68)",
|
|
22
|
+
"ru": "оптимизировать код для смягчения установленных государственных сроков для дальних стран JSON (#68)",
|
|
23
|
+
"pt": "otimizar o código para mitigar o tempo de estado definido para estados JSON longos (#68)",
|
|
24
|
+
"nl": "vertaling:",
|
|
25
|
+
"fr": "optimiser le code pour atténuer le temps d'état défini pour les états JSON longs (#68)",
|
|
26
|
+
"it": "ottimizzare il codice per mitigare i tempi di stato impostati per i lunghi stati JSON (#68)",
|
|
27
|
+
"es": "optimizar el código para mitigar el tiempo establecido del estado para los estados JSON largos (#68)",
|
|
28
|
+
"pl": "kod optymalizacyjny w celu złagodzenia systemu stanowego dla długich stanów JSON (#68)",
|
|
29
|
+
"uk": "оптимізуйте код для пом'якшення часу стану для довгих станів JSON (#68)",
|
|
30
|
+
"zh-cn": "完善减少长期合作行动联盟国家时间表的守则(#68)"
|
|
31
|
+
},
|
|
6
32
|
"0.2.4": {
|
|
7
33
|
"en": "enable correct price poll also for adapter running in different timezones (#63)",
|
|
8
34
|
"de": "korrekte Preisabfrage auch für Adapter in verschiedenen Zeitzonen (#63)",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "iobroker.tibberlink",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.6",
|
|
4
4
|
"description": "links tibber API data to be used in ioBroker",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Hombach",
|
|
@@ -32,12 +32,12 @@
|
|
|
32
32
|
"@types/chai": "^4.3.5",
|
|
33
33
|
"@types/chai-as-promised": "^7.1.5",
|
|
34
34
|
"@types/mocha": "^10.0.1",
|
|
35
|
-
"@types/node": "^20.5.
|
|
35
|
+
"@types/node": "^20.5.9",
|
|
36
36
|
"@types/proxyquire": "^1.3.28",
|
|
37
37
|
"@types/sinon": "^10.0.16",
|
|
38
38
|
"@types/sinon-chai": "^3.2.8",
|
|
39
|
-
"@typescript-eslint/eslint-plugin": "^6.
|
|
40
|
-
"@typescript-eslint/parser": "^6.
|
|
39
|
+
"@typescript-eslint/eslint-plugin": "^6.5.0",
|
|
40
|
+
"@typescript-eslint/parser": "^6.5.0",
|
|
41
41
|
"axios": "^1.5.0",
|
|
42
42
|
"chai": "^4.3.8",
|
|
43
43
|
"chai-as-promised": "^7.1.1",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"eslint-config-prettier": "^9.0.0",
|
|
46
46
|
"eslint-plugin-prettier": "^5.0.0",
|
|
47
47
|
"mocha": "^10.2.0",
|
|
48
|
-
"prettier": "^3.0.
|
|
48
|
+
"prettier": "^3.0.3",
|
|
49
49
|
"proxyquire": "^2.1.3",
|
|
50
50
|
"rimraf": "^5.0.1",
|
|
51
51
|
"sinon": "^15.2.0",
|