Fixed a few issues with session startup and close

Author: MinnDevelopment

src/main/java/net/dv8tion/jda/core/requests/WebSocketClient.java

@@ -115,7 +115,21 @@ public WebSocketClient(JDAImpl api)
         this.shardInfo = api.getShardInfo();
         this.shouldReconnect = api.isAutoReconnect();
         this.connectNode = new StartingNode();
-        api.getSessionController().appendSession(connectNode);
+        try
+        {
+            api.getSessionController().appendSession(connectNode);
+        }
+        catch (RuntimeException | Error e)
+        {
+            LOG.error("Failed to append new session to session controller queue. Shutting down!", e);
+            this.api.setStatus(JDA.Status.SHUTDOWN);
+            this.api.getEventManager().handle(
+                new ShutdownEvent(api, OffsetDateTime.now(), 1006));
+            if (e instanceof RuntimeException)
+                throw (RuntimeException) e;
+            else
+                throw (Error) e;
+        }
     }
 
     public JDA getJDA()
@@ -396,17 +410,20 @@ private JSONObject newVoiceOpen(AudioManager manager, VoiceChannel channel)
 
     public void close()
     {
-        socket.sendClose(1000);
+        if (socket != null)
+            socket.sendClose(1000);
     }
 
     public void close(int code)
     {
-        socket.sendClose(code);
+        if (socket != null)
+            socket.sendClose(code);
     }
 
     public void close(int code, String reason)
     {
-        socket.sendClose(code, reason);
+        if (socket != null)
+            socket.sendClose(code, reason);
     }
 
     public synchronized void shutdown()
@@ -552,10 +569,19 @@ else if (closeCode != null)
             if (isInvalidate)
                 invalidate(); // 1000 means our session is dropped so we cannot resume
             api.getEventManager().handle(new DisconnectEvent(api, serverCloseFrame, clientCloseFrame, closedByServer, OffsetDateTime.now()));
-            if (sessionId == null)
+            try
+            {
+                if (sessionId == null)
+                    queueReconnect();
+                else // if resume is possible
+                    reconnect();
+            }
+            catch (InterruptedException e)
+            {
+                LOG.error("Failed to resume due to interrupted thread", e);
+                invalidate();
                 queueReconnect();
-            else // if resume is possible
-                reconnect();
+            }
         }
     }
 
@@ -578,7 +604,7 @@ protected void queueReconnect()
         }
     }
 
-    protected void reconnect()
+    protected void reconnect() throws InterruptedException
     {
         reconnect(false, true);
     }
@@ -592,7 +618,7 @@ protected void reconnect()
      * @param  shouldHandleIdentify
      *         whether SessionReconnectQueue already handled an IDENTIFY rate limit for this session
      */
-    public void reconnect(boolean callFromQueue, boolean shouldHandleIdentify)
+    public void reconnect(boolean callFromQueue, boolean shouldHandleIdentify) throws InterruptedException
     {
         if (callFromQueue && api.getContextMap() != null)
             api.getContextMap().forEach(MDC::put);
@@ -613,23 +639,15 @@ public void reconnect(boolean callFromQueue, boolean shouldHandleIdentify)
         }
         while (shouldReconnect)
         {
-            try
-            {
-                api.setStatus(JDA.Status.WAITING_TO_RECONNECT);
-                if (handleIdentifyRateLimit && shouldHandleIdentify)
-                {
-                    LOG.error("Encountered IDENTIFY (OP {}) Rate Limit! Waiting {} seconds before trying again!",
-                        WebSocketCode.IDENTIFY, IDENTIFY_DELAY);
-                    Thread.sleep(IDENTIFY_DELAY * 1000);
-                }
-                else
-                {
-                    Thread.sleep(reconnectTimeoutS * 1000);
-                }
-                handleIdentifyRateLimit = false;
-                api.setStatus(JDA.Status.ATTEMPTING_TO_RECONNECT);
-            }
-            catch (InterruptedException ignored) {}
+            api.setStatus(JDA.Status.WAITING_TO_RECONNECT);
+            int delay = IDENTIFY_DELAY;
+            if (handleIdentifyRateLimit && shouldHandleIdentify)
+                LOG.error("Encountered IDENTIFY (OP {}) Rate Limit! Waiting {} seconds before trying again!", WebSocketCode.IDENTIFY, IDENTIFY_DELAY);
+            else
+                delay = reconnectTimeoutS;
+            Thread.sleep(delay * 1000);
+            handleIdentifyRateLimit = false;
+            api.setStatus(JDA.Status.ATTEMPTING_TO_RECONNECT);
             LOG.warn("Attempting to reconnect!");
             try
             {

src/main/java/net/dv8tion/jda/core/utils/SessionControllerAdapter.java

@@ -16,6 +16,7 @@
 
 package net.dv8tion.jda.core.utils;
 
+import com.neovisionaries.ws.client.OpeningHandshakeException;
 import net.dv8tion.jda.core.AccountType;
 import net.dv8tion.jda.core.JDA;
 import net.dv8tion.jda.core.exceptions.AccountTypeException;
@@ -25,6 +26,7 @@
 import net.dv8tion.jda.core.requests.Route;
 import net.dv8tion.jda.core.utils.tuple.Pair;
 import org.json.JSONObject;
+import org.slf4j.Logger;
 
 import javax.security.auth.login.LoginException;
 import java.util.Queue;
@@ -34,6 +36,7 @@
 
 public class SessionControllerAdapter implements SessionController
 {
+    protected static final Logger log = JDALogger.getLog(SessionControllerAdapter.class);
     protected final Object lock = new Object();
     protected Queue<SessionConnectNode> connectQueue;
     protected AtomicLong globalRatelimit;
@@ -169,6 +172,12 @@ public QueueWorker(long delay)
         {
             super("SessionControllerAdapter-Worker");
             this.delay = delay;
+            super.setUncaughtExceptionHandler(this::handleFailure);
+        }
+
+        protected void handleFailure(Thread thread, Throwable exception)
+        {
+            log.error("Worker has failed with throwable!", exception);
         }
 
         @Override
@@ -185,8 +194,19 @@ public void run()
             }
             catch (InterruptedException ex)
             {
-                JDALogger.getLog(SessionControllerAdapter.class).error("Unable to backoff", ex);
+                log.error("Unable to backoff", ex);
             }
+            processQueue();
+            synchronized (lock)
+            {
+                workerHandle = null;
+                if (!connectQueue.isEmpty())
+                    runWorker();
+            }
+        }
+
+        protected void processQueue()
+        {
             while (!connectQueue.isEmpty())
             {
                 SessionConnectNode node = connectQueue.poll();
@@ -199,18 +219,22 @@ public void run()
                     if (this.delay > 0)
                         Thread.sleep(this.delay);
                 }
+                catch (IllegalStateException e)
+                {
+                    Throwable t = e.getCause();
+                    if (t instanceof OpeningHandshakeException)
+                        log.error("Failed opening handshake, appending to queue. Message: {}", e.getMessage());
+                    else
+                        log.error("Failed to establish connection for a node, appending to queue", e);
+                    appendSession(node);
+                }
                 catch (InterruptedException e)
                 {
-                    JDALogger.getLog(SessionControllerAdapter.class).error("Failed to run node", e);
+                    log.error("Failed to run node", e);
                     appendSession(node);
+                    return; // caller should start a new thread
                 }
             }
-            synchronized (lock)
-            {
-                workerHandle = null;
-                if (!connectQueue.isEmpty())
-                    runWorker();
-            }
         }
     }
 }