playwright-ruby-client 1.28.0 → 1.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d96f4cf4c170f020d8b73571e23f61e994e535708759b0148aec799110f3d72
-  data.tar.gz: cc6471e1da4e8f02d8b98b960a84feb67251bafd7781dec9c0d103385474f098
+  metadata.gz: f6b579547c4cff2fbaf98b5c2796c8689f655f316b391b7127891fd03212cea4
+  data.tar.gz: c32a3787fa3f6c2e874844f94deef249c335cee4f6efcc8d23e8045bfd6346f1
 SHA512:
-  metadata.gz: 953724a4d98d278b2bcd63a580f433b1defb630534023ae2c3c2df426ef4717a89c6c0e546fb76df5df7ae0b16cfd01d494be36c277d890f1774d65551932fdc
-  data.tar.gz: 92be169ac6c6adeac4ac7346df21dd929de1021e38f99f01eba73a74c4327d0436b97e6ea074560f49520eada9a6cd29f399ae144a7baa93fd64cec1c63c9cd4
+  metadata.gz: 7481f324212879e913399614beab51affce2c8dc05040ac0d506d9b583fcf48c897bd1a1f3b7f332212497db2000e538a1cf1fd19c60d5ddf7c884e2e366d687
+  data.tar.gz: 58eb07d5abb6307bd15464b6f33d8c0d0cc4110cf80c26915cecc00be911fba8e6240687cb46698c81fda29651718b4039f8ca1530661e5ccd4a7d1632bd6ef3

data/lib/playwright/channel_owners/android.rb

@@ -4,8 +4,8 @@ module Playwright
       @timeout_settings = TimeoutSettings.new
     end
 
-    def devices(port: nil)
-      params = { port: port }.compact
+    def devices(host: nil, omitDriverInstall: nil, port: nil)
+      params = { host: host, port: port, omitDriverInstall: omitDriverInstall }.compact
       resp = @channel.send_message_to_server('devices', params)
       resp.map { |device| ChannelOwners::AndroidDevice.from(device) }
     end

data/lib/playwright/channel_owners/android_device.rb

@@ -4,6 +4,11 @@ module Playwright
 
     private def after_initialize
       @input = AndroidInputImpl.new(@channel)
+      @should_close_connection_on_close = false
+    end
+
+    def should_close_connection_on_close!
+      @should_close_connection_on_close = true
     end
 
     attr_reader :input
@@ -77,8 +82,12 @@ module Playwright
     end
 
     def close
-      @channel.send_message_to_server('close')
       emit(Events::AndroidDevice::Close)
+      if @should_close_connection_on_close
+        @connection.stop
+      else
+        @channel.send_message_to_server('close')
+      end
     end
 
     def shell(command)
@@ -86,60 +95,10 @@ module Playwright
       Base64.strict_decode64(resp)
     end
 
-    def launch_browser(
-          pkg: nil,
-          acceptDownloads: nil,
-          bypassCSP: nil,
-          colorScheme: nil,
-          deviceScaleFactor: nil,
-          extraHTTPHeaders: nil,
-          geolocation: nil,
-          hasTouch: nil,
-          httpCredentials: nil,
-          ignoreHTTPSErrors: nil,
-          isMobile: nil,
-          javaScriptEnabled: nil,
-          locale: nil,
-          noViewport: nil,
-          offline: nil,
-          permissions: nil,
-          proxy: nil,
-          record_har_omit_content: nil,
-          record_har_path: nil,
-          record_video_dir: nil,
-          record_video_size: nil,
-          storageState: nil,
-          timezoneId: nil,
-          userAgent: nil,
-          viewport: nil,
-          &block)
-      params = {
-        pkg: pkg,
-        acceptDownloads: acceptDownloads,
-        bypassCSP: bypassCSP,
-        colorScheme: colorScheme,
-        deviceScaleFactor: deviceScaleFactor,
-        extraHTTPHeaders: extraHTTPHeaders,
-        geolocation: geolocation,
-        hasTouch: hasTouch,
-        httpCredentials: httpCredentials,
-        ignoreHTTPSErrors: ignoreHTTPSErrors,
-        isMobile: isMobile,
-        javaScriptEnabled: javaScriptEnabled,
-        locale: locale,
-        noViewport: noViewport,
-        offline: offline,
-        permissions: permissions,
-        proxy: proxy,
-        record_har_omit_content: record_har_omit_content,
-        record_har_path: record_har_path,
-        record_video_dir: record_video_dir,
-        record_video_size: record_video_size,
-        storageState: storageState,
-        timezoneId: timezoneId,
-        userAgent: userAgent,
-        viewport: viewport,
-      }.compact
+    def launch_browser(pkg: nil, **options, &block)
+      params = options.dup
+      params[:pkg] = pkg
+      params.compact!
       prepare_browser_context_options(params)
 
       resp = @channel.send_message_to_server('launchBrowser', params)

data/lib/playwright/channel_owners/playwright.rb

@@ -39,6 +39,13 @@ module Playwright
       ::Playwright::ChannelOwners::Browser.from(@initializer['preLaunchedBrowser'])
     end
 
+    private def pre_connected_android_device
+      unless @initializer['preConnectedAndroidDevice']
+        raise 'Malformed endpoint. Did you use Android.launchServer method?'
+      end
+      ::Playwright::ChannelOwners::AndroidDevice.from(@initializer['preConnectedAndroidDevice'])
+    end
+
     private def parse_device_descriptor(descriptor)
       # This return value can be passed into Browser#new_context as it is.
       # ex:

data/lib/playwright/input_files.rb

@@ -4,7 +4,9 @@ module Playwright
   class InputFiles
     def initialize(context, files)
       @context = context
-      if files.is_a?(Enumerable)
+      if files.is_a?(File)
+        @files = [files]
+      elsif files.is_a?(Enumerable)
         @files = files
       else
         @files = [files]

data/lib/playwright/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Playwright
-  VERSION = '1.28.0'
+  VERSION = '1.28.1'
   COMPATIBLE_PLAYWRIGHT_VERSION = '1.28.1'
 end

data/lib/playwright/web_socket_transport.rb

@@ -49,7 +49,7 @@ module Playwright
       end
 
       # Wait for closed actually.
-      future.value!
+      future.value!(2)
     end
 
     # Start `playwright-cli run-driver`

data/lib/playwright.rb

@@ -51,6 +51,22 @@ module Playwright
     attr_reader :playwright, :browser
   end
 
+  class AndroidExecution
+    def initialize(connection, playwright, device = nil)
+      @connection = connection
+      @playwright = playwright
+      @device = device
+    end
+
+    def stop
+      @device&.close
+      @connection.stop
+    end
+
+    attr_reader :playwright, :device
+  end
+
+
   # Recommended to call this method with block.
   #
   # Playwright.create(...) do |playwright|
@@ -161,4 +177,43 @@ module Playwright
       execution
     end
   end
+
+    # Connects to Playwright server, launched by `npx playwright launch-server chromium` or `playwright.chromium.launchServer()`
+  #
+  # Playwright.connect_to_browser_server('ws://....') do |browser|
+  #   page = browser.new_page
+  #   ...
+  # end
+  #
+  # @experimental
+  module_function def connect_to_android_server(ws_endpoint, &block)
+    require 'playwright/web_socket_client'
+    require 'playwright/web_socket_transport'
+
+    transport = WebSocketTransport.new(ws_endpoint: ws_endpoint)
+    connection = Connection.new(transport)
+    connection.mark_as_remote
+    connection.async_run
+
+    execution =
+      begin
+        playwright = connection.initialize_playwright
+        android_device = playwright.send(:pre_connected_android_device)
+        android_device.should_close_connection_on_close!
+        AndroidExecution.new(connection, PlaywrightApi.wrap(playwright), PlaywrightApi.wrap(android_device))
+      rescue
+        connection.stop
+        raise
+      end
+
+    if block
+      begin
+        block.call(execution.device)
+      ensure
+        execution.stop
+      end
+    else
+      execution
+    end
+  end
 end

data/lib/playwright_api/android_device.rb

@@ -168,6 +168,11 @@ module Playwright
       raise NotImplementedError.new('web_views is not implemented yet.')
     end
 
+    # @nodoc
+    def should_close_connection_on_close!
+      wrap_impl(@impl.should_close_connection_on_close!)
+    end
+
     # @nodoc
     def tap_on(selector, duration: nil, timeout: nil)
       wrap_impl(@impl.tap_on(unwrap_impl(selector), duration: unwrap_impl(duration), timeout: unwrap_impl(timeout)))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: playwright-ruby-client
 version: !ruby/object:Gem::Version
-  version: 1.28.0
+  version: 1.28.1
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-17 00:00:00.000000000 Z
+date: 2022-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby