onyxcord 2.0.6 → 2.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c794e2e7f5ad51dea52e27c049fb7d08fb7b54c84b452243fe549cd54f46dd5d
-  data.tar.gz: 2f7e1a9df9cf56085e31dd7bc13e843f8c5bee2e9083817305e6936117c92dd4
+  metadata.gz: '080907ed18fd9ca727ddeb4d6ee21935995b3027c53a864442b9ffb315a9fe1e'
+  data.tar.gz: 4ad0ff3358ae5bde79a83f8e019a007661a1225d1bc752b06c2c1b992a1eb0a4
 SHA512:
-  metadata.gz: dce8555d60a8bf6662bfc357c64918e75ff803ab30c43c93dab390756ee52e0057f20914367ec4cce89e5a6906c0745f99b89f42953bb9b91648caa3fe296378
-  data.tar.gz: 7b25cd2d344182abbdce7fb5f74f8cffb7dea3ad478d6a03e9018ea138635fac13e9203184f656f677c39b85b26f1a8287f24ac6a855b5b9ae64ec12165e8c72
+  metadata.gz: c9098f8a981433ab24e3567bbdbb057d12ac0cf6d80358e2c99dfce84a04e7d68ed3fd59b5b71479580c6997cd17aaac52250b33179754565df0e95493cfc9b4
+  data.tar.gz: 137922d8f76e11add880ec027167ce04bbfa3d18b8547a8ed5b726184a7448b4629e0875f49455193185ade34c119d87a49bbbff59070d56eb3cc21c80c39a6f

data/CHANGELOG.md

@@ -1,5 +1,47 @@
 # Changelog
 
+## 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
+
+- Forca WebSocket do Gateway e do cliente generico em HTTP/1.1 para evitar `Async::WebSocket::ConnectionError: Failed to negotiate connection!` ao conectar no Discord.
+- Desativa extensoes WebSocket no handshake para evitar close `Error while decoding payload` no Gateway do Discord.
+- Remove o empacotamento separado `onyxcord-webhooks`; webhooks continuam incluidos diretamente na gem `onyxcord`.
+
 ## 2.0.6 - 2026-06-28
 
 ### Correcoes de empacotamento
@@ -64,7 +106,7 @@ bot.sync_application_commands!(server_id: ENV.fetch('DISCORD_SERVER_ID'))
 - **Gateway via Async-WebSocket**: Substituída a implementação de raw TCP sockets + `websocket-client-simple` por `async-websocket`, proporcionando um event loop de gateway extremamente rápido e escalável.
 - **Parse JSON via Oj**: A gem `oj` foi integrada em modo de compatibilidade (`mode: :compat`), acelerando transparentemente todas as serializações e deserializações de pacotes do Discord na lib inteira.
 - **Cache Inteligente LRU**: Os caches em memória (usuários, canais, servidores, membros) agora utilizam `LruRedux::ThreadSafeCache`. Os tamanhos padrão foram aumentados (`users: 50_000`, `channels: 10_000`, `servers: 1_000`, `members: 100_000`) e podem ser customizados via `OnyxCord.configure { |c| c.cache_sizes.users = 100_000 }`.
-- **Fusão do Webhooks**: A funcionalidade da gem separada `onyxcord-webhooks` foi integrada diretamente no núcleo da gem `onyxcord`. A gem `onyxcord-webhooks` agora atua apenas como um shim de transição deprecado.
+- **Fusão do Webhooks**: A funcionalidade da gem separada `onyxcord-webhooks` foi integrada diretamente no núcleo da gem `onyxcord`; nao ha mais pacote separado para publicar.
 - **Alvo Ruby ≥ 3.4**: Atualizada a versão mínima requerida do Ruby para aproveitar as otimizações modernas do interpretador e fibras.
 
 ## 1.1.8 - 2026-06-28
@@ -81,7 +123,6 @@ bot.sync_application_commands!(server_id: ENV.fetch('DISCORD_SERVER_ID'))
 - `ruby -c lib/onyxcord/data/component.rb`: sucesso.
 - `ruby -c spec/components_v2_spec.rb`: sucesso.
 - `gem build onyxcord.gemspec`: sucesso.
-- `gem build onyxcord-webhooks.gemspec`: sucesso.
 
 ## 1.1.7 - 2026-06-28
 
@@ -93,7 +134,6 @@ bot.sync_application_commands!(server_id: ENV.fetch('DISCORD_SERVER_ID'))
 ### Validacao
 
 - `ruby -c onyxcord.gemspec`: sucesso.
-- `ruby -c onyxcord-webhooks.gemspec`: sucesso.
 
 ## 1.1.6 - 2026-06-28
 
@@ -160,4 +200,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/Rakefile

@@ -6,12 +6,8 @@ namespace :main do
   Bundler::GemHelper.install_tasks(name: 'onyxcord')
 end
 
-namespace :webhooks do
-  Bundler::GemHelper.install_tasks(name: 'onyxcord-webhooks')
-end
-
-task build: %i[main:build webhooks:build]
-task release: %i[main:release webhooks:release]
+task build: :'main:build'
+task release: :'main:release'
 
 # Make "build" the default task
 task default: :build

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/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/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

@@ -2,6 +2,7 @@
 
 require 'async'
 require 'async/http/endpoint'
+require 'async/http/protocol/http11'
 require 'async/websocket/client'
 require 'onyxcord/async/runtime'
 require 'onyxcord/rate_limiter/gateway'
@@ -83,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.
@@ -141,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
@@ -218,6 +227,7 @@ module OnyxCord
 
     def setup_heartbeats(interval)
       @last_heartbeat_acked = true
+      @missed_heartbeat_acks = 0
       return if @heartbeat_task
 
       @heartbeat_interval = interval
@@ -293,9 +303,9 @@ module OnyxCord
       @pipe_broken = false
       @closed = false
 
-      endpoint = Async::HTTP::Endpoint.parse(url)
+      endpoint = websocket_endpoint(url)
 
-      Async::WebSocket::Client.connect(endpoint) do |connection|
+      Async::WebSocket::Client.connect(endpoint, extensions: nil) do |connection|
         @connection = connection
         LOGGER.debug('WebSocket connected')
 
@@ -313,6 +323,14 @@ module OnyxCord
       @connection = nil
     end
 
+    def websocket_endpoint(url)
+      Async::HTTP::Endpoint.parse(
+        url,
+        protocol: Async::HTTP::Protocol::HTTP11,
+        alpn_protocols: ['http/1.1']
+      )
+    end
+
     def handle_open; end
 
     def handle_error(e)
@@ -423,7 +441,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)
@@ -453,7 +474,7 @@ module OnyxCord
 
       @send_limiter.wait
 
-      @connection.write(Protocol::WebSocket::TextMessage.generate(data))
+      @connection.write(data)
       @connection.flush
     rescue StandardError => e
       @pipe_broken = true

data/lib/onyxcord/http.rb

@@ -45,15 +45,15 @@ module OnyxCord
 
     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)
     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}.

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.6'
+  VERSION = '2.0.13'
 end

data/lib/onyxcord/webhooks/version.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-# Webhook support for onyxcord
+# Webhook support bundled in onyxcord.
 module OnyxCord
   module Webhooks
-    # The current version of onyxcord-webhooks.
-    VERSION = '2.0.6'
+    # Kept for compatibility with code that checks the webhooks module version.
+    VERSION = '2.0.13'
   end
 end

data/lib/onyxcord/websocket.rb

@@ -2,6 +2,7 @@
 
 require 'onyxcord/async/runtime'
 require 'async/http/endpoint'
+require 'async/http/protocol/http11'
 require 'async/websocket/client'
 
 module OnyxCord
@@ -43,10 +44,10 @@ module OnyxCord
     private
 
     def connect
-      endpoint = Async::HTTP::Endpoint.parse(@host)
+      endpoint = websocket_endpoint(@host)
 
       @task = OnyxCord::AsyncRuntime.async do
-        Async::WebSocket::Client.connect(endpoint) do |connection|
+        Async::WebSocket::Client.connect(endpoint, extensions: nil) do |connection|
           @connection = connection
           @connected = true
           @open_handler&.call
@@ -64,5 +65,13 @@ module OnyxCord
     rescue StandardError => e
       @error_handler&.call(e)
     end
+
+    def websocket_endpoint(url)
+      Async::HTTP::Endpoint.parse(
+        url,
+        protocol: Async::HTTP::Protocol::HTTP11,
+        alpn_protocols: ['http/1.1']
+      )
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onyxcord
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.13
 platform: ruby
 authors:
 - Gustavo Silva
@@ -506,7 +506,6 @@ files:
 - lib/onyxcord/webhooks/version.rb
 - lib/onyxcord/webhooks/view.rb
 - lib/onyxcord/websocket.rb
-- onyxcord-webhooks.gemspec
 - onyxcord.gemspec
 homepage: https://github.com/kruldevb/OnyxCord
 licenses:

data/onyxcord-webhooks.gemspec

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'lib/onyxcord/webhooks/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'onyxcord-webhooks'
-  spec.version       = OnyxCord::Webhooks::VERSION
-  spec.authors       = ['Gustavo Silva']
-  spec.email         = ['gustavosilva8kt@gmail.com']
-
-  spec.summary       = '[DEPRECATED] Webhook client for onyxcord — now bundled into the onyxcord gem'
-  spec.description   = "This gem is deprecated. Webhooks are now included in the onyxcord gem. Install 'onyxcord' instead."
-  spec.homepage      = 'https://github.com/kruldevb/OnyxCord'
-  spec.license       = 'MIT'
-
-  spec.files         = ['lib/onyxcord/webhooks.rb', 'lib/onyxcord/webhooks/version.rb']
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-
-  # This gem now simply depends on the main onyxcord gem
-  spec.add_dependency 'onyxcord', "~> #{OnyxCord::Webhooks::VERSION}"
-
-  spec.required_ruby_version = '>= 3.4'
-  spec.metadata = {
-    'bug_tracker_uri' => 'https://github.com/kruldevb/OnyxCord/issues',
-    'documentation_uri' => 'https://github.com/kruldevb/OnyxCord#readme',
-    'source_code_uri' => 'https://github.com/kruldevb/OnyxCord',
-    'rubygems_mfa_required' => 'true'
-  }
-
-  spec.post_install_message = <<~MSG
-    ⚠️  onyxcord-webhooks is DEPRECATED.
-    Webhooks are now bundled into the 'onyxcord' gem.
-    Please update your Gemfile:
-      gem 'onyxcord', '~> 2.0'
-    and remove 'onyxcord-webhooks'.
-  MSG
-end