onyxcord 1.1.7 → 2.0.0

data/lib/onyxcord/gateway.rb

@@ -1,107 +1,32 @@
 # frozen_string_literal: true
 
-# This file uses code from Websocket::Client::Simple, licensed under the following license:
-#
-# Copyright (c) 2013-2014 Sho Hashimoto
-#
-# MIT License
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-#                                  distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
+require 'async'
+require 'async/http/endpoint'
+require 'async/websocket/client'
 require 'onyxcord/rate_limiter/gateway'
 
 module OnyxCord
   # Gateway packet opcodes
   module Opcodes
-    # **Received** when Discord dispatches an event to the gateway (like MESSAGE_CREATE, PRESENCE_UPDATE or whatever).
-    # The vast majority of received packets will have this opcode.
     DISPATCH = 0
-
-    # **Two-way**: The client has to send a packet with this opcode every ~40 seconds (actual interval specified in
-    # READY or RESUMED) and the current sequence number, otherwise it will be disconnected from the gateway. In certain
-    # cases Discord may also send one, specifically if two clients are connected at once.
     HEARTBEAT = 1
-
-    # **Sent**: This is one of the two possible ways to initiate a session after connecting to the gateway. It
-    # should contain the authentication token along with other stuff the server has to know right from the start, such
-    # as large_threshold and, for older gateway versions, the desired version.
     IDENTIFY = 2
-
-    # **Sent**: Packets with this opcode are used to change the user's status and played game. (Sending this is never
-    # necessary for a gateway client to behave correctly)
     PRESENCE = 3
-
-    # **Sent**: Packets with this opcode are used to change a user's voice state (mute/deaf/unmute/undeaf/etc.). It is
-    # also used to connect to a voice server in the first place. (Sending this is never necessary for a gateway client
-    # to behave correctly)
     VOICE_STATE = 4
-
-    # **Sent**: This opcode is used to ping a voice server, whatever that means. The functionality of this opcode isn't
-    # known well but non-user clients should never send it.
     VOICE_PING = 5
-
-    # **Sent**: This is the other of two possible ways to initiate a gateway session (other than {IDENTIFY}). Rather
-    # than starting an entirely new session, it resumes an existing session by replaying all events from a given
-    # sequence number. It should be used to recover from a connection error or anything like that when the session is
-    # still valid - sending this with an invalid session will cause an error to occur.
     RESUME = 6
-
-    # **Received**: Discord sends this opcode to indicate that the client should reconnect to a different gateway
-    # server because the old one is currently being decommissioned. Counterintuitively, this opcode also invalidates the
-    # session - the client has to create an entirely new session with the new gateway instead of resuming the old one.
     RECONNECT = 7
-
-    # **Sent**: This opcode identifies packets used to retrieve a list of members from a particular server. There is
-    # also a REST endpoint available for this, but it is inconvenient to use because the client has to implement
-    # pagination itself, whereas sending this opcode lets Discord handle the pagination and the client can just add
-    # members when it receives them. (Sending this is never necessary for a gateway client to behave correctly)
     REQUEST_MEMBERS = 8
-
-    # **Received**: Sent by Discord when the session becomes invalid for any reason. This may include improperly
-    # resuming existing sessions, attempting to start sessions with invalid data, or something else entirely. The client
-    # should handle this by simply starting a new session.
     INVALIDATE_SESSION = 9
-
-    # **Received**: Sent immediately for any opened connection; tells the client to start heartbeating early on, so the
-    # server can safely search for a session server to handle the connection without the connection being terminated.
-    # As a side-effect, large bots are less likely to disconnect because of very large READY parse times.
     HELLO = 10
-
-    # **Received**: Returned after a heartbeat was sent to the server. This allows clients to identify and deal with
-    # zombie connections that don't dispatch any events anymore.
     HEARTBEAT_ACK = 11
   end
 
-  # This class stores the data of an active gateway session. Note that this is different from a websocket connection -
-  # there may be multiple sessions per connection or one session may persist over multiple connections.
+  # Stores data of an active gateway session.
   class Session
-    # @return [String] Used to uniquely identify this session. Mostly used when resuming connections.
-    attr_reader :session_id
-
-    # @return [Integer] Incrementing integer used to determine the most recent event reccived from Discord.
+    attr_reader :session_id, :resume_gateway_url
     attr_accessor :sequence
 
-    # @return [String] Gateway URL used to reconnect to the gateway node that Discord wants this session to use.
-    attr_reader :resume_gateway_url
-
-    # @!visibility private
     def initialize(session_id, resume_gateway_url)
       @session_id = session_id
       @sequence = 0
@@ -110,7 +35,6 @@ module OnyxCord
       @resume_gateway_url = resume_gateway_url
     end
 
-    # Flags this session as suspended, so we know not to try and send heartbeats, etc. to the gateway until we've reconnected
     def suspend
       @suspended = true
     end
@@ -119,12 +43,10 @@ module OnyxCord
       @suspended
     end
 
-    # Flags this session as no longer being suspended, so we can resume
     def resume
       @suspended = false
     end
 
-    # Flags this session as being invalid
     def invalidate
       @invalid = true
       @resume_gateway_url = nil
@@ -139,163 +61,100 @@ module OnyxCord
     end
   end
 
-  # Client for the Discord gateway protocol
+  # Client for the Discord gateway protocol — fully async.
   class Gateway
-    # How many members there need to be in a server for it to count as "large"
     LARGE_THRESHOLD = 100
-
-    # The version of the gateway that's supposed to be used.
     GATEWAY_VERSION = 9
-
-    # Close codes that are unrecoverable, after which we should not try to reconnect.
-    # - 4003: Not authenticated. How did this happen?
-    # - 4004: Authentication failed. Token was wrong, nothing we can do.
-    # - 4011: Sharding required. Currently requires developer intervention.
-    # - 4014: Use of disabled privileged intents.
     FATAL_CLOSE_CODES = [4003, 4004, 4011, 4014].freeze
 
-    # Heartbeat ACKs are Discord's way of verifying on the client side whether the connection is still alive. If this is
-    # set to true (default value) the gateway client will use that functionality to detect zombie connections and
-    # reconnect in such a case; however it may lead to instability if there's some problem with the ACKs. If this occurs
-    # it can simply be set to false.
-    # @return [true, false] whether or not this gateway should check for heartbeat ACKs.
     attr_accessor :check_heartbeat_acks
-
-    # @return [Integer] the intent parameter sent to the gateway server.
     attr_reader :intents
 
     def initialize(bot, token, shard_key = nil, compress_mode = :stream, intents = ALL_INTENTS)
       @token = token
       @bot = bot
-
       @shard_key = shard_key
-
-      # Whether the connection to the gateway has succeeded yet
       @ws_success = false
-
       @check_heartbeat_acks = true
-
       @compress_mode = compress_mode
       @intents = intents
       @send_limiter = OnyxCord::RateLimiter::Gateway.new
+      @connection = nil
+      @closed = true
+      @pipe_broken = false
     end
 
-    # Connect to the gateway server in a separate thread
+    # Connect to the gateway server inside an Async reactor.
     def run_async
       @ws_thread = Thread.new do
-        Thread.current[:onyxcord_name] = 'websocket'
-        connect_loop
-        LOGGER.warn('The WS loop exited! Not sure if this is a good thing')
+        Thread.current[:onyxcord_name] = 'gateway'
+        Async do |task|
+          @reactor_task = task
+          connect_loop
+          LOGGER.warn('The gateway loop exited!')
+        end
       end
 
-      LOGGER.debug('WS thread created! Now waiting for confirmation that everything worked')
+      LOGGER.debug('Gateway thread created! Waiting for confirmation...')
       loop do
         sleep(0.5)
-
-        if @ws_success
-          LOGGER.debug('Confirmation received! Exiting run.')
-          break
-        end
-
-        if @should_reconnect == false
-          LOGGER.debug('Reconnection flag was unset. Exiting run.')
-          break
-        end
+        break if @ws_success
+        break if @should_reconnect == false
       end
     end
 
-    # Prevents all further execution until the websocket thread stops (e.g. through a closed connection).
     def sync
-      @ws_thread.join
+      @ws_thread&.join
     end
 
-    # Whether the WebSocket connection to the gateway is currently open
     def open?
-      @handshake&.finished? && !@closed
+      !@closed && @connection
     end
 
-    # Stops the bot gracefully, disconnecting the websocket without immediately killing the thread. This means that
-    # Discord is immediately aware of the closed connection and makes the bot appear offline instantly.
-    #
-    # If this method doesn't work or you're looking for something more drastic, use {#kill} instead.
     def stop
       @should_reconnect = false
       close
-
-      # Return nil so command bots don't send a message
       nil
     end
 
-    # Kills the websocket thread, stopping all connections to Discord.
     def kill
-      @ws_thread.kill
+      @ws_thread&.kill
     end
 
-    # Notifies the {#run_async} method that everything is ready and the caller can now continue (i.e. with syncing,
-    # or with doing processing and then syncing)
     def notify_ready
       @ws_success = true
     end
 
-    # Injects a reconnect event (op 7) into the event processor, causing Discord to reconnect to the given gateway URL.
-    # If the URL is set to nil, it will reconnect and get an entirely new gateway URL. This method has not much use
-    # outside of testing and implementing highly custom reconnect logic.
-    # @param url [String, nil] the URL to connect to or nil if one should be obtained from Discord.
     def inject_reconnect(url = nil)
-      # When no URL is specified, the data should be nil, as is the case with Discord-sent packets.
       data = url ? { url: url } : nil
-
-      handle_message({
-        op: Opcodes::RECONNECT,
-        d: data
-      }.to_json)
+      handle_message({ op: Opcodes::RECONNECT, d: data }.to_json)
     end
 
-    # Injects a resume packet (op 6) into the gateway. If this is done with a running connection, it will cause an
-    # error. It has no use outside of testing stuff that I know of, but if you want to use it anyway for some reason,
-    # here it is.
-    # @param seq [Integer, nil] The sequence ID to inject, or nil if the currently tracked one should be used.
     def inject_resume(seq)
       send_resume(raw_token, @session_id, seq || @sequence)
     end
 
-    # Injects a terminal gateway error into the handler. Useful for testing the reconnect logic.
-    # @param e [Exception] The exception object to inject.
     def inject_error(e)
       handle_internal_close(e)
     end
 
-    # Sends a heartbeat with the last received packet's seq (to acknowledge that we have received it and all packets
-    # before it), or if none have been received yet, with 0.
-    # @see #send_heartbeat
     def heartbeat
       if check_heartbeat_acks
         unless @last_heartbeat_acked
-          # We're in a bad situation - apparently the last heartbeat wasn't ACK'd, which means the connection is likely
-          # a zombie. Reconnect
-          LOGGER.warn('Last heartbeat was not acked, so this is a zombie connection! Reconnecting')
-
-          # We can't send anything on zombie connections
+          LOGGER.warn('Last heartbeat was not acked — zombie connection! Reconnecting')
           @pipe_broken = true
           reconnect
           return
         end
-
         @last_heartbeat_acked = false
       end
-
       send_heartbeat(@session ? @session.sequence : 0)
     end
 
-    # Sends a heartbeat packet (op 1). This tells Discord that the current connection is still active and that the last
-    # packets until the given sequence have been processed (in case of a resume).
-    # @param sequence [Integer] The sequence number for which to send a heartbeat.
     def send_heartbeat(sequence)
       send_packet(Opcodes::HEARTBEAT, sequence)
     end
 
-    # Identifies to Discord with the default parameters.
-    # @see #send_identify
     def identify
       compress = @compress_mode == :large
       send_identify(@token, {
@@ -305,253 +164,105 @@ module OnyxCord
                     }, compress, LARGE_THRESHOLD, @shard_key, @intents)
     end
 
-    # Sends an identify packet (op 2). This starts a new session on the current connection and tells Discord who we are.
-    # This can only be done once a connection.
-    # @param token [String] The token with which to authorise the session. If it belongs to a bot account, it must be
-    #   prefixed with "Bot ".
-    # @param properties [Hash<Symbol => String>] A list of properties for Discord to use in analytics. The following
-    #   keys are recognised:
-    #
-    #    - "os" (recommended value: the operating system the bot is running on)
-    #    - "browser" (recommended value: library name)
-    #    - "device" (recommended value: library name)
-    #    - "referrer" (recommended value: empty)
-    #    - "referring_domain" (recommended value: empty)
-    #
-    # @param compress [true, false] Whether certain large packets should be compressed using zlib.
-    # @param large_threshold [Integer] The member threshold after which a server counts as large and will have to have
-    #   its member list chunked.
-    # @param shard_key [Array(Integer, Integer), nil] The shard key to use for sharding, represented as
-    #   [shard_id, num_shards], or nil if the bot should not be sharded.
     def send_identify(token, properties, compress, large_threshold, shard_key = nil, intents = ALL_INTENTS)
       data = {
-        # Don't send a v anymore as it's entirely determined by the URL now
         token: token,
         properties: properties,
         compress: compress,
         large_threshold: large_threshold,
         intents: intents
       }
-
-      # Don't include the shard key at all if it is nil as Discord checks for its mere existence
       data[:shard] = shard_key if shard_key
-
       send_packet(Opcodes::IDENTIFY, data)
     end
 
-    # Sends a status update packet (op 3). This sets the bot user's status (online/idle/...) and game playing/streaming.
-    # @param status [String] The status that should be set (`online`, `idle`, `dnd`, `invisible`).
-    # @param since [Integer] The Unix timestamp in milliseconds when the status was set. Should only be provided when
-    #   `afk` is true.
-    # @param game [Hash<Symbol => Object>, nil] `nil` if no game should be played, or a hash of `:game => "name"` if a
-    #   game should be played. The hash can also contain additional attributes for streaming statuses.
-    # @param afk [true, false] Whether the status was set due to inactivity on the user's part.
     def send_status_update(status, since, game, afk)
-      data = {
-        status: status,
-        since: since,
-        game: game,
-        afk: afk
-      }
-
-      send_packet(Opcodes::PRESENCE, data)
+      send_packet(Opcodes::PRESENCE, { status: status, since: since, game: game, afk: afk })
     end
 
-    # Sends a voice state update packet (op 4). This packet can connect a user to a voice channel, update self mute/deaf
-    # status in an existing voice connection, move the user to a new voice channel on the same server or disconnect an
-    # existing voice connection.
-    # @param server_id [Integer] The ID of the server on which this action should occur.
-    # @param channel_id [Integer, nil] The channel ID to connect/move to, or `nil` to disconnect.
-    # @param self_mute [true, false] Whether the user should itself be muted to everyone else.
-    # @param self_deaf [true, false] Whether the user should be deaf towards other users.
     def send_voice_state_update(server_id, channel_id, self_mute, self_deaf)
-      data = {
-        guild_id: server_id,
-        channel_id: channel_id,
-        self_mute: self_mute,
-        self_deaf: self_deaf
-      }
-
-      send_packet(Opcodes::VOICE_STATE, data)
+      send_packet(Opcodes::VOICE_STATE, {
+                    guild_id: server_id, channel_id: channel_id,
+                    self_mute: self_mute, self_deaf: self_deaf
+                  })
     end
 
-    # Resumes the session from the last recorded point.
-    # @see #send_resume
     def resume
       send_resume(@token, @session.session_id, @session.sequence)
     end
 
-    # Reconnects the gateway connection in a controlled manner.
-    # @param attempt_resume [true, false] Whether a resume should be attempted after the reconnection.
     def reconnect(attempt_resume = true)
       @session.suspend if @session && attempt_resume
-
       @instant_reconnect = true
       @should_reconnect = true
-
       close(4000)
     end
 
-    # Sends a resume packet (op 6). This replays all events from a previous point specified by its packet sequence. This
-    # will not work if the packet to resume from has already been acknowledged using a heartbeat, or if the session ID
-    # belongs to a now invalid session.
-    #
-    # If this packet is sent at the beginning of a connection, it will act similarly to an {#identify} in that it
-    # creates a session on the current connection. Unlike identify however, this packet can also be sent in an existing
-    # session and will just replay some of the events.
-    # @param token [String] The token that was used to identify the session to resume.
-    # @param session_id [String] The session ID of the session to resume.
-    # @param seq [Integer] The packet sequence of the packet after which the events should be replayed.
     def send_resume(token, session_id, seq)
-      data = {
-        token: token,
-        session_id: session_id,
-        seq: seq
-      }
-
-      send_packet(Opcodes::RESUME, data)
+      send_packet(Opcodes::RESUME, { token: token, session_id: session_id, seq: seq })
     end
 
-    # Sends a request members packet (op 8). This will order Discord to gradually sent all requested members as dispatch
-    # events with type `GUILD_MEMBERS_CHUNK`. It is necessary to use this method in order to get all members of a large
-    # server (see `large_threshold` in {#send_identify}), however it can also be used for other purposes.
-    # @param server_id [Integer] The ID of the server whose members to query.
-    # @param query [String] If this string is not empty, only members whose username starts with this string will be
-    #   returned.
-    # @param limit [Integer] How many members to send at maximum, or `0` to send all members.
     def send_request_members(server_id, query, limit)
-      data = {
-        guild_id: server_id,
-        query: query,
-        limit: limit
-      }
-
-      send_packet(Opcodes::REQUEST_MEMBERS, data)
+      send_packet(Opcodes::REQUEST_MEMBERS, { guild_id: server_id, query: query, limit: limit })
     end
 
-    # Sends a custom packet over the connection. This can be useful to implement future yet unimplemented functionality
-    # or for testing. You probably shouldn't use this unless you know what you're doing.
-    # @param opcode [Integer] The opcode the packet should be sent as. Can be one of {Opcodes} or a custom value if
-    #   necessary.
-    # @param packet [Object] Some arbitrary JSON-serializable data that should be sent as the `d` field.
     def send_packet(opcode, packet)
-      data = {
-        op: opcode,
-        d: packet
-      }
-
-      send(data.to_json)
+      send({ op: opcode, d: packet }.to_json)
     end
 
-    # Sends custom raw data over the connection. Only useful for testing; even if you know what you're doing you
-    # probably want to use {#send_packet} instead.
-    # @param data [String] The data to send.
-    # @param type [Symbol] The type the WebSocket frame should have; either `:text`, `:binary`, `:ping`, `:pong`, or
-    #   `:close`.
-    def send_raw(data, type = :text)
-      send(data, type)
+    def send_raw(data, _type = :text)
+      send(data)
     end
 
     private
 
     def setup_heartbeats(interval)
-      # Make sure to reset ACK handling, so we don't keep reconnecting
       @last_heartbeat_acked = true
-
-      # We don't want to have redundant heartbeat threads, so if one already exists, don't start a new one
-      return if @heartbeat_thread
+      return if @heartbeat_task
 
       @heartbeat_interval = interval
-      @heartbeat_thread = Thread.new do
-        Thread.current[:onyxcord_name] = 'heartbeat'
+      @heartbeat_task = @reactor_task&.async do
         loop do
-          # Send a heartbeat if heartbeats are active and either no session exists yet, or an existing session is
-          # suspended (e.g. after op7)
           if (@session && !@session.suspended?) || !@session
             sleep @heartbeat_interval
-            # Check if we're connected here, since we could possibly be waiting for a reconnect to occur.
-            if @handshaked && !@closed
+            if !@closed && @connection
               @bot.raise_heartbeat_event
               heartbeat
             else
-              LOGGER.debug('Tried to send a heartbeat without being connected! Ignoring, we should be fine.')
+              LOGGER.debug('Tried to heartbeat without connection — skipping.')
             end
           else
             sleep 1
           end
         rescue StandardError => e
-          LOGGER.error('An error occurred while heartbeating!')
+          LOGGER.error('Error while heartbeating!')
           LOGGER.log_exception(e)
         end
       end
     end
 
     def connect_loop
-      # Initialize falloff so we wait for more time before reconnecting each time
       @falloff = 1.0
-
       @should_reconnect = true
+
       loop do
         connect
-
         break unless @should_reconnect
 
         if @instant_reconnect
-          LOGGER.info('Instant reconnection flag was set - reconnecting right away')
+          LOGGER.info('Instant reconnection — reconnecting now')
           @instant_reconnect = false
         else
           wait_for_reconnect
         end
-
-        # Restart the loop, i.e. reconnect
       end
     end
 
-    # Separate method to wait an ever-increasing amount of time before reconnecting after being disconnected in an
-    # unexpected way
     def wait_for_reconnect
-      # We disconnected in an unexpected way! Wait before reconnecting so we don't spam Discord's servers.
-      LOGGER.debug("Attempting to reconnect in #{@falloff} seconds.")
+      LOGGER.debug("Reconnecting in #{@falloff} seconds.")
       sleep @falloff
-
-      # Calculate new falloff
       @falloff *= 1.5
-      @falloff = 115 + (rand * 10) if @falloff > 120 # Cap the falloff at 120 seconds and then add some random jitter
-    end
-
-    # Create and connect a socket using a URI
-    def obtain_socket(uri)
-      socket = TCPSocket.new(uri.host, uri.port || socket_port(uri))
-
-      if secure_uri?(uri)
-        ctx = OpenSSL::SSL::SSLContext.new
-
-        if ENV['ONYXCORD_SSL_VERIFY_NONE']
-          ctx.ssl_version = 'SSLv23'
-          ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE # use VERIFY_PEER for verification
-
-          cert_store = OpenSSL::X509::Store.new
-          cert_store.set_default_paths
-          ctx.cert_store = cert_store
-        else
-          ctx.set_params ssl_version: :TLSv1_2 # rubocop:disable Naming/VariableNumber
-        end
-
-        socket = OpenSSL::SSL::SSLSocket.new(socket, ctx)
-        socket.connect
-      end
-
-      socket
-    end
-
-    # Whether the URI is secure (connection should be encrypted)
-    def secure_uri?(uri)
-      %w[https wss].include? uri.scheme
-    end
-
-    # The port we should connect to, if the URI doesn't have one set.
-    def socket_port(uri)
-      secure_uri?(uri) ? 443 : 80
+      @falloff = 115 + (rand * 10) if @falloff > 120
     end
 
     def find_gateway
@@ -561,9 +272,7 @@ module OnyxCord
 
     def process_gateway
       raw_url = @session&.resume_gateway_url || find_gateway
-
-      # Append a slash in case it's not there (I'm not sure how well WSCS handles it otherwise)
-      raw_url += '/' unless raw_url.end_with? '/'
+      raw_url += '/' unless raw_url.end_with?('/')
 
       query = if @compress_mode == :stream
                 "?encoding=json&v=#{GATEWAY_VERSION}&compress=zlib-stream"
@@ -577,104 +286,37 @@ module OnyxCord
     def connect
       LOGGER.debug('Connecting')
 
-      # Get the URI we should connect to
       url = process_gateway
       LOGGER.debug("Gateway URL: #{url}")
 
-      # Parse it
-      gateway_uri = URI.parse(url)
-
-      # Zlib context for this gateway connection
       @zlib_reader = Zlib::Inflate.new
+      @pipe_broken = false
+      @closed = false
 
-      # Connect to the obtained URI with a socket
-      @socket = obtain_socket(gateway_uri)
-      LOGGER.debug('Obtained socket')
+      endpoint = Async::HTTP::Endpoint.parse(url)
 
-      # Initialise some properties
-      @handshake = ::WebSocket::Handshake::Client.new(url: url) # Represents the handshake between us and the server
-      @handshaked = false # Whether the handshake has finished yet
-      @pipe_broken = false # Whether we've received an EPIPE at any time
-      @closed = false # Whether the websocket is currently closed
+      Async::WebSocket::Client.connect(endpoint) do |connection|
+        @connection = connection
+        LOGGER.debug('WebSocket connected')
 
-      # We're done! Delegate to the websocket loop
-      websocket_loop
-    rescue StandardError => e
-      LOGGER.error('An error occurred while connecting to the websocket!')
-      LOGGER.log_exception(e)
-    end
-
-    def websocket_loop
-      # Send the handshake data that we have so far
-      @socket.write(@handshake.to_s)
+        handle_open
 
-      # Create a frame to handle received data
-      frame = ::WebSocket::Frame::Incoming::Client.new
-
-      until @closed
-        begin
-          unless @socket
-            LOGGER.warn('Socket is nil in websocket_loop! Reconnecting')
-            handle_internal_close('Socket is nil in websocket_loop')
-            next
-          end
-
-          # Get some data from the socket
-          begin
-            recv_data = @socket.readpartial(4096)
-          rescue EOFError
-            @pipe_broken = true
-            handle_internal_close('Socket EOF in websocket_loop')
-            next
-          end
-
-          # Check if we actually got data
-          unless recv_data
-            # If we didn't, wait
-            sleep 1
-            next
-          end
-
-          # Check whether the handshake has finished yet
-          if @handshaked
-            # If it hasn't, add the received data to the current frame
-            frame << recv_data
-
-            # Try to parse a message from the frame
-            msg = frame.next
-            while msg
-              # Check whether the message is a close frame, and if it is, handle accordingly
-              if msg.respond_to?(:code) && msg.code
-                handle_internal_close(msg)
-                break
-              end
-
-              # If there is one, handle it and try again
-              handle_message(msg.data)
-              msg = frame.next
-            end
-          else
-            # If the handshake hasn't finished, handle it
-            handle_handshake_data(recv_data)
-          end
-        rescue StandardError => e
-          handle_error(e)
+        while (message = connection.read)
+          handle_message(message.to_str)
         end
       end
-    end
-
-    def handle_handshake_data(recv_data)
-      @handshake << recv_data
-      return unless @handshake.finished?
-
-      @handshaked = true
-      handle_open
+    rescue StandardError => e
+      LOGGER.error('Error connecting to gateway!')
+      LOGGER.log_exception(e)
+    ensure
+      @closed = true
+      @connection = nil
     end
 
     def handle_open; end
 
     def handle_error(e)
-      LOGGER.error('An error occurred in the main websocket loop!')
+      LOGGER.error('Error in gateway loop!')
       LOGGER.log_exception(e)
     end
 
@@ -684,32 +326,19 @@ module OnyxCord
     def handle_message(msg)
       case @compress_mode
       when :large
-        if msg.byteslice(0) == 'x'
-          # The message is compressed, inflate it
-          msg = Zlib::Inflate.inflate(msg)
-        end
+        msg = Zlib::Inflate.inflate(msg) if msg.byteslice(0) == 'x'
       when :stream
-        # Write deflated string to buffer
         @zlib_reader << msg
-
-        # Check if message ends in `ZLIB_SUFFIX`
         return if msg.bytesize < 4 || msg.byteslice(-4, 4) != ZLIB_SUFFIX
 
-        # Inflate the deflated buffer
         msg = @zlib_reader.inflate('')
       end
 
-      # Parse packet
       packet = JSON.parse(msg)
       op = packet['op'].to_i
 
       LOGGER.in(packet)
 
-      # If the packet has a sequence defined (all dispatch packets have one), make sure to update that in the
-      # session so it will be acknowledged next heartbeat.
-      # Only do this, of course, if a session has been created already; for a READY dispatch (which has s=0 set but is
-      # the packet that starts the session in the first place) we need not do any handling since initialising the
-      # session will set it to 0 by default.
       @session.sequence = packet['s'] if packet['s'] && @session
 
       case op
@@ -726,7 +355,7 @@ module OnyxCord
       when Opcodes::HEARTBEAT
         handle_heartbeat(packet)
       else
-        LOGGER.warn("Received invalid opcode #{op} - please report with this information: #{msg}")
+        LOGGER.warn("Invalid opcode #{op}: #{msg}")
       end
     end
 
@@ -737,15 +366,11 @@ module OnyxCord
 
       case type
       when :READY
-        LOGGER.info("Discord using gateway protocol version: #{data['v']}, requested: #{GATEWAY_VERSION}")
-
+        LOGGER.info("Discord gateway v#{data['v']}, requested: #{GATEWAY_VERSION}")
         @session = Session.new(data['session_id'], data['resume_gateway_url'])
         @session.sequence = 0
         @bot.__send__(:notify_ready) if @intents && @intents.nobits?(INTENTS[:servers])
       when :RESUMED
-        # The RESUMED event is received after a successful op 6 (resume). It does nothing except tell the bot the
-        # connection is initiated (like READY would). Starting with v5, it doesn't set a new heartbeat interval anymore
-        # since that is handled by op 10 (HELLO).
         LOGGER.info 'Resumed'
         return
       end
@@ -755,20 +380,18 @@ module OnyxCord
 
     # Op 1
     def handle_heartbeat(packet)
-      # If we receive a heartbeat, we have to resend one with the same sequence
       send_heartbeat(packet['s'])
     end
 
     # Op 7
     def handle_reconnect
-      LOGGER.debug('Received op 7, reconnecting and attempting resume')
+      LOGGER.debug('Received op 7, reconnecting')
       reconnect
     end
 
     # Op 9
     def handle_invalidate_session(packet)
-      LOGGER.debug('Received op 9, invalidating session and re-identifying.')
-
+      LOGGER.debug('Received op 9, invalidating session')
       if @session
         if packet['d'] == true
           reconnect
@@ -776,28 +399,21 @@ module OnyxCord
           @session.invalidate
         end
       else
-        LOGGER.warn('Received op 9 without a running session! Not invalidating, we *should* be fine though.')
+        LOGGER.warn('Op 9 without session!')
       end
-
       identify
     end
 
     # Op 10
     def handle_hello(packet)
       LOGGER.debug('Hello!')
-
-      # The heartbeat interval is given in ms, so divide it by 1000 to get seconds
       interval = packet['d']['heartbeat_interval'].to_f / 1000.0
       setup_heartbeats(interval)
-
       LOGGER.debug("Trace: #{packet['d']['_trace']}")
       LOGGER.debug("Session: #{@session.inspect}")
 
       if @session&.should_resume?
-        # Make sure we're sending heartbeats again
         @session.resume
-
-        # Send the actual resume packet to get the missing events
         resume
       else
         identify
@@ -806,11 +422,10 @@ module OnyxCord
 
     # Op 11
     def handle_heartbeat_ack(packet)
-      LOGGER.debug("Received heartbeat ack for packet: #{packet.inspect}")
+      LOGGER.debug("Heartbeat ACK: #{packet.inspect}")
       @last_heartbeat_acked = true if @check_heartbeat_acks
     end
 
-    # Called when the websocket has been disconnected in some way - say due to a pipe error while sending
     def handle_internal_close(e)
       close
       handle_close(e)
@@ -819,71 +434,45 @@ module OnyxCord
     def handle_close(e)
       @bot.__send__(:raise_event, Events::DisconnectEvent.new(@bot))
 
-      if e.respond_to? :code
-        # It is a proper close frame we're dealing with, print reason and message to console
-        LOGGER.error('Websocket close frame received!')
-        LOGGER.error("Code: #{e.code}")
-        LOGGER.error("Message: #{e.data}")
-
-        if e.code == 4014
-          LOGGER.error(<<~ERROR)
-            You attempted to identify with privileged intents that your bot is not authorized to use
-            Please enable the privileged intents on the bot page of your application on the discord developer page.
-            Read more here https://discord.com/developers/docs/topics/gateway#privileged-intents
-          ERROR
-        end
-
+      if e.respond_to?(:code)
+        LOGGER.error("WebSocket close frame! Code: #{e.code}")
+        LOGGER.error('Privileged intents not authorized. Enable them in the Discord developer portal.') if e.code == 4014
         @should_reconnect = false if FATAL_CLOSE_CODES.include?(e.code)
-      elsif e.is_a? Exception
-        # Log the exception
-        LOGGER.error('The websocket connection has closed due to an error!')
+      elsif e.is_a?(Exception)
+        LOGGER.error('WebSocket closed due to error!')
         LOGGER.log_exception(e)
       else
-        LOGGER.error("The websocket connection has closed: #{e&.inspect || '(no information)'}")
+        LOGGER.error("WebSocket closed: #{e&.inspect || '(no info)'}")
       end
     end
 
-    def send(data, type = :text, code = nil)
+    def send(data, _type = :text, _code = nil)
       LOGGER.out(data)
 
-      unless @handshaked && !@closed
-        # If we're not handshaked or closed, it means there's no connection to send anything to
-        raise 'Tried to send something to the websocket while not being connected!'
-      end
-
-      @send_limiter.wait if %i[text binary].include?(type)
+      raise 'Tried to send to websocket while not connected!' unless @connection && !@closed
 
-      # Create the frame we're going to send
-      frame = ::WebSocket::Frame::Outgoing::Client.new(data: data, type: type, version: @handshake.version, code: code)
+      @send_limiter.wait
 
-      # Try to send it
-      begin
-        @socket.write frame.to_s
-      rescue StandardError => e
-        # There has been an error!
-        @pipe_broken = true
-        handle_internal_close(e)
-      end
+      @connection.write(Protocol::WebSocket::TextMessage.generate(data))
+      @connection.flush
+    rescue StandardError => e
+      @pipe_broken = true
+      handle_internal_close(e)
     end
 
-    def close(code = 1000)
-      # If we're already closed, there's no need to do anything - return
+    def close(_code = 1000)
       return if @closed
 
-      # Suspend the session so we don't send heartbeats
       @session&.suspend
-
-      # Send a close frame (if we can)
-      send nil, :close, code unless @pipe_broken
-
-      # We're officially closed, notify the main loop.
       @closed = true
 
-      # Close the socket if possible
-      @socket&.close
-      @socket = nil
+      begin
+        @connection&.close
+      rescue StandardError
+        # Ignore close errors
+      end
 
-      # Make sure we do necessary things as soon as we're closed
+      @connection = nil
       handle_close(nil)
     end
   end