iobroker.tibberlink 0.1.5 → 0.1.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.
- package/README.md +5 -0
- package/build/lib/tibberAPICaller.js +75 -54
- package/build/lib/tibberAPICaller.js.map +1 -1
- package/build/lib/tibberPulse.js +16 -10
- package/build/lib/tibberPulse.js.map +1 -1
- package/build/main.js +4 -5
- package/build/main.js.map +1 -1
- package/io-package.json +28 -2
- package/package.json +10 -9
package/README.md
CHANGED
|
@@ -35,6 +35,11 @@ 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.1.7 (2023-08-11)
|
|
39
|
+
* (HombachC) code cleanup, fix error for obsolete next day pricing (#23)
|
|
40
|
+
* (HombachC) add another try/catch while fetching homes list (#32)
|
|
41
|
+
### 0.1.6 (2023-07-30)
|
|
42
|
+
* (HombachC) add units for live data, bump adapter-core to 3.x
|
|
38
43
|
### 0.1.5 (2023-07-18)
|
|
39
44
|
* (HombachC) fix error in sentry logging
|
|
40
45
|
### 0.1.4 (2023-07-17)
|
|
@@ -11,75 +11,94 @@ class TibberAPICaller extends tibberHelper_1.TibberHelper {
|
|
|
11
11
|
this.currentHomeId = "";
|
|
12
12
|
}
|
|
13
13
|
async updateHomesFromAPI() {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
const
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
return homeIdList;
|
|
42
|
-
}
|
|
43
|
-
generateErrorMessage(error, context) {
|
|
44
|
-
let errorMessages = "";
|
|
45
|
-
for (const index in error.errors) {
|
|
46
|
-
if (errorMessages) {
|
|
47
|
-
errorMessages += ", ";
|
|
14
|
+
try {
|
|
15
|
+
const currentHomes = await this.tibberQuery.getHomes();
|
|
16
|
+
this.adapter.log.debug("Got homes from tibber api: " + JSON.stringify(currentHomes));
|
|
17
|
+
const homeIdList = [];
|
|
18
|
+
for (const homeIndex in currentHomes) {
|
|
19
|
+
const currentHome = currentHomes[homeIndex];
|
|
20
|
+
this.currentHomeId = currentHome.id;
|
|
21
|
+
homeIdList.push(this.currentHomeId);
|
|
22
|
+
// Set HomeId in tibberConfig for further API Calls
|
|
23
|
+
this.tibberConfig.homeId = this.currentHomeId;
|
|
24
|
+
// Home GENERAL
|
|
25
|
+
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, "General", "Id"), currentHome.id, "ID of your home");
|
|
26
|
+
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, "General", "Timezone"), currentHome.timeZone, "The time zone the home resides in");
|
|
27
|
+
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, "General", "NameInApp"), currentHome.appNickname, "The nickname given to the home");
|
|
28
|
+
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, "General", "AvatarInApp"), currentHome.appAvatar, "The chosen app avatar for the home");
|
|
29
|
+
// Values: APARTMENT, ROWHOUSE, FLOORHOUSE1, FLOORHOUSE2, FLOORHOUSE3, COTTAGE, CASTLE
|
|
30
|
+
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, "General", "Type"), currentHome.type, "The type of home.");
|
|
31
|
+
// Values: APARTMENT, ROWHOUSE, HOUSE, COTTAGE
|
|
32
|
+
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, "General", "PrimaryHeatingSource"), currentHome.primaryHeatingSource, "The primary form of heating in the home");
|
|
33
|
+
// Values: AIR2AIR_HEATPUMP, ELECTRICITY, GROUND, DISTRICT_HEATING, ELECTRIC_BOILER, AIR2WATER_HEATPUMP, OTHER
|
|
34
|
+
this.checkAndSetValueNumber(this.getStatePrefix(this.currentHomeId, "General", "Size"), currentHome.size, "The size of the home in square meters");
|
|
35
|
+
this.checkAndSetValueNumber(this.getStatePrefix(this.currentHomeId, "General", "NumberOfResidents"), currentHome.numberOfResidents, "The number of people living in the home");
|
|
36
|
+
this.checkAndSetValueNumber(this.getStatePrefix(this.currentHomeId, "General", "MainFuseSize"), currentHome.mainFuseSize, "The main fuse size");
|
|
37
|
+
this.checkAndSetValueBoolean(this.getStatePrefix(this.currentHomeId, "General", "HasVentilationSystem"), currentHome.hasVentilationSystem, "Whether the home has a ventilation system");
|
|
38
|
+
this.fetchAddress("Address", currentHome.address);
|
|
39
|
+
this.fetchLegalEntity("Owner", currentHome.owner);
|
|
40
|
+
this.checkAndSetValueBoolean(this.getStatePrefix(this.currentHomeId, "Features", "RealTimeConsumptionEnabled"), currentHome.features.realTimeConsumptionEnabled);
|
|
48
41
|
}
|
|
49
|
-
|
|
42
|
+
return homeIdList;
|
|
43
|
+
}
|
|
44
|
+
catch (error) {
|
|
45
|
+
this.adapter.log.error(this.generateErrorMessage(error, "fetching homes from Tibber API"));
|
|
46
|
+
// Hier weitere Schritte unternehmen, um auf den Fehler zu reagieren. Neustart?
|
|
47
|
+
return [];
|
|
50
48
|
}
|
|
51
|
-
return "Error (" + error.statusMessage + ") during: " + context + ": " + errorMessages;
|
|
52
49
|
}
|
|
53
50
|
async updateCurrentPrice(homeId) {
|
|
54
51
|
if (homeId) {
|
|
55
52
|
const currentPrice = await this.tibberQuery.getCurrentEnergyPrice(homeId);
|
|
56
|
-
this.adapter.log.debug("
|
|
53
|
+
this.adapter.log.debug("Got current price from tibber api: " + JSON.stringify(currentPrice));
|
|
57
54
|
this.currentHomeId = homeId;
|
|
58
55
|
await this.fetchPrice("CurrentPrice", currentPrice);
|
|
59
56
|
}
|
|
60
57
|
}
|
|
61
58
|
async updatePricesToday(homeId) {
|
|
62
59
|
const pricesToday = await this.tibberQuery.getTodaysEnergyPrices(homeId);
|
|
63
|
-
this.adapter.log.debug("
|
|
60
|
+
this.adapter.log.debug("Got prices today from tibber api: " + JSON.stringify(pricesToday));
|
|
64
61
|
this.currentHomeId = homeId;
|
|
65
62
|
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, "PricesToday", "json"), JSON.stringify(pricesToday), "The prices today as json");
|
|
66
|
-
for (const
|
|
67
|
-
const price = pricesToday[
|
|
63
|
+
for (const i in pricesToday) {
|
|
64
|
+
const price = pricesToday[i];
|
|
68
65
|
const hour = new Date(price.startsAt).getHours();
|
|
69
66
|
this.fetchPrice("PricesToday." + hour, price);
|
|
70
67
|
}
|
|
71
68
|
}
|
|
72
69
|
async updatePricesTomorrow(homeId) {
|
|
73
70
|
const pricesTomorrow = await this.tibberQuery.getTomorrowsEnergyPrices(homeId);
|
|
74
|
-
this.adapter.log.debug("
|
|
71
|
+
this.adapter.log.debug("Got prices tomorrow from tibber api: " + JSON.stringify(pricesTomorrow));
|
|
75
72
|
this.currentHomeId = homeId;
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
73
|
+
if (pricesTomorrow.length === 0) { // pricing not known, before about 13:00 - delete the states
|
|
74
|
+
for (let i = 0; i < 3; i++) {
|
|
75
|
+
const hour = i;
|
|
76
|
+
this.emptyingPrice("PricesTomorrow." + hour);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
else if (pricesTomorrow) { // pricing known, after about 13:00 - write the states
|
|
80
|
+
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, "PricesTomorrow", "json"), JSON.stringify(pricesTomorrow), "The prices tomorrow as json");
|
|
81
|
+
for (const i in pricesTomorrow) {
|
|
82
|
+
const price = pricesTomorrow[i];
|
|
83
|
+
const hour = new Date(price.startsAt).getHours();
|
|
84
|
+
this.fetchPrice("PricesTomorrow." + hour, price);
|
|
85
|
+
}
|
|
81
86
|
}
|
|
82
87
|
}
|
|
88
|
+
fetchPrice(objectDestination, price) {
|
|
89
|
+
this.checkAndSetValueNumber(this.getStatePrefix(this.currentHomeId, objectDestination, "total"), price.total, "The total price (energy + taxes)");
|
|
90
|
+
this.checkAndSetValueNumber(this.getStatePrefix(this.currentHomeId, objectDestination, "energy"), price.energy, "Spotmarket price");
|
|
91
|
+
this.checkAndSetValueNumber(this.getStatePrefix(this.currentHomeId, objectDestination, "tax"), price.tax, "The tax part of the price (energy tax, VAT, etc.)");
|
|
92
|
+
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, objectDestination, "startsAt"), price.startsAt, "Start time of the price");
|
|
93
|
+
//this.checkAndSetValue(this.getStatePrefix(objectDestination, "currency"), price.currency, "The price currency");
|
|
94
|
+
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, objectDestination, "level"), price.level, "Price level compared to recent price values");
|
|
95
|
+
}
|
|
96
|
+
emptyingPrice(objectDestination) {
|
|
97
|
+
this.checkAndSetValueNumber(this.getStatePrefix(this.currentHomeId, objectDestination, "total"), 0, "The total price (energy + taxes)");
|
|
98
|
+
this.checkAndSetValueNumber(this.getStatePrefix(this.currentHomeId, objectDestination, "energy"), 0, "Spotmarket price");
|
|
99
|
+
this.checkAndSetValueNumber(this.getStatePrefix(this.currentHomeId, objectDestination, "tax"), 0, "The tax part of the price (energy tax, VAT, etc.)");
|
|
100
|
+
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, objectDestination, "level"), "Not known now", "Price level compared to recent price values");
|
|
101
|
+
}
|
|
83
102
|
fetchAddress(objectDestination, address) {
|
|
84
103
|
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, objectDestination, "address1"), address.address1);
|
|
85
104
|
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, objectDestination, "address2"), address.address2);
|
|
@@ -90,14 +109,6 @@ class TibberAPICaller extends tibberHelper_1.TibberHelper {
|
|
|
90
109
|
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, objectDestination, "Latitude"), address.latitude);
|
|
91
110
|
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, objectDestination, "Longitude"), address.longitude);
|
|
92
111
|
}
|
|
93
|
-
fetchPrice(objectDestination, price) {
|
|
94
|
-
this.checkAndSetValueNumber(this.getStatePrefix(this.currentHomeId, objectDestination, "total"), price.total, "The total price (energy + taxes)");
|
|
95
|
-
this.checkAndSetValueNumber(this.getStatePrefix(this.currentHomeId, objectDestination, "energy"), price.energy, "Spotmarket price");
|
|
96
|
-
this.checkAndSetValueNumber(this.getStatePrefix(this.currentHomeId, objectDestination, "tax"), price.tax, "The tax part of the price (guarantee of origin certificate, energy tax (Sweden only) and VAT)");
|
|
97
|
-
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, objectDestination, "startsAt"), price.startsAt, "Start time of the price");
|
|
98
|
-
//this.checkAndSetValue(this.getStatePrefix(objectDestination, "currency"), price.currency, "The price currency");
|
|
99
|
-
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, objectDestination, "level"), price.level, "Price level compared to recent price values");
|
|
100
|
-
}
|
|
101
112
|
fetchLegalEntity(objectDestination, legalEntity) {
|
|
102
113
|
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, objectDestination, "Id"), legalEntity.id);
|
|
103
114
|
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, objectDestination, "FirstName"), legalEntity.firstName);
|
|
@@ -118,6 +129,16 @@ class TibberAPICaller extends tibberHelper_1.TibberHelper {
|
|
|
118
129
|
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, objectDestination, "Email"), contactInfo.email);
|
|
119
130
|
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, objectDestination, "Mobile"), contactInfo.mobile);
|
|
120
131
|
}
|
|
132
|
+
generateErrorMessage(error, context) {
|
|
133
|
+
let errorMessages = "";
|
|
134
|
+
for (const index in error.errors) {
|
|
135
|
+
if (errorMessages) {
|
|
136
|
+
errorMessages += ", ";
|
|
137
|
+
}
|
|
138
|
+
errorMessages += error.errors[index].message;
|
|
139
|
+
}
|
|
140
|
+
return "Error (" + error.statusMessage + ") occured during: " + context + ": " + errorMessages;
|
|
141
|
+
}
|
|
121
142
|
}
|
|
122
143
|
exports.TibberAPICaller = TibberAPICaller;
|
|
123
144
|
//# sourceMappingURL=tibberAPICaller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tibberAPICaller.js","sourceRoot":"","sources":["../../src/lib/tibberAPICaller.ts"],"names":[],"mappings":";;;AACA,2CAAkD;AAKlD,iDAA8C;AAE9C,MAAa,eAAgB,SAAQ,2BAAY;IAKhD,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,aAAa,GAAG,EAAE,CAAC;IACzB,CAAC;
|
|
1
|
+
{"version":3,"file":"tibberAPICaller.js","sourceRoot":"","sources":["../../src/lib/tibberAPICaller.ts"],"names":[],"mappings":"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"}
|
package/build/lib/tibberPulse.js
CHANGED
|
@@ -65,7 +65,7 @@ class TibberPulse extends tibberHelper_1.TibberHelper {
|
|
|
65
65
|
}
|
|
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
|
-
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "power"), power, "W", "
|
|
68
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "power"), power, "W", "Powerlevel measured at the moment +/-");
|
|
69
69
|
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "lastMeterConsumption"), (Math.round(1000 * liveMeasurement.lastMeterConsumption)) / 1000, "kWh", "Latest consumption meter state");
|
|
70
70
|
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedConsumption"), (Math.round(1000 * liveMeasurement.accumulatedConsumption)) / 1000, "kWh", "Energy consumed since midnight");
|
|
71
71
|
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedProduction"), (Math.round(1000 * liveMeasurement.accumulatedProduction)) / 1000, "kWh", "Energy produced since midnight");
|
|
@@ -83,26 +83,32 @@ class TibberPulse extends tibberHelper_1.TibberHelper {
|
|
|
83
83
|
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "maxPowerProduction"), liveMeasurement.maxPowerProduction, "W", "Max net production since midnight");
|
|
84
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
|
-
this.
|
|
87
|
-
|
|
88
|
-
this.
|
|
89
|
-
|
|
90
|
-
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "
|
|
91
|
-
|
|
86
|
+
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");
|
|
87
|
+
// "Voltage on phase 1; on Kaifa and Aidon meters the value is not part of every HAN data frame therefore the value is null at timestamps with second value other than 0, 10, 20, 30, 40, 50. There can be other deviations based on concrete meter firmware."
|
|
88
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "voltagePhase2"), liveMeasurement.voltagePhase2, "V", "Voltage on phase 2; on some meters this value is not part of every data frame therefore the value is null at some timestamps");
|
|
89
|
+
// "Voltage on phase 2; on Kaifa and Aidon meters the value is not part of every HAN data frame therefore the value is null at timestamps with second value other than 0, 10, 20, 30, 40, 50. There can be other deviations based on concrete meter firmware."
|
|
90
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "voltagePhase3"), liveMeasurement.voltagePhase3, "V", "Voltage on phase 3; on some meters this value is not part of every data frame therefore the value is null at some timestamps");
|
|
91
|
+
// "Voltage on phase 3; on Kaifa and Aidon meters the value is not part of every HAN data frame therefore the value is null at timestamps with second value other than 0, 10, 20, 30, 40, 50. There can be other deviations based on concrete meter firmware."
|
|
92
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "currentL1"), liveMeasurement.currentL1, "A", "Current on L1; on some meters this value is not part of every data frame therefore the value is null at some timestamps");
|
|
93
|
+
// "Current on L1; on Kaifa and Aidon meters the value is not part of every HAN data frame therefore the value is null at timestamps with second value other than 0, 10, 20, 30, 40, 50. There can be other deviations based on concrete meter firmware."
|
|
94
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "currentL2"), liveMeasurement.currentL2, "A", "Current on L2; on some meters this value is not part of every data frame therefore the value is null at some timestamps");
|
|
95
|
+
// "Current on L2; on Kaifa and Aidon meters the value is not part of every HAN data frame therefore the value is null at timestamps with second value other than 0, 10, 20, 30, 40, 50. There can be other deviations based on concrete meter firmware."
|
|
96
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "currentL3"), liveMeasurement.currentL3, "A", "Current on L3; on some meters this value is not part of every data frame therefore the value is null at some timestamps");
|
|
97
|
+
// "Current on L3; on Kaifa and Aidon meters the value is not part of every HAN data frame therefore the value is null at timestamps with second value other than 0, 10, 20, 30, 40, 50. There can be other deviations based on concrete meter firmware."
|
|
92
98
|
this.checkAndSetValueNumber(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "signalStrength"), liveMeasurement.signalStrength, "Device signal strength (Pulse - dB; Watty - percent)");
|
|
93
99
|
}
|
|
94
100
|
}
|
|
95
101
|
reconnect() {
|
|
96
102
|
const reconnectionInterval = this.adapter.setInterval(() => {
|
|
97
103
|
if (!this.tibberFeed.connected) {
|
|
98
|
-
this.adapter.log.debug("
|
|
104
|
+
this.adapter.log.debug("No TibberFeed connected try reconnecting now in 6sec interval!");
|
|
99
105
|
this.ConnectPulseStream();
|
|
100
106
|
}
|
|
101
107
|
else {
|
|
102
|
-
this.adapter.log.debug("
|
|
108
|
+
this.adapter.log.debug("Reconnection successful! Interval not necessary (anymore).");
|
|
103
109
|
this.adapter.clearInterval(reconnectionInterval);
|
|
104
110
|
}
|
|
105
|
-
},
|
|
111
|
+
}, 6000);
|
|
106
112
|
}
|
|
107
113
|
}
|
|
108
114
|
exports.TibberPulse = TibberPulse;
|
|
@@ -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":";;;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,wBAAwB,GAAI,CAAW,CAAC,OAAO,CAAC,CAAC;SACvE;IACF,CAAC;IAED,qBAAqB;QACpB,IAAI;YACH,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;SACxB;QAAC,OAAO,CAAC,EAAE;YACX,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,GAAI,CAAW,CAAC,OAAO,CAAC,CAAC;SACtE;QAED,oBAAoB;QACpB,IAAI,CAAC,UAAU,GAAG,IAAI,uBAAU,CAAC,IAAI,wBAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;IACtE,CAAC;IAEO,qBAAqB,CAAC,WAAuB;QACpD,4BAA4B;QAC5B,WAAW,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE;YACpC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC1D,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;QAEH,4BAA4B;QAC5B,WAAW,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;YACvC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC1D,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YACtD,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE;gBACnC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;gBACzE,IAAI,CAAC,SAAS,EAAE,CAAC;aACjB;QACF,CAAC,CAAC,CAAC;QAEH,kCAAkC;QAClC,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;YAC7B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,wBAAwB,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QAEH,oBAAoB;QACpB,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/B,MAAM,YAAY,GAAqB,IAAI,CAAC;YAC5C,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;IACJ,CAAC;IAEO,oBAAoB,CAAC,iBAAyB,EAAE,eAAiC;QACxF,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,eAAe,CAAC,KAAK,GAAG,CAAC,EAAE;YAC9B,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC;SAC9B;aAAM,IAAI,eAAe,CAAC,eAAe,GAAG,CAAC,EAAE;YAC/C,KAAK,GAAG,eAAe,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC;SAC7C;QACD,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,KAAK,SAAS,EAAE;YAC3C,IAAI,CAAC,gBAAgB,CACpB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,WAAW,CAAC,EAC7E,eAAe,CAAC,SAAS,EAAE,+BAA+B,CAAC,CAAC;YAC7D,IAAI,CAAC,0BAA0B,CAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,uCAAuC,CAAC,CAAC;YACjI,IAAI,CAAC,0BAA0B,CAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,sBAAsB,CAAC,EACxF,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,eAAe,CAAC,oBAAoB,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,EAAE,gCAAgC,CAAC,CAAC;YAC5G,IAAI,CAAC,0BAA0B,CAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,wBAAwB,CAAC,EAC1F,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,eAAe,CAAC,sBAAsB,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,EAAE,gCAAgC,CAAC,CAAC;YAC9G,IAAI,CAAC,0BAA0B,CAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,uBAAuB,CAAC,EACzF,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,eAAe,CAAC,qBAAqB,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,EAAE,gCAAgC,CAAC,CAAC;YAC7G,IAAI,CAAC,0BAA0B,CAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,gCAAgC,CAAC,EAClG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,eAAe,CAAC,8BAA8B,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,EACjF,6CAA6C,CAAC,CAAC;YAChD,IAAI,CAAC,0BAA0B,CAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,+BAA+B,CAAC,EACjG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,eAAe,CAAC,6BAA6B,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,EAChF,uCAAuC,CAAC,CAAC;YAC1C,IAAI,CAAC,sBAAsB,CAC1B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,EACnF,eAAe,CAAC,eAAe,EAC/B,oEAAoE,CAAC,CAAC;YACvE,IAAI,CAAC,sBAAsB,CAC1B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,mBAAmB,CAAC,EACrF,eAAe,CAAC,iBAAiB,EACjC,sEAAsE,CAAC,CAAC;YACzE,IAAI,CAAC,gBAAgB,CACpB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,CAAC,EAC5E,eAAe,CAAC,QAAQ,EACxB,+DAA+D,CAAC,CAAC;YAClE,IAAI,CAAC,0BAA0B,CAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,CAAC,EAC5E,eAAe,CAAC,QAAQ,EAAE,GAAG,EAAE,gCAAgC,CAAC,CAAC;YAClE,IAAI,CAAC,0BAA0B,CAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,cAAc,CAAC,EAChF,eAAe,CAAC,YAAY,EAAE,GAAG,EAAE,oCAAoC,CAAC,CAAC;YAC1E,IAAI,CAAC,0BAA0B,CAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,CAAC,EAC5E,eAAe,CAAC,QAAQ,EAAE,GAAG,EAAE,iCAAiC,CAAC,CAAC;YACnE,IAAI,CAAC,0BAA0B,CAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,EACpF,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,oCAAoC,CAAC,CAAC;YACnE,IAAI,CAAC,0BAA0B,CAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,EACnF,eAAe,CAAC,eAAe,EAAE,GAAG,EAAE,mCAAmC,CAAC,CAAC;YAC5E,IAAI,CAAC,0BAA0B,CAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,oBAAoB,CAAC,EACtF,eAAe,CAAC,kBAAkB,EAAE,GAAG,EAAE,mCAAmC,CAAC,CAAC;YAC/E,IAAI,CAAC,0BAA0B,CAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,oBAAoB,CAAC,EACtF,eAAe,CAAC,kBAAkB,EAAE,GAAG,EAAE,mCAAmC,CAAC,CAAC;YAC/E,IAAI,CAAC,0BAA0B,CAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,qBAAqB,CAAC,EACvF,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,eAAe,CAAC,mBAAmB,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,EACtE,+BAA+B,CAAC,CAAC;YAClC,IAAI,CAAC,sBAAsB,CAC1B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,aAAa,CAAC,EAC/E,eAAe,CAAC,WAAW,EAAE,8CAA8C,CAAC,CAAC;YAC9E,IAAI,CAAC,0BAA0B,CAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,eAAe,CAAC,EACjF,eAAe,CAAC,aAAa,EAAE,GAAG,EAAE,8HAA8H,CAAC,CAAC;YACpK,8PAA8P;YAC/P,IAAI,CAAC,0BAA0B,CAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,eAAe,CAAC,EACjF,eAAe,CAAC,aAAa,EAAE,GAAG,EAAE,8HAA8H,CAAC,CAAC;YACpK,8PAA8P;YAC/P,IAAI,CAAC,0BAA0B,CAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,eAAe,CAAC,EACjF,eAAe,CAAC,aAAa,EAAE,GAAG,EAAE,8HAA8H,CAAC,CAAC;YACpK,8PAA8P;YAC/P,IAAI,CAAC,0BAA0B,CAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,WAAW,CAAC,EAC7E,eAAe,CAAC,SAAS,EAAE,GAAG,EAAE,yHAAyH,CAAC,CAAC;YAC3J,yPAAyP;YAC1P,IAAI,CAAC,0BAA0B,CAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,WAAW,CAAC,EAC7E,eAAe,CAAC,SAAS,EAAE,GAAG,EAAE,yHAAyH,CAAC,CAAC;YAC3J,yPAAyP;YAC1P,IAAI,CAAC,0BAA0B,CAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,WAAW,CAAC,EAC7E,eAAe,CAAC,SAAS,EAAE,GAAG,EAAE,yHAAyH,CAAC,CAAC;YAC3J,yPAAyP;YAC1P,IAAI,CAAC,sBAAsB,CAC1B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,gBAAgB,CAAC,EAClF,eAAe,CAAC,cAAc,EAAE,sDAAsD,CAAC,CAAC;SACzF;IACF,CAAC;IAEO,SAAS;QAChB,MAAM,oBAAoB,GAAQ,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE;YAC/D,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE;gBAC/B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,gEAAgE,CAAC,CAAC;gBACzF,IAAI,CAAC,kBAAkB,EAAE,CAAC;aAC1B;iBAAM;gBACN,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,4DAA4D,CAAC,CAAC;gBACrF,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;aACjD;QACF,CAAC,EAAE,IAAI,CAAC,CAAC;IACV,CAAC;CACD;AA9KD,kCA8KC"}
|
package/build/main.js
CHANGED
|
@@ -23,8 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
// The adapter-core module gives you access to the core ioBroker functions
|
|
27
|
-
// you need to create an adapter
|
|
26
|
+
// The adapter-core module gives you access to the core ioBroker functions you need to create an adapter
|
|
28
27
|
const utils = __importStar(require("@iobroker/adapter-core"));
|
|
29
28
|
const tibberAPICaller_1 = require("./lib/tibberAPICaller");
|
|
30
29
|
const tibberPulse_1 = require("./lib/tibberPulse");
|
|
@@ -70,13 +69,13 @@ class Tibberlink extends utils.Adapter {
|
|
|
70
69
|
queryUrl: this.queryUrl,
|
|
71
70
|
},
|
|
72
71
|
};
|
|
73
|
-
// Now read
|
|
72
|
+
// Now read homes list from API
|
|
74
73
|
const tibberAPICaller = new tibberAPICaller_1.TibberAPICaller(tibberConfigAPI, this);
|
|
75
74
|
try {
|
|
76
75
|
this.homeIdList = await tibberAPICaller.updateHomesFromAPI();
|
|
77
76
|
}
|
|
78
77
|
catch (error) {
|
|
79
|
-
this.log.
|
|
78
|
+
this.log.error(tibberAPICaller.generateErrorMessage(error, "pull of homes"));
|
|
80
79
|
}
|
|
81
80
|
// if feed is not used - set info.connection if data received
|
|
82
81
|
if (!this.config.FeedActive) {
|
|
@@ -108,7 +107,7 @@ class Tibberlink extends utils.Adapter {
|
|
|
108
107
|
this.setStateAsync("info.LastSentryLogDay", { val: today.getDate(), ack: true });
|
|
109
108
|
}
|
|
110
109
|
}
|
|
111
|
-
// Init Load Data for
|
|
110
|
+
// Init Load Data for all homes
|
|
112
111
|
if (this.homeIdList.length > 0) {
|
|
113
112
|
for (const index in this.homeIdList) {
|
|
114
113
|
try {
|
package/build/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
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.1.
|
|
4
|
+
"version": "0.1.7",
|
|
5
5
|
"news": {
|
|
6
|
+
"0.1.7": {
|
|
7
|
+
"en": "code cleanup, fix error for obsolete next day pricing #23; add another try/catch while fetching homes list #32",
|
|
8
|
+
"de": "code cleanup, fix fehler für veraltete am nächsten tag preis #23; fügen sie einen weiteren versuch / fang, während das fetching homes list #32",
|
|
9
|
+
"ru": "очистка кода, исправление ошибки для устаревших на следующий день цены #23; добавить еще одну попытку/качать при выборе списка домов #32",
|
|
10
|
+
"pt": "limpeza de código, corrigir erro para obsoleto no dia seguinte preços #23; adicionar outro try/catch ao buscar lista casas #32",
|
|
11
|
+
"nl": "codeopruiming, fixfout voor veroudering volgende dag pricing #23, voeg nog een poging/vang toe terwijl je huizenlijst haalt 32",
|
|
12
|
+
"fr": "nettoyage de code, corriger l'erreur pour obsolète prix du lendemain #23; ajouter un autre essai/catch tout en récupérant la liste des maisons #32",
|
|
13
|
+
"it": "pulizia del codice, errore di correzione per obsoleto giorno successivo prezzo #23; aggiungere un altro tentativo/catch mentre il fetching home list #32",
|
|
14
|
+
"es": "limpieza del código, corregir el error para obsoleto precio del día siguiente #23; añadir otro intento / captura mientras que buscar la lista de casas #32",
|
|
15
|
+
"pl": "oczyszczenie kodu dla przestarzałego następnego dnia numer 23; dodanie kolejnego / katego podczas przyzwoitej listy #32",
|
|
16
|
+
"uk": "чистка коду, виправлена помилка для застарілого наступного дня ціни #23; додати ще одну спробу / обману при списці будинків #32",
|
|
17
|
+
"zh-cn": "守则的清理,下一天过时定价的固定错误,第23号;在住房名单中增加一宗尝试/观察。"
|
|
18
|
+
},
|
|
19
|
+
"0.1.6": {
|
|
20
|
+
"en": "add units for live data, bump adapter-core to 3.x",
|
|
21
|
+
"de": "hinzufügen von Einheiten für Live-Daten, adapter-core Update auf 3.x",
|
|
22
|
+
"ru": "добавьте блоки для живых данных, bump adapter-core до 3.x",
|
|
23
|
+
"pt": "adicionar unidades para dados ao vivo, bater o núcleo do adaptador para 3.x",
|
|
24
|
+
"nl": "voeg eenheden toe voor live gegevens, bot adaptercore tot 3.x",
|
|
25
|
+
"fr": "ajouter des unités pour les données en direct, adaptateur de bosse à 3.x",
|
|
26
|
+
"it": "aggiungere unità per dati dal vivo, urtare adattatore-core a 3.x",
|
|
27
|
+
"es": "añadir unidades para datos en vivo, adaptador de parachoques a 3.x",
|
|
28
|
+
"pl": "dodanie do danych na żywo, adapter-core",
|
|
29
|
+
"uk": "до 3.x",
|
|
30
|
+
"zh-cn": "增加生活数据单位,使倾销者适应3.x"
|
|
31
|
+
},
|
|
6
32
|
"0.1.5": {
|
|
7
33
|
"en": "Fix error in sentry logging",
|
|
8
34
|
"de": "Fehler beim Versandprotokoll beheben",
|
|
@@ -140,7 +166,7 @@
|
|
|
140
166
|
],
|
|
141
167
|
"plugins": {
|
|
142
168
|
"sentry": {
|
|
143
|
-
"dsn": "https://
|
|
169
|
+
"dsn": "https://06e51e8346a5411f99ac6b1533d1d0ea@o415875.ingest.sentry.io/4505569088765952"
|
|
144
170
|
}
|
|
145
171
|
}
|
|
146
172
|
},
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "iobroker.tibberlink",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.7",
|
|
4
4
|
"description": "links tibber API data to be used in ioBroker",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Hombach",
|
|
@@ -23,25 +23,26 @@
|
|
|
23
23
|
"node": ">= 16.4.0"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@iobroker/adapter-core": "^
|
|
27
|
-
"tibber-api": "
|
|
26
|
+
"@iobroker/adapter-core": "^3.0.3",
|
|
27
|
+
"tibber-api": "^5.1.9"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
30
|
"@iobroker/testing": "^4.1.0",
|
|
31
|
+
"@iobroker/types": "^5.0.10",
|
|
31
32
|
"@types/chai": "^4.3.5",
|
|
32
33
|
"@types/chai-as-promised": "^7.1.5",
|
|
33
34
|
"@types/mocha": "^10.0.1",
|
|
34
|
-
"@types/node": "^20.4.
|
|
35
|
+
"@types/node": "^20.4.10",
|
|
35
36
|
"@types/proxyquire": "^1.3.28",
|
|
36
|
-
"@types/sinon": "^10.0.
|
|
37
|
+
"@types/sinon": "^10.0.16",
|
|
37
38
|
"@types/sinon-chai": "^3.2.8",
|
|
38
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
39
|
-
"@typescript-eslint/parser": "^
|
|
39
|
+
"@typescript-eslint/eslint-plugin": "^6.3.0",
|
|
40
|
+
"@typescript-eslint/parser": "^6.3.0",
|
|
40
41
|
"axios": "^1.4.0",
|
|
41
42
|
"chai": "^4.3.6",
|
|
42
43
|
"chai-as-promised": "^7.1.1",
|
|
43
|
-
"eslint": "^8.
|
|
44
|
-
"eslint-config-prettier": "^
|
|
44
|
+
"eslint": "^8.47.0",
|
|
45
|
+
"eslint-config-prettier": "^9.0.0",
|
|
45
46
|
"eslint-plugin-prettier": "^4.2.1",
|
|
46
47
|
"mocha": "^10.2.0",
|
|
47
48
|
"prettier": "^2.8.8",
|