discorb 0.7.3 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4197e97af48fc47c1062d0327ccc048cb8317701be673a2bce035b108f7cade
-  data.tar.gz: 7c48b69868636ca4722e3ec2aee50bb6148174c1cfdcf0b31a2d227110aefa76
+  metadata.gz: a2d341757256d728ba6bb750b068a06f859e5d796d9e44bb1e4d616f4b439444
+  data.tar.gz: 3d4f6aaf740f8366a7f714011f60688871a9b4698bce9a37b6fd4c35cd31ab10
 SHA512:
-  metadata.gz: 7215a8dc3b0c3502f1948838aac8c08cc0ae0ac4c7c874dcc695c48fc5ead628f36718f08e7e2854aa46f191e9f0c851ff23a6f96aa82edaa3c7d7c912ff490b
-  data.tar.gz: 7ade9dcd2e56efb2513928a021d0f557d827a230b02f2c23ee6691cc9decc919f2e51b19e9e95fab13f535e8cc112cc8f3a29ac36e3a2144651a625e60ea0e25
+  metadata.gz: dd2620d3de3cf9e1b024701a9312d63a0990ac5360c9b5e65d096cc3792dd81effb79b26577812e6ac229f155d53ccf4a8f5aa093103e56d05c677eb8904936b
+  data.tar.gz: a04ab3bb0982d21d0d40d132b0b217ee4b95b214c848d970229e8f66bf0a4d5e2d07dce2006822ab07954f5a0de343a7769b1e36181778ccd501e5a02b6456fb

data/Changelog.md

@@ -190,4 +190,16 @@ end
 
 ## 0.7.3
 
-- Add: Improve `discorb init`
+- Add: Improve `discorb init`
+
+## 0.7.4 (yanked)
+
+- Fix: Fix disconnected client
+  
+## 0.7.5 (yanked)
+
+- Fix: Fix critical error
+
+## 0.7.6
+
+- Fix: Fix heartbeating error

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.7.3"
+  VERSION = "0.7.6"
   # @return [String] The user agent for the bot.
   USER_AGENT = "DiscordBot (https://github.com/discorb-lib/discorb #{VERSION}) Ruby/#{RUBY_VERSION}"
 

data/lib/discorb/gateway.rb

@@ -488,7 +488,7 @@ module Discorb
           _, gateway_response = @http.get("/gateway").wait
           gateway_url = gateway_response[:url]
           endpoint = Async::HTTP::Endpoint.parse("#{gateway_url}?v=9&encoding=json&compress=zlib-stream",
-                                                alpn_protocols: Async::HTTP::Protocol::HTTP11.names)
+                                                 alpn_protocols: Async::HTTP::Protocol::HTTP11.names)
           begin
             Async::WebSocket::Client.connect(endpoint, headers: [["User-Agent", Discorb::USER_AGENT]], handler: RawConnection) do |connection|
               @connection = connection
@@ -510,7 +510,9 @@ module Discorb
               raise ClientError.new("Authentication failed."), cause: nil
             when "Discord WebSocket requesting client reconnect."
               @log.info "Discord WebSocket requesting client reconnect"
-              @tasks.map(&:stop)
+              connect_gateway(false)
+            else
+              @log.error "Discord WebSocket closed: #{e.message}"
               connect_gateway(false)
             end
           rescue EOFError, Async::Wrapper::Cancelled
@@ -579,15 +581,18 @@ module Discorb
         end
       end
 
-      def handle_heartbeat(interval)
+      def handle_heartbeat
         Async do |task|
+          interval = @heartbeat_interval
           sleep((interval / 1000.0 - 1) * rand)
           loop do
-            @heartbeat_before = Time.now.to_f
-            @connection.write({ op: 1, d: @last_s }.to_json)
-            @connection.flush
-            @log.debug "Sent opcode 1."
-            @log.debug "Waiting for heartbeat."
+            unless @connection.closed?
+              @heartbeat_before = Time.now.to_f
+              @connection.write({ op: 1, d: @last_s }.to_json)
+              @connection.flush
+              @log.debug "Sent opcode 1."
+              @log.debug "Waiting for heartbeat."
+            end
             sleep(interval / 1000.0 - 1)
           end
         end
@@ -609,7 +614,7 @@ module Discorb
             dispatch(:ready)
             @log.info("Successfully connected to Discord.")
           end
-          @tasks << handle_heartbeat(@heartbeat_interval)
+          @tasks << handle_heartbeat
         when "GUILD_CREATE"
           if @uncached_guilds.include?(data[:id])
             Guild.new(self, data, true)
@@ -839,12 +844,12 @@ module Discorb
           dispatch(:voice_state_update, old, current)
           if old&.channel != current&.channel
             dispatch(:voice_channel_update, old, current)
-            case [old&.channel, current&.channel]
-            in [nil, _]
+            case [old&.channel.nil?, current&.channel.nil?]
+            when [true, false]
               dispatch(:voice_channel_connect, current)
-            in [_, nil]
+            when [false, true]
               dispatch(:voice_channel_disconnect, old)
-            in _
+            when [false, false]
               dispatch(:voice_channel_move, old, current)
             end
           end
@@ -980,9 +985,9 @@ module Discorb
           dispatch(:reaction_add, ReactionEvent.new(self, data))
         when "MESSAGE_REACTION_REMOVE"
           if (target_message = @messages[data[:message_id]]) &&
-            (target_reaction = target_message.reactions.find do |r|
-              data[:emoji][:id].nil? ? r.emoji.name == data[:emoji][:name] : r.emoji.id == data[:emoji][:id]
-            end)
+             (target_reaction = target_message.reactions.find do |r|
+               data[:emoji][:id].nil? ? r.emoji.name == data[:emoji][:name] : r.emoji.id == data[:emoji][:id]
+             end)
             target_reaction.instance_variable_set(:@count, target_reaction.count - 1)
             target_message.reactions.delete(target_reaction) if target_reaction.count.zero?
           end
@@ -994,7 +999,7 @@ module Discorb
           dispatch(:reaction_remove_all, ReactionRemoveAllEvent.new(self, data))
         when "MESSAGE_REACTION_REMOVE_EMOJI"
           if (target_message = @messages[data[:message_id]]) &&
-            (target_reaction = target_message.reactions.find { |r| data[:emoji][:id].nil? ? r.name == data[:emoji][:name] : r.id == data[:emoji][:id] })
+             (target_reaction = target_message.reactions.find { |r| data[:emoji][:id].nil? ? r.name == data[:emoji][:name] : r.id == data[:emoji][:id] })
             target_message.reactions.delete(target_reaction)
           end
           dispatch(:reaction_remove_emoji, ReactionRemoveEmojiEvent.new(data))
@@ -1017,25 +1022,35 @@ module Discorb
         end
       end
     end
-    
+
     #
     # A class for connecting websocket with raw bytes data.
     # @private
     #
-    class RawConnection < Async::WebSocket::Connection		
-      def initialize(...)
+    class RawConnection < Async::WebSocket::Connection
+      def initialize(*, **)
         super
+        @closed = false
       end
-    
-			def parse(buffer)
-				# noop
+
+      def closed?
+        @closed
+      end
+
+      def close
+        super
+        @closed = true
+      end
+
+      def parse(buffer)
+        # noop
         buffer.to_s
-			end
-			
-			def dump(object)
-				# noop
+      end
+
+      def dump(object)
+        # noop
         object.to_s
-			end
+      end
     end
   end
-end
+end

metadata

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