rookout 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a79d1186aec6390fdce4b56f19a1a2586e91837e51e1e40d70b3290284f8ca0a
-  data.tar.gz: bc0400c6406c42355a9aec84ad0655c37ae7546464e5b80bbc9d3d8a7ae1c330
+  metadata.gz: e08815efb5a89029e091fe5cd252dce182407411e6025de9db8e5ae2659d77d7
+  data.tar.gz: 60bba85497d1f9253e3447283fa1adb97096cb21213b5911ba90371323f1de26
 SHA512:
-  metadata.gz: 181118c9440177b284e30570420d4b12bb5d9e5885605c2081695b07e128828460653fc74bfa8123cc0c87f1d5ec9d210eda05a553b64fd7cf19610cceb2ecb5
-  data.tar.gz: 52f5f5a5c62b617f8936c5ee5e9ff6b3a5c2bad83dce5ea912275dcc0a762e636dae84b37cfa78803208247cc5d560ae24002d67b74452e91430f3e9e8280568
+  metadata.gz: 3d4744c8a0eda6615c1c9b503503d67a1ee647ac7dbf4607fe75b1d9aeff90f8ad98dd497df23eab4488f692f26266d5fd048db566a88a8713272ad072843200
+  data.tar.gz: 7aec7fcff6e9637319f5867b19f2a5eb15d1a0c560a7e1ed212f21b730ed67253db853eff0d3aeacb89a66a6b558f06fbb9049c68d2a8d052cc6787630859247

data/lib/rookout/com_ws/websocket_client.rb

@@ -2,6 +2,7 @@ module Rookout
   module ComWs
     require "openssl"
     require "websocket/driver"
+    require "uri"
 
     require_relative "../config"
     require_relative "../logger"
@@ -11,14 +12,13 @@ module Rookout
       def initialize url, proxy, token
         @token = token
         @connection = WebsocketConnection.new url, proxy
+        @proxy = proxy
         @driver = nil
-        @error = nil
         @last_ping = nil
       end
 
       def connect
-        # TODO: add proxy support
-        @connection.connect
+        connection_error = nil
         @driver = WebSocket::Driver.client @connection
 
         headers.each do |key, value|
@@ -26,18 +26,20 @@ module Rookout
         end
 
         @driver.on :error do |error|
-          @error = error
+          connection_error = error
         end
 
         # Connect to the remote server
-        @driver.start
         # TODO: ADD CONNECT TIMEOUT
+        @connection.connect @driver
+        @driver.start
+
         while @driver.state == :connecting
           recv_data = @connection.read_char
           @driver.parse recv_data
         end
 
-        raise Exceptions::RookWebsocketException, @error if @driver.state != :open
+        raise Exceptions::RookWebsocketException, connection_error if @driver.state != :open
       end
 
       def connection_pump message_handler
@@ -88,14 +90,36 @@ module Rookout
         @secure = %w[https wss].include? @uri.scheme
 
         @socket = nil
+
+        @proxy_connected = false
       end
 
-      def connect
-        if @secure
-          @socket = ssl_connect
-        else
-          @socket = tcp_connect
+      def connect driver
+        @socket = tcp_connect
+
+        proxy_connect driver if @proxy
+
+        @socket = ssl_connect @socket if @secure
+      end
+
+      def proxy_connect driver
+        connection_error = nil
+        @proxy_connected = false
+        proxy = driver.proxy @proxy
+
+        proxy.on :connect do
+          @proxy_connected = true
         end
+
+        proxy.on :error do |error|
+          connection_error = error
+        end
+
+        proxy.start
+
+        proxy.parse read_char until @proxy_connected == true || !connection_error.nil?
+
+        raise Exceptions::RookProxyException, connection_error unless connection_error.nil?
       end
 
       attr_reader :url
@@ -118,13 +142,16 @@ module Rookout
       private
 
       def tcp_connect
-        TCPSocket.new @uri.host,
-                      @uri.port || (@secure ? 443 : 80)
+        if @proxy
+          uri = URI(@proxy)
+          TCPSocket.new uri.host, uri.port
+        else
+          TCPSocket.new @uri.host,
+                        @uri.port || (@secure ? 443 : 80)
+        end
       end
 
-      def ssl_connect
-        tcp_socket = tcp_connect
-
+      def ssl_connect tcp_socket
         ctx = ::OpenSSL::SSL::SSLContext.new
         ctx.min_version = ::OpenSSL::SSL::TLS1_2_VERSION
         cert_store = ::OpenSSL::X509::Store.new

data/lib/rookout/commit.rb

@@ -1,3 +1,3 @@
 module Rookout
-  COMMIT = "c6e9d699d0dd8a6d17e8c466c18ccc082a29e5aa".freeze
+  COMMIT = "809b0c180b1861b5f90a7ed0a14ccdd356e7edcf".freeze
 end

data/lib/rookout/exceptions.rb

@@ -178,6 +178,12 @@ module Rookout
       end
     end
 
+    class RookProxyException < ToolException
+      def initialize error
+        super "Error from proxy #{error}", { "error" => error }
+      end
+    end
+
     class RookBadProtobuf < ToolException
       def initialize
         super 'Bad protobuf version. Please execute "bundle config force_ruby_platform true" before "bundler install".'

data/lib/rookout/interface.rb

@@ -17,6 +17,8 @@ module Rookout
       throw_errors = options[:throw_errors] == true
       Config.debug = evaluate_flag options[:debug], "ROOKOUT_DEBUG"
 
+      puts "[Rookout] Running in debug mode" if Config.debug
+
       begin
         verify_env
 
@@ -103,7 +105,7 @@ module Rookout
       proxy = evaluate_config options[:proxy], "ROOKOUT_PROXY"
       token = evaluate_config options[:token], "ROOKOUT_TOKEN"
 
-      raise RookMissingToken if token.nil? && host == "wss://control.rookout.com"
+      raise RookMissingToken if token.nil? && !(host_specified options)
       verify_token token if token
 
       labels = stringify_labels(options[:labels]) || parse_labels(ENV["ROOKOUT_LABELS"])
@@ -115,6 +117,10 @@ module Rookout
       { host: host, port: port, proxy: proxy, token: token, labels: labels, async_start: async_start, fork: fork }
     end
 
+    def host_specified options
+      !options[:host].nil? || !ENV["ROOKOUT_CONTROLLER_HOST"].nil? || !ENV["ROOKOUT_AGENT_HOST"].nil?
+    end
+
     def evaluate_flag argument, env_var_name
       return true? argument unless argument.nil?
       true? ENV[env_var_name]

data/lib/rookout/version.rb

@@ -1,3 +1,3 @@
 module Rookout
-  VERSION = "0.1.15".freeze
+  VERSION = "0.1.16".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rookout
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Liran Haimovitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-04 00:00:00.000000000 Z
+date: 2021-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binding_of_caller