public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[tibber] Enhancement, added channel and channel corrections due to API changes (#9814)

Browse Source 
Signed-off-by: Stian Kjoglum <stiankj@online.no>
This commit is contained in:
Stian Kjoglum
2021-01-14 01:35:03 +01:00
committed by GitHub
parent 7e5e0e2295
commit 3f85b32502
5 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bundles/org.openhab.binding.tibber/src/main/java/org/openhab/binding/tibber/internal/TibberBindingConstants.java
View File

@@ -43,6 +43,7 @@ public class TibberBindingConstants {
// List of all Channel ids - Used for queries
public static final String CURRENT_TOTAL = "current_total";
public static final String CURRENT_STARTSAT = "current_startsAt";
public static final String CURRENT_LEVEL = "current_level";
public static final String DAILY_FROM = "daily_from";
public static final String DAILY_TO = "daily_to";
public static final String DAILY_COST = "daily_cost";

34
bundles/org.openhab.binding.tibber/src/main/java/org/openhab/binding/tibber/internal/handler/TibberHandler.java
View File

@@ -102,6 +102,7 @@ public class TibberHandler extends BaseThingHandler {
}
public void getTibberParameters() {
String response = "";
try {
httpHeader.put("cache-control", "no-cache");
httpHeader.put("content-type", JSON_CONTENT_TYPE);
@@ -109,12 +110,10 @@ public class TibberHandler extends BaseThingHandler {
TibberPriceConsumptionHandler tibberQuery = new TibberPriceConsumptionHandler();
InputStream connectionStream = tibberQuery.connectionInputStream(tibberConfig.getHomeid());
String response = HttpUtil.executeUrl("POST", BASE_URL, httpHeader, connectionStream, null,
REQUEST_TIMEOUT);
response = HttpUtil.executeUrl("POST", BASE_URL, httpHeader, connectionStream, null, REQUEST_TIMEOUT);
if (!response.contains("error") && !response.contains("<html>")) {
updateStatus(ThingStatus.ONLINE);
getURLInput(BASE_URL);
InputStream inputStream = tibberQuery.getRealtimeInputStream(tibberConfig.getHomeid());
@@ -141,10 +140,11 @@ public class TibberHandler extends BaseThingHandler {
}
public void getURLInput(String url) throws IOException {
String jsonResponse = "";
TibberPriceConsumptionHandler tibberQuery = new TibberPriceConsumptionHandler();
InputStream inputStream = tibberQuery.getInputStream(tibberConfig.getHomeid());
String jsonResponse = HttpUtil.executeUrl("POST", url, httpHeader, inputStream, null, REQUEST_TIMEOUT);
jsonResponse = HttpUtil.executeUrl("POST", url, httpHeader, inputStream, null, REQUEST_TIMEOUT);
logger.debug("API response: {}", jsonResponse);
if (!jsonResponse.contains("error") && !jsonResponse.contains("<html>")) {
@@ -163,13 +163,15 @@ public class TibberHandler extends BaseThingHandler {
updateState(CURRENT_TOTAL, new DecimalType(myObject.get("total").toString()));
String timestamp = myObject.get("startsAt").toString().substring(1, 20);
updateState(CURRENT_STARTSAT, new DateTimeType(timestamp));
updateState(CURRENT_LEVEL, new StringType(myObject.get("level").toString()));
} catch (JsonSyntaxException e) {
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
"Error communicating with Tibber API: " + e.getMessage());
}
}
if (jsonResponse.contains("daily")) {
if (jsonResponse.contains("daily") && !jsonResponse.contains("\"daily\":{\"nodes\":[]")
&& !jsonResponse.contains("\"daily\":null")) {
try {
JsonObject myObject = (JsonObject) object.getAsJsonObject("data").getAsJsonObject("viewer")
.getAsJsonObject("home").getAsJsonObject("daily").getAsJsonArray("nodes").get(0);
@@ -188,7 +190,8 @@ public class TibberHandler extends BaseThingHandler {
"Error communicating with Tibber API: " + e.getMessage());
}
}
if (jsonResponse.contains("hourly")) {
if (jsonResponse.contains("hourly") && !jsonResponse.contains("\"hourly\":{\"nodes\":[]")
&& !jsonResponse.contains("\"hourly\":null")) {
try {
JsonObject myObject = (JsonObject) object.getAsJsonObject("data").getAsJsonObject("viewer")
.getAsJsonObject("home").getAsJsonObject("hourly").getAsJsonArray("nodes").get(0);
@@ -257,7 +260,7 @@ public class TibberHandler extends BaseThingHandler {
updateState(channelID, new QuantityType<>(new BigDecimal(channelValue), Units.WATT));
} else if (channelID.contains("voltage")) {
updateState(channelID, new QuantityType<>(new BigDecimal(channelValue), Units.VOLT));
} else if (channelID.contains("live_current")) {
} else if (channelID.contains("current")) {
updateState(channelID, new QuantityType<>(new BigDecimal(channelValue), Units.AMPERE));
} else {
updateState(channelID, new DecimalType(channelValue));
@@ -307,6 +310,7 @@ public class TibberHandler extends BaseThingHandler {
WebSocketClient client = this.client;
if (client == null) {
client = new WebSocketClient(sslContextFactory, websocketExecutor);
client.setMaxIdleTimeout(600 * 1000);
this.client = client;
}
@@ -352,7 +356,7 @@ public class TibberHandler extends BaseThingHandler {
} catch (IOException e) {
logger.warn("Websocket Close Exception: {}", e.getMessage());
}
session.close(0, "Tibber websocket disposed");
session.close();
this.session = null;
this.socket = null;
}
@@ -470,14 +474,14 @@ public class TibberHandler extends BaseThingHandler {
if (myObject.has("voltagePhase3")) {
updateChannel(LIVE_VOLTAGE3, myObject.get("voltagePhase3").toString());
}
if (myObject.has("currentPhase1")) {
updateChannel(LIVE_CURRENT1, myObject.get("currentPhase1").toString());
if (myObject.has("currentL1")) {
updateChannel(LIVE_CURRENT1, myObject.get("currentL1").toString());
}
if (myObject.has("currentPhase2")) {
updateChannel(LIVE_CURRENT2, myObject.get("currentPhase2").toString());
if (myObject.has("currentL2")) {
updateChannel(LIVE_CURRENT2, myObject.get("currentL2").toString());
}
if (myObject.has("currentPhase3")) {
updateChannel(LIVE_CURRENT3, myObject.get("currentPhase3").toString());
if (myObject.has("currentL3")) {
updateChannel(LIVE_CURRENT3, myObject.get("currentL3").toString());
}
if (myObject.has("powerProduction")) {
updateChannel(LIVE_POWERPRODUCTION, myObject.get("powerProduction").toString());
@@ -508,7 +512,7 @@ public class TibberHandler extends BaseThingHandler {
String query = "{\"id\":\"1\",\"type\":\"start\",\"payload\":{\"variables\":{},\"extensions\":{},\"operationName\":null,\"query\":\"subscription {\\n liveMeasurement(homeId:\\\""
+ tibberConfig.getHomeid()
+ "\\\") {\\n timestamp\\n power\\n lastMeterConsumption\\n accumulatedConsumption\\n accumulatedCost\\n currency\\n minPower\\n averagePower\\n maxPower\\n"
+ "voltagePhase1\\n voltagePhase2\\n voltagePhase3\\n currentPhase1\\n currentPhase2\\n currentPhase3\\n powerProduction\\n accumulatedProduction\\n minPowerProduction\\n maxPowerProduction\\n }\\n }\\n\"}}";
+ "voltagePhase1\\n voltagePhase2\\n voltagePhase3\\n currentL1\\n currentL2\\n currentL3\\n powerProduction\\n accumulatedProduction\\n minPowerProduction\\n maxPowerProduction\\n }\\n }\\n\"}}";
try {
TibberWebSocketListener socket = TibberHandler.this.socket;
if (socket != null) {

2
bundles/org.openhab.binding.tibber/src/main/java/org/openhab/binding/tibber/internal/handler/TibberPriceConsumptionHandler.java
View File

@@ -33,7 +33,7 @@ public class TibberPriceConsumptionHandler {
public InputStream getInputStream(String homeId) {
String Query = "{\"query\": \"{viewer {home (id: \\\"" + homeId
+ "\\\") {currentSubscription {priceInfo {current {total startsAt }}} daily: consumption(resolution: DAILY, last: 1) {nodes {from to cost unitPrice consumption consumptionUnit}} hourly: consumption(resolution: HOURLY, last: 1) {nodes {from to cost unitPrice consumption consumptionUnit}}}}}\"}";
+ "\\\") {currentSubscription {priceInfo {current {total startsAt level }}} daily: consumption(resolution: DAILY, last: 1) {nodes {from to cost unitPrice consumption consumptionUnit}} hourly: consumption(resolution: HOURLY, last: 1) {nodes {from to cost unitPrice consumption consumptionUnit}}}}}\"}";
return new ByteArrayInputStream(Query.getBytes(StandardCharsets.UTF_8));
}

6
bundles/org.openhab.binding.tibber/src/main/resources/OH-INF/thing/thing-types.xml
View File

@@ -10,6 +10,7 @@
<channels>
<channel id="current_total" typeId="price"/>
<channel id="current_startsAt" typeId="timestamp"/>
<channel id="current_level" typeId="level"/>
<channel id="daily_from" typeId="timestamp"/>
<channel id="daily_to" typeId="timestamp"/>
<channel id="daily_cost" typeId="cost"/>
@@ -68,6 +69,11 @@
<description>Total Price: Energy + Tax</description>
<state pattern="%.3f"></state>
</channel-type>
<channel-type id="level">
<item-type>String</item-type>
<label>Price Level</label>
<description>Current price level</description>
</channel-type>
<channel-type id="cost">
<item-type>Number:Dimensionless</item-type>
<label>Total Cost</label>