onyxcord 3.2.7 → 4.0.0.beta.1

data/lib/onyxcord/models/server.rb

@@ -122,6 +122,8 @@ module OnyxCord
 
       # Whether this server's members have been chunked (resolved using op 8 and GUILD_MEMBERS_CHUNK) yet
       @chunked = false
+      @chunk_mutex = Mutex.new
+      @chunk_condition = ConditionVariable.new
     end
 
     # @return [Member] The server owner.
@@ -172,7 +174,7 @@ module OnyxCord
     #  end
     # @return [Hash<Integer => Integer>] A hash mapping role IDs to their respective member counts.
     def role_member_counts
-      response = JSON.parse(REST::Server.role_member_counts(@bot.token, @id))
+      response = OnyxCord::Internal::JSON.parse(REST::Server.role_member_counts(@bot.token, @id))
       response.transform_keys!(&:to_i)
       response.tap { |hash| hash[@id] = @member_count }
     end
@@ -202,7 +204,13 @@ module OnyxCord
       raise 'The :server_members intent is required to get server members' if @bot.gateway.intents.nobits?(INTENTS[:server_members])
 
       @bot.request_chunks(@id)
-      sleep 0.05 until @chunked
+
+      @chunk_mutex.synchronize do
+        @chunk_condition.wait(@chunk_mutex, 30) unless @chunked
+      end
+
+      raise Timeout::Error, "Guild members not received for server #{@id} within 30s" unless @chunked
+
       @members.values
     end
 
@@ -226,7 +234,7 @@ module OnyxCord
     # @return [Array<Integration>] an array of the integrations in this server.
     # @note If the server has more than 50 integrations, they cannot be accessed.
     def integrations
-      integration = JSON.parse(REST::Server.integrations(@bot.token, @id))
+      integration = OnyxCord::Internal::JSON.parse(REST::Server.integrations(@bot.token, @id))
       integration.map { |element| Integration.new(element, @bot, self) }
     end
 
@@ -241,14 +249,14 @@ module OnyxCord
       action = AuditLogs::ACTIONS.key(action)
       user = user.resolve_id if user
       before = before.resolve_id if before
-      AuditLogs.new(self, @bot, JSON.parse(REST::Server.audit_logs(@bot.token, @id, limit, user, action, before)))
+      AuditLogs.new(self, @bot, OnyxCord::Internal::JSON.parse(REST::Server.audit_logs(@bot.token, @id, limit, user, action, before)))
     end
 
     # @note For internal use only
     # @!visibility private
     def cache_widget_data(data = nil)
       data ||= if bot.permission?(:manage_server)
-                 JSON.parse(REST::Server.widget(@bot.token, @id))
+                 OnyxCord::Internal::JSON.parse(REST::Server.widget(@bot.token, @id))
                else
                  return update_data(nil)
                end
@@ -315,7 +323,7 @@ module OnyxCord
     def modify_widget(enabled, channel, reason = nil)
       cache_widget_data if @widget_enabled.nil?
       channel_id = channel ? channel.resolve_id : @widget_channel_id
-      cache_widget_data(JSON.parse(REST::Server.modify_widget(@bot.token, @id, enabled, channel_id, reason)))
+      cache_widget_data(OnyxCord::Internal::JSON.parse(REST::Server.modify_widget(@bot.token, @id, enabled, channel_id, reason)))
     end
     alias_method :modify_embed, :modify_widget
 
@@ -347,7 +355,7 @@ module OnyxCord
       response = REST::Server.add_member(@bot.token, @id, user_id, access_token, nick, roles, deaf, mute)
       return nil if response.empty?
 
-      add_member Member.new(JSON.parse(response), self, @bot)
+      add_member Member.new(OnyxCord::Internal::JSON.parse(response), self, @bot)
     end
 
     # Returns the amount of members that are candidates for pruning
@@ -357,7 +365,7 @@ module OnyxCord
     def prune_count(days)
       raise ArgumentError, 'Days must be between 1 and 30' unless days.between?(1, 30)
 
-      response = JSON.parse REST::Server.prune_count(@bot.token, @id, days)
+      response = OnyxCord::Internal::JSON.parse REST::Server.prune_count(@bot.token, @id, days)
       response['pruned']
     end
 
@@ -369,7 +377,7 @@ module OnyxCord
     def begin_prune(days, reason = nil)
       raise ArgumentError, 'Days must be between 1 and 30' unless days.between?(1, 30)
 
-      response = JSON.parse REST::Server.begin_prune(@bot.token, @id, days, reason)
+      response = OnyxCord::Internal::JSON.parse REST::Server.begin_prune(@bot.token, @id, days, reason)
       response['pruned']
     end
 
@@ -581,7 +589,7 @@ module OnyxCord
       total = nil
 
       get_messages = lambda do |query|
-        data = JSON.parse(REST::Server.search_messages(@bot.token, @id, **options, **query.compact))
+        data = OnyxCord::Internal::JSON.parse(REST::Server.search_messages(@bot.token, @id, **options, **query.compact))
         total ||= data['total_results']
 
         data['threads']&.each do |thread|
@@ -621,13 +629,14 @@ module OnyxCord
     # @note For internal use only
     # @!visibility private
     def delete_role(role_id)
-      @roles.delete(role_id.resolve_id)
+      resolved_id = role_id.resolve_id
+      @roles.delete(resolved_id)
       @members.each_value do |member|
-        new_roles = member.roles.reject { |r| r.id == role_id }
+        new_roles = member.roles.reject { |r| r.id == resolved_id }
         member.update_roles(new_roles)
       end
       @channels.each do |channel|
-        overwrites = channel.permission_overwrites.reject { |id, _| id == role_id }
+        overwrites = channel.permission_overwrites.reject { |id, _| id == resolved_id }
         channel.update_overwrites(overwrites)
       end
     end
@@ -636,7 +645,7 @@ module OnyxCord
     # @note For internal use only
     # @!visibility private
     def update_role_positions(role_positions, reason: nil)
-      response = JSON.parse(REST::Server.update_role_positions(@bot.token, @id, role_positions, reason))
+      response = OnyxCord::Internal::JSON.parse(REST::Server.update_role_positions(@bot.token, @id, role_positions, reason))
       response.each { |data| role(data['id'].to_i)&.update_data(data) }
     end
 
@@ -739,7 +748,7 @@ module OnyxCord
       permission_overwrites.map! { |e| e.is_a?(Overwrite) ? e.to_hash : e } if permission_overwrites.is_a?(Array)
       parent_id = parent.respond_to?(:resolve_id) ? parent.resolve_id : nil
       response = REST::Server.create_channel(@bot.token, @id, name, type, topic, bitrate, user_limit, permission_overwrites, parent_id, nsfw, rate_limit_per_user, position, reason)
-      Channel.new(JSON.parse(response), @bot)
+      Channel.new(OnyxCord::Internal::JSON.parse(response), @bot)
     end
 
     # Creates a role on this server which can then be modified. It will be initialized
@@ -784,7 +793,7 @@ module OnyxCord
 
       response = REST::Server.create_role(@bot.token, @id, name, nil, hoist, mentionable, permissions&.to_s, reason, colours, icon, unicode_emoji)
 
-      role = Role.new(JSON.parse(response), @bot, self)
+      role = Role.new(OnyxCord::Internal::JSON.parse(response), @bot, self)
       @roles[role.id] = role
     end
 
@@ -797,7 +806,7 @@ module OnyxCord
     def add_emoji(name, image, roles = [], reason: nil)
       image = image.respond_to?(:read) ? OnyxCord.encode64(image) : image
 
-      data = JSON.parse(REST::Server.add_emoji(@bot.token, @id, image, name, roles.map(&:resolve_id), reason))
+      data = OnyxCord::Internal::JSON.parse(REST::Server.add_emoji(@bot.token, @id, image, name, roles.map(&:resolve_id), reason))
       new_emoji = Emoji.new(data, @bot, self)
       @emoji[new_emoji.id] = new_emoji
     end
@@ -817,7 +826,7 @@ module OnyxCord
     # @return [Emoji] The edited emoji.
     def edit_emoji(emoji, name: nil, roles: nil, reason: nil)
       emoji = @emoji[emoji.resolve_id]
-      data = JSON.parse(REST::Server.edit_emoji(@bot.token, @id, emoji.resolve_id, name || emoji.name, (roles || emoji.roles).map(&:resolve_id), reason))
+      data = OnyxCord::Internal::JSON.parse(REST::Server.edit_emoji(@bot.token, @id, emoji.resolve_id, name || emoji.name, (roles || emoji.roles).map(&:resolve_id), reason))
       new_emoji = Emoji.new(data, @bot, self)
       @emoji[new_emoji.id] = new_emoji
     end
@@ -842,7 +851,7 @@ module OnyxCord
     # @param limit [Integer] The maximum number of members between 1-1000 to return. Returns 1 member by default.
     # @return [Array<Member>, nil] An array of member objects that match the given parameters, or nil for no members.
     def search_members(name:, limit: nil)
-      response = JSON.parse(REST::Server.search_guild_members(@bot.token, @id, name, limit))
+      response = OnyxCord::Internal::JSON.parse(REST::Server.search_guild_members(@bot.token, @id, name, limit))
       return nil if response.empty?
 
       response.map { |mem| Member.new(mem, self, @bot) }
@@ -854,7 +863,7 @@ module OnyxCord
     # @param after_id [Integer] Consider only users after given user id.
     # @return [Array<ServerBan>] a list of banned users on this server and the reason they were banned.
     def bans(limit: nil, before_id: nil, after_id: nil)
-      response = JSON.parse(REST::Server.bans(@bot.token, @id, limit, before_id, after_id))
+      response = OnyxCord::Internal::JSON.parse(REST::Server.bans(@bot.token, @id, limit, before_id, after_id))
       response.map do |e|
         ServerBan.new(self, @bot.ensure_user(e['user']), e['reason'])
       end
@@ -876,7 +885,7 @@ module OnyxCord
 
       get_bans = lambda do |before: nil, after: nil|
         data = REST::Server.bans(@bot.token, @id, f_limit, before&.id || f_before, after&.id || f_after)
-        JSON.parse(data).map { |ban| ServerBan.new(self, @bot.ensure_user(ban['user']), ban['reason']) }
+        OnyxCord::Internal::JSON.parse(data).map { |ban| ServerBan.new(self, @bot.ensure_user(ban['user']), ban['reason']) }
       end
 
       paginator = Paginator.new(limit, before ? :up : :down) do |page|
@@ -923,7 +932,7 @@ module OnyxCord
       return ban(users.first, 0, message_seconds: message_seconds, reason: reason) if users.size == 1
 
       response = REST::Server.bulk_ban(@bot.token, @id, users.map(&:resolve_id), message_seconds, reason)
-      BulkBan.new(JSON.parse(response), self, reason)
+      BulkBan.new(OnyxCord::Internal::JSON.parse(response), self, reason)
     end
 
     # Kicks a user from this server.
@@ -958,7 +967,7 @@ module OnyxCord
 
       @available_voice_regions = {}
 
-      data = JSON.parse REST::Server.regions(@bot.token, @id)
+      data = OnyxCord::Internal::JSON.parse REST::Server.regions(@bot.token, @id)
       @available_voice_regions = data.map { |e| VoiceRegion.new e }
     end
 
@@ -971,7 +980,7 @@ module OnyxCord
     # Moves the server to another region. This will cause a voice interruption of at most a second.
     # @param region [String] The new region the server should be in.
     def region=(region)
-      update_data(JSON.parse(REST::Server.update!(@bot.token, @id, region: region.to_s)))
+      update_data(OnyxCord::Internal::JSON.parse(REST::Server.update!(@bot.token, @id, region: region.to_s)))
     end
 
     # Sets the server's icon.
@@ -1127,14 +1136,14 @@ module OnyxCord
     # Requests a list of Webhooks on the server.
     # @return [Array<Webhook>] webhooks on the server.
     def webhooks
-      webhooks = JSON.parse(REST::Server.webhooks(@bot.token, @id))
+      webhooks = OnyxCord::Internal::JSON.parse(REST::Server.webhooks(@bot.token, @id))
       webhooks.map { |webhook| Webhook.new(webhook, @bot) }
     end
 
     # Requests a list of Invites to the server.
     # @return [Array<Invite>] invites to the server.
     def invites
-      invites = JSON.parse(REST::Server.invites(@bot.token, @id))
+      invites = OnyxCord::Internal::JSON.parse(REST::Server.invites(@bot.token, @id))
       invites.map { |invite| Invite.new(invite, @bot) }
     end
 
@@ -1143,7 +1152,7 @@ module OnyxCord
     #   should be ignored and re-fetched via an HTTP request.
     # @return [Array<ScheduledEvent>] The scheduled events on the server.
     def scheduled_events(bypass_cache: false)
-      process_scheduled_events(JSON.parse(REST::Server.list_scheduled_events(@bot.token, @id, with_user_count: true))) if bypass_cache
+      process_scheduled_events(OnyxCord::Internal::JSON.parse(REST::Server.list_scheduled_events(@bot.token, @id, with_user_count: true))) if bypass_cache
 
       @scheduled_events.values
     end
@@ -1157,7 +1166,7 @@ module OnyxCord
       return @scheduled_events[id] if @scheduled_events[id]
       return nil unless request
 
-      event = JSON.parse(REST::Server.get_scheduled_event(@bot.token, @id, id, with_user_count: true))
+      event = OnyxCord::Internal::JSON.parse(REST::Server.get_scheduled_event(@bot.token, @id, id, with_user_count: true))
       scheduled_event = ScheduledEvent.new(event, self, @bot)
       @scheduled_events[scheduled_event.id] = scheduled_event
     rescue StandardError
@@ -1193,7 +1202,7 @@ module OnyxCord
         recurrence_rule: block_given? ? builder.to_h : recurrence_rule&.to_h
       }
 
-      event = JSON.parse(REST::Server.create_scheduled_event(@bot.token, @id, **options, reason: reason))
+      event = OnyxCord::Internal::JSON.parse(REST::Server.create_scheduled_event(@bot.token, @id, **options, reason: reason))
       scheduled_event = ScheduledEvent.new(event, self, @bot)
       @scheduled_events[scheduled_event.id] = scheduled_event
     end
@@ -1210,7 +1219,10 @@ module OnyxCord
       LOGGER.debug("Finished chunking server #{@id}")
 
       # Reset everything to normal
-      @chunked = true
+      @chunk_mutex.synchronize do
+        @chunked = true
+      end
+      @chunk_condition.broadcast
     end
 
     # Get the AFK channel of the server.
@@ -1305,7 +1317,7 @@ module OnyxCord
           channel_id: widget_channel == :undef ? widget_channel : widget_channel&.resolve_id
         }
 
-        cache_widget_data(JSON.parse(REST::Server.update_widget(@bot.token, @id, **widget_data, reason: reason)))
+        cache_widget_data(OnyxCord::Internal::JSON.parse(REST::Server.update_widget(@bot.token, @id, **widget_data, reason: reason)))
       end
 
       if invites_disabled_until != :undef || dms_disabled_until != :undef
@@ -1314,12 +1326,12 @@ module OnyxCord
           invites_disabled_until: invites_disabled_until == :undef ? @invites_disabled_until&.iso8601 : invites_disabled_until&.iso8601
         }
 
-        process_incident_actions(JSON.parse(REST::Server.update_incident_actions(@bot.token, @id, **incidents_data, reason: reason)))
+        process_incident_actions(OnyxCord::Internal::JSON.parse(REST::Server.update_incident_actions(@bot.token, @id, **incidents_data, reason: reason)))
       end
 
       return unless data.any? { |_, value| value != :undef }
 
-      update_data(JSON.parse(REST::Server.update!(@bot.token, @id, **data, reason: reason)))
+      update_data(OnyxCord::Internal::JSON.parse(REST::Server.update!(@bot.token, @id, **data, reason: reason)))
       nil
     end
 
@@ -1327,7 +1339,7 @@ module OnyxCord
     # @note For internal use only
     # @!visibility private
     def update_data(new_data = nil)
-      new_data ||= JSON.parse(REST::Server.resolve(@bot.token, @id))
+      new_data ||= OnyxCord::Internal::JSON.parse(REST::Server.resolve(@bot.token, @id))
       @name = new_data['name']
       @icon_id = new_data['icon']
       @splash_id = new_data['splash']

data/lib/onyxcord/models/user.rb

@@ -193,7 +193,7 @@ module OnyxCord
     # @return [String, nil] the ID of this user's current banner, can be used to generate a banner URL.
     # @see #banner_url
     def banner_id
-      @banner_id ||= JSON.parse(REST::User.resolve(@bot.token, @id))['banner']
+      @banner_id ||= OnyxCord::Internal::JSON.parse(REST::User.resolve(@bot.token, @id))['banner']
     end
 
     # Set the user's username

data/lib/onyxcord/models/webhook.rb

@@ -153,7 +153,7 @@ module OnyxCord
 
       resp = REST::Webhook.token_execute_webhook(@token, @id, wait, data[:content], data[:username], data[:avatar_url], data[:tts], data[:file], data[:embeds], data[:allowed_mentions], flags, components.to_a)
 
-      Message.new(JSON.parse(resp), @bot) if wait
+      Message.new(OnyxCord::Internal::JSON.parse(resp), @bot) if wait
     end
 
     # Delete a message created by this webhook.
@@ -192,7 +192,7 @@ module OnyxCord
       edit_content = content == OnyxCord::MessagePayload::KEEP || !content.nil? ? content : data[:content]
       edit_embeds = embeds == OnyxCord::MessagePayload::KEEP || !embeds.nil? ? embeds : data[:embeds]
       resp = REST::Webhook.token_edit_message(@token, @id, message.resolve_id, edit_content, edit_embeds, data[:allowed_mentions], components.to_a, nil, flags)
-      Message.new(JSON.parse(resp), @bot)
+      Message.new(OnyxCord::Internal::JSON.parse(resp), @bot)
     end
 
     # Utility function to get a webhook's avatar URL.
@@ -228,11 +228,11 @@ module OnyxCord
 
     def update_webhook(new_data)
       reason = new_data.delete(:reason)
-      data = JSON.parse(if token?
-                          REST::Webhook.token_update_webhook(@token, @id, new_data, reason)
-                        else
-                          REST::Webhook.update_webhook(@bot.token, @id, new_data, reason)
-                        end)
+      data = OnyxCord::Internal::JSON.parse(if token?
+                                              REST::Webhook.token_update_webhook(@token, @id, new_data, reason)
+                                            else
+                                              REST::Webhook.update_webhook(@bot.token, @id, new_data, reason)
+                                            end)
       # Only update cache if API call worked
       update_internal(data) if data['name']
     end

data/lib/onyxcord/rest/client.rb

@@ -12,11 +12,17 @@ require_relative '../internal/rate_limiter/async_rest'
 # List of methods representing endpoints in Discord's API
 module OnyxCord::REST
   # The base URL of the Discord REST API.
-  APIBASE = 'https://discord.com/api/v9'
+  APIBASE = 'https://discord.com/api/v10'
 
   # The URL of Discord's CDN
   CDN_URL = 'https://cdn.discordapp.com'
 
+  # Maximum number of retries for 502 Bad Gateway errors
+  MAX_RAW_RETRIES = 3
+
+  # Maximum number of retries for 429 Rate Limit errors
+  MAX_429_RETRIES = 5
+
   module_function
 
   # @return [String] the currently used API base URL.
@@ -62,8 +68,11 @@ module OnyxCord::REST
 
   # Resets all rate limit mutexes
   def reset_mutexes
-    @rate_limiter = ::OnyxCord::Internal::RateLimiter::Rest.new
-    @async_rate_limiter = ::OnyxCord::Internal::RateLimiter::AsyncRest.new
+    @rest_mutex ||= Mutex.new
+    @rest_mutex.synchronize do
+      @rate_limiter = ::OnyxCord::Internal::RateLimiter::Rest.new
+      @async_rate_limiter = ::OnyxCord::Internal::RateLimiter::AsyncRest.new
+    end
   end
 
   def rate_limiter
@@ -118,9 +127,15 @@ module OnyxCord::REST
       raise noprm
     end
 
-    # Retry on 502 Bad Gateway
+    # Retry on 502 Bad Gateway (with limit and backoff)
     if response.code == 502
+      retries = caller.count { |c| c.include?('raw_request') }
+      if retries >= MAX_RAW_RETRIES
+        OnyxCord::LOGGER.warn("Got #{MAX_RAW_RETRIES} consecutive 502s — giving up on #{url}")
+        return response
+      end
       OnyxCord::LOGGER.warn('Got a 502 while sending a request! Not a big deal, retrying the request')
+      sleep(2**retries)
       return raw_request(type, url, body, **headers)
     end
 
@@ -203,7 +218,7 @@ module OnyxCord::REST
 
       if response.code >= 400 && response.code != 429
         data = begin
-          JSON.parse(response.body)
+          OnyxCord::Internal::JSON.parse(response.body)
         rescue StandardError
           nil
         end
@@ -222,7 +237,11 @@ module OnyxCord::REST
 
         err_klass = OnyxCord::Errors.error_class_for(data['code'] || 0)
         e = err_klass.new(data['message'], data['errors'], status: response.code, headers: response.headers, route: route, body: response.body, response: response)
-        OnyxCord::LOGGER.error(e.full_message)
+        if e.is_a?(OnyxCord::Errors::UnknownMessage)
+          OnyxCord::LOGGER.warn('Ignoring stale Discord message reference.')
+        else
+          OnyxCord::LOGGER.error(e.full_message)
+        end
         raise e
       end
     rescue OnyxCord::Errors::NoPermission => e
@@ -233,13 +252,30 @@ module OnyxCord::REST
     end
 
     if response.code == 429
+      retries_for_429 = caller.count { |c| c.include?('request_async') && c.include?('429') }
       trace("429 #{key} #{major_parameter}")
       async_rate_limiter.handle_rate_limit(key, major_parameter, response)
+
+      if retries_for_429 >= MAX_429_RETRIES
+        raise OnyxCord::Errors::HTTPError.new(
+          "Rate limited after #{MAX_429_RETRIES} retries: #{key} #{major_parameter}",
+          status: 429,
+          headers: response.headers,
+          body: response.body,
+          response: response
+        )
+      end
+
+      retry_after = response.headers[:x_ratelimit_reset_after]&.to_f || response.headers[:retry_after]&.to_f
+      if retry_after && retry_after.positive?
+        OnyxCord::LOGGER.warn("Rate limited — waiting #{retry_after}s before retry ##{retries_for_429 + 1}")
+        OnyxCord::Internal::AsyncRuntime.sleep(retry_after)
+      end
       return request_async(key, major_parameter, type, url, body, headers)
     end
 
     if response.code == 202 && response.body
-      body_data = JSON.parse(response.body)
+      body_data = OnyxCord::Internal::JSON.parse(response.body)
 
       if body_data['code'] == 110_000
         case body_data['retry_after']

data/lib/onyxcord/voice/client.rb

@@ -230,6 +230,8 @@ module OnyxCord::Voice
           # Windows does not support TERM as a kill signal, so we use KILL. `Process.waitpid` verifies that our
           # child process has not already completed.
           Process.kill(Gem.win_platform? ? 'KILL' : 'TERM', pid) if Process.waitpid(pid, Process::WNOHANG).nil?
+        rescue Errno::ESRCH, Errno::ECHILD
+          # Process already exited or doesn't exist — no action needed
         rescue StandardError => e
           OnyxCord::LOGGER.warn('Failed to kill ffmpeg process! You *might* have a process leak now.')
           OnyxCord::LOGGER.warn("Reason: #{e}")

data/lib/onyxcord/voice/network/udp.rb

@@ -37,8 +37,11 @@ module OnyxCord::Voice
     # Waits for a UDP discovery reply, and returns the sent data.
     # @return [Array(String, Integer)] the IP and port received from the discovery reply.
     def receive_discovery_reply
-      # Wait for a UDP message
+      # Wait for a UDP message with timeout
+      raise Timeout::Error, 'Timed out waiting for UDP discovery reply' unless @socket.wait_readable(5)
+
       message = @socket.recv(74)
+
       ip = message[8..-3].delete("\0")
       port = message[-2..].unpack1('n')
       [ip, port]

data/lib/onyxcord/voice/network/websocket.rb

@@ -64,7 +64,7 @@ module OnyxCord::Voice
 
     # Send a heartbeat (op 3), has to be done every @heartbeat_interval seconds or the connection will terminate
     def send_heartbeat
-      millis = Time.now.strftime('%s%L').to_i
+      millis = (Process.clock_gettime(Process::CLOCK_REALTIME, :millisecond)).to_i
       @bot.debug("Sending voice heartbeat at #{millis}")
 
       send_opcode(
@@ -110,7 +110,7 @@ module OnyxCord::Voice
     # @!visibility private
     def websocket_message(msg)
       @bot.debug("Received VWS message! #{msg}")
-      packet = JSON.parse(msg)
+      packet = OnyxCord::Internal::JSON.parse(msg)
 
       @seq = packet['seq'] if packet['seq']
 
@@ -136,6 +136,7 @@ module OnyxCord::Voice
         @ready = true
         @udp.secret_key = @ws_data['secret_key'].pack('C*')
         @udp.mode = @ws_data['mode']
+        @ready_condition&.broadcast
       when OnyxCord::Voice::Opcodes::HELLO
         # Opcode 8 contains the heartbeat interval.
         @heartbeat_interval = packet['d']['heartbeat_interval']
@@ -176,7 +177,11 @@ module OnyxCord::Voice
       @bot.debug('Waiting for op 4 now')
 
       # Wait for op 4, then finish
-      sleep 0.05 until @ready
+      @ready_mutex ||= Mutex.new
+      @ready_condition ||= ConditionVariable.new
+      @ready_mutex.synchronize do
+        @ready_condition.wait(@ready_mutex, 30) unless @ready
+      end
     end
 
     # Disconnects the websocket and kills the thread

data/lib/onyxcord/webhooks/view/container_builder.rb

@@ -60,7 +60,12 @@ class OnyxCord::Webhooks::View
     def colour=(colour)
       @colour = case colour
                 when Array
-                  (colour[0] << 16) | (colour[1] << 8) | colour[2]
+                  raise ArgumentError, 'Colour array must have exactly 3 elements (R, G, B)' unless colour.size == 3
+
+                  r, g, b = colour
+                  raise ArgumentError, 'RGB values must be between 0 and 255' unless [r, g, b].all? { |v| v.is_a?(Integer) && v.between?(0, 255) }
+
+                  (r << 16) | (g << 8) | b
                 when String
                   colour.delete('#').to_i(16)
                 else

data/lib/onyxcord.rb

@@ -199,8 +199,10 @@ loader.ignore(
   "#{__dir__}/onyxcord/cache",
   "#{__dir__}/onyxcord/gateway",
   "#{__dir__}/onyxcord/container.rb",
+  "#{__dir__}/onyxcord/cogs",
   "#{__dir__}/onyxcord/bot.rb",
-  "#{__dir__}/onyxcord/commands"
+  "#{__dir__}/onyxcord/commands",
+  "#{__dir__}/onyxcord/light"
 )
 
 loader.setup
@@ -238,6 +240,7 @@ loader.setup
   cache/manager
   await
   container
+  cogs/cog
   internal/event_bus
   gateway/client
   application_commands
@@ -246,6 +249,7 @@ loader.setup
   webhooks
   bot
   commands/bot
+  light
 ].each { |path| require_relative "onyxcord/#{path}" }
 
 loader.eager_load if ENV['ONYXCORD_EAGER_LOAD']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onyxcord
 version: !ruby/object:Gem::Version
-  version: 3.2.7
+  version: 4.0.0.beta.1
 platform: ruby
 authors:
 - Gustavo Silva
@@ -391,6 +391,10 @@ files:
 - lib/onyxcord/bot.rb
 - lib/onyxcord/cache/manager.rb
 - lib/onyxcord/cache/stores/gateway.rb
+- lib/onyxcord/cogs/bot.rb
+- lib/onyxcord/cogs/cog.rb
+- lib/onyxcord/cogs/cog_meta.rb
+- lib/onyxcord/cogs/extensions.rb
 - lib/onyxcord/commands/bot.rb
 - lib/onyxcord/commands/bot/channels.rb
 - lib/onyxcord/commands/bot/execution.rb