fix: finished? should return true only when response is fully loaded (#309)

fixes #197

Author: route

CHANGELOG.md

@@ -1,10 +1,14 @@
 ## [Unreleased](https://github.com/rubycdp/ferrum/compare/v0.13...main) ##
 
 ### Added
+- `Ferrum::Network::Exchange#xhr?` determines if the exchange is XHR
+- `Ferrum::Network::Request#xhr?` determines if the request is XHR
+- `Ferrum::Network::Response#loaded?` returns true if the response is fully loaded
 
 ### Changed
 
 ### Fixed
+- `Ferrum::Network::Exchange#finished?` returns `true` only fully loaded responses
 
 ### Removed
 

lib/ferrum/network.rb

@@ -374,8 +374,12 @@ def subscribe_response_received
 
     def subscribe_loading_finished
       @page.on("Network.loadingFinished") do |params|
-        exchange = select(params["requestId"]).last
-        exchange.response.body_size = params["encodedDataLength"] if exchange&.response
+        response = select(params["requestId"]).last&.response
+
+        if response
+          response.loaded = true
+          response.body_size = params["encodedDataLength"]
+        end
       end
     end
 

lib/ferrum/network/exchange.rb

@@ -79,7 +79,7 @@ def blocked?
       # @return [Boolean]
       #
       def finished?
-        blocked? || !response.nil? || !error.nil?
+        blocked? || response&.loaded? || !error.nil?
       end
 
       #
@@ -100,6 +100,15 @@ def intercepted?
         !intercepted_request.nil?
       end
 
+      #
+      # Determines if the exchange is XHR.
+      #
+      # @return [Boolean]
+      #
+      def xhr?
+        !!request&.xhr?
+      end
+
       #
       # Returns request's URL.
       #

lib/ferrum/network/request.rb

@@ -50,6 +50,15 @@ def type?(value)
         type.downcase == value.to_s.downcase
       end
 
+      #
+      # Determines if the request is XHR.
+      #
+      # @return [Boolean]
+      #
+      def xhr?
+        type?("xhr")
+      end
+
       #
       # The frame ID of the request.
       #

lib/ferrum/network/response.rb

@@ -18,8 +18,13 @@ class Response
       # @return [Hash{String => Object}]
       attr_reader :params
 
+      # The response is fully loaded by the browser.
       #
-      # Initializes the respones object.
+      # @return [Boolean]
+      attr_writer :loaded
+
+      #
+      # Initializes the responses object.
       #
       # @param [Page] page
       #   The page associated with the network response.
@@ -121,9 +126,8 @@ def body_size=(size)
       #
       def body
         @body ||= begin
-          body, encoded = @page
-                          .command("Network.getResponseBody", requestId: id)
-                          .values_at("body", "base64Encoded")
+          body, encoded = @page.command("Network.getResponseBody", requestId: id)
+                               .values_at("body", "base64Encoded")
           encoded ? Base64.decode64(body) : body
         end
       end
@@ -135,6 +139,13 @@ def main?
         @page.network.response == self
       end
 
+      # The response is fully loaded by the browser or not.
+      #
+      # @return [Boolean]
+      def loaded?
+        @loaded
+      end
+
       #
       # Comapres the respones ID to another response's ID.
       #