Don't blow up when trying to close the client.

Author: ioquatix

lib/slack/real_time/client.rb

@@ -81,8 +81,6 @@ def config
 
       def run_loop
         @socket.connect! do |driver|
-          @callback.call(driver) if @callback
-
           driver.on :open do |event|
             logger.debug("#{self.class}##{__method__}") { event.class.name }
             open(event)
@@ -100,6 +98,9 @@ def run_loop
             close(event)
             callback(event, :closed)
           end
+
+          # This must be called last to ensure any events are registered before invoking user code.
+          @callback.call(driver) if @callback
         end
       end
 

lib/slack/real_time/concurrency/async.rb

@@ -65,8 +65,12 @@ def connect!
 
           # Close the socket.
           def close
-            @socket.close if @socket
             super
+          ensure
+            if @socket
+              @socket.close
+              @socket = nil
+            end
           end
 
           def run_loop

lib/slack/real_time/concurrency/celluloid.rb

@@ -46,7 +46,6 @@ def disconnect!
 
           def close
             @closing = true
-            driver.close if driver
             super
           end
 

lib/slack/real_time/concurrency/eventmachine.rb

@@ -56,11 +56,6 @@ def disconnect!
             @thread = nil
           end
 
-          def close
-            driver.close if driver
-            super
-          end
-
           def send_data(message)
             logger.debug("#{self.class}##{__method__}") { message }
             driver.send(message)

lib/slack/real_time/socket.rb

@@ -38,8 +38,10 @@ def connect!
         yield @driver if block_given?
       end
 
+      # Gracefully shut down the connection.
       def disconnect!
         @driver.close
+      ensure
         close
       end
 
@@ -74,7 +76,11 @@ def current_time
       end
 
       def close
-        @driver = nil
+        # When you call `driver.emit(:close)`, it will typically end up calling `client.close` which will call `@socket.close` and end up back here. In order to break this infinite recursion, we check and set `@driver = nil` before invoking `client.close`.
+        if driver = @driver
+          @driver = nil
+          driver.emit(:close)
+        end
       end
 
       protected