torckapi 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af443d831abf10bd6fbedf125e88dc362488fa49
-  data.tar.gz: de96aca388dc814092a9d8a7a20e75c7569f1d06
+  metadata.gz: 521381cc5f7043c7b0895498adb494875ab07247
+  data.tar.gz: 0d7a63fd41723fc794232936489e56fac2fd7d87
 SHA512:
-  metadata.gz: 2f3202afa722b9ee81318bd7bb6f4bca4b3d15e6421ceacd2265b2ea542cfd634a4c5d1ec34e4689bd5dbd21ef82277aea6f16fcbab389e584467e5e38c2fe98
-  data.tar.gz: 908c4d75b6966cec35789dbd45f0db581dcc92d72ff23bec8fdaf58651089542a63abed32eca39f60d9a672b1c8eccd379fab637f48d98e80fe8abb09bebf881
+  metadata.gz: 6854a5a7625fd0b28ec785702eccb9e8a789491056f2c2ea1767f92567d30c86a11b655f4a45f18235a249037a7e902f6f1d605cc0746e610f3c992f0437d2dc
+  data.tar.gz: 8a52f192ad8183ce3795824a3c86da5235daf89c0691efa7a2acc3c189aa97aa661891ad7352ea43d3a28b8ed067fd448fa1753b9dd7880ff19880246ff08f6e

data/lib/torckapi/errors.rb

@@ -9,6 +9,8 @@ module Torckapi
     class CommunicationError < Error; end
     class CommunicationFailedError < CommunicationError; end
     class CommunicationTimeoutError < CommunicationError; end
+    class MalformedResponseError < CommunicationError; end
+    class TransactionIdMismatchError < CommunicationError; end
   end
 
   module Response

data/lib/torckapi/response/error.rb

@@ -14,7 +14,7 @@ module Torckapi
       # @param data [String] UDP response data (omit action and transaction_id)
       # @return [Torckapi::Response::Error] response
       def self.from_udp info_hashes, data
-        new info_hashes, data
+        new(info_hashes, data || "")
       end
 
       def info_hash

data/lib/torckapi/tracker/udp.rb

@@ -9,26 +9,20 @@ module Torckapi
     # Implementation of http://www.bittorrent.org/beps/bep_0015.html
     class UDP < Base
       CONNECTION_TIMEOUT = 60
-
-      # index = action (connect, announce, scrape, error)
-      # [response class, minimum response length]
-      RESPONSES = [
-        [nil, 16],
-        [Torckapi::Response::Announce, 20],
-        [Torckapi::Response::Scrape, 8],
-        [Torckapi::Response::Error, 8]
-      ].freeze
+      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
 
       # (see Base#announce)
-      def announce info_hash
+      def announce info_hash, peer_id=SecureRandom.random_bytes(20)
         super info_hash
-        perform_request 1, announce_request_data(info_hash), info_hash
+        perform_request Announce, announce_request_data(info_hash, peer_id), info_hash
       end
 
       # (see Base#scrape)
       def scrape info_hashes=[]
         super info_hashes
-        perform_request 2, scrape_request_data(info_hashes), info_hashes
+        perform_request Scrape, scrape_request_data(info_hashes), info_hashes
       end
 
       private
@@ -37,21 +31,11 @@ module Torckapi
         connect
         response = communicate action, data
 
-        raise CommunicationFailedError if response.nil?
-        action = response[0][0..3].unpack('L>')[0]
-        raise CommunicationFailedError if RESPONSES[action][1] > response[0].length
-
-        begin
-          RESPONSES[action][0].from_udp(*args, response[0][8..-1])
-        rescue Torckapi::Response::ArgumentError => e
-          $stderr.puts "Error: #{e.inspect}"
-          $stderr.puts "Response: #{response.inspect}"
-          raise CommunicationFailedError
-        end
+        RESPONSE_CLASSES[response[0][0..3].unpack('L>')[0]].from_udp(*args, response[0][8..-1])
       end
 
-      def announce_request_data info_hash
-        [[info_hash].pack('H*'), SecureRandom.random_bytes(20), [0, 0, 0, 0, 0, 0, -1, 0].pack('Q>3L>4S>')].join
+      def announce_request_data info_hash, peer_id
+        [[info_hash].pack('H*'), peer_id, [0, 0, 0, 0, 0, 0, -1, 0].pack('Q>3L>4S>')].join
       end
 
       def scrape_request_data info_hashes
@@ -62,8 +46,7 @@ module Torckapi
         return if @connection_id && @communicated_at.to_i >= Time.now.to_i - CONNECTION_TIMEOUT
 
         @connection_id = [0x41727101980].pack('Q>')
-        response = communicate 0 # connect
-        raise ConnectionFailedError if response.nil? or 16 > response[0].length
+        response = communicate Connect
         @connection_id = response[0][8..15]
       end
 
@@ -81,13 +64,15 @@ module Torckapi
             @socket.send(packet, 0, @url.host, @url.port)
             response = @socket.recvfrom(65536)
             raise TransactionIdMismatchError if transaction_id != response[0][4..7]
+            raise MalformedResponseError if RESPONSE_MIN_LENGTHS[response[0][0..3].unpack('L>')[0]] > response[0].length
             @communicated_at = Time.now
           end
         rescue CommunicationTimeoutError
           retry if (tries += 1) <= @options[:tries]
-          raise CommunicationFailedError
         end
 
+        raise CommunicationFailedError if response.nil?
+
         response
       end
     end

data/lib/torckapi/version.rb

@@ -1,3 +1,3 @@
 module Torckapi
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: torckapi
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Dennis Krupenik