connect web socket in separate thread (#116)

* connect websocket in seprete thread

* connect websocket in seprete thread

* connect websocket in seprete thread

Author: USAMAWIZARD

webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/websocket/WebSocketConstants.java

@@ -449,4 +449,6 @@ private WebSocketConstants() {
      */
     public static final String BROADCAST = "broadcast";
 
+    public static final int WEBSOCKET_CONNECTION_TIMEOUT = 10000; //10 sec
+
 }

webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/websocket/WebSocketHandler.java

@@ -24,10 +24,11 @@
 
 import static io.antmedia.webrtcandroidframework.websocket.WebSocketConstants.DEFINITION;
 import static io.antmedia.webrtcandroidframework.websocket.WebSocketConstants.NOTIFICATION_COMMAND;
+import static io.antmedia.webrtcandroidframework.websocket.WebSocketConstants.WEBSOCKET_CONNECTION_TIMEOUT;
+
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-
 public class WebSocketHandler implements WebSocket.WebSocketConnectionObserver {
     private static final String TAG = "WebSocketHandler";
     private static final int CLOSE_TIMEOUT = 1000;
@@ -61,20 +62,36 @@ public WebSocketHandler(AntMediaSignallingEvents signallingListener, Handler han
         gson = builder.create();
     }
 
+    public WebSocketConnection creteWebSocket(){
+        return new WebSocketConnection();
+    }
     public void connect(final String wsUrl) {
         checkIfCalledOnValidThread();
+        if(wsUrl==null || wsUrl.isBlank())
+            return;
         wsServerUrl = wsUrl;
-        Log.d(TAG, "Connecting WebSocket to: " + wsUrl);
-        ws = new WebSocketConnection();
-        try {
-            ws.connect(new URI(wsServerUrl), this);
-        } catch (WebSocketException e) {
-            e.printStackTrace();
-            disconnect(false);
-        } catch (URISyntaxException e) {
-            e.printStackTrace();
-            disconnect(false);
-        }
+
+        ws = creteWebSocket();
+        Thread connectorThread = new Thread(() -> {
+            try {
+                ws.connect(new URI(wsServerUrl), this);
+            } catch (WebSocketException e) {
+                e.printStackTrace();
+                disconnect(false);
+            } catch (URISyntaxException e) {
+                e.printStackTrace();
+                disconnect(false);
+            }
+        });
+        connectorThread.start();
+        handler.postDelayed(new Runnable() {
+            public void run() {
+                if (connectorThread.isAlive()) {
+                    connectorThread.interrupt();
+                    Log.e(TAG, "exception occurred while waiting for websocket");
+                }
+            }
+        },WEBSOCKET_CONNECTION_TIMEOUT);
     }
 
     public void sendTextMessage(String message) {

webrtc-android-framework/src/test/java/io/antmedia/webrtcandroidframework/WebSocketHandlerTest.java

@@ -2,6 +2,7 @@
 
 import android.os.Handler;
 
+import org.awaitility.Awaitility;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -13,16 +14,19 @@
 import org.webrtc.IceCandidate;
 import org.webrtc.SessionDescription;
 
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
 import java.util.concurrent.Executors;
 
 import de.tavendo.autobahn.WebSocketConnection;
+import de.tavendo.autobahn.WebSocketException;
 import io.antmedia.webrtcandroidframework.websocket.AntMediaSignallingEvents;
 import io.antmedia.webrtcandroidframework.websocket.Broadcast;
 import io.antmedia.webrtcandroidframework.websocket.WebSocketConstants;
 import io.antmedia.webrtcandroidframework.websocket.WebSocketHandler;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.mockito.Mockito.*;
 
 import com.google.gson.Gson;
@@ -452,6 +456,15 @@ public void testOnBroadcastObjectNotification() {
 
     }
 
+    @Test
+    public void testWsConnect() throws InterruptedException, URISyntaxException, WebSocketException {
+        String url = "wss://test.antmedia.io:5443/LiveApp/websocket";
+        doReturn(ws).when(webSocketHandler).creteWebSocket();
+        webSocketHandler.connect(url);
+        Thread.sleep(3000);
+        verify(ws,times(1)).connect(new URI(url),webSocketHandler);
+    }
+
     @Test
     public void testWsReconnection(){
         Handler wsReconnectionHandlerMock = mock(Handler.class);