signalwire 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 52a3ee7521ca981f6ba3708c08c52546d8f0552e4984efe371ff1bfcc92f6714
-  data.tar.gz: 38325b6730da2aeae07b81be5e1576aa08eee4b207f7f9d43541316498ff4dd7
+SHA1:
+  metadata.gz: a5ba44a20acd7bb12393399af0f7457543d60030
+  data.tar.gz: '069bc5cbbe6465918eab2e726d88b2120b5519a8'
 SHA512:
-  metadata.gz: 71519d68edfdf1cf4531c48a9c3233965be0194d06e7f08d55810684f64af8a55c7bcdf0922344f3ecc67445fb79e6e83e38a070f5021ee670ae41fb822c3c57
-  data.tar.gz: 96c15dd6087165ae39ef4504f552a85d1115828274c87c455ce60e448698be474412100094db1a5d621c7c5214fd37c7cb8a862be6a9b811650946dfe2436f1a
+  metadata.gz: b93d4efd4ab92f26fba1934720c1a03b50e17ad5576ea743af02654584170ff702a793fc2b201bb614a9b44d3ae82cd4feffc49de3d5790cd82b6bd88fcc82eb
+  data.tar.gz: 27353d85dd32d496b747c78659badb0c56df081cfdb37d707a6e8acb400d0e17399aecca433237b3a8c3efc633d96b29dd4cce346f8ef52b3b159fda58a1d535

data/CHANGELOG.md

@@ -3,13 +3,20 @@ 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
+## [2.1.2] - 2019-08-01
+### Fixed
+- Fix CPU usage
+- Set default log level to INFO.
+- Fix incorrect names for messaging parameters.
+- Fix an issue when creating new calls.
+
+## [2.1.1] - 2019-08-01
 ### Fixed
 - Correctly set `peer` on calls
 ### Changed
 - Call `Consumer::teardown` on shutdown
 
-## [2.1.0] 2019-07-29
+## [2.1.0] - 2019-07-29
 ### Added
 - Tap API for Relay
 - `:task` broadcast from client

data/examples/relay/wait_for_ending.rb

@@ -0,0 +1,30 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+%w[
+  bundler/setup
+  signalwire
+].each { |f| require f }
+
+Signalwire::Logger.logger.level = ::Logger::DEBUG
+
+MY_NUMBER = "+12027621401"
+
+class MyConsumer < Signalwire::Relay::Consumer
+  contexts ['incoming']
+  def on_incoming_call(call)
+    call.answer
+    call.play_tts 'Welcome to Relay'
+    dial = call.connect [[{ type: 'phone', params: { to_number: MY_NUMBER, from_number: call.from, timeout: 30 } }]]
+    pp "Connected"
+    pp dial.successful
+    dial.call.play_tts "Hello!" if dial.successful
+    pp "Waiting on Ending"
+    dial.call.wait_for_ending
+    call.play_tts 'finished. hanging up.'
+    call.hangup
+  rescue StandardError => e
+    logger.error e.inspect
+    logger.error e.backtrace
+  end
+end
+
+MyConsumer.new.run

data/lib/signalwire/blade/connection.rb

@@ -56,10 +56,14 @@ module Signalwire::Blade
           logger.error "Error occurred: #{error.message}"
         end
 
-        EM.next_tick { flush_queues }
+        schedule_flush_queues
       end
     end
 
+    def schedule_flush_queues
+      EM.add_timer(0.005) { flush_queues }
+    end
+
     def setup_started_event
       on :started do |_event|
         @connected = true
@@ -132,7 +136,7 @@ module Signalwire::Blade
         @outbound_queue.pop { |outbound| write(outbound) } until @outbound_queue.empty?
       end
 
-      EM.next_tick { flush_queues }
+      schedule_flush_queues
     end
 
     def enqueue_inbound(message)

data/lib/signalwire/logger.rb

@@ -10,7 +10,7 @@ module Signalwire
       def logger
         @logger ||= begin
           logger = ::Logger.new(STDERR, progname: 'SignalWire', level: ::Logger::DEBUG)
-          logger.level = ENV.fetch('SIGNALWIRE_LOG_LEVEL', ::Logger::WARN)
+          logger.level = ENV.fetch('SIGNALWIRE_LOG_LEVEL', ::Logger::INFO)
           logger
         end
       end

data/lib/signalwire/relay/calling.rb

@@ -14,6 +14,7 @@ module Signalwire::Relay
 
       def initialize(client)
         @client = client
+        listen_for_created_calls
       end
 
       def calls
@@ -24,10 +25,19 @@ module Signalwire::Relay
         @client.contexts
       end
 
+      def listen_for_created_calls
+        @client.on :event, event_type: 'calling.call.state' do |event|
+          if !find_call_by_id(event.call_id)
+            created_call = Call.from_event(@client, event)
+            calls << created_call
+          end
+        end
+      end
+
       def receive(context:, &block)
         @client.on :event, event_type: 'calling.call.receive' do |event|
-          logger.info "Starting up call for #{event.call_params}"
-          call_obj = Signalwire::Relay::Calling::Call.from_event(self, event)
+          logger.debug "Receiving call: #{event.call_params}"
+          call_obj = Signalwire::Relay::Calling::Call.from_event(@client, event)
           calls << call_obj
           block.call(call_obj) if block_given?
         end
@@ -58,7 +68,7 @@ module Signalwire::Relay
             }
           }
         }
-        call = Call.new(self, params)
+        call = Call.new(@client, params)
         calls << call
         call
       end

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

@@ -13,7 +13,7 @@ module Signalwire::Relay::Calling
 
     attr_reader :device, :type, :node_id, :context, :from, :to,
                 :timeout, :tag, :client, :state, :previous_state, :components,
-                :busy, :failed
+                :busy, :failed, :peer_call
     def_delegators :@client, :relay_execute
 
     def self.from_event(client, event)
@@ -64,7 +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]
+      @peer_call = call_state[:peer] if call_state[:peer]
     end
 
     def change_connect_state(new_connect_state)
@@ -96,7 +96,7 @@ module Signalwire::Relay::Calling
     end
 
     def peer
-      @client.calling.find_call_by_id(@peer[:call_id]) if @peer && @peer[:call_id]
+      @client.calling.find_call_by_id(@peer_call[:call_id]) if @peer_call && @peer_call[:call_id]
     end
 
     def answer

data/lib/signalwire/relay/messaging.rb

@@ -21,8 +21,8 @@ module Signalwire::Relay
 
       def send(from:, to:, context:, body: nil, media: nil, tags: nil, region: nil)
         params = {
-          from_number: from_number,
-          to_number: to_number,
+          from_number: from,
+          to_number: to,
           context: context
         }
 

data/lib/signalwire/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signalwire
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - SignalWire Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-01 00:00:00.000000000 Z
+date: 2019-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -268,6 +268,7 @@ files:
 - examples/relay/outbound_tap.rb
 - examples/relay/tasking/tasking_receive.rb
 - examples/relay/tasking/tasking_send.rb
+- examples/relay/wait_for_ending.rb
 - lib/signalwire.rb
 - lib/signalwire/blade.rb
 - lib/signalwire/blade/connection.rb
@@ -356,7 +357,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Ruby client for Signalwire