puppeteer-ruby 0.0.10 → 0.0.15

data/lib/puppeteer/execution_context.rb

@@ -1,6 +1,6 @@
 class Puppeteer::ExecutionContext
   include Puppeteer::IfPresent
-  using Puppeteer::AsyncAwaitBehavior
+  using Puppeteer::DefineAsyncMethod
 
   EVALUATION_SCRIPT_URL = '__puppeteer_evaluation_script__'
   SOURCE_URL_REGEX = /^[\040\t]*\/\/[@#] sourceURL=\s*(\S*?)\s*$/m
@@ -16,11 +16,6 @@ class Puppeteer::ExecutionContext
 
   attr_reader :client, :world
 
-  # only used in DomWorld#delete_context
-  def _context_id
-    @context_id
-  end
-
   # @return [Puppeteer::Frame]
   def frame
     if_present(@world) do |world|

data/lib/puppeteer/frame.rb

@@ -1,4 +1,6 @@
 class Puppeteer::Frame
+  using Puppeteer::DefineAsyncMethod
+
   # @param {!FrameManager} frameManager
   # @param {!Puppeteer.CDPSession} client
   # @param {?Frame} parentFrame
@@ -33,10 +35,12 @@ class Puppeteer::Frame
 
   # @param timeout [number|nil]
   # @param wait_until [string|nil] 'load' | 'domcontentloaded' | 'networkidle0' | 'networkidle2'
-  def wait_for_navigation(timeout: nil, wait_until: nil)
+  private def wait_for_navigation(timeout: nil, wait_until: nil)
     @frame_manager.wait_for_frame_navigation(self, timeout: timeout, wait_until: wait_until)
   end
 
+  define_async_method :async_wait_for_navigation
+
   def execution_context
     @main_world.execution_context
   end
@@ -47,12 +51,16 @@ class Puppeteer::Frame
     @main_world.evaluate_handle(page_function, *args)
   end
 
+  define_async_method :async_evaluate_handle
+
   # @param {Function|string} pageFunction
   # @param {!Array<*>} args
   def evaluate(page_function, *args)
     @main_world.evaluate(page_function, *args)
   end
 
+  define_async_method :async_evaluate
+
   # `$()` in JavaScript. $ is not allowed to use as a method name in Ruby.
   # @param {string} selector
   # @return {!Promise<?Puppeteer.ElementHandle>}
@@ -60,6 +68,7 @@ class Puppeteer::Frame
     @main_world.S(selector)
   end
 
+  define_async_method :async_S
 
   # `$x()` in JavaScript. $ is not allowed to use as a method name in Ruby.
   # @param {string} expression
@@ -68,6 +77,7 @@ class Puppeteer::Frame
     @main_world.Sx(expression)
   end
 
+  define_async_method :async_Sx
 
   # `$eval()` in JavaScript. $ is not allowed to use as a method name in Ruby.
   # @param {string} selector
@@ -78,6 +88,8 @@ class Puppeteer::Frame
     @main_world.Seval(selector, page_function, *args)
   end
 
+  define_async_method :async_Seval
+
   # `$$eval()` in JavaScript. $ is not allowed to use as a method name in Ruby.
   # @param {string} selector
   # @param {Function|string} pageFunction
@@ -87,6 +99,8 @@ class Puppeteer::Frame
     @main_world.SSeval(selector, page_function, *args)
   end
 
+  define_async_method :async_SSeval
+
   # `$$()` in JavaScript. $ is not allowed to use as a method name in Ruby.
   # @param {string} selector
   # @return {!Promise<!Array<!Puppeteer.ElementHandle>>}
@@ -94,12 +108,16 @@ class Puppeteer::Frame
     @main_world.SS(selector)
   end
 
+  define_async_method :async_SS
+
+  # @return [String]
   def content
     @secondary_world.content
   end
 
-  # @param {string} html
-  # @param {!{timeout?: number, waitUntil?: string|!Array<string>}=} options
+  # @param html [String]
+  # @param timeout [Integer]
+  # @param wait_until [String|Array<String>]
   def set_content(html, timeout: nil, wait_until: nil)
     @secondary_world.set_content(html, timeout: timeout, wait_until: wait_until)
   end
@@ -151,11 +169,15 @@ class Puppeteer::Frame
     @secondary_world.click(selector, delay: delay, button: button, click_count: click_count)
   end
 
+  define_async_method :async_click
+
   # @param {string} selector
   def focus(selector)
     @secondary_world.focus(selector)
   end
 
+  define_async_method :async_focus
+
   # @param {string} selector
   def hover(selector)
     @secondary_world.hover(selector)
@@ -168,11 +190,15 @@ class Puppeteer::Frame
     @secondary_world.select(selector, *values)
   end
 
+  define_async_method :async_select
+
   # @param {string} selector
   def tap(selector)
     @secondary_world.tap(selector)
   end
 
+  define_async_method :async_tap
+
   # @param selector [String]
   # @param text [String]
   # @param delay [Number]
@@ -180,6 +206,8 @@ class Puppeteer::Frame
     @main_world.type_text(selector, text, delay: delay)
   end
 
+  define_async_method :async_type_text
+
   # /**
   #  * @param {(string|number|Function)} selectorOrFunctionOrTimeout
   #  * @param {!Object=} options
@@ -217,6 +245,8 @@ class Puppeteer::Frame
     result
   end
 
+  define_async_method :async_wait_for_selector
+
   # @param xpath [String]
   # @param visible [Boolean] Wait for element visible (not 'display: none' nor 'visibility: hidden') on true. default to false.
   # @param hidden [Boolean] Wait for element invisible ('display: none' nor 'visibility: hidden') on true. default to false.
@@ -232,6 +262,8 @@ class Puppeteer::Frame
     result
   end
 
+  define_async_method :async_wait_for_xpath
+
   # @param {Function|string} pageFunction
   # @param {!{polling?: string|number, timeout?: number}=} options
   # @param {!Array<*>} args
@@ -240,6 +272,9 @@ class Puppeteer::Frame
     @main_world.wait_for_function(page_function, options, *args)
   end
 
+  define_async_method :async_wait_for_function
+
+  # @return [String]
   def title
     @secondary_world.title
   end

data/lib/puppeteer/frame_manager.rb

@@ -4,7 +4,7 @@ class Puppeteer::FrameManager
   include Puppeteer::DebugPrint
   include Puppeteer::IfPresent
   include Puppeteer::EventCallbackable
-  using Puppeteer::AsyncAwaitBehavior
+  using Puppeteer::DefineAsyncMethod
 
   UTILITY_WORLD_NAME = '__puppeteer_utility_world__'
 
@@ -23,7 +23,6 @@ class Puppeteer::FrameManager
 
     # @type {!Map<number, !ExecutionContext>}
     @context_id_to_context = {}
-    @context_id_created = {}
 
     # @type {!Set<string>}
     @isolated_worlds = Set.new
@@ -74,9 +73,7 @@ class Puppeteer::FrameManager
     @network_manager.init
   end
 
-  async def async_init
-    init
-  end
+  define_async_method :async_init
 
   attr_reader :network_manager
 
@@ -281,7 +278,7 @@ class Puppeteer::FrameManager
   # @param url [String]
   def handle_frame_navigated_within_document(frame_id, url)
     frame = @frames[frame_id]
-    return if !frame
+    return unless frame
     frame.navigated_within_document(url)
     emit_event 'Events.FrameManager.FrameNavigatedWithinDocument', frame
     emit_event 'Events.FrameManager.FrameNavigated', frame
@@ -320,44 +317,29 @@ class Puppeteer::FrameManager
       world.context = context
     end
     @context_id_to_context[context_payload['id']] = context
-    @context_id_created[context_payload['id']] = Time.now
   end
 
   # @param {number} executionContextId
   def handle_execution_context_destroyed(execution_context_id)
     context = @context_id_to_context[execution_context_id]
-    return if !context
+    return unless context
     @context_id_to_context.delete(execution_context_id)
-    @context_id_created.delete(execution_context_id)
     if context.world
       context.world.delete_context(execution_context_id)
     end
   end
 
   def handle_execution_contexts_cleared
-    # executionContextsCleared is often notified after executionContextCreated.
-    #   D, [2020-04-06T01:47:03.101227 #13823] DEBUG -- : RECV << {"method"=>"Runtime.executionContextCreated", "params"=>{"context"=>{"id"=>5, "origin"=>"https://github.com", "name"=>"", "auxData"=>{"isDefault"=>true, "type"=>"default", "frameId"=>"71C347B70848B89DDDEFAA8AB5B0BC92"}}}, "sessionId"=>"53F088EED260C28001D26A019F95D9E3"}
-    #   D, [2020-04-06T01:47:03.101439 #13823] DEBUG -- : RECV << {"method"=>"Page.frameNavigated", "params"=>{"frame"=>{"id"=>"71C347B70848B89DDDEFAA8AB5B0BC92", "loaderId"=>"80338225D035AC96BAE8F6D4E81C7D51", "url"=>"https://github.com/search?q=puppeteer", "securityOrigin"=>"https://github.com", "mimeType"=>"text/html"}}, "sessionId"=>"53F088EED260C28001D26A019F95D9E3"}
-    #   D, [2020-04-06T01:47:03.101325 #13823] DEBUG -- : RECV << {"method"=>"Target.targetInfoChanged", "params"=>{"targetInfo"=>{"targetId"=>"71C347B70848B89DDDEFAA8AB5B0BC92", "type"=>"page", "title"=>"https://github.com/search?q=puppeteer", "url"=>"https://github.com/search?q=puppeteer", "attached"=>true, "browserContextId"=>"AF37BC660284CE1552B4ECB147BE9305"}}}
-    #   D, [2020-04-06T01:47:03.101269 #13823] DEBUG -- : RECV << {"method"=>"Runtime.executionContextsCleared", "params"=>{}, "sessionId"=>"53F088EED260C28001D26A019F95D9E3"}
-    # it unexpectedly clears the created execution context.
-    # To avoid the problem, just skip recent created ids.
-    now = Time.now
-    context_ids_to_skip = @context_id_created.select { |k, v| now - v < 1 }.keys
-    @context_id_to_context.reject { |k, v| context_ids_to_skip.include?(k) }.each do |execution_context_id, context|
+    @context_id_to_context.each do |execution_context_id, context|
       if context.world
         context.world.delete_context(execution_context_id)
       end
     end
-    @context_id_to_context.select! { |k, v| context_ids_to_skip.include?(k) }
+    @context_id_to_context.clear
   end
 
   def execution_context_by_id(context_id)
-    context = @context_id_to_context[context_id]
-    if !context
-      raise "INTERNAL ERROR: missing context with id = #{context_id}"
-    end
-    context
+    @context_id_to_context[context_id] or raise "INTERNAL ERROR: missing context with id = #{context_id}"
   end
 
   # @param {!Frame} frame

data/lib/puppeteer/js_handle.rb

@@ -1,5 +1,5 @@
 class Puppeteer::JSHandle
-  using Puppeteer::AsyncAwaitBehavior
+  using Puppeteer::DefineAsyncMethod
 
   # @param context [Puppeteer::ExecutionContext]
   # @param remote_object [Puppeteer::RemoteObject]
@@ -46,11 +46,7 @@ class Puppeteer::JSHandle
     execution_context.evaluate(page_function, self, *args)
   end
 
-  # @param page_function [String]
-  # @return [Future<Object>]
-  async def async_evaluate(page_function, *args)
-    evaluate(page_function, *args)
-  end
+  define_async_method :async_evaluate
 
   # @param page_function [String]
   # @param args {Array<*>}
@@ -59,12 +55,7 @@ class Puppeteer::JSHandle
     execution_context.evaluate_handle(page_function, self, *args)
   end
 
-  # @param page_function [String]
-  # @param args {Array<*>}
-  # @return [Future<Puppeteer::JSHandle>]
-  async def async_evaluate_handle(page_function, *args)
-    evaluate_handle(page_function, *args)
-  end
+  define_async_method :async_evaluate_handle
 
   # /**
   #  * @param {string} propertyName

data/lib/puppeteer/keyboard.rb

@@ -2,7 +2,7 @@ require_relative './keyboard/key_description'
 require_relative './keyboard/us_keyboard_layout'
 
 class Puppeteer::Keyboard
-  using Puppeteer::AsyncAwaitBehavior
+  using Puppeteer::DefineAsyncMethod
 
   # @param {!Puppeteer.CDPSession} client
   def initialize(client)
@@ -38,12 +38,7 @@ class Puppeteer::Keyboard
     @client.send_message('Input.dispatchKeyEvent', params)
   end
 
-  # @param key [String]
-  # @param text [String]
-  # @return [Future]
-  async def async_down(key, text: nil)
-    down(key, text)
-  end
+  define_async_method :async_down
 
   # @param {string} key
   # @return {number}
@@ -127,22 +122,14 @@ class Puppeteer::Keyboard
     )
   end
 
-  # @param key [String]
-  # @return [Future]
-  async def async_up(key)
-    up(key)
-  end
+  define_async_method :async_up
 
   # @param char [string]
   def send_character(char)
     @client.send_message('Input.insertText', text: char)
   end
 
-  # @param char [string]
-  # @return [Future]
-  async def async_send_character(char)
-    send_character(char)
-  end
+  define_async_method :async_send_character
 
   # @param text [String]
   # @return [Future]
@@ -159,11 +146,7 @@ class Puppeteer::Keyboard
     end
   end
 
-  # @param text [String]
-  # @return [Future]
-  async def async_type_text(text, delay: nil)
-    type_text(text, delay)
-  end
+  define_async_method :async_type_text
 
   # @param key [String]
   # @return [Future]
@@ -175,9 +158,5 @@ class Puppeteer::Keyboard
     up(key)
   end
 
-  # @param key [String]
-  # @return [Future]
-  async def async_press(key, delay: nil)
-    press(key, delay: delay)
-  end
+  define_async_method :async_press
 end

data/lib/puppeteer/launcher.rb

@@ -4,13 +4,13 @@ require_relative './launcher/chrome'
 require_relative './launcher/chrome_arg_options'
 require_relative './launcher/launch_options'
 
-# https://github.com/puppeteer/puppeteer/blob/master/lib/Launcher.js
+# https://github.com/puppeteer/puppeteer/blob/main/src/node/Launcher.ts
 module Puppeteer::Launcher
-  # @param {string} projectRoot
-  # @param {string} preferredRevision
-  # @param {boolean} isPuppeteerCore
-  # @param {string=} product
-  # @return {!Puppeteer.ProductLauncher}
+  # @param project_root [String]
+  # @param prefereed_revision [String]
+  # @param is_puppeteer_core [String]
+  # @param product [String] 'chrome' or 'firefox' (not implemented yet)
+  # @return [Puppeteer::Launcher::Chrome]
   module_function def new(project_root:, preferred_revision:, is_puppeteer_core:, product:)
     if product == 'firefox'
       raise NotImplementedError.new('FirefoxLauncher is not implemented yet.')

data/lib/puppeteer/launcher/chrome.rb

@@ -1,6 +1,6 @@
 require 'tmpdir'
 
-# https://github.com/puppeteer/puppeteer/blob/master/lib/Launcher.js
+# https://github.com/puppeteer/puppeteer/blob/main/src/node/Launcher.ts
 module Puppeteer::Launcher
   class Chrome < Base
     # @param {!(Launcher.LaunchOptions & Launcher.ChromeArgOptions & Launcher.BrowserOptions)=} options
@@ -139,6 +139,7 @@ module Puppeteer::Launcher
       end
     end
 
+    # @return [DefaultArgs]
     def default_args(options = nil)
       if options.nil?
         @default_args ||= DefaultArgs.new(@chrome_arg_options)
@@ -147,8 +148,7 @@ module Puppeteer::Launcher
       end
     end
 
-    # @param {!(Launcher.BrowserOptions & {browserWSEndpoint?: string, browserURL?: string, transport?: !Puppeteer.ConnectionTransport})} options
-    # @return {!Promise<!Browser>}
+    # @return [Puppeteer::Browser]
     def connect(options = {})
       @browser_options = BrowserOptions.new(options)
       browser_ws_endpoint = options[:browser_ws_endpoint]
@@ -187,11 +187,13 @@ module Puppeteer::Launcher
 
     # @return [Puppeteer::Connection]
     private def connect_with_browser_url(browser_url)
-      raise NotImplementedError.new('Puppeteer#connect with browserUrl is not implemented yet.')
-      # const connectionURL = await getWSEndpoint(browserURL);
-      # const connectionTransport = await WebSocketTransport.create(
-      #   connectionURL
-      # );
+      require 'net/http'
+      uri = URI(browser_url)
+      uri.path = '/json/version'
+      response_body = Net::HTTP.get(uri)
+      json = JSON.parse(response_body)
+      connection_url = json['webSocketDebuggerUrl']
+      connect_with_browser_ws_endpoint(connection_url)
     end
 
     # @return [Puppeteer::Connection]

data/lib/puppeteer/mouse.rb

@@ -1,5 +1,5 @@
 class Puppeteer::Mouse
-  using Puppeteer::AsyncAwaitBehavior
+  using Puppeteer::DefineAsyncMethod
 
   module Button
     NONE = 'none'
@@ -44,13 +44,7 @@ class Puppeteer::Mouse
     end
   end
 
-  # @param x [number]
-  # @param y [number]
-  # @param steps [number]
-  # @return [Future]
-  async def async_move(x, y, steps: nil)
-    move(x, y, steps: steps)
-  end
+  define_async_method :async_move
 
   # @param x [number]
   # @param y [number]
@@ -61,27 +55,16 @@ class Puppeteer::Mouse
     # D, [2020-04-15T17:09:47.898422 #88683] DEBUG -- : SEND >> {"sessionId":"0B09EA5E18DEE403E525B3E7FCD7E225","method":"Input.dispatchMouseEvent","params":{"type":"mouseReleased","button":"left","x":0,"y":0,"modifiers":0,"clickCount":1},"id":24}
     # D, [2020-04-15T17:09:47.899711 #88683] DEBUG -- : SEND >> {"sessionId":"0B09EA5E18DEE403E525B3E7FCD7E225","method":"Input.dispatchMouseEvent","params":{"type":"mousePressed","button":"left","x":0,"y":0,"modifiers":0,"clickCount":1},"id":25}
     # D, [2020-04-15T17:09:47.900237 #88683] DEBUG -- : SEND >> {"sessionId":"0B09EA5E18DEE403E525B3E7FCD7E225","method":"Input.dispatchMouseEvent","params":{"type":"mouseMoved","button":"left","x":187,"y":283,"modifiers":0},"id":26}
-    # So we execute move in advance.
+    # So we execute them sequential
     move(x, y)
+    down(button: button, click_count: click_count)
     if delay
-      down(button: button, click_count: click_count)
       sleep(delay / 1000.0)
-      up(button: button, click_count: click_count)
-    else
-      await_all(
-        async_down(button: button, click_count: click_count),
-        async_up(button: button, click_count: click_count),
-      )
     end
+    up(button: button, click_count: click_count)
   end
 
-  # @param x [number]
-  # @param y [number]
-  # @param {!{delay?: number, button?: "left"|"right"|"middle", clickCount?: number}=} options
-  # @return [Future]
-  async def async_click(x, y, delay: nil, button: nil, click_count: nil)
-    click(x, y, delay: delay, button: button, click_count: click_count)
-  end
+  define_async_method :async_click
 
   # @param {!{button?: "left"|"right"|"middle", clickCount?: number}=} options
   def down(button: nil, click_count: nil)
@@ -96,11 +79,7 @@ class Puppeteer::Mouse
     )
   end
 
-  # @param {!{button?: "left"|"right"|"middle", clickCount?: number}=} options
-  # @return [Future]
-  async def async_down(button: nil, click_count: nil)
-    down(button: button, click_count: click_count)
-  end
+  define_async_method :async_down
 
   # @param {!{button?: "left"|"right"|"middle", clickCount?: number}=} options
   def up(button: nil, click_count: nil)
@@ -115,9 +94,5 @@ class Puppeteer::Mouse
     )
   end
 
-  # @param {!{button?: "left"|"right"|"middle", clickCount?: number}=} options
-  # @return [Future]
-  async def async_up(button: nil, click_count: nil)
-    up(button: button, click_count: click_count)
-  end
+  define_async_method :async_up
 end