superbot 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5521299c6e822711616b725a18c9c60d66757301762518ab47543e8e055f4f9c
-  data.tar.gz: 3b5e2d80ee4c4ea7b308618517c37556c193e07f0d22a430ef2247438f521cca
+  metadata.gz: f71e13691620164c6f8ccb20568412b28edd9fbf6a8c8284dd7f1ba728dbdecf
+  data.tar.gz: afb80afe5c87473d1bd43b33b5d2a4bf5306f6577b01f415055a5ca33fd0e8dd
 SHA512:
-  metadata.gz: 3046c7aada967221fb3b5833dd5cf2a1db4d33d4ddd91c59c546136b5f014ba100b14e9575f47364b7f719f6aa895ac3c519da8fb441dc1067b97266454a1a20
-  data.tar.gz: e370c5eae0bcbf34b520db8857d96dfb51974b780b162d2c3f1095462e0214dba02c8a59014192ee074dad063f8853c0ba93b08d797bf470b006ddb0dc20158f
+  metadata.gz: '09789a18105dba7f043de350645a527a299dcc86525a62ee99b31b3ca805dfb7c6ec8c13f2b5fee8c31df2da6a721ffd51c88f119e729bc25db9bab07e1ddb39'
+  data.tar.gz: f3ec0a6cba8bf4f2986d8c96767dccfe7853acaf3cdfcc026dec2332043f77e24761875207fcc2bd0b4b4dd405a9a7cbc60fb61d8ce626886d178b8d49b08ca0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    superbot (0.1.10)
+    superbot (0.1.11)
       clamp (= 1.2.1)
       kommando (~> 0.1)
       launchy (= 2.4.3)
@@ -111,7 +111,7 @@ GEM
       rack-protection (= 2.0.3)
       tilt (~> 2.0)
     sinatra-silent (0.0.1)
-    superbot-cloud (0.1.5)
+    superbot-cloud (0.1.6)
       marcel (= 0.3.3)
       multipart-post (= 2.0.0)
     thor (0.20.0)

data/lib/superbot/cli/run_command.rb

@@ -13,8 +13,6 @@ module Superbot
         validates_browser_type browser
       end
       option ['--region'], 'REGION', 'Region for remote webdriver'
-      option ['-u', '--user'], 'AUTH_USER_NAME', 'Cloud webdriver auth credentials', environment_variable: 'AUTH_USER_NAME', attribute_name: :auth_user
-      option ['-p', '--password'], 'AUTH_USER_PASSWORD', 'Cloud webdriver auth credentials', environment_variable: 'AUTH_USER_PASSWORD', attribute_name: :auth_password
 
       def execute
         script = File.read(File.join(path, 'main.rb'))

data/lib/superbot/cli/teleport_command.rb

@@ -11,9 +11,11 @@ module Superbot
       option ['--region'], 'REGION', 'Region for remote webdriver'
 
       def execute
-        @web = Superbot::Web.new(webdriver_type: browser).tap(&:run_async_after_running!)
+        @web = Superbot::Web.new(webdriver_type: browser, region: region)
+        @web.run_async_after_running!
 
         @chromedriver = Kommando.run_async 'chromedriver --silent --port=9515' if browser == 'local'
+
         puts "", "🤖 Teleport is active ☁️ "
         puts "", "Configure your webdriver to http://localhost:4567/wd/hub"
 

data/lib/superbot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Superbot
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

data/lib/superbot/web.rb

@@ -2,14 +2,14 @@
 
 require "sinatra/base"
 require "sinatra/silent"
-require 'net/http'
+require "net/http"
 
 require_relative "capybara/convert"
 require_relative "capybara/runner"
 
 module Superbot
   class Web
-    def initialize(webdriver_type: 'cloud')
+    def initialize(webdriver_type: 'cloud', region: nil)
       @sinatra = Sinatra.new
       @sinatra.set :bind, "127.0.0.1"
       @sinatra.set :silent_sinatra, true
@@ -37,20 +37,23 @@ module Superbot
         instance.capybara_runner.run(converted_script)
       end
 
-      webdriver_uri = URI.parse(Superbot.webdriver_endpoint(webdriver_type))
+      @webdriver_type = webdriver_type
+      webdriver_uri = URI.parse(Superbot.webdriver_endpoint(@webdriver_type))
       @request_settings = {
         host:     webdriver_uri.host,
         port:     webdriver_uri.port,
         path:     webdriver_uri.path
       }
+      @region = region
 
       %w(get post put patch delete).each do |verb|
         @sinatra.send(verb, "/wd/hub/*") do
           begin
+            request_path = request.path_info.gsub('/wd/hub', '')
             content_type 'application/json'
             response = instance.remote_webdriver_request(
               verb.capitalize,
-              request.path_info,
+              request_path,
               request.query_string,
               request.body,
               instance.incomming_headers(request)
@@ -58,9 +61,9 @@ module Superbot
             status response.code
             headers instance.all_headers(response)
             response.body
-          rescue
+          rescue StandardError => e
             error_message = "Remote webdriver doesn't responding"
-            puts error_message
+            puts error_message, e
             halt 500, { message: error_message }.to_json
           end
         end
@@ -74,23 +77,39 @@ module Superbot
     def remote_webdriver_request(type, path, query_string, body, new_headers)
       uri = URI::HTTP.build(
         @request_settings.merge(
-          path: [@request_settings[:path], path.gsub('wd/hub/', '')].join,
+          path: @request_settings[:path] + path,
           query: query_string.empty? ? nil : query_string
         )
       )
       req = Net::HTTP.const_get(type).new(uri, new_headers.merge('Content-Type' => 'application/json'))
 
-      if Superbot::Cloud.credentials
-        req.basic_auth(*Superbot::Cloud.credentials.slice(:username, :token).values)
+      request_body = body.read
+      if cloud_teleport?
+        user_auth_creds = Superbot::Cloud.credentials&.slice(:username, :token)
+        req.basic_auth(*user_auth_creds.values) if user_auth_creds
+
+        if @region && creating_session?(type, path)
+          parsed_body = JSON.parse(request_body)
+          parsed_body['desiredCapabilities']['superOptions'] = { 'region': @region }
+          request_body = parsed_body.to_json
+        end
       end
+      req.body = request_body
 
-      req.body = body.read
       Net::HTTP.new(uri.hostname, uri.port).start do |http|
         http.read_timeout = Superbot.cloud_timeout
         http.request(req)
       end
     end
 
+    def cloud_teleport?
+      %w(cloud local_cloud).include?(@webdriver_type)
+    end
+
+    def creating_session?(method, path)
+      method.casecmp?('post') && path == '/session'
+    end
+
     def all_headers(response)
       header_list = {}
       response.header.each_capitalized do |k, v|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbot
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Superbots
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-09 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp