torckapi 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0e78cdf84987163d2164e0eab58654e6c0825c6
-  data.tar.gz: 7516aecf37f02107ce58f5c193dfd1a9285f7289
+  metadata.gz: 128514fdb065b8c1127accfd9d1f34faa850abbb
+  data.tar.gz: 9ec91b782fb80a643e27a29b59d23913cbf9c5ab
 SHA512:
-  metadata.gz: 3c560a87c520bf0f0220fb8608e72cc0072455aeb7be1ed884d8bbb1bb285eb3e9e3f01a3d500e49ee31c99cdaeab6ed241acb6e8e035fbf9dcfe6cea265a0a6
-  data.tar.gz: 76931f6d709de866750b102a8097d7fbf2b30dbc098c419d4208cf83a10fd54dc411545cf080b8fcd371446a3653e783abd93ce333671eb180b025337a554e38
+  metadata.gz: 11251aa9696786eb80c58cd38e108de956363cceb110120e9b2df4f65cc7628645520088571f4c86aa446cfbc7b7f4f89588482c71841e9217279480a2de4c80
+  data.tar.gz: 236b55602c853b01eb0882c0f6852559e9378dedb79c78658c4bc08f57e7004f0647442b947ceb5b7afe24e71c2663837ea09910a72043d6929aeab8e2b85eda

data/lib/torckapi/errors.rb

@@ -10,6 +10,7 @@ module Torckapi
     CommunicationFailedError = Class.new(CommunicationError)
     CommunicationTimeoutError = Class.new(CommunicationError)
     MalformedResponseError = Class.new(Error)
+    LittleEndianResponseError = Class.new(MalformedResponseError)
     TransactionIdMismatchError = Class.new(CommunicationError)
   end
 end

data/lib/torckapi/tracker/base.rb

@@ -30,7 +30,7 @@ module Torckapi
 
       def initialize url, options={}
         @url = url
-        @options = {timeout: 15, tries: 3}.merge(options)
+        @options = {timeout: 15, tries: 7}.merge(options)
       end
     end
   end

data/lib/torckapi/tracker/http.rb

@@ -7,13 +7,13 @@ module Torckapi
     class HTTP < Base
       # (see Base#announce)
       def announce info_hash
-        super info_hash
+        super
         Torckapi::Response::Announce.from_http(info_hash, perform_request(url_for(@url.dup, Announce, info_hash)))
       end
 
       # (see Base#scrape)
       def scrape info_hashes=[]
-        super info_hashes
+        super
         Torckapi::Response::Scrape.from_http(perform_request(url_for(@url.dup, Scrape, info_hashes)))
       end
 
@@ -22,7 +22,7 @@ module Torckapi
       REQUEST_ACTIONS = [Announce = 1, Scrape = 2].freeze
 
       def initialize url, options={}
-        super url, options
+        super
         @url.query ||= ""
       end
 

data/lib/torckapi/tracker/udp.rb

@@ -8,12 +8,12 @@ module Torckapi
     # Implementation of http://www.bittorrent.org/beps/bep_0015.html
     class UDP < Base
       def announce info_hash, peer_id=SecureRandom.random_bytes(20)
-        super info_hash
+        super
         perform_request Announce, announce_request_data(info_hash, peer_id), info_hash
       end
 
       def scrape info_hashes=[]
-        super info_hashes
+        super
         perform_request Scrape, scrape_request_data(info_hashes), info_hashes
       end
 
@@ -23,12 +23,27 @@ module Torckapi
       REQUEST_ACTIONS = [Connect = 0, Announce = 1, Scrape = 2].freeze
       RESPONSE_CLASSES = [nil, Torckapi::Response::Announce, Torckapi::Response::Scrape, Torckapi::Response::Error].freeze
       RESPONSE_MIN_LENGTHS = [16, 20, 8, 8].freeze
+      RESPONSE_CODES = 0..RESPONSE_CLASSES.length
+
+      def initialize url, options={}
+        super
+        @state = nil
+        @connection_id = nil
+        @communicated_at = 0
+      end
+
+      def connected?
+        @connection_id && @communicated_at.to_i >= Time.now.to_i - CONNECTION_TIMEOUT
+      end
+
+      def connecting?
+        @state == :connecting
+      end
 
       def perform_request action, data, *args
-        connect
         response = communicate action, data
 
-        RESPONSE_CLASSES[response[:type]].from_udp(*args, response[:data])
+        RESPONSE_CLASSES[response[:code]].from_udp(*args, response[:data])
       end
 
       def announce_request_data info_hash, peer_id
@@ -40,29 +55,31 @@ module Torckapi
       end
 
       def connect
-        return if @connection_id && @communicated_at.to_i >= Time.now.to_i - CONNECTION_TIMEOUT
+        return if connected? || connecting?
 
-        @connection_id = [0x041727101980].pack('Q>')
+        @state, @connection_id = :connecting, [0x041727101980].pack('Q>')
         response = communicate Connect
-        @connection_id = response[:data]
+        @state, @connection_id = nil, response[:data]
       end
 
       def communicate action, data=nil
         @socket ||= UDPSocket.new
 
-        transaction_id = SecureRandom.random_bytes(4)
         tries = 0
         response = nil
 
         begin
+          timeout = @options[:timeout] * (2 ** tries)
+          connect
+          transaction_id = SecureRandom.random_bytes(4)
           packet = [@connection_id, [action].pack('L>'), transaction_id, data].join
 
-          Timeout::timeout(@options[:timeout], CommunicationTimeoutError) do
+          Timeout::timeout(timeout, CommunicationTimeoutError) do
             @socket.send(packet, 0, @url.host, @url.port)
             response = parse_response @socket.recvfrom(65536), transaction_id
             @communicated_at = Time.now
           end
-        rescue CommunicationTimeoutError
+        rescue CommunicationTimeoutError, LittleEndianResponseError => e
           retry if (tries += 1) <= @options[:tries]
         end
 
@@ -72,14 +89,18 @@ module Torckapi
       end
 
       def parse_response data, transaction_id
-        response, sender_addrinfo = data
-
-        response_type = response[0..3].unpack('L>')[0]
+        response = data[0]
 
         raise TransactionIdMismatchError, response.inspect if transaction_id != response[4..7]
-        raise MalformedResponseError, response.inspect if RESPONSE_MIN_LENGTHS[response_type] > response.length
 
-        {type: response_type, data: response[8..-1]}
+        response_code, response_code_le = response[0..3].unpack('L>')[0], response[0..3].unpack('L<')[0]
+
+        unless RESPONSE_CODES.include?(response_code)
+          raise (RESPONSE_CODES.include?(response_code_le) ? LittleEndianResponseError : MalformedResponseError), response.inspect
+        end
+        raise MalformedResponseError, response.inspect if RESPONSE_MIN_LENGTHS[response_code] > response.length
+
+        {code: response_code, data: response[8..-1]}
       end
     end
   end

data/lib/torckapi/version.rb

@@ -1,3 +1,3 @@
 module Torckapi
-  VERSION = "0.0.23"
+  VERSION = "0.0.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torckapi
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Dennis Krupenik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake