discorb 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c80c426387c9e5ba44589c5851e7c1a4d54a5de99c82d5b3571c4200dcaf135
-  data.tar.gz: 2aa6db0900cafe2120793b295b68e5de357e97e0797cd416a06caca9491b09e1
+  metadata.gz: 6b979da1f1325d5d9cae229e0262cce1d6cf16b6aca91feba731ec6a0146fe42
+  data.tar.gz: e6e1fcbe4265cfb54828fef5c7e2d6304dd306544e941cb787233ad563d9abaf
 SHA512:
-  metadata.gz: afe14b35796820b8b7af5baaab6a79a5a770c55d11d30d25b2a9647034658e27346e918be42fb8d4a30edbf27873bd367cf3551cf1b091e82c49150c886ef03e
-  data.tar.gz: 9c817738b2a4b3763d94182e2b47f583aaa7129a8769cdc9b8f7fc7e10f0656f43183f0d416d72aa20112b6b34addfdd38e36b7710c6405d2f29f658cb238c4c
+  metadata.gz: bb35c0736b2e549964030103dfb1202ef7711fd3c36323710d3f94631b958a9976f7c111f340d03cf2ed67032a8f74f5165f66b5ff92c59d0628af25b4a95e79
+  data.tar.gz: 01d59859fb5e84beaafdc48e333ba841398a8fe5867c52bb9621b2d676493dbc776297c94e303297ffeef591c7f2e527ea30aaae381323e4ed8e8b1ce632b1ef

data/Changelog.md

@@ -4,6 +4,13 @@
 
 ## v0.11
 
+### v0.11.1
+
+- Improve: Improve rate limit handling
+- Fix: Fix bug in Integration initalization
+- Change: Change log style
+- Add: Support OP code 7
+
 ### v0.11.0
 
 - Add: Improve documents

data/lib/discorb/common.rb

@@ -4,7 +4,7 @@ module Discorb
   # @return [String] The API base URL.
   API_BASE_URL = "https://discord.com/api/v9"
   # @return [String] The version of discorb.
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
   # @return [String] The user agent for the bot.
   USER_AGENT = "DiscordBot (https://discorb-lib.github.io #{VERSION}) Ruby/#{RUBY_VERSION}"
 

data/lib/discorb/gateway.rb

@@ -495,6 +495,7 @@ module Discorb
               @connection = connection
               @zlib_stream = Zlib::Inflate.new(Zlib::MAX_WBITS)
               @buffer = +""
+
               while (message = @connection.read)
                 @buffer << message
                 if message.end_with?((+"\x00\x00\xff\xff").force_encoding("ASCII-8BIT"))
@@ -505,7 +506,7 @@ module Discorb
                   rescue JSON::ParserError
                     @buffer = +""
                     @log.error "Received invalid JSON from gateway."
-                    @log.debug data
+                    @log.debug "#{data}"
                   else
                     handle_gateway(message)
                   end
@@ -524,7 +525,10 @@ module Discorb
               @log.error "Discord WebSocket closed: #{e.message}"
               connect_gateway(false)
             end
-          rescue EOFError, Async::Wrapper::Cancelled
+          rescue EOFError, Async::Wrapper::Cancelled, Async::Wrapper::WaitError
+            connect_gateway(false)
+          rescue => e
+            @log.error "Discord WebSocket error: #{e.message}"
             connect_gateway(false)
           end
         end
@@ -533,7 +537,7 @@ module Discorb
       def send_gateway(opcode, **value)
         @connection.write({ op: opcode, d: value }.to_json)
         @connection.flush
-        @log.debug "Sent message: #{{ op: opcode, d: value }.to_json.gsub(@token, "[Token]")}"
+        @log.debug "Sent message #{{ op: opcode, d: value }.to_json.gsub(@token, "[Token]")}"
       end
 
       def handle_gateway(payload)
@@ -568,6 +572,11 @@ module Discorb
               }
               send_gateway(6, **payload)
             end
+          when 7
+            @log.info "Received opcode 7, reconnecting"
+            @tasks.map(&:stop)
+            @connection.close
+            connect_gateway(false)
           when 9
             @log.warn "Received opcode 9, closed connection"
             @tasks.map(&:stop)
@@ -1024,7 +1033,7 @@ module Discorb
           if respond_to?("event_" + event_name.downcase)
             __send__("event_" + event_name.downcase, data)
           else
-            @log.debug "Received unknown event: #{event_name}\n#{data.inspect}"
+            @log.debug "#{event_name}\n#{data.inspect}"
           end
         end
       end

data/lib/discorb/http.rb

@@ -175,6 +175,7 @@ module Discorb
     def handle_response(method, resp, data, path, body, headers, audit_log_reason, kwargs)
       case resp.code
       when "429"
+        @client.log.info("Rate limit exceeded for #{method} #{path}, waiting #{data[:retry_after]} seconds")
         sleep(data[:retry_after])
         if body
           __send__(method, path, body, headers: headers, audit_log_reason: audit_log_reason, **kwargs).wait
@@ -227,15 +228,19 @@ module Discorb
     end
 
     def get_response_data(resp)
-      if resp["Via"].nil? && resp.code == "429"
-        raise CloudFlareBanError.new(resp, @client)
+      begin
+        data = JSON.parse(resp.body, symbolize_names: true)
+      rescue JSON::ParserError, TypeError
+        if resp.body.nil? || resp.body.empty?
+          data = nil
+        else
+          data = resp.body
+        end
       end
-      rd = resp.body
-      if rd.nil? || rd.empty?
-        nil
-      else
-        JSON.parse(rd, symbolize_names: true)
+      if resp["Via"].nil? && resp.code == "429" && data.is_a?(String)
+        raise CloudFlareBanError.new(resp, @client)
       end
+      data
     end
 
     def http

data/lib/discorb/integration.rb

@@ -80,7 +80,7 @@ module Discorb
       @enable_emoticons = data[:enable_emoticons]
       @expire_behavior = self.class.expire_behavior[data[:expire_behavior]]
       @expire_grace_period = data[:expire_grace_period]
-      @user = @client.users[data[:user].to_i]
+      @user = @client.users[data[:user][:id]] or Discorb::User.new(@client, data[:user])
       @account = Account.new(data[:account])
       @subscriber_count = data[:subscriber_count]
       @revoked = data[:revoked]

data/lib/discorb/rate_limit.rb

@@ -9,8 +9,8 @@ module Discorb
     # @private
     def initialize(client)
       @client = client
-      @ratelimit_hash = {}
-      @path_ratelimit_hash = {}
+      @current_ratelimits = {}
+      @path_ratelimit_bucket = {}
       @global = false
     end
 
@@ -25,24 +25,23 @@ module Discorb
 
       if @global
         time = b[:reset_at] - Time.now.to_i
-        @client.log.info("Global ratelimit reached, waiting #{time} seconds")
+        @client.log.info("global rate limit reached, waiting #{time} seconds")
         sleep(time)
         @global = false
-        
       end
 
-      return unless hash = @path_ratelimit_hash[method + path]
+      return unless hash = @path_ratelimit_bucket[method + path]
 
-      return unless b = @ratelimit_hash[hash]
+      return unless b = @current_ratelimits[hash]
 
-      if b[:reset_at] < Time.now.to_i
-        @ratelimit_hash.delete(hash)
+      if b[:reset_at] < Time.now.to_f
+        @current_ratelimits.delete(hash)
         return
       end
       return if b[:remaining] > 0
 
-      time = b[:reset_at] - Time.now.to_i
-      @client.log.info("Ratelimit reached, waiting #{time} seconds")
+      time = b[:reset_at] - Time.now.to_f
+      @client.log.info("rate limit for #{method} #{path} reached, waiting #{time} seconds")
       sleep(time)
     end
 
@@ -59,10 +58,10 @@ module Discorb
       end
       return unless resp["X-RateLimit-Remaining"]
 
-      @path_ratelimit_hash[method + path] = resp["X-RateLimit-Bucket"]
-      @ratelimit_hash[resp["X-RateLimit-Bucket"]] = {
+      @path_ratelimit_bucket[method + path] = resp["X-RateLimit-Bucket"]
+      @current_ratelimits[resp["X-RateLimit-Bucket"]] = {
         remaining: resp["X-RateLimit-Remaining"].to_i,
-        reset_at: resp["X-RateLimit-Reset"].to_i,
+        reset_at: Time.now.to_f + resp["X-RateLimit-Reset-After"].to_f,
       }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discorb
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - sevenc-nanashi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-10 00:00:00.000000000 Z
+date: 2021-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async