distribustream 0.3.1 → 0.4.0

data/CHANGES

@@ -1,3 +1,15 @@
+Version 0.4.0
+* Change PDTP::Client#run to take an instance of PDTP::Client::Callbacks rather
+  than the name of the class to instantiate
+
+* Register PDTP::Server's Mongrel StatusHandler before the file service handler
+  in order to prevent a potential conflict when displaying the status page.
+
+* Client / File Service HttpHandlers now check for knowledge of requested
+  URIs and return 404 if an unknown resource is requested
+
+* Client / File Service now properly handle interal exceptions
+
 Version 0.3.0
 * dsseed now factored into server.rb.  Remote seeds will not be supported until
   protocol changes can be made to support authenticating remote seeds, remote

data/distribustream.gemspec

@@ -2,8 +2,8 @@ require 'rubygems'
 
 GEMSPEC = Gem::Specification.new do |s|
   s.name = "distribustream"
-  s.version = "0.3.1"
-  s.date = "2008-11-09"
+  s.version = "0.4.0"
+  s.date = "2008-11-15"
   s.summary = "DistribuStream is a fully open peercasting system allowing on-demand or live streaming media to be delivered at a fraction of the normal cost"
   s.email = "tony@clickcaster.com"
   s.homepage = "http://distribustream.org"

data/lib/pdtp/client/http_handler.rb

@@ -66,13 +66,12 @@ module PDTP
           )
 
           @client.transfers << transfer
-          transfer.handle_header
+          return unless transfer.handle_header
+          transfer.send_completed_message transfer.hash
         rescue Exception => e
           raise e if transfer.nil?
           transfer.write_http_exception(e)
         end
-
-        transfer.send_completed_message transfer.hash
       end
 
       # Returns true if the given message refers to the given transfer  

data/lib/pdtp/client/transfer.rb

@@ -54,11 +54,8 @@ module PDTP
 
         # Takes an HTTP range and returns a ruby Range object
         def parse_http_range(string)
-          begin
-            raise "Can't parse range string: #{string}" unless string =~ /bytes=([0-9]+)-([0-9]+)/
-            (($1).to_i)..(($2).to_i)
-          rescue nil
-          end
+          raise RuntimeError, "Can't parse range string: #{string}" unless string =~ /bytes=([0-9]+)-([0-9]+)/
+          (($1).to_i)..(($2).to_i)
         end
 
         # Notify the server of transfer completion.
@@ -120,8 +117,10 @@ module PDTP
           path=@request.params["REQUEST_PATH"]
           vhost=@request.params["HTTP_HOST"]
           @url="http://"+vhost+path
+          
+          # 404 unless we know about this URL
+          return unless @file_service.get_info(@url)
 
-          return unless request.params["HTTP_RANGE"]
           @byte_range=parse_http_range(request.params["HTTP_RANGE"])
           @peer_id=@request.params["HTTP_X_PDTP_PEER_ID"]
 
@@ -132,6 +131,9 @@ module PDTP
 
           send_ask_verify_message
           @response.pending = true
+          
+          # return true meaning the URL and header info were accepted
+          true
         end
 
         # Called after receiving verification message from the server
@@ -173,9 +175,7 @@ module PDTP
           else
             raise HTTPException.new(405,"Invalid method: #{@method}")
           end
-
         end
-
       end
 
       # Implements http transfer between two peers from the connector's (client) perspective

data/lib/pdtp/common.rb

@@ -22,7 +22,7 @@
 
 # Namespace for all PDTP components
 module PDTP
-  PDTP::VERSION = '0.3.1' unless defined? PDTP::VERSION
+  PDTP::VERSION = '0.4.0' unless defined? PDTP::VERSION
   def self.version() VERSION end
 
   PDTP::DEFAULT_PORT = 6086 unless defined? PDTP::DEFAULT_PORT

data/lib/pdtp/server/dispatcher.rb

@@ -290,8 +290,9 @@ module PDTP
           )
         when "completed"
           my_id = client_info(connection).client_id
-          transfer_id=  Transfer::gen_transfer_id(
-            my_id,message["peer_id"],
+          transfer_id = Transfer::gen_transfer_id(
+            my_id,
+            message["peer_id"],
             message["url"],
             message["range"]
           )

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: distribustream
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
-date: 2008-11-09 00:00:00 -07:00
+  version: 0.4.0
+date: 2008-11-15 00:00:00 -07:00
 summary: DistribuStream is a fully open peercasting system allowing on-demand or live streaming media to be delivered at a fraction of the normal cost
 require_paths: 
 - lib