FlexPlex/FlexLib
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Cleanup websockets

Browse Source
This commit is contained in:
Jonttuuu 2023-07-30 16:14:47 +03:00
parent 71b03cb87d
commit b38a3201d3
2 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/fi/flexplex/lib/FlexLib.java
View File

@ -9,8 +9,11 @@ import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.neovisionaries.ws.client.WebSocketException;
public final class FlexLib { public final class FlexLib {
private final FlexLib instance;
private final String token; private final String token;
private final Logger logger; private final Logger logger;
private final Timer timer; private final Timer timer;
@ -37,25 +40,33 @@ public final class FlexLib {
*/ */
public FlexLib(final String token, final Logger logger) { public FlexLib(final String token, final Logger logger) {
logger.info("Initializing FlexLib"); logger.info("Initializing FlexLib");
this.instance = this;
this.token = token; this.token = token;
this.logger = logger; this.logger = logger;
this.graphQLApi = new GraphQLApi(this, "https://api.flexplex.fi/graphql"); this.graphQLApi = new GraphQLApi(this, "https://api.flexplex.fi/graphql");
new FlexLibAdapterImpl(this); new FlexLibAdapterImpl(this);
try {
this.webSocketClient = new WebSocketClient(this, "wss://api.flexplex.fi/flexlib", this.token);
} catch (final IOException e) {
this.logger.warning("Failed to initialize FlexLib WebSocket client");
}
this.timer = new Timer(); this.timer = new Timer();
this.timerTask = new TimerTask() { this.timerTask = new TimerTask() {
@Override @Override
public void run() { public void run() {
final long removeTime = System.currentTimeMillis() - 10_800_000; final long removeTime = System.currentTimeMillis() - 10_800_000;
playerFriends.entrySet().removeIf(entry -> entry.getValue().getLastUsed() < removeTime); playerFriends.entrySet().removeIf(entry -> entry.getValue().getLastUsed() < removeTime);
// Connect websocket if closed
if (webSocketClient != null && !webSocketClient.isOpen()) {
webSocketClient.disable();
webSocketClient = null;
}
if (webSocketClient == null) {
try {
webSocketClient = new WebSocketClient(instance, "wss://api.flexplex.fi/flexlib", token);
webSocketClient.connect(); webSocketClient.connect();
} catch (final IOException | WebSocketException e) {
logger.warning("Failed to initialize FlexLib WebSocket client");
}
}
} }
}; };
this.timer.schedule(this.timerTask, 0, 60_000); this.timer.schedule(this.timerTask, 0, 60_000);

27
src/main/java/fi/flexplex/lib/WebSocketClient.java
View File

@ -16,20 +16,6 @@ public final class WebSocketClient {
protected WebSocketClient(final FlexLib flexLib, final String url, final String token) throws IOException { protected WebSocketClient(final FlexLib flexLib, final String url, final String token) throws IOException {
this.flexLib = flexLib; this.flexLib = flexLib;
this.webSocket = this.createWebSocket(url, token); this.webSocket = this.createWebSocket(url, token);
}
protected void connect() {
if (!webSocket.isOpen()) {
this.webSocket.connectAsynchronously();
this.setWebSocketSettings();
}
}
protected void disable() {
this.webSocket.disconnect();
}
private void setWebSocketSettings() {
try { try {
this.webSocket.getConnectedSocket().setSoTimeout(0); this.webSocket.getConnectedSocket().setSoTimeout(0);
this.webSocket.getConnectedSocket().setKeepAlive(true); this.webSocket.getConnectedSocket().setKeepAlive(true);
@ -38,6 +24,18 @@ public final class WebSocketClient {
} }
} }
protected void connect() throws WebSocketException {
this.webSocket.connect();
}
protected boolean isOpen() {
return this.webSocket.isOpen();
}
protected void disable() {
this.webSocket.disconnect();
}
private WebSocket createWebSocket(final String url, final String token) throws IOException { private WebSocket createWebSocket(final String url, final String token) throws IOException {
return new WebSocketFactory() return new WebSocketFactory()
.createSocket(url) .createSocket(url)
@ -87,6 +85,7 @@ public final class WebSocketClient {
for (final FlexLibAdapter listener : flexLib.getEventListeners()) { for (final FlexLibAdapter listener : flexLib.getEventListeners()) {
listener.onWebSocketConnect(); listener.onWebSocketConnect();
} }
break;
default: default:
flexLib.getLogger().warning("Received invalid WebSocket message from FlexPlex. Message: " + args[0]); flexLib.getLogger().warning("Received invalid WebSocket message from FlexPlex. Message: " + args[0]);
break; break;