asterisk-ami 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23aad48f08a544364eb4b8141a1a007ccbf9ad44
-  data.tar.gz: b8a33710c383e6862b7d1ad8a3a2298697ffdc75
+  metadata.gz: d2c16d3026df5c4f13a86a2a772fdf6cae201ed3
+  data.tar.gz: 2b46c96f5058776a98ddc6a35dfefe3bb55c3166
 SHA512:
-  metadata.gz: 72b32e800d65e830cadb351785a91ea6b4affa3a07ea5a62f09fb77deb02a5cde68bc11c5c207d6faba61b131c94d8b85b4a2dddc4a8ef054d88e918cf87d516
-  data.tar.gz: 136424727ecabc5559b08096db78e5647bcd05e183e741820469b41f9910411bbf684a5c21f00c294307be76c447b7328ec12e2efbbfbbef3ca8c77fcafd5f0f
+  metadata.gz: f88972ba1a2a6633b03fd8ed7594b4a07bc2608dcaa693fab203c055c546e78550127c5d9392c517e71d3e7fc221e90af38a05bab6ecc28611e61561ff96b3ac
+  data.tar.gz: b2c99e20a2ba41333d681c13106372988ea3ae519192f6d3688d4c45c37e0ec8032319b7c564b4ac2d2e0cc4fcc6d5655d80dd04ed862225a4c70ebfbf0d8c74

data/README.md

@@ -1,6 +1,6 @@
 # Asterisk::Ami
 
-TODO: Write a gem description
+Asterisk Websocket to AMI proxy.
 
 ## Installation
 
@@ -18,7 +18,9 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Run the ami proxy from the command line with the following command changing the ami_* parameters with your access details for asterisk.
+
+    $ bundle exec asterisk-ami localhost 8088 ami_user ami_password ami_host
 
 ## Contributing
 

data/asterisk-ami.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "titleize"
   spec.add_dependency "json"
-  spec.add_dependency "em-websocket", "> 0.5.0"
+  spec.add_dependency "em-websocket", ">= 0.5.0"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

data/lib/ami.rb

@@ -9,6 +9,7 @@ module Asterisk
 
     def initialize(username, password, host="localhost", port=5038)
       @connection = Asterisk::Connection.new(username, password, host, port)
+      @connected = false
     end
 
     def connect
@@ -95,5 +96,8 @@ module Asterisk
       Asterisk::Action.new("MailboxCount", {"Mailbox" => "#{exten}@#{context}"}).send(@connection)
     end
 
+    private
+      attr_accessor :connected
+
   end
 end

data/lib/asterisk/action.rb

@@ -2,12 +2,13 @@ require File.expand_path(File.dirname(__FILE__)) + "/message_helper"
 
 module Asterisk
   class Action
+
     include Asterisk::MessageHelper
 
     def initialize(command, options={})
       @command = command
       @options = options
-      @options[:action_id] = Random.rand(9999) unless @options.has_key?(:action_id)
+      @options[:action_id] = Random.rand(99999999) unless @options[:action_id]
     end
 
     def self.parse(str)
@@ -17,11 +18,11 @@ module Asterisk
 
     # send the ami action
     def send(connection)
-      #puts self.to_ami
-      connection.write(self.to_ami + "\r\n\r\n")
-      #connection.waitfor("Match" => /\r\n\r\n/) do |received_data|
-        #puts received_data
-      #end
+      connection.write(self.to_ami)
+    end
+
+    def action_id
+      @options[:action_id]
     end
 
     # convert the action to ami string to send down wire

data/lib/asterisk/ami/version.rb

@@ -1,5 +1,5 @@
 module Asterisk
   module Ami
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/asterisk/connection.rb

@@ -20,13 +20,13 @@ module Asterisk
         puts "connected"
         @connection.waitfor(/Asterisk Call Manager\/\d+\.\d+/) {|response| puts response }
         puts "Logging in.."
-        Asterisk::Action.new(:login, :username => @username, :secret => @password).send(@connection)
+        Asterisk::Action.new(:login, :username => @username, :secret => @password).send(self)
         puts "Done."
       end
     end
 
-    def write(str)
-      @connection.write(str + "\r\n\r\n")
+    def write(command)
+      @connection.write(command + "\r\n\r\n")
     end
 
     def events(&block)
@@ -43,6 +43,8 @@ module Asterisk
                     begin
                       if message.include?("Event")
                         yield Asterisk::Event.parse(message) if block_given?
+                      else
+                        puts message
                       end
                     rescue Errno::EPIPE => e
                       puts "Error in connection to Asterisk: #{e.message}"

data/lib/asterisk/event.rb

@@ -1,9 +1,10 @@
-module Asterisk
+require File.expand_path(File.dirname(__FILE__)) + "/message_helper"
 
+module Asterisk
   class Event
     include Asterisk::MessageHelper
     def self.parse(str)
       parse_lines(str)
     end
   end
-end
+end

data/lib/asterisk/server/socket.rb

@@ -9,24 +9,26 @@ require 'em-websocket'
 Thread.abort_on_exception = true
 # WebSocket.debug = true
 
-if ARGV.size != 5
-  $stderr.puts("Usage: asterisk-ami ACCEPTED_DOMAIN PORT AMI_USERNAME AMI_PASSWORD AMI_HOSTNAME")
+if ARGV.size < 3
+  $stderr.puts("Usage: asterisk-ami AMI_USERNAME AMI_PASSWORD AMI_HOSTNAME [ACCEPTED_DOMAIN] [PORT]")
   exit(1)
 end
 
-# server = WebSocketServer.new(
-#   :accepted_domains => [ARGV[0], "localhost"],
-#   :port => ARGV[1].to_i())
 
-port = ARGV[1].to_i
 
-ami_username = ARGV[2]
-ami_password = ARGV[3]
-ami_host = ARGV[4]
+host = ARGV[3]
+port = ARGV[4].to_i
+
+ami_host = ARGV[0]
+ami_username = ARGV[1]
+ami_password = ARGV[2]
+
+host = "0.0.0.0" if host.nil?
+port = 8088 if port==0
 
 puts "Starting Server on port #{port}"
 EM.run {
-  EM::WebSocket.run(:host => "0.0.0.0", :port => port) do |ws|
+  EM::WebSocket.run(:host => host, :port => port) do |ws|
     ws.onopen { |handshake|
 
       puts "Websocket connection request received"
@@ -44,18 +46,48 @@ EM.run {
       puts "Recieved message: #{msg}"
 
       if msg.is_json?
-        puts "its json"
         data = JSON.parse(msg)
-        puts data
         if data["command"]
-          puts "its a command"
           case data["command"]
           when "initiate-call"
-            puts "initiate call!"
-            ami_command = Asterisk::Action.new("Originate", :channel => "SIP/#{data["from"]}", :exten => data["to"], :priority => 1, :context => "default")
-            puts ami_command.to_ami
+            ami_command = Asterisk::Action.new(:originate, :action_id => data["action_id"], :channel => "SIP/#{data["from"]}", :extension => data["to"], :priority => 1, :context => "default")
+          when "hangup"
+            ami_command = Asterisk::Action.new(:hangup, :action_id => data["action_id"], :channel => data["channel"])  
+          when "transfer"
+            ami_command = Asterisk::Action.new(:blind_transfer, :action_id => data["action_id"], :channel => data["channel"], :extension => data["to"], :context => "default")
+
+          when "hold"
+            if data.has_key?("timeout")
+              timeout = data["timeout"].to_s.to_i
+            else
+              timeout = 60
+            end
+            ami_command = Asterisk::Action.new(:park, :action_id => data["action_id"], :channel => data["channel"], :channel2 => data["my_channel"], :timeout => (timeout*1000).to_s)
+          when "unhold"
+            ami_command = Asterisk::Action.new(:bridge, :action_id => data["action_id"], :channel => data["my_channel"], :channel2 => data["remote_channel"], :tone => "yes")
+          when "start-recording"
+            ami_command = Asterisk::Action.new(:monitor, :action_id => data["action_id"], :channel => data["channel"], :format => "wav", :mix => "true")
+          when "stop-recording"
+            ami_command = Asterisk::Action.new(:stop_monitor, :action_id => data["action_id"], :channel => data["channel"])
+          when "pause-recording"
+            ami_command = Asterisk::Action.new(:pause_monitor, :action_id => data["action_id"], :channel => data["channel"])
+          when "resume-recording"
+            ami_command = Asterisk::Action.new(:unpause_monitor, :action_id => data["action_id"], :channel => data["channel"])
+          when "queue-add"
+            ami_command = Asterisk::Action.new(:queue_add, :action_id => data["action_id"], :channel => data["channel"])
+          when "queue-pause"
+            ami_command = Asterisk::Action.new(:queue_pause, :action_id => data["action_id"], :channel => data["channel"])
+          when "queue-remove"
+            ami_command = Asterisk::Action.new(:queue_remove, :action_id => data["action_id"], :channel => data["channel"])
+          when "queues"
+            ami_command = Asterisk::Action.new(:queues, :action_id => data["action_id"], :channel => data["channel"])
+          when "queue-status"
+            ami_command = Asterisk::Action.new(:queue_status, :action_id => data["action_id"], :channel => data["channel"])
+          when "get_variable"
+            ami_command = Asterisk::Action.new(:get_var, :action_id => data["action_id"], :channel => data["channel"], :variable => data["name"])
           end
-          ami_command.send(@connection)
+          puts ami_command.to_ami
+          @connection.send(ami_command)
         else
           ws.send ("No action found to execute, you must supply a command")
         end
@@ -64,9 +96,10 @@ EM.run {
       end
     }
 
-    @connection = Asterisk::Connection.new(ARGV[2], ARGV[3], ARGV[4])
+    @connection = Asterisk::Connection.new(ami_username, ami_password, ami_host)
     t = Thread.new do
       @connection.events do |data|
+        puts " ====  #{data[:event]} ==== "
         puts data.to_json
         ws.send(data.to_json)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asterisk-ami
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Stewart McKee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: titleize
@@ -42,14 +42,14 @@ dependencies:
   name: em-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Asterisk AMI integration gem