Enhance ThrottleMiddleware to dynamically manage GitHub API rate limits

Author: thedave42

api/ruby/find-inactive-members/find_inactive_members.rb

@@ -16,6 +16,8 @@ def initialize(app, options = {})
     @last_request_time = Time.now
     @mutex = Mutex.new
     @debug_enabled = !ENV['THROTTLE_DEBUG'].nil? && !ENV['THROTTLE_DEBUG'].empty?
+    @github_rate_limit_remaining = nil
+    @github_rate_limit_reset = nil
   end
 
   def call(env)
@@ -24,11 +26,43 @@ def call(env)
       log_throttle_status
     end
 
-    @app.call(env)
+    response = @app.call(env)
+    
+    # Update GitHub rate limit info from response headers
+    @mutex.synchronize do
+      update_github_rate_limit(response)
+    end
+    
+    response
   end
 
   private
 
+  def update_github_rate_limit(response)
+    if response.headers['x-ratelimit-remaining']
+      @github_rate_limit_remaining = response.headers['x-ratelimit-remaining'].to_i
+      @github_rate_limit_reset = response.headers['x-ratelimit-reset'].to_i if response.headers['x-ratelimit-reset']
+    end
+  end
+
+  def calculate_dynamic_delay
+    return MIN_DELAY_SECONDS unless @github_rate_limit_remaining && @github_rate_limit_reset
+    
+    # Calculate time until rate limit resets
+    current_time = Time.now.to_i
+    time_until_reset = [@github_rate_limit_reset - current_time, 1].max
+    
+    # Calculate required delay to not exceed remaining requests
+    if @github_rate_limit_remaining > 0
+      required_delay = time_until_reset.to_f / @github_rate_limit_remaining
+      # Use the more conservative delay (either our standard delay or the calculated one)
+      [MIN_DELAY_SECONDS, required_delay].max
+    else
+      # No requests remaining, wait until reset
+      time_until_reset
+    end
+  end
+
   def throttle_request
     current_time = Time.now
 
@@ -39,11 +73,16 @@ def throttle_request
       @last_request_time = current_time
     end
 
-    # Ensure minimum delay between requests to maintain steady rate under 5000/hour
+    # Use dynamic delay based on actual GitHub rate limit if available
+    required_delay = @github_rate_limit_remaining ? calculate_dynamic_delay : MIN_DELAY_SECONDS
+    
+    # Ensure minimum delay between requests
     time_since_last = current_time - @last_request_time
-    if time_since_last < MIN_DELAY_SECONDS
-      sleep_time = MIN_DELAY_SECONDS - time_since_last
+    if time_since_last < required_delay
+      sleep_time = required_delay - time_since_last
       if sleep_time > 0
+        #delay_reason = @github_rate_limit_remaining ? "dynamic" : "standard"
+        #$stderr.print "Throttling: waiting #{sleep_time.round(2)}s (#{delay_reason} delay)\n"
         sleep(sleep_time)
       end
     end
@@ -55,7 +94,8 @@ def throttle_request
     if @request_count % 1000 == 0
       elapsed_hour = @last_request_time - @hour_start_time
       current_rate = elapsed_hour > 0 ? (@request_count / elapsed_hour * 3600).round(1) : 0
-      $stderr.print "Throttling status: #{@request_count} requests in #{elapsed_hour.round(1)}s (#{current_rate}/hour rate)\n"
+      github_info = @github_rate_limit_remaining ? " GitHub: #{@github_rate_limit_remaining} remaining" : ""
+      $stderr.print "Throttling status: #{@request_count} requests in #{elapsed_hour.round(1)}s (#{current_rate}/hour rate)#{github_info}\n"
     end
   end
 
@@ -264,8 +304,22 @@ def member_activity
 
     # for each repo
     @repositories.each do |repo|
-      rate_limit = @client.rate_limit
-      info "rate limit remaining: #{rate_limit.remaining}/#{rate_limit.limit}  "
+      # Show rate limit from last response headers (more efficient than API call)
+      if @client.last_response
+        remaining = @client.last_response.headers['x-ratelimit-remaining']
+        limit = @client.last_response.headers['x-ratelimit-limit']
+        if remaining && limit
+          reset_time = @client.last_response.headers['x-ratelimit-reset']
+          if reset_time
+            minutes_until_reset = [(reset_time.to_i - Time.now.to_i) / 60.0, 0].max.round(1)
+            reset_info = " (resets in #{minutes_until_reset}min)"
+          else
+            reset_info = ""
+          end
+          info "#{remaining} requests remaining#{reset_info}  "
+        end
+      end
+      
       info "analyzing #{repo}"
 
       commit_activity(repo)
@@ -342,13 +396,13 @@ def member_activity
   builder.use Octokit::Middleware::FollowRedirects
   builder.use Octokit::Response::RaiseError
   builder.use Octokit::Response::FeedParser
-  builder.response :logger
+  builder.response :logger if @debug
   builder.adapter Faraday.default_adapter
 end
 
 Octokit.configure do |kit|
   kit.auto_paginate = true
-  kit.middleware = stack if @debug
+  kit.middleware = stack
 end
 
 options[:client] = Octokit::Client.new