discordrb 1.8.1 → 2.0.0

data/lib/discordrb/voice/voice_bot.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require 'discordrb/voice/encoder'
 require 'discordrb/voice/network'
+require 'discordrb/logger'
 
 # Voice support
 module Discordrb::Voice
@@ -67,8 +70,11 @@ module Discordrb::Voice
     # @return [Float] the volume for audio playback, `1.0` by default.
     attr_accessor :volume
 
+    # @!visibility private
     def initialize(channel, bot, token, session, endpoint, encrypted)
       @bot = bot
+      @channel = channel
+
       @ws = VoiceWS.new(channel, bot, token, session, endpoint)
       @udp = @ws.udp
       @udp.encrypted = encrypted
@@ -85,6 +91,9 @@ module Discordrb::Voice
 
       @encoder = Encoder.new
       @ws.connect
+    rescue => e
+      Discordrb::LOGGER.log_exception(e)
+      raise
     end
 
     # @return [true, false] whether audio data sent will be encrypted.
@@ -141,7 +150,7 @@ module Discordrb::Voice
     # Permanently disconnects from the voice channel; to reconnect you will have to call {Bot#voice_connect} again.
     def destroy
       stop_playing
-      @bot.voice_destroy(false)
+      @bot.voice_destroy(@channel.server.id, false)
       @ws.destroy
     end
 
@@ -153,6 +162,7 @@ module Discordrb::Voice
     def play(encoded_io)
       stop_playing if @playing
       @retry_attempts = 3
+      @first_packet = true
 
       play_internal do
         buf = nil
@@ -161,6 +171,8 @@ module Discordrb::Voice
         begin
           buf = encoded_io.readpartial(DATA_LENGTH) if encoded_io
         rescue EOFError
+          raise IOError, 'File or stream not found!' if @first_packet
+
           @bot.debug('EOF while reading, breaking immediately')
           break
         end
@@ -177,12 +189,23 @@ module Discordrb::Voice
         # Adjust volume
         buf = @encoder.adjust_volume(buf, @volume) if @volume != 1.0
 
+        @first_packet = false
+
         # Encode data
         @encoder.encode(buf)
       end
 
       # If the stream is a process, kill it
-      Process.kill('TERM', encoded_io.pid) if encoded_io.respond_to? :pid
+      if encoded_io.respond_to? :pid
+        Discordrb::LOGGER.info("Killing ffmpeg process with pid #{encoded_io.pid.inspect}")
+
+        begin
+          Process.kill('TERM', encoded_io.pid)
+        rescue => e
+          Discordrb::LOGGER.warn('Failed to kill ffmpeg process! You *might* have a process leak now.')
+          Discordrb::LOGGER.warn("Reason: #{e}")
+        end
+      end
 
       # Close the stream
       encoded_io.close
@@ -225,7 +248,7 @@ module Discordrb::Voice
           # Read header
           header = input_stream.read(2).unpack('s<')[0]
 
-          raise RuntimeError, 'Negative header in DCA file! Your file is likely corrupted.' if header < 0
+          raise 'Negative header in DCA file! Your file is likely corrupted.' if header < 0
         rescue EOFError
           @bot.debug 'Finished DCA parsing'
           break

data/lib/discordrb/websocket.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require 'websocket-client-simple'
+
+puts "Using WSCS version: #{WebSocket::Client::Simple::VERSION}"
+module WebSocket::Client::Simple
+  # Patch to the WSCS class to allow reading the internal thread
+  class Client
+    # @return [Thread] the internal thread this client is using for the event loop.
+    attr_reader :thread
+  end
+end
+
+module Discordrb
+  # Utility wrapper class that abstracts an instance of WSCS. Useful should we decide that WSCS isn't good either -
+  # in that case we can just switch to something else
+  class WebSocket
+    attr_reader :open_handler, :message_handler, :close_handler, :error_handler
+
+    # Create a new WebSocket and connect to the given endpoint.
+    # @param endpoint [String] Where to connect to.
+    # @param open_handler [#call] The handler that should be called when the websocket has opened successfully.
+    # @param message_handler [#call] The handler that should be called when the websocket receives a message. The
+    #   handler can take one parameter which will have a `data` attribute for normal messages and `code` and `data` for
+    #   close frames.
+    # @param close_handler [#call] The handler that should be called when the websocket is closed due to an internal
+    #   error. The error will be passed as the first parameter to the handler.
+    # @param error_handler [#call] The handler that should be called when an error occurs in another handler. The error
+    #   will be passed as the first parameter to the handler.
+    def initialize(endpoint, open_handler, message_handler, close_handler, error_handler)
+      @open_handler = open_handler
+      @message_handler = message_handler
+      @close_handler = close_handler
+      @error_handler = error_handler
+
+      instance = self # to work around WSCS's weird way of handling blocks
+
+      @client = ::WebSocket::Client::Simple.connect(endpoint) do |ws|
+        ws.on(:open) { instance.open_handler.call }
+        ws.on(:message) do |msg|
+          # If the message has a code attribute, it is in reality a close message
+          if msg.code
+            instance.close_handler.call(msg)
+          else
+            instance.message_handler.call(msg.data)
+          end
+        end
+        ws.on(:close) { |err| instance.close_handler.call(err) }
+        ws.on(:error) { |err| instance.error_handler.call(err) }
+      end
+    end
+
+    # Send data over this WebSocket
+    # @param data [String] What to send
+    def send(data)
+      @client.send(data)
+    end
+
+    # Close the WebSocket connection
+    def close
+      @client.close
+    end
+
+    # @return [Thread] the internal WSCS thread
+    def thread
+      @client.thread
+    end
+  end
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: discordrb
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 2.0.0
 platform: ruby
 authors:
 - meew0
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: faye-websocket
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rbnacl
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: 0.39.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: 0.39.0
 description: A Ruby implementation of the Discord (https://discordapp.com) API.
 email:
 - ''
@@ -172,6 +158,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".overcommit.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -191,6 +178,7 @@ files:
 - lib/discordrb/api.rb
 - lib/discordrb/await.rb
 - lib/discordrb/bot.rb
+- lib/discordrb/cache.rb
 - lib/discordrb/commands/command_bot.rb
 - lib/discordrb/commands/container.rb
 - lib/discordrb/commands/events.rb
@@ -201,20 +189,20 @@ files:
 - lib/discordrb/errors.rb
 - lib/discordrb/events/await.rb
 - lib/discordrb/events/bans.rb
-- lib/discordrb/events/channel_create.rb
-- lib/discordrb/events/channel_delete.rb
-- lib/discordrb/events/channel_update.rb
+- lib/discordrb/events/channels.rb
 - lib/discordrb/events/generic.rb
-- lib/discordrb/events/guild_role_create.rb
-- lib/discordrb/events/guild_role_delete.rb
-- lib/discordrb/events/guild_role_update.rb
 - lib/discordrb/events/guilds.rb
 - lib/discordrb/events/lifetime.rb
 - lib/discordrb/events/members.rb
 - lib/discordrb/events/message.rb
 - lib/discordrb/events/presence.rb
+- lib/discordrb/events/roles.rb
 - lib/discordrb/events/typing.rb
 - lib/discordrb/events/voice_state_update.rb
+- lib/discordrb/light.rb
+- lib/discordrb/light/data.rb
+- lib/discordrb/light/integrations.rb
+- lib/discordrb/light/light_bot.rb
 - lib/discordrb/logger.rb
 - lib/discordrb/permissions.rb
 - lib/discordrb/token_cache.rb
@@ -222,6 +210,7 @@ files:
 - lib/discordrb/voice/encoder.rb
 - lib/discordrb/voice/network.rb
 - lib/discordrb/voice/voice_bot.rb
+- lib/discordrb/websocket.rb
 homepage: https://github.com/meew0/discordrb
 licenses:
 - MIT

data/lib/discordrb/events/channel_create.rb

@@ -1,44 +0,0 @@
-require 'discordrb/events/generic'
-require 'discordrb/data'
-
-module Discordrb::Events
-  # Raised when a channel is created
-  class ChannelCreateEvent < Event
-    attr_reader :type, :topic, :position, :name, :is_private, :id, :server
-
-    def initialize(data, bot)
-      @type = data['type']
-      @topic = data['topic']
-      @position = data['position']
-      @name = data['name']
-      @is_private = data['is_private']
-      @id = data['id']
-      @server = bot.server(data['guild_id'].to_i)
-    end
-  end
-
-  # Event handler for ChannelCreateEvent
-  class ChannelCreateEventHandler < EventHandler
-    def matches?(event)
-      # Check for the proper event type
-      return false unless event.is_a? ChannelCreateEvent
-
-      [
-        matches_all(@attributes[:type], event.type) do |a, e|
-          a == if a.is_a? String
-                 e.name
-               else
-                 e
-               end
-        end,
-        matches_all(@attributes[:name], event.name) do |a, e|
-          a == if a.is_a? String
-                 e.to_s
-               else
-                 e
-               end
-        end
-      ].reduce(true, &:&)
-    end
-  end
-end

data/lib/discordrb/events/channel_delete.rb

@@ -1,44 +0,0 @@
-require 'discordrb/events/generic'
-require 'discordrb/data'
-
-module Discordrb::Events
-  # Raised when a channel is deleted
-  class ChannelDeleteEvent < Event
-    attr_reader :type, :topic, :position, :name, :is_private, :id, :server
-
-    def initialize(data, bot)
-      @type = data['type']
-      @topic = data['topic']
-      @position = data['position']
-      @name = data['name']
-      @is_private = data['is_private']
-      @id = data['id'].to_i
-      @server = bot.server(data['guild_id'].to_i)
-    end
-  end
-
-  # Event handler for ChannelDeleteEvent
-  class ChannelDeleteEventHandler < EventHandler
-    def matches?(event)
-      # Check for the proper event type
-      return false unless event.is_a? ChannelDeleteEvent
-
-      [
-        matches_all(@attributes[:type], event.type) do |a, e|
-          a == if a.is_a? String
-                 e.name
-               else
-                 e
-               end
-        end,
-        matches_all(@attributes[:name], event.name) do |a, e|
-          a == if a.is_a? String
-                 e.to_s
-               else
-                 e
-               end
-        end
-      ].reduce(true, &:&)
-    end
-  end
-end

data/lib/discordrb/events/channel_update.rb

@@ -1,46 +0,0 @@
-require 'discordrb/events/generic'
-require 'discordrb/data'
-
-module Discordrb::Events
-  # Raised when a channel is updated (e.g. topic changes)
-  class ChannelUpdateEvent < Event
-    attr_reader :type, :topic, :position, :name, :is_private, :channel, :server
-
-    def initialize(data, bot)
-      @type = data['type']
-      @topic = data['topic']
-      @position = data['position']
-      @name = data['name']
-      @is_private = data['is_private']
-      @server = bot.server(data['guild_id'].to_i)
-      return unless @server
-
-      @channel = bot.channel(data['id'].to_i)
-    end
-  end
-
-  # Event handler for ChannelUpdateEvent
-  class ChannelUpdateEventHandler < EventHandler
-    def matches?(event)
-      # Check for the proper event type
-      return false unless event.is_a? ChannelUpdateEvent
-
-      [
-        matches_all(@attributes[:type], event.type) do |a, e|
-          a == if a.is_a? String
-                 e.name
-               else
-                 e
-               end
-        end,
-        matches_all(@attributes[:name], event.name) do |a, e|
-          a == if a.is_a? String
-                 e.to_s
-               else
-                 e
-               end
-        end
-      ].reduce(true, &:&)
-    end
-  end
-end

data/lib/discordrb/events/guild_role_create.rb

@@ -1,35 +0,0 @@
-require 'discordrb/events/generic'
-require 'discordrb/data'
-
-module Discordrb::Events
-  # Raised when a role is created on a server
-  class GuildRoleCreateEvent < Event
-    attr_reader :role, :server
-
-    def initialize(data, bot)
-      @server = bot.server(data['guild_id'].to_i)
-      return unless @server
-
-      role_id = data['role']['id'].to_i
-      @role = @server.roles.find { |r| r.id == role_id }
-    end
-  end
-
-  # Event handler for GuildRoleCreateEvent
-  class GuildRoleCreateEventHandler < EventHandler
-    def matches?(event)
-      # Check for the proper event type
-      return false unless event.is_a? GuildRoleCreateEvent
-
-      [
-        matches_all(@attributes[:name], event.name) do |a, e|
-          a == if a.is_a? String
-                 e.to_s
-               else
-                 e
-               end
-        end
-      ].reduce(true, &:&)
-    end
-  end
-end

data/lib/discordrb/events/guild_role_delete.rb

@@ -1,36 +0,0 @@
-require 'discordrb/events/generic'
-require 'discordrb/data'
-
-module Discordrb::Events
-  # Raised when a role is deleted from a server
-  class GuildRoleDeleteEvent < Event
-    attr_reader :id, :server
-
-    def initialize(data, bot)
-      # The role should already be deleted from the server's list
-      # by the time we create this event, so we'll create a temporary
-      # role object for event consumers to use.
-      @id = data['role_id'].to_i
-      server_id = data['guild_id'].to_i
-      @server = bot.server(server_id)
-    end
-  end
-
-  # EventHandler for GuildRoleDeleteEvent
-  class GuildRoleDeleteEventHandler < EventHandler
-    def matches?(event)
-      # Check for the proper event type
-      return false unless event.is_a? GuildRoleDeleteEvent
-
-      [
-        matches_all(@attributes[:name], event.name) do |a, e|
-          a == if a.is_a? String
-                 e.to_s
-               else
-                 e
-               end
-        end
-      ].reduce(true, &:&)
-    end
-  end
-end