superbot-teleport 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 428aebb42ee7827783d9af49474d5e48f7303eaaff8a9612d9e37b033baf9de3
-  data.tar.gz: 6163a6bb059033dbedb3c82553fea9e4f67daea2ad18385b4ffa3e50211f3475
+  metadata.gz: 9b274c26142be5c2dc8b56512ce30742f6707868ef8a767b4fa2fa2dde664e6a
+  data.tar.gz: 4aae54f1e4ca46467c11c0427730ef588a6a4a44286941ceda53afecee3d0749
 SHA512:
-  metadata.gz: 4f3f9cfe22bac517f19cb42b1d931325338c9f2f0a6b87c1a3b88dd5806d254a73fffc2c6b1509791323a618af34ce546b46f464cc8bd55b72560dfd19a0f445
-  data.tar.gz: cb266fdb6b96987283270b122da3187f9b3a7ea60afe72f1f47b95faf171247593edd4753b73e99af01cff7435c9574a32d1b2b71d280d45c217c0576a246803
+  metadata.gz: 9f6b4ecf86782e3706254290d899f38f08dcea71f09081eae6781a1a96ce33979f546ad7d416f326bc622920e63b6cec300cc483a8439f5dd413a62bf1549183
+  data.tar.gz: f6f03e163930c425ac56d25574d7d7c1aa634e4dbda493bf5ae3af95d3e40e6db9b59aaa12f89adffa4dc3841db5b651e556ea6a0a98bf8bedb9142277fe64fa

data/Gemfile.lock

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

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

@@ -16,6 +16,7 @@ module Superbot
         option ['--browser'], 'BROWSER', "Browser type to use. Can be either local or cloud", default: 'cloud'
         option ['--region'], 'REGION', 'Region for remote webdriver'
         option ['--org'], 'ORGANIZATION', 'Name of organization to take action', attribute_name: :organization
+        option ['--reuse'], :flag, "Reuse existing session"
 
         def execute
           validate_teleport_options(browser, organization)
@@ -26,19 +27,25 @@ module Superbot
           puts 'Configure your remote webdriver to http://localhost:4567/wd/hub', ''
           puts 'Press [control+c] to exit', ''
 
-          @web = Superbot::Web.run!(webdriver_type: browser, region: region, organization: organization)
-        ensure
-          close_teleport
-        end
+          @web = Superbot::Web.run!(
+            webdriver_type: browser,
+            region: region,
+            organization: organization,
+            reuse: reuse?
+          )
 
-        def close_teleport
-          @web&.quit!
-          @chromedriver&.kill
+          at_exit do
+            @web&.quit!
+          end
         end
 
         def run_local_chromedriver
           chromedriver_path = Chromedriver::Helper.new.binary_path
           @chromedriver = Kommando.run_async "#{chromedriver_path} --silent --port=9515 --url-base=wd/hub"
+
+          at_exit do
+            @chromedriver&.kill
+          end
         end
       end
     end

data/lib/superbot/teleport/version.rb

@@ -1,5 +1,5 @@
 module Superbot
   module Teleport
-    VERSION = "0.2.7"
+    VERSION = "0.2.8"
   end
 end

data/lib/superbot/teleport/web.rb

@@ -11,16 +11,16 @@ module Superbot
 
         user_auth_creds = Superbot::Cloud.credentials&.slice(:username, :token) || {}
 
-        sinatra.set :connection, (
-          Excon.new sinatra.webdriver_url, {
-            user: user_auth_creds[:username],
-            password: user_auth_creds[:token],
-            persistent: true,
-            connect_timeout: 3,
-            read_timeout: 5,
-            write_timeout: 5,
-          }
+        sinatra.set :connection, Excon.new(
+          sinatra.webdriver_url,
+          user: user_auth_creds[:username],
+          password: user_auth_creds[:token],
+          persistent: true,
+          connect_timeout: 3,
+          read_timeout: 500,
+          write_timeout: 500
         )
+        sinatra.set :current_session, nil
 
         sinatra.helpers do
           def request_path(params)
@@ -39,18 +39,18 @@ module Superbot
             path = "wd/hub/#{request_path(params)}"
             headers["Content-Type"] = "application/json"
 
-            settings.connection.request({method: method, path: path}.merge(opts))
+            settings.connection.request({ method: method, path: path }.merge(opts))
           end
 
           def respond(upstream)
-            headers = upstream.headers
+            headers upstream.headers
             status upstream.status
             upstream.body
           end
         end
 
         sinatra.get "/wd/hub/*" do
-          respond proxy(:get, params, {headers: headers, body: request.body})
+          respond proxy(:get, params, headers: headers, body: request.body)
         end
 
         sinatra.post "/wd/hub/*" do
@@ -58,22 +58,39 @@ module Superbot
           when "session"
             parsed_body = safe_parse_json request.body, on_error: {}
 
-            parsed_body['organization_name'] = settings.organization
+            parsed_body['organization_name'] = settings.teleport_options[:organization]
 
-            if settings.region && parsed_body.dig('desiredCapabilities', 'superOptions', 'region').nil?
+            if settings.teleport_options[:region] && parsed_body.dig('desiredCapabilities', 'superOptions', 'region').nil?
               parsed_body['desiredCapabilities'] ||= {}
               parsed_body['desiredCapabilities']['superOptions'] ||= {}
-              parsed_body['desiredCapabilities']['superOptions']['region'] ||= settings.region
+              parsed_body['desiredCapabilities']['superOptions']['region'] ||= settings.teleport_options[:region]
             end
 
-            respond proxy(:post, params, {headers: headers, body: parsed_body.to_json, read_timeout: 500})
+            unless settings.teleport_options[:reuse] && settings.current_session
+              settings.current_session = proxy(
+                :post,
+                params,
+                headers: headers,
+                body: parsed_body.to_json,
+                write_timeout: 500,
+                read_timeout: 500
+              )
+            end
+
+            respond settings.current_session
           else
-            respond proxy(:post, params, {headers: headers, body: request.body})
+            respond proxy(:post, params, headers: headers, body: request.body)
           end
         end
 
         sinatra.delete "/wd/hub/*" do
-          respond proxy(:delete, params, {headers: headers})
+          if settings.teleport_options[:reuse]
+            puts "Skipping DELETE, keep session open"
+            halt 204
+          else
+            settings.current_session = nil
+            respond proxy(:delete, params, headers: headers)
+          end
         end
 
         sinatra.error Excon::Error::Socket do
@@ -87,6 +104,20 @@ module Superbot
             raise "unknown: #{$!.message}"
           end
         end
+
+        at_exit do
+          return unless sinatra.settings.current_session
+
+          puts nil, "Removing active session..."
+          session_id = JSON.parse(sinatra.settings.current_session.body)['sessionId']
+          sinatra.settings.connection.request(
+            method: :delete,
+            path: "wd/hub/session/#{session_id}",
+            headers: { 'Content-Type' => 'application/json' }
+          )
+        rescue => e
+          puts e.message
+        end
       end
     end
   end

metadata

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