signalwire 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6165a9529b9376430f0d3d27ee60d19e0fef310ceb5bf9ec8ac602b4cf0d45f6
-  data.tar.gz: 56cd7d1ae685944c202bb82000d4549da11960bc278ddc977b5cc728a2019851
+  metadata.gz: 37ac58e5e91849e4c0d59ab3958741297f2964e00b839759d165c90231ad226f
+  data.tar.gz: 1413019319f177546936cc684447ba417838cb7d35fdcd4b8b7d1a08719569ca
 SHA512:
-  metadata.gz: 96659014e4dd5da3a222f9690085b5be43c625d3f1ff767a30574c3c90edd1ddc2abf31b757bc5a0eb54f99d7d7f248b170c2067c087a6f75775a2aac49b3dba
-  data.tar.gz: '070834c4ac95d63981b45ec4b8684f4b2d5b385eb8c24e0bf9fcc7036a76144f9cdedf37a19d6e19d193dd3485ab0837b10d87ee6945f2d3797fa76eda2249da'
+  metadata.gz: 4e2c0471c12a90e88c288457240506ea796e02de1bbbd4e5451f4457d4b19d489fc803326cdffd700fb86f34cef57ab5cc6521f6b1b8556ef3778d1e65b61b4b
+  data.tar.gz: d2833633a7461d91d5e5325e8f9869c033c529564969170b8243c6a2cf57b0016c849bdf623070fad7d8a25636862b3d81a5385cb1f58b5e238b86ef13c34974

data/.drone.yml

@@ -3,8 +3,9 @@ name: default
 
 steps:
 - name: test
-  image: ruby:2.5
+  image: ruby:2.6
   commands:
+  - gem install bundler
   - bundle install --jobs=3 --retry=3
   - bundle exec rspec
 

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [Unreleased]
 
+## [2.3.1] - 2019-12-20
+### Changed
+- Keepalive now uses `blade.ping`.
+
 ## [2.3.0] - 2019-10-22
 ### Added
 - Add `pause` and `resume` on `PlayAction`.

data/lib/signalwire/blade.rb

@@ -9,4 +9,5 @@ require 'signalwire/blade/connection'
 require 'signalwire/blade/message'
 require 'signalwire/blade/message/connect'
 require 'signalwire/blade/message/execute'
+require 'signalwire/blade/message/ping'
 require 'signalwire/blade/message/subscribe'

data/lib/signalwire/blade/connection.rb

@@ -25,6 +25,8 @@ module Signalwire::Blade
       @inbound_queue = EM::Queue.new
       @outbound_queue = EM::Queue.new
 
+      @keep_alive_timer = nil
+
       @shutdown_list = []
     end
 
@@ -37,7 +39,7 @@ module Signalwire::Blade
     end
 
     def reconnect!
-      @connected = false
+      clear_connections
       return if @shutdown
       sleep Signalwire::Blade::RECONNECT_PERIOD
       logger.info "Attempting reconnection"
@@ -69,13 +71,14 @@ module Signalwire::Blade
         begin
           @connected = true
           myreq = connect_request
-          start_periodic_timer
+          @pong = nil
 
           write_command(myreq) do |event|
             @session_id = event.dig(:result, :sessionid) unless @session_id
             @node_id = event.dig(:result, :nodeid) unless @node_d
             logger.info "Blade Session connected with id: #{@session_id}"
             broadcast :connected, event
+            keep_alive
           end
 
         rescue StandardError => e
@@ -127,18 +130,28 @@ module Signalwire::Blade
       block_given? ? write_command(Execute.new(params), &block) : write_command(Execute.new(params))
     end
 
+    def ping(&block)
+      block_given? ? write_command(Ping.new, &block) : write_command(Ping.new)
+    end
+
     def subscribe(params, &block)
       block_given? ? write_command(Subscribe.new(params), &block) : write_command(Subscribe.new(params))
     end
 
     def handle_close
+      logger.warn "WS Socket closed!"
       reconnect!
     end
 
-    def disconnect!
-      # logger.info 'Stopping Blade event loop'
+    def clear_connections
       @ws = nil
       @connected = false
+      @keep_alive_timer.cancel if @keep_alive_timer
+    end
+
+    def disconnect!
+      # logger.info 'Stopping Blade event loop'
+      clear_connections
       EM.stop
     end
 
@@ -169,19 +182,19 @@ module Signalwire::Blade
       @connected == true
     end
 
-    def start_periodic_timer
-      pinger = EventMachine::PeriodicTimer.new(Signalwire::Relay::PING_TIMEOUT) do
-        timeouter = EventMachine::Timer.new(2) do
-          # reconnect logic goes here
-          logger.error "We got disconnected!"
-          pinger.cancel
+    def keep_alive
+      @pong = false
+
+      ping do
+        @pong = true
+      end
+
+      @keep_alive_timer = EventMachine::Timer.new(Signalwire::Relay::PING_TIMEOUT) do
+        if @pong === false
+          logger.error "Ping failed"
           reconnect! if connected?
-        end
-        
-        if @connected
-          @ws.ping 'detecting presence' do
-            timeouter.cancel
-          end
+        else
+          keep_alive
         end
       end
     end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Signalwire::Blade
+    class Ping < Message
+      # Creates a Ping message
+      #
+
+      def initialize
+        @payload = {
+          method: 'blade.ping',
+          params: {}
+        }
+      end
+    end
+  end
+  

data/lib/signalwire/relay/constants.rb

@@ -4,7 +4,7 @@ module Signalwire::Relay
   DEFAULT_URL = 'relay.signalwire.com'
   COMMAND_TIMEOUT = 30
   DEFAULT_CALL_TIMEOUT = 30
-  PING_TIMEOUT = 5
+  PING_TIMEOUT = 10
   DEFAULT_LANGUAGE = 'en-US'
   DEFAULT_GENDER = 'female'
 

data/lib/signalwire/version.rb

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

data/signalwire.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'bundler-audit', '~> 0.6.1'
   spec.add_development_dependency 'guard-rspec', '~> 4.7.3'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signalwire
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - SignalWire Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2019-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -277,6 +277,7 @@ files:
 - lib/signalwire/blade/message.rb
 - lib/signalwire/blade/message/connect.rb
 - lib/signalwire/blade/message/execute.rb
+- lib/signalwire/blade/message/ping.rb
 - lib/signalwire/blade/message/subscribe.rb
 - lib/signalwire/common.rb
 - lib/signalwire/logger.rb
@@ -367,7 +368,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Ruby client for Signalwire