torckapi 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c9a7381eb1ab2a6327c590e2f536e6c37e57b08
-  data.tar.gz: 8b3eb6f625736f2189f9c1a62f0185d04bcfeb9b
+  metadata.gz: 3a0baba0c9a96c4a5d53910a0aa79c8aae7b7700
+  data.tar.gz: ab9bbfc9b647d4d86051b53f2e4f34cc81ece987
 SHA512:
-  metadata.gz: d2b7de86de6fdd7b2041616b9b781f5a2cf74505cf6a9a1690844d409b6bc377afe8dab0053948ded9cbe73e4caaedfb4f9ff323b6b9f1b7e2b66d1e75abbfe9
-  data.tar.gz: 92faf338aa7741f54996764877c35da4f8f6910b5904cae16155e503c2a69e50b56fc8baf3365f6c520ef411f231fbf5843170aaf6d8ba0d732b27fd87eaf835
+  metadata.gz: 42281cee6c47ef4a9b9bba6dd237cb21610fd2f79049b85e1d2c9fc36a8a9c320f6ebd43b05f76c884b927eae2a32774e64992586aa2d18847854db7c91ce2b5
+  data.tar.gz: 529731b856d62142d9fdddcf5c50ec48a600c3a6bb8bc3ab37bfbc428eadbc336f669e30878de2fbc2594c8624feaef68f1ef9b70a254b12f6d8db8c5ac67984

data/lib/torckapi/errors.rb

@@ -5,9 +5,12 @@ module Torckapi
   module Tracker
     class Error < Torckapi::Error; end
     class InvalidSchemeError < Error; end
+    class ConnectionFailedError < Error; end
     class CommunicationError < Error; end
-    class CommunicationFailedError < CommunicationError; end
     class CommunicationTimeoutError < CommunicationError; end
+    class CommunicationFailedError < CommunicationError; end
+    class AnnounceFailedError < CommunicationFailedError; end
+    class ScrapeFailedError < CommunicationFailedError; end
   end
 
   module Response

data/lib/torckapi/response/announce.rb

@@ -21,7 +21,7 @@ module Torckapi
       def self.from_udp info_hash, data
         raise ArgumentError, "info_hash cannot be nil" if info_hash.nil?
         raise ArgumentError, "data cannot be nil" if data.nil?
-        new info_hash, *data[4..11].unpack('L>2'), peers_from_compact(data[12..-1])
+        new info_hash, *data[4..11].unpack('L>2'), peers_from_compact(data[12..-1] || '')
       end
 
       # Construct response object from http response data
@@ -30,6 +30,8 @@ module Torckapi
       # @param compact [true, false] is peer data in compact format?
       # @return [Torckapi::Response::Announce] response
       def self.from_http info_hash, data, compact=true
+        raise ArgumentError, "info_hash cannot be nil" if info_hash.nil?
+        raise ArgumentError, "data cannot be nil" if data.nil?
         bdecoded_data = BEncode.load(data)
         new info_hash, *bdecoded_data.values_at("incomplete", "complete"), peers_from_compact(bdecoded_data["peers"])
       end
@@ -44,6 +46,7 @@ module Torckapi
       end
 
       def self.peers_from_compact data
+        # ipv4 address + tcp/udp port = 6 bytes
         data.unpack('a6' * (data.length / 6)).map { |i| [IPAddr.ntop(i[0..3]), i[4..5].unpack('S>')[0]] }
       end
     end

data/lib/torckapi/response/scrape.rb

@@ -13,7 +13,8 @@ module Torckapi
       def self.from_udp info_hashes, data
         raise ArgumentError, "info_hashes cannot be nil" if info_hashes.nil?
         raise ArgumentError, "data cannot be nil" if data.nil?
-        new Hash[info_hashes.zip(data.unpack('a12' * (info_hashes.count)).map { |i| Hash[[:seeders, :completed, :leechers].zip i.unpack('L>3').map(&:to_i)] })]
+        raise ArgumentError, "data size invalid" if data.length != info_hashes.count * 12
+        new Hash[info_hashes.zip(data.unpack('a12' * info_hashes.count).map { |i| Hash[[:seeders, :completed, :leechers].zip i.unpack('L>3').map(&:to_i)] })]
       end
 
       private

data/lib/torckapi/tracker/udp.rb

@@ -28,18 +28,23 @@ module Torckapi
         connect
         response = communicate action, data
 
+        raise CommunicationFailedError if response.nil?
+
         begin
           case response[0][0..3].unpack('L>')[0] # action
           when 1
+            raise AnnounceFailedError if 20 > response[0].length
             Torckapi::Response::Announce.from_udp(*args, response[0][8..-1])
           when 2
+            raise ScrapeFailedError if 8 > response[0].length
             Torckapi::Response::Scrape.from_udp(*args, response[0][8..-1])
           when 3
+            raise CommunicationFailedError if 8 > response[0].length
             Torckapi::Response::Error.from_udp(*args, response[0][8..-1])
           end
         rescue Torckapi::Response::ArgumentError => e
-          puts "Error: #{e.inspect}"
-          puts "Response: #{response.inspect}"
+          $stderr.puts "Error: #{e.inspect}"
+          $stderr.puts "Response: #{response.inspect}"
           raise CommunicationFailedError
         end
       end
@@ -56,8 +61,9 @@ module Torckapi
         return if @connection_id && @communicated_at.to_i >= Time.now.to_i - CONNECTION_TIMEOUT
 
         @connection_id = [0x41727101980].pack('Q>')
-        response_body = communicate(0)[0] # connect
-        @connection_id = response_body[8..15]
+        response = communicate 0 # connect
+        raise ConnectionFailedError if response.nil? or 16 > response[0].length
+        @connection_id = response[0][8..15]
       end
 
       def communicate action, data=nil
@@ -68,6 +74,7 @@ module Torckapi
 
         tries = 0
         response = nil
+
         begin
           Timeout::timeout(@options[:timeout], CommunicationTimeoutError) do
             @socket.send(packet, 0, @url.host, @url.port)
@@ -76,11 +83,8 @@ module Torckapi
             @communicated_at = Time.now
           end
         rescue CommunicationTimeoutError
-          if (tries += 1) <= @options[:tries]
-            retry
-          else
-            raise CommunicationFailedError
-          end
+          retry if (tries += 1) <= @options[:tries]
+          raise CommunicationFailedError
         end
 
         response

data/lib/torckapi/version.rb

@@ -1,3 +1,3 @@
 module Torckapi
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

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