Enhancement for websocket re-econnectivity & fix item/channel response (#12191)

Signed-off-by: Stian Kjoglum <stiankj@online.no>
Signed-off-by: kjoglum <stiankj@online.no>

diff --git a/bundles/org.openhab.binding.tibber/src/main/java/org/openhab/binding/tibber/internal/handler/TibberHandler.java b/bundles/org.openhab.binding.tibber/src/main/java/org/openhab/binding/tibber/internal/handler/TibberHandler.java
index 1d6ad8bfb4dd86bdcf52b567f6cb00ca1bd678cb..ac3461fa714445874557370ca4bbe7442c2399fb 100644 (file)
--- a/bundles/org.openhab.binding.tibber/src/main/java/org/openhab/binding/tibber/internal/handler/TibberHandler.java
+++ b/bundles/org.openhab.binding.tibber/src/main/java/org/openhab/binding/tibber/internal/handler/TibberHandler.java
@@ -20,7 +20,6 @@ import java.math.BigDecimal;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Properties;
-import java.util.concurrent.Executor;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
@@ -37,7 +36,6 @@ import org.eclipse.jetty.websocket.api.annotations.WebSocket;
 import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
 import org.openhab.binding.tibber.internal.config.TibberConfiguration;
-import org.openhab.core.common.ThreadPoolManager;
 import org.openhab.core.io.net.http.HttpUtil;
 import org.openhab.core.library.types.DateTimeType;
 import org.openhab.core.library.types.DecimalType;
@@ -69,9 +67,8 @@ public class TibberHandler extends BaseThingHandler {
     private static final int REQUEST_TIMEOUT = (int) TimeUnit.SECONDS.toMillis(20);
     private final Logger logger = LoggerFactory.getLogger(TibberHandler.class);
     private final Properties httpHeader = new Properties();
-    private final SslContextFactory sslContextFactory = new SslContextFactory.Client(true);
-    private final Executor websocketExecutor = ThreadPoolManager.getPool("tibber.websocket");
     private TibberConfiguration tibberConfig = new TibberConfiguration();
+    private @Nullable SslContextFactory sslContextFactory;
     private @Nullable TibberWebSocketListener socket;
     private @Nullable Session session;
     private @Nullable WebSocketClient client;
@@ -125,10 +122,10 @@ public class TibberHandler extends BaseThingHandler {
                         .getAsJsonObject("features").get("realTimeConsumptionEnabled").toString();
 
                 if ("true".equals(rtEnabled)) {
-                    logger.info("Pulse associated with HomeId: Live stream will be started");
+                    logger.debug("Pulse associated with HomeId: Live stream will be started");
                     open();
                 } else {
-                    logger.info("No Pulse associated with HomeId: No live stream will be started");
+                    logger.debug("No Pulse associated with HomeId: No live stream will be started");
                 }
             } else {
                 updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
@@ -163,7 +160,8 @@ 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()));
+                    updateState(CURRENT_LEVEL,
+                            new StringType(myObject.get("level").toString().replaceAll("^\"|\"$", "")));
 
                 } catch (JsonSyntaxException e) {
                     updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
@@ -246,7 +244,7 @@ public class TibberHandler extends BaseThingHandler {
     public void updateRequest() throws IOException {
         getURLInput(BASE_URL);
         if ("true".equals(rtEnabled) && !isConnected()) {
-            logger.info("Attempting to reopen Websocket connection");
+            logger.debug("Attempting to reopen Websocket connection");
             open();
         }
     }
@@ -288,12 +286,12 @@ public class TibberHandler extends BaseThingHandler {
             WebSocketClient client = this.client;
             if (client != null) {
                 try {
-                    logger.warn("Stopping and Terminating Websocket connection");
+                    logger.debug("DISPOSE - Stopping and Terminating Websocket connection");
                     client.stop();
-                    client.destroy();
                 } catch (Exception e) {
                     logger.warn("Websocket Client Stop Exception: {}", e.getMessage());
                 }
+                client.destroy();
                 this.client = null;
             }
         }
@@ -302,23 +300,26 @@ public class TibberHandler extends BaseThingHandler {
 
     public void open() {
         WebSocketClient client = this.client;
-        if (client == null || !client.isRunning()) {
+        if (client == null || !client.isRunning() || !isConnected()) {
             if (client != null) {
                 try {
                     client.stop();
                 } catch (Exception e) {
-                    logger.warn("Failed to stop websocket client: {}", e.getMessage());
+                    logger.warn("OPEN FRAME - Failed to stop websocket client: {}", e.getMessage());
                 }
+                client.destroy();
             }
+            sslContextFactory = new SslContextFactory.Client(true);
             sslContextFactory.setTrustAll(true);
             sslContextFactory.setEndpointIdentificationAlgorithm(null);
 
-            client = new WebSocketClient(sslContextFactory, websocketExecutor);
-            client.setMaxIdleTimeout(600 * 1000);
+            client = new WebSocketClient(sslContextFactory);
+            client.setMaxIdleTimeout(30 * 1000);
             this.client = client;
 
             TibberWebSocketListener socket = this.socket;
             if (socket == null) {
+                logger.debug("New socket being created");
                 socket = new TibberWebSocketListener();
                 this.socket = socket;
             }
@@ -328,14 +329,25 @@ public class TibberHandler extends BaseThingHandler {
             newRequest.setSubProtocols("graphql-subscriptions");
 
             try {
-                logger.info("Starting Websocket connection");
+                logger.debug("Starting Websocket connection");
                 client.start();
             } catch (Exception e) {
                 logger.warn("Websocket Start Exception: {}", e.getMessage());
             }
             try {
-                logger.info("Connecting Websocket connection");
+                logger.debug("Connecting Websocket connection");
                 sessionFuture = client.connect(socket, new URI(SUBSCRIPTION_URL), newRequest);
+                try {
+                    Thread.sleep(10 * 1000);
+                } catch (InterruptedException e) {
+                }
+                Session session = this.session;
+                if (!session.isOpen()) {
+                    close();
+                    logger.warn("Unable to establish websocket session");
+                } else {
+                    logger.debug("Websocket session established");
+                }
             } catch (IOException e) {
                 logger.warn("Websocket Connect Exception: {}", e.getMessage());
             } catch (URISyntaxException e) {
@@ -353,15 +365,19 @@ public class TibberHandler extends BaseThingHandler {
             try {
                 TibberWebSocketListener socket = this.socket;
                 if (socket != null) {
-                    logger.info("Sending websocket disconnect message");
+                    logger.debug("Sending websocket disconnect message");
                     socket.sendMessage(disconnect);
                 } else {
-                    logger.debug("Socket unable to send disconnect message: Socket is null");
+                    logger.warn("Socket unable to send disconnect message: Socket is null");
                 }
             } catch (IOException e) {
                 logger.warn("Websocket Close Exception: {}", e.getMessage());
             }
-            session.close();
+            try {
+                session.close();
+            } catch (Exception e) {
+                logger.warn("Unable to disconnect session");
+            }
             this.session = null;
             this.socket = null;
         }
@@ -374,8 +390,9 @@ public class TibberHandler extends BaseThingHandler {
             try {
                 client.stop();
             } catch (Exception e) {
-                logger.warn("Failed to stop websocket client: {}", e.getMessage());
+                logger.warn("CLOSE FRAME - Failed to stop websocket client: {}", e.getMessage());
             }
+            client.destroy();
         }
     }
 
@@ -395,7 +412,7 @@ public class TibberHandler extends BaseThingHandler {
             String connection = "{\"type\":\"connection_init\", \"payload\":\"token=" + tibberConfig.getToken() + "\"}";
             try {
                 if (socket != null) {
-                    logger.info("Sending websocket connect message");
+                    logger.debug("Sending websocket connect message");
                     socket.sendMessage(connection);
                 } else {
                     logger.debug("Socket unable to send connect message: Socket is null");
@@ -407,11 +424,11 @@ public class TibberHandler extends BaseThingHandler {
 
         @OnWebSocketClose
         public void onClose(int statusCode, String reason) {
-            logger.info("Closing a WebSocket due to {}", reason);
+            logger.debug("Closing a WebSocket due to {}", reason);
             WebSocketClient client = TibberHandler.this.client;
             if (client != null && client.isRunning()) {
                 try {
-                    logger.info("Stopping and Terminating Websocket connection");
+                    logger.debug("ONCLOSE - Stopping and Terminating Websocket connection");
                     client.stop();
                 } catch (Exception e) {
                     logger.warn("Websocket Client Stop Exception: {}", e.getMessage());
@@ -423,13 +440,13 @@ public class TibberHandler extends BaseThingHandler {
         public void onWebSocketError(Throwable e) {
             String message = e.getMessage();
             logger.debug("Error during websocket communication: {}", message);
-            onClose(0, message != null ? message : "null");
+            close();
         }
 
         @OnWebSocketMessage
         public void onMessage(String message) {
             if (message.contains("connection_ack")) {
-                logger.info("Connected to Server");
+                logger.debug("Connected to Server");
                 startSubscription();
             } else if (message.contains("error") || message.contains("terminate")) {
                 logger.debug("Error/terminate received from server: {}", message);