envoy-proxy 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc8414d24201c9196eabae2e64e25b62c971a104
-  data.tar.gz: bca21d64b3aa9b7ada87de0e0b662ea5a3d5b3ea
+  metadata.gz: 5c6a64248f11bee0dcc828dfd58f77809175820a
+  data.tar.gz: 67ec9e035d118f7d0b80ef6ddecc9da019b72597
 SHA512:
-  metadata.gz: 2f26ce559fd86e362372202f5c9e3361333ca593f51e584ce09f6267cb980f968800a47cff8209e32d098b8fa3b6e52275a7e6b82a5f49fcecb6082d9365ae5e
-  data.tar.gz: 09f52e2d4b4dccb0c4b40fd4816877f75eaabda436d8797c69b315cbb6ef0804ddd72b0aca825a8bff743a8eb237af8d2a6bde00530ab7493c98f613ef8587d8
+  metadata.gz: 395ebb8755c9fafc317e17778b3d45b467f654af150dc98f1fb317a55f7acb4ca426efa63e6118abcdec33486137983ae5623fbf33eec867aa3f237274f1c5dc
+  data.tar.gz: 8cd6ed01cc0b23a387aa765914721db7116b5f72f773e907041745d21aeabcf6174ac8ffcda6c22d2be3c92b1246398ab2db0441d5386f2b272ea8c260812f0d

data/README.md

@@ -29,3 +29,37 @@ specified host and port, which default to 0.0.0.0 and 8080.
 If KEY is specified, clients _must_ specify that key.
 
 The ZONE specifies the domain name suffix.
+
+## Advanced Client Configuration
+
+The client will search up from the current directory for a .envoy file. If it
+exists, it must be a YAML file containing either one hash of command line
+options, or an array of multiple options. This file can also contain settings
+which will execute a command if a local connection is refused.
+
+| Option        | Description | Default |
+| ------------- | ----------------------- | - |
+| `host`        | The domain name prefix | None |
+| `local_port`  | The local port to use | None |
+| `local_host`  | The local host to use | 127.0.0.1 |
+| `server_host` | The server host to use | p45.eu |
+| `server_port` | The server port to use | 8282 |
+| `tls`         | Use TLS in the server connections | false |
+| `verbose`     | Be noisy | false |
+| `command`     | A command to run if a local connection is refused | None |
+| `command_delay` | Number of seconds to wait before reconnecting, after starting a command | 1 |
+| `dir`           | A directory to change to | . |
+
+If no host is specified, a random one is selected by the server.
+If no local port is specified, a random one is selected by the client.
+The command is processed for % substitions against the configuration hash,
+including any randomly selected local port.
+
+e.g. To start a rails app, you might use this configuration:
+
+   host: my_app
+   dir: ~/apps/my_app
+   command: rails s -p %{local_port}
+
+You can still specify a constant local port, if you prefer that.
+

data/lib/envoy/client/channel.rb

@@ -1,20 +1,65 @@
 
 module Envoy
+  
   module Client
     
     module Channel
       
       def initialize id, client
         @id, @client = id, client
+        @buffer = ""
         super()
       end
       
+      def connection_completed
+        send_data @buffer, true
+        @buffer = nil
+      end
+      
+      def send_data data, force = false
+        if !@buffer or force
+          super data
+        else
+          @buffer << data
+        end
+      end
+      
       def receive_data data
         @client.send_object :stream, @id, data
       end
       
-      def unbind
-        @client.send_object :close, @id
+      def reconnect
+        super @client.options[:local_host], @client.options[:local_port]
+      end
+      
+      def unbind e
+        if e == Errno::ECONNREFUSED
+          if @tried_starting
+            @client.log "Service isn't running, but starting it didn't really work out."
+            @client.send_object :close, @id, 502
+          elsif cmd = @client.options[:command]
+            cmd = cmd % @client.options
+            @client.log "Service doesn't seem to be running. Trying to start it now..."
+            @tried_starting = true
+            Dir.chdir File.expand_path(@client.options[:dir]) do
+              fork do
+                #Process.daemon(true, false)
+                ENV.delete("GEM_HOME")
+                ENV.delete("GEM_PATH")
+                ENV.delete("BUNDLE_BIN_PATH")
+                ENV.delete("BUNDLE_GEMFILE")
+                system cmd
+              end
+            end
+            EM.add_timer @client.options[:delay] do
+              reconnect
+            end
+          end
+        elsif e
+          @client.log e.inspect
+        else
+          @client.send_object :close, @id
+        end
       end
       
     end
@@ -31,4 +76,6 @@ module Envoy
     end
     
   end
+  
 end
+

data/lib/envoy/client/command.rb

@@ -1,61 +1,38 @@
 require 'envoy/client/trunk'
+require 'envoy/client/option_parser'
 require 'envoy/version'
+require 'yaml'
 
-require 'optparse'
-require 'ostruct'
-
-options = {
-  server_host: 'p45.eu',
-  server_port: "8282",
-  local_host: '127.0.0.1',
-  local_port: "80",
-  tls: false,
-  verbose: false,
-  version: Envoy::VERSION
-}
+def find_config
+  dirs = Dir.pwd.split("/")
+  r = dirs.reduce([]) do |m, x|
+    [[*m[0], x], *m]
+  end.map do |p|
+    p.join("/") + "/.envoy"
+  end.each do |p|
+    return p if File.exist?(p)
+  end
+  false
+end
 
-OptionParser.new do |op|
-  op.banner = "Usage: #{$0} [options] [[HOST:]PORT]"
-  op.on "--host HOST", "Allocate this domain label on the proxy" do |v|
-    options[:hosts] ||= []
-    options[:hosts] << v
-  end
-  op.on "-k", "--key KEY" do |v|
-    options[:key] = v
-  end
-  op.on "-t", "--[no-]tls", "Encrypt communications with the envoy server" do |v|
-    options[:tls] = v
-  end
-  op.on "-s", "--server SERVER", "Specify envoy/proxylocal server" do |v|
-    host, port = v.split(":")
-    options[:server_host] = host
-    options[:server_port] ||= port
-  end
-  op.on "-v", "--[no-]verbose", "Be noisy about what's happening" do |v|
-    options[:verbose] = v
-  end
-  op.on "-h", "--help", "Show this message" do
-    puts op
-    exit
-  end
-  op.on "--version" do
-    puts Envoy::VERSION
-    exit
-  end
-  op.parse!
-  case ARGV[0]
-  when /^(\d+)$/
-    options[:local_port] = $1
-  when /^(\[[^\]+]\]|[^:]+):(\d+)$/x
-    options[:local_host] = $1
-    options[:local_port] = $2
-  when /^(.*)$/
-    options[:local_host] = $1
-  end
+def load_config
+  conf = YAML.load(File.read(find_config))
+  conf.is_a?(Array) ? conf : [conf]
 end
 
+options = parse_options
+
 unless EM.reactor_running?
   EM.run do
-    Envoy::Client::Trunk.start options
+    load_config.each do |config|
+      config["local_port"] ||= rand(16383) + 49152
+      config = options.merge(config)
+      config["hosts"] ||= [config.delete("host")]
+      config = config.each_with_object({}) do |(k, v), h|
+        h[k.to_sym] = v
+      end
+      Envoy::Client::Trunk.start p config
+    end
   end
-end
+end
+

data/lib/envoy/client/option_parser.rb

@@ -0,0 +1,59 @@
+require 'optparse'
+
+def default_options
+  {
+    "server_host" => 'p45.eu',
+    "server_port" => "8282",
+    "local_host" => '127.0.0.1',
+    "tls" => false,
+    "verbose" => false,
+    "version" => Envoy::VERSION,
+    "command_delay" => 1,
+    "dir" => "."
+  }
+end
+
+def parse_options
+  options = default_options
+  OptionParser.new do |op|
+    op.banner = "Usage: #{$0} [options] [[HOST:]PORT]"
+    op.on "--host HOST", "Allocate this domain label on the proxy" do |v|
+      options["hosts"] ||= []
+      options["hosts"] << v
+    end
+    op.on "-k", "--key KEY" do |v|
+      options["key"] = v
+    end
+    op.on "-t", "--[no-]tls", "Encrypt communications with the envoy server" do |v|
+      options["tls"] = v
+    end
+    op.on "-s", "--server SERVER", "Specify envoy/proxylocal server" do |v|
+      host, port = v.split(":")
+      options["server_host"] = host
+      options["server_port"] ||= port
+    end
+    op.on "-v", "--[no-]verbose", "Be noisy about what's happening" do |v|
+      options["verbose"] = v
+    end
+    op.on "-h", "--help", "Show this message" do
+      puts op
+      exit
+    end
+    op.on "--version" do
+      puts Envoy::VERSION
+      exit
+    end
+    op.parse!
+    case ARGV[0]
+    when /^(\d+)$/
+      options["local_port"] = $1
+    when /^(\[[^\]+]\]|[^:]+):(\d+)$/x
+      options["local_host"] = $1
+      options["local_port"] = $2
+    when /^(.*)$/
+      options["local_host"] = $1
+    end
+  end
+  options
+end
+

data/lib/envoy/client/trunk.rb

@@ -42,11 +42,15 @@ module Envoy
       def receive_keepalive
       end
       
-      def receive_message message
+      def log message
         t = Time.now.strftime("%F %T")
         STDERR.puts t + " " + message.split("\n").join("\n#{t.gsub(/./, ' ')} ")
       end
       
+      def receive_message message
+        log message
+      end
+      
       def receive_halt
         @halting = true
         EventMachine.stop_event_loop
@@ -84,4 +88,4 @@ module Envoy
     end
   
   end
-end
+end

data/lib/envoy/server/channel.rb

@@ -30,3 +30,4 @@ module Envoy
     
   end
 end
+

data/lib/envoy/server/web.rb

@@ -11,7 +11,18 @@ module Envoy
         @connection = "close"
       end
       
+      def send_page status, message
+        send_data "HTTP/1.0 #{status} Message\r\n"
+        send_data "Content-Type: text/plain\r\n"
+        send_data "\r\n"
+        send_data "#{message}\r\n"
+      end
+      
       def close code
+        case code
+        when 502
+          send_page code, "The service isn't running, and couldn't be started." 
+        end
         close_connection(true)
       end
       
@@ -42,10 +53,7 @@ module Envoy
           @header << line + "\r\n"
         end
       rescue RuntimeError => e
-        send_data "HTTP/1.0 500 Internal Server Error\r\n"
-        send_data "Content-Type: text/plain\r\n"
-        send_data "\r\n"
-        send_data "#{e.message}\r\n"
+        send_page 500, e.inspect
         close_connection true
       end
       

data/lib/envoy/version.rb

@@ -1,3 +1,3 @@
 module Envoy
-  VERSION = '0.0.16'
+  VERSION = '0.0.17'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envoy-proxy
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Nathan Baum
@@ -85,6 +85,7 @@ files:
 - envoy-proxy.gemspec
 - lib/envoy/client/channel.rb
 - lib/envoy/client/command.rb
+- lib/envoy/client/option_parser.rb
 - lib/envoy/client/trunk.rb
 - lib/envoy/protocol.rb
 - lib/envoy/server/channel.rb