signalwire 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85b3509109fd09ce52f1f579294b3723c4bfc63337584dfc753c491645221868
-  data.tar.gz: 35cf3f667c586fc788136eec75930785c360315594246a3dd9b0800123f86ee1
+  metadata.gz: 52a3ee7521ca981f6ba3708c08c52546d8f0552e4984efe371ff1bfcc92f6714
+  data.tar.gz: 38325b6730da2aeae07b81be5e1576aa08eee4b207f7f9d43541316498ff4dd7
 SHA512:
-  metadata.gz: 5d9261efe1e472198348e53f8f7805baa24f50c4c6282e510200b84860bb17919a7bc0b0059b73c6b9c8b078eb854592e4d88a1bd6424598a433afa44f00ab20
-  data.tar.gz: 18ce795d935a76bad953e7128d98932b5fc24353d8d842d639628ba10bb9f69f0ddcc91fadb3c4d2443809190ecc1a2851641e03f232b196652a7b818ad03016
+  metadata.gz: 71519d68edfdf1cf4531c48a9c3233965be0194d06e7f08d55810684f64af8a55c7bcdf0922344f3ecc67445fb79e6e83e38a070f5021ee670ae41fb822c3c57
+  data.tar.gz: 96c15dd6087165ae39ef4504f552a85d1115828274c87c455ce60e448698be474412100094db1a5d621c7c5214fd37c7cb8a862be6a9b811650946dfe2436f1a

data/CHANGELOG.md

@@ -3,6 +3,12 @@ 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).
 
+## [2.1.1] 2019-08-01
+### Fixed
+- Correctly set `peer` on calls
+### Changed
+- Call `Consumer::teardown` on shutdown
+
 ## [2.1.0] 2019-07-29
 ### Added
 - Tap API for Relay

data/examples/relay/inbound_consumer.rb

@@ -21,6 +21,10 @@ class MyConsumer < Signalwire::Relay::Consumer
 
     call.hangup
   end
+
+  def teardown
+    puts "this is an example of teardown"
+  end
 end
 
 MyConsumer.new.run

data/lib/signalwire/blade/connection.rb

@@ -25,7 +25,7 @@ module Signalwire::Blade
       @inbound_queue = EM::Queue.new
       @outbound_queue = EM::Queue.new
 
-      @counter = 1
+      @shutdown_list = []
     end
 
     def connect!
@@ -193,8 +193,19 @@ module Signalwire::Blade
 
     def shutdown_from_signal
       @shutdown = true
+      shutdown_registered
       disconnect!
       exit
     end
+
+    def register_for_shutdown(obj)
+      @shutdown_list << obj
+    end
+
+    def shutdown_registered
+      @shutdown_list.each do |obj|
+        obj.stop
+      end
+    end
   end
 end

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

@@ -46,6 +46,7 @@ module Signalwire::Relay::Calling
           change_call_state(event.event_params)
         end
 
+        update_call_fields(event.call_params)
         broadcast :event, event
         broadcast :state_change, event
       end
@@ -56,8 +57,6 @@ module Signalwire::Relay::Calling
       @previous_state = @state
       @state = call_state[:call_state]
       broadcast :call_state_change, previous_state: @previous_state, state: @state
-
-      update_call_fields(call_state)
       broadcast @state.to_sym, previous_state: @previous_state, state: @state
       finish_call(event_params) if @state == Relay::CallState::ENDED
     end
@@ -65,6 +64,7 @@ module Signalwire::Relay::Calling
     def update_call_fields(call_state)
       @id = call_state[:call_id] if call_state[:call_id]
       @node_id = call_state[:node_id] if call_state[:node_id]
+      @peer = call_state[:peer] if call_state[:peer]
     end
 
     def change_connect_state(new_connect_state)
@@ -95,6 +95,10 @@ module Signalwire::Relay::Calling
       !ended?
     end
 
+    def peer
+      @client.calling.find_call_by_id(@peer[:call_id]) if @peer && @peer[:call_id]
+    end
+
     def answer
       answer_component = Signalwire::Relay::Calling::Answer.new(call: self)
       answer_component.wait_for(Relay::CallState::ANSWERED, Relay::CallState::ENDING, Relay::CallState::ENDED)

data/lib/signalwire/relay/consumer.rb

@@ -31,25 +31,21 @@ module Signalwire::Relay
       @url =     host  || ENV['SIGNALWIRE_HOST'] || Signalwire::Relay::DEFAULT_URL
       @client = Signalwire::Relay::Client.new(project: @project,
         token: @token, host: @url)
+
+      @client.session.register_for_shutdown(self)
     end
 
     def setup; end
-
     def ready; end
-
     def teardown; end
-
     def on_task(task); end
     def on_incoming_message(message); end
     def on_message_state_change(message); end
-
-    def on_event(event)
-      # all-events firespout
-    end
-
+    def on_event(event); end
     def on_incoming_call(call); end
 
     def run
+      logger.info "Starting up #{self.class}"
       setup
       client.once :ready do
         setup_receive_listeners
@@ -63,6 +59,11 @@ module Signalwire::Relay
 
     def stop
       teardown
+      logger_thread = Thread.new do
+        logger.info "#{self.class} Consumer shutting down."
+      end
+      logger_thread.join
+
       client.disconnect!
     end
 

data/lib/signalwire/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signalwire
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - SignalWire Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-30 00:00:00.000000000 Z
+date: 2019-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler