envoy-proxy 0.2.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 734a2635f297c2cb9cad38f557c25ccffb7d9b13
-  data.tar.gz: 462d924cb400c2b024b972b6de150c9933933cdd
+  metadata.gz: 79aa6508c84fc016f6cd86578c4fc3c2e4c56bb7
+  data.tar.gz: 0756f96ffcc9738416d2f72478dd081938e7c881
 SHA512:
-  metadata.gz: 0c251a55c27846f203464df452e824fc3fb58a15f4ed2139808afcc3f7813c4012cc7cdea710e19a6a4d1a5e6cba9f6aebe5d435b01d5c1f193a2e8e3bb68c85
-  data.tar.gz: 96a1abac6b4480f849c582734e2c290dd608b30c4a05075ffd974897bef722c1ec65fe55f03e0843b25f83e5f194e9a5ab54efc35efd1502812c7eda6f2243ed
+  metadata.gz: 3669908f7d9b5cdde77f905b419213190164082d8750223b06b12574d91b86e7306beefa9c9ea69ca08c3498751da947eaabec8e05d572c41bb4065cfcda092c
+  data.tar.gz: 06434fb4ffbf9ebcf082d4118b1fd2323be2437284f13f4b06a6791f36e9dcdd6f9b835fd6ade6c20ab4de335268b9fff82fe5e14dcbd70f4fbb2cee1ab0428a

data/bin/envoy

@@ -3,9 +3,11 @@
 
 begin
   require 'envoy/client/command'
+  Envoy::Client::Command.new.run(ARGV)
 rescue LoadError
   path = File.expand_path '../../lib', __FILE__
   $:.unshift path if File.directory?(path)
   require 'envoy/client/command'
+  Envoy::Client::Command.new.run(ARGV)
 end
 

data/lib/envoy/client/channel.rb

@@ -38,39 +38,13 @@ module Envoy
       
       def unbind e
         if e == Errno::ECONNREFUSED
-          @client.log TRACE, "couldn't connect to upstream service for stream #{@id}"
-          if @tried_starting
-            if Time.now > @tried_starting + @client.options[:delay]
-              @client.log ERROR, "Service isn't running, but starting it didn't really work out."
-              @client.send_object :close, @id, 502
-              @tried_starting = false
-            else
-              EM.add_timer 0.1 do
-                reconnect
-              end
-            end
-          elsif cmd = @client.options[:command]
-            cmd = cmd % @client.options
-            @client.log INFO, "Service doesn't seem to be running. Trying to start it now..."
-            @tried_starting = Time.now
-            p @client.options[:dir]
-            Dir.chdir File.expand_path(@client.options[:dir]) do
-              fork do
-                ENV.delete("GEM_HOME")
-                ENV.delete("GEM_PATH")
-                ENV.delete("BUNDLE_BIN_PATH")
-                ENV.delete("BUNDLE_GEMFILE")
-                system cmd
-              end
-            end
-            EM.add_timer 0.1 do
-              reconnect
-            end
-          end
+          @client.log ERROR, "couldn't connect to upstream service for stream #{@id}"
+          @client.send_object :close, @id
         elsif e
           @client.log ERROR, e.inspect
+          @client.send_object :close, @id
         else
-          @client.log TRACE, "upstream service closed stream #{@id}"
+          @client.log DEBUG, "upstream service closed stream #{@id}"
           @client.send_object :close, @id
         end
       end

data/lib/envoy/client/command.rb

@@ -1,62 +1,23 @@
 require 'envoy/client/trunk'
-require 'envoy/client/option_parser'
+require 'envoy/client/config'
 require 'envoy/version'
-require 'yaml'
 
-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
-
-def load_config
-  if path = find_config
-    conf = YAML.load(File.read(path))
-    Array(conf).each do |conf|
-      if conf["rails"]
-        conf["dir"] = conf["rails"]
-        conf["pidfile"] = "tmp/pids/server.pid"
-        conf["command"] = "rails s -p %{local_port}"
-        conf["delay"] = 10
-      elsif conf["rackup"]
-        conf["dir"] = conf["rackup"]
-        conf["command"] = "rackup -p %{local_port}"
-        conf["delay"] = 10
-      end
-      conf["host"] ||= conf["dir"].split("/")[-1] if conf["dir"]
-      conf["dir"] = File.expand_path(conf["dir"], path + "/..") if conf["dir"]
-    end
-  else
-    [{}]
-  end
-end
-
-options = parse_options
+class Envoy::Client::Command
 
-unless EM.reactor_running?
-  EM.run do
-    Signal.trap("INT") do
-      $exiting = true
-      EventMachine.stop
-    end
-    Signal.trap("TERM") do
-      $exiting = true
-      EventMachine.stop
-    end
-    load_config.each do |config|
-      config = config.merge(options)
-      config["local_port"] ||= config["command"] ? rand(16383) + 49152 : 80
-      config["hosts"] ||= [config.delete("host")] if config["host"]
-      config = config.each_with_object({}) do |(k, v), h|
-        h[k.to_sym] = v
-      end
+  def run (args)
+    EM.run do
+      Envoy.verbosity = Envoy::INFO
+      stopper = proc { $exiting = true; EventMachine.stop }
+      Signal.trap("INT", stopper)
+      Signal.trap("TERM", stopper)
+      Envoy.log(Envoy::DEBUG, "envoy #{Envoy::VERSION} starting up")
+      config = Envoy::Client::Config.new
+      config.parse_options
+      config.parse_envoyfile
+      config.infer_sane_defaults
+      config.start_service
       Envoy::Client::Trunk.start config
     end
   end
+
 end

data/lib/envoy/client/config.rb

@@ -0,0 +1,94 @@
+require 'envoy/client/config/builder'
+require 'envoy/utils'
+require 'optparse'
+
+class Envoy::Client::Config
+
+  attr_accessor :server
+  attr_accessor :key
+  attr_accessor :label
+  attr_accessor :command
+  attr_accessor :export
+
+  def initialize
+    @server = ["p45.eu", 8282]
+    @key = ENV["ENVOY_KEY"] || SecureRandom.base64(8)
+  end
+
+  def options
+    {
+      hosts: [label].compact,
+      key: key,
+      verbosity: true,
+      version: Envoy::VERSION
+    }
+  end
+
+  def start_service
+    return unless command
+    Envoy.log Envoy::INFO, "Starting service..."
+    fork do
+      ENV.delete("GEM_HOME")
+      ENV.delete("GEM_PATH")
+      ENV.delete("BUNDLE_BIN_PATH")
+      ENV.delete("BUNDLE_GEMFILE")
+      system(command)
+    end
+  end
+
+  def infer_sane_defaults
+    self.export = [:tcp, "127.0.0.1", 80] unless export
+  end
+
+  def parse_envoyfile
+    if path = Envoy.find_file("Envoyfile")
+      Builder.new(self).run(path)
+    end
+  end
+
+  def parse_options
+    OptionParser.new do |op|
+      op.banner = "Usage: #{$0} [options]"
+      op.on "-l LABEL", "Use this domain label" do |lab|
+        @label = lab
+      end
+      op.on "-d DIRECTORY", "Change to this directory before starting envoy" do |dir|
+        Dir.chdir(dir)
+      end
+      op.on "-k KEY", "Secure access to the label with this key" do |v|
+        @key = v
+      end
+      op.on "-s SERVER", "Specify envoy server" do |v|
+        host, port = v.split(":")
+        @server = [host, port || @server[1]]
+      end
+      op.on "-v", "Show messages. Repeat to show more." do
+        Envoy.verbosity += 1
+      end
+      op.on "-q", "Hide messages. Repeat to hide more." do
+        Envoy.verbosity -= 1
+      end
+      op.on "-h", "Show this message" do
+        puts op
+        exit
+      end
+      op.on "-V", "Show version number" do
+        puts Envoy::VERSION
+        exit
+      end
+      op.parse!
+      case ARGV[0]
+      when nil
+      when /\//
+        @export = [:unix, ARGV[0]]
+      when /^([^:]+):(\d+)$/
+        @export = [:tcp, $1 || "127.0.0.1", $2]
+      when /^(\d+)$/
+        @export = [:tcp, "127.0.0.1", $1]
+      else
+        @export = [:tcp, ARGV[0], 80]
+      end
+    end
+  end
+
+end

data/lib/envoy/client/config/builder.rb

@@ -0,0 +1,51 @@
+class Envoy::Client::Config; end
+
+class Envoy::Client::Config::Builder
+
+  def initialize (config)
+    @config = config
+  end
+
+  def run (path)
+    instance_eval(File.read(path), path)
+  end
+
+  def set (name, value)
+    @config.__send__("#{name}=", value)
+  end
+
+  def fetch (name, &block)
+    if r = @config.__send__(name)
+      r
+    elsif block
+      set(name, block.())
+    end
+  end
+
+  def export (type, *args)
+    case type
+    when :tcp
+      args = args[0].split(":") if args[0] and !args[1]
+      args[0] ||= "127.0.0.1"
+      args[1] ||= rand(16383) + 49152
+      args = [:tcp, *args]
+    when :unix
+      args[0] ||= ".envoy.sock"
+      args = [:unix, *args]
+    end
+    set :export, args
+  end
+
+  def localsock ()
+    export(:unix)[1]
+  end
+
+  def localhost
+    export(:tcp)[1]
+  end
+
+  def localport ()
+    export(:tcp)[2]
+  end
+
+end

data/lib/envoy/client/trunk.rb

@@ -8,19 +8,17 @@ module Envoy
     module Trunk
       include Protocol
       
-      attr_reader :options
+      attr_reader :config
       
-      def self.start options
-        EM.connect options[:server_host], options[:server_port].to_i, Envoy::Client::Trunk, options
+      State = Struct.new(:connected, :reconnects)
+      
+      def self.start (config, state = State.new(false, 0))
+        EM.connect(*config.server, Envoy::Client::Trunk, config, state)
       end
       
-      def initialize options
-        @options = options
-        @log = STDERR
-        if @options.has_key?(:log)
-          @log = @options[:log] && File.open(@options[:log], "a")
-        end
-        log DEBUG, "envoy #{Envoy::VERSION} starting up"
+      def initialize (config, state)
+        @config = config
+        @state = state
       end
       
       def channels
@@ -33,46 +31,43 @@ module Envoy
       end
       
       def receive_close id
+        return unless channels[id]
         log TRACE, "closed stream #{id}"
         channels[id].close_connection true
         channels.delete(id)
       end
       
       def receive_stream id, data
+        return unless channels[id]
         log TRACE, "#{data.length} bytes of data received on stream #{id}"
         channels[id].send_data data
       end
       
       def receive_connection id
         log TRACE, "New connection request with id `#{id}'"
-        channels[id] = EM.connect(options[:local_host] || '127.0.0.1',
-                                  options[:local_port], Channel, id, self)
+        channels[id] = case @config.export[0]
+          when :tcp
+            EM.connect(*@config.export[1, 2], Channel, id, self)
+          when :unix
+            EM.connect_unix_domain(*@config.export[1], Channel, id, self)
+          else
+            raise @config.export[0].inspect
+          end
+      rescue
+        send_object :close, id
       end
       
       def receive_keepalive
       end
       
-      def log (level, text, io = @log)
-        return unless io
-        return unless level <= verbosity
-        message = [
-          @options[:timestamps] ? Time.now.strftime("%F %T") : nil,
-          @options[:show_log_level] ? "#{VERBOSITIES[level][0]}:" : nil,
-          text
-        ].compact.join(" ")
-        if @options[:color_log_level]
-          #FATAL ERROR WARN\  INFO\  DEBUG TRACE
-          message = message.colorize(%i"red red yellow green default light_black"[level])
-        end 
-        io.puts message
-        io.flush
-      end
-      
       def receive_message text, level = INFO
         log level, text
       end
       
       def receive_ping
+        unless @state.connected
+          ssl_handshake_completed
+        end
         log TRACE, "Server pinged. Ponging back."
         send_object :pong
       end
@@ -86,39 +81,39 @@ module Envoy
         log DEBUG, "Server confirmed our request. Proxy set up."
       end
       
+      def log (*args)
+        Envoy.log(*args)
+      end
+      
       def unbind
         if @halting
           log DEBUG, "Shutting down because server told us to."
         elsif $exiting
           log DEBUG, "Shutting down because the local system told us to."
-        elsif !@halting && r = @options[:reconnect]
-          log WARN, "Lost connection. Retrying..." if r == 0
+        elsif @state.connected
+          log WARN, "Lost connection. Retrying..." if @state.reconnects == 0
           EM.add_timer 0.5 do
-            @options[:reconnect] += 1
-            Trunk.start @options
+            @state.reconnects += 1
+            Trunk.start(@config, @state)
           end
         else
-          if options[:did_connect]
-            log FATAL, "Connection lost. Not point reconnecting because the host is randomly generated."
-          else
-            log FATAL, "Couldn't connect. Abandoning ship."
-          end
+          log FATAL, "Couldn't connect. Abandoning ship."
           EventMachine.stop_event_loop
         end
       end
       
       def ssl_handshake_completed
         log DEBUG, "Channel is secure, sending options"
-        options[:did_connect] = true
-        options[:reconnect] = 0 if options[:hosts]
-        send_object :options, options
-        log DEBUG, "Exporting #{@options[:local_host]}:#{@options[:local_port]}"
+        @state.connected = true
+        send_object :options, @config.options
+        log DEBUG, "Exporting #{@config.export.join(":")}"
       end
       
       def post_init
-        self.comm_inactivity_timeout = 25
-        log DEBUG, "Requesting TLS negotiation."
-        send_object :start_tls
+        self.comm_inactivity_timeout = 60
+        log TRACE, "Requesting TLS negotiation."
+        #send_object :start_tls
+        send_object :pong
       end
       
     end

data/lib/envoy/protocol.rb

@@ -1,24 +1,11 @@
 require 'eventmachine'
 require 'bert'
 
-TRACE = 5
-DEBUG = 4
-INFO  = 3
-WARN  = 2
-ERROR = 1
-FATAL = 0
-
 module Envoy
 
   module Protocol
     include EM::P::ObjectProtocol
     
-    VERBOSITIES = %w"FATAL ERROR WARN\  INFO\  DEBUG TRACE"
-    
-    def verbosity
-      @verbosity ||= [FATAL, [TRACE, @options[:verbosity] || 3].min].max
-    end
-      
     module Serializer
       def self.dump(object)
         BERT.encode(object)

data/lib/envoy/server/command.rb

@@ -27,6 +27,7 @@ $zone = ARGV[0].gsub(/^\.+/, '')
 
 unless EM.reactor_running?
   EM.run do
+    Envoy.verbosity = Envoy::FATAL
     EM.start_server "0.0.0.0", 8282, Envoy::Server::Trunk, key
     EM.start_server *listen, Envoy::Server::Web
   end

data/lib/envoy/server/trunk.rb

@@ -1,4 +1,5 @@
 require 'envoy/protocol'
+require 'envoy/utils'
 
 module Envoy
   module Server
@@ -26,37 +27,12 @@ module Envoy
         @channels ||= {}
       end
       
-      def receive_pong
-        EM.add_timer 30 do
-          send_object :ping
-        end
-      end
-      
-      def receive_close id, code = nil
-        if chan = channels[id]
-          chan.web.close(code)
-          channels.delete id
-        end
-      end
-      
-      def receive_start_tls
-        send_object :start_tls
-        start_tls
-      end
-      
-      def receive_stream id, data
-        c = channels[id]
-        w = c && c.web
-        w && w.send_data(data)
-      end
-      
       def key
         @options[:key]
       end
       
-      def log message
-        t = Time.now.strftime("%F %T")
-        STDERR.puts t + " " + message.split("\n").join("\n#{t.gsub(/./, ' ')} ")
+      def log (*args)
+        Envoy.log(*args)
       end
       
       def message (level, message)
@@ -68,7 +44,7 @@ module Envoy
       end
       
       def halt message = nil
-        message FATAL, message if message
+        message Envoy::FATAL, message if message
         send_object :halt
         close_connection(true)
       end
@@ -77,13 +53,42 @@ module Envoy
         Gem::Requirement.new(*requirement) =~ Gem::Version.new(@options[:version])
       end
       
+      def receive_pong
+        unless @pinged
+          send_object :ping
+          @pinged = true
+        else
+          EM.add_timer 30 do
+            send_object :ping
+          end
+        end
+      end
+      
+      def receive_close id, code = nil
+        if chan = channels[id]
+          chan.web.close(code)
+          channels.delete id
+        end
+      end
+      
+      def receive_start_tls
+        send_object :start_tls
+        start_tls
+      end
+      
+      def receive_stream id, data
+        c = channels[id]
+        w = c && c.web
+        w && w.send_data(data)
+      end
+      
       def receive_options options
         @options = options
         receive_pong if version? "> 0.1"
         if version? "< #{Envoy::VERSION}"
-          message WARN, "Your client is out of date. Please upgrade to #{Envoy::VERSION}."
+          message Envoy::WARN, "Your client is out of date. Please upgrade to #{Envoy::VERSION}."
         elsif version? "> #{Envoy::VERSION}"
-          message WARN, "Your client is from the future. The server is expecting #{Envoy::VERSION}."
+          message Envoy::WARN, "Your client is from the future. The server is expecting #{Envoy::VERSION}."
         end
         if @key and @key != @options[:key]
           halt "Key is invalid"
@@ -92,30 +97,30 @@ module Envoy
         hosts = @options[:hosts] || []
         hosts.any? do |label|
           if label == "s"
-            message FATAL, "label is reserved: `#{label}'"
+            message Envoy::FATAL, "label is reserved: `#{label}'"
             true
           elsif label =~ /\./
-            message FATAL, "label is invalid: `#{label}'"
+            message Envoy::FATAL, "label is invalid: `#{label}'"
             true
           elsif other_trunk = Trunk.trunks[label][0]
             unless other_trunk.key == key
-              message FATAL, "label is protected with a key: `#{label}'"
+              message Envoy::FATAL, "label is protected with a key: `#{label}'"
               true
             end
           end
         end && halt
         if hosts.empty?
           hosts = [SecureRandom.random_number(36 ** 4).to_s(36)]
-          message INFO, "Service accessible at http://#{hosts[0]}.#{$zone}/"
+          message Envoy::INFO, "Service accessible at http://#{hosts[0]}.#{$zone}/"
         else
           @hosts = hosts.each do |host|
             Trunk.trunks[host] << self
-            message INFO, "Service accessible at http://#{host}.#{$zone}/"
+            message Envoy::INFO, "Service accessible at http://#{host}.#{$zone}/"
           end
         end
         unless @options[:key]
           @options[:key] = SecureRandom.hex(8)
-          message INFO, "Service access key is `#{@options[:key]}'"
+          message Envoy::INFO, "Service access key is `#{@options[:key]}'"
         end
         send_object :confirm, @options if version? ">= 0.2.2"
       end

data/lib/envoy/utils.rb

@@ -0,0 +1,40 @@
+module Envoy
+
+  TRACE = 5
+  DEBUG = 4
+  INFO  = 3
+  WARN  = 2
+  ERROR = 1
+  FATAL = 0
+
+  VERBOSITIES = "FEWIDT"
+
+  class << self
+    attr_accessor :verbosity
+  end
+
+  def self.log (level, text, io = STDERR)
+    return unless io
+    return unless level <= verbosity
+    message = [
+      Time.now.strftime("%F %T"),
+      VERBOSITIES[level][0],
+      text
+    ].compact.join(" ")
+    io.puts message
+    io.flush
+  end
+
+  def self.find_file (name)
+    dirs = Dir.pwd.split("/")
+    r = dirs.reduce([]) do |m, x|
+      [[*m[0], x], *m]
+    end.map do |p|
+      p.join("/") + "/#{name}"
+    end.each do |p|
+      return p if File.exist?(p)
+    end
+    false
+  end
+
+end

data/lib/envoy/version.rb

@@ -1,3 +1,3 @@
 module Envoy
-  VERSION = '0.2.3'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: envoy-proxy
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Nathan Baum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-20 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -99,13 +99,15 @@ files:
 - envoy-proxy.gemspec
 - lib/envoy/client/channel.rb
 - lib/envoy/client/command.rb
-- lib/envoy/client/option_parser.rb
+- lib/envoy/client/config.rb
+- lib/envoy/client/config/builder.rb
 - lib/envoy/client/trunk.rb
 - lib/envoy/protocol.rb
 - lib/envoy/server/channel.rb
 - lib/envoy/server/command.rb
 - lib/envoy/server/trunk.rb
 - lib/envoy/server/web.rb
+- lib/envoy/utils.rb
 - lib/envoy/version.rb
 homepage: ''
 licenses:

data/lib/envoy/client/option_parser.rb

@@ -1,76 +0,0 @@
-require 'optparse'
-
-def default_options
-  {
-    "server_host" => 'p45.eu',
-    "server_port" => "8282",
-    "local_host" => '127.0.0.1',
-    "tls" => false,
-    "verbosity" => 3,
-    "version" => Envoy::VERSION,
-    "delay" => 1,
-    "dir" => ".",
-    "timestamps" => false,
-    "show_log_level" => true,
-    "color_log_level" => true,
-  }
-end
-
-def parse_options
-  options = default_options
-  OptionParser.new do |op|
-    op.banner = "Usage: #{$0} [options] [[HOST:]PORT] [LABEL]"
-    op.on "-l LABEL", "--label", "--host", "Allocate this domain label on the proxy" do |v|
-      options["hosts"] ||= []
-      options["hosts"] << v
-    end
-    op.on "-k KEY", "--key", "Secure access to the label with this key" do |v|
-      options["key"] = v
-    end
-    op.on "-s SERVER", "--server", "Specify envoy server" do |v|
-      host, port = v.split(":")
-      options["server_host"] = host
-      options["server_port"] ||= port
-    end
-    op.on "-c COMMAND", "Run this command" do |v|
-      options["command"] = v
-    end
-    op.on "-v", "--verbose", "Show messages. Repeat to show more." do
-      options["verbosity"] += 1
-    end
-    op.on "-q", "--quiet", "Hide messages. Repeat to hide more." do
-      options["verbosity"] -= 1
-    end
-    op.on "-h", "--help", "Show this message" do
-      puts op
-      exit
-    end
-    op.on "-V", "--version", "Show version number" do
-      puts Envoy::VERSION
-      exit
-    end
-    op.parse!
-    case ARGV[0]
-    when "rails"
-      options["pidfile"] = "tmp/pids/server.pid"
-      options["command"] = "rails s -p %{local_port}"
-      options["delay"] = 10
-    when "rackup"
-      options["command"] = "rackup -p %{local_port}"
-      options["delay"] = 10
-    when /^(\d+)$/
-      options["local_port"] = $1
-    when /^(\[[^\]+]\]|[^:]+):(\d+)$/x
-      options["local_host"] = $1
-      options["local_port"] = $2
-    when /^(.*)$/
-      options["local_host"] = $1
-    end
-    if ARGV[1]
-      options["hosts"] ||= []
-      options["hosts"] << ARGV[1]
-    end
-  end
-  options
-end
-