playwright-ruby-client 0.6.0 → 0.6.5

data/lib/playwright/channel_owners/binding_call.rb

@@ -3,5 +3,38 @@ module Playwright
     def name
       @initializer['name']
     end
+
+    def call_async(callback)
+      Thread.new(callback) { call(callback) }
+    end
+
+    # @param callback [Proc]
+    def call(callback)
+      frame = ChannelOwners::Frame.from(@initializer['frame'])
+      # It is not desired to use PlaywrightApi.wrap directly.
+      # However it is a little difficult to define wrapper for `source` parameter in generate_api.
+      # Just a workaround...
+      source = {
+        context: PlaywrightApi.wrap(frame.page.context),
+        page: PlaywrightApi.wrap(frame.page),
+        frame: PlaywrightApi.wrap(frame),
+      }
+      args =
+        if @initializer['handle']
+          handle = ChannelOwners::ElementHandle.from(@initializer['handle'])
+          [handle]
+        else
+          @initializer['args'].map do |arg|
+            JavaScript::ValueParser.new(arg).parse
+          end
+        end
+
+      begin
+        result = PlaywrightApi.unwrap(callback.call(source, *args))
+        @channel.send_message_to_server('resolve', result: JavaScript::ValueSerializer.new(result).serialize)
+      rescue => err
+        @channel.send_message_to_server('reject', error: { error: { message: err.message, name: 'Error' }})
+      end
+    end
   end
 end

data/lib/playwright/channel_owners/browser.rb

@@ -7,7 +7,7 @@ module Playwright
     private def after_initialize
       @connected = true
       @closed_or_closing = false
-      @remote = true
+      @remote = false
 
       @contexts = Set.new
       @channel.on('close', method(:on_close))
@@ -30,36 +30,32 @@ module Playwright
       @contexts << context
       context.browser = self
       context.options = params
+      return context unless block
 
-      if block
-        begin
-          block.call(context)
-        ensure
-          context.close
-        end
-      else
-        context
+      begin
+        block.call(context)
+      ensure
+        context.close
       end
     end
 
-    def new_page(**options)
+    def new_page(**options, &block)
       context = new_context(**options)
       page = context.new_page
       page.owned_context = context
       context.owner_page = page
-      page
+
+      return page unless block
+
+      begin
+        block.call(page)
+      ensure
+        page.close
+      end
     end
 
     def close
       return if @closed_or_closing
-      if @remote
-        @contexts.each do |context|
-          context.pages.each do |page|
-            page.send(:on_close)
-          end
-          context.send(:on_close)
-        end
-      end
       @closed_or_closing = true
       @channel.send_message_to_server('close')
       nil
@@ -89,14 +85,6 @@ module Playwright
 
     private def on_close(_ = {})
       @connected = false
-      if @remote
-        @contexts.each do |context|
-          context.pages.each do |page|
-            page.send(:on_close)
-          end
-          context.send(:on_close)
-        end
-      end
       emit(Events::Browser::Disconnected, self)
       @closed_or_closing = true
     end

data/lib/playwright/channel_owners/browser_context.rb

@@ -46,6 +46,8 @@ module Playwright
           ChannelOwners::Request.from_nullable(params['page']),
         )
       })
+
+      @closed_promise = Concurrent::Promises.resolvable_future
     end
 
     private def on_page(page)
@@ -67,9 +69,9 @@ module Playwright
     end
 
     private def on_binding(binding_call)
-      func = @binding[binding_call.name]
+      func = @bindings[binding_call.name]
       if func
-        binding_call.call(func)
+        binding_call.call_async(func)
       end
     end
 
@@ -111,10 +113,17 @@ module Playwright
     end
 
     # @returns [Playwright::Page]
-    def new_page
+    def new_page(&block)
       raise 'Please use browser.new_context' if @owner_page
       resp = @channel.send_message_to_server('newPage')
-      ChannelOwners::Page.from(resp)
+      page = ChannelOwners::Page.from(resp)
+      return page unless block
+
+      begin
+        block.call(page)
+      ensure
+        page.close
+      end
     end
 
     def cookies(urls: nil)
@@ -223,15 +232,14 @@ module Playwright
     end
 
     private def on_close
-      @closed_or_closing = true
       @browser&.send(:remove_context, self)
       emit(Events::BrowserContext::Close)
+      @closed_promise.fulfill(true)
     end
 
     def close
-      return if @closed_or_closing
-      @closed_or_closing = true
       @channel.send_message_to_server('close')
+      @closed_promise.value!
       nil
     rescue => err
       raise unless safe_close_error?(err)

data/lib/playwright/channel_owners/browser_type.rb

@@ -1,5 +1,7 @@
 module Playwright
   define_channel_owner :BrowserType do
+    include Utils::PrepareBrowserContextOptions
+
     def name
       @initializer['name']
     end
@@ -11,15 +13,28 @@ module Playwright
     def launch(options, &block)
       resp = @channel.send_message_to_server('launch', options.compact)
       browser = ChannelOwners::Browser.from(resp)
+      return browser unless block
 
-      if block
-        begin
-          block.call(browser)
-        ensure
-          browser.close
-        end
-      else
-        browser
+      begin
+        block.call(browser)
+      ensure
+        browser.close
+      end
+    end
+
+    def launch_persistent_context(userDataDir, **options, &block)
+      params = options.dup
+      prepare_browser_context_options(params)
+      params['userDataDir'] = userDataDir
+
+      resp = @channel.send_message_to_server('launchPersistentContext', params.compact)
+      context = ChannelOwners::Browser.from(resp)
+      return context unless block
+
+      begin
+        block.call(context)
+      ensure
+        context.close
       end
     end
 

data/lib/playwright/channel_owners/element_handle.rb

@@ -301,19 +301,11 @@ module Playwright
       end
 
       def eval_on_selector(selector, pageFunction, arg: nil)
-        if JavaScript.function?(pageFunction)
-          JavaScript::Function.new(pageFunction, arg).eval_on_selector(@channel, selector)
-        else
-          JavaScript::Expression.new(pageFunction).eval_on_selector(@channel, selector)
-        end
+        JavaScript::Expression.new(pageFunction, arg).eval_on_selector(@channel, selector)
       end
 
       def eval_on_selector_all(selector, pageFunction, arg: nil)
-        if JavaScript.function?(pageFunction)
-          JavaScript::Function.new(pageFunction, arg).eval_on_selector_all(@channel, selector)
-        else
-          JavaScript::Expression.new(pageFunction).eval_on_selector_all(@channel, selector)
-        end
+        JavaScript::Expression.new(pageFunction, arg).eval_on_selector_all(@channel, selector)
       end
 
       def wait_for_element_state(state, timeout: nil)

data/lib/playwright/channel_owners/frame.rb

@@ -132,19 +132,11 @@ module Playwright
     end
 
     def evaluate(pageFunction, arg: nil)
-      if JavaScript.function?(pageFunction)
-        JavaScript::Function.new(pageFunction, arg).evaluate(@channel)
-      else
-        JavaScript::Expression.new(pageFunction).evaluate(@channel)
-      end
+      JavaScript::Expression.new(pageFunction, arg).evaluate(@channel)
     end
 
     def evaluate_handle(pageFunction, arg: nil)
-      if JavaScript.function?(pageFunction)
-        JavaScript::Function.new(pageFunction, arg).evaluate_handle(@channel)
-      else
-        JavaScript::Expression.new(pageFunction).evaluate_handle(@channel)
-      end
+      JavaScript::Expression.new(pageFunction, arg).evaluate_handle(@channel)
     end
 
     def query_selector(selector)
@@ -208,19 +200,11 @@ module Playwright
     end
 
     def eval_on_selector(selector, pageFunction, arg: nil)
-      if JavaScript.function?(pageFunction)
-        JavaScript::Function.new(pageFunction, arg).eval_on_selector(@channel, selector)
-      else
-        JavaScript::Expression.new(pageFunction).eval_on_selector(@channel, selector)
-      end
+      JavaScript::Expression.new(pageFunction, arg).eval_on_selector(@channel, selector)
     end
 
     def eval_on_selector_all(selector, pageFunction, arg: nil)
-      if JavaScript.function?(pageFunction)
-        JavaScript::Function.new(pageFunction, arg).eval_on_selector_all(@channel, selector)
-      else
-        JavaScript::Expression.new(pageFunction).eval_on_selector_all(@channel, selector)
-      end
+      JavaScript::Expression.new(pageFunction, arg).eval_on_selector_all(@channel, selector)
     end
 
     def content
@@ -531,14 +515,8 @@ module Playwright
         raise ArgumentError.new("Unknown polling option: #{polling}")
       end
 
-      function_or_expression =
-        if JavaScript.function?(pageFunction)
-          JavaScript::Function.new(pageFunction, arg)
-        else
-          JavaScript::Expression.new(pageFunction)
-        end
-
-      function_or_expression.wait_for_function(@channel, polling: polling, timeout: timeout)
+      expression = JavaScript::Expression.new(pageFunction, arg)
+      expression.wait_for_function(@channel, polling: polling, timeout: timeout)
     end
 
     def title

data/lib/playwright/channel_owners/js_handle.rb

@@ -14,19 +14,11 @@ module Playwright
     end
 
     def evaluate(pageFunction, arg: nil)
-      if JavaScript.function?(pageFunction)
-        JavaScript::Function.new(pageFunction, arg).evaluate(@channel)
-      else
-        JavaScript::Expression.new(pageFunction).evaluate(@channel)
-      end
+      JavaScript::Expression.new(pageFunction, arg).evaluate(@channel)
     end
 
     def evaluate_handle(pageFunction, arg: nil)
-      if JavaScript.function?(pageFunction)
-        JavaScript::Function.new(pageFunction, arg).evaluate_handle(@channel)
-      else
-        JavaScript::Expression.new(pageFunction).evaluate_handle(@channel)
-      end
+      JavaScript::Expression.new(pageFunction, arg).evaluate_handle(@channel)
     end
 
     def get_properties

data/lib/playwright/channel_owners/page.rb

@@ -30,6 +30,7 @@ module Playwright
       @frames << @main_frame
       @opener = ChannelOwners::Page.from_nullable(@initializer['opener'])
 
+      @channel.on('bindingCall', ->(params) { on_binding(ChannelOwners::BindingCall.from(params['binding'])) })
       @channel.once('close', ->(_) { on_close })
       @channel.on('console', ->(params) {
         console_message = ChannelOwners::ConsoleMessage.from(params['message'])
@@ -64,7 +65,8 @@ module Playwright
         emit(Events::Page::WebSocket, ChannelOwners::WebSocket.from(params['webSocket']))
       })
       @channel.on('worker', ->(params) {
-        on_worker(ChannelOwners::Worker.from(params['worker']))
+        worker = ChannelOwners::Worker.from(params['worker'])
+        # on_worker(worker)
       })
     end
 
@@ -100,6 +102,14 @@ module Playwright
       end
     end
 
+    private def on_binding(binding_call)
+      func = @bindings[binding_call.name]
+      if func
+        binding_call.call_async(func)
+      end
+      @browser_context.send(:on_binding, binding_call)
+    end
+
     private def on_close
       @closed = true
       @browser_context.send(:remove_page, self)
@@ -306,7 +316,7 @@ module Playwright
         timeout: timeout,
         waitUntil: waitUntil,
       }.compact
-      resp = @channel.send_message_to_server('reoad', params)
+      resp = @channel.send_message_to_server('reload', params)
       ChannelOwners::Response.from_nullable(resp)
     end
 
@@ -330,10 +340,11 @@ module Playwright
       ChannelOwners::Response.from_nullable(resp)
     end
 
-    def emulate_media(colorScheme: nil, media: nil)
+    def emulate_media(colorScheme: nil, media: nil, reducedMotion: nil)
       params = {
         colorScheme: colorScheme,
         media: media,
+        reducedMotion: reducedMotion,
       }.compact
       @channel.send_message_to_server('emulateMedia', params)
 
@@ -704,7 +715,6 @@ module Playwright
       end
 
       wait_helper.wait_for_event(self, event, predicate: predicate)
-
       block&.call
 
       wait_helper.promise.value!
@@ -734,7 +744,7 @@ module Playwright
       expect_event(Events::Page::Popup, predicate: predicate, timeout: timeout, &block)
     end
 
-    def expect_request(urlOrPredicate, timeout: nil)
+    def expect_request(urlOrPredicate, timeout: nil, &block)
       predicate =
         case urlOrPredicate
         when String, Regexp
@@ -746,10 +756,10 @@ module Playwright
           -> (_) { true }
         end
 
-      expect_event(Events::Page::Request, predicate: predicate, timeout: timeout)
+      expect_event(Events::Page::Request, predicate: predicate, timeout: timeout, &block)
     end
 
-    def expect_response(urlOrPredicate, timeout: nil)
+    def expect_response(urlOrPredicate, timeout: nil, &block)
       predicate =
         case urlOrPredicate
         when String, Regexp
@@ -761,7 +771,7 @@ module Playwright
           -> (_) { true }
         end
 
-      expect_event(Events::Page::Response, predicate: predicate, timeout: timeout)
+      expect_event(Events::Page::Response, predicate: predicate, timeout: timeout, &block)
     end
 
     # called from Frame with send(:timeout_settings)

data/lib/playwright/channel_owners/worker.rb

@@ -0,0 +1,4 @@
+module Playwright
+  define_channel_owner :Worker do
+  end
+end

data/lib/playwright/input_files.rb

@@ -1,5 +1,4 @@
 require 'base64'
-require 'mime/types'
 
 module Playwright
   class InputFiles
@@ -19,13 +18,11 @@ module Playwright
         when String
           {
             name: File.basename(file),
-            mimeType: mime_type_for(file),
             buffer: Base64.strict_encode64(File.read(file)),
           }
         when File
           {
             name: File.basename(file.path),
-            mimeType: mime_type_for(file.path),
             buffer: Base64.strict_encode64(file.read),
           }
         else
@@ -33,10 +30,5 @@ module Playwright
         end
       end
     end
-
-    private def mime_type_for(filepath)
-      mime_types = MIME::Types.type_for(filepath)
-      mime_types.first.to_s || 'application/octet-stream'
-    end
   end
 end