eyes_core 4.1.2 → 4.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0de07c4333f2eb419422f6701bd0b853777072aa408f59390088f644bc8ccc21
-  data.tar.gz: 1f67f9079dde416580f1726473b491fa0094ecb10a0dc2bdb7f4fce6c2fb29a8
+  metadata.gz: cbf1994a6f05889f55ab95ff3af3a02caa1abdd64edb53c303d9cc92a3c0bb02
+  data.tar.gz: 6f973ccd0f7c868912b34b8fa78cb1e7cd7d86ae13a6b6459f07da41d3044e1a
 SHA512:
-  metadata.gz: c0b840e04ecb9ba7c933ba861bc20967f854a2efa9549ab8a827b6a12d9de10508dcc1b6e07453da3c6fdb2655d9ab7726037ad4a98595dc2eabe4a622451555
-  data.tar.gz: e2ba459ea74622bd29ae5b9142636097c322e1fd319fcf6c1be4add444dc5104292f34b9dc8acec8f5c739c5fa122869c5267f5964f4ed861d64d23ca51937aa
+  metadata.gz: 00e3f79dd9ddd4d1095d48dff3eb87d97075e4e848d34bb86b35dc6fa515b03c4027b73afe179fafad3f83bc05f848d809b214dccd1bd5559c0ff3106d99a0ac
+  data.tar.gz: e41402ca4efae7a05b584050c86a0a3c6bdbddaa1b72a9ec1f56c84fb5f98b991e143af42be807fc55aabdd311c8c199e9718068f7aed30d2d8c910065653d2a

data/lib/applitools/universal_sdk/executable_finder.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Applitools::Connectivity
+  module UniversalServerGemFinder
+    extend self
+
+    SERVER_GEM_NAME = 'eyes_universal'
+
+    def filepath
+      server_lib ? File.join(server_lib.gem_dir, 'ext', 'eyes-universal', filename) : ''
+    end
+
+    def executable_filepath
+      raise 'Universal server unrecognized' unless File.exist?(filepath) && File.executable?(filepath)
+      filepath
+    end
+
+    private
+
+    def server_lib
+      Gem::Specification.find_by_name(SERVER_GEM_NAME)
+    rescue Gem::MissingSpecError
+      nil
+    end
+
+    def filename
+      return 'eyes-universal-win.exe' if Gem.win_platform?
+      case RUBY_PLATFORM
+        when /mswin|windows|mingw/i
+          'eyes-universal-win.exe'
+        when /musl/i
+          'eyes-universal-alpine'
+        when /linux|arch/i
+          'eyes-universal-linux'
+        when /darwin/i
+          'eyes-universal-macos'
+        else
+          raise 'Unsupported platform'
+      end
+    end
+
+  end
+end

data/lib/applitools/universal_sdk/universal_client.rb

@@ -132,7 +132,8 @@ module Applitools::Connectivity
 
 
     def prepare_socket
-      @web_socket = ::Applitools::Connectivity::UniversalServer.check_or_run
+      @universal_server_control = Applitools::Connectivity::UniversalServerControl.instance
+      @web_socket = @universal_server_control.new_server_socket_connection
       socket_handshake
       session_init
       # connect_and_configure_socket(socket_uri)
@@ -165,9 +166,7 @@ module Applitools::Connectivity
 
 
     def socket_handshake
-      ip = @web_socket.remote_address.ip_address
-      port = @web_socket.remote_address.ip_port
-      socket_uri = "ws://#{ip}:#{port}/eyes"
+      socket_uri = "ws://#{@web_socket.remote_address.inspect_sockaddr}/eyes"
       handshake = WebSocket::Handshake::Client.new(url: socket_uri)
       @web_socket.write(handshake)
       web_socket_result = receive_result('handshake')

data/lib/applitools/universal_sdk/universal_server_control.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require 'singleton'
+
+module Applitools::Connectivity
+  class UniversalServerControl
+
+    include Singleton
+
+    DEFAULT_SERVER_IP = '127.0.0.1'
+    EXECUTABLE_FILEPATH = Applitools::Connectivity::UniversalServerGemFinder.executable_filepath
+
+    def initialize
+      @control_pipe = nil
+      @port_pipe = nil
+      @usdk_pid = nil
+      @monitoring_thread = nil
+      @port = nil
+      start_server_with_pipe
+      @sockets = []
+    end
+
+    def server_port
+      @port
+    end
+
+    def new_server_socket_connection
+      begin
+        socket = TCPSocket.new(DEFAULT_SERVER_IP, @port)
+        @sockets.push(socket)
+        socket
+      rescue Errno::ECONNREFUSED
+        nil
+      end
+    end
+
+    def server_running?
+      return false if @monitoring_thread.nil?
+      monitoring_result = @monitoring_thread.join(1)
+      monitoring_result.nil?
+    end
+
+    def stop_server
+      return if @control_pipe.nil?
+      @control_pipe.close_write
+      @sockets.each {|socket| socket.close unless socket.closed? }
+      sleep(1)
+    end
+
+    def to_s # for test & debug
+      "SDKServer(port=#{@port}; pid=#{@usdk_pid})"
+    end
+
+    private
+
+    def start_server_with_pipe
+      in_pipe, @control_pipe = IO.pipe
+      @port_pipe, port_w = IO.pipe
+
+      @usdk_pid = spawn(
+        EXECUTABLE_FILEPATH, '--no-singleton', '--shutdown-mode', 'stdin',
+        in: in_pipe, out: port_w, err: port_w,
+        # close_others: true
+      )
+      in_pipe.close_read
+      port_w.close_write
+
+      @monitoring_thread = Process.detach(@usdk_pid)
+
+      @port = @port_pipe.readline.strip.to_i
+      @port_pipe.close_read
+
+      if ENV['APPLITOOLS_SHOW_LOGS']
+        Applitools::EyesLogger.logger.debug("Started Universal SDK server at #{@port} pid = #{@usdk_pid}")
+      end
+    end
+
+  end
+end

data/lib/applitools/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 
 module Applitools
-  VERSION = '4.1.2'.freeze
-  UNIVERSAL_VERSION = '2.9.5'.freeze
+  VERSION = '4.1.4'.freeze
+  UNIVERSAL_VERSION = '2.10.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.4
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-07 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.5
+        version: 2.10.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.5
+        version: 2.10.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -386,6 +386,7 @@ files:
 - lib/applitools/method_tracer.rb
 - lib/applitools/rspec/target_matcher.rb
 - lib/applitools/sauce.rb
+- lib/applitools/universal_sdk/executable_finder.rb
 - lib/applitools/universal_sdk/universal_check_settings.rb
 - lib/applitools/universal_sdk/universal_client.rb
 - lib/applitools/universal_sdk/universal_client_socket.rb
@@ -394,6 +395,7 @@ files:
 - lib/applitools/universal_sdk/universal_eyes_manager.rb
 - lib/applitools/universal_sdk/universal_eyes_manager_config.rb
 - lib/applitools/universal_sdk/universal_server.rb
+- lib/applitools/universal_sdk/universal_server_control.rb
 - lib/applitools/utils/eyes_selenium_utils.rb
 - lib/applitools/utils/image_delta_compressor.rb
 - lib/applitools/utils/image_utils.rb