demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 07:02:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

[meater] Fix broken cloud communication (#16994)

Browse Source 
* Improve error handling

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
This commit is contained in:
Jacob Laursen 2024-07-05 16:55:05 +02:00
parent 4b7220c552
commit ac2ff96f25
2 changed files with 56 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
bundles/org.openhab.binding.meater/src/main/java/org/openhab/binding/meater/internal/api/MeaterRestAPI.java
View File

@ -35,6 +35,7 @@ import org.openhab.binding.meater.internal.dto.MeaterProbeDTO.Device;
import org.openhab.binding.meater.internal.exceptions.MeaterAuthenticationException;
import org.openhab.binding.meater.internal.exceptions.MeaterException;
import org.openhab.core.i18n.LocaleProvider;
import org.osgi.framework.FrameworkUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -63,6 +64,7 @@ public class MeaterRestAPI {
private final Gson gson;
private final HttpClient httpClient;
private final MeaterBridgeConfiguration configuration;
private final String userAgent;
private String authToken = "";
private LocaleProvider localeProvider;
@ -72,10 +74,10 @@ public class MeaterRestAPI {
this.configuration = configuration;
this.httpClient = httpClient;
this.localeProvider = localeProvider;
userAgent = "openHAB/" + FrameworkUtil.getBundle(this.getClass()).getVersion().toString();
}
public boolean refresh(Map<String, MeaterProbeDTO.Device> meaterProbeThings) {
try {
public void refresh(Map<String, MeaterProbeDTO.Device> meaterProbeThings) throws MeaterException {
MeaterProbeDTO dto = getDevices(MeaterProbeDTO.class);
if (dto != null) {
List<Device> devices = dto.getData().getDevices();
@ -87,27 +89,27 @@ public class MeaterRestAPI {
} else {
meaterProbeThings.clear();
}
return true;
}
}
} catch (MeaterException e) {
logger.warn("Failed to refresh! {}", e.getMessage());
}
return false;
}
private void login() throws MeaterException {
try {
// Login
String json = "{ \"email\": \"" + configuration.email + "\", \"password\": \"" + configuration.password
+ "\" }";
Request request = httpClient.newRequest(API_ENDPOINT + LOGIN).method(HttpMethod.POST)
.timeout(REQUEST_TIMEOUT_MS, TimeUnit.MILLISECONDS);
request.header(HttpHeader.ACCEPT, JSON_CONTENT_TYPE);
request.header(HttpHeader.CONTENT_TYPE, JSON_CONTENT_TYPE);
request.content(new StringContentProvider(json), JSON_CONTENT_TYPE);
String json = """
{
"email": "%s",
"password": "%s"
}
""".formatted(configuration.email, configuration.password);
Request request = httpClient.newRequest(API_ENDPOINT + LOGIN) //
.method(HttpMethod.POST) //
.timeout(REQUEST_TIMEOUT_MS, TimeUnit.MILLISECONDS) //
.header(HttpHeader.ACCEPT, JSON_CONTENT_TYPE) //
.agent(userAgent) //
.content(new StringContentProvider(json), JSON_CONTENT_TYPE);
logger.trace("{}.", request.toString());
logger.trace("{}", request.toString());
ContentResponse httpResponse = request.send();
if (!HttpStatus.isSuccess(httpResponse.getStatus())) {
@ -135,24 +137,25 @@ public class MeaterRestAPI {
try {
for (int i = 0; i < MAX_RETRIES; i++) {
try {
Request request = httpClient.newRequest(API_ENDPOINT + uri).method(HttpMethod.GET)
.timeout(REQUEST_TIMEOUT_MS, TimeUnit.MILLISECONDS);
request.header(HttpHeader.AUTHORIZATION, "Bearer " + authToken);
request.header(HttpHeader.ACCEPT, JSON_CONTENT_TYPE);
request.header(HttpHeader.CONTENT_TYPE, JSON_CONTENT_TYPE);
request.header(HttpHeader.ACCEPT_LANGUAGE, localeProvider.getLocale().getLanguage());
Request request = httpClient.newRequest(API_ENDPOINT + uri) //
.method(HttpMethod.GET) //
.timeout(REQUEST_TIMEOUT_MS, TimeUnit.MILLISECONDS)
.header(HttpHeader.AUTHORIZATION, "Bearer " + authToken)
.header(HttpHeader.ACCEPT, JSON_CONTENT_TYPE)
.header(HttpHeader.ACCEPT_LANGUAGE, localeProvider.getLocale().getLanguage())
.agent(userAgent);
ContentResponse response = request.send();
String content = response.getContentAsString();
logger.trace("API response: {}", content);
if (response.getStatus() == HttpStatus.UNAUTHORIZED_401) {
int status = response.getStatus();
if (status == HttpStatus.UNAUTHORIZED_401) {
// This will currently not happen because "WWW-Authenticate" header is missing; see below.
logger.debug("getFromApi failed, authentication failed, HTTP status: 401");
throw new MeaterAuthenticationException("Authentication failed");
} else if (!HttpStatus.isSuccess(response.getStatus())) {
logger.debug("getFromApi failed, HTTP status: {}", response.getStatus());
throw new MeaterException("Failed to fetch from API!");
} else if (!HttpStatus.isSuccess(status)) {
throw new MeaterException(HttpStatus.getCode(status).getMessage());
} else {
return content;
}
@ -160,7 +163,7 @@ public class MeaterRestAPI {
logger.debug("TimeoutException error in get: {}", e.getMessage());
}
}
throw new MeaterException("Failed to fetch from API!");
throw new MeaterException("Failed to fetch from API");
} catch (ExecutionException e) {
Throwable cause = e.getCause();
if (cause instanceof HttpResponseException httpResponseException) {
@ -201,7 +204,7 @@ public class MeaterRestAPI {
}
if (json.isEmpty()) {
throw new MeaterException("JSON from API is empty!");
throw new MeaterException("JSON from API is empty");
} else {
try {
return gson.fromJson(json, dto);

18
bundles/org.openhab.binding.meater/src/main/java/org/openhab/binding/meater/internal/handler/MeaterBridgeHandler.java
View File

@ -28,6 +28,7 @@ import org.openhab.binding.meater.internal.MeaterBridgeConfiguration;
import org.openhab.binding.meater.internal.api.MeaterRestAPI;
import org.openhab.binding.meater.internal.discovery.MeaterDiscoveryService;
import org.openhab.binding.meater.internal.dto.MeaterProbeDTO;
import org.openhab.binding.meater.internal.exceptions.MeaterException;
import org.openhab.core.i18n.LocaleProvider;
import org.openhab.core.i18n.TranslationProvider;
import org.openhab.core.thing.Bridge;
@ -109,10 +110,14 @@ public class MeaterBridgeHandler extends BaseBridgeHandler {
meaterProbeThings.clear();
}
private boolean refreshAndUpdateStatus() {
private void refreshAndUpdateStatus() {
MeaterRestAPI localAPI = api;
if (localAPI != null) {
if (localAPI.refresh(meaterProbeThings)) {
if (localAPI == null) {
return;
}
try {
localAPI.refresh(meaterProbeThings);
updateStatus(ThingStatus.ONLINE);
getThing().getThings().stream().forEach(thing -> {
MeaterHandler handler = (MeaterHandler) thing.getHandler();
@ -120,13 +125,10 @@ public class MeaterBridgeHandler extends BaseBridgeHandler {
handler.update();
}
});
return true;
} else {
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR);
} catch (MeaterException e) {
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, e.getMessage());
}
}
return false;
}
private void startAutomaticRefresh() {
ScheduledFuture<?> refreshJob = this.refreshJob;