torckapi 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3112c8317a08948c59951be48af26276e8c2577
-  data.tar.gz: 79b61c263454d66d48be430c6d7f306e7efc86e8
+  metadata.gz: f0e78cdf84987163d2164e0eab58654e6c0825c6
+  data.tar.gz: 7516aecf37f02107ce58f5c193dfd1a9285f7289
 SHA512:
-  metadata.gz: de86e0c8f5c0587eef46b3c1aa75ec6001a02b0698da54a0bb8f72f461a014fe8b4dd3a932981704b1f55030e641c219a4a6ecf911b88afa0a071cc72189d86a
-  data.tar.gz: 66b12c835cae8252a7bb35794434e18b4505710c1c6fe1b7ee399c9ee988d3ec7f17072dab2321d8f39b8654b60e7fd706d29515d6679aed3a70e77ada54fd11
+  metadata.gz: 3c560a87c520bf0f0220fb8608e72cc0072455aeb7be1ed884d8bbb1bb285eb3e9e3f01a3d500e49ee31c99cdaeab6ed241acb6e8e035fbf9dcfe6cea265a0a6
+  data.tar.gz: 76931f6d709de866750b102a8097d7fbf2b30dbc098c419d4208cf83a10fd54dc411545cf080b8fcd371446a3653e783abd93ce333671eb180b025337a554e38

data/lib/torckapi/tracker/udp.rb

@@ -28,7 +28,7 @@ module Torckapi
         connect
         response = communicate action, data
 
-        RESPONSE_CLASSES[response[0][0..3].unpack('L>')[0]].from_udp(*args, response[0][8..-1])
+        RESPONSE_CLASSES[response[:type]].from_udp(*args, response[:data])
       end
 
       def announce_request_data info_hash, peer_id
@@ -42,39 +42,45 @@ module Torckapi
       def connect
         return if @connection_id && @communicated_at.to_i >= Time.now.to_i - CONNECTION_TIMEOUT
 
-        @connection_id = [0x41727101980].pack('Q>')
+        @connection_id = [0x041727101980].pack('Q>')
         response = communicate Connect
-        @connection_id = response[0][8..15]
+        @connection_id = response[:data]
       end
 
       def communicate action, data=nil
         @socket ||= UDPSocket.new
 
         transaction_id = SecureRandom.random_bytes(4)
-        packet = [@connection_id, [action].pack('L>'), transaction_id, data].join
-
         tries = 0
         response = nil
 
         begin
+          packet = [@connection_id, [action].pack('L>'), transaction_id, data].join
+
           Timeout::timeout(@options[:timeout], CommunicationTimeoutError) do
             @socket.send(packet, 0, @url.host, @url.port)
-            response = @socket.recvfrom(65536)
-            raise TransactionIdMismatchError if transaction_id != response[0][4..7]
-
-            response_type = response[0][0..3].unpack('L>')[0]
-            raise(MalformedResponseError, response) if !(0...RESPONSE_CLASSES.length).include?(response_type) ||
-              RESPONSE_MIN_LENGTHS[response_type] > response[0].length
+            response = parse_response @socket.recvfrom(65536), transaction_id
             @communicated_at = Time.now
           end
         rescue CommunicationTimeoutError
           retry if (tries += 1) <= @options[:tries]
         end
 
-        raise CommunicationFailedError if response.nil?
+        raise CommunicationFailedError unless response
 
         response
       end
+
+      def parse_response data, transaction_id
+        response, sender_addrinfo = data
+
+        response_type = response[0..3].unpack('L>')[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]}
+      end
     end
   end
 end

data/lib/torckapi/version.rb

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

metadata

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