onyxcord 3.2.5 → 3.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58b6c40e04d80caf8907786964a17a7499074e7f2a213ba0c8d95aa4a7a97617
-  data.tar.gz: f5a62bd27e38a81f849b0cdd8e4f3210e73f684775320929a7f01cd963d3b9fc
+  metadata.gz: 11790e2e347a44d298323d5f3fe9d01bda9a0c087a53452440d2bcaa80e141ec
+  data.tar.gz: aced6ea00fc6a5909654524c0c24c8ba9e50200a90528d4efdb20cd238ac4a98
 SHA512:
-  metadata.gz: d5fd3b0d1966b6e37b23675bc5ac1948b059cfe9b4777032b5d573c2bb199cf540776291b51c1e92a5e368021e5191d09089cccb18fd6f04e2438c193914b8ac
-  data.tar.gz: 3ad8f80253da0da08e946870590bbf10b9ffd70da02fe24f838d67d0bce5d93f58302f03493b7e187fe00a76a36c53d63e4c6cec67e698bbbabba43cd4779a0a
+  metadata.gz: a920b096a309c8ffd55af075dcd1e65321e107556d4559855f6cc3663c35a2f90c38baab65add1f623fc0bbdfd59e7f8f1d5574ac08c4dfeaad3218b0a34410d
+  data.tar.gz: 458f16d158eddb9b038ef2f3b03fe08e6477e49832508a3328d560d09664fd3081f33fca923119173d0824019e700c84702f15546303936e989247fdd235d569

data/lib/onyxcord/core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OnyxCord
-  VERSION = '3.2.5'
+  VERSION = '3.2.7'
 end

data/lib/onyxcord/internal/http.rb

@@ -54,19 +54,36 @@ module OnyxCord
 
       module_function
 
-      # The shared HTTPX session with persistent connections for the current thread.
+      POOL_OPTIONS = {
+        max_connections: 50,
+        max_connections_per_origin: 20,
+        pool_timeout: 10
+      }.freeze
+
+      # The shared HTTPX session with persistent, pooled connections.
       def session
-        Thread.current[:onyxcord_http_session] ||= HTTPX.plugin(:persistent)
-                                                        .plugin(:follow_redirects)
-                                                        .with(
-                                                          fallback_protocol: 'http/1.1',
-                                                          ssl: { alpn_protocols: ['http/1.1'] }
-                                                        )
+        session_mutex.synchronize do
+          @session ||= HTTPX.plugin(:persistent)
+                            .plugin(:follow_redirects)
+                            .with(
+                              fallback_protocol: 'http/1.1',
+                              ssl: { alpn_protocols: ['http/1.1'] },
+                              pool_options: POOL_OPTIONS
+                            )
+        end
       end
 
       # Reset the HTTP session (useful for tests).
       def reset!
-        Thread.current[:onyxcord_http_session] = nil
+        session_mutex.synchronize do
+          @session&.close if @session.respond_to?(:close)
+        ensure
+          @session = nil
+        end
+      end
+
+      def session_mutex
+        @session_mutex ||= Mutex.new
       end
 
       # Perform a raw HTTP request and return a {Response}.

data/lib/onyxcord/models/component.rb

@@ -49,12 +49,6 @@ module OnyxCord
     class ActionRow
       include Enumerable
 
-      DELEGATED_COMPONENT_METHODS = %i[
-        custom_id
-        value
-        values
-      ].freeze
-
       # @return [Integer] the numeric identifier of the action row.
       attr_reader :id
 
@@ -90,13 +84,6 @@ module OnyxCord
       def to_a
         @components
       end
-
-      DELEGATED_COMPONENT_METHODS.each do |name|
-        define_method(name) do
-          component = @components.first
-          component.public_send(name) if @components.one? && component.respond_to?(name)
-        end
-      end
     end
 
     # An interactable button component.
@@ -498,14 +485,6 @@ module OnyxCord
 
     # A parent component for interactive modal components.
     class Label
-      # Methods from the wrapped interactive component that should remain
-      # available for legacy modal code that iterates over event.components.
-      DELEGATED_COMPONENT_METHODS = %i[
-        custom_id
-        value
-        values
-      ].freeze
-
       # @return [Integer] the numeric identifier of the label.
       attr_reader :id
 
@@ -526,12 +505,6 @@ module OnyxCord
         @description = data['description']
         @component = Components.from_data(data['component'], @bot)
       end
-
-      DELEGATED_COMPONENT_METHODS.each do |name|
-        define_method(name) do
-          @component.public_send(name) if @component.respond_to?(name)
-        end
-      end
     end
 
     # A surface that allows users to upload files in a modal.

data/lib/onyxcord/rest/client.rb

@@ -172,6 +172,7 @@ module OnyxCord::REST
           retries += 1
           raise unless retries < max_retries
 
+          ::OnyxCord::Internal::HTTP.reset!
           OnyxCord::LOGGER.warn("Temporary HTTP failure while sending request (#{e.class}), retrying")
           OnyxCord::Internal::AsyncRuntime.sleep(retries * 0.5)
           next

data/lib/onyxcord/webhooks/modal.rb

@@ -39,53 +39,9 @@ class OnyxCord::Webhooks::Modal
     @components << LabelBuilder.new(...)
   end
 
-  # Add a legacy action row to the modal.
-  def row(id: nil)
-    @components << LegacyRowBuilder.new(id: id) { |row| yield row }
-  end
-
   # Add a text display component to the view.
   # @see Webhooks::View::TextDisplayBuilder#initialize
   def text_display(...)
     @components << OnyxCord::Webhooks::View::TextDisplayBuilder.new(...)
   end
-
-  class LegacyRowBuilder
-    def initialize(id: nil)
-      @id = id
-      @components = []
-
-      yield self if block_given?
-    end
-
-    def text_input(style:, custom_id:, id: nil, min_length: nil, max_length: nil, required: nil, value: nil, placeholder: nil, label: nil)
-      @components << {
-        type: COMPONENT_TYPES[:text_input],
-        custom_id: custom_id,
-        id: id,
-        label: label,
-        style: LabelBuilder::TEXT_INPUT_STYLES[style] || style,
-        min_length: min_length,
-        max_length: max_length,
-        required: required,
-        value: value,
-        placeholder: placeholder
-      }.compact
-    end
-
-    def file_upload(custom_id:, id: nil, min_values: nil, max_values: nil, required: nil)
-      @components << {
-        type: COMPONENT_TYPES[:file_upload],
-        custom_id: custom_id,
-        id: id,
-        min_values: min_values,
-        max_values: max_values,
-        required: required
-      }.compact
-    end
-
-    def to_h
-      { type: COMPONENT_TYPES[:action_row], id: @id, components: @components }.compact
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onyxcord
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.2.7
 platform: ruby
 authors:
 - Gustavo Silva