torckapi 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8068649a0efc6fd9f1d714dd29d3b3046444c316
-  data.tar.gz: 8956d195256c27b0cd1af9459c87f739cb616895
+  metadata.gz: 2c9a7381eb1ab2a6327c590e2f536e6c37e57b08
+  data.tar.gz: 8b3eb6f625736f2189f9c1a62f0185d04bcfeb9b
 SHA512:
-  metadata.gz: d354588908b2023258217d798a614a1db970e49a95b56389f362e980e694a29b5ddf147aacebdf81f5b9aa31de0ab50b7e1fc884beefce72bedf96c6207790e7
-  data.tar.gz: ecb437764df589846cf50f2153c13404b753609da9ea587437263b052ca772037b1d944923694219d0922227a8c710975a0b016f103b593a5874c6c97775b56b
+  metadata.gz: d2b7de86de6fdd7b2041616b9b781f5a2cf74505cf6a9a1690844d409b6bc377afe8dab0053948ded9cbe73e4caaedfb4f9ff323b6b9f1b7e2b66d1e75abbfe9
+  data.tar.gz: 92faf338aa7741f54996764877c35da4f8f6910b5904cae16155e503c2a69e50b56fc8baf3365f6c520ef411f231fbf5843170aaf6d8ba0d732b27fd87eaf835

data/lib/torckapi/errors.rb

@@ -9,4 +9,9 @@ module Torckapi
     class CommunicationFailedError < CommunicationError; end
     class CommunicationTimeoutError < CommunicationError; end
   end
+
+  module Response
+    class Error < Torckapi::Error; end
+    class ArgumentError < Error; end
+  end
 end

data/lib/torckapi/response/announce.rb

@@ -19,6 +19,8 @@ module Torckapi
       # @param data [String] UDP response data (omit action and transaction_id)
       # @return [Torckapi::Response::Announce] response
       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])
       end
 

data/lib/torckapi/response/error.rb

@@ -3,22 +3,30 @@ module Torckapi
     class Error
       # @!attribute [r] info_hash
       #   @return [String] 40-char hexadecimal string
+      # @!attribute [r] info_hashes
+      #   @return [Array<String>] an array of 40-char hexadecimal strings
       # @!attribute [r] message
       #   @return [String] error description
-      attr_reader :info_hash, :message
+      attr_reader :info_hash, :info_hashes, :message
 
       # Construct response object from udp response data
       # @param info_hash [String] 40-char hexadecimal string
       # @param data [String] UDP response data (omit action and transaction_id)
       # @return [Torckapi::Response::Error] response
-      def self.from_udp info_hash, data
-        new info_hash, data
+      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 info_hashes, data
+      end
+
+      def info_hash
+        info_hashes[0]
       end
 
       private
 
-      def initialize info_hash, message
-        @info_hash = info_hash
+      def initialize info_hashes, message
+        @info_hashes = [*info_hashes]
         @message = message
       end
     end

data/lib/torckapi/response/scrape.rb

@@ -11,6 +11,8 @@ module Torckapi
       # @param data [String] UDP response data (omit action and transaction_id)
       # @return [Torckapi::Response::Scrape] response
       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)] })]
       end
 

data/lib/torckapi/tracker/udp.rb

@@ -28,13 +28,19 @@ module Torckapi
         connect
         response = communicate action, data
 
-        case response[0][0..3].unpack('L>')[0] # action
-        when 1
-          Torckapi::Response::Announce.from_udp(*args, response[0][8..-1])
-        when 2
-          Torckapi::Response::Scrape.from_udp(*args, response[0][8..-1])
-        when 3
-          Torckapi::Response::Error.from_udp(*args, response[0][8..-1])
+        begin
+          case response[0][0..3].unpack('L>')[0] # action
+          when 1
+            Torckapi::Response::Announce.from_udp(*args, response[0][8..-1])
+          when 2
+            Torckapi::Response::Scrape.from_udp(*args, response[0][8..-1])
+          when 3
+            Torckapi::Response::Error.from_udp(*args, response[0][8..-1])
+          end
+        rescue Torckapi::Response::ArgumentError => e
+          puts "Error: #{e.inspect}"
+          puts "Response: #{response.inspect}"
+          raise CommunicationFailedError
         end
       end
 

data/lib/torckapi/version.rb

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

metadata

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