discorb 0.15.1 → 0.16.0

data/lib/discorb/interaction/root.rb

@@ -100,7 +100,7 @@ module Discorb
           interaction = klass.make_interaction(client, data) if !klass.interaction_type.nil? && klass.interaction_type == data[:type]
         end
         if interaction.nil?
-          client.log.warn("Unknown interaction type #{data[:type]}, initialized Interaction")
+          client.logger.warn("Unknown interaction type #{data[:type]}, initialized Interaction")
           interaction = Interaction.new(client, data)
         end
         interaction

data/lib/discorb/rate_limit.rb

@@ -32,7 +32,7 @@ module Discorb
       # return if path.url.start_with?("https://")
       if @global && @global > Time.now.to_f
         time = @global - Time.now.to_f
-        @client.log.info("global rate limit reached, waiting #{time} seconds")
+        @client.logger.info("global rate limit reached, waiting #{time} seconds")
         sleep(time)
         @global = false
       end
@@ -48,7 +48,7 @@ module Discorb
       return if (bucket[:remaining]).positive?
 
       time = bucket[:reset_at] - Time.now.to_f
-      @client.log.info("rate limit for #{path.identifier} with #{path.major_param} reached, waiting #{time.round(4)} seconds")
+      @client.logger.info("rate limit for #{path.identifier} with #{path.major_param} reached, waiting #{time.round(4)} seconds")
       sleep(time)
     end
 

data/lib/discorb/shard.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module Discorb
+  #
+  # Represents a shard.
+  #
+  class Shard
+    # @return [Integer] The ID of the shard.
+    attr_reader :id
+    # @return [Thread] The thread of the shard.
+    attr_reader :thread
+    # @return [Logger] The logger of the shard.
+    attr_reader :logger
+    # @private
+    # @return [Integer] The internal index of the shard.
+    attr_reader :index
+    # @private
+    attr_accessor :status, :connection, :session_id, :next_shard, :main_task
+
+    #
+    # Initializes a new shard.
+    # @private
+    #
+    # @param [Discorb::Client] client The client.
+    # @param [Integer] id The ID of the shard.
+    # @param [Integer] count The number of shards.
+    # @param [Integer] index The index of the shard.
+    #
+    def initialize(client, id, count, index)
+      @client = client
+      @id = id
+      @shard_count = count
+      @status = :idle
+      @index = index
+      @session_id = nil
+      @next_shard = nil
+      @main_task = nil
+      @logger = client.logger.dup.tap { |l| l.progname = "discorb: shard #{id}" }
+      @thread = Thread.new do
+        Thread.current.thread_variable_set("shard_id", id)
+        Thread.current.thread_variable_set("shard", self)
+        if @index.positive?
+          Thread.stop
+          sleep 5  # Somehow discord disconnects the shard without a little sleep.
+        end
+        client.send(:main_loop, id)
+      end
+    end
+
+    #
+    # Starts the shard.
+    #
+    # @return [void]
+    #
+    def start
+      @thread.wakeup
+    end
+
+    #
+    # Stops the shard.
+    #
+    # @return [void]
+    #
+    def close!
+      @status = :closed
+      @main_task&.stop
+      @thread.kill
+    end
+
+    def inspect
+      "#<#{self.class} #{id}/#{@shard_count} #{@status}>"
+    end
+  end
+end

data/lib/discorb.rb

@@ -45,10 +45,10 @@ require_order = %w[common flag dictionary error rate_limit http intents emoji_ta
                 %w[message_meta allowed_mentions] +
                 %w[user member guild emoji channel embed message] +
                 %w[application audit_logs color components event event_handler] +
-                %w[attachment guild_template image integration interaction invite log permission] +
+                %w[attachment guild_template image integration interaction invite permission] +
                 %w[presence reaction role sticker utils voice_state webhook] +
                 %w[gateway_requests gateway app_command] +
-                %w[asset extension client extend]
+                %w[asset extension shard client extend]
 require_order.each do |name|
   require_relative "discorb/#{name}.rb"
 end