airplay 1.0.2 → 1.0.3

data/lib/airplay/cli/doctor.rb

@@ -0,0 +1,60 @@
+module Airplay
+  module CLI
+    class Doctor
+      DebugDevice = Struct.new(:node, :resolved) do
+        def host
+          info = Socket.getaddrinfo(resolved.target, nil, Socket::AF_INET)
+          info[0][2]
+        rescue SocketError
+          target
+        end
+      end
+
+      attr_accessor :devices
+
+      def initialize
+        @devices = []
+      end
+
+      def information
+        find_devices!
+
+        devices.each do |device|
+          puts <<-EOS.gsub!(" "*12, "")
+            Name: #{device.node.name}
+            Host: #{device.host}
+            Port: #{device.resolved.port}
+            Full Name: #{device.node.fullname}
+            Iface: #{device.node.interface_name}
+            TXT: #{device.resolved.text_record}
+
+          EOS
+        end
+      end
+
+      private
+
+      def find_devices!
+        timeout(5) do
+          DNSSD.browse!(Airplay::Browser::SEARCH) do |node|
+            try_resolving(node)
+            break unless node.flags.more_coming?
+          end
+        end
+      end
+
+      def try_resolving(node)
+        timeout(5) do
+          resolver = DNSSD::Service.new
+          resolver.resolve(node) do |resolved|
+            devices << DebugDevice.new(node, resolved)
+
+            break unless resolved.flags.more_coming?
+          end
+        end
+      end
+
+
+    end
+  end
+end

data/lib/airplay/cli/version.rb

@@ -1,5 +1,5 @@
 module Airplay
   module CLI
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/lib/airplay/configuration.rb

@@ -1,4 +1,5 @@
 require "log4r/config"
+require "celluloid/autostart"
 require "airplay/logger"
 
 # Public: Airplay core module
@@ -10,12 +11,13 @@ module Airplay
     attr_accessor :log_level, :output, :autodiscover, :host, :port
 
     def initialize
+      Celluloid.boot # Force Thread Pool initialization
       Log4r.define_levels(*Log4r::Log4rConfig::LogLevels)
 
       @log_level = Log4r::ERROR
       @autodiscover = true
       @host = "0.0.0.0"
-      @port = "1337"
+      @port = nil
       @output = Log4r::Outputter.stdout
     end
 

data/lib/airplay/connection.rb

@@ -1,4 +1,4 @@
-require "celluloid"
+require "celluloid/autostart"
 require "airplay/connection/persistent"
 require "airplay/connection/authentication"
 
@@ -7,6 +7,8 @@ module Airplay
   #
   class Connection
     Response = Struct.new(:connection, :response)
+    PasswordRequired = Class.new(StandardError)
+    WrongPassword = Class.new(StandardError)
 
     include Celluloid
 
@@ -43,11 +45,7 @@ module Airplay
     # Returns a response object
     #
     def post(resource, body = "", headers = {})
-      @logger.info("POST #{resource} with #{body.bytesize} bytes")
-      request = Net::HTTP::Post.new(resource)
-      request.body = body
-
-      send_request(request, headers)
+      prepare_request(:post, resource, body, headers)
     end
 
     # Public: Executes a PUT to a resource
@@ -59,11 +57,7 @@ module Airplay
     # Returns a response object
     #
     def put(resource, body = "", headers = {})
-      @logger.info("PUT #{resource} with #{body.bytesize} bytes")
-      request = Net::HTTP::Put.new(resource)
-      request.body = body
-
-      send_request(request, headers)
+      prepare_request(:put, resource, body, headers)
     end
 
     # Public: Executes a GET to a resource
@@ -74,14 +68,34 @@ module Airplay
     # Returns a response object
     #
     def get(resource, headers = {})
-      @logger.info("GET #{resource}")
-      request = Net::HTTP::Get.new(resource)
-
-      send_request(request, headers)
+      prepare_request(:get, resource, nil, headers)
     end
 
     private
 
+    # Private: Prepares HTTP requests for :get, :post and :put
+    #
+    # verb     - The http method/verb to use for the request
+    # resource - The resource on the currently active Device
+    # body     - The body of the action
+    # headers  - The headers of the request
+    #
+    # Returns a response object
+    #
+    def prepare_request(verb, resource, body, headers)
+      msg = "#{verb.upcase} #{resource}"
+
+      request = Net::HTTP.const_get(verb.capitalize).new(resource)
+
+      unless verb.eql?(:get)
+        request.body = body
+        msg.concat(" with #{body.bytesize} bytes")
+      end
+
+      @logger.info(msg)
+      send_request(request, headers)
+    end
+
     # Private: The defaults connection headers
     #
     # Returns the default headers
@@ -105,14 +119,29 @@ module Airplay
       request.initialize_http_header(default_headers.merge(headers))
 
       if @device.password?
-        authentication = Airplay::Connection::Authentication.new(persistent)
+        authentication = Airplay::Connection::Authentication.new(@device, persistent)
         request = authentication.sign(request)
       end
 
       @logger.info("Sending request to #{@device.address}")
       response = persistent.request(request)
 
-      Airplay::Connection::Response.new(persistent, response)
+      verify_response(Airplay::Connection::Response.new(persistent, response))
+    end
+
+    # Private: Verifies response
+    #
+    # response - The Response object
+    #
+    # Returns a response object or exception
+    #
+    def verify_response(response)
+      if response.response.status == 401
+        return PasswordRequired.new if !@device.password?
+        return WrongPassword.new    if @device.password?
+      end
+
+      response
     end
   end
 end

data/lib/airplay/connection/authentication.rb

@@ -2,7 +2,7 @@ require "net/http/digest_auth"
 
 module Airplay
   class Connection
-    class Authentication < Struct.new(:handler)
+    Authentication = Struct.new(:device, :handler) do
       def sign(request)
         auth_token = authenticate(request)
         request.add_field('Authorization', auth_token) if auth_token
@@ -12,11 +12,10 @@ module Airplay
       private
 
       def uri(request)
-        server = Airplay.active
-        path = "http://#{server.address}#{request.path}"
+        path = "http://#{device.address}#{request.path}"
         uri = URI.parse(path)
         uri.user = "Airplay"
-        uri.password = server.password
+        uri.password = device.password
 
         uri
       end

data/lib/airplay/device.rb

@@ -23,6 +23,8 @@ module Airplay
       @type     = attributes[:type]
       @password = attributes[:password]
 
+      @it_has_password = false
+
       Airplay.configuration.load
     end
 
@@ -34,6 +36,19 @@ module Airplay
       @_ip ||= address.split(":").first
     end
 
+    # Public: Sets server information based on text records
+    #
+    # Returns text records hash.
+    #
+    def text_records=(record)
+      @text_records = {
+        "model"      => record["model"],
+        "features"   => record["features"],
+        "macAddress" => record["deviceid"],
+        "srcvers"    => record["srcvers"]
+      }
+    end
+
     # Public: Sets the password for the device
     #
     # passwd - The password string
@@ -49,6 +64,7 @@ module Airplay
     # Returns boolean for the presence of a password
     #
     def password?
+      return @it_has_password if @it_has_password
       !!password && !password.empty?
     end
 
@@ -102,26 +118,30 @@ module Airplay
       @_connection = nil
     end
 
-    private
-
-    # Private: Validates the mandatory attributes for a device
+    # Public: The unique id of the device (mac address)
     #
-    # attributes - The attributes hash to be validated
+    # Returns the mac address based on basic_info or server_info
     #
-    # Returns nothing or raises a MissingAttributes if some key is missing
-    #
-    def validate_attributes(attributes)
-      if !([:name, :address] - attributes.keys).empty?
-        raise MissingAttributes.new("A :name and an :address are mandatory")
+    def id
+      @_id ||= begin
+        basic_info.fetch("macAddress", server_info["macAddress"])
       end
     end
 
+    private
+
+    def it_has_password!
+      @it_has_password = true
+    end
+
     # Private: Access the basic info of the device
     #
     # Returns a hash with the basic information
     #
     def basic_info
       @_basic_info ||= begin
+        return @text_records if @text_records
+
         response = connection.get("/server-info").response
         plist = CFPropertyList::List.new(data: response.body)
         CFPropertyList.native_types(plist.value)
@@ -133,16 +153,36 @@ module Airplay
     # Returns a hash with extra information
     #
     def extra_info
-      @_extra_info ||= begin
-        new_device = clone
-        new_device.refresh_connection
-        new_device.address = "#{ip}:7100"
+      @_extra_info ||=
+        begin
+          new_device = clone
+          new_device.refresh_connection
+          new_device.address = "#{ip}:7100"
 
-        response = new_device.connection.get("/stream.xml").response
-        return {} if response.status != 200
+          result = new_device.connection.get("/stream.xml")
+          raise result if !result.is_a?(Airplay::Connection::Response)
 
-        plist = CFPropertyList::List.new(data: response.body)
-        CFPropertyList.native_types(plist.value)
+          response = result.response
+          return {} if response.status != 200
+
+          plist = CFPropertyList::List.new(data: response.body)
+          CFPropertyList.native_types(plist.value)
+        rescue Airplay::Connection::PasswordRequired
+          it_has_password!
+
+          return {}
+        end
+    end
+
+    # Private: Validates the mandatory attributes for a device
+    #
+    # attributes - The attributes hash to be validated
+    #
+    # Returns nothing or raises a MissingAttributes if some key is missing
+    #
+    def validate_attributes(attributes)
+      if !([:name, :address] - attributes.keys).empty?
+        raise MissingAttributes.new("A :name and an :address are mandatory")
       end
     end
   end

data/lib/airplay/device/info.rb

@@ -10,7 +10,7 @@ module Airplay
       def initialize(device)
         @device = device
         @model = device.server_info["model"]
-        @os_version = device.server_info["osBuildVersion"]
+        @os_version = device.server_info["srcvers"]
         @mac_address = device.server_info["macAddress"]
       end
 

data/lib/airplay/devices.rb

@@ -42,7 +42,9 @@ module Airplay
     # Returns nothing
     #
     def add(name, address)
-      self << Device.new(name: name, address: address)
+      device = Device.new(name: name, address: address)
+      self << device
+      device
     end
 
     # Public: Adds a device to the list

data/lib/airplay/player.rb

@@ -1,7 +1,7 @@
 require "uri"
 require "forwardable"
 require "micromachine"
-require "celluloid"
+require "celluloid/autostart"
 require "cfpropertylist"
 
 require "airplay/connection"
@@ -130,7 +130,7 @@ module Airplay
     #
     def scrub
       return unless playing?
-      response = connection.get("/scrub")
+      response = connection.get("/scrub").response
       parts = response.body.split("\n")
       Hash[parts.collect { |v| v.split(": ") }]
     end
@@ -170,6 +170,14 @@ module Airplay
       connection.post("/stop")
     end
 
+    # Public: Seeks to the specified position (seconds) in the video
+    #
+    # Returns nothing
+    #
+    def seek(position)
+      connection.async.post("/scrub?position=#{position}")
+    end
+
     def loading?; state == :loading end
     def playing?; state == :playing end
     def paused?;  state == :paused  end

data/lib/airplay/server.rb

@@ -1,6 +1,6 @@
 require "rack"
 require "socket"
-require "celluloid"
+require "celluloid/autostart"
 require "reel/rack"
 
 require "airplay/logger"
@@ -10,8 +10,10 @@ module Airplay
   class Server
     include Celluloid
 
+    attr_reader :port
+
     def initialize
-      @port = Airplay.configuration.port
+      @port = Airplay.configuration.port || find_free_port
       @logger = Airplay::Logger.new("airplay::server")
       @server = Rack::Server.new(
         server: :reel,
@@ -53,9 +55,9 @@ module Airplay
     #
     # Returns a boolean with the state
     #
-    def running?
+    def running?(port = @port)
       begin
-        socket = TCPSocket.new(private_ip, @port)
+        socket = TCPSocket.new(private_ip, port)
         socket.close unless socket.nil?
         true
       rescue Errno::ECONNREFUSED, Errno::EBADF, Errno::EADDRNOTAVAIL
@@ -72,5 +74,17 @@ module Airplay
         addr.ipv4_private?
       end.ip_address
     end
+
+    # Private: Finds a free port by asking the kernel for a free one
+    #
+    # Returns a free port number
+    #
+    def find_free_port
+      socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+      socket.listen(1)
+      port = socket.local_address.ip_port
+      socket.close
+      port
+    end
   end
 end

data/lib/airplay/version.rb

@@ -1,3 +1,3 @@
 module Airplay
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end