[netatmo] Handling camera ping timeouts (#13487)

* Solves #13486

Signed-off-by: clinique <gael@lhopital.org>

diff --git a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/api/SecurityApi.java b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/api/SecurityApi.java
index bbb9038bfe903ba27d4471418c3bd9c093732c8f..aa2157b6e7984a53e0a75c59d9479b9fff9a5a2c 100644 (file)
--- a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/api/SecurityApi.java
+++ b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/api/SecurityApi.java
@@ -21,6 +21,7 @@ import java.util.stream.Collectors;
 import javax.ws.rs.core.UriBuilder;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.netatmo.internal.api.data.NetatmoConstants.FeatureArea;
 import org.openhab.binding.netatmo.internal.api.data.NetatmoConstants.FloodLightMode;
 import org.openhab.binding.netatmo.internal.api.dto.Home;
@@ -28,6 +29,8 @@ import org.openhab.binding.netatmo.internal.api.dto.HomeEvent;
 import org.openhab.binding.netatmo.internal.api.dto.HomeEvent.NAEventsDataResponse;
 import org.openhab.binding.netatmo.internal.api.dto.Ping;
 import org.openhab.binding.netatmo.internal.handler.ApiBridgeHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Base class for all Security related endpoints
@@ -36,6 +39,8 @@ import org.openhab.binding.netatmo.internal.handler.ApiBridgeHandler;
  */
 @NonNullByDefault
 public class SecurityApi extends RestManager {
+    private final Logger logger = LoggerFactory.getLogger(SecurityApi.class);
+
     public SecurityApi(ApiBridgeHandler apiClient) {
         super(apiClient, FeatureArea.SECURITY);
     }
@@ -91,10 +96,14 @@ public class SecurityApi extends RestManager {
         throw new NetatmoException("home should not be null");
     }
 
-    public String ping(String vpnUrl) throws NetatmoException {
+    public @Nullable String ping(String vpnUrl) {
         UriBuilder uriBuilder = UriBuilder.fromUri(vpnUrl).path(PATH_COMMAND).path(SUB_PATH_PING);
-        Ping response = get(uriBuilder, Ping.class);
-        return response.getStatus();
+        try {
+            return get(uriBuilder, Ping.class).getStatus();
+        } catch (NetatmoException e) {
+            logger.debug("Pinging {} failed : {}", vpnUrl, e.getMessage());
+            return null;
+        }
     }
 
     public void changeStatus(String localCameraURL, boolean setOn) throws NetatmoException {

diff --git a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/CommonInterface.java b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/CommonInterface.java
index 18eb8b3ffede22f23e312b6206142eca5852c83c..27e8b6089af45a88a09848f85b85fb9de28cb352 100644 (file)
--- a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/CommonInterface.java
+++ b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/CommonInterface.java
@@ -155,7 +155,9 @@ public interface CommonInterface {
                 finalReason = thingStatusReason;
             }
         }
-        if (!newData.isIgnoredForThingUpdate()) {
+        // Prevent turning ONLINE myself if in the meantime something turned account OFFLINE
+        ApiBridgeHandler accountHandler = getAccountHandler();
+        if (accountHandler != null && accountHandler.isConnected() && !newData.isIgnoredForThingUpdate()) {
             setThingStatus(finalReason == null ? ThingStatus.ONLINE : ThingStatus.OFFLINE, ThingStatusDetail.NONE,
                     finalReason);
         }

diff --git a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/CameraCapability.java b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/CameraCapability.java
index 7c526b3cc05d4c98a880244b1753b1f8ee7eb68d..910c018c56cb3154b605bd1d6cd4a12513fbe26b 100644 (file)
--- a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/CameraCapability.java
+++ b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/CameraCapability.java
@@ -49,6 +49,7 @@ public class CameraCapability extends HomeSecurityThingCapability {
     private final ChannelUID personChannelUID;
 
     protected @Nullable String localUrl;
+    protected @Nullable String vpnUrl;
 
     public CameraCapability(CommonInterface handler, NetatmoDescriptionProvider descriptionProvider,
             List<ChannelHelper> channelHelpers) {
@@ -62,12 +63,15 @@ public class CameraCapability extends HomeSecurityThingCapability {
     @Override
     public void updateHomeStatusModule(HomeStatusModule newData) {
         super.updateHomeStatusModule(newData);
-        String vpnUrl = newData.getVpnUrl();
-        if (vpnUrl != null) {
-            localUrl = newData.isLocal() ? securityCapability.map(cap -> cap.ping(vpnUrl)).orElse(null) : null;
-            cameraHelper.setUrls(vpnUrl, localUrl);
-            eventHelper.setUrls(vpnUrl, localUrl);
+        // Per documentation vpn_url expires every 3 hours and on camera reboot. So useless to reping it if not changed
+        String newVpnUrl = newData.getVpnUrl();
+        if (newVpnUrl != null && !newVpnUrl.equals(vpnUrl)) {
+            // This will also decrease the number of requests emitted toward Netatmo API.
+            localUrl = newData.isLocal() ? securityCapability.map(cap -> cap.ping(newVpnUrl)).orElse(null) : null;
+            cameraHelper.setUrls(newVpnUrl, localUrl);
+            eventHelper.setUrls(newVpnUrl, localUrl);
         }
+        vpnUrl = newVpnUrl;
         if (!SdCardStatus.SD_CARD_WORKING.equals(newData.getSdStatus())
                 || !AlimentationStatus.ALIM_CORRECT_POWER.equals(newData.getAlimStatus())) {
             statusReason = String.format("%s, %s", newData.getSdStatus(), newData.getAlimStatus());

diff --git a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/SecurityCapability.java b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/SecurityCapability.java
index 6fa9661e5728fdfebf84ecc66468a1ce8ec5f9e7..2803973576f51b1e834ac6e4643a09cb52deafab 100644 (file)
--- a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/SecurityCapability.java
+++ b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/SecurityCapability.java
@@ -145,12 +145,7 @@ class SecurityCapability extends RestCapability<SecurityApi> {
 
     public @Nullable String ping(String vpnUrl) {
         return getApi().map(api -> {
-            try {
-                return api.ping(vpnUrl);
-            } catch (NetatmoException e) {
-                logger.warn("Error pinging camera '{}' : {}", vpnUrl, e.getMessage());
-                return null;
-            }
+            return api.ping(vpnUrl);
         }).orElse(null);
     }