torrenter 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2ef8e3760de9d724d24826b929e2d40bcbea4be
-  data.tar.gz: 58aa8774b9ca139ec06d6c44751b48745f339147
+  metadata.gz: 992e0e356ed722f0cb7131a5029b454e6fdba9e2
+  data.tar.gz: 64ae0a3e57481d38ac75668773303d2ab601fa91
 SHA512:
-  metadata.gz: ce174384bf065513a2b487098c7430d195280c87d1ed0c9a3b1205b768b0effe4339c419710a7c99477780b6a6be12e4bafac6d41c4950393124082ade4002e6
-  data.tar.gz: 8985f1f8769bccb328fefbb122f7d024537c9958fdd6d07e89041935291c89f63f61fc487c8dc8237ee15751fb0789441b497ad435131b133fb2f64850bea53e
+  metadata.gz: bb19b53d0d740111e96941af9a02a07352979196ead79e1c34c796f42fdcec5d1aab7d6527b309f8cea84dec1513cc6b76b680f02c562f14c8993b7fa7a0353e
+  data.tar.gz: a2870db5b56bfc2a887a2530ea924671fa677e0fb26ce0b80311148bf83a29b9457a2b8282e0ec9de832bfa8b401cecd9479eacac3441dd36f7ae342072e9273

data/lib/torrenter.rb

@@ -1,9 +1,16 @@
+require 'socket'
+require 'digest/sha1'
+require 'bencode'
+require 'fileutils'
+
 require 'torrenter/message/messager'
 require 'torrenter/message/message_types'
 require 'torrenter/peer'
 require 'torrenter/reactor'
-require 'torrenter/udp'
 require 'torrenter/torrent_reader'
+require 'torrenter/http_tracker'
+require 'torrenter/udp_tracker'
+
 module Torrenter
   class Torrent
     def start(file)

data/lib/torrenter/http_tracker.rb

@@ -0,0 +1,40 @@
+module Torrenter
+  class HTTPTracker < TorrentReader
+
+    def initialize(address, stream)
+      @address = URI(address)
+      super(stream)
+    end
+
+    def connect
+      @address.query = URI.encode_www_form(tracker_params)
+      @response = 
+        begin
+          BEncode.load(Net::HTTP.get(@address))
+        rescue
+          false
+        end
+    end
+
+    def address_hashes
+      @response['peers']
+    end
+
+    def address_list
+      parse_addresses(address_hashes, address_hashes.bytesize / 6)
+    end
+
+    def tracker_params
+      {
+        :info_hash => @sha,
+        :peer_id   => PEER_ID,
+        :left      => @piece_length,
+        :pieces    => @file_list
+      }
+    end
+
+    def connected?
+      @response
+    end
+  end
+end

data/lib/torrenter/message/messager.rb

@@ -4,7 +4,6 @@ module Torrenter
   # these methods get mixed in with the Peer class as a way to help 
   # organize and parse the byte-encoded data. The intention is to shorten
   # and shrink the complexity of the Peer class.
-
   # the following methods are responsible solely for data retrieval and data transmission
 
   def send_data(msg, opts={})

data/lib/torrenter/torrent_reader.rb

@@ -1,15 +1,15 @@
-require 'socket'
-require 'digest/sha1'
-require 'bencode'
-require 'pry'
-require 'fileutils'
+
 
 
 module Torrenter
   class TorrentReader
     attr_reader :stream
     def initialize(stream)
-      @stream      = stream
+      @stream       = stream
+      @file_list    = stream['info']['files'] || stream['info']
+      @sha          = Digest::SHA1.digest(stream['info'].bencode)
+      @piece_length = stream['info']['piece length']
+      @sha_list     = stream['info']['pieces']
     end
 
     def determine_protocol
@@ -18,115 +18,51 @@ module Torrenter
                   else
                     [@stream['announce']]
                   end
-
-      @http_trackers = trackers.select { |tracker| tracker =~ /http\:\/\// }
-      @udp_trackers  = trackers.select { |tracker| tracker =~ /udp\:\/\//  }
-      # first try the http trackers...
       
-      connect_to_http_tracker if @http_trackers.size > 0
-      connect_to_udp_tracker if @peers.nil?
-      peer_list
-      establish_reactor
-
-    end
-
-    def connect_to_http_tracker
-      @uri       = URI(@http_trackers.shift)
-      @uri.query = URI.encode_www_form(peer_hash)
-      @peers     = raw_peers
-    end
-
-    def connect_to_udp_tracker
-      @udp_trackers.map! do |udp|
-        port = udp[/\d+/]
-        udp.gsub!(/udp\:\/\/|\:\d+|\/announce/, '')
-        begin
-          ip = Socket.getaddrinfo(udp, 80)[0][3]
-          udp_socket = UDPConnection.new(ip, port.to_i, sha)
-          udp_socket.connect_to_udp_host
-        rescue SocketError
-          puts 'Unuseable UDP site'
-        end
-      end
+      trackers.each do |track|
+        tracker = build_tracker(track)
 
-      while @peers.nil?
-        udp = @udp_trackers.shift
-        begin
-          @peers = udp.message_relay
-        rescue
+        tracker.connect
+        if tracker.connected?
+          @peers = tracker.address_list
+          break
         end
-
-      end
-    end
-
-
-    # url gets reformatted to include query parameters
-
-    def raw_peers
-      begin
-        BEncode.load(Net::HTTP.get(@uri))['peers']
-      rescue
-        nil
       end
-    end
-
 
-    def piece_length
-      stream['info']['piece length']
+      establish_reactor if @peers
     end
 
-    def sha
-      Digest::SHA1.digest(stream['info'].bencode)
-    end
-
-    # data stored as a hash in the order made necessary
-
-    def peer_hash
+    def peer_info
       {
-        :info_hash => sha,
-        :peer_id   => PEER_ID,
-        :left      => piece_length,
-        :pieces    => stream['info']['files'] || stream['info']['name']
+        :info_hash    => @sha,
+        :piece_length => @piece_length,
+        :sha_list     => @sha_list,
+        :piece_index  => Array.new(@sha_list.size) { false }
       }
     end
 
-    # Using the peers key of the torrent file, the hex-encoded data gets reinterpreted as ips addresses.
-
-    def peer_list
-      ip_list = []
-      until @peers.empty?
-        ip_list << { ip: @peers.slice!(0..3).bytes.join('.'), port: @peers.slice!(0..1).unpack("S>").first }
+    def parse_addresses(addr, size)
+      Array.new(size) do
+        peer = { :ip   => addr.slice!(0..3).bytes.join('.'), 
+                 :port => port(addr.slice!(0..1)) }
+        Peer.new(peer, @file_list, peer_info)
       end
-
-      @peers = ip_list.map { |peer| Peer.new(peer, file_list, peer_info) }
     end
 
-    def sha_list
-      n, e = 0, 20
-      list = []
-      until stream['info']['pieces'].bytesize < e
-        list << stream['info']['pieces'].byteslice(n...e)
-        n += 20
-        e += 20
-      end
-      list
+    def port(addr)
+      addr.unpack("S>").first
     end
 
-    def peer_info
-      {
-        :info_hash    => sha,
-        :piece_length => piece_length,
-        :sha_list     => sha_list,
-        :piece_index  => Array.new(sha_list.size) { false }
-      }
+    def build_tracker(track)
+      track.include?('http://') ? HTTPTracker.new(track, stream) : UDPTracker.new(track, stream)
     end
 
-    def file_list
-      stream['info']['files'] || stream['info']
+    def sha_pieces
+      Array.new(@sha_list.bytesize / 20) { @sha_list.slice!(0..19) }
     end
 
     def establish_reactor
-      react = Reactor.new(@peers, sha_list, piece_length, file_list)
+      react = Reactor.new(@peers, @sha_list, @piece_length, @file_list)
       begin
         react.message_reactor
       end

data/lib/torrenter/udp_tracker.rb

@@ -0,0 +1,104 @@
+module Torrenter
+  class UDPTracker < TorrentReader
+    attr_reader :socket, :response
+
+    def initialize(tracker, stream)
+      @url           = tracker[/(?<=udp\:\/\/).+(?=\:\d+)/]
+      @port          = tracker[/\d+$/].to_i
+      @socket        = UDPSocket.new
+      @connection_id = [0x41727101980].pack("Q>")
+      super(stream)
+    end
+
+    def connect
+      begin
+        @transaction_id = [rand(1000)].pack("I>")
+        @socket.connect(ip_addr, @port)
+        send_msg(connect_msg)
+        read_response
+      rescue
+        false
+      end
+    end
+
+    def send_msg(msg)
+      begin
+        @socket.send(msg, 0)
+      rescue
+        false
+      end
+    end
+
+    def connected?
+      @response
+    end
+
+    def ip_addr
+      Socket.getaddrinfo(@url, @port)[0][3]
+    end
+
+    def connect_to_udp_host
+      begin
+        @socket.connect(@ip, @port)
+        return self
+      rescue
+        false
+      end
+    end
+
+    def address_list
+
+      @connection_id = @response[-8..-1]
+      @transaction_id = [rand(10000)].pack("I>")
+      send_msg(announce_msg)
+
+      read_response
+    
+      parse_announce if @response[0..3] == action(1)
+      parse_addresses(@response, @response.size)
+    end
+
+    def parse_announce
+      if @response[4..7] == @transaction_id
+        res = @response.slice!(0..11)
+        leechers = @response.slice!(0..3).unpack("I>").first
+        seeders  = @response.slice!(0..3).unpack("I>").first
+      end
+    end
+
+    def send_message
+      begin
+        @socket.send(@msg, 0)
+      rescue
+      end
+    end
+
+    def read_response
+      begin
+        @response = @socket.recv(1028)
+      rescue Exception => e
+        e
+      end
+    end
+
+    def connect_match?
+      data[0] == (action(0) + @transaction_id + @connection_id)
+    end
+
+    def announce_input
+      @connection_id + action(1) + @transaction_id + @sha + PEER_ID
+    end
+
+    def connect_msg
+      @connection_id + action(0) + @transaction_id
+    end
+
+    def action(n)
+      [n].pack("I>")
+    end
+    
+    def announce_msg
+      @connection_id + action(1) + @transaction_id + @sha + PEER_ID + [0].pack("Q>") + [0].pack("Q>") + [0].pack("Q>") + action(0) + action(0) + action(0) + action(-1) + [@socket.addr[1]].pack(">S")
+    end
+  end
+end

data/lib/torrenter/version.rb

@@ -1,3 +1,3 @@
 module Torrenter
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torrenter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - wismer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-04-26 00:00:00.000000000 Z
 dependencies: []
 description: BitTorrent Client written in Ruby
 email:
@@ -20,12 +20,13 @@ extra_rdoc_files: []
 files:
 - bin/torrenter
 - lib/torrenter.rb
+- lib/torrenter/http_tracker.rb
 - lib/torrenter/message/message_types.rb
 - lib/torrenter/message/messager.rb
 - lib/torrenter/peer.rb
 - lib/torrenter/reactor.rb
 - lib/torrenter/torrent_reader.rb
-- lib/torrenter/udp.rb
+- lib/torrenter/udp_tracker.rb
 - lib/torrenter/version.rb
 homepage: http://wismer.github.io
 licenses:

data/lib/torrenter/udp.rb

@@ -1,89 +0,0 @@
-module Torrenter
-  class UDPConnection
-    attr_reader :sender, :response
-    def initialize(ip, port, info_hash)
-      @ip             = ip
-      @port           = port
-      @sender         = UDPSocket.new
-      @t              = rand(10000)
-      @connection_id  = [0x41727101980].pack("Q>")
-      @transaction_id = [@t].pack("I>")
-      @info_hash      = info_hash
-    end
-
-    def connect_to_udp_host
-      begin
-        @sender.connect(@ip, @port)
-        return self
-      rescue
-        false
-      end
-    end
-
-    def message_relay
-      @sender.send(connect_msg, 0)
-
-      read_response
-      
-      if @response
-        @connection_id = @response[-8..-1]
-        @transaction_id = [rand(10000)].pack("I>")
-        @sender.send(announce_msg, 0)
-      end
-
-      read_response
-      
-      if @response
-        parse_announce if @response[0..3] == action(1)
-        return @response
-      end
-    end
-
-    def parse_announce
-      if @response[4..7] == @transaction_id
-        res = @response.slice!(0..11)
-        leechers = @response.slice!(0..3).unpack("I>").first
-        seeders  = @response.slice!(0..3).unpack("I>").first
-      end
-    end
-
-    def send_message
-      begin
-        @sender.send(@msg, 0)
-      rescue
-      end
-    end
-
-    def read_response
-      begin
-        @response = @sender.recv(1028)
-      rescue Exception => e
-        e
-      end
-    end
-
-    def connect_match?
-      data[0] == (action(0) + @transaction_id + @connection_id)
-    end
-
-    def announce_input
-      @connection_id + action(1) + @transaction_id + @info_hash + PEER_ID
-    end
-
-    def connect_msg
-      @connection_id + action(0) + @transaction_id
-    end
-
-    def port
-      @sender.addr[1]
-    end
-
-    def action(n)
-      [n].pack("I>")
-    end
-    
-    def announce_msg
-      @connection_id + action(1) + @transaction_id + @info_hash + PEER_ID + [0].pack("Q>") + [0].pack("Q>") + [0].pack("Q>") + action(0) + action(0) + action(0) + action(-1) + [port].pack(">S")
-    end
-  end
-end