punchblock 2.1.1 → 2.2.0

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

@@ -15,20 +15,16 @@ module Punchblock
               send_ref
             rescue RubyAMI::Error
               set_node_response false
-              terminate
             rescue ChannelGoneError
               set_node_response ProtocolError.new.setup(:item_not_found, "Could not find a call with ID #{call_id}", call_id)
-              terminate
             end
-            exclusive :execute
 
             def handle_ami_event(event)
               if event.name == 'AsyncAGI' && event['SubEvent'] == 'Exec'
-                send_complete_event success_reason(event), nil, false
+                send_complete_event success_reason(event)
                 if @component_node.name == 'ASYNCAGI BREAK' && @call.channel_var('PUNCHBLOCK_END_ON_ASYNCAGI_BREAK')
                   @call.handle_hangup_event
                 end
-                terminate
               end
             end
 

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

@@ -15,15 +15,15 @@ module Punchblock
 
             @output_incomplete = true
 
-            output_component = Output.new_link(output_command, @call)
-            call.register_component output_component
-            fut = output_component.future.execute
+            @output_component = Output.new(output_command, @call)
+            call.register_component @output_component
+            fut = Celluloid::Future.new { @output_component.execute }
 
-            case output_command.response
+            case @output_command.response
             when Ref
               send_ref
             else
-              set_node_response output_command.response
+              set_node_response @output_command.response
             end
 
             if @component_node.barge_in
@@ -41,7 +41,7 @@ module Punchblock
 
           def process_dtmf(digit)
             if @component_node.barge_in && @output_incomplete
-              call.async.redirect_back
+              @output_component.stop_by_redirect Punchblock::Event::Complete::Stop.new
               @barged = true
             end
             super
@@ -58,14 +58,13 @@ module Punchblock
           end
 
           def register_dtmf_event_handler
-            component = current_actor
             @dtmf_handler_id = call.register_handler :ami, :name => 'DTMF', [:[], 'End'] => 'Yes' do |event|
-              component.process_dtmf event['Digit']
+              process_dtmf event['Digit']
             end
           end
 
           def unregister_dtmf_event_handler
-            call.async.unregister_handler :ami, @dtmf_handler_id if instance_variable_defined?(:@dtmf_handler_id)
+            call.unregister_handler :ami, @dtmf_handler_id if instance_variable_defined?(:@dtmf_handler_id)
           end
         end
       end

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

@@ -17,14 +17,13 @@ module Punchblock
           private
 
           def register_dtmf_event_handler
-            component = current_actor
             call.register_handler :ami, :name => 'DTMF', [:[], 'End'] => 'Yes' do |event|
-              component.process_dtmf event['Digit']
+              process_dtmf event['Digit']
             end
           end
 
           def unregister_dtmf_event_handler
-            call.async.unregister_handler :ami, @dtmf_handler_id if instance_variable_defined?(:@dtmf_handler_id)
+            call.unregister_handler :ami, @dtmf_handler_id if instance_variable_defined?(:@dtmf_handler_id)
           end
         end
       end

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

@@ -14,6 +14,7 @@ module Punchblock
             raise OptionError, "The renderer #{renderer} is unsupported." unless renderer == 'unimrcp'
             raise OptionError, "The recognizer #{recognizer} is unsupported." unless recognizer == 'unimrcp'
             raise OptionError, 'An SSML 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, 'A grammar is required.' unless input_node.grammars.count > 0
 
             super
@@ -28,17 +29,16 @@ module Punchblock
           end
 
           def execute_unimrcp_app
-            execute_app 'SynthAndRecog', render_docs, grammars
+            execute_app 'SynthAndRecog', render_doc, grammars
           end
 
-          def render_docs
-            output_node.render_documents.map do |d|
-              if d.content_type
-                d.value.to_doc.to_s
-              else
-                d.url
-              end
-            end.join ','
+          def render_doc
+            d = output_node.render_documents.first
+            if d.content_type
+              d.value.to_doc.to_s
+            else
+              d.url
+            end
           end
 
           def unimrcp_app_options

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

@@ -16,50 +16,58 @@ module Punchblock
 
           def execute
             raise OptionError, 'An SSML document is required.' unless @component_node.render_documents.first.value
-            raise OptionError, 'Only a single document is supported.' unless @component_node.render_documents.size == 1
             raise OptionError, 'An interrupt-on value of speech is unsupported.' if @component_node.interrupt_on == :voice
 
-            [:start_offset, :start_paused, :repeat_interval, :repeat_times, :max_time].each do |opt|
+            [:start_offset, :start_paused, :repeat_interval, :max_time].each do |opt|
               raise OptionError, "A #{opt} value is unsupported on Asterisk." if @component_node.send opt
             end
 
-            early = !@call.answered?
+            @early = !@call.answered?
 
             rendering_engine = @component_node.renderer || :asterisk
 
+            repeat_times = @component_node.repeat_times || 1
+            repeat_times = 1000 if repeat_times.zero?
+
             case rendering_engine.to_sym
             when :asterisk
-              raise OptionError, "A voice value is unsupported on Asterisk." if @component_node.voice
-              raise OptionError, 'Interrupt digits are not allowed with early media.' if early && @component_node.interrupt_on
+              validate_audio_only
+              setup_for_native
 
-              case @component_node.interrupt_on
-              when :any, :dtmf
-                interrupt = true
+              repeat_times.times do
+                render_docs.each do |doc|
+                  playback(filenames(doc).values) || raise(PlaybackError)
+                end
               end
-
-              path = filenames.join '&'
-
-              @call.send_progress if early
-
-              if interrupt
-                output_component = current_actor
-                call.register_handler :ami, :name => 'DTMF', [:[], 'End'] => 'Yes' do |event|
-                  output_component.stop_by_redirect finish_reason
+            when :native_or_unimrcp
+              setup_for_native
+
+              repeat_times.times do
+                render_docs.each do |doc|
+                  doc.value.children.each do |node|
+                    case node
+                    when RubySpeech::SSML::Audio
+                      playback([path_for_audio_node(node)]) || render_with_unimrcp(fallback_doc(doc, node))
+                    when String
+                      if node.include?(' ')
+                        render_with_unimrcp(copied_doc(doc, node))
+                      else
+                        playback([node]) || render_with_unimrcp(copied_doc(doc, node))
+                      end
+                    else
+                      render_with_unimrcp(copied_doc(doc, node.node))
+                    end
+                  end
                 end
               end
-
-              send_ref
-
-              opts = early ? "#{path},noanswer" : path
-              @call.execute_agi_command 'EXEC Playback', opts
-              raise PlaybackError if @call.channel_var('PLAYBACKSTATUS') == 'FAILED'
             when :unimrcp
-              @call.send_progress if early
+              send_progress_if_necessary
               send_ref
-              UniMRCPApp.new('MRCPSynth', render_doc, mrcpsynth_options).execute @call
-              raise UniMRCPError if @call.channel_var('SYNTHSTATUS') == 'ERROR'
+              repeat_times.times do
+                render_with_unimrcp(*render_docs)
+              end
             when :swift
-              @call.send_progress if early
+              send_progress_if_necessary
               send_ref
               @call.execute_agi_command 'EXEC Swift', swift_doc
             else
@@ -80,26 +88,113 @@ module Punchblock
             with_error 'option error', e.message
           end
 
+          def stop_by_redirect(*args)
+            @stopped = true
+            super
+          end
+
           private
 
-          def filenames
-            @filenames ||= render_doc.children.map do |node|
+          def setup_for_native
+            raise OptionError, "A voice value is unsupported on Asterisk." if @component_node.voice
+            raise OptionError, 'Interrupt digits are not allowed with early media.' if @early && @component_node.interrupt_on
+
+            case @component_node.interrupt_on
+            when :any, :dtmf
+              interrupt = true
+            end
+
+            send_progress_if_necessary
+
+            if interrupt
+              call.register_handler :ami, :name => 'DTMF', [:[], 'End'] => 'Yes' do |event|
+                stop_by_redirect finish_reason
+              end
+            end
+
+            send_ref
+          end
+
+          def send_progress_if_necessary
+            @call.send_progress if @early
+          end
+
+          def validate_audio_only
+            render_docs.each do |doc|
+              filenames doc, -> { raise UnrenderableDocError, 'The provided document could not be rendered. See http://adhearsion.com/docs/common_problems#unrenderable-document-error for details.' }
+            end
+          end
+
+          def path_for_audio_node(node)
+            node.src.sub('file://', '').gsub(/\.[^\.]*$/, '')
+          end
+
+          def filenames(doc, check_audio_only_policy = -> {})
+            names = {}
+            doc.value.children.each do |node|
               case node
               when RubySpeech::SSML::Audio
-                node.src.sub('file://', '').gsub(/\.[^\.]*$/, '')
+                names[node] = path_for_audio_node node
               when String
-                raise if node.include?(' ')
-                node
+                check_audio_only_policy.call if node.include?(' ')
+                names[nil] = node
+              else
+                check_audio_only_policy.call
+              end
+            end
+            names
+          end
+
+          def playback_options(paths)
+            opts = paths.join '&'
+            opts << ",noanswer" if @early
+            opts
+          end
+
+          def playback(paths)
+            return true if @stopped
+            @call.execute_agi_command 'EXEC Playback', playback_options(paths)
+            @call.channel_var('PLAYBACKSTATUS') != 'FAILED'
+          end
+
+          def fallback_doc(original, failed_audio_node)
+            children = failed_audio_node.nokogiri_children
+            copied_doc original, children
+          end
+
+          def copied_doc(original, elements)
+            doc = RubySpeech::SSML.draw do
+              if Nokogiri.jruby?
+                self.write_attr 'version', original.value['version']
+                self.write_attr 'xml:lang', original.value['xml:lang']
               else
-                raise
+                original.value.attributes.each do |name, value|
+                  attr_name = value.namespace && value.namespace.prefix ? [value.namespace.prefix, name].join(':') : name
+                  self.write_attr attr_name, value
+                end
               end
-            end.compact
-          rescue
-            raise UnrenderableDocError, 'The provided document could not be rendered. See http://adhearsion.com/docs/common_problems#unrenderable-document-error for details.'
+
+              add_child Nokogiri.jruby? ? elements : elements.to_xml
+            end
+            Punchblock::Component::Output::Document.new(value: doc)
+          end
+
+          def render_with_unimrcp(*docs)
+            docs.each do |doc|
+              return if @stopped
+              UniMRCPApp.new('MRCPSynth', doc.value.to_s, mrcpsynth_options).execute @call
+              raise UniMRCPError if @call.channel_var('SYNTHSTATUS') == 'ERROR'
+            end
           end
 
-          def render_doc
-            @component_node.render_documents.first.value
+          def render_docs
+            @component_node.render_documents
+          end
+
+          def concatenated_render_doc
+            render_docs.inject RubySpeech::SSML.draw do |doc, argument|
+              doc + argument.value
+            end
           end
 
           def mrcpsynth_options
@@ -110,7 +205,7 @@ module Punchblock
           end
 
           def swift_doc
-            doc = render_doc.to_s.squish.gsub(/["\\]/) { |m| "\\#{m}" }
+            doc = concatenated_render_doc.to_s.squish.gsub(/["\\]/) { |m| "\\#{m}" }
             doc << "|1|1" if [:any, :dtmf].include? @component_node.interrupt_on
             doc.insert 0, "#{@component_node.voice}^" if @component_node.voice
             doc

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

@@ -22,9 +22,8 @@ module Punchblock
 
             @format = @component_node.format || 'wav'
 
-            component = current_actor
             call.register_tmp_handler :ami, :name => 'MonitorStop' do |event|
-              component.finished
+              finished
             end
 
             if @component_node.start_beep
@@ -33,7 +32,7 @@ module Punchblock
 
             ami_client.send_action 'Monitor', 'Channel' => call.channel, 'File' => filename, 'Format' => @format, 'Mix' => true
             unless max_duration == -1
-              after max_duration/1000 do
+              call.after max_duration/1000 do
                 ami_client.send_action 'StopMonitor', 'Channel' => call.channel
               end
             end

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

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

data/lib/punchblock/translator/dtmf_recognizer.rb

@@ -23,6 +23,8 @@ module Punchblock
         end
       end
 
+      include Celluloid
+
       def initialize(responder, grammar, initial_timeout = nil, inter_digit_timeout = nil, terminator = nil)
         @responder = responder
         self.initial_timeout = initial_timeout || -1
@@ -68,10 +70,6 @@ module Punchblock
         @matcher.match @buffer.dup
       end
 
-      def after(*args, &block)
-        @responder.after *args, &block
-      end
-
       def initial_timeout=(other)
         raise OptionError, 'An initial timeout value that is negative (and not -1) is invalid.' if other < -1
         @initial_timeout = other

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

@@ -36,7 +36,6 @@ module Punchblock
 
           def validate
             raise OptionError, 'An SSML document is required.' unless @component_node.render_documents.first.value
-            raise OptionError, 'Only a single document is supported.' unless @component_node.render_documents.size == 1
 
             [:start_offset, :start_paused, :repeat_interval, :repeat_times, :max_time].each do |opt|
               raise OptionError, "A #{opt} value is unsupported." if @component_node.send opt
@@ -48,6 +47,12 @@ module Punchblock
             end
           end
 
+          def concatenated_render_doc
+            @component_node.render_documents.inject RubySpeech::SSML.draw do |doc, argument|
+              doc + argument.value
+            end
+          end
+
           def finish_reason
             Punchblock::Component::Output::Complete::Finish.new
           end

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

@@ -12,7 +12,7 @@ module Punchblock
           end
 
           def document
-            @component_node.render_documents.first.value.inner_text.to_s
+            concatenated_render_doc.inner_text.to_s
           end
         end
       end

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

@@ -17,17 +17,19 @@ module Punchblock
           end
 
           def filenames
-            @filenames ||= @component_node.render_documents.first.value.children.map do |node|
-              case node
-              when RubySpeech::SSML::Audio
-                node.src
-              when String
-                raise if node.include?(' ')
-                node
-              else
-                raise
+            @filenames ||= @component_node.render_documents.map do |doc|
+              doc.value.children.map do |node|
+                case node
+                when RubySpeech::SSML::Audio
+                  node.src
+                when String
+                  raise if node.include?(' ')
+                  node
+                else
+                  raise
+                end
               end
-            end.compact
+            end.compact.flatten
           rescue
             raise UnrenderableDocError, 'The provided document could not be rendered. See http://adhearsion.com/docs/common_problems#unrenderable-document-error for details.'
           end