punchblock 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ade03e2779ab1cdbeec2d6f3745571abc1713b81
-  data.tar.gz: accbf90369fded5cb31bb010b2fbe02c9f887ec3
+  metadata.gz: 818e14c3ff0bfcf90e7e8087256855a16a1298f4
+  data.tar.gz: e0702027282797f03c8c02d2550f94de4b99e4e8
 SHA512:
-  metadata.gz: 4b3c942cfd4e6f6acd1dd8d2042dc0ef7cd50fb795ef2a0e96fcfa97afba700c5778c2c89637a61d79704be3f0d2f0849aea353ce269dd67fb82f293cb4a0eb3
-  data.tar.gz: 3c0ddd90d0c21bd82de65d3d792fc0d0f898acd6d2e728a2a03482c86dd001665e38e7ce5c2a881a413bb5c0e9771c85c099f33323ae2d68db7033c93733e60d
+  metadata.gz: e8865f044c3d41d8c4410f655fca8c2271a49e29b726bfb6de36a8df936a592a061bd9bf73a6c22e35fe2bc7bfeea478a21b5969b54a218aa1e93d1bc6e43a70
+  data.tar.gz: 2951eeea8e8ddf297280b5e488a33768e24a09eae4a0712f144a27a4d8de696d7d1969742493d90e203db9745342714590df5cf44178587be7ddbbc1a84126de

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # [develop](https://github.com/adhearsion/punchblock)
 
+# [v2.7.0](https://github.com/adhearsion/punchblock/compare/v2.6.0...v2.7.0) - [2015-06-09](https://rubygems.org/gems/punchblock/versions/2.7.0)
+  * Feature: Support for Asterisk 13 (AMI v2)
+  * Feature: Pass all possible MRCP recognition headers through Asterisk [#244](https://github.com/adhearsion/punchblock/pull/244)
+  * Bugfix: Handle an illegal AMI response by Asterisk as a failure with code -1
+  * Bugfix: Ensure a useful error is raised when attempting to join to a call which doesn't exist [#529](https://github.com/adhearsion/adhearsion/issues/529)
+  * Bugfix: Support SSML in MRCPRecog case on Asterisk. This is the case where a prompt component wants to render using Asterisk and recognise using UniMRCP. This worked fine with a uri-list which already has test coverage, but threw (and silently swallowed) an exception for an SSML doc (as provided by Adhearsion) resulting in a hung call with no audio, and then a timeout exception in Adhearsion. [#241](https://github.com/adhearsion/punchblock/pull/241)
+
 # [v2.6.0](https://github.com/adhearsion/punchblock/compare/v2.5.3...v2.6.0) - [2015-02-01](https://rubygems.org/gems/punchblock/versions/2.6.0)
   * Feature: Support recognition-timeout settings on UniMRCP-based ASR on Asterisk ([#228](https://github.com/adhearsion/punchblock/pull/228))
   * Feature: Implement redirect command on Asterisk ([#219](https://github.com/adhearsion/punchblock/pull/219))

data/lib/punchblock/component/output.rb

@@ -46,6 +46,18 @@ module Punchblock
           super
         end
 
+        def size
+          if ssml?
+            value.children.count
+          else
+            value.size
+          end
+        end
+
+        def ssml?
+          content_type == SSML_CONTENT_TYPE
+        end
+
         private
 
         def xml_value
@@ -58,10 +70,6 @@ module Punchblock
           end
         end
 
-        def ssml?
-          content_type == SSML_CONTENT_TYPE
-        end
-
         def urilist?
           content_type == 'text/uri-list'
         end

data/lib/punchblock/translator/asterisk.rb

@@ -18,7 +18,7 @@ module Punchblock
       autoload :Channel
       autoload :Component
 
-      attr_reader :ami_client, :connection, :calls
+      attr_reader :ami_client, :connection, :calls, :bridges
 
       REDIRECT_CONTEXT = 'adhearsion-redirect'
       REDIRECT_EXTENSION = '1'
@@ -47,7 +47,7 @@ module Punchblock
 
       def initialize(ami_client, connection)
         @ami_client, @connection = ami_client, connection
-        @calls, @components, @channel_to_call_id = {}, {}, {}
+        @calls, @components, @channel_to_call_id, @bridges = {}, {}, {}, {}
       end
 
       def register_call(call)
@@ -88,7 +88,6 @@ module Punchblock
         handle_varset_ami_event event
 
         ami_dispatch_to_or_create_call event
-
         if !ami_event_known_call?(event) && self.class.event_passes_filter?(event)
           handle_pb_event Event::Asterisk::AMI::Event.new(name: event.name, headers: event.headers)
         end
@@ -208,7 +207,7 @@ module Punchblock
             next if channel.bridged? && !EVENTS_ALLOWED_BRIDGED.include?(event.name)
             call.process_ami_event event
           end
-        elsif event.name == "AsyncAGI" && event['SubEvent'] == "Start"
+        elsif event.name == "AsyncAGIStart" || (event.name == "AsyncAGI" && event['SubEvent'] == "Start")
           handle_async_agi_start_event event
         end
       end

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

@@ -23,6 +23,9 @@ module Punchblock
         def parse_result(event)
           parser = RubyAMI::AGIResultParser.new event['Result']
           {code: parser.code, result: parser.result, data: parser.data}
+        rescue ArgumentError => e
+          pb_logger.warn "Illegal message received from Asterisk: #{e.message}"
+          {code: -1, result: nil, data: nil}
         end
 
         private

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

@@ -13,7 +13,7 @@ module Punchblock
 
         OUTBOUND_CHANNEL_MATCH = /.* <(?<channel>.*)>/.freeze
 
-        attr_reader :id, :channel, :translator, :agi_env, :direction
+        attr_reader :id, :channel, :translator, :agi_env, :direction, :pending_joins
 
         HANGUP_CAUSE_TO_END_REASON = Hash.new { :error }
         HANGUP_CAUSE_TO_END_REASON[0] = :hungup
@@ -116,19 +116,55 @@ module Punchblock
           when 'Hangup'
             handle_hangup_event ami_event['Cause'].to_i, ami_event.best_time
           when 'AsyncAGI'
-            if component = component_with_id(ami_event['CommandID'])
-              component.handle_ami_event ami_event
-            end
+            component_for_command_id_handle ami_event
 
             if @answered == false && ami_event['SubEvent'] == 'Start'
               @answered = true
               send_pb_event Event::Answered.new(timestamp: ami_event.best_time)
             end
+          when 'AsyncAGIStart'
+            component_for_command_id_handle ami_event
+
+            if @answered == false
+              @answered = true
+              send_pb_event Event::Answered.new(timestamp: ami_event.best_time)
+            end
+          when 'AsyncAGIExec', 'AsyncAGIEnd'
+            component_for_command_id_handle ami_event
           when 'Newstate'
             case ami_event['ChannelState']
             when '5'
               send_pb_event Event::Ringing.new(timestamp: ami_event.best_time)
             end
+          when 'BridgeEnter'
+            if other_call_channel = translator.bridges.delete(ami_event['BridgeUniqueid'])
+              if other_call = translator.call_for_channel(other_call_channel)
+                join_command  = other_call.pending_joins.delete channel
+                join_command.response = true if join_command
+
+                event = Event::Joined.new call_uri: other_call.id, timestamp: ami_event.best_time
+                send_pb_event event
+
+                other_call_event = Event::Joined.new call_uri: id, timestamp: ami_event.best_time
+                other_call_event.target_call_id = other_call.id
+                translator.handle_pb_event other_call_event
+              end
+            else
+              translator.bridges[ami_event['BridgeUniqueid']] = ami_event['Channel']
+            end
+           when 'BridgeLeave'
+            if other_call_channel = translator.bridges.delete(ami_event['BridgeUniqueid'] + '_leave')
+              if other_call = translator.call_for_channel(other_call_channel)
+                event = Event::Unjoined.new call_uri: other_call.id, timestamp: ami_event.best_time
+                send_pb_event event
+
+                other_call_event = Event::Unjoined.new call_uri: id, timestamp: ami_event.best_time
+                other_call_event.target_call_id = other_call.id
+                translator.handle_pb_event other_call_event
+              end
+            else
+              translator.bridges[ami_event['BridgeUniqueid'] + '_leave'] = ami_event['Channel']
+            end
           when 'OriginateResponse'
             if ami_event['Response'] == 'Failure' && ami_event['Uniqueid'] == '<null>'
               send_end_event :error, nil, ami_event.best_time
@@ -194,8 +230,12 @@ module Punchblock
             command.response = true
           when Command::Join
             other_call = translator.call_with_id command.call_uri
-            @pending_joins[other_call.channel] = command
-            execute_agi_command 'EXEC Bridge', "#{other_call.channel},F(#{REDIRECT_CONTEXT},#{REDIRECT_EXTENSION},#{REDIRECT_PRIORITY})"
+            if other_call
+              @pending_joins[other_call.channel] = command
+              execute_agi_command 'EXEC Bridge', "#{other_call.channel},F(#{REDIRECT_CONTEXT},#{REDIRECT_EXTENSION},#{REDIRECT_PRIORITY})"
+            else
+              command.response = ProtocolError.new.setup :service_unavailable, "Could not find join party with address #{command.call_uri}", id
+            end
           when Command::Unjoin
             other_call = translator.call_with_id command.call_uri
             redirect_back other_call
@@ -264,7 +304,7 @@ module Punchblock
         def execute_agi_command(command, *params)
           agi = AGICommand.new Punchblock.new_uuid, channel, command, *params
           response = Celluloid::Future.new
-          register_tmp_handler :ami, name: 'AsyncAGI', [:[], 'SubEvent'] => 'Exec', [:[], 'CommandID'] => agi.id do |event|
+          register_tmp_handler :ami, [{name: 'AsyncAGI', [:[], 'SubEvent'] => 'Exec'}, {name: 'AsyncAGIExec'}], [{[:[], 'CommandID'] => agi.id}, {[:[], 'CommandId'] => agi.id}] do |event|
             response.signal Celluloid::SuccessResponse.new(nil, event)
           end
           agi.execute @ami_client
@@ -353,6 +393,12 @@ module Punchblock
           end
         end
 
+        def component_for_command_id_handle(ami_event)
+          if component = component_with_id(ami_event['CommandID'] || ami_event['CommandId'])
+            component.handle_ami_event ami_event
+          end
+        end
+
         def variable_for_headers(headers)
           variables = { :punchblock_call_id => id }
           header_counter = 51

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

@@ -20,7 +20,7 @@ module Punchblock
             end
 
             def handle_ami_event(event)
-              if event.name == 'AsyncAGI' && event['SubEvent'] == 'Exec'
+              if (event.name == 'AsyncAGI' && event['SubEvent'] == 'Exec') || event.name == 'AsyncAGIExec'
                 send_complete_event success_reason(event)
                 if @component_node.name == 'ASYNCAGI BREAK' && @call.channel_var('PUNCHBLOCK_END_ON_ASYNCAGI_BREAK')
                   @call.handle_hangup_event nil, event.best_time

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

@@ -58,7 +58,7 @@ module Punchblock
           end
 
           def register_dtmf_event_handler
-            @dtmf_handler_id = call.register_handler :ami, :name => 'DTMF', [:[], 'End'] => 'Yes' do |event|
+            @dtmf_handler_id = call.register_handler :ami, [{:name => 'DTMF', [:[], 'End'] => 'Yes'}, {:name => 'DTMFEnd'}] do |event|
               process_dtmf event['Digit']
             end
           end

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

@@ -17,7 +17,7 @@ module Punchblock
           private
 
           def register_dtmf_event_handler
-            call.register_handler :ami, :name => 'DTMF', [:[], 'End'] => 'Yes' do |event|
+            call.register_handler :ami, [{:name => 'DTMF', [:[], 'End'] => 'Yes'}, {:name => 'DTMFEnd'}] do |event|
               process_dtmf event['Digit']
             end
           end

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

@@ -17,7 +17,7 @@ module Punchblock
             raise OptionError, 'A document is required.' unless output_node.render_documents.count > 0
             raise OptionError, 'Only one document is allowed.' if output_node.render_documents.count > 1
             raise OptionError, 'Only inline documents are allowed.' if first_doc.url
-            raise OptionError, 'Only one audio file is allowed.' if first_doc.value.size > 1
+            raise OptionError, 'Only one audio file is allowed.' if first_doc.size > 1
 
             raise OptionError, 'A grammar is required.' unless input_node.grammars.count > 0
 
@@ -41,7 +41,19 @@ module Punchblock
           end
 
           def audio_filename
-            first_doc.value.first
+            path = if first_doc.ssml?
+              first_doc.value.children.first.src
+            else
+              first_doc.value.first
+            end.sub('file://', '')
+
+            dir = File.dirname(path)
+            basename = File.basename(path, '.*')
+            if dir == '.'
+              basename
+            else
+              File.join(dir, basename)
+            end
           end
 
           def unimrcp_app_options

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

@@ -45,6 +45,13 @@ module Punchblock
             raise OptionError, "An initial-timeout value must be -1 or a positive integer." if @initial_timeout < -1
             raise OptionError, "An inter-digit-timeout value must be -1 or a positive integer." if @inter_digit_timeout < -1
             raise OptionError, "A recognition-timeout value must be -1, 0, or a positive integer." if @recognition_timeout < -1
+            raise OptionError, "A max-silence value must be -1, 0, or a positive integer." if @max_silence < -1
+            raise OptionError, "A speech-complete-timeout value must be -1, 0, or a positive integer." if @speech_complete_timeout < -1
+            raise OptionError, "A hotword-max-duration value must be -1, 0, or a positive integer." if @hotword_max_duration < -1
+            raise OptionError, "A hotword-min-duration value must be -1, 0, or a positive integer." if @hotword_min_duration < -1
+            raise OptionError, "A dtmf-terminate-timeout value must be -1, 0, or a positive integer." if @dtmf_terminate_timeout < -1
+            raise OptionError, "An n-best-list-length value must be a positive integer." if @n_best_list_length && @n_best_list_length < 1
+            raise OptionError, "A speed-vs-accuracy value must be a positive integer." if @speed_vs_accuracy && @speed_vs_accuracy < 0
           end
 
           def execute_app(app, *args)
@@ -60,6 +67,23 @@ module Punchblock
               opts[:ct] = input_node.min_confidence if input_node.min_confidence
               opts[:sl] = input_node.sensitivity if input_node.sensitivity
               opts[:t]  = input_node.recognition_timeout if @recognition_timeout > -1
+              opts[:sint]  = input_node.max_silence if @max_silence > -1
+              opts[:sct]  = @speech_complete_timeout if @speech_complete_timeout > -1
+
+              opts[:sva] = @speed_vs_accuracy if @speed_vs_accuracy
+              opts[:nb] = @n_best_list_length if @n_best_list_length
+              opts[:sit] = @start_input_timers unless @start_input_timers.nil?
+              opts[:dtt] = @dtmf_terminate_timeout if @dtmf_terminate_timeout > -1
+              opts[:sw] = @save_waveform unless @save_waveform.nil?
+              opts[:nac] = @new_audio_channel unless @new_audio_channel.nil?
+              opts[:rm] = @recognition_mode if @recognition_mode
+              opts[:hmaxd] = @hotword_max_duration if @hotword_max_duration > -1
+              opts[:hmind] = @hotword_min_duration if @hotword_min_duration > -1
+              opts[:cdb] = @clear_dtmf_buffer unless @clear_dtmf_buffer.nil?
+              opts[:enm] = @early_no_match unless @early_no_match.nil?
+              opts[:iwu] = @input_waveform_uri if @input_waveform_uri
+              opts[:mt] = @media_type if @media_type
+
               yield opts
             end
           end
@@ -68,6 +92,21 @@ module Punchblock
             @initial_timeout = input_node.initial_timeout || -1
             @inter_digit_timeout = input_node.inter_digit_timeout || -1
             @recognition_timeout = input_node.recognition_timeout || -1
+            @max_silence = input_node.max_silence || -1
+            @speech_complete_timeout = input_node.headers['Speech-Complete-Timeout'] || -1
+            @speed_vs_accuracy = input_node.headers['Speed-Vs-Accuracy']
+            @n_best_list_length = input_node.headers['N-Best-List-Length']
+            @start_input_timers = input_node.headers['Start-Input-Timers']
+            @dtmf_terminate_timeout = input_node.headers['DTMF-Terminate-Timeout'] || -1
+            @save_waveform = input_node.headers['Save-Waveform']
+            @new_audio_channel = input_node.headers['New-Audio-Channel']
+            @recognition_mode = input_node.headers['Recognition-Mode']
+            @hotword_max_duration = input_node.headers['Hotword-Max-Duration'] || -1
+            @hotword_min_duration = input_node.headers['Hotword-Min-Duration'] || -1
+            @clear_dtmf_buffer = input_node.headers['Clear-DTMF-Buffer']
+            @early_no_match = input_node.headers['Early-No-Match']
+            @input_waveform_uri = input_node.headers['Input-Waveform-URI']
+            @media_type = input_node.headers['Media-Type']
           end
 
           def grammars

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

@@ -107,7 +107,7 @@ module Punchblock
             send_progress_if_necessary
 
             if interrupt
-              call.register_handler :ami, :name => 'DTMF', [:[], 'End'] => 'Yes' do |event|
+              call.register_handler :ami, [{:name => 'DTMF', [:[], 'End'] => 'Yes'}, {:name => 'DTMFEnd'}] do |event|
                 stop_by_redirect finish_reason
               end
             end

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

@@ -18,7 +18,7 @@ module Punchblock
           end
 
           def stop_by_redirect(complete_reason)
-            call.register_handler :ami, lambda { |e| e['SubEvent'] == 'Start' }, :name => 'AsyncAGI' do |event|
+            call.register_handler :ami, [{name: 'AsyncAGI', [:[], 'SubEvent'] => 'Start'}, {name: 'AsyncAGIExec'}] do |event|
               send_complete_event complete_reason
             end
             call.redirect_back

data/lib/punchblock/version.rb

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

data/spec/punchblock/translator/asterisk/call_spec.rb

@@ -516,31 +516,80 @@ module Punchblock
             let :component do
               Component::Asterisk::AGICommand.new mock_component_node, subject
             end
-
-            let(:ami_event) do
-              RubyAMI::Event.new "AsyncAGI",
-                "SubEvent"  => "End",
-                "Channel"   => "SIP/1234-00000000",
-                "CommandID" => component.id,
-                "Command"   => "EXEC ANSWER",
-                "Result"    => "200%20result=123%20(timeout)%0A"
-            end
-
             before do
               subject.register_component component
             end
 
-            it 'should send the event to the component' do
-              expect(component).to receive(:handle_ami_event).once.with ami_event
-              subject.process_ami_event ami_event
+            context 'with Asterisk 11 AsyncAGI SubEvent' do
+              let(:ami_event) do
+                RubyAMI::Event.new "AsyncAGI",
+                  "SubEvent"  => "End",
+                  "Channel"   => "SIP/1234-00000000",
+                  "CommandID" => component.id,
+                  "Command"   => "EXEC ANSWER",
+                  "Result"    => "200%20result=123%20(timeout)%0A"
+              end
+
+              it 'should send the event to the component' do
+                expect(component).to receive(:handle_ami_event).once.with ami_event
+                subject.process_ami_event ami_event
+              end
+
+              it 'should not send an answered event' do
+                expect(translator).to receive(:handle_pb_event).with(kind_of(Punchblock::Event::Answered)).never
+                subject.process_ami_event ami_event
+              end
             end
 
-            it 'should not send an answered event' do
-              expect(translator).to receive(:handle_pb_event).with(kind_of(Punchblock::Event::Answered)).never
-              subject.process_ami_event ami_event
+            context 'with Asterisk 13 AsyncAGIEnd and CommandId with a lowercase d' do
+              let(:ami_event) do
+                RubyAMI::Event.new "AsyncAGIEnd",
+                  "Channel"   => "SIP/1234-00000000",
+                  "CommandId" => component.id,
+                  "Command"   => "EXEC ANSWER",
+                  "Result"    => "200%20result=123%20(timeout)%0A"
+              end
+
+              it 'should send the event to the component' do
+                expect(component).to receive(:handle_ami_event).once.with ami_event
+                subject.process_ami_event ami_event
+              end
+
+              it 'should not send an answered event' do
+                expect(translator).to receive(:handle_pb_event).with(kind_of(Punchblock::Event::Answered)).never
+                subject.process_ami_event ami_event
+              end
             end
           end
 
+          def should_send_answered_event
+            expected_answered = Punchblock::Event::Answered.new
+            expected_answered.target_call_id = subject.id
+            expect(translator).to receive(:handle_pb_event).with expected_answered
+            subject.process_ami_event ami_event
+          end
+
+          def answered_should_be_true
+            subject.process_ami_event ami_event
+            expect(subject.answered?).to be_true
+          end
+
+          def should_only_send_one_answered_event
+            expected_answered = Punchblock::Event::Answered.new
+            expected_answered.target_call_id = subject.id
+            expect(translator).to receive(:handle_pb_event).with(expected_answered).once
+            subject.process_ami_event ami_event
+            subject.process_ami_event ami_event
+          end
+
+          def should_use_ami_timestamp_for_rayo_event
+            expected_answered = Punchblock::Event::Answered.new target_call_id: subject.id,
+                                                           timestamp: DateTime.new(2014, 2, 25, 22, 46, 20)
+            expect(translator).to receive(:handle_pb_event).with expected_answered
+
+            subject.process_ami_event ami_event
+          end
+
           context 'with an AsyncAGI Start event' do
             let(:ami_event) do
               RubyAMI::Event.new "AsyncAGI",
@@ -550,24 +599,16 @@ module Punchblock
             end
 
             it 'should send an answered event' do
-              expected_answered = Punchblock::Event::Answered.new
-              expected_answered.target_call_id = subject.id
-              expect(translator).to receive(:handle_pb_event).with expected_answered
-              subject.process_ami_event ami_event
+              should_send_answered_event
             end
 
             it '#answered? should be true' do
-              subject.process_ami_event ami_event
-              expect(subject.answered?).to be_true
+              answered_should_be_true
             end
 
             context "for a second time" do
               it 'should only send one answered event' do
-                expected_answered = Punchblock::Event::Answered.new
-                expected_answered.target_call_id = subject.id
-                expect(translator).to receive(:handle_pb_event).with(expected_answered).once
-                subject.process_ami_event ami_event
-                subject.process_ami_event ami_event
+                should_only_send_one_answered_event
               end
             end
 
@@ -581,11 +622,42 @@ module Punchblock
               end
 
               it "should use the AMI timestamp for the Rayo event" do
-                expected_answered = Punchblock::Event::Answered.new target_call_id: subject.id,
-                                                                    timestamp: DateTime.new(2014, 2, 25, 22, 46, 20)
-                expect(translator).to receive(:handle_pb_event).with expected_answered
+                should_use_ami_timestamp_for_rayo_event
+              end
+            end
+          end
 
-                subject.process_ami_event ami_event
+          context 'with an Asterisk 13 AsyncAGIStart event' do
+            let(:ami_event) do
+              RubyAMI::Event.new "AsyncAGIStart",
+                "Channel"   => "SIP/1234-00000000",
+                "Env"       => "agi_request%3A%20async%0Aagi_channel%3A%20SIP%2Fuserb-00000006%0Aagi_language%3A%20en%0Aagi_type%3A%20SIP%0Aagi_uniqueid%3A%201390303636.6%0Aagi_version%3A%2011.7.0%0Aagi_callerid%3A%20userb%0Aagi_calleridname%3A%20User%20B%0Aagi_callingpres%3A%200%0Aagi_callingani2%3A%200%0Aagi_callington%3A%200%0Aagi_callingtns%3A%200%0Aagi_dnid%3A%20unknown%0Aagi_rdnis%3A%20unknown%0Aagi_context%3A%20adhearsion-redirect%0Aagi_extension%3A%201%0Aagi_priority%3A%201%0Aagi_enhanced%3A%200.0%0Aagi_accountcode%3A%20%0Aagi_threadid%3A%20139696536876800%0A%0A"
+            end
+
+            it 'should send an answered event' do
+              should_send_answered_event
+            end
+
+            it '#answered? should be true' do
+              answered_should_be_true
+            end
+
+            context "for a second time" do
+              it 'should only send one answered event' do
+                should_only_send_one_answered_event
+              end
+            end
+
+            context "when the AMI event has a timestamp" do
+              let :ami_event do
+                RubyAMI::Event.new "AsyncAGIStart",
+                  "Channel"   => "SIP/1234-00000000",
+                  "Env"       => "agi_request%3A%20async%0Aagi_channel%3A%20SIP%2Fuserb-00000006%0Aagi_language%3A%20en%0Aagi_type%3A%20SIP%0Aagi_uniqueid%3A%201390303636.6%0Aagi_version%3A%2011.7.0%0Aagi_callerid%3A%20userb%0Aagi_calleridname%3A%20User%20B%0Aagi_callingpres%3A%200%0Aagi_callingani2%3A%200%0Aagi_callington%3A%200%0Aagi_callingtns%3A%200%0Aagi_dnid%3A%20unknown%0Aagi_rdnis%3A%20unknown%0Aagi_context%3A%20adhearsion-redirect%0Aagi_extension%3A%201%0Aagi_priority%3A%201%0Aagi_enhanced%3A%200.0%0Aagi_accountcode%3A%20%0Aagi_threadid%3A%20139696536876800%0A%0A",
+                  'Timestamp' => '1393368380.572575'
+              end
+
+              it "should use the AMI timestamp for the Rayo event" do
+                should_use_ami_timestamp_for_rayo_event
               end
             end
           end
@@ -736,6 +808,124 @@ module Punchblock
             end
           end
 
+          context 'with a BridgeEnter event' do
+            let(:bridge_uniqueid) { "1234-5678" }
+            let(:call_channel) { "SIP/foo" }
+            let :ami_event do
+              RubyAMI::Event.new 'BridgeEnter',
+                'Privilege' => "call,all",
+                'BridgeUniqueid'  => bridge_uniqueid,
+                'Channel'  => call_channel
+            end
+
+            context 'when the event is received the first time' do
+              it 'sets an entry in translator.bridges' do
+                subject.process_ami_event ami_event
+                expect(translator.bridges[bridge_uniqueid]).to eq call_channel
+              end
+            end
+
+            context 'when the event is received a second time for the same BridgeUniqueid' do
+              let(:other_channel) { 'SIP/5678-00000000' }
+              let :other_call do
+                Call.new other_channel, translator, ami_client, connection
+              end
+              let(:other_call_id) { other_call.id }
+
+              let :command do
+                Punchblock::Command::Join.new call_uri: other_call_id
+              end
+
+              let :ami_event do
+                RubyAMI::Event.new 'BridgeEnter',
+                'Privilege' => "call,all",
+                'BridgeUniqueid'  => bridge_uniqueid,
+                'Channel'  => call_channel
+              end
+
+              let :expected_joined do
+                Punchblock::Event::Joined.new target_call_id: subject.id,
+                  call_uri: other_call_id
+              end
+
+              let :expected_joined_other do
+                Punchblock::Event::Joined.new target_call_id: other_call_id,
+                  call_uri: subject.id
+              end
+
+              before do
+                translator.bridges[bridge_uniqueid] = other_channel
+                translator.register_call other_call
+
+                other_call.pending_joins[channel] = command
+                command.request!
+                expect(subject).to receive(:execute_agi_command).and_return code: 200
+                subject.execute_command command
+              end
+
+              it 'sends the correct Joined events' do
+                expect(translator).to receive(:handle_pb_event).with expected_joined
+                expect(translator).to receive(:handle_pb_event).with expected_joined_other
+                subject.process_ami_event ami_event
+                expect(command.response(0.5)).to eq(true)
+              end
+            end
+          end
+
+          context 'with a BridgeLeave event' do
+            let(:bridge_uniqueid) { "1234-5678" }
+            let(:call_channel) { "SIP/foo-1234" }
+            let :ami_event do
+              RubyAMI::Event.new 'BridgeLeave',
+                'Privilege' => "call,all",
+                'BridgeUniqueid'  => bridge_uniqueid,
+                'Channel'  => call_channel
+            end
+
+            context 'when the event is received the first time' do
+              it 'sets an entry in translator.bridges' do
+                subject.process_ami_event ami_event
+                expect(translator.bridges[bridge_uniqueid + '_leave']).to eq call_channel
+              end
+            end
+
+            context 'when the event is received a second time for the same BridgeUniqueid' do
+              let(:other_channel) { 'SIP/5678-00000000' }
+              let :other_call do
+                Call.new other_channel, translator, ami_client, connection
+              end
+              let(:other_call_id) { other_call.id }
+
+              let :ami_event do
+                RubyAMI::Event.new 'BridgeLeave',
+                'Privilege' => "call,all",
+                'BridgeUniqueid'  => bridge_uniqueid,
+                'Channel'  => call_channel
+              end
+
+              let :expected_unjoined do
+                Punchblock::Event::Unjoined.new target_call_id: subject.id,
+                  call_uri: other_call_id
+              end
+
+              let :expected_unjoined_other do
+                Punchblock::Event::Unjoined.new target_call_id: other_call_id,
+                  call_uri: subject.id
+              end
+
+              before do
+                translator.bridges[bridge_uniqueid + '_leave'] = other_channel
+                translator.register_call other_call
+              end
+
+              it 'sends the correct Unjoined events' do
+                expect(translator).to receive(:handle_pb_event).with expected_unjoined
+                expect(translator).to receive(:handle_pb_event).with expected_unjoined_other
+                subject.process_ami_event ami_event
+              end
+            end
+          end
+
           context 'with a BridgeExec event' do
             let :ami_event do
               RubyAMI::Event.new 'BridgeExec',
@@ -794,10 +984,10 @@ module Punchblock
 
           context 'with a Bridge event' do
             let(:other_channel) { 'SIP/5678-00000000' }
-            let(:other_call_id) { 'def567' }
             let :other_call do
               Call.new other_channel, translator, ami_client, connection
             end
+            let(:other_call_id) { other_call.id }
 
             let :ami_event do
               RubyAMI::Event.new 'Bridge',
@@ -828,7 +1018,6 @@ module Punchblock
             before do
               translator.register_call other_call
               expect(translator).to receive(:call_for_channel).with(other_channel).and_return(other_call)
-              expect(other_call).to receive(:id).and_return other_call_id
             end
 
             context "of state 'Link'" do
@@ -1379,6 +1568,15 @@ module Punchblock
               subject.execute_command command
             end
 
+            context "when the other call doesn't exist" do
+              let(:other_call) { nil }
+
+              it "returns an error" do
+                subject.execute_command command
+                expect(command.response(0.5)).to eq(ProtocolError.new.setup(:service_unavailable, "Could not find join party with address #{other_call_id}", subject.id))
+              end
+            end
+
             context "when the AMI command raises an error" do
               let(:message) { 'Some error' }
               let(:error)   { RubyAMI::Error.new.tap { |e| e.message = message } }
@@ -1758,6 +1956,7 @@ module Punchblock
             end
           end
 
+
           describe 'when receiving an AsyncAGI event' do
             context 'of type Exec' do
               let(:ami_event) do
@@ -1771,11 +1970,27 @@ module Punchblock
 
               it 'should return the result' do
                 fut = Celluloid::Future.new { subject.execute_agi_command 'EXEC ANSWER' }
-
                 sleep 0.25
-
                 subject.process_ami_event ami_event
+                expect(fut.value).to eq({code: 200, result: 123, data: 'timeout'})
+              end
+            end
+          end
 
+          describe 'when receiving an Asterisk 13 AsyncAGIExec event' do
+            context 'without a subtype' do
+              let(:ami_event) do
+                RubyAMI::Event.new 'AsyncAGIExec',
+                  "Channel"    => channel,
+                  "CommandId"  => Punchblock.new_uuid,
+                  "Command"    => "EXEC ANSWER",
+                  "Result"     => "200%20result=123%20(timeout)%0A"
+              end
+
+              it 'should return the result' do
+                fut = Celluloid::Future.new { subject.execute_agi_command 'EXEC ANSWER' }
+                sleep 0.25
+                subject.process_ami_event ami_event
                 expect(fut.value).to eq({code: 200, result: 123, data: 'timeout'})
               end
             end