punchblock 1.4.0 → 1.4.1

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # [develop](https://github.com/adhearsion/punchblock)
 
+# [v1.4.1](https://github.com/adhearsion/punchblock/compare/v1.4.0...v1.4.1) - [2012-09-06](https://rubygems.org/gems/punchblock/versions/1.4.1)
+  * Bugfix: Cleaning up DTMF handlers for input components with a dead call should not crash on FreeSWITCH
+  * Bugfix: Reduced a race condition on FreeSWITCH when dispatching events from calls to dead components
+  * Bugfix: Events relevant to bridged channels were not being routed to the call
+  * Bugfix: Components using #stop_by_redirect now return an error response if stopped when they are complete
+  * Bugfix: Hold back ruby_ami and ruby_fs dependencies pending fixes for Celluloid 0.12.0
+
 # [v1.4.0](https://github.com/adhearsion/punchblock/compare/v1.3.0...v1.4.0) - [2012-08-07](https://rubygems.org/gems/punchblock/versions/1.4.0)
   * Feature: FreeSWITCH support (mostly complete, experimental, proceed with caution)
   * Bugfix: Report the correct caller ID in offers from Asterisk

data/lib/punchblock/dead_actor_safety.rb

@@ -2,8 +2,7 @@ module Punchblock
   module DeadActorSafety
     def safe_from_dead_actors
       yield
-    rescue Celluloid::DeadActorError => e
-      pb_logger.error e
+    rescue Celluloid::DeadActorError
     end
   end
 end

data/lib/punchblock/translator/asterisk/component/stop_by_redirect.rb

@@ -9,8 +9,12 @@ module Punchblock
         module StopByRedirect
           def execute_command(command)
             return super unless command.is_a?(Punchblock::Component::Stop)
-            stop_by_redirect Punchblock::Event::Complete::Stop.new
-            command.response = true
+            if @complete  
+              command.response = ProtocolError.new.setup 'component-already-stopped', "Component #{id} is already stopped", call_id, id
+            else
+              stop_by_redirect Punchblock::Event::Complete::Stop.new
+              command.response = true
+            end
           end
 
           def stop_by_redirect(complete_reason)

data/lib/punchblock/translator/asterisk/component.rb

@@ -42,7 +42,7 @@ module Punchblock
               c << recording if recording
             end
             send_event event
-            current_actor.terminate!
+            terminate
           end
 
           def send_event(event)

data/lib/punchblock/translator/asterisk.rb

@@ -19,6 +19,9 @@ module Punchblock
       REDIRECT_EXTENSION = '1'
       REDIRECT_PRIORITY = '1'
 
+      CHANNEL_NORMALIZATION_REGEXP = /^(?<prefix>Bridge\/)*(?<channel>[^<>]*)(?<suffix><.*>)*$/.freeze
+      EVENTS_ALLOWED_BRIDGED = %w{agiexec asyncagi}
+
       trap_exit :actor_died
 
       def initialize(ami_client, connection, media_engine = nil)
@@ -42,7 +45,7 @@ module Punchblock
       end
 
       def call_for_channel(channel)
-        call_with_id @channel_to_call_id[channel]
+        call_with_id @channel_to_call_id[channel.match(CHANNEL_NORMALIZATION_REGEXP)[:channel]]
       end
 
       def register_component(component)
@@ -176,7 +179,13 @@ module Punchblock
         if ami_event_known_call?(event)
           channels_for_ami_event(event).each do |channel|
             call = call_for_channel channel
-            call.process_ami_event! event if call
+            if call
+              if channel_is_bridged?(channel)
+                call.process_ami_event! event if EVENTS_ALLOWED_BRIDGED.include?(event.name.downcase)
+              else
+                call.process_ami_event! event
+              end
+            end
           end
         elsif event.name.downcase == "asyncagi" && event['SubEvent'] == "Start"
           handle_async_agi_start_event event
@@ -193,6 +202,11 @@ module Punchblock
           (event['Channel2'] && call_for_channel(event['Channel2']))
       end
 
+      def channel_is_bridged?(channel)
+        matches = channel.match CHANNEL_NORMALIZATION_REGEXP
+        matches[:prefix] || matches[:suffix]
+      end
+
       def handle_async_agi_start_event(event)
         env = RubyAMI::AsyncAGIEnvironmentParser.new(event['Env']).to_hash
 

data/lib/punchblock/translator/freeswitch/call.rb

@@ -102,7 +102,7 @@ module Punchblock
 
           register_handler :es, [:has_key?, :scope_variable_punchblock_component_id] => true do |event|
             if component = component_with_id(event[:scope_variable_punchblock_component_id])
-              safe_from_dead_actors { component.handle_es_event event }
+              safe_from_dead_actors { component.handle_es_event event if component.alive? }
             end
           end
         end

data/lib/punchblock/translator/freeswitch/component/input.rb

@@ -21,6 +21,7 @@ module Punchblock
 
           def unregister_dtmf_event_handler
             call.unregister_handler :es, @dtmf_handler_id if instance_variable_defined?(:@dtmf_handler_id)
+          rescue Celluloid::DeadActorError
           end
         end
       end

data/lib/punchblock/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Punchblock
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/punchblock.gemspec

@@ -28,9 +28,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency %q<state_machine>, ["~> 1.0"]
   s.add_runtime_dependency %q<future-resource>, ["~> 1.0"]
   s.add_runtime_dependency %q<has-guarded-handlers>, ["~> 1.3"]
-  s.add_runtime_dependency %q<celluloid>, [">= 0.11.0"]
-  s.add_runtime_dependency %q<ruby_ami>, ["~> 1.2", ">= 1.2.1"]
-  s.add_runtime_dependency %q<ruby_fs>, ["~> 1.0"]
+  s.add_runtime_dependency %q<celluloid>, [">= 0.11.1"]
+  s.add_runtime_dependency %q<ruby_ami>, ["~> 1.2", ">= 1.2.1", "< 1.2.2"]
+  s.add_runtime_dependency %q<ruby_fs>, ["~> 1.0", "< 1.0.1"]
   s.add_runtime_dependency %q<ruby_speech>, ["~> 1.0"]
 
   s.add_development_dependency %q<bundler>, ["~> 1.0"]

data/spec/punchblock/translator/asterisk/component/stop_by_redirect_spec.rb

@@ -10,6 +10,9 @@ module Punchblock
 
           class MockComponent < Component
             include StopByRedirect
+            def set_complete
+              @complete = true
+            end
           end
 
           let(:mock_call) { mock 'Call', :id => 'foo' }
@@ -46,9 +49,13 @@ module Punchblock
                 command.response(0.1).should be == true
               end
 
+              it "returns an error if the component is already complete" do
+                subject.set_complete
+                subject.execute_command command
+                command.response(0.1).should be_a ProtocolError
+              end
             end
           end
-
         end
       end
     end

data/spec/punchblock/translator/asterisk_spec.rb

@@ -583,6 +583,45 @@ module Punchblock
             end
           end
         end
+
+        describe 'with an event for a channel with Bridge and special statuses appended' do
+          let :ami_event do
+            RubyAMI::Event.new('AGIExec').tap do |e|
+              e['SubEvent']    = "End"
+              e['Channel']      = "Bridge/SIP/1234-00000000<ZOMBIE>"
+            end
+          end
+
+          let :ami_event2 do
+            RubyAMI::Event.new('Hangup').tap do |e|
+              e['Uniqueid']     = "1320842458.8"
+              e['Calleridnum']  = "5678"
+              e['Calleridname'] = "Jane Smith"
+              e['Cause']        = "0"
+              e['Cause-txt']    = "Unknown"
+              e['Channel']      = "Bridge/SIP/1234-00000000<ZOMBIE>"
+            end
+          end
+
+          let(:call) do
+            Asterisk::Call.new "SIP/1234-00000000", subject, "agi_request%3A%20async%0Aagi_channel%3A%20SIP%2F1234-00000000%0Aagi_language%3A%20en%0Aagi_type%3A%20SIP%0Aagi_uniqueid%3A%201320835995.0%0Aagi_version%3A%201.8.4.1%0Aagi_callerid%3A%205678%0Aagi_calleridname%3A%20Jane%20Smith%0Aagi_callingpres%3A%200%0Aagi_callingani2%3A%200%0Aagi_callington%3A%200%0Aagi_callingtns%3A%200%0Aagi_dnid%3A%201000%0Aagi_rdnis%3A%20unknown%0Aagi_context%3A%20default%0Aagi_extension%3A%201000%0Aagi_priority%3A%201%0Aagi_enhanced%3A%200.0%0Aagi_accountcode%3A%20%0Aagi_threadid%3A%204366221312%0A%0A"
+          end
+
+          before do
+            subject.register_call call
+          end
+
+          it 'sends the AMI event to the call and to the connection as a PB event if it is an allowed event' do
+            call.expects(:process_ami_event!).once.with ami_event
+            subject.handle_ami_event ami_event
+          end
+
+          it 'does not send the AMI event to a bridged channel if it is not allowed' do
+            call.expects(:process_ami_event!).never.with ami_event2
+            subject.handle_ami_event ami_event2
+          end
+
+        end
       end#handle_ami_event
 
       describe '#send_ami_action' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceogiri
@@ -116,7 +116,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: ruby_ami
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -147,6 +150,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: ruby_fs
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +161,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -163,6 +172,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: ruby_speech
   requirement: !ruby/object:Gem::Requirement
@@ -511,7 +523,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2536698351368430325
+      hash: 1778552231483051908
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -520,7 +532,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.7
 requirements: []
 rubyforge_project: punchblock
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Punchblock is a telephony middleware library