iobroker.tibberlink 0.2.1 → 0.2.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 +4 -0
- package/admin/jsonConfig.json +71 -71
- package/build/lib/tibberAPICaller.js +53 -26
- package/build/lib/tibberAPICaller.js.map +1 -1
- package/build/lib/tibberHelper.js +56 -1
- package/build/lib/tibberHelper.js.map +1 -1
- package/build/lib/tibberPulse.js +5 -5
- package/build/lib/tibberPulse.js.map +1 -1
- package/build/main.js +2 -2
- package/build/main.js.map +1 -1
- package/io-package.json +14 -1
- package/package.json +4 -4
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.2 (2023-08-24)
|
|
39
|
+
* (HombachC) reducing polls at Tibber server by precheck of known data
|
|
40
|
+
* (HombachC) code optimizations
|
|
41
|
+
* (HombachC) fix config screen (#55)
|
|
38
42
|
### 0.2.1 (2023-08-21)
|
|
39
43
|
* (HombachC) double timeout for Tibber server queries
|
|
40
44
|
### 0.2.0 (2023-08-18)
|
package/admin/jsonConfig.json
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"type": "text",
|
|
11
11
|
"label": "TibberAPIToken",
|
|
12
12
|
"maxLength": 60,
|
|
13
|
-
"sm":
|
|
13
|
+
"sm": 12,
|
|
14
14
|
"md": 6,
|
|
15
15
|
"lg": 6,
|
|
16
16
|
"newLine": true
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"FeedActive": {
|
|
19
19
|
"type": "checkbox",
|
|
20
20
|
"label": "PulseActive",
|
|
21
|
-
"sm":
|
|
21
|
+
"sm": 12,
|
|
22
22
|
"md": 6,
|
|
23
23
|
"lg": 6,
|
|
24
24
|
"newLine": true
|
|
@@ -41,9 +41,9 @@
|
|
|
41
41
|
"FeedConfigLastMeterConsumption": {
|
|
42
42
|
"type": "checkbox",
|
|
43
43
|
"label": "LastMeterConsumption",
|
|
44
|
-
"sm":
|
|
45
|
-
"md":
|
|
46
|
-
"lg":
|
|
44
|
+
"sm": 12,
|
|
45
|
+
"md": 6,
|
|
46
|
+
"lg": 4,
|
|
47
47
|
"hidden": "!data.FeedActive",
|
|
48
48
|
"newLine": true
|
|
49
49
|
},
|
|
@@ -51,129 +51,129 @@
|
|
|
51
51
|
"type": "checkbox",
|
|
52
52
|
"label": "AccumulatedConsumption",
|
|
53
53
|
"hidden": "!data.FeedActive",
|
|
54
|
-
"sm":
|
|
55
|
-
"md":
|
|
56
|
-
"lg":
|
|
54
|
+
"sm": 12,
|
|
55
|
+
"md": 6,
|
|
56
|
+
"lg": 4
|
|
57
57
|
},
|
|
58
58
|
"FeedConfigAccumulatedConsumptionLastHour": {
|
|
59
59
|
"type": "checkbox",
|
|
60
60
|
"label": "AccumulatedConsumptionLastHour",
|
|
61
61
|
"hidden": "!data.FeedActive",
|
|
62
|
-
"sm":
|
|
63
|
-
"md":
|
|
64
|
-
"lg":
|
|
62
|
+
"sm": 12,
|
|
63
|
+
"md": 6,
|
|
64
|
+
"lg": 4
|
|
65
65
|
},
|
|
66
66
|
|
|
67
67
|
"FeedConfigLastMeterProduction": {
|
|
68
68
|
"type": "checkbox",
|
|
69
69
|
"label": "LastMeterProduction",
|
|
70
70
|
"hidden": "!data.FeedActive",
|
|
71
|
-
"sm":
|
|
72
|
-
"md":
|
|
73
|
-
"lg":
|
|
71
|
+
"sm": 12,
|
|
72
|
+
"md": 6,
|
|
73
|
+
"lg": 4,
|
|
74
74
|
"newLine": true
|
|
75
75
|
},
|
|
76
76
|
"FeedConfigAccumulatedProduction": {
|
|
77
77
|
"type": "checkbox",
|
|
78
78
|
"label": "AccumulatedProduction",
|
|
79
79
|
"hidden": "!data.FeedActive",
|
|
80
|
-
"sm":
|
|
81
|
-
"md":
|
|
82
|
-
"lg":
|
|
80
|
+
"sm": 12,
|
|
81
|
+
"md": 6,
|
|
82
|
+
"lg": 4
|
|
83
83
|
},
|
|
84
84
|
"FeedConfigAccumulatedProductionLastHour": {
|
|
85
85
|
"type": "checkbox",
|
|
86
86
|
"label": "AccumulatedProductionLastHour",
|
|
87
87
|
"hidden": "!data.FeedActive",
|
|
88
|
-
"sm":
|
|
89
|
-
"md":
|
|
90
|
-
"lg":
|
|
88
|
+
"sm": 12,
|
|
89
|
+
"md": 6,
|
|
90
|
+
"lg": 4
|
|
91
91
|
},
|
|
92
92
|
|
|
93
93
|
"FeedConfigAccumulatedCost": {
|
|
94
94
|
"type": "checkbox",
|
|
95
95
|
"label": "AccumulatedCost",
|
|
96
96
|
"hidden": "!data.FeedActive",
|
|
97
|
-
"sm":
|
|
98
|
-
"md":
|
|
99
|
-
"lg":
|
|
97
|
+
"sm": 12,
|
|
98
|
+
"md": 6,
|
|
99
|
+
"lg": 4,
|
|
100
100
|
"newLine": true
|
|
101
101
|
},
|
|
102
102
|
"FeedConfigAccumulatedReward": {
|
|
103
103
|
"type": "checkbox",
|
|
104
104
|
"label": "AccumulatedReward",
|
|
105
105
|
"hidden": "!data.FeedActive",
|
|
106
|
-
"sm":
|
|
107
|
-
"md":
|
|
108
|
-
"lg":
|
|
106
|
+
"sm": 12,
|
|
107
|
+
"md": 6,
|
|
108
|
+
"lg": 4
|
|
109
109
|
},
|
|
110
110
|
"FeedConfigCurrency": {
|
|
111
111
|
"type": "checkbox",
|
|
112
112
|
"label": "Currency",
|
|
113
113
|
"hidden": "!data.FeedActive",
|
|
114
|
-
"sm":
|
|
115
|
-
"md":
|
|
116
|
-
"lg":
|
|
114
|
+
"sm": 12,
|
|
115
|
+
"md": 6,
|
|
116
|
+
"lg": 4
|
|
117
117
|
},
|
|
118
118
|
|
|
119
119
|
"FeedConfigMinPower": {
|
|
120
120
|
"type": "checkbox",
|
|
121
121
|
"label": "MinPower",
|
|
122
122
|
"hidden": "!data.FeedActive",
|
|
123
|
-
"sm":
|
|
124
|
-
"md":
|
|
125
|
-
"lg":
|
|
123
|
+
"sm": 12,
|
|
124
|
+
"md": 6,
|
|
125
|
+
"lg": 4,
|
|
126
126
|
"newLine": true
|
|
127
127
|
},
|
|
128
128
|
"FeedConfigAveragePower": {
|
|
129
129
|
"type": "checkbox",
|
|
130
130
|
"label": "AveragePower",
|
|
131
131
|
"hidden": "!data.FeedActive",
|
|
132
|
-
"sm":
|
|
133
|
-
"md":
|
|
134
|
-
"lg":
|
|
132
|
+
"sm": 12,
|
|
133
|
+
"md": 6,
|
|
134
|
+
"lg": 4
|
|
135
135
|
},
|
|
136
136
|
"FeedConfigMaxPower": {
|
|
137
137
|
"type": "checkbox",
|
|
138
138
|
"label": "MaxPower",
|
|
139
139
|
"hidden": "!data.FeedActive",
|
|
140
|
-
"sm":
|
|
141
|
-
"md":
|
|
142
|
-
"lg":
|
|
140
|
+
"sm": 12,
|
|
141
|
+
"md": 6,
|
|
142
|
+
"lg": 4
|
|
143
143
|
},
|
|
144
144
|
|
|
145
145
|
"FeedConfigPowerProduction": {
|
|
146
146
|
"type": "checkbox",
|
|
147
147
|
"label": "PowerProduction",
|
|
148
148
|
"hidden": "!data.FeedActive",
|
|
149
|
-
"sm":
|
|
150
|
-
"md":
|
|
151
|
-
"lg":
|
|
149
|
+
"sm": 12,
|
|
150
|
+
"md": 6,
|
|
151
|
+
"lg": 4,
|
|
152
152
|
"newLine": true
|
|
153
153
|
},
|
|
154
154
|
"FeedConfigMinPowerProduction": {
|
|
155
155
|
"type": "checkbox",
|
|
156
156
|
"label": "MinPowerProduction",
|
|
157
157
|
"hidden": "!data.FeedActive",
|
|
158
|
-
"sm":
|
|
159
|
-
"md":
|
|
160
|
-
"lg":
|
|
158
|
+
"sm": 12,
|
|
159
|
+
"md": 6,
|
|
160
|
+
"lg": 4
|
|
161
161
|
},
|
|
162
162
|
"FeedConfigMaxPowerProduction": {
|
|
163
163
|
"type": "checkbox",
|
|
164
164
|
"label": "MaxPowerProduction",
|
|
165
165
|
"hidden": "!data.FeedActive",
|
|
166
|
-
"sm":
|
|
167
|
-
"md":
|
|
168
|
-
"lg":
|
|
166
|
+
"sm": 12,
|
|
167
|
+
"md": 6,
|
|
168
|
+
"lg": 4
|
|
169
169
|
},
|
|
170
170
|
"FeedConfigPowerFactor": {
|
|
171
171
|
"type": "checkbox",
|
|
172
172
|
"label": "PowerFactor",
|
|
173
173
|
"hidden": "!data.FeedActive",
|
|
174
|
-
"sm":
|
|
175
|
-
"md":
|
|
176
|
-
"lg":
|
|
174
|
+
"sm": 12,
|
|
175
|
+
"md": 6,
|
|
176
|
+
"lg": 4,
|
|
177
177
|
"newLine": true
|
|
178
178
|
},
|
|
179
179
|
|
|
@@ -181,9 +181,9 @@
|
|
|
181
181
|
"type": "checkbox",
|
|
182
182
|
"label": "SignalStrength",
|
|
183
183
|
"hidden": "!data.FeedActive",
|
|
184
|
-
"sm":
|
|
185
|
-
"md":
|
|
186
|
-
"lg":
|
|
184
|
+
"sm": 12,
|
|
185
|
+
"md": 6,
|
|
186
|
+
"lg": 4
|
|
187
187
|
},
|
|
188
188
|
|
|
189
189
|
|
|
@@ -197,52 +197,52 @@
|
|
|
197
197
|
"type": "checkbox",
|
|
198
198
|
"label": "VoltagePhase1",
|
|
199
199
|
"hidden": "!data.FeedActive",
|
|
200
|
-
"sm":
|
|
201
|
-
"md":
|
|
202
|
-
"lg":
|
|
200
|
+
"sm": 12,
|
|
201
|
+
"md": 6,
|
|
202
|
+
"lg": 4,
|
|
203
203
|
"newLine": true
|
|
204
204
|
},
|
|
205
205
|
"FeedConfigVoltagePhase2": {
|
|
206
206
|
"type": "checkbox",
|
|
207
207
|
"label": "VoltagePhase2",
|
|
208
208
|
"hidden": "!data.FeedActive",
|
|
209
|
-
"sm":
|
|
210
|
-
"md":
|
|
211
|
-
"lg":
|
|
209
|
+
"sm": 12,
|
|
210
|
+
"md": 6,
|
|
211
|
+
"lg": 4
|
|
212
212
|
},
|
|
213
213
|
"FeedConfigVoltagePhase3": {
|
|
214
214
|
"type": "checkbox",
|
|
215
215
|
"label": "VoltagePhase3",
|
|
216
216
|
"hidden": "!data.FeedActive",
|
|
217
|
-
"sm":
|
|
218
|
-
"md":
|
|
219
|
-
"lg":
|
|
217
|
+
"sm": 12,
|
|
218
|
+
"md": 6,
|
|
219
|
+
"lg": 4
|
|
220
220
|
},
|
|
221
221
|
|
|
222
222
|
"FeedConfigCurrentL1": {
|
|
223
223
|
"type": "checkbox",
|
|
224
224
|
"label": "CurrentL1",
|
|
225
225
|
"hidden": "!data.FeedActive",
|
|
226
|
-
"sm":
|
|
227
|
-
"md":
|
|
228
|
-
"lg":
|
|
226
|
+
"sm": 12,
|
|
227
|
+
"md": 6,
|
|
228
|
+
"lg": 4,
|
|
229
229
|
"newLine": true
|
|
230
230
|
},
|
|
231
231
|
"FeedConfigCurrentL2": {
|
|
232
232
|
"type": "checkbox",
|
|
233
233
|
"label": "CurrentL2",
|
|
234
234
|
"hidden": "!data.FeedActive",
|
|
235
|
-
"sm":
|
|
236
|
-
"md":
|
|
237
|
-
"lg":
|
|
235
|
+
"sm": 12,
|
|
236
|
+
"md": 6,
|
|
237
|
+
"lg": 4
|
|
238
238
|
},
|
|
239
239
|
"FeedConfigCurrentL3": {
|
|
240
240
|
"type": "checkbox",
|
|
241
241
|
"label": "CurrentL3",
|
|
242
242
|
"hidden": "!data.FeedActive",
|
|
243
|
-
"sm":
|
|
244
|
-
"md":
|
|
245
|
-
"lg":
|
|
243
|
+
"sm": 12,
|
|
244
|
+
"md": 6,
|
|
245
|
+
"lg": 4
|
|
246
246
|
}
|
|
247
247
|
|
|
248
248
|
}
|
|
@@ -13,7 +13,7 @@ class TibberAPICaller extends tibberHelper_1.TibberHelper {
|
|
|
13
13
|
async updateHomesFromAPI() {
|
|
14
14
|
try {
|
|
15
15
|
const Homes = await this.tibberQuery.getHomes();
|
|
16
|
-
this.adapter.log.debug(
|
|
16
|
+
this.adapter.log.debug(`Got homes from tibber api: ${JSON.stringify(Homes)}`);
|
|
17
17
|
const homeInfoList = [];
|
|
18
18
|
for (const index in Homes) {
|
|
19
19
|
const currentHome = Homes[index];
|
|
@@ -49,42 +49,69 @@ class TibberAPICaller extends tibberHelper_1.TibberHelper {
|
|
|
49
49
|
async updateCurrentPrice(homeId) {
|
|
50
50
|
if (homeId) {
|
|
51
51
|
const currentPrice = await this.tibberQuery.getCurrentEnergyPrice(homeId);
|
|
52
|
-
this.adapter.log.debug(
|
|
52
|
+
this.adapter.log.debug(`Got current price from tibber api: ${JSON.stringify(currentPrice)}`);
|
|
53
53
|
this.currentHomeId = homeId;
|
|
54
54
|
await this.fetchPrice("CurrentPrice", currentPrice);
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
57
|
async updatePricesToday(homeId) {
|
|
58
|
-
const
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
58
|
+
const exJSON = await this.getStateValue(`Homes.${this.currentHomeId}.PricesToday.json`);
|
|
59
|
+
const exPricesToday = JSON.parse(exJSON);
|
|
60
|
+
let exDate = null;
|
|
61
|
+
if (exPricesToday[2] && exPricesToday[2].startsAt) {
|
|
62
|
+
exDate = new Date(exPricesToday[2].startsAt);
|
|
63
|
+
}
|
|
64
|
+
const heute = new Date();
|
|
65
|
+
heute.setHours(0, 0, 0, 0); // sets clock to 0:00
|
|
66
|
+
if (!exDate || exDate <= heute) {
|
|
67
|
+
const pricesToday = await this.tibberQuery.getTodaysEnergyPrices(homeId);
|
|
68
|
+
this.adapter.log.debug(`Got prices today from tibber api: ${JSON.stringify(pricesToday)}`);
|
|
69
|
+
this.currentHomeId = homeId;
|
|
70
|
+
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, "PricesToday", "json"), JSON.stringify(pricesToday), "The prices today as json");
|
|
71
|
+
for (const i in pricesToday) {
|
|
72
|
+
const price = pricesToday[i];
|
|
73
|
+
const hour = new Date(price.startsAt).getHours();
|
|
74
|
+
this.fetchPrice(`PricesToday.${hour}`, price);
|
|
75
|
+
}
|
|
76
|
+
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, "PricesToday", "jsonBYpriceASC"), JSON.stringify(pricesToday.sort((a, b) => a.total - b.total)), "prices sorted by cost ascending");
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
this.adapter.log.debug(`Existing date (${exDate}) of price info is already the today date, polling of prices today from Tibber skipped`);
|
|
66
80
|
}
|
|
67
|
-
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, "PricesToday", "jsonBYpriceASC"), JSON.stringify(pricesToday.sort((a, b) => a.total - b.total)), "prices sorted by cost ascending");
|
|
68
81
|
}
|
|
69
82
|
async updatePricesTomorrow(homeId) {
|
|
70
|
-
const
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
if (
|
|
74
|
-
|
|
75
|
-
for (let hour = 0; hour < 24; hour++) {
|
|
76
|
-
this.emptyingPrice("PricesTomorrow." + hour);
|
|
77
|
-
}
|
|
83
|
+
const exJSON = await this.getStateValue(`Homes.${this.currentHomeId}.PricesTomorrow.json`);
|
|
84
|
+
const exPricesTomorrow = JSON.parse(exJSON);
|
|
85
|
+
let exDate = null;
|
|
86
|
+
if (exPricesTomorrow[2] && exPricesTomorrow[2].startsAt) {
|
|
87
|
+
exDate = new Date(exPricesTomorrow[2].startsAt);
|
|
78
88
|
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
89
|
+
const morgen = new Date();
|
|
90
|
+
morgen.setDate(morgen.getDate() + 1);
|
|
91
|
+
morgen.setHours(0, 0, 0, 0); // sets clock to 0:00
|
|
92
|
+
if (!exDate || exDate <= morgen) {
|
|
93
|
+
const pricesTomorrow = await this.tibberQuery.getTomorrowsEnergyPrices(homeId);
|
|
94
|
+
this.adapter.log.debug(`Got prices tomorrow from tibber api: ${JSON.stringify(pricesTomorrow)}`);
|
|
95
|
+
this.currentHomeId = homeId;
|
|
96
|
+
if (pricesTomorrow.length === 0) { // pricing not known, before about 13:00 - delete the states
|
|
97
|
+
this.adapter.log.debug(`Emptying PricesTomorrow cause existing ones are obsolete...`);
|
|
98
|
+
for (let hour = 0; hour < 24; hour++) {
|
|
99
|
+
this.emptyingPrice(`PricesTomorrow.${hour}`);
|
|
100
|
+
}
|
|
84
101
|
}
|
|
102
|
+
else if (pricesTomorrow) { // pricing known, after about 13:00 - write the states
|
|
103
|
+
for (const i in pricesTomorrow) {
|
|
104
|
+
const price = pricesTomorrow[i];
|
|
105
|
+
const hour = new Date(price.startsAt).getHours();
|
|
106
|
+
this.fetchPrice("PricesTomorrow." + hour, price);
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, "PricesTomorrow", "json"), JSON.stringify(pricesTomorrow), "The prices tomorrow as json");
|
|
110
|
+
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, "PricesTomorrow", "jsonBYpriceASC"), JSON.stringify(pricesTomorrow.sort((a, b) => a.total - b.total)), "prices sorted by cost ascending");
|
|
111
|
+
}
|
|
112
|
+
else {
|
|
113
|
+
this.adapter.log.debug(`Existing date (${exDate}) of price info is already the tomorrow date, polling of prices tomorrow from Tibber skipped`);
|
|
85
114
|
}
|
|
86
|
-
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, "PricesTomorrow", "json"), JSON.stringify(pricesTomorrow), "The prices tomorrow as json");
|
|
87
|
-
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, "PricesTomorrow", "jsonBYpriceASC"), JSON.stringify(pricesTomorrow.sort((a, b) => a.total - b.total)), "prices sorted by cost ascending");
|
|
88
115
|
}
|
|
89
116
|
fetchPrice(objectDestination, price) {
|
|
90
117
|
this.checkAndSetValueNumber(this.getStatePrefix(this.currentHomeId, objectDestination, "total"), price.total, "The total price (energy + taxes)");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tibberAPICaller.js","sourceRoot":"","sources":["../../src/lib/tibberAPICaller.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tibberAPICaller.js","sourceRoot":"","sources":["../../src/lib/tibberAPICaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,61 @@ class TibberHelper {
|
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
|
+
async getStateValue(stateName) {
|
|
35
|
+
try {
|
|
36
|
+
const stateObject = await this.getState(stateName);
|
|
37
|
+
if (stateObject == null)
|
|
38
|
+
return null; // errors thrown already in GetState()
|
|
39
|
+
return stateObject.val;
|
|
40
|
+
}
|
|
41
|
+
catch (e) {
|
|
42
|
+
this.adapter.log.error(`[getStateValue](${stateName}): ${e}`);
|
|
43
|
+
return null;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
async getState(stateName) {
|
|
47
|
+
try {
|
|
48
|
+
const stateObject = await this.adapter.getObjectAsync(stateName); // Check state existence
|
|
49
|
+
if (!stateObject) {
|
|
50
|
+
throw `State '${stateName}' does not exist.`;
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
// Get state value, so like: {val: false, ack: true, ts: 1591117034451, �}
|
|
54
|
+
const stateValueObject = await this.adapter.getStateAsync(stateName);
|
|
55
|
+
if (!this.isLikeEmpty(stateValueObject)) {
|
|
56
|
+
return stateValueObject;
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
throw `Unable to retrieve info from state '${stateName}'.`;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
catch (e) {
|
|
64
|
+
this.adapter.log.error(`[asyncGetState](${stateName}): ${e}`);
|
|
65
|
+
return null;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
isLikeEmpty(inputVar) {
|
|
69
|
+
if (typeof inputVar !== "undefined" && inputVar !== null) {
|
|
70
|
+
let sTemp = JSON.stringify(inputVar);
|
|
71
|
+
sTemp = sTemp.replace(/\s+/g, ""); // remove all white spaces
|
|
72
|
+
sTemp = sTemp.replace(/"+/g, ""); // remove all >"<
|
|
73
|
+
sTemp = sTemp.replace(/'+/g, ""); // remove all >'<
|
|
74
|
+
sTemp = sTemp.replace(/\[+/g, ""); // remove all >[<
|
|
75
|
+
sTemp = sTemp.replace(/\]+/g, ""); // remove all >]<
|
|
76
|
+
sTemp = sTemp.replace(/\{+/g, ""); // remove all >{<
|
|
77
|
+
sTemp = sTemp.replace(/\}+/g, ""); // remove all >}<
|
|
78
|
+
if (sTemp !== "") {
|
|
79
|
+
return false;
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
return true;
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
else {
|
|
86
|
+
return true;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
34
89
|
async checkAndSetValueNumber(stateName, value, description) {
|
|
35
90
|
if (value || value === 0) {
|
|
36
91
|
await this.adapter.setObjectNotExistsAsync(stateName.value, {
|
|
@@ -91,7 +146,7 @@ class TibberHelper {
|
|
|
91
146
|
}
|
|
92
147
|
errorMessages += error.errors[index].message;
|
|
93
148
|
}
|
|
94
|
-
return
|
|
149
|
+
return `Error (${error.statusMessage}) occured during: -${context}- : ${errorMessages}`;
|
|
95
150
|
}
|
|
96
151
|
}
|
|
97
152
|
exports.TibberHelper = TibberHelper;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tibberHelper.js","sourceRoot":"","sources":["../../src/lib/tibberHelper.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tibberHelper.js","sourceRoot":"","sources":["../../src/lib/tibberHelper.ts"],"names":[],"mappings":"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"}
|
package/build/lib/tibberPulse.js
CHANGED
|
@@ -17,7 +17,7 @@ class TibberPulse extends tibberHelper_1.TibberHelper {
|
|
|
17
17
|
this.tibberFeed.connect();
|
|
18
18
|
}
|
|
19
19
|
catch (e) {
|
|
20
|
-
this.adapter.log.warn(
|
|
20
|
+
this.adapter.log.warn(`Error on connect Feed: ${e.message}`);
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
DisconnectPulseStream() {
|
|
@@ -25,7 +25,7 @@ class TibberPulse extends tibberHelper_1.TibberHelper {
|
|
|
25
25
|
this.tibberFeed.close();
|
|
26
26
|
}
|
|
27
27
|
catch (e) {
|
|
28
|
-
this.adapter.log.warn(
|
|
28
|
+
this.adapter.log.warn(`Error on Feed closed: ${e.message}`);
|
|
29
29
|
}
|
|
30
30
|
// reinit Tibberfeed
|
|
31
31
|
this.tibberFeed = new tibber_api_1.TibberFeed(new tibber_api_1.TibberQuery(this.tibberConfig));
|
|
@@ -33,12 +33,12 @@ class TibberPulse extends tibberHelper_1.TibberHelper {
|
|
|
33
33
|
addEventHandlerOnFeed(currentFeed) {
|
|
34
34
|
// Set info.connection state
|
|
35
35
|
currentFeed.on("connected", (data) => {
|
|
36
|
-
this.adapter.log.debug(
|
|
36
|
+
this.adapter.log.debug(`Tibber Feed: ${data.toString()}`);
|
|
37
37
|
this.adapter.setState("info.connection", true, true);
|
|
38
38
|
});
|
|
39
39
|
// Set info.connection state
|
|
40
40
|
currentFeed.on("disconnected", (data) => {
|
|
41
|
-
this.adapter.log.debug(
|
|
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
44
|
this.adapter.log.warn("a feed was disconnected. I try to reconnect in 6s");
|
|
@@ -47,7 +47,7 @@ class TibberPulse extends tibberHelper_1.TibberHelper {
|
|
|
47
47
|
});
|
|
48
48
|
// Add Error Handler on connection
|
|
49
49
|
currentFeed.on("error", (e) => {
|
|
50
|
-
this.adapter.log.error(
|
|
50
|
+
this.adapter.log.error(`ERROR on Tibber-Feed: ${e.toString()}`);
|
|
51
51
|
});
|
|
52
52
|
// Add data receiver
|
|
53
53
|
currentFeed.on("data", (data) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tibberPulse.js","sourceRoot":"","sources":["../../src/lib/tibberPulse.ts"],"names":[],"mappings":";;;AAAA,2CAA8D;AAG9D,iDAA8C;AAE9C,MAAa,WAAY,SAAQ,2BAAY;IAM5C,YAAY,YAAqB,EAAE,OAA8B;QAChE,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,IAAI,wBAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtD,IAAI,CAAC,UAAU,GAAG,IAAI,uBAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACnD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC;QACtD,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC7C,CAAC;IAED,kBAAkB;QACjB,IAAI;YACH,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;SAC1B;QAAC,OAAO,CAAC,EAAE;YACX,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"tibberPulse.js","sourceRoot":"","sources":["../../src/lib/tibberPulse.ts"],"names":[],"mappings":"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"}
|
package/build/main.js
CHANGED
|
@@ -52,7 +52,7 @@ class Tibberlink extends utils.Adapter {
|
|
|
52
52
|
// Reset the connection indicator during startup;
|
|
53
53
|
if (!this.config.TibberAPIToken) {
|
|
54
54
|
// No Token defined in configuration
|
|
55
|
-
this.log.warn(
|
|
55
|
+
this.log.warn(`Missing API Token - please check configuration`);
|
|
56
56
|
this.setState("info.connection", false, true);
|
|
57
57
|
}
|
|
58
58
|
else {
|
|
@@ -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(`try 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":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wGAAwG;AACxG,8DAAgD;AAEhD,2DAAwD;AACxD,mDAAgD;AAChD,6DAA0D;AAG1D,MAAM,UAAW,SAAQ,KAAK,CAAC,OAAO;IAKrC,YAAmB,UAAyC,EAAE;QAC7D,KAAK,CAAC;YACL,GAAG,OAAO;YACV,IAAI,EAAE,YAAY;SAClB,CAAC,CAAC;QAPJ,iBAAY,GAAyC,EAAE,CAAC;QACxD,aAAQ,GAAG,EAAE,CAAC;QAOb,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1C,yDAAyD;QACzD,2DAA2D;QAC3D,iDAAiD;QACjD,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,QAAQ,GAAG,oCAAoC,CAAC;IACtD,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,OAAO;QACpB,iDAAiD;QACjD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE;YAChC,oCAAoC;YACpC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;YAChE,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;SAC9C;aAAM;YACN,yDAAyD;YACzD,MAAM,eAAe,GAAY;gBAChC,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE;oBACZ,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc;oBAClC,QAAQ,EAAE,IAAI,CAAC,QAAQ;iBACvB;aACD,CAAC;YACF,MAAM,gBAAgB,GAAY;gBACjC,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE;oBACZ,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc;oBAClC,QAAQ,EAAE,IAAI,CAAC,QAAQ;iBACvB;aACD,CAAC;YACF,+BAA+B;YAC/B,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;YACnE,IAAI;gBACH,IAAI,CAAC,YAAY,GAAG,MAAM,eAAe,CAAC,kBAAkB,EAAE,CAAC;aAC/D;YAAC,OAAO,KAAU,EAAE;gBACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,EAAE,kCAAkC,CAAC,CAAC,CAAC;aAChG;YACD,6DAA6D;YAC7D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;gBAC5B,IAAI,IAAI,CAAC,YAAY,EAAE;oBACtB,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;oBAC7C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,wFAAwF,CAAC,CAAC;iBACzG;qBAAM;oBACN,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;oBAC9C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yFAAyF,CAAC,CAAC;iBAC1G;aACD;YAED,iBAAiB;YACjB,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE;gBAC5D,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;gBACxD,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC;gBACzB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,uBAAuB,CAAC,CAAA;gBAC9D,IAAI,IAAI,EAAE,GAAG,IAAI,MAAM,KAAK,CAAC,OAAO,EAAE,EAAE;oBACvC,IAAI,cAAc,EAAE;wBACnB,MAAM,MAAM,GAAG,cAAc,CAAC,eAAe,EAAE,CAAC;wBAChD,MAAM,IAAI,MAAM,CAAC,SAAS,CACzB,CAAC,KAGA,EAAE,EAAE;4BACJ,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;4BACvB,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;4BAC3C,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;4BAClD,MAAM,CAAC,cAAc,CAAC,4BAA4B,EAAE,MAAM,CAAC,CAAC,CAAC,eAAe;wBAC7E,CAAC,CACD,CAAC;qBACF;oBACD,sHAAsH;oBACtH,IAAI,CAAC,aAAa,CAAC,uBAAuB,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;iBACjF;aACD;YAED,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,EAAC,uDAAuD;gBAC5F,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iGAAiG,CAAC,CAAC;gBACjH,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE;oBAC5C,IAAI,CAAC,OAAO,EAAE,CAAC;gBAChB,CAAC,EAAE,MAAM,CAAC,CAAC;gBACX,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;aACxC;YAED,+BAA+B;YAC/B,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,EAAE,4DAA4D;gBAC/F,MAAM,gBAAgB,GAAG,IAAI,mCAAgB,CAAC,IAAI,CAAC,CAAC;gBACpD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,YAAY,EAAE;oBAEtC,+DAA+D;oBAC/D,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE;wBAClC,IAAI;4BACH,MAAM,gBAAgB,CAAC,qBAAqB,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;4BAC7E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;yBAC1D;wBAAC,OAAO,KAAU,EAAE;4BACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,EAAE,4CAA4C,CAAC,CAAC,CAAC;yBACzG;qBACD;oBAED,uCAAuC;oBACvC,IAAI;wBACH,MAAM,eAAe,CAAC,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;qBACtE;oBAAC,OAAO,KAAU,EAAE;wBACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,EAAE,6BAA6B,CAAC,CAAC,CAAC;qBAC3F;oBAED,sCAAsC;oBACtC,IAAI;wBACH,MAAM,eAAe,CAAC,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;qBACrE;oBAAC,OAAO,KAAU,EAAE;wBACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,EAAE,4BAA4B,CAAC,CAAC,CAAC;qBAC1F;oBAED,yCAAyC;oBACzC,IAAI;wBACH,MAAM,eAAe,CAAC,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;qBACxE;oBAAC,OAAO,KAAU,EAAE;wBACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,EAAE,+BAA+B,CAAC,CAAC,CAAC;qBAC7F;iBACD;gBAED,MAAM,wBAAwB,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE;oBACtD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,YAAY,EAAE;wBACtC,IAAI;4BACH,eAAe,CAAC,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;yBAChE;wBAAC,OAAO,KAAU,EAAE;4BACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,EAAE,uBAAuB,CAAC,CAAC,CAAC;yBACpF;qBACD;gBACF,CAAC,EAAE,MAAM,CAAC,CAAC;gBACX,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;gBAElD,MAAM,8BAA8B,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE;oBAC5D,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,YAAY,EAAE;wBACtC,IAAI;4BACH,eAAe,CAAC,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;yBAC/D;wBAAC,OAAO,KAAU,EAAE;4BACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,EAAE,sBAAsB,CAAC,CAAC,CAAC;yBACnF;wBACD,IAAI;4BACH,eAAe,CAAC,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;yBAClE;wBAAC,OAAO,KAAU,EAAE;4BACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,CAAC,CAAC,CAAC;yBACtF;qBACD;gBACF,CAAC,EAAE,OAAO,CAAC,CAAC;gBACZ,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;aAC/C;YAEV,4CAA4C;YAC5C,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;gBAC3B,MAAM,oBAAoB,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,kCAAkC;gBACpG,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,YAAY,EAAE;oBACtC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC
|
|
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,21 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "tibberlink",
|
|
4
|
-
"version": "0.2.
|
|
4
|
+
"version": "0.2.2",
|
|
5
5
|
"news": {
|
|
6
|
+
"0.2.2": {
|
|
7
|
+
"en": "reducing polls at Tibber server by precheck of known data, code optimizations, fix config screen (#55)",
|
|
8
|
+
"de": "Reduktion von Anfragen am Tibber-Server durch Vorprüfung bekannter Daten, Codeoptimierungen, Fix Config-Bildschirm (#55)",
|
|
9
|
+
"ru": "сокращение опросов на сервере Tibber путем предварительного проверки известных данных, оптимизации кода, фиксации config экрана (#55)",
|
|
10
|
+
"pt": "reduzindo pesquisas no servidor Tibber por pré-verificação de dados conhecidos, otimizações de código, corrigir tela de configuração (#55)",
|
|
11
|
+
"nl": "polls verminderen bij Tibberserver met voorzien van bekende gegevens, code optimaties, config screen repareren",
|
|
12
|
+
"fr": "réduire les sondages sur le serveur Tibber en prévérant les données connues, les optimisations de code, fixer l'écran de configuration (#55)",
|
|
13
|
+
"it": "ridurre i sondaggi al server Tibber precheck di dati noti, ottimizzazioni di codice, fix config screen (#55)",
|
|
14
|
+
"es": "reducir las encuestas en el servidor Tibber por precheck de datos conocidos, optimizaciones de códigos, fijar la pantalla de configuración (#55)",
|
|
15
|
+
"pl": "zmniejszanie zanieczyszczeń w serwerze Tibber poprzez sprawdzanie znanych danych, optymalizacje kodu, naprawy ekranu (#55)",
|
|
16
|
+
"uk": "знижувати опитування на сервері Tibber за допомогою пречбеку відомих даних, оптимізації коду, фіксації екрана конфігурації (#55)",
|
|
17
|
+
"zh-cn": "通过预先检查已知数据、守则优化、固定集群筛查(第55号)减少Tibber服务器的污染"
|
|
18
|
+
},
|
|
6
19
|
"0.2.1": {
|
|
7
20
|
"en": "double timeout for Tibber server queries",
|
|
8
21
|
"de": "doppelter Timeout für Tibber Server-Abfragen",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "iobroker.tibberlink",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.2",
|
|
4
4
|
"description": "links tibber API data to be used in ioBroker",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Hombach",
|
|
@@ -32,14 +32,14 @@
|
|
|
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.6",
|
|
36
36
|
"@types/proxyquire": "^1.3.28",
|
|
37
37
|
"@types/sinon": "^10.0.16",
|
|
38
38
|
"@types/sinon-chai": "^3.2.8",
|
|
39
39
|
"@typescript-eslint/eslint-plugin": "^6.4.1",
|
|
40
40
|
"@typescript-eslint/parser": "^6.4.1",
|
|
41
41
|
"axios": "^1.4.0",
|
|
42
|
-
"chai": "^4.3.
|
|
42
|
+
"chai": "^4.3.8",
|
|
43
43
|
"chai-as-promised": "^7.1.1",
|
|
44
44
|
"eslint": "^8.47.0",
|
|
45
45
|
"eslint-config-prettier": "^9.0.0",
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"sinon-chai": "^3.7.0",
|
|
53
53
|
"source-map-support": "^0.5.21",
|
|
54
54
|
"ts-node": "^10.9.1",
|
|
55
|
-
"typescript": "~5.
|
|
55
|
+
"typescript": "~5.2.2"
|
|
56
56
|
},
|
|
57
57
|
"main": "build/main.js",
|
|
58
58
|
"files": [
|