signalwire 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 617cfadba260ca55f6a9930c26eca415a3db201fdad4165a86f6c06955a98471
-  data.tar.gz: e78dc8b25ac1cd28e0252962497ed620aa9794635b23b1fc72347b1458e79dfb
+  metadata.gz: d31f18c614ab0890b0c3000c45f607b636c8c3a3b7ad51d1e9dffae4c3b30165
+  data.tar.gz: 6ef1eeb8106c935d12beb8edafb67004d14c012761c43c675a9ce4d430c794d6
 SHA512:
-  metadata.gz: 9ca9a848b357a319f84ec836fb73a75a99e5054064fbdf59ffcb44da615b0009df676da2c8abd434062747888618016220e8f016b35682808ebf3acab2a51df4
-  data.tar.gz: f367464b5544df04e67828765a16c5368af055eb1e24328f9e8a97d93ebac5105a8ebcd840cdee984a257825e9363c49d7f5d791b636ba7e830286962374ad54
+  metadata.gz: 4535d5d33d7d8152ffd349d0fbeb4cb544fc71931fb72f93c2c866eda4957249ace7b5337472193ebd58f0f6a987f546a226edc97618fb8bef03652162b534db
+  data.tar.gz: 6887060feada342534a3b4a365eb058e93276aa50ecd8e88456d1b4495e6aee7aa47be22e26adc22dfb292e24a0291ffe3376e06b6359d27fa6d0aaffeaba457

data/CHANGELOG.md

@@ -3,7 +3,13 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+ ## [Unreleased]
+
+## [2.3.4] - 2020-09-09
+### Fixed
+- Correctly ignore non-call events and clear handlers on call end
+- Async method arguments fixed
+- Fix ping race condition
 
 ## [2.3.3] - 2020-03-09
 ### Fixed

data/lib/signalwire.rb

@@ -3,6 +3,7 @@
 module Signalwire
 end
 
+require 'signalwire/version'
 require 'signalwire/sdk'
 require 'signalwire/logger'
 require 'signalwire/common'

data/lib/signalwire/blade/connection.rb

@@ -4,6 +4,7 @@ require 'has_guarded_handlers'
 require 'eventmachine'
 require 'faye/websocket'
 require 'json'
+require 'concurrent-ruby'
 
 module Signalwire::Blade
   class Connection
@@ -22,10 +23,14 @@ module Signalwire::Blade
       @log_traffic = options.fetch(:log_traffic, true)
       @authentication = options.fetch(:authentication, nil)
 
+      
+
       @inbound_queue = EM::Queue.new
       @outbound_queue = EM::Queue.new
 
+      @pong = Concurrent::AtomicBoolean.new
       @keep_alive_timer = nil
+      @ping_is_sent = Concurrent::AtomicBoolean.new
 
       @shutdown_list = []
     end
@@ -48,6 +53,7 @@ module Signalwire::Blade
 
     def main_loop!
       EM.run do
+        logger.info "CREATING SOCKET"
         @ws = Faye::WebSocket::Client.new(@url)
 
         @ws.on(:open) { |event| broadcast :started, event }
@@ -71,7 +77,7 @@ module Signalwire::Blade
         begin
           @connected = true
           myreq = connect_request
-          @pong = nil
+          @pong.make_false
 
           write_command(myreq) do |event|
             @session_id = event.dig(:result, :sessionid) unless @session_id
@@ -131,7 +137,9 @@ module Signalwire::Blade
     end
 
     def ping(&block)
-      block_given? ? write_command(Ping.new, &block) : write_command(Ping.new)
+      ping_cmd = Ping.new
+      block_given? ? write_command(ping_cmd, &block) : write_command(ping_cmd)
+      ping_cmd
     end
 
     def subscribe(params, &block)
@@ -150,7 +158,6 @@ module Signalwire::Blade
     end
 
     def disconnect!
-      # logger.info 'Stopping Blade event loop'
       clear_connections
       EM.stop
     end
@@ -183,19 +190,21 @@ module Signalwire::Blade
     end
 
     def keep_alive
-      @pong = false
-
-      ping do
-        @pong = true
+      if @ping_is_sent.false?
+        ping do
+          @pong.make_true
+        end
+        @ping_is_sent.make_true
+      else
+        if @pong.false?
+          logger.error "KEEPALIVE: Ping failed"
+          reconnect! if connected?
+        end
+        @ping_is_sent.make_false
       end
 
       @keep_alive_timer = EventMachine::Timer.new(Signalwire::Relay::PING_TIMEOUT) do
-        if @pong === false
-          logger.error "Ping failed"
-          reconnect! if connected?
-        else
-          keep_alive
-        end
+        keep_alive
       end
     end
 

data/lib/signalwire/blade/message/connect.rb

@@ -10,7 +10,8 @@ module Signalwire::Blade
             major: 2,
             minor: 1,
             revision: 0
-          }
+          },
+          agent: "Ruby SDK/#{Signalwire::VERSION}"
         }
       }
     end

data/lib/signalwire/relay/calling/action/connect_action.rb

@@ -5,7 +5,7 @@ require 'forwardable'
 module Signalwire::Relay::Calling
   class ConnectAction < Action
     def result
-      ConnectResult.new(@component)
+      ConnectResult.new(component: @component)
     end
   end
 end

data/lib/signalwire/relay/calling/action/detect_action.rb

@@ -5,7 +5,7 @@ require 'forwardable'
 module Signalwire::Relay::Calling
   class DetectAction < Action
     def result
-      DetectResult.new(@component)
+      DetectResult.new(component: @component)
     end
 
     def stop

data/lib/signalwire/relay/calling/action/fax_action.rb

@@ -5,7 +5,7 @@ require 'forwardable'
 module Signalwire::Relay::Calling
   class FaxAction < Action
     def result
-      FaxResult.new(@component)
+      FaxResult.new(component: @component)
     end
 
     def stop

data/lib/signalwire/relay/calling/action/play_action.rb

@@ -5,7 +5,7 @@ require 'forwardable'
 module Signalwire::Relay::Calling
   class PlayAction < Action
     def result
-      PlayResult.new(@component)
+      PlayResult.new(component: @component)
     end
 
     def stop

data/lib/signalwire/relay/calling/action/prompt_action.rb

@@ -5,7 +5,7 @@ require 'forwardable'
 module Signalwire::Relay::Calling
   class PromptAction < Action
     def result
-      PromptResult.new(@component)
+      PromptResult.new(component: @component)
     end
 
     def stop

data/lib/signalwire/relay/calling/action/record_action.rb

@@ -5,7 +5,7 @@ require 'forwardable'
 module Signalwire::Relay::Calling
   class RecordAction < Action
     def result
-      RecordResult.new(@component)
+      RecordResult.new(component: @component)
     end
 
     def stop

data/lib/signalwire/relay/calling/action/send_digits_action.rb

@@ -5,7 +5,7 @@ require 'forwardable'
 module Signalwire::Relay::Calling
   class SendDigitsAction < Action
     def result
-      SendDigitsResult.new(@component)
+      SendDigitsResult.new(component: @component)
     end
   end
 end

data/lib/signalwire/relay/calling/action/tap_action.rb

@@ -7,7 +7,7 @@ module Signalwire::Relay::Calling
     def_delegators :@component, :source_device
 
     def result
-      TapResult.new(@component)
+      TapResult.new(component: @component)
     end
 
     def stop

data/lib/signalwire/relay/calling/call.rb

@@ -45,7 +45,7 @@ module Signalwire::Relay::Calling
     end
 
     def setup_call_event_handlers
-      @client.on(:event, proc { |evt| call_match_event(evt) }) do |event|
+      @call_event_handler = @client.on(:event, proc { |evt| call_match_event(evt) }) do |event|
         case event.event_type
         when 'calling.call.connect'
           change_connect_state(event.call_params[:connect_state])
@@ -81,7 +81,8 @@ module Signalwire::Relay::Calling
     end
 
     def call_match_event(event)
-      event.event_type.match(/calling\.call/) &&
+      event.event_type &&
+        event.event_type.match(/calling\.call/) &&
         !event.event_type.match(/receive/) &&
         (event.call_id == id || event.call_params[:tag] == tag)
     end
@@ -316,6 +317,7 @@ module Signalwire::Relay::Calling
     end
 
     def finish_call(params)
+      @client.unregister_handler(:event, @call_event_handler)
       terminate_components(params)
       client.calling.end_call(id)
       @busy = true if params[:reason] == Relay::DisconnectReason::BUSY

data/lib/signalwire/relay/calling/component/record.rb

@@ -51,7 +51,7 @@ module Signalwire::Relay::Calling
     end
 
     def after_execute(execute_event)
-      @url = execute_event.dig(:params, :params, :params, :url)
+      @url = execute_event.dig(:params, :params, :params, :url) if execute_event
     end
   end
 end

data/lib/signalwire/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Signalwire
-  VERSION = '2.3.3'
+  VERSION = '2.3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signalwire
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - SignalWire Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -370,7 +370,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby client for Signalwire