torrenter 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 992e0e356ed722f0cb7131a5029b454e6fdba9e2
-  data.tar.gz: 64ae0a3e57481d38ac75668773303d2ab601fa91
+  metadata.gz: a3773b22bb18ac1dc0b3ccd2994889a9f21bbc84
+  data.tar.gz: cd433369ba505739ad4672dae2b5e81a8b048971
 SHA512:
-  metadata.gz: bb19b53d0d740111e96941af9a02a07352979196ead79e1c34c796f42fdcec5d1aab7d6527b309f8cea84dec1513cc6b76b680f02c562f14c8993b7fa7a0353e
-  data.tar.gz: a2870db5b56bfc2a887a2530ea924671fa677e0fb26ce0b80311148bf83a29b9457a2b8282e0ec9de832bfa8b401cecd9479eacac3441dd36f7ae342072e9273
+  metadata.gz: 0a25c88408740951f0400a2f723d5a02265a6d0a71e6af317b82913b3a58453f06bccd26af66349a8e276f25b56ca652b2ae7d1b392d98b7f4842cd9759ba233
+  data.tar.gz: 30b43deacc081ce8475a5e1ac83e058f10fdc7782a188d835e6da602438714f9e2a46b851f9d6fad83b8a84d498d84f39e62f5baa8e9c67f8e16ab5c2be77ea1

data/lib/torrenter/message/messager.rb

@@ -14,34 +14,19 @@ module Torrenter
     rescue *EXCEPTIONS
       @status = false
       ''
-    #   ''
-    # rescue Errno::ECONNREFUSED
-    #   @status = false
-    #   ''
-    # rescue Errno::EPIPE
-    #   @status = false
-    #   ''
     end
   end
 
   def recv_data(bytes=BLOCK, opts={})
     begin
-      Timeout::timeout(2) { buffer << @socket.recv_nonblock(bytes) }
+      Timeout::timeout(5) { buffer << @socket.recv_nonblock(bytes) }
     rescue Timeout::Error
       ''
     rescue *EXCEPTIONS
       @status = false
       ''
-    #   ''
-    # rescue Errno::ECONNREFUSED
-    #   ''
-    # rescue Errno::ECONNRESET
-    #   ''
     rescue IO::EAGAINWaitReadable
       ''
-    # rescue Errno::ETIMEDOUT
-    #   @status = false
-    #   @buffer = ''
     end
   end
 
@@ -131,6 +116,7 @@ module Torrenter
     elsif buffer.bytesize == 4 && buffer[0..3] == KEEP_ALIVE
       buffer.slice!(0..3)
     else
+
       # p @buffer[0..3].unp@buack("C*")
       case @buffer[4]
       when INTERESTED
@@ -144,17 +130,22 @@ module Torrenter
         parse_bitfield
         send_interested if buffer.empty?
       when PIECE
-        @length = buffer[0..3].unpack("N*").first + 4
-        if buffer.bytesize >= @length
+        @msg_length = buffer[0..3].unpack("N*").first + 4
 
+        if block_finished?
           buffer.slice!(0..12)
-          # the metadata is slireced off.
-          @offset += (@length - 13)
+
+          # the metadata is sliced off.
+
+          @offset += (@msg_length - 13)
+
           # buffer is reduced
+
           pack_buffer
           # that means the bytes for that block have been collected entirely.
           # the buffer becomes empty
           if pieces_remaining(master) > 1
+
             if piece_size == @piece_len
               pack_file(master)
               evaluate_index(master)
@@ -172,7 +163,7 @@ module Torrenter
             end
           end
         else
-          recv_data(@length - buffer.bytesize)
+          recv_data(@msg_length - buffer.bytesize)
         end
         # piece
       when CHOKE
@@ -197,7 +188,7 @@ module Torrenter
   end
 
   def pack_buffer
-    @block_map << @buffer.slice!(0...(@length - 13))
+    @block_map << @buffer.slice!(0...(@msg_length - 13))
   end
 
   def pack_file(master)
@@ -225,4 +216,12 @@ module Torrenter
   def pack(i)
     [i].pack("I>")
   end
+
+  def block_finished?
+    buffer.bytesize >= @msg_length
+  end
+
+  def piece_finished?
+    
+  end
 end

data/lib/torrenter/peer.rb

@@ -1,13 +1,10 @@
-# contains the peer information
 module Torrenter
   class Peer
     include Torrenter
-    # for non outside vars use the @ and remove them from
 
-    attr_reader :socket, :peer, :sha_list, :piece_len, :info_hash, :status, :index
+    attr_reader :socket, :peer, :sha_list, :piece_len, :info_hash, :status, :index, :msg_length
     attr_accessor :piece_index, :offset, :buffer, :block_map
 
-
     def initialize(peer, file_list, peer_info={})
       @peer            = peer
       @info_hash       = peer_info[:info_hash]
@@ -32,7 +29,7 @@ module Torrenter
     def connect
       puts "\nConnecting to IP: #{peer[:ip]} PORT: #{peer[:port]}"
       begin
-        Timeout::timeout(5) { @socket = TCPSocket.new(peer[:ip], peer[:port]) }
+        Timeout::timeout(1) { @socket = TCPSocket.new(peer[:ip], peer[:port]) }
       rescue Timeout::Error
         puts "Timed out."
       rescue Errno::EADDRNOTAVAIL
@@ -44,7 +41,7 @@ module Torrenter
       end
 
       if @socket
-
+        puts "Connected!"
         @socket.write(handshake)
         @status = true
       else

data/lib/torrenter/peer_state.rb

@@ -0,0 +1,17 @@
+module Torrenter
+
+  # The buffer state should be responsible ONLY for the handling of non-metadata bytes.
+  # the messaging behavior should and ought to remain with the peer class, though
+  # in truth, it may be better if I didnt do that. 
+
+  # So, if the state of the buffer reaches a certain step in its process involving the piece
+  # the buffer state should be fired off. 
+
+  # instead of initialiazing it with the buffer, 
+
+  class BufferState < Peer
+    def examine(buffer, msg_length)
+      binding.pry
+    end
+  end
+end

data/lib/torrenter/reactor.rb

@@ -31,31 +31,38 @@ module Torrenter
     def message_reactor
       modify_index
       if !@master_index.all? { |index| index == :downloaded }
-        @peers.each { |peer| peer.connect if active_peers.size < 4 }
+        @peers.each { |peer| peer.connect if active_peers.size < 8 }
         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
-                
                 system("clear")
                 puts download_bar + "Downloading from #{active_peers.size} active peers"
               end
-            elsif Time.now.to_i % 60 == 0
-              peer.connect
+            else
+              @peers.each { |peer| peer.connect if Time.now.to_i % 60 == 0 }
             end
           end
         end
-        stop_downloading
-        seperate_data_dump_into_files
       else
-        upload_data
+        # upload_data
       end
+      seperate_data_dump_into_files
+    end
+
+    def piece_done?(peer)
+      
+    end
+
+    def block_done?(peer)
+      
     end
 
     def indices
@@ -80,7 +87,7 @@ module Torrenter
     end
 
     def active_peers
-      @peers.select { |peer| peer.index && peer.status }
+      @peers.select { |peer| peer.status }
     end
 
     def index_percentages
@@ -122,7 +129,7 @@ module Torrenter
           offset += length
         end
       else
-        File.open("#{folder}/#{@file_list['name'].join}", 'w') { |data| data << File.read($data_dump) }
+        File.open("#{folder}/#{@file_list['name']}", 'w') { |data| data << File.read($data_dump) }
       end
       File.delete($data_dump)
     end

data/lib/torrenter/torrent_reader.rb

@@ -1,6 +1,3 @@
-
-
-
 module Torrenter
   class TorrentReader
     attr_reader :stream
@@ -10,6 +7,7 @@ module Torrenter
       @sha          = Digest::SHA1.digest(stream['info'].bencode)
       @piece_length = stream['info']['piece length']
       @sha_list     = stream['info']['pieces']
+      @sha_size     = stream['info']['pieces'].size / 20
     end
 
     def determine_protocol
@@ -23,20 +21,24 @@ module Torrenter
         tracker = build_tracker(track)
 
         tracker.connect
+        
         if tracker.connected?
           @peers = tracker.address_list
-          break
         end
+
+        break if @peers
       end
 
-      establish_reactor if @peers
+      if @peers
+        establish_reactor
+      end
     end
 
     def peer_info
       {
         :info_hash    => @sha,
         :piece_length => @piece_length,
-        :sha_list     => @sha_list,
+        :sha_list     => sha_pieces,
         :piece_index  => Array.new(@sha_list.size) { false }
       }
     end
@@ -58,14 +60,13 @@ module Torrenter
     end
 
     def sha_pieces
-      Array.new(@sha_list.bytesize / 20) { @sha_list.slice!(0..19) }
+      start, term = -20, 0
+      Array.new(@sha_size) { start += 20; term += 20; @sha_list[start...term]}
     end
 
     def establish_reactor
-      react = Reactor.new(@peers, @sha_list, @piece_length, @file_list)
-      begin
-        react.message_reactor
-      end
+      react = Reactor.new(@peers, sha_pieces, @piece_length, @file_list)
+      react.message_reactor
     end
   end
 end

data/lib/torrenter/udp_tracker.rb

@@ -37,17 +37,7 @@ module Torrenter
       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)
@@ -55,7 +45,7 @@ module Torrenter
       read_response
     
       parse_announce if @response[0..3] == action(1)
-      parse_addresses(@response, @response.size)
+      parse_addresses(@response, @response.size / 6)
     end
 
     def parse_announce

data/lib/torrenter/version.rb

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

data/lib/torrenter.rb

@@ -2,7 +2,7 @@ require 'socket'
 require 'digest/sha1'
 require 'bencode'
 require 'fileutils'
-
+require 'pry'
 require 'torrenter/message/messager'
 require 'torrenter/message/message_types'
 require 'torrenter/peer'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torrenter
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - wismer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-26 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies: []
 description: BitTorrent Client written in Ruby
 email:
@@ -24,6 +24,7 @@ files:
 - lib/torrenter/message/message_types.rb
 - lib/torrenter/message/messager.rb
 - lib/torrenter/peer.rb
+- lib/torrenter/peer_state.rb
 - lib/torrenter/reactor.rb
 - lib/torrenter/torrent_reader.rb
 - lib/torrenter/udp_tracker.rb