torckapi 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29d24fdd398ac1eb525d2f7e549b28758503aaf8
-  data.tar.gz: 2166897e0f941f25da66e84c1c8a2fc8dd6ac9e0
+  metadata.gz: b2132ac0c587ca136fb4e0069018f02973d6d5e6
+  data.tar.gz: d72518b11c78f359da5857dfdc6491e96a636604
 SHA512:
-  metadata.gz: bc75dd6ed40fe0d9ee30cad1edb8552fb143d089856e86f26a6266ac0d91de5a5b9dd08e81f28121329bd23d8e1362b7079acfad8f2bc91f17d5d38feac46487
-  data.tar.gz: 0fb9ac7f55e5aafb757d566c57b452b74c90c49c645c3ec20904f43c9d7990cef164248a27b8e5f24d91004bade06dd7275c745fbfbfbba3f196ec7f85611fae
+  metadata.gz: cdd4f816b4e1526dc975cc8439a9e64cf17897fd1406343b5c202076bb724c38ca44e487d5a43aabe1f0158c68172b9b7df6b3caf52de1b07d6ad03b3dc7d099
+  data.tar.gz: 89779cb521dfa7e3497909e11c9713dcb7ef650d44a85e17cc318a4e820be1db8243b8960262d554757c0f3077a5734bb8fe3039cc23116683696e33d94f4ef3

data/Gemfile

@@ -1 +1,3 @@
 source 'https://rubygems.org'
+
+gem 'bencode'

data/Gemfile.lock

@@ -1,8 +1,10 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    bencode (0.8.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bencode

data/lib/torckapi/response/announce.rb

@@ -1,4 +1,5 @@
 require 'ipaddr'
+require 'bencode'
 
 module Torckapi
   module Response
@@ -19,19 +20,34 @@ module Torckapi
       # @return [Torckapi::Response::Announce] response
       def self.from_udp info_hash, data
         leechers, seeders = data[0..7].unpack('L>2')
-        peers = data[8..-1].unpack('a6' * (leechers + seeders)).map { |i| [IPAddr.ntop(i[0..3]), i[4..5].unpack('S>')[0]] }
-      
-        new info_hash, leechers, seeders, peers
+
+        new info_hash, leechers, seeders, peers_from_compact(data[8..-1], leechers + seeders)
+      end
+
+      # Construct response object from http response data
+      # @param info_hash [String] 40-char hexadecimal string
+      # @param data [String] HTTP response data (bencoded)
+      # @param compact [true, false] is peer data in compact format?
+      # @return [Torckapi::Response::Announce] response
+      def self.from_http info_hash, data, compact=true
+        bdecoded_data = BEncode.load(data)
+        leechers, seeders = bdecoded_data.values_at("incomplete", "complete")
+
+        new info_hash, leechers, seeders, peers_from_compact(bdecoded_data["peers"], [50, leechers + seeders].min)
       end
-      
+
       private
-      
+
       def initialize info_hash, leechers, seeders, peers
         @info_hash = info_hash
         @leechers = leechers
         @seeders = seeders
         @peers = peers
       end
+
+      def self.peers_from_compact data, peer_count
+        data.unpack('a6' * peer_count).map { |i| [IPAddr.ntop(i[0..3]), i[4..5].unpack('S>')[0]] }
+      end
     end
   end
 end

data/lib/torckapi/response/scrape.rb

@@ -1,11 +1,11 @@
 module Torckapi
   module Response
-    
+
     # Scrape response
     class Scrape
       # @return [Hash<String, Hash>] scrape data
       attr_reader :data
-    
+
       # Construct response object from udp response data
       # @param info_hashes [Array<String>] list of 40-char hexadecimal strings
       # @param data [String] UDP response data (omit action and transaction_id)
@@ -13,9 +13,9 @@ module Torckapi
       def self.from_udp info_hashes, data
         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
-    
+
       def initialize data
         @data = data
       end

data/lib/torckapi/tracker/base.rb

@@ -1,6 +1,6 @@
 module Torckapi
   module Tracker
-    
+
     # Public interface for torrent trackers
     class Base
       # Announce Request
@@ -16,9 +16,9 @@ module Torckapi
       def scrape info_hashes=[]
         raise Torckapi::InvalidInfohashError if [*info_hashes].any? { |i| i !~ /\A[0-9a-f]{40}\z/i }
       end
-      
+
       private
-      
+
       def initialize url, options={}
         @url = url
         @options = {timeout: 15, tries: 3}.merge(options)

data/lib/torckapi/tracker/http.rb

@@ -1,10 +1,28 @@
+require 'net/http'
 require_relative 'base'
 
 module Torckapi
   module Tracker
-    
-    # @todo implement
+
     class HTTP < Base
+
+      # (see Base#announce)
+      def announce info_hash
+        super info_hash
+
+        @url.query ||= ""
+        @url.query += "info_hash=%s&num_want=500" % URI.encode([info_hash].pack('H*'))
+
+        Torckapi::Response::Announce.from_http info_hash, Net::HTTP.get(@url)
+      end
+
+      def scrape info_hashes=[]
+        super info_hashes
+
+        raise NotImplementedError
+      end
+
+      private
     end
   end
 end

data/lib/torckapi/tracker/udp.rb

@@ -5,53 +5,47 @@ require_relative 'base'
 
 module Torckapi
   module Tracker
-    
+
     # Implementation of http://www.bittorrent.org/beps/bep_0015.html
     class UDP < Base
-      # connection_id is valid for 1 minute as per protocol
       CONNECTION_TIMEOUT = 60
-      
+
       # @see Base#announce
       def announce info_hash
         super info_hash
-        
-        data = [[info_hash].pack('H*'), SecureRandom.random_bytes(20), [0, 0, 0, 0, 0, 0, -1, 0].pack('Q>3L>4s>')].join
+
+        data = [[info_hash].pack('H*'), SecureRandom.random_bytes(20), [0, 0, 0, 0, 0, 0, -1, 0].pack('Q>3L>4S>')].join
 
         connect
         response_body = communicate(1, data)[0] # announce
 
         Torckapi::Response::Announce.from_udp info_hash, response_body[12..-1]
       end
-      
+
       def scrape info_hashes=[]
         super info_hashes
 
         data = [*info_hashes].map { |i| [i].pack('H*') }.join
-        
+
         connect
         response_body = communicate(2, data)[0] # scrape
-        
+
         Torckapi::Response::Scrape.from_udp [*info_hashes], response_body[8..-1]
       end
 
       private
 
-      def initialize *args
-        super *args
-      end
-      
       def connect
         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]
-        puts "connection_id = #{@connection_id.inspect}" if Torckapi::debug
       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
 
@@ -59,17 +53,15 @@ module Torckapi
         response = nil
         begin
           Timeout::timeout(@options[:timeout], CommunicationTimeoutError) do
-            puts "--> #{packet.inspect}" if Torckapi::debug
             @socket.send(packet, 0, @url.host, @url.port)
             response = @socket.recvfrom(65536)
-            puts "<-- #{response.inspect}" if Torckapi::debug
             raise TransactionIdMismatchError if transaction_id != response[0][4..7]
             @communicated_at = Time.now
           end
         rescue CommunicationTimeoutError
-          retry if (tries += 1) <= @options[:tries] 
+          retry if (tries += 1) <= @options[:tries]
         end
-        
+
         response
       end
     end

data/lib/torckapi/version.rb

@@ -1,3 +1,3 @@
 module Torckapi
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/torckapi.rb

@@ -7,16 +7,6 @@ require 'torckapi/response/announce'
 require 'torckapi/response/scrape'
 
 module Torckapi
-  @@debug = false
-  
-  def self.debug
-    @@debug
-  end
-  
-  def self.debug= debug
-    @@debug = !!debug
-  end
-  
   # Creates a tracker interface instance
   # @param tracker_url [String] tracker announce url
   # @param options [Hash] defaults to \\{timeout: 15, tries: 3}

data/torckapi.gemspec

@@ -16,5 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Torckapi::VERSION
 
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'minitest'  
+  gem.add_development_dependency 'minitest'
+
+  gem.add_runtime_dependency 'bencode'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: torckapi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Dennis Krupenik
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bencode
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: torrent tracker api
 email:
 - dennis@krupenik.com