Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

connect web socket in separate thread #116

Merged
merged 3 commits into from
Mar 17, 2025
Merged

connect web socket in separate thread #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7206664
connect websocket in seprete thread
USAMAWIZARD Feb 28, 2025
31f1b3e
connect websocket in seprete thread
USAMAWIZARD Feb 28, 2025
a1e4f0a
connect websocket in seprete thread
USAMAWIZARD Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...mework/src/main/java/io/antmedia/webrtcandroidframework/websocket/WebSocketConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,4 +449,6 @@ private WebSocketConstants() {
*/
public static final String BROADCAST = "broadcast";

public static final int WEBSOCKET_CONNECTION_TIMEOUT = 10000; //10 sec

}
41 changes: 29 additions & 12 deletions ...ramework/src/main/java/io/antmedia/webrtcandroidframework/websocket/WebSocketHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
15 changes: 14 additions & 1 deletion ...roid-framework/src/test/java/io/antmedia/webrtcandroidframework/WebSocketHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import android.os.Handler;

import org.awaitility.Awaitility;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
Loading