[freeboxos] Better fix for WEB socket registration (#17236)

* Checks if the server supports VM.

Replace #17124 which was more a workaround.

* Change default value

The value is always set when calling openSession.

Signed-off-by: Laurent Garnier <lg.hc@free.fr>

diff --git a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/FreeboxOsSession.java b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/FreeboxOsSession.java
index 911989a702da1abaab81b38138fe6664d18e24c1..32c8dfa1b9c686b38ed18aa67e7717091e6b848f 100644 (file)
--- a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/FreeboxOsSession.java
+++ b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/FreeboxOsSession.java
@@ -52,6 +52,8 @@ public class FreeboxOsSession {
     private @Nullable Session session;
     private String appToken = "";
     private int wsReconnectInterval;
+    @Nullable
+    private Boolean vmSupported;
 
     public enum BoxModel {
         FBXGW_R1_FULL, // Freebox Server (v6) revision 1
@@ -85,7 +87,9 @@ public class FreeboxOsSession {
                 ApiVersion.class, null, null);
         this.uriBuilder = config.getUriBuilder(version.baseUrl());
         this.wsReconnectInterval = config.wsReconnectInterval;
+        this.vmSupported = null;
         getManager(LoginManager.class);
+        getManager(SystemManager.class);
         getManager(NetShareManager.class);
         getManager(LanManager.class);
         getManager(WifiManager.class);
@@ -95,9 +99,13 @@ public class FreeboxOsSession {
 
     public void openSession(String appToken) throws FreeboxException {
         Session newSession = getManager(LoginManager.class).openSession(appToken);
-        getManager(WebSocketManager.class).openSession(newSession.sessionToken(), wsReconnectInterval);
         session = newSession;
         this.appToken = appToken;
+        if (vmSupported == null) {
+            vmSupported = getManager(SystemManager.class).getConfig().modelInfo().hasVm();
+        }
+        getManager(WebSocketManager.class).openSession(newSession.sessionToken(), wsReconnectInterval,
+                Boolean.TRUE.equals(vmSupported));
     }
 
     public String grant() throws FreeboxException {

diff --git a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/WebSocketManager.java b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/WebSocketManager.java
index 99aca9298ff717236fbf8baed1cf90121a3e63e1..4b4b6b2539879aabb80ddcb1f43411be9015e77e 100644 (file)
--- a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/WebSocketManager.java
+++ b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/WebSocketManager.java
@@ -73,8 +73,7 @@ public class WebSocketManager extends RestManager implements WebSocketListener {
     @Nullable
     private String sessionToken;
     private int reconnectInterval;
-    private boolean vmSupported = true;
-    private boolean retryConnectWithoutVm = false;
+    private boolean vmSupported;
 
     private record Register(String action, List<String> events) {
         Register(String... events) {
@@ -101,9 +100,10 @@ public class WebSocketManager extends RestManager implements WebSocketListener {
         }
     }
 
-    public void openSession(@Nullable String sessionToken, int reconnectInterval) {
+    public void openSession(@Nullable String sessionToken, int reconnectInterval, boolean vmSupported) {
         this.sessionToken = sessionToken;
         this.reconnectInterval = reconnectInterval;
+        this.vmSupported = vmSupported;
         if (reconnectInterval > 0) {
             try {
                 client.start();
@@ -190,12 +190,6 @@ public class WebSocketManager extends RestManager implements WebSocketListener {
                 default:
                     logger.warn("Unhandled notification received: {}", result.action);
             }
-        } else if (result.action == Action.REGISTER) {
-            logger.debug("Event registration failed!");
-            if (vmSupported && "unsupported event vm_state_changed".equals(result.msg)) {
-                vmSupported = false;
-                retryConnectWithoutVm = true;
-            }
         }
     }
 
@@ -233,11 +227,6 @@ public class WebSocketManager extends RestManager implements WebSocketListener {
     public void onWebSocketClose(int statusCode, @NonNullByDefault({}) String reason) {
         logger.debug("Socket Closed: [{}] - reason {}", statusCode, reason);
         this.wsSession = null;
-        if (retryConnectWithoutVm) {
-            logger.debug("Retry connecting websocket client without VM support");
-            retryConnectWithoutVm = false;
-            startReconnect();
-        }
     }
 
     @Override