plr-speedtest 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73d4d621364f2ead38d1d11300cbe8e31f99eb61e99cb2b240eb3dd5a9e1f805
-  data.tar.gz: 373baa9881da4b0169caa9877f4ad438ec0bebb2a0570a890c9d579d9e4e65ba
+  metadata.gz: 55d8ad59a06d925a76c6a9a5097034ff454bf0f9c60ec1d1fd3c4cc2abd70fd5
+  data.tar.gz: 96160eb37e01c31d0c0b2eabc79e521ec0795b9ca07da20acd41aef2c35ff4c1
 SHA512:
-  metadata.gz: 46fb6d63bf16d3e98b836446dae58306c652bc9abeba0f91090abec890f6d7e0de6c3e2cca7ef6977c59e8a3a8a1fee13ca4a4f76a3a999c371e1537b4cb3b43
-  data.tar.gz: 18f813f4b4333bf9da00f37add3f270c297b3a6a16ab7d980bfd1345c75a9069b44a69686c9ff849850f5cc92a8035585d8044ef2893a51e114cc34f137d7323
+  metadata.gz: 751405ec1d2fff2afdf5b742569527b95758998b4d0c64e42324cf79541ab6a56e12bd83ad963b15598cd9fcf5f928e3b9c39561875cb6e5a159e97a274ddf7e
+  data.tar.gz: 5da842bfbcde57f40acd8bd2d72b0d780f667cc94900a0ca2c7517d9f1e6549049b09859550a76bc17d6ba0bb4fc34074efb81756ea69aaa74b9219a7930d5d4

data/lib/speedtest/transfer_worker.rb

@@ -0,0 +1,44 @@
+require 'celluloid/current'
+
+module Speedtest
+  class TransferWorker
+    include Celluloid
+
+    def initialize(url, logger)
+      @url = url
+      @logger = logger
+    end
+
+    def log(msg)
+      return unless @logger
+      @logger.debug msg
+    end
+
+    def download
+      log "  downloading: #{@url}"
+      status = ThreadStatus.new(false, 0)
+
+      page = HTTParty.get(@url, timeout: 10)
+      unless page.code / 100 == 2
+        error "GET #{@url} failed with code #{page.code}"
+        status.error = true
+      end
+      status.size = page.body.length
+      status
+    end
+
+    def upload(content)
+      log "  uploading: #{@url}"
+      status = ThreadStatus.new(false, 0)
+
+      page = HTTParty.post(@url, :body => { "content" => content }, timeout: 10)
+      log "upload response body = [#{page.body}]"
+      unless page.code / 100 == 2
+        error "GET #{@url} failed with code #{page.code}"
+        status.error = true
+      end
+      status.size = page.body.split('=')[1].to_i
+      status
+    end
+  end
+end

data/lib/speedtest/version.rb

@@ -1,3 +1,3 @@
 module Speedtest
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/speedtest.rb

@@ -2,8 +2,7 @@ require 'httparty'
 
 require_relative 'speedtest/result'
 require_relative 'speedtest/geo_point'
-require_relative 'speedtest/download_worker'
-require_relative 'speedtest/upload_worker'
+require_relative 'speedtest/transfer_worker'
 require_relative 'speedtest/ring'
 
 module Speedtest
@@ -68,13 +67,17 @@ module Speedtest
       @logger.error msg if @logger
     end
 
+    def download_url(server_root)
+      "#{server_root}/speedtest/random#{@download_size}x#{@download_size}.jpg"
+    end
+
     def download
       log "\nstarting download tests:"
 
       start_time = Time.now
       futures_ring = Ring.new(@num_threads + @num_transfers_padding)
-      download_url = "#{@server_root}/speedtest/random#{@download_size}x#{@download_size}.jpg"
-      pool = DownloadWorker.pool(size: @num_threads, args: [download_url, @logger])
+      download_url = download_url(@server_root)
+      pool = TransferWorker.pool(size: @num_threads, args: [download_url, @logger])
       1.upto(@num_threads + @num_transfers_padding).each do |i|
         futures_ring.append(pool.future.download)
       end
@@ -100,6 +103,10 @@ module Speedtest
       (1.upto(size)).map { alphabet[rand(alphabet.length)] }.join
     end
 
+    def upload_url(server_root)
+      "#{server_root}/speedtest/upload.php"
+    end
+
     def upload
       log "\nstarting upload tests:"
 
@@ -108,8 +115,8 @@ module Speedtest
       start_time = Time.now
 
       futures_ring = Ring.new(@num_threads + @num_transfers_padding)
-      upload_url = "#{@server_root}/speedtest/upload.php"
-      pool = UploadWorker.pool(size: @num_threads, args: [upload_url, @logger])
+      upload_url = upload_url(@server_root)
+      pool = TransferWorker.pool(size: @num_threads, args: [upload_url, @logger])
       1.upto(@num_threads + @num_transfers_padding).each do |i|
         futures_ring.append(pool.future.upload(data))
       end
@@ -152,12 +159,30 @@ module Speedtest
         :latency => ping(x[:url]),
         :url => x[:url]
         }}.sort_by { |x| x[:latency] }
-      selected = latency_sorted_servers[0]
+
+
+      selected = latency_sorted_servers.detect { |s| validate_server_transfer(s[:url]) }
       log "Automatically selected server: #{selected[:url]} - #{selected[:latency]} ms"
 
       selected
     end
 
+    def validate_server_transfer(server_root)
+      downloader = TransferWorker.new(download_url(server_root), @logger)
+      status = downloader.download
+      raise RuntimeError if status.error
+
+      uploader = TransferWorker.new(upload_url(server_root), @logger)
+      data = randomString(('A'..'Z').to_a, @upload_size)
+      status = uploader.upload(data)
+      raise RuntimeError if status.error || status.size < @upload_size
+
+      true
+    rescue => e
+      log "Rejecting #{server_root}"
+      false
+    end
+
     def ping(server)
       times = []
       1.upto(@ping_runs) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plr-speedtest
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Pete Myron
@@ -112,11 +112,10 @@ files:
 - README.md
 - Rakefile
 - lib/speedtest.rb
-- lib/speedtest/download_worker.rb
 - lib/speedtest/geo_point.rb
 - lib/speedtest/result.rb
 - lib/speedtest/ring.rb
-- lib/speedtest/upload_worker.rb
+- lib/speedtest/transfer_worker.rb
 - lib/speedtest/version.rb
 - speedtest.gemspec
 homepage: https://github.com/petemyron/speedtest

data/lib/speedtest/download_worker.rb

@@ -1,26 +0,0 @@
-require 'celluloid/current'
-
-module Speedtest
-
-  class DownloadWorker
-    include Celluloid
-
-    def initialize(url, logger)
-      @logger = logger
-      @url = url
-    end
-
-    def download
-      @logger.debug "  downloading: #{@url}"
-      status = ThreadStatus.new(false, 0)
-
-      page = HTTParty.get(@url, timeout: 10)
-      unless page.code / 100 == 2
-        error "GET #{url} failed with code #{page.code}"
-        status.error = true
-      end
-      status.size = page.body.length
-      status
-    end
-  end
-end

data/lib/speedtest/upload_worker.rb

@@ -1,25 +0,0 @@
-require 'celluloid/current'
-
-module Speedtest
-  class UploadWorker
-    include Celluloid
-
-    def initialize(url, logger)
-      @url = url
-      @logger = logger
-    end
-
-    def upload(content)
-      status = ThreadStatus.new(false, 0)
-
-      page = HTTParty.post(@url, :body => { "content" => content }, timeout: 10)
-      @logger.debug "upload response body = [#{page.body}]"
-      unless page.code / 100 == 2
-        error "GET #{url} failed with code #{page.code}"
-        status.error = true
-      end
-      status.size = page.body.split('=')[1].to_i
-      status
-    end
-  end
-end