superbot-teleport 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1620839ecc26d6c0292f19d72cc4ec53cea926a3534cfe4f6b711b5dcac354ac
-  data.tar.gz: 78eb318940b908ef33b6c414dbb368697fdecdeb0b385b5b12367407df83da94
+  metadata.gz: 4cf993d114e2d4d467b2b14447bc00703fec337a3a3ed31493b276b9b497c8b0
+  data.tar.gz: a5d01bc4e1ff057bdbabf44fe7f8442a179c51f39f1f52c1a8846a6461910ba8
 SHA512:
-  metadata.gz: c057d335c073daed278599683e49f527cfd2dc29a89b3193c1efead1dcf0244a553658d7e85ca19d632ab9ea4d0c1c96678d186cf5a66eb73b2509fcce618494
-  data.tar.gz: 14996fac924ad819156dc915fa9bc90ede7b89d00f77dcaa9509f043d71d3120a863cc987e134603569d344a4ba33e1fb462c596b4cc486c0604de9b413a485c
+  metadata.gz: 0f05f544ed9c7b1953f287473deb3abe8d1946431cf148ea44f3c609d831c8da8307fd7fa8ae679c3ac7ce8c15fa38590e179090fb9a3f4b8019a6de8fc2704e
+  data.tar.gz: 19be38e67e0bd137c11eeb887a521dd6ed5043e4087bad4ae5270c8be7055361b99ce2591578ef7b424bba4994ded339f114a9a6da01ce7ffbc4a7d7f66cf0af

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    superbot-teleport (0.1.1)
+    superbot-teleport (0.2.0)
       excon
       sinatra
 

data/lib/superbot/teleport/cli.rb

@@ -1,5 +1,6 @@
-require 'sinatra'
+require 'sinatra/base'
 require 'excon'
+require 'json'
 
 module Superbot
   module Teleport
@@ -10,25 +11,13 @@ module Superbot
         s.set :show_exceptions, false
 
         s.before do
-          $__request = request
-        end
-
-        s.error Excon::Error::Socket do
-          puts "="*30
-          puts $__request.path_info
-
-          if $!.message.end_with? "(Errno::ECONNREFUSED)"
-            status 500
-            "upstream failed"
-          else
-            raise "unknown"
-          end
+          $__superbot_teleport_request_for_errors = request
         end
 
         s.set :connection, (
           Excon.new ENV.fetch("SUPERBOT_TELEPORT_UPSTREAM_URL"), {
             persistent: true,
-            connect_timeout: 5,
+            connect_timeout: 3,
             read_timeout: 5,
             write_timeout: 5,
             debug_request: (ENV["EXCON_DEBUG"] == "true"),
@@ -36,25 +25,73 @@ module Superbot
           }
         )
 
-        [:get, :post, :delete].each do |method|
-          s.send method, "/wd/hub/*" do
-            path = params[:splat].join("/")
+        s.helpers do
+          def request_path(params)
+            params[:splat].join("/")
+          end
+
+          def safe_parse_json(string_or_io, on_error: nil)
+            JSON.parse (string_or_io.respond_to?(:read) ? string_or_io.read : string_or_io)
+          rescue
+            on_error
+          end
+
+          def proxy(method, params, opts={})
+            raise "DELETE may not contain body" if method == :delete && opts[:body]
+            opts[:headers] ||= {}
 
             unless ENV.fetch("SUPERBOT_TELEPORT_UPSTREAM_URL").include? "localhost"
-              path = "wd/hub/#{path}"
+              path = "wd/hub/#{request_path(params)}"
               headers["Content-Type"] = "application/json"
+            else
+              path = request_path
             end
 
-            upstream = settings.connection.request({
-              method: method, path: path, body: request.body, headers: headers
-            })
+            settings.connection.request({method: method, path: path}.merge(opts))
+          end
 
+          def respond(upstream)
             headers = upstream.headers
             status upstream.status
             upstream.body
           end
         end
 
+        s.get "/wd/hub/*" do
+          respond proxy(:get, params, {headers: headers, body: request.body})
+        end
+
+        s.post "/wd/hub/*" do
+          case request_path(params)
+          when "session"
+            parsed_body = safe_parse_json request.body, on_error: {}
+
+            if ENV['SUPERBOT_TELEPORT_REGION'] && parsed_body['desiredCapabilities']
+              parsed_body['desiredCapabilities']['superOptions'] = { "region": ENV['SUPERBOT_TELEPORT_REGION'] }
+            end
+
+            respond proxy(:post, params, {headers: headers, body: parsed_body.to_json, read_timeout: 500})
+          else
+            respond proxy(:post, params, {headers: headers, body: request.body})
+          end
+        end
+
+        s.delete "/wd/hub/*" do
+          respond proxy(:delete, params, {headers: headers})
+        end
+
+        s.error Excon::Error::Socket do
+          puts "="*30
+          puts $__superbot_teleport_request_for_errors.path_info
+
+          if $!.message.end_with? "(Errno::ECONNREFUSED)"
+            status 500
+            "upstream does not respond"
+          else
+            raise "unknown: #{$!.message}"
+          end
+        end
+
         s.run!
       end
     end

data/lib/superbot/teleport/version.rb

@@ -1,5 +1,5 @@
 module Superbot
   module Teleport
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: superbot-teleport
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Superbot HQ