torrenter 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 126aceaca6caddcec9814075900faa9f8e5ce0e0
-  data.tar.gz: 537b792fc0b1640c9e6683acc9157e2140b5390f
+  metadata.gz: f2ef8e3760de9d724d24826b929e2d40bcbea4be
+  data.tar.gz: 58aa8774b9ca139ec06d6c44751b48745f339147
 SHA512:
-  metadata.gz: 9c8dc7755108cb35a6f9c99a8ed5f415c84a12e0f5e002f9a5b58d08aa2dff43b0b89952b26be964cfad7ee34683cf532cac1e64e9704fe05c37e0132fe49311
-  data.tar.gz: 07eae93f45408462558f941efc24be0fd3779a1982c481f819e470fa0b1bb100c0f4133a0c6167331ffc15462ac3a6235a1452204ad4a6e5fae1171d9f14a544
+  metadata.gz: ce174384bf065513a2b487098c7430d195280c87d1ed0c9a3b1205b768b0effe4339c419710a7c99477780b6a6be12e4bafac6d41c4950393124082ade4002e6
+  data.tar.gz: 8985f1f8769bccb328fefbb122f7d024537c9958fdd6d07e89041935291c89f63f61fc487c8dc8237ee15751fb0789441b497ad435131b133fb2f64850bea53e

data/lib/torrenter/message/message_types.rb

@@ -9,4 +9,5 @@ module Torrenter
   PIECE      = "\a"
   CHOKE      = "\x00"
   PROTOCOL = "\x13BitTorrent protocol\x00\x00\x00\x00\x00\x00\x00\x00"
+  EXCEPTIONS = [Errno::EADDRNOTAVAIL, Errno::ECONNREFUSED, Errno::EPIPE, Errno::ECONNRESET]
 end

data/lib/torrenter/message/messager.rb

@@ -12,35 +12,37 @@ module Torrenter
       Timeout::timeout(2) { @socket.sendmsg_nonblock(msg) }
     rescue Timeout::Error
       ''
-    rescue Errno::EADDRNOTAVAIL
-      ''
-    rescue Errno::ECONNREFUSED
-      ''
-    rescue Errno::EPIPE
+    rescue *EXCEPTIONS
+      @status = false
       ''
+    #   ''
+    # rescue Errno::ECONNREFUSED
+    #   @status = false
+    #   ''
+    # rescue Errno::EPIPE
+    #   @status = false
+    #   ''
     end
   end
 
   def recv_data(bytes=BLOCK, opts={})
     begin
-      if opts[:peek]
-        Timeout::timeout(2) { @socket.recv_nonblock(4, Socket::MSG_PEEK) }
-      else
-        Timeout::timeout(2) { buffer << @socket.recv_nonblock(bytes) }
-      end
+      Timeout::timeout(2) { buffer << @socket.recv_nonblock(bytes) }
     rescue Timeout::Error
       ''
-    rescue Errno::EADDRNOTAVAIL
-      ''
-    rescue Errno::ECONNREFUSED
-      ''
-    rescue Errno::ECONNRESET
+    rescue *EXCEPTIONS
+      @status = false
       ''
+    #   ''
+    # rescue Errno::ECONNREFUSED
+    #   ''
+    # rescue Errno::ECONNRESET
+    #   ''
     rescue IO::EAGAINWaitReadable
       ''
-    rescue Errno::ETIMEDOUT
-      @status = false
-      @buffer = ''
+    # rescue Errno::ETIMEDOUT
+    #   @status = false
+    #   @buffer = ''
     end
   end
 
@@ -61,8 +63,10 @@ module Torrenter
   def parse_bitfield
     len = msg_len
     buffer.slice!(0)
-    @piece_index = buffer.slice!(0...len).unpack("B#{sha_list.size}")
-      .first.split('')
+    @piece_index = buffer.slice!(0...len)
+      .unpack("B#{sha_list.size}")
+      .first
+      .split('')
       .map { |bit| bit == '1' ? :available : :unavailable }
   end
 
@@ -97,8 +101,10 @@ module Torrenter
     @buffer.slice!(0..3).unpack("N*").first - 1
   end
 
+  # needs optimization. It evaluates the master index lazily with 
+  # no thought as to the 'rare pieces'
+
   def evaluate_index(master)
-    @requesting = 0
     if @piece_index.any? { |chunk| chunk == :available }
       @index = @piece_index.index(:available)
       if master[@index] == :free
@@ -214,7 +220,6 @@ module Torrenter
   end
 
   def request_message(bytes=BLOCK)
-    @requesting += 1
     send_data(pack(13) + "\x06" + pack(@index) + pack(@offset) + pack(bytes))
   end
 

data/lib/torrenter/peer.rb

@@ -4,7 +4,7 @@ module Torrenter
     include Torrenter
     # for non outside vars use the @ and remove them from
 
-    attr_reader :socket, :peer, :sha_list, :piece_len, :info_hash, :status
+    attr_reader :socket, :peer, :sha_list, :piece_len, :info_hash, :status, :index
     attr_accessor :piece_index, :offset, :buffer, :block_map
 
 
@@ -32,7 +32,7 @@ module Torrenter
     def connect
       puts "\nConnecting to IP: #{peer[:ip]} PORT: #{peer[:port]}"
       begin
-        Timeout::timeout(2) { @socket = TCPSocket.new(peer[:ip], peer[:port]) }
+        Timeout::timeout(5) { @socket = TCPSocket.new(peer[:ip], peer[:port]) }
       rescue Timeout::Error
         puts "Timed out."
       rescue Errno::EADDRNOTAVAIL
@@ -44,7 +44,6 @@ module Torrenter
       end
 
       if @socket
-        emit_event
 
         @socket.write(handshake)
         @status = true
@@ -53,12 +52,6 @@ module Torrenter
       end
     end
 
-    def emit_event
-      # http = Net::HTTP.new("localhost", 9000)
-
-      # http.post("/watcher", JSON.generate(peer))
-    end
-
     def handshake
       "#{PROTOCOL}#{@info_hash}#{PEER_ID}"
     end

data/lib/torrenter/reactor.rb

@@ -22,27 +22,29 @@ module Torrenter
         data = IO.read($data_dump, @piece_length, n * @piece_length) || ''
         @master_index[n] = :downloaded if Digest::SHA1.digest(data) == @sha_list[n]
       end
-      $update = @master_index
+      $update = { index: indices }
       puts "#{@master_index.count(:downloaded)} pieces are downloaded already."
     end
 
     # sends the handshake messages.
 
-    def message_reactor(opts={})
+    def message_reactor
       modify_index
       if !@master_index.all? { |index| index == :downloaded }
-        @peers.each { |peer| peer.connect }
-        puts "You are now connected to #{active_peers} peers."
+        @peers.each { |peer| peer.connect if active_peers.size < 4 }
+        puts "You are now connected to #{active_peers.size} peers."
         loop do
           break if @master_index.all? { |piece| piece == :downloaded }
           @peers.each do |peer|
+            $update = { index: indices, peer_count: peer_data }
+
             piece_count = @master_index.count(:downloaded)
             if peer.status
               peer.state(@master_index, @blocks) # unless peer.piece_index.all? { |piece| piece == :downloaded }
               if @master_index.count(:downloaded) > piece_count
-                send_post
+                
                 system("clear")
-                puts download_bar + "Downloading from #{active_peers} active peers"
+                puts download_bar + "Downloading from #{active_peers.size} active peers"
               end
             elsif Time.now.to_i % 60 == 0
               peer.connect
@@ -56,14 +58,36 @@ module Torrenter
       end
     end
 
-    def send_post
-      $update = @master_index
-      # http = Net::HTTP.new("localhost", 4567)
-      # http.post("/filer", JSON.generate({:index => @master_index}))
+    def indices
+      @master_index.map do |piece|
+        if piece == :free
+          0
+        elsif piece == :downloaded
+          1
+        else
+          get_status @master_index.index(piece)
+        end
+      end
+    end
+
+    def peer_data
+      active_peers.map { |peer| "ip: #{peer.peer[:ip]} port:#{peer.peer[:port]}" }.join("\n")
+    end
+
+    def get_status(i)
+      peer = @peers.find { |peer| peer.piece_index[i] == :downloading }
+      (peer.buffer.bytesize + peer.piece_size).fdiv(@piece_length)
     end
 
     def active_peers
-      @peers.select { |peer| peer.status }.size
+      @peers.select { |peer| peer.index && peer.status }
+    end
+
+    def index_percentages
+      active_peers.map do |peer|
+        size = peer.buffer.bytesize + peer.piece_size
+        [peer.index, (size.fdiv @piece_length) * 100]
+      end
     end
 
     def download_bar

data/lib/torrenter/udp.rb

@@ -22,7 +22,9 @@ module Torrenter
 
     def message_relay
       @sender.send(connect_msg, 0)
+
       read_response
+      
       if @response
         @connection_id = @response[-8..-1]
         @transaction_id = [rand(10000)].pack("I>")

data/lib/torrenter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torrenter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - wismer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies: []
 description: BitTorrent Client written in Ruby
 email: