ferrum 0.14 → 0.15

data/lib/ferrum/target.rb

@@ -8,17 +8,21 @@ module Ferrum
     # where we enhance page class and build page ourselves.
     attr_writer :page
 
-    def initialize(browser, params = nil)
+    attr_reader :session_id, :options
+
+    def initialize(browser_client, session_id = nil, params = nil)
       @page = nil
-      @browser = browser
+      @session_id = session_id
       @params = params
+      @browser_client = browser_client
+      @options = browser_client.options
     end
 
     def update(params)
-      @params = params
+      @params.merge!(params)
     end
 
-    def attached?
+    def connected?
       !!@page
     end
 
@@ -26,9 +30,13 @@ module Ferrum
       @page ||= build_page
     end
 
+    def client
+      @client ||= build_client
+    end
+
     def build_page(**options)
       maybe_sleep_if_new_window
-      Page.new(id, @browser, **options)
+      Page.new(client, context_id: context_id, target_id: id, **options)
     end
 
     def id
@@ -63,5 +71,17 @@ module Ferrum
       # Dirty hack because new window doesn't have events at all
       sleep(NEW_WINDOW_WAIT) if window?
     end
+
+    private
+
+    def build_client
+      return @browser_client.session(session_id) if options.flatten
+
+      Client.new(ws_url, options)
+    end
+
+    def ws_url
+      @browser_client.ws_url.merge(path: "/devtools/page/#{id}")
+    end
   end
 end

data/lib/ferrum/utils/elapsed_time.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "concurrent-ruby"
-
 module Ferrum
   module Utils
     module ElapsedTime

data/lib/ferrum/utils/event.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Ferrum
+  module Utils
+    class Event < Concurrent::Event
+      def iteration
+        synchronize { @iteration }
+      end
+
+      def reset
+        synchronize do
+          @iteration += 1
+          @set = false if @set
+          @iteration
+        end
+      end
+    end
+  end
+end

data/lib/ferrum/utils/platform.rb

@@ -20,6 +20,10 @@ module Ferrum
         RbConfig::CONFIG["host_os"] =~ /darwin/
       end
 
+      def mac_arm?
+        mac? && RbConfig::CONFIG["host_cpu"] =~ /arm/
+      end
+
       def mri?
         defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby"
       end

data/lib/ferrum/utils/thread.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Ferrum
+  module Utils
+    module Thread
+      module_function
+
+      def spawn(abort_on_exception: true)
+        ::Thread.new(abort_on_exception) do |whether_abort_on_exception|
+          ::Thread.current.abort_on_exception = whether_abort_on_exception
+          ::Thread.current.report_on_exception = true if ::Thread.current.respond_to?(:report_on_exception=)
+
+          yield
+        end
+      end
+    end
+  end
+end

data/lib/ferrum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ferrum
-  VERSION = "0.14"
+  VERSION = "0.15"
 end

data/lib/ferrum.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "concurrent-ruby"
+require "ferrum/utils/event"
+require "ferrum/utils/thread"
 require "ferrum/utils/platform"
 require "ferrum/utils/elapsed_time"
 require "ferrum/utils/attempt"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ferrum
 version: !ruby/object:Gem::Version
-  version: '0.14'
+  version: '0.15'
 platform: ruby
 authors:
 - Dmitry Vorotilin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-14 00:00:00.000000000 Z
+date: 2024-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -56,22 +56,16 @@ dependencies:
   name: websocket-driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.7'
 description: Ferrum allows you to control headless Chrome browser
 email:
 - d.vorotilin@gmail.com
@@ -84,22 +78,23 @@ files:
 - lib/ferrum.rb
 - lib/ferrum/browser.rb
 - lib/ferrum/browser/binary.rb
-- lib/ferrum/browser/client.rb
 - lib/ferrum/browser/command.rb
 - lib/ferrum/browser/options.rb
 - lib/ferrum/browser/options/base.rb
 - lib/ferrum/browser/options/chrome.rb
 - lib/ferrum/browser/options/firefox.rb
 - lib/ferrum/browser/process.rb
-- lib/ferrum/browser/subscriber.rb
 - lib/ferrum/browser/version_info.rb
-- lib/ferrum/browser/web_socket.rb
 - lib/ferrum/browser/xvfb.rb
+- lib/ferrum/client.rb
+- lib/ferrum/client/subscriber.rb
+- lib/ferrum/client/web_socket.rb
 - lib/ferrum/context.rb
 - lib/ferrum/contexts.rb
 - lib/ferrum/cookies.rb
 - lib/ferrum/cookies/cookie.rb
 - lib/ferrum/dialog.rb
+- lib/ferrum/downloads.rb
 - lib/ferrum/errors.rb
 - lib/ferrum/frame.rb
 - lib/ferrum/frame/dom.rb
@@ -128,7 +123,9 @@ files:
 - lib/ferrum/target.rb
 - lib/ferrum/utils/attempt.rb
 - lib/ferrum/utils/elapsed_time.rb
+- lib/ferrum/utils/event.rb
 - lib/ferrum/utils/platform.rb
+- lib/ferrum/utils/thread.rb
 - lib/ferrum/version.rb
 homepage: https://github.com/rubycdp/ferrum
 licenses:
@@ -148,14 +145,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Ruby headless Chrome driver

data/lib/ferrum/browser/client.rb

@@ -1,103 +0,0 @@
-# frozen_string_literal: true
-
-require "ferrum/browser/subscriber"
-require "ferrum/browser/web_socket"
-
-module Ferrum
-  class Browser
-    class Client
-      INTERRUPTIONS = %w[Fetch.requestPaused Fetch.authRequired].freeze
-
-      def initialize(ws_url, connectable, logger: nil, ws_max_receive_size: nil, id_starts_with: 0)
-        @connectable = connectable
-        @command_id = id_starts_with
-        @pendings = Concurrent::Hash.new
-        @ws = WebSocket.new(ws_url, ws_max_receive_size, logger)
-        @subscriber, @interrupter = Subscriber.build(2)
-
-        @thread = Thread.new do
-          Thread.current.abort_on_exception = true
-          Thread.current.report_on_exception = true if Thread.current.respond_to?(:report_on_exception=)
-
-          loop do
-            message = @ws.messages.pop
-            break unless message
-
-            if INTERRUPTIONS.include?(message["method"])
-              @interrupter.async.call(message)
-            elsif message.key?("method")
-              @subscriber.async.call(message)
-            else
-              @pendings[message["id"]]&.set(message)
-            end
-          end
-        end
-      end
-
-      def command(method, params = {})
-        pending = Concurrent::IVar.new
-        message = build_message(method, params)
-        @pendings[message[:id]] = pending
-        @ws.send_message(message)
-        data = pending.value!(@connectable.timeout)
-        @pendings.delete(message[:id])
-
-        raise DeadBrowserError if data.nil? && @ws.messages.closed?
-        raise TimeoutError unless data
-
-        error, response = data.values_at("error", "result")
-        raise_browser_error(error) if error
-        response
-      end
-
-      def on(event, &block)
-        case event
-        when *INTERRUPTIONS
-          @interrupter.on(event, &block)
-        else
-          @subscriber.on(event, &block)
-        end
-      end
-
-      def subscribed?(event)
-        [@interrupter, @subscriber].any? { |s| s.subscribed?(event) }
-      end
-
-      def close
-        @ws.close
-        # Give a thread some time to handle a tail of messages
-        @pendings.clear
-        @thread.kill unless @thread.join(1)
-      end
-
-      private
-
-      def build_message(method, params)
-        { method: method, params: params }.merge(id: next_command_id)
-      end
-
-      def next_command_id
-        @command_id += 1
-      end
-
-      def raise_browser_error(error)
-        case error["message"]
-        # Node has disappeared while we were trying to get it
-        when "No node with given id found",
-             "Could not find node with given id",
-             "Inspected target navigated or closed"
-          raise NodeNotFoundError, error
-        # Context is lost, page is reloading
-        when "Cannot find context with specified id"
-          raise NoExecutionContextError, error
-        when "No target with given id found"
-          raise NoSuchPageError
-        when /Could not compute content quads/
-          raise CoordinatesNotFoundError
-        else
-          raise BrowserError, error
-        end
-      end
-    end
-  end
-end

data/lib/ferrum/browser/subscriber.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-module Ferrum
-  class Browser
-    class Subscriber
-      include Concurrent::Async
-
-      def self.build(size)
-        (0..size).map { new }
-      end
-
-      def initialize
-        super
-        @on = Concurrent::Hash.new { |h, k| h[k] = Concurrent::Array.new }
-      end
-
-      def on(event, &block)
-        @on[event] << block
-        true
-      end
-
-      def subscribed?(event)
-        @on.key?(event)
-      end
-
-      def call(message)
-        method, params = message.values_at("method", "params")
-        total = @on[method].size
-        @on[method].each_with_index do |block, index|
-          # In case of multiple callbacks we provide current index and total
-          block.call(params, index, total)
-        end
-      end
-    end
-  end
-end