onyxcord 2.0.8 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de906b93116b1c325312db44d7373011c24b4ea6807cea759112af2846a9449a
-  data.tar.gz: 3be86bc11a833fd3cb8b88874837d2cc732c916a4b6f4afbad340f1573531f89
+  metadata.gz: df2a03d17ca81fd7a31574dbb8f94a53fc18b602a87ccd77d8390c472bb8a89b
+  data.tar.gz: 970063416e35a36c1f1f8c97d706a9e6a4895b5d7c1ec44eb19ab1e923b0fdcc
 SHA512:
-  metadata.gz: b7c429540a55956bb417841e610d9e8da946d18c4565c3177a45cb2ec4ba885988e02fade2c910edff015aee77970709198d450ba5719faa1862a182ab3507fb
-  data.tar.gz: 8159656f82928ec348522857df842cfe27479c6ba147e090778ac26749533f7d0c32c80390b61df6e4b15ef485fa2e6dcb886355650cc2cb1f2598759f694da9
+  metadata.gz: 96fd63b818d4e7abcd493f747444692951ec8c2c45a17efdb7772ae5de0aee444f3a22dc410067b8585ad803baa300d52d54856dd3efeddd8938a207d0aa3037
+  data.tar.gz: 37d0a1e7c88edc3ced210a92a9bceefd9f980a9280f0802538efed8b4b0de17f92120924a1c2a0121a55d07a33aa9915a2cafca2b915f1630f47e4e7f3049828

data/CHANGELOG.md

@@ -1,5 +1,94 @@
 # Changelog
 
+## 2.1.0 - 2026-07-01
+
+### Melhorias de REST e gateway
+
+- Adiciona `OnyxCord::MessagePayload` e `OnyxCord::Upload` para centralizar payloads, anexos e multipart.
+- Melhora rate limit global async para bloquear novas requests enquanto o limite global esta ativo.
+- Adiciona retry REST para falhas temporarias `500`, `502`, `503`, `504` e erros de conexao.
+- Adiciona erros HTTP tipados com `status`, `code`, `headers`, `route`, `body` e `response`.
+- Torna o reconnect do gateway mais defensivo: quedas antes do `HELLO` voltam para `IDENTIFY`, quedas depois do `HELLO` tentam `RESUME`.
+- Adiciona `AllowedMentions.none` e `AllowedMentions.all`.
+- Ajusta edicao de mensagens para limpar `embeds` ao editar `content`, limpar `content` ao editar `embeds`, e preservar campos com `:keep`.
+- Valida payloads antes da API para limites de embeds/anexos e combinacoes invalidas de Components V2.
+
+## 2.0.20 - 2026-06-30
+
+### Correcoes de REST
+
+- Porta o formato multipart do disnake: lista de partes `files[n]` e `payload_json`, com reset do arquivo antes do envio.
+
+## 2.0.19 - 2026-06-30
+
+### Correcoes de REST
+
+- Adiciona diagnostico de metodo, URL sanitizada, headers e formato do body em erros HTTP sem JSON.
+
+## 2.0.18 - 2026-06-30
+
+### Correcoes de REST
+
+- Normaliza multipart de followup webhook com `payload_json` primeiro e sem campos vazios.
+
+## 2.0.17 - 2026-06-30
+
+### Correcoes de REST
+
+- Envia `payload_json` com `Content-Type: application/json` e `.txt` como `text/plain` em multipart.
+
+## 2.0.16 - 2026-06-30
+
+### Correcoes de REST
+
+- Forca HTTP/1.1 na sessao REST do HTTPX para evitar `protocol_error` em interacoes e followups.
+
+## 2.0.15 - 2026-06-30
+
+### Correcoes de REST
+
+- Envia uploads `multipart/form-data` por `Net::HTTP` no adaptador REST para evitar rejeicao `HTTP 400` do Cloudflare em anexos.
+
+## 2.0.14 - 2026-06-30
+
+### Correcoes de REST
+
+- Corrige uploads `multipart/form-data` no adaptador HTTPX usando `form:` nativo, evitando `HTTP 400` HTML do Cloudflare em anexos.
+
+## 2.0.13 - 2026-06-28
+
+### Correcoes de gateway
+
+- Evita chamadas REST em `Bot#update_voice_state` ao processar `VOICE_STATE_UPDATE`.
+- Torna `GUILD_UPDATE` tolerante a guild ainda nao cacheada.
+
+## 2.0.12 - 2026-06-28
+
+### Correcoes de gateway
+
+- Evita chamadas REST durante a criação de eventos do Gateway para `VOICE_STATE_UPDATE` e `CHANNEL_CREATE`.
+- Trata `Async::Cancel` durante dispatch do Gateway como cancelamento esperado, sem registrar erro fatal.
+
+## 2.0.11 - 2026-06-28
+
+### Correcoes de estabilidade
+
+- Isola a sessao HTTP persistente por thread para evitar que tarefas em segundo plano disputem a mesma conexao REST das interacoes.
+
+## 2.0.10 - 2026-06-28
+
+### Correcoes de voz
+
+- Mantem `channel_id` no cache de `VoiceState` mesmo quando o objeto do canal ainda nao foi resolvido.
+- Expoe `channel_id` e `old_channel_id` em `VoiceStateUpdateEvent`, corrigindo entradas em call que pareciam `nil -> nil`.
+- Permite que raw dispatch handlers filtrem pacotes com chaves string ou symbol.
+
+## 2.0.9 - 2026-06-28
+
+### Correcoes de estabilidade
+
+- Tolera um heartbeat sem ACK antes de reconectar, evitando queda por ACK atrasado isolado.
+
 ## 2.0.8 - 2026-06-28
 
 ### Correcoes de gateway
@@ -166,4 +255,3 @@ bot.sync_application_commands!(server_id: ENV.fetch('DISCORD_SERVER_ID'))
 - `bundle exec rspec`: 456 exemplos, 0 falhas, 3 pendentes.
 - RuboCop nos arquivos alterados: sem offenses.
 - `gem build onyxcord.gemspec`: sucesso.
-- `gem build onyxcord-webhooks.gemspec`: sucesso.

data/lib/onyxcord/allowed_mentions.rb

@@ -30,6 +30,14 @@ module OnyxCord
       @replied_user = replied_user
     end
 
+    def self.none
+      new(parse: [], users: [], roles: [], replied_user: false)
+    end
+
+    def self.all
+      new(parse: %w[users roles everyone], replied_user: true)
+    end
+
     # @!visibility private
     def to_hash
       {

data/lib/onyxcord/api/channel.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'onyxcord/message_components'
+require 'onyxcord/message_payload'
 
 # API calls for Channel
 module OnyxCord::API::Channel
@@ -9,18 +9,12 @@ module OnyxCord::API::Channel
   # Build attachment metadata payload for multipart uploads.
   # Returns an array of { id:, filename: } hashes.
   def attachment_payload(attachments)
-    Array(attachments).map.with_index do |attachment, index|
-      { id: index, filename: File.basename(attachment.path) }
-    end
+    OnyxCord::MessagePayload.attachment_payload(attachments)
   end
 
   # Build multipart body with named file fields and JSON payload.
   def multipart_body(body, attachments)
-    files = Array(attachments).map.with_index.to_h do |attachment, index|
-      ["files[#{index}]", attachment]
-    end
-
-    { **files, payload_json: body.to_json }
+    OnyxCord::MessagePayload.multipart_body(body, attachments)
   end
 
   # Get a channel's data
@@ -113,6 +107,7 @@ module OnyxCord::API::Channel
     tts = false unless [true, false].include?(tts)
     components = OnyxCord::MessageComponents.payload(components) unless components.nil?
     flags = OnyxCord::MessageComponents.apply_v2_flag(flags, components)
+    OnyxCord::MessagePayload.validate!(content: message, embeds: embeds, components: components, flags: flags, attachments: attachments, poll: poll)
     body = { content: message, tts: tts == true, embeds: embeds, nonce: nonce, allowed_mentions: allowed_mentions, message_reference: message_reference, components: components, attachments: attachments ? attachment_payload(attachments) : nil, flags: flags, enforce_nonce: enforce_nonce, poll: poll }.compact
     body = if attachments
              multipart_body(body, attachments)
@@ -151,12 +146,14 @@ module OnyxCord::API::Channel
   def edit_message(token, channel_id, message_id, message, mentions = nil, embeds = nil, components = nil, flags = nil)
     components = OnyxCord::MessageComponents.payload(components) unless components.nil? || components == :undef
     flags = OnyxCord::MessageComponents.apply_v2_flag(flags, components)
+    body = OnyxCord::MessagePayload.edit_body(message, embeds)
+    body.merge!(allowed_mentions: mentions, components: components, flags: flags)
     OnyxCord::API.request(
       :channels_cid_messages_mid,
       channel_id,
       :patch,
       "#{OnyxCord::API.api_base}/channels/#{channel_id}/messages/#{message_id}",
-      { content: message, allowed_mentions: mentions, embeds: embeds, components: components, flags: flags }.reject { |_, v| v == :undef }.to_json,
+      body.reject { |_, v| v == :undef }.to_json,
       Authorization: token,
       content_type: :json
     )
@@ -655,6 +652,7 @@ module OnyxCord::API::Channel
   # Start a thread in a forum or media channel.
   # https://discord.com/developers/docs/resources/channel#start-thread-in-forum-or-media-channel
   def start_thread_in_forum_or_media_channel(token, channel_id, name, message, attachments = nil, rate_limit_per_user = nil, auto_archive_duration = nil, applied_tags = nil, reason = nil)
+    OnyxCord::MessagePayload.validate!(attachments: attachments)
     body = { name: name, message: message, rate_limit_per_user: rate_limit_per_user, auto_archive_duration: auto_archive_duration, applied_tags: applied_tags }.compact
 
     body = if attachments

data/lib/onyxcord/api/interaction.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'onyxcord/message_components'
+require 'onyxcord/message_payload'
 
 # API calls for interactions.
 module OnyxCord::API::Interaction
@@ -9,18 +9,12 @@ module OnyxCord::API::Interaction
   # Build attachment metadata payload for multipart uploads.
   # Returns an array of { id:, filename: } hashes.
   def attachment_payload(attachments)
-    Array(attachments).map.with_index do |attachment, index|
-      { id: index, filename: File.basename(attachment.path) }
-    end
+    OnyxCord::MessagePayload.attachment_payload(attachments)
   end
 
   # Build multipart body with named file fields and JSON payload.
   def multipart_body(body, attachments)
-    files = Array(attachments).map.with_index.to_h do |attachment, index|
-      ["files[#{index}]", attachment]
-    end
-
-    { **files, payload_json: body.to_json }
+    OnyxCord::MessagePayload.multipart_body(body, attachments)
   end
 
   # Respond to an interaction.
@@ -28,6 +22,7 @@ module OnyxCord::API::Interaction
   def create_interaction_response(interaction_token, interaction_id, type, content = nil, tts = nil, embeds = nil, allowed_mentions = nil, flags = nil, components = nil, attachments = nil, choices = nil, with_response = nil, poll = nil)
     components = OnyxCord::MessageComponents.payload(components) unless components.nil?
     flags = OnyxCord::MessageComponents.apply_v2_flag(flags, components)
+    OnyxCord::MessagePayload.validate!(content: content, embeds: embeds, components: components, flags: flags, attachments: attachments, poll: poll)
     data = { tts: tts, content: content, embeds: embeds, allowed_mentions: allowed_mentions, flags: flags, components: components, attachments: attachments ? attachment_payload(attachments) : nil, choices: choices, poll: poll }.compact
 
     body = if attachments

data/lib/onyxcord/api/webhook.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'onyxcord/message_components'
+require 'onyxcord/message_payload'
 
 # API calls for Webhook object
 module OnyxCord::API::Webhook
@@ -9,18 +9,12 @@ module OnyxCord::API::Webhook
   # Build attachment metadata payload for multipart uploads.
   # Returns an array of { id:, filename: } hashes.
   def attachment_payload(attachments)
-    Array(attachments).map.with_index do |attachment, index|
-      { id: index, filename: File.basename(attachment.path) }
-    end
+    OnyxCord::MessagePayload.attachment_payload(attachments)
   end
 
   # Build multipart body with named file fields and JSON payload.
   def multipart_body(body, attachments)
-    files = Array(attachments).map.with_index.to_h do |attachment, index|
-      ["files[#{index}]", attachment]
-    end
-
-    { **files, payload_json: body.to_json }
+    OnyxCord::MessagePayload.multipart_body(body, attachments)
   end
 
   # Get a webhook
@@ -49,9 +43,12 @@ module OnyxCord::API::Webhook
   # Execute a webhook via token.
   # https://discord.com/developers/docs/resources/webhook#execute-webhook
   def token_execute_webhook(webhook_token, webhook_id, wait = false, content = nil, username = nil, avatar_url = nil, tts = nil, file = nil, embeds = nil, allowed_mentions = nil, flags = nil, components = nil, attachments = nil, poll = nil)
+    raise ArgumentError, 'cannot mix file and attachments' if file && attachments
+
     components = OnyxCord::MessageComponents.payload(components) unless components.nil?
     flags = OnyxCord::MessageComponents.apply_v2_flag(flags, components)
-    body = { content: content, username: username, avatar_url: avatar_url, tts: tts, embeds: embeds&.map(&:to_hash), allowed_mentions: allowed_mentions, flags: flags, components: components, attachments: attachments ? attachment_payload(attachments) : nil, poll: poll }.compact
+    OnyxCord::MessagePayload.validate!(content: content, embeds: embeds, components: components, flags: flags, attachments: attachments, poll: poll)
+    body = { content: content, username: username, avatar_url: avatar_url, tts: tts == true ? true : nil, embeds: embeds&.map(&:to_hash), allowed_mentions: allowed_mentions, flags: flags, components: components&.any? ? components : nil, attachments: attachments ? attachment_payload(attachments) : nil, poll: poll }.compact
 
     body = if file
              { file: file, payload_json: body.to_json }
@@ -145,7 +142,8 @@ module OnyxCord::API::Webhook
   def token_edit_message(webhook_token, webhook_id, message_id, content = nil, embeds = nil, allowed_mentions = nil, components = nil, attachments = nil, flags = nil, poll = nil)
     components = OnyxCord::MessageComponents.payload(components) unless components.nil?
     flags = OnyxCord::MessageComponents.apply_v2_flag(flags, components)
-    body = { content: content, embeds: embeds, allowed_mentions: allowed_mentions, components: components, attachments: attachments ? attachment_payload(attachments) : nil, flags: flags, poll: poll }.compact
+    OnyxCord::MessagePayload.validate!(content: content, embeds: embeds, components: components, flags: flags, attachments: attachments, poll: poll)
+    body = OnyxCord::MessagePayload.edit_body(content, embeds).merge({ allowed_mentions: allowed_mentions, components: components, attachments: attachments ? attachment_payload(attachments) : nil, flags: flags, poll: poll }.compact)
 
     body = if attachments
              multipart_body(body, attachments)

data/lib/onyxcord/api.rb

@@ -105,9 +105,17 @@ module OnyxCord::API
     response = OnyxCord::HTTP.request(type, url, body, **headers)
 
     if response.code == 403
-      noprm = OnyxCord::Errors::NoPermission.new
+      route = request_diagnostic(type, url, body, headers)
+      noprm = OnyxCord::Errors::NoPermission.new(
+        "The bot doesn't have the required permission to do this!",
+        status: response.code,
+        headers: response.headers,
+        route: route,
+        body: response.body,
+        response: response
+      )
       noprm.define_singleton_method(:_response) { response }
-      raise noprm, "The bot doesn't have the required permission to do this!"
+      raise noprm
     end
 
     # Retry on 502 Bad Gateway
@@ -157,20 +165,38 @@ module OnyxCord::API
 
       response = nil
       loop do
-        response = OnyxCord::HTTP.request(type, url, body, **headers)
-        break unless response.code == 502
+        begin
+          response = OnyxCord::HTTP.request(type, url, body, **headers)
+        rescue StandardError => e
+          retries += 1
+          raise unless retries < max_retries
+
+          OnyxCord::LOGGER.warn("Temporary HTTP failure while sending request (#{e.class}), retrying")
+          OnyxCord::AsyncRuntime.sleep(retries * 0.5)
+          next
+        end
+
+        break unless [500, 502, 503, 504].include?(response.code)
 
         retries += 1
         break unless retries < max_retries
 
-        OnyxCord::LOGGER.warn('Got a 502 while sending a request! Not a big deal, retrying the request')
+        OnyxCord::LOGGER.warn("Got HTTP #{response.code} while sending a request, retrying")
         OnyxCord::AsyncRuntime.sleep(retries * 0.5)
       end
 
       if response.code == 403
-        noprm = OnyxCord::Errors::NoPermission.new
+        route = request_diagnostic(type, url, body, headers)
+        noprm = OnyxCord::Errors::NoPermission.new(
+          "The bot doesn't have the required permission to do this!",
+          status: response.code,
+          headers: response.headers,
+          route: route,
+          body: response.body,
+          response: response
+        )
         noprm.define_singleton_method(:_response) { response }
-        raise noprm, "The bot doesn't have the required permission to do this!"
+        raise noprm
       end
 
       if response.code >= 400 && response.code != 429
@@ -180,10 +206,20 @@ module OnyxCord::API
           nil
         end
 
-        raise "HTTP #{response.code}: #{response.body}" unless data
+        route = request_diagnostic(type, url, body, headers)
+        unless data
+          raise OnyxCord::Errors::HTTPError.new(
+            "HTTP #{response.code} #{route}: #{response.body}",
+            status: response.code,
+            headers: response.headers,
+            route: route,
+            body: response.body,
+            response: response
+          )
+        end
 
         err_klass = OnyxCord::Errors.error_class_for(data['code'] || 0)
-        e = err_klass.new(data['message'], data['errors'])
+        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)
         raise e
       end
@@ -243,6 +279,25 @@ module OnyxCord::API
     end
   end
 
+  def request_diagnostic(type, url, body, headers)
+    clean_url = url.to_s.sub(%r{/webhooks/(\d+)/[^?]+}, '/webhooks/\1/[token]')
+                      .sub(%r{/interactions/(\d+)/[^/]+}, '/interactions/\1/[token]')
+    header_keys = headers.keys.map(&:to_s).sort.join(',')
+    body_info = if body.is_a?(Hash)
+                  body.map do |key, value|
+                    path = value.path if value.respond_to?(:path)
+                    detail = path ? "file:#{File.basename(path)}" : value.to_s.bytesize
+                    "#{key}=#{detail}"
+                  end.join(',')
+                else
+                  body.nil? ? 'nil' : "#{body.class}:#{body.to_s.bytesize}"
+                end
+
+    "(#{type.to_s.upcase} #{clean_url} headers=#{header_keys} body=#{body_info})"
+  rescue StandardError => e
+    "(diagnostic_failed=#{e.class}: #{e.message})"
+  end
+
   # Make an icon URL from server and icon IDs
   def icon_url(server_id, icon_id, format = 'webp')
     "#{cdn_url}/icons/#{server_id}/#{icon_id}.#{format}"

data/lib/onyxcord/async/runtime.rb

@@ -10,7 +10,7 @@ module OnyxCord
       current = Async::Task.current?
       return yield current if current
 
-      Async(&block).wait
+      Sync(&block)
     end
 
     def async(&block)

data/lib/onyxcord/bot.rb

@@ -1119,12 +1119,12 @@ module OnyxCord
       @session_id = data['session_id']
 
       server_id = data['guild_id'].to_i
-      server = server(server_id)
+      server = @servers&.[](server_id)
       return unless server
 
       user_id = data['user_id'].to_i
       old_voice_state = server.voice_states[user_id]
-      old_channel_id = old_voice_state.voice_channel&.id if old_voice_state
+      old_channel_id = old_voice_state&.channel_id || old_voice_state&.voice_channel&.id
 
       server.update_voice_state(data)
 
@@ -1132,7 +1132,8 @@ module OnyxCord
       if user_id == @profile.id && existing_voice
         new_channel_id = data['channel_id']
         if new_channel_id
-          new_channel = channel(new_channel_id)
+          channel_id = new_channel_id.to_i
+          new_channel = @channels&.[](channel_id) || server.channels.find { |channel| channel.id == channel_id }
           existing_voice.channel = new_channel
         else
           voice_destroy(server_id)
@@ -1248,7 +1249,15 @@ module OnyxCord
 
     # Internal handler for GUILD_UPDATE
     def update_guild(data)
-      @servers[data['id'].to_i].update_data(data)
+      server_id = data['id'].to_i
+      server = @servers&.[](server_id)
+
+      if server
+        server.update_data(data)
+      else
+        LOGGER.warn("GUILD_UPDATE received for uncached server #{server_id}; caching from payload")
+        ensure_server(data, true)
+      end
     end
 
     # Internal handler for GUILD_DELETE
@@ -1868,6 +1877,11 @@ module OnyxCord
         raise_event(event)
       end
     rescue Exception => e
+      if defined?(Async::Cancel) && e.is_a?(Async::Cancel)
+        LOGGER.debug('Gateway message handling was cancelled.')
+        return
+      end
+
       LOGGER.error('Gateway message error!')
       log_exception(e)
     end

data/lib/onyxcord/data/interaction.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'onyxcord/webhooks'
-require 'onyxcord/message_components'
+require 'onyxcord/message_payload'
 
 module OnyxCord
   # Base class for interaction objects.
@@ -260,7 +260,7 @@ module OnyxCord
       components ||= view
       flags = OnyxCord::MessageComponents.apply_v2_flag(flags, components, force: has_components || components_v2)
       data = builder.to_json_hash
-      resp = OnyxCord::API::Interaction.edit_original_interaction_response(@token, @application_id, data[:content], data[:embeds], data[:allowed_mentions], components.to_a, attachments, flags, data[:poll])
+      resp = OnyxCord::API::Interaction.edit_original_interaction_response(@token, @application_id, edit_content(content, data), edit_embeds(embeds, data), data[:allowed_mentions], components.to_a, attachments, flags, data[:poll])
 
       Interactions::Message.new(JSON.parse(resp), @bot, self)
     end
@@ -324,7 +324,7 @@ module OnyxCord
       data = builder.to_json_hash
 
       resp = OnyxCord::API::Webhook.token_edit_message(
-        @token, @application_id, message.resolve_id, data[:content], data[:embeds], data[:allowed_mentions], components.to_a, attachments, flags, data[:poll]
+        @token, @application_id, message.resolve_id, edit_content(content, data), edit_embeds(embeds, data), data[:allowed_mentions], components.to_a, attachments, flags, data[:poll]
       )
       Interactions::Message.new(JSON.parse(resp), @bot, self)
     end
@@ -392,9 +392,17 @@ module OnyxCord
     # @param poll [Poll, Poll::Builder, Hash, nil]
     def prepare_builder(builder, content, embeds, allowed_mentions, poll)
       builder.poll = poll
-      builder.content = content
+      builder.content = content unless content == OnyxCord::MessagePayload::KEEP
       builder.allowed_mentions = allowed_mentions
-      embeds&.each { |embed| builder << embed }
+      embeds&.each { |embed| builder << embed } unless embeds == OnyxCord::MessagePayload::KEEP
+    end
+
+    def edit_content(content, data)
+      content == OnyxCord::MessagePayload::KEEP ? OnyxCord::MessagePayload::KEEP : data[:content]
+    end
+
+    def edit_embeds(embeds, data)
+      embeds == OnyxCord::MessagePayload::KEEP ? OnyxCord::MessagePayload::KEEP : data[:embeds]
     end
 
     # @!visibility private

data/lib/onyxcord/data/message.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'onyxcord/message_components'
+require 'onyxcord/message_payload'
 
 module OnyxCord
   # A message on Discord that was sent to a text channel
@@ -304,7 +304,11 @@ module OnyxCord
     # @param flags [Integer] Flags for this message. Currently only SUPPRESS_EMBEDS (1 << 2) can be edited.
     # @return [Message] the resulting message.
     def edit(new_content, new_embeds = nil, new_components = nil, flags = 0)
-      new_embeds = (new_embeds.instance_of?(Array) ? new_embeds.map(&:to_hash) : [new_embeds&.to_hash]).compact
+      new_embeds = if new_embeds == OnyxCord::MessagePayload::KEEP
+                     new_embeds
+                   else
+                     (new_embeds.instance_of?(Array) ? new_embeds.map { |embed| embed.respond_to?(:to_hash) ? embed.to_hash : embed } : [new_embeds&.to_hash]).compact
+                   end
       new_components = new_components.to_a
       flags = OnyxCord::MessageComponents.apply_v2_flag(flags, new_components)
 

data/lib/onyxcord/data/server.rb

@@ -697,13 +697,15 @@ module OnyxCord
         end
 
         # Update the existing voice state (or the one we just created)
-        channel = @channels_by_id[data['channel_id'].to_i]
+        channel_id = data['channel_id'].to_i
+        channel = @channels_by_id[channel_id]
         @voice_states[user_id].update(
           channel,
           data['mute'],
           data['deaf'],
           data['self_mute'],
-          data['self_deaf']
+          data['self_deaf'],
+          channel_id
         )
       else
         # The user is not in a voice channel anymore, so delete its voice state

data/lib/onyxcord/data/voice_state.rb

@@ -22,6 +22,9 @@ module OnyxCord
     # @return [Channel] the voice channel this voice state's member is in.
     attr_reader :voice_channel
 
+    # @return [Integer, nil] the ID of the voice channel this member is in.
+    attr_reader :channel_id
+
     # @!visibility private
     def initialize(user_id)
       @user_id = user_id
@@ -30,8 +33,9 @@ module OnyxCord
     # Update this voice state with new data from Discord
     # @note For internal use only.
     # @!visibility private
-    def update(channel, mute, deaf, self_mute, self_deaf)
+    def update(channel, mute, deaf, self_mute, self_deaf, channel_id = nil)
       @voice_channel = channel
+      @channel_id = channel_id&.to_i || channel&.id
       @mute = mute
       @deaf = deaf
       @self_mute = self_mute

data/lib/onyxcord/data/webhook.rb

@@ -2,7 +2,7 @@
 
 require 'onyxcord/webhooks/builder'
 require 'onyxcord/webhooks/view'
-require 'onyxcord/message_components'
+require 'onyxcord/message_payload'
 
 module OnyxCord
   # A webhook on a server channel
@@ -178,7 +178,7 @@ module OnyxCord
     def edit_message(message, content: nil, embeds: nil, allowed_mentions: nil, builder: nil, components: nil, flags: 0, has_components: false, components_v2: false)
       raise OnyxCord::Errors::UnauthorizedWebhook unless @token
 
-      params = { content: content, embeds: embeds, allowed_mentions: allowed_mentions }.compact
+      params = { allowed_mentions: allowed_mentions }.compact
 
       builder ||= Webhooks::Builder.new
       view ||= Webhooks::View.new
@@ -189,7 +189,9 @@ module OnyxCord
       components ||= view
       flags = OnyxCord::MessageComponents.apply_v2_flag(flags, components, force: has_components || components_v2)
 
-      resp = API::Webhook.token_edit_message(@token, @id, message.resolve_id, data[:content], data[:embeds], data[:allowed_mentions], components.to_a, nil, flags)
+      edit_content = content == OnyxCord::MessagePayload::KEEP || !content.nil? ? content : data[:content]
+      edit_embeds = embeds == OnyxCord::MessagePayload::KEEP || !embeds.nil? ? embeds : data[:embeds]
+      resp = API::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)
     end
 

data/lib/onyxcord/errors.rb

@@ -14,8 +14,22 @@ module OnyxCord
     # Raised when a message is over the character limit
     class MessageTooLong < RuntimeError; end
 
+    class HTTPError < RuntimeError
+      attr_reader :status, :code, :headers, :route, :body, :response
+
+      def initialize(message = nil, status: nil, code: 0, headers: {}, route: nil, body: nil, response: nil)
+        super(message)
+        @status = status
+        @code = code || 0
+        @headers = headers
+        @route = route
+        @body = body
+        @response = response
+      end
+    end
+
     # Raised when the bot can't do something because its permissions on the server are insufficient
-    class NoPermission < RuntimeError; end
+    class NoPermission < HTTPError; end
 
     # Raised when the bot gets a HTTP 502 error, which is usually caused by Cloudflare.
     class CloudflareError < RuntimeError; end
@@ -24,7 +38,7 @@ module OnyxCord
     class UnauthorizedWebhook < RuntimeError; end
 
     # Generic class for errors denoted by API error codes
-    class CodeError < RuntimeError
+    class CodeError < HTTPError
       class << self
         # @return [Integer] The error code represented by this error class.
         attr_reader :code
@@ -33,10 +47,11 @@ module OnyxCord
       # Create a new error with a particular message (the code should be defined by the class instance variable)
       # @param message [String] the message to use
       # @param errors [Hash] API errors
-      def initialize(message, errors = nil)
+      def initialize(message, errors = nil, status: nil, headers: {}, route: nil, body: nil, response: nil)
         @message = message
 
         @errors = errors ? flatten_errors(errors) : []
+        super(full_message, status: status, code: code, headers: headers, route: route, body: body, response: response)
       end
 
       # @return [Integer] The error code represented by this error.

data/lib/onyxcord/events/channels.rb

@@ -32,7 +32,23 @@ module OnyxCord::Events
     # @!visibility private
     def initialize(data, bot)
       @bot = bot
-      @channel = data.is_a?(OnyxCord::Channel) ? data : bot.channel(data['id'].to_i)
+      @channel = if data.is_a?(OnyxCord::Channel)
+                   data
+                 else
+                   cached_channel(bot, data['id']) || OnyxCord::Channel.new(data, bot, cached_server(bot, data['guild_id']))
+                 end
+    end
+
+    def cached_channel(bot, channel_id)
+      channels = bot.instance_variable_get(:@channels)
+      channels&.[](channel_id.to_i)
+    end
+
+    def cached_server(bot, server_id)
+      return nil unless server_id
+
+      servers = bot.instance_variable_get(:@servers)
+      servers&.[](server_id.to_i)
     end
   end
 

data/lib/onyxcord/events/raw.rb

@@ -57,7 +57,7 @@ module OnyxCord::Events
     def matches?(packet)
       return true unless @filter
 
-      type = packet['t']
+      type = packet['t'] || packet[:t]
       return false unless type
 
       if @filter.is_a?(Regexp)

data/lib/onyxcord/events/voice_state_update.rb

@@ -6,11 +6,17 @@ require 'onyxcord/data'
 module OnyxCord::Events
   # Event raised when a user's voice state updates
   class VoiceStateUpdateEvent < Event
-    attr_reader :user, :token, :suppress, :session_id, :self_mute, :self_deaf, :mute, :deaf, :server, :channel
+    attr_reader :user, :user_id, :token, :suppress, :session_id, :self_mute, :self_deaf, :mute, :deaf, :server, :channel
 
     # @return [Channel, nil] the old channel this user was on, or nil if the user is newly joining voice.
     attr_reader :old_channel
 
+    # @return [Integer, nil] the current voice channel ID, or nil if the user left voice.
+    attr_reader :channel_id
+
+    # @return [Integer, nil] the previous voice channel ID, or nil if the user joined voice.
+    attr_reader :old_channel_id
+
     # @!visibility private
     def initialize(data, old_channel_id, bot)
       @bot = bot
@@ -22,12 +28,35 @@ module OnyxCord::Events
       @self_deaf = data['self_deaf']
       @mute = data['mute']
       @deaf = data['deaf']
-      @server = bot.server(data['guild_id'].to_i)
+      @user_id = data['user_id']&.to_i
+      @channel_id = data['channel_id']&.to_i
+      @old_channel_id = old_channel_id&.to_i
+      @server = cached_server(bot, data['guild_id'])
       return unless @server
 
-      @channel = bot.channel(data['channel_id'].to_i) if data['channel_id']
-      @old_channel = bot.channel(old_channel_id) if old_channel_id
-      @user = bot.user(data['user_id'].to_i)
+      @channel = cached_channel(bot, @channel_id, @server)
+      @old_channel = cached_channel(bot, @old_channel_id, @server)
+      @user = cached_user(bot, data)
+    end
+
+    def cached_server(bot, server_id)
+      servers = bot.instance_variable_get(:@servers)
+      servers&.[](server_id.to_i)
+    end
+
+    def cached_channel(bot, channel_id, server)
+      return nil unless channel_id
+
+      channels = bot.instance_variable_get(:@channels)
+      channels&.[](channel_id.to_i) || server.channels.find { |channel| channel.id == channel_id.to_i }
+    end
+
+    def cached_user(bot, data)
+      user_data = data.dig('member', 'user') || data['user']
+      return bot.ensure_user(user_data) if user_data
+
+      users = bot.instance_variable_get(:@users)
+      users&.[](data['user_id'].to_i)
     end
   end
 
@@ -39,6 +68,8 @@ module OnyxCord::Events
 
       [
         matches_all(@attributes[:from], event.user) do |a, e|
+          next unless e
+
           a == case a
                when String
                  e.name

data/lib/onyxcord/gateway.rb

@@ -84,6 +84,7 @@ module OnyxCord
       @connection = nil
       @closed = true
       @pipe_broken = false
+      @missed_heartbeat_acks = 0
     end
 
     # Connect to the gateway server inside an Async reactor.
@@ -142,10 +143,17 @@ module OnyxCord
     def heartbeat
       if check_heartbeat_acks
         unless @last_heartbeat_acked
-          LOGGER.warn('Last heartbeat was not acked — zombie connection! Reconnecting')
-          @pipe_broken = true
-          reconnect
-          return
+          @missed_heartbeat_acks += 1
+          if @missed_heartbeat_acks >= 2
+            LOGGER.warn('Last heartbeats were not acked — zombie connection! Reconnecting')
+            @pipe_broken = true
+            reconnect
+            return
+          end
+
+          LOGGER.warn('Last heartbeat was not acked — waiting one more interval before reconnecting')
+        else
+          @missed_heartbeat_acks = 0
         end
         @last_heartbeat_acked = false
       end
@@ -194,6 +202,7 @@ module OnyxCord
 
     def reconnect(attempt_resume = true)
       @session.suspend if @session && attempt_resume
+      @session.invalidate if attempt_resume && @session && !@received_hello
       @instant_reconnect = true
       @should_reconnect = true
       close(4000)
@@ -219,6 +228,7 @@ module OnyxCord
 
     def setup_heartbeats(interval)
       @last_heartbeat_acked = true
+      @missed_heartbeat_acks = 0
       return if @heartbeat_task
 
       @heartbeat_interval = interval
@@ -292,6 +302,7 @@ module OnyxCord
 
       @zlib_reader = Zlib::Inflate.new
       @pipe_broken = false
+      @received_hello = false
       @closed = false
 
       endpoint = websocket_endpoint(url)
@@ -307,9 +318,11 @@ module OnyxCord
         end
       end
     rescue StandardError => e
+      @session&.invalidate unless @received_hello
       LOGGER.error('Error connecting to gateway!')
       LOGGER.log_exception(e)
     ensure
+      @session&.invalidate unless @received_hello
       @closed = true
       @connection = nil
     end
@@ -415,6 +428,7 @@ module OnyxCord
 
     # Op 10
     def handle_hello(packet)
+      @received_hello = true
       LOGGER.debug('Hello!')
       interval = packet['d']['heartbeat_interval'].to_f / 1000.0
       setup_heartbeats(interval)
@@ -432,7 +446,10 @@ module OnyxCord
     # Op 11
     def handle_heartbeat_ack(packet)
       LOGGER.debug("Heartbeat ACK: #{packet.inspect}")
-      @last_heartbeat_acked = true if @check_heartbeat_acks
+      if @check_heartbeat_acks
+        @last_heartbeat_acked = true
+        @missed_heartbeat_acks = 0
+      end
     end
 
     def handle_internal_close(e)

data/lib/onyxcord/http.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
 require 'httpx'
+require 'net/http'
 require 'onyxcord/json'
+require 'onyxcord/upload'
+require 'securerandom'
+require 'uri'
 
 module OnyxCord
   # Modern HTTP adapter wrapping HTTPX with persistent connections, automatic
@@ -22,8 +26,9 @@ module OnyxCord
       def initialize(httpx_response)
         @raw = httpx_response
         @body = httpx_response.body.to_s
-        @code = httpx_response.status
-        @headers = normalize_headers(httpx_response.headers)
+        @code = httpx_response.respond_to?(:status) ? httpx_response.status : httpx_response.code.to_i
+        response_headers = httpx_response.respond_to?(:headers) ? httpx_response.headers : httpx_response.to_hash
+        @headers = normalize_headers(response_headers)
       end
 
       def to_s
@@ -39,21 +44,27 @@ module OnyxCord
       def normalize_headers(headers)
         headers.to_h.transform_keys do |key|
           key.to_s.tr('-', '_').downcase.to_sym
+        end.transform_values do |value|
+          value.is_a?(Array) && value.size == 1 ? value.first : value
         end
       end
     end
 
     module_function
 
-    # The shared HTTPX session with persistent connections.
+    # The shared HTTPX session with persistent connections for the current thread.
     def session
-      @session ||= HTTPX.plugin(:persistent)
-                        .plugin(:follow_redirects)
+      Thread.current[:onyxcord_http_session] ||= HTTPX.plugin(:persistent)
+                                                 .plugin(:follow_redirects)
+                                                 .with(
+                                                   fallback_protocol: 'http/1.1',
+                                                   ssl: { alpn_protocols: ['http/1.1'] }
+                                                 )
     end
 
     # Reset the HTTP session (useful for tests).
     def reset!
-      @session = nil
+      Thread.current[:onyxcord_http_session] = nil
     end
 
     # Perform a raw HTTP request and return a {Response}.
@@ -69,9 +80,9 @@ module OnyxCord
             when :get
               http.get(url)
             when :post
-              if body.is_a?(Hash) && body.any? { |_, v| v.respond_to?(:read) || v.respond_to?(:path) }
+              if multipart?(body)
                 # Multipart upload
-                http.plugin(:multipart).post(url, form: body)
+                post_multipart(url, body, headers)
               else
                 http.post(url, body: body)
               end
@@ -91,6 +102,66 @@ module OnyxCord
       Response.new(raw)
     end
 
+    def post_multipart(url, body, headers)
+      uri = URI(url)
+      boundary = "----OnyxCord#{SecureRandom.hex(12)}"
+      request = Net::HTTP::Post.new(uri)
+      headers.each { |key, value| request[key.to_s] = value }
+      request['Content-Type'] = "multipart/form-data; boundary=#{boundary}"
+      request.body = multipart_body(body, boundary)
+
+      Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
+        http.request(request)
+      end
+    end
+
+    def multipart_body(body, boundary)
+      output = String.new.b
+
+      multipart_parts(body).each do |part|
+        key = part[:name]
+        value = part[:value]
+        output << "--#{boundary}\r\n"
+        if part[:filename]
+          value.rewind if value.respond_to?(:rewind)
+          filename = part[:filename]
+          output << "Content-Disposition: form-data; name=\"#{key}\"; filename=\"#{filename}\"\r\n"
+          output << "Content-Type: #{part[:content_type] || multipart_content_type(filename)}\r\n\r\n"
+          output << value.read.to_s
+        else
+          output << "Content-Disposition: form-data; name=\"#{key}\"\r\n"
+          output << "\r\n"
+          output << value.to_s
+        end
+        output << "\r\n"
+      end
+
+      output << "--#{boundary}--\r\n"
+    end
+
+    def multipart_content_type(filename)
+      File.extname(filename).casecmp('.txt').zero? ? 'text/plain' : 'application/octet-stream'
+    end
+
+    def multipart?(body)
+      return true if body.is_a?(Array) && body.all? { |part| part.is_a?(Hash) && part[:name] && part.key?(:value) }
+
+      body.is_a?(Hash) && body.any? { |_, value| value.respond_to?(:read) || value.respond_to?(:path) }
+    end
+
+    def multipart_parts(body)
+      return body if body.is_a?(Array)
+
+      body.map do |key, value|
+        if value.respond_to?(:read) || value.respond_to?(:path)
+          upload = OnyxCord::Upload.wrap(value)
+          { name: key, value: upload, filename: upload.filename, content_type: upload.content_type }
+        else
+          { name: key, value: value }
+        end
+      end
+    end
+
     # Convenience wrappers
     def get(url, **headers)
       request(:get, url, nil, **headers)

data/lib/onyxcord/message_payload.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require 'onyxcord/message_components'
+require 'onyxcord/upload'
+
+module OnyxCord
+  module MessagePayload
+    MAX_ATTACHMENTS = 10
+    MAX_EMBEDS = 10
+    KEEP = :keep
+
+    module_function
+
+    def attachment_payload(attachments)
+      uploads(attachments).map.with_index { |upload, index| { id: index, filename: upload.filename } }
+    end
+
+    def multipart_body(body, attachments)
+      parts = uploads(attachments).map.with_index do |upload, index|
+        {
+          name: "files[#{index}]",
+          value: upload,
+          filename: upload.filename,
+          content_type: upload.content_type || 'application/octet-stream'
+        }
+      end
+
+      parts << { name: 'payload_json', value: body.to_json }
+    end
+
+    def validate!(content: nil, embeds: nil, components: nil, flags: nil, attachments: nil, poll: nil)
+      validate_limit!('attachments', attachments, MAX_ATTACHMENTS)
+      validate_limit!('embeds', embeds, MAX_EMBEDS)
+      validate_components_v2!(content, embeds, components, flags, poll)
+    end
+
+    def edit_body(content, embeds)
+      content_keep = content == KEEP
+      embeds_keep = embeds == KEEP
+      content_given = !content_keep && !content.nil?
+      embeds_given = !embeds_keep && !embeds.nil?
+      body = {}
+      body[:content] = content if !content_keep && (content_given || embeds_given)
+      body[:embeds] = embeds_given ? embeds : [] if !embeds_keep && (embeds_given || content_given)
+      body
+    end
+
+    def uploads(attachments)
+      Array(attachments).map { |attachment| OnyxCord::Upload.wrap(attachment) }
+    end
+
+    def validate_limit!(name, values, max)
+      return if values.nil? || Array(values).length <= max
+
+      raise ArgumentError, "#{name} cannot exceed #{max} elements"
+    end
+
+    def validate_components_v2!(content, embeds, components, flags, poll)
+      return unless components_v2?(components, flags)
+      return unless present?(content) || present?(embeds) || present?(poll)
+
+      raise ArgumentError, 'Components V2 messages cannot include content, embeds, or poll'
+    end
+
+    def components_v2?(components, flags)
+      OnyxCord::MessageComponents.components_v2?(components) ||
+        (OnyxCord::MessageComponents.flag_value(flags) & OnyxCord::MessageComponents::IS_COMPONENTS_V2).positive?
+    end
+
+    def present?(value)
+      return false if value.nil?
+      return false if value == KEEP
+      return !value.empty? if value.respond_to?(:empty?)
+
+      true
+    end
+  end
+end

data/lib/onyxcord/rate_limiter/async_rest.rb

@@ -21,6 +21,7 @@ module OnyxCord
       end
 
       def before_request(route, major_parameter)
+        wait_for(@global_lock)
         wait_for(mutex_for(route, major_parameter))
       end
 
@@ -142,8 +143,8 @@ module OnyxCord
       end
 
       def global_wait(time)
-        OnyxCord::AsyncRuntime.sleep(time)
+        async_wait(time, @global_lock)
       end
     end
   end
-end
+end

data/lib/onyxcord/upload.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module OnyxCord
+  # Small wrapper for file uploads while keeping raw File/Tempfile support.
+  class Upload
+    attr_reader :io, :filename, :content_type
+
+    def self.wrap(file)
+      file.is_a?(self) ? file : new(file)
+    end
+
+    def initialize(io, filename: nil, content_type: nil)
+      @io = io
+      @filename = filename || upload_filename(io)
+      @content_type = content_type
+    end
+
+    def read(...)
+      @io.read(...)
+    end
+
+    def rewind
+      @io.rewind if @io.respond_to?(:rewind)
+    end
+
+    def path
+      @io.path if @io.respond_to?(:path)
+    end
+
+    private
+
+    def upload_filename(io)
+      path = io.path if io.respond_to?(:path)
+      return File.basename(path) if path && !path.empty?
+
+      'upload.dat'
+    end
+  end
+end

data/lib/onyxcord/version.rb

@@ -3,5 +3,5 @@
 # OnyxCord and all its functionality, in this case only the version.
 module OnyxCord
   # The current version of onyxcord.
-  VERSION = '2.0.8'
+  VERSION = '2.1.0'
 end

data/lib/onyxcord/webhooks/version.rb

@@ -4,6 +4,6 @@
 module OnyxCord
   module Webhooks
     # Kept for compatibility with code that checks the webhooks module version.
-    VERSION = '2.0.8'
+    VERSION = '2.1.0'
   end
 end

data/lib/onyxcord.rb

@@ -8,6 +8,8 @@ require 'onyxcord/version'
 require 'onyxcord/configuration'
 require 'onyxcord/event_executor'
 require 'onyxcord/message_components'
+require 'onyxcord/message_payload'
+require 'onyxcord/upload'
 require 'onyxcord/webhooks'
 require 'onyxcord/bot'
 require 'onyxcord/commands/command_bot'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onyxcord
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.1.0
 platform: ruby
 authors:
 - Gustavo Silva
@@ -486,11 +486,13 @@ files:
 - lib/onyxcord/light/light_bot.rb
 - lib/onyxcord/logger.rb
 - lib/onyxcord/message_components.rb
+- lib/onyxcord/message_payload.rb
 - lib/onyxcord/paginator.rb
 - lib/onyxcord/permissions.rb
 - lib/onyxcord/rate_limiter/async_rest.rb
 - lib/onyxcord/rate_limiter/gateway.rb
 - lib/onyxcord/rate_limiter/rest.rb
+- lib/onyxcord/upload.rb
 - lib/onyxcord/version.rb
 - lib/onyxcord/voice/encoder.rb
 - lib/onyxcord/voice/network.rb
@@ -530,7 +532,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.15
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Discord API for Ruby with Components V2 support
 test_files: []