superbot-teleport 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21608df2202349dc253a3a7d9bd7198e1a85a88adc34426e42f2c452bd577bb2
-  data.tar.gz: 68f9315d65367edfa9064339ec0a29173ed6715e808e69da6cea758f6c7cb5f9
+  metadata.gz: 5376f1fb8031a0517b62f61f005925b4c28aa53808a85278abf4eefdc38763ea
+  data.tar.gz: 1c8566752197cb1ef6d7eb78b902131585f7d1b8b2ed48596c3bf716848ff3db
 SHA512:
-  metadata.gz: 2493dd94547974cd299a55b2e9dffb1cb563b661362e6a6936140f2cbfd15acc80180e8bac7686b18180d83c2026d90b2e065e06efbf4908ba1c8d1c1927bc6a
-  data.tar.gz: 373bf3c864187635acf664b30fe7f10c28421777f82d912f295ac8d2a2e2c2f5504361dc8ed7e47e41d92069fd9eb6bda2ff9ce955503b9ccec1c9a3586c743f
+  metadata.gz: 55a7c5f1a1c8598b5862407a04428bc17056cd666e0ab33cc54c8703be8ffc764ebadf1b81b4601ce807daacca149413f637bef2b1d528571fbda050361df40f
+  data.tar.gz: 662acacf69bfbc574904fb6ed5142934e136fb586d6bbee203d3c8acf3b8923c2aea5db16ef2ac198ceb766931c5fdcbf9be4205b7f315fe127d04b892cddf67

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    superbot-teleport (0.3.6)
+    superbot-teleport (0.3.7)
       excon
 
 GEM

data/lib/superbot/teleport/cli/root_command.rb

@@ -22,6 +22,7 @@ module Superbot
         option ['--session'], 'SESSION', "Session to use in teleport"
         option ['--base-url'], 'BASE_URL', "Base project URL"
         option ['--tag'], 'TAG', "Deployment tag for webdriver session", environment_variable: "SUPERBOT_TAG"
+        option ['--acquire-session'], :flag, "Request session creation as soon as teleport open"
 
         def execute
           validate_teleport_options(browser, organization, session)
@@ -40,7 +41,8 @@ module Superbot
             keep_session: session || keep_session?,
             session: session,
             base_url: base_url,
-            tag: tag
+            tag: tag,
+            acquire_session: acquire_session?
           )
 
           at_exit do

data/lib/superbot/teleport/version.rb

@@ -1,5 +1,5 @@
 module Superbot
   module Teleport
-    VERSION = "0.3.6"
+    VERSION = "0.3.7"
   end
 end

data/lib/superbot/teleport/web.rb

@@ -43,6 +43,31 @@ module Superbot
             status upstream.status
             upstream.body
           end
+
+          def acquire_session(parsed_body: {}, headers: {})
+            assign_super_options(parsed_body)
+            proxy(
+              :post,
+              { splat: ['session'] },
+              headers: headers.merge('Idempotency-Key' => SecureRandom.hex),
+              body: parsed_body.to_json,
+              retry_interval: 60
+            ).tap do |session_response|
+              parsed_response = safe_parse_json session_response.body, on_error: {}
+              settings.teleport_options[:session] = parsed_response['sessionId']
+            end
+          end
+
+          def assign_super_options(parsed_body)
+            parsed_body['organization_name'] = settings.teleport_options[:organization]
+
+            if settings.teleport_options.slice(:region, :tag).compact.any?
+              parsed_body['desiredCapabilities'] ||= { 'browserName' => 'chrome' }
+              parsed_body['desiredCapabilities']['superOptions'] ||= {}
+              parsed_body['desiredCapabilities']['superOptions']['region'] ||= settings.teleport_options[:region]
+              parsed_body['desiredCapabilities']['superOptions']['tag'] ||= settings.teleport_options[:tag]
+            end
+          end
         end
 
         sinatra.get "/wd/hub/*" do
@@ -58,28 +83,7 @@ module Superbot
               return { 'sessionId': settings.teleport_options[:session] }.to_json
             else
               parsed_body = safe_parse_json request.body, on_error: {}
-
-              parsed_body['organization_name'] = settings.teleport_options[:organization]
-
-              if settings.teleport_options[:region] || settings.teleport_options[:tag]
-                parsed_body['desiredCapabilities'] ||= {}
-                parsed_body['desiredCapabilities']['superOptions'] ||= {}
-                parsed_body['desiredCapabilities']['superOptions']['region'] ||= settings.teleport_options[:region]
-                parsed_body['desiredCapabilities']['superOptions']['tag'] ||= settings.teleport_options[:tag]
-              end
-
-              session_response = proxy(
-                :post,
-                params,
-                headers: headers.merge('Idempotency-Key' => SecureRandom.hex),
-                body: parsed_body.to_json,
-                write_timeout: 500,
-                read_timeout: 500,
-                retry_interval: 60
-              )
-              settings.teleport_options[:session] = JSON.parse(session_response.body)['sessionId']
-
-              respond session_response
+              respond acquire_session(parsed_body: parsed_body, headers: headers)
             end
           else
             parsed_body = safe_parse_json request.body, on_error: {}
@@ -117,11 +121,35 @@ module Superbot
           end
         end
 
+        if sinatra.teleport_options[:acquire_session]
+          sinatra.connection.request(
+            method: :post,
+            path: 'wd/hub/session',
+            headers: { 'Content-Type' => 'application/json', 'Idempotency-Key' => SecureRandom.hex },
+            body: {
+              organization_name: sinatra.teleport_options[:organization],
+              desiredCapabilities: {
+                browserName: 'chrome',
+                superOptions: {
+                  tag: sinatra.teleport_options[:tag],
+                  region: sinatra.teleport_options[:region],
+                }.compact
+              }
+            }.to_json,
+            idempotent: true,
+            retry_interval: 60
+          ).tap do |session_response|
+            if session_response.status == 200
+              sinatra.teleport_options[:session] = JSON.parse(session_response.body)['sessionId']
+            end
+          end
+        end
+
         at_exit do
-          return if sinatra.teleport_options[:session] && sinatra.settings.teleport_options[:keep_session]
+          return if sinatra.teleport_options[:session] && sinatra.teleport_options[:keep_session]
 
           puts nil, "Removing active session..."
-          sinatra.settings.connection.request(
+          sinatra.connection.request(
             method: :delete,
             path: "wd/hub/session/#{sinatra.teleport_options[:session]}",
             headers: { 'Content-Type' => 'application/json' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbot-teleport
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Superbot HQ
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2019-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon