ref: Always put target to targets

lib/ferrum.rb

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

lib/ferrum/context.rb

@@ -50,17 +50,14 @@ def create_target
       target = @pendings.take(@client.timeout)
       raise NoSuchTargetError unless target.is_a?(Target)
 
-      @targets.put_if_absent(target.id, target)
       target
     end
 
     def add_target(params)
       target = Target.new(@client, params)
-      if target.window?
-        @targets.put_if_absent(target.id, target)
-      else
-        @pendings.put(target, @client.timeout)
-      end
+      @targets.put_if_absent(target.id, target)
+
+      @pendings.put(target, @client.timeout) if @pendings.empty?
     end
 
     def update_target(target_id, params)

lib/ferrum/downloads.rb

@@ -6,7 +6,7 @@ class Downloads
 
     def initialize(page)
       @page = page
-      @event = Event.new.tap(&:set)
+      @event = Utils::Event.new.tap(&:set)
       @files = {}
     end
 

lib/ferrum/page.rb

@@ -2,7 +2,6 @@
 
 require "forwardable"
 require "pathname"
-require "ferrum/event"
 require "ferrum/mouse"
 require "ferrum/keyboard"
 require "ferrum/headers"
@@ -73,7 +72,7 @@ def initialize(client, context_id:, target_id:, proxy: nil)
 
       @frames = Concurrent::Map.new
       @main_frame = Frame.new(nil, self)
-      @event = Event.new.tap(&:set)
+      @event = Utils::Event.new.tap(&:set)
       self.proxy = proxy
 
       @mouse = Mouse.new(self)

lib/ferrum/utils/elapsed_time.rb

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

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