Use mvar for execution_id

Author: route

lib/ferrum/frame.rb

@@ -20,8 +20,8 @@ class Frame
     def initialize(id, page, parent_id = nil)
       @id = id
       @page = page
-      @execution_id = nil
       @parent_id = parent_id
+      @execution_id = Concurrent::MVar.new
     end
 
     def state=(value)
@@ -52,25 +52,19 @@ def content=(html)
     end
     alias set_content content=
 
-    def execution_id?(execution_id)
-      @execution_id == execution_id
-    end
-
     def execution_id
-      raise NoExecutionContextError unless @execution_id
-
-      @execution_id
-    rescue NoExecutionContextError
-      @page.event.reset
-      @page.event.wait(@page.timeout) ? retry : raise
-    end
+      value = @execution_id.borrow(@page.timeout, &:itself)
+      raise NoExecutionContextError if value.instance_of?(Object)
 
-    def set_execution_id(value)
-      @execution_id ||= value
+      value
     end
 
-    def reset_execution_id
-      @execution_id = nil
+    def execution_id=(value)
+      if value.nil?
+        @execution_id.try_take!
+      else
+        @execution_id.try_put!(value)
+      end
     end
 
     def inspect

lib/ferrum/page/frames.rb

@@ -11,11 +11,13 @@ def frames
         @frames.values
       end
 
-      def frame_by(id: nil, name: nil)
+      def frame_by(id: nil, name: nil, execution_id: nil)
         if id
           @frames[id]
         elsif name
           frames.find { |f| f.name == name }
+        elsif execution_id
+          frames.find { |f| f.execution_id == execution_id }
         else
           raise ArgumentError
         end
@@ -69,37 +71,32 @@ def frames_subscribe
         end
 
         on("Runtime.executionContextCreated") do |params|
-          setting_up_main_frame = false
           context_id = params.dig("context", "id")
           frame_id = params.dig("context", "auxData", "frameId")
 
           unless @main_frame.id
             root_frame = command("Page.getFrameTree").dig("frameTree", "frame", "id")
             if frame_id == root_frame
-              setting_up_main_frame = true
               @main_frame.id = frame_id
               @frames[frame_id] = @main_frame
             end
           end
 
           frame = @frames[frame_id] || Frame.new(frame_id, self)
-          frame.set_execution_id(context_id)
-
-          # Set event because `execution_id` might raise NoExecutionContextError
-          @event.set if setting_up_main_frame
+          frame.execution_id = context_id
 
           @frames[frame_id] ||= frame
         end
 
         on("Runtime.executionContextDestroyed") do |params|
           execution_id = params["executionContextId"]
-          frame = frames.find { |f| f.execution_id?(execution_id) }
-          frame.reset_execution_id
+          frame = frame_by(execution_id: execution_id)
+          frame&.execution_id = nil
         end
 
         on("Runtime.executionContextsCleared") do
           @frames.delete_if { |_, f| !f.main? }
-          @main_frame.reset_execution_id
+          @main_frame.execution_id = nil
         end
       end