fix(ws): added fixes for websocket & gateway that allow multiple discord.jar instances to run under a single java process - this previously didn't work because of static variables

Author: seailz

src/main/java/com/seailz/discordjar/DiscordJar.java

@@ -1561,7 +1561,7 @@ public EnumSet<CacheType> getCacheTypes() {
      * <br>The time is in milliseconds.
      */
     public List<Long> getGatewayPingHistory() {
-        return Gateway.pingHistoryMs;
+        return getGateway().pingHistoryMs;
     }
 
     /**

src/main/java/com/seailz/discordjar/gateway/Gateway.java

@@ -62,13 +62,13 @@ public class Gateway {
     private boolean resumedConnection = false;
     private boolean reconnecting = false;
     private ReconnectInfo resumeInfo;
-    public static long lastSequenceNumber = -1;
+    public long lastSequenceNumber = -1;
     private boolean readyForMessages = false;
     private boolean receivedReady = false;
     private HeartLogic heartbeatManager;
-    public static Date lastHeartbeatSent = new Date();
+    public Date lastHeartbeatSent = new Date();
 
-    public static List<Long> pingHistoryMs = new ArrayList<>();
+    public List<Long> pingHistoryMs = new ArrayList<>();
     /**
      * Allows you to set the maximum size of the ping history. This is initially limited to 100 to avoid memory issues in long-running bots.
      * If the array exceeds the limit, the oldest ping will be removed.
@@ -106,7 +106,7 @@ private void connectionFlow() {
         gatewayUrl = appendGatewayQueryParams(gatewayUrl);
         if (bot.isDebug()) logger.info("[Gateway - Connection Flow] Gateway URL with query params: " + gatewayUrl);
 
-        socket = new WebSocket(gatewayUrl, bot.isDebug());
+        socket = new WebSocket(gatewayUrl, bot.isDebug(), bot);
         setupDisconnectedSocket(socket);
         connectToSocket(socket, false);
 
@@ -154,7 +154,7 @@ private void resumeFlow() {
 
         String connectUrl = appendGatewayQueryParams(resumeInfo.url());
         if (bot.isDebug()) logger.info("[Gateway - Resume Flow] Resume URL: " + connectUrl);
-        socket = new WebSocket(connectUrl, bot.isDebug());
+        socket = new WebSocket(connectUrl, bot.isDebug(), bot);
         setupDisconnectedSocket(socket);
         connectToSocket(socket, true);
 
@@ -303,7 +303,7 @@ private void handleHello(@NotNull JSONObject payload) {
             heartbeatManager.startCycle();
             return;
         }
-        heartbeatManager = new HeartLogic(socket, payload.getJSONObject("d").getInt("heartbeat_interval"));
+        heartbeatManager = new HeartLogic(socket, payload.getJSONObject("d").getInt("heartbeat_interval"), this);
         heartbeatManager.start();
     }
 
@@ -553,15 +553,15 @@ public ReconnectInfo getResumeInfo() {
      * Returns when the last heartbeat was sent, or null if none were sent yet.
      */
     @Nullable
-    public static Date getLastHeartbeatSent() {
+    public Date getLastHeartbeatSent() {
         return lastHeartbeatSent;
     }
 
     /**
      * Returns an array of estimated ping times in milliseconds based on heartbeat ACKs.
      */
     @NotNull
-    public static List<Long> getPingHistoryMs() {
+    public List<Long> getPingHistoryMs() {
         return pingHistoryMs;
     }
 

src/main/java/com/seailz/discordjar/gateway/events/DispatchedEvents.java

@@ -256,10 +256,10 @@ public enum DispatchedEvents {
 
                 switch (CommandType.fromCode(p.getJSONObject("d").getJSONObject("data").getInt("type"))) {
                     case SLASH_COMMAND ->
-                            event = new SlashCommandInteractionEvent(d, Gateway.lastSequenceNumber, p);
-                    case USER -> event = new UserContextCommandInteractionEvent(d, Gateway.lastSequenceNumber, p);
+                            event = new SlashCommandInteractionEvent(d, d.getGateway().lastSequenceNumber, p);
+                    case USER -> event = new UserContextCommandInteractionEvent(d, d.getGateway().lastSequenceNumber, p);
                     case MESSAGE ->
-                            event = new MessageContextCommandInteractionEvent(d, Gateway.lastSequenceNumber, p);
+                            event = new MessageContextCommandInteractionEvent(d, d.getGateway().lastSequenceNumber, p);
                 }
 
                 d.getCommandDispatcher().dispatch(p.getJSONObject("d").getJSONObject("data").getString("name"),

src/main/java/com/seailz/discordjar/gateway/heartbeat/HeartLogic.java

@@ -23,14 +23,17 @@ public class HeartLogic {
     private long lastSequence = -1;
     private final Map<UUID, Boolean> isInstanceStillRunning = new HashMap<>();
     boolean running = true;
+    private final Gateway gateway;
 
-    public HeartLogic(WebSocket socket, long interval) {
+    public HeartLogic(WebSocket socket, long interval, Gateway gateway) {
         this.interval = interval;
         this.socket = socket;
+        this.gateway = gateway;
     }
 
-    public HeartLogic(WebSocket socket) {
+    public HeartLogic(WebSocket socket, Gateway gateway) {
         this.socket = socket;
+        this.gateway = gateway;
     }
 
     public void setInterval(long interval) {
@@ -79,7 +82,7 @@ public void start() {
                     socket.send(
                         WSPayloads.HEARBEAT.fill(lastSequence == -1 ? JSONObject.NULL : lastSequence).toString()
                     );
-                    Gateway.lastHeartbeatSent = new Date();
+                    gateway.lastHeartbeatSent = new Date();
                     Thread.sleep(interval);
                 } catch (InterruptedException e) {
                     e.printStackTrace();

src/main/java/com/seailz/discordjar/http/HttpOnlyManager.java

@@ -79,12 +79,12 @@ public ResponseEntity<String> get(HttpServletRequest request) throws IOException
 
                 switch (CommandType.fromCode(new JSONObject(interaction.raw()).getJSONObject("data").getInt("type"))) {
                     case SLASH_COMMAND -> {
-                        event = new SlashCommandInteractionEvent(discordJar, Gateway.lastSequenceNumber, new JSONObject().put("d", new JSONObject(body)));
+                        event = new SlashCommandInteractionEvent(discordJar, discordJar.getGateway().lastSequenceNumber, new JSONObject().put("d", new JSONObject(body)));
                     }
                     case USER ->
-                            event = new UserContextCommandInteractionEvent(discordJar, Gateway.lastSequenceNumber, new JSONObject().put("d", new JSONObject(body)));
+                            event = new UserContextCommandInteractionEvent(discordJar, discordJar.getGateway().lastSequenceNumber, new JSONObject().put("d", new JSONObject(body)));
                     case MESSAGE ->
-                            event = new MessageContextCommandInteractionEvent(discordJar, Gateway.lastSequenceNumber, new JSONObject().put("d", new JSONObject(body)));
+                            event = new MessageContextCommandInteractionEvent(discordJar, discordJar.getGateway().lastSequenceNumber, new JSONObject().put("d", new JSONObject(body)));
                 }
 
                 discordJar.getCommandDispatcher().dispatch(new JSONObject(interaction.raw()).getJSONObject("data").getString("name"), event);

src/main/java/com/seailz/discordjar/ws/WebSocket.java

@@ -1,5 +1,6 @@
 package com.seailz.discordjar.ws;
 
+import com.seailz.discordjar.DiscordJar;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -17,6 +18,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -39,20 +41,21 @@ public class WebSocket extends WebSocketListener {
     private final List<Consumer<CloseStatus>> onDisconnectConsumers = new ArrayList<>();
     private final List<Runnable> onConnectConsumers = new ArrayList<>();
     private Function<CloseStatus, Boolean> reEstablishConnection = (e) -> true;
-    private static final byte[] ZLIB_SUFFIX = new byte[] { 0, 0, (byte) 0xff, (byte) 0xff };
-    private static byte[] buffer = {};
-    private static final Inflater inflator = new Inflater();
+    private final byte[] ZLIB_SUFFIX = new byte[] { 0, 0, (byte) 0xff, (byte) 0xff };
+    private byte[] buffer = {};
+    private final Inflater inflator = new Inflater();
     private boolean open = false;
-    private static final List<WebSocket> webSockets = new ArrayList<>();
+    private static final HashMap<DiscordJar, List<WebSocket>> webSockets = new HashMap<>();
 
-    public WebSocket(String url, boolean debug) {
+    public WebSocket(String url, boolean debug, DiscordJar jar) {
         this.url = url;
         this.debug = debug;
         if (webSockets.size() > 1) {
             // Close all other websockets
-            webSockets.forEach(WebSocket::disconnect);
+            webSockets.get(jar).forEach(WebSocket::disconnect);
         }
-        webSockets.add(this);
+        // Add websockets to the list
+        webSockets.put(jar, new ArrayList<>(Arrays.asList(this)));
     }
 
     public WebsocketAction<Void> connect() {