Close previous connection when opening a new inspector

Author: vtrifonov

test-app/app/src/main/java/com/tns/AndroidJsV8Inspector.java

@@ -218,6 +218,8 @@ private class JsV8InspectorServer extends NanoWSD {
             super(name);
         }
 
+        private JsV8InspectorWebSocket webSocket;
+
         @Override
         protected Response serveHttp(IHTTPSession session) {
             if (DEBUG_LOG_ENABLED) {
@@ -228,7 +230,18 @@ protected Response serveHttp(IHTTPSession session) {
 
         @Override
         protected WebSocket openWebSocket(IHTTPSession handshake) {
-            return new JsV8InspectorWebSocket(handshake);
+            // close the previous webSocket
+            if(this.webSocket != null) {
+                try {
+                    this.webSocket.close(WebSocketFrame.CloseCode.NormalClosure, "New browser connection is open", false);
+                } catch (IOException ioException) {
+                    if(this.webSocket.getState() != State.CLOSED) {
+                        Log.e("{N}.v8-inspector", "Error closing previous connection", ioException);
+                    }
+                }
+            }
+            this.webSocket = new JsV8InspectorWebSocket(handshake);
+            return this.webSocket;
         }
     }
 

test-app/runtime/src/main/cpp/com_tns_AndroidJsV8Inspector.cpp

@@ -12,6 +12,7 @@ JNIEXPORT extern "C" void Java_com_tns_AndroidJsV8Inspector_init(JNIEnv* env, jo
 }
 
 JNIEXPORT extern "C" void Java_com_tns_AndroidJsV8Inspector_connect(JNIEnv* env, jobject instance, jobject connection) {
+    JsV8InspectorClient::GetInstance()->disconnect();
     JsV8InspectorClient::GetInstance()->connect(connection);
 }
 

test-app/runtime/src/main/java/fi/iki/elonen/NanoWSD.java

@@ -101,6 +101,8 @@ public boolean isOpen() {
             return state == State.OPEN;
         }
 
+        public State getState() { return this.state; }
+
         protected abstract void onOpen();
 
         protected abstract void onClose(CloseCode code, String reason, boolean initiatedByRemote);