envoy-proxy 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef2118712910e35819c817d33c0e2d6b7f9d502b
-  data.tar.gz: 88ae6105ccd8b45c4c21b2ca5f3550eaec77de9f
+  metadata.gz: 6d9b0f4972a7646dbf5c14d62a4dd6b22b38b916
+  data.tar.gz: d8d329bb6236ff90676eb4b3bd87049e76754d6b
 SHA512:
-  metadata.gz: f37e81842ec29acd108aa83d71f9d0a8b802d8b5e47cc914a2b134110b525c133aeecdad66ad530a13a7210b32f8ec9fed8f28e6f0b52f9ee751d04369d19e70
-  data.tar.gz: 57e5090d881c0d67b267114332cb8a9665f1c22a2e8e2f98dbf06610f475b9ae8313169367caeb826b5723991e0ff7ef5f9fec6d21a8639210a1769eb8667ce7
+  metadata.gz: ba994c1c737f4a6ec79b790bd899615e75a26da0322fe0189cb3ffeeaa46d0598617bfcab2f91df1cdd840ccd7fed06c17f89dddf63d9935260875def10a52ed
+  data.tar.gz: 906a1e74a93456b3c971b0c15bf398ad79b1213a01a8dd5066cd1d0f0adacdae94d6c4cd18ac52d7010faaf509200d4313d808e00906a51ee32c649263f366b0

data/lib/envoy/client/trunk.rb

@@ -43,7 +43,8 @@ module Envoy
       end
       
       def receive_message message
-        STDERR.puts message
+        t = Time.now.strftime("%F %T")
+        STDERR.puts t + " " + message.split("\n").join("\n#{t.gsub(/./, ' ')} ")
       end
       
       def receive_halt
@@ -51,10 +52,10 @@ module Envoy
       end
       
       def unbind
-        if @options[:reconnect]
-          STDERR.puts "No connection. Reconnecting in #{@options[:reconnect]}s."
-          EM.add_timer @options[:reconnect] do
-            @options[:reconnect] *= 2
+        if r = @options[:reconnect]
+          STDERR.puts "Lost connection. Reconnecting in #{r[0]}s."
+          EM.add_timer r[0] do
+            @options[:reconnect] = [r[1], r[0] + r[1]]
             Trunk.start @options
           end
         else
@@ -69,7 +70,7 @@ module Envoy
       
       def ssl_handshake_completed
         options[:did_connect] = true
-        options[:reconnect] = 1 if options[:hosts]
+        options[:reconnect] = [0, 1] if options[:hosts]
         o = options.dup
         o.delete(:local_host)
         send_object :options, o

data/lib/envoy/server/channel.rb

@@ -18,6 +18,10 @@ module Envoy
         @trunk.send_object :stream, id, data
       end
       
+      def message data
+        @trunk.send_object :message, data
+      end
+      
       def id
         @id ||= SecureRandom.hex(4)
       end
@@ -26,4 +30,3 @@ module Envoy
     
   end
 end
-

data/lib/envoy/server/trunk.rb

@@ -46,11 +46,12 @@ module Envoy
           end
         end
         hosts << SecureRandom.random_number(36 ** 4).to_s(36) if hosts.empty?
-        send_object :message, "Local server on port #{options[:local_port]} is now publicly available via:"
+        m = ["Local server on port #{options[:local_port]} is now publicly available via:"]
         @hosts = hosts.each do |host|
           Trunk.trunks[host] << self
-          send_object :message, "http://#{host}.#{$zone}/"
+          m << "http://#{host}.#{$zone}/"
         end
+        send_object :message, m.join("\n")
       end
       
       def unbind

data/lib/envoy/server/web.rb

@@ -8,6 +8,7 @@ module Envoy
       
       def post_init
         @header = ""
+        @connection = "close"
       end
       
       def unbind
@@ -15,17 +16,26 @@ module Envoy
       end
       
       def receive_line line
-        @header << line + "\r\n"
-        if line =~ /^Host: ([^:]*)/
-          host = $1
-          raise "Request is not in #{$zone}" unless host.end_with?($zone)
-          host = host[0...-$zone.length]
-          host = host.split(".").last
-          trunk = Trunk.trunks[host].sample || raise("No trunk for #{host}.#{$zone}")
+        @first_line ||= line
+        if line == ""
+          trunk = Trunk.trunks[@host].sample || raise("No trunk for #{@host}.#{$zone}")
+          @header << "Connection: #{@connection}\r\n"
           @channel = Channel.new(trunk, self, @header)
+          @channel.message "%s %s" % [Socket.unpack_sockaddr_in(get_peername)[1], @first_line]
           set_text_mode
+        elsif line =~ /^connection:\s*upgrade$/i
+          @connection = "upgrade"
+        elsif line =~ /^keep-alive:/i
+        elsif line =~ /^host:\s*([^:]*)/i
+          @host = $1
+          @host = @host[0...-$zone.length]
+          @host = @host.split(".").last
+          raise "Request is not in #{$zone}" unless @host.end_with?($zone)
+          @header << line + "\r\n"
         elsif @header.size > 4096
           raise "Header's too long for my liking"
+        else
+          @header << line + "\r\n"
         end
       rescue RuntimeError => e
         send_data "HTTP/1.0 500 Internal Server Error\r\n"

data/lib/envoy/version.rb

@@ -1,5 +1,5 @@
 
 module Envoy
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envoy-proxy
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Nathan Baum