fingerprinter 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e23aed5ef3ed13d6d87ce5c9a60f8ae7c76b1af3072e5743e2d2fe97613c69a0
-  data.tar.gz: 5fdd5658a3eef4660f3c7274065e409b47e602c4a3f213c90de0bc002f052688
+  metadata.gz: 5a235ab2c1e2f911a87dd87eaa83d1b81ae974614f57ded0e9c69dd96c946b4d
+  data.tar.gz: f0b6197d8604b4b655a53cd2d7112f2f142e5048135956137518cd1011b1dcc9
 SHA512:
-  metadata.gz: 80134337a1020a483c849b4e54944531cf414a47325e8b51365f95bfebaaac8beab2b9b8e963f76a05a6cc218b57fb7c45756cfdf54bf6bba616919e7f2bab46
-  data.tar.gz: a4d1599414026b37d11628e6c84abba00c071c05857ee4ca9b833149fe3f8a81a384f6d4b0fe10f36833b8bbd0d0dfd7afd21566ca177476c71865dd5a38902b
+  metadata.gz: 4720f0b52bf5130c980d759abc42ae829dd64da3feedb3c65c67be159d55500700433ea6d27483a1ff65dd8caa7e3e4b467ca46de7f173c68969df5d2f633815
+  data.tar.gz: f9a778664a1e258ee7894daf4eb9dee52bd40b3e925b5fa6c890df8126c151fc36f979ea97486d1979f9eafdd4a0f285fa42b2029b0a6147abe840ec3b477051

data/lib/fingerprinter.rb

@@ -35,7 +35,7 @@ module Fingerprinter
         response = get_response(url)
         next unless response
 
-        url = Utilities::Urls.up_to_port(response.effective_url)
+        url = effective_url(response, url)
   
         responses = response.redirections
         responses << response
@@ -59,20 +59,47 @@ module Fingerprinter
       response = nil
       3.times do
         response = Fingerprinter.http_client.get(url, { follow_location: true })[url]
-        break if response&.code != 0 && !response.return_message.include?('Stream error')
+        break if response&.code != 0 || timeout_without_scheme?(url, response)
 
         sleep(1)
       end
-      return if response&.code&.zero?
-      return response if same_scope?(url, response)
+
+      if stream_error?(response)
+        return
+      elsif timeout_without_scheme?(url, response)
+        url = normalize_url(url)
+        return get_response(url)
+      end
+      return if response&.code == 0
+      return response if response.redirections.empty? || same_scope?(url, response)
 
       response.redirections.first
     end
 
+    def effective_url(response, url)
+      effective_url = Utilities::Urls.up_to_port(response.effective_url)
+      effective_url.nil? ? normalize_url(url) : effective_url
+    end
+
+    def normalize_url(url)
+      url.start_with?('http') ? url : "https://#{url}"
+    end
+
     def same_scope?(url, response)
-      url = "https://#{url}" unless url.start_with?('http')
+      url = normalize_url(url)
+
+      base_host = Utilities::Urls.uri_parse(url)&.host
+      response_host = Utilities::Urls.uri_parse(response&.effective_url)&.host
+
+      base_host == response_host || 'www.' + base_host == response_host
+    end
+
+    def stream_error?(response)
+      response&.code&.zero? && response.return_message.include?('Stream error')
+    end
 
-      Utilities::Urls.uri_parse(url)&.host == Utilities::Urls.uri_parse(response&.effective_url)&.host
+    def timeout_without_scheme?(url, response)
+      response&.code == 0 && !url.start_with?('http') && response.return_message.include?('Timeout was reached') 
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fingerprinter
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Joshua MARTINELLE
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-10 00:00:00.000000000 Z
+date: 2024-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby