Merge pull request #104 from Smarteon/listener

Introduce local end socket closed event

src/main/java/cz/smarteon/loxone/LoxoneWebSocket.java

@@ -379,9 +379,13 @@ void connectionOpened() {
 
     }
 
-    void connectionClosed(int code) {
+    void connectionClosed(int code, boolean remote) {
         if (webSocketListener != null) {
-            webSocketListener.webSocketRemoteClosed(code);
+            if (remote) {
+                webSocketListener.webSocketRemoteClosed(code);
+            } else {
+                webSocketListener.webSocketLocalClosed(code);
+            }
         }
     }
 

src/main/java/cz/smarteon/loxone/LoxoneWebSocketListener.java

@@ -11,10 +11,15 @@ public interface LoxoneWebSocketListener {
     void webSocketOpened();
 
     /**
-     * Loxone web socket has been closed.
+     * Loxone web socket has been closed by remote end.
      * @param code the code returned by the socket when the connection is closed
      */
-    default void webSocketRemoteClosed(int code){
-
-    }
+    default void webSocketRemoteClosed(int code) {}
+
+    /**
+     * Loxone web socket has been closed by local end. This is mostly the situation indicating
+     * {@link LoxoneWebSocket#close()} has been called.
+     * @param code the code returned by the socket when the connection is closed
+     */
+    default void webSocketLocalClosed(int code) {}
 }

src/main/java/cz/smarteon/loxone/LoxoneWebsocketClient.java

@@ -127,8 +127,8 @@ public void onClose(int code, String reason, boolean remote) {
         if (keepAliveFuture != null) {
             keepAliveFuture.cancel(true);
         }
+        ws.connectionClosed(code, remote);
         if (remote) {
-            ws.connectionClosed(code);
             ws.autoRestart();
         }
     }

src/test/groovy/cz/smarteon/loxone/LoxoneWebSocketTest.groovy

@@ -88,12 +88,18 @@ class LoxoneWebSocketTest extends Specification {
 
         when:
         loxoneWebSocket.setWebSocketListener(listener)
-        loxoneWebSocket.connectionClosed(1000)
+        loxoneWebSocket.connectionClosed(1000, remote)
         sleep(10) // wait for another thread execution
 
         then:
         loxoneWebSocket.getWebSocketListener() == listener
-        1 * listener.webSocketRemoteClosed(1000)
+        if (remote)
+            1 * listener.webSocketRemoteClosed(1000)
+        else
+            1 * listener.webSocketLocalClosed(1000)
+
+        where:
+        remote << [true, false]
     }
 
     def "should close properly"() {

src/test/groovy/cz/smarteon/loxone/LoxoneWebsocketClientTest.groovy

@@ -1,19 +1,37 @@
 package cz.smarteon.loxone
 
 import spock.lang.Specification
+import spock.lang.Subject
 
 import java.nio.ByteBuffer
 
 class LoxoneWebsocketClientTest extends Specification {
 
-    LoxoneWebsocketClient client
+    @Subject LoxoneWebsocketClient client
+    LoxoneWebSocket webSocket
 
     void setup() {
-        client = new LoxoneWebsocketClient(Mock(LoxoneWebSocket), URI.create(''))
+        webSocket = Mock(LoxoneWebSocket)
+        client = new LoxoneWebsocketClient(webSocket, URI.create(''))
     }
 
     def "should parse binary message"() {
         expect:
         client.onMessage(ByteBuffer.wrap([0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0] as byte[]))
     }
+
+    def "should handle onClose"() {
+        when:
+        client.onClose(1000, 'some reason', remote)
+
+        then:
+        1 * webSocket.wsClosed()
+        1 * webSocket.connectionClosed(1000, remote)
+        if (remote) {
+            1 * webSocket.autoRestart()
+        }
+
+        where:
+        remote << [true, false]
+    }
 }