em-proxy 0.1.6 → 0.1.7

data/Gemfile

@@ -1,3 +1,3 @@
 source "http://rubygems.org"
 
-gemspec
+gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    em-proxy (0.1.5)
+    em-proxy (0.1.6)
       eventmachine
 
 GEM
@@ -19,6 +19,7 @@ GEM
       eventmachine
     eventmachine (1.0.0.beta.4)
     http_parser.rb (0.5.3)
+    rake (0.9.2.2)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
       rspec-expectations (~> 2.7.0)
@@ -35,4 +36,5 @@ DEPENDENCIES
   ansi
   em-http-request
   em-proxy!
+  rake
   rspec

data/em-proxy.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "em-proxy"
-  s.version     = "0.1.6"
+  s.version     = "0.1.7"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ilya Grigorik"]
   s.email       = ["ilya@igvita.com"]
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_development_dependency "em-http-request"
   s.add_development_dependency "ansi"
+  s.add_development_dependency "rake"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/examples/duplex.rb

@@ -1,17 +1,17 @@
 require 'lib/em-proxy'
 
-Proxy.start(:host => "0.0.0.0", :port => 80, :debug => true) do |conn|
+Proxy.start(:host => "0.0.0.0", :port => 8000, :debug => true) do |conn|
   @start = Time.now
   @data = Hash.new("")
 
-  conn.server :test, :host => "127.0.0.1", :port => 81    # production, will render resposne
-  conn.server :prod, :host => "127.0.0.1", :port => 82     # testing, internal only
+  conn.server :prod, :host => "127.0.0.1", :port => 8100    # production, will render resposne
+  conn.server :test, :host => "127.0.0.1", :port => 8200    # testing, internal only
 
   conn.on_data do |data|
     # rewrite User-Agent
     data.gsub(/User-Agent: .*?\r\n/, "User-Agent: em-proxy/0.1\r\n")
   end
- 
+
   conn.on_response do |server, resp|
     # only render response from production
     @data[server] += resp
@@ -21,16 +21,17 @@ Proxy.start(:host => "0.0.0.0", :port => 80, :debug => true) do |conn|
   conn.on_finish do |name|
     p [:on_finish, name, Time.now - @start]
     p @data
+    :close if name == :prod
   end
 end
 
 #
-# ruby examples/appserver.rb 81
-# ruby examples/appserver.rb 82
+# ruby examples/appserver.rb 8100 1
+# ruby examples/appserver.rb 8200 3
 # ruby examples/line_interceptor.rb
-# curl localhost
+# curl localhost:8000
 #
 # > [:on_finish, 1.008561]
 # > {:prod=>"HTTP/1.1 200 OK\r\nConnection: close\r\nDate: Fri, 01 May 2009 04:20:00 GMT\r\nContent-Type: text/plain\r\n\r\nhello world: 0",
 #       :test=>"HTTP/1.1 200 OK\r\nConnection: close\r\nDate: Fri, 01 May 2009 04:20:00 GMT\r\nContent-Type: text/plain\r\n\r\nhello world: 1"}
-#
+#

data/examples/http_proxy.rb

@@ -2,8 +2,9 @@ require 'em-proxy'
 require 'http/parser' # gem install http_parser.rb
 require 'uuid'        # gem install uuid
 
-# > ruby em-proxy-http.rb
+# > ruby http_proxy.rb
 # > curl --proxy localhost:9889 www.google.com
+# > curl --proxy x.x.x.x:9889 www.google.com - bind ip example
 
 host = "0.0.0.0"
 port = 9889
@@ -17,7 +18,8 @@ Proxy.start(:host => host, :port => port) do |conn|
     puts "New session: #{session} (#{h.inspect})"
 
     host, port = h['Host'].split(':')
-    conn.server session, :host => host, :port => (port || 80)
+    conn.server session, :host => host, :port => (port || 80) #, :bind_host => conn.sock[0] - # for bind ip
+                         
     conn.relay_to_servers @buffer
 
     @buffer.clear

data/lib/em-proxy/connection.rb

@@ -43,7 +43,7 @@ module EventMachine
       # initialize connections to backend servers
       #
       def server(name, opts)
-        srv = EventMachine::connect(opts[:host], opts[:port], EventMachine::ProxyServer::Backend, @debug) do |c|
+        srv = EventMachine::bind_connect(opts[:bind_host], opts[:bind_port], opts[:host], opts[:port], EventMachine::ProxyServer::Backend, @debug) do |c|
           c.name = name
           c.plexer = self
           c.proxy_incoming_to(self, 10240) if opts[:relay_server]
@@ -57,8 +57,20 @@ module EventMachine
       # [ip, port] of the connected client
       #
       def peer
-        peername = get_peername
-        @peer ||= peername ? Socket.unpack_sockaddr_in(peername).reverse : nil
+        @peer ||= begin
+          peername = get_peername
+          peername ? Socket.unpack_sockaddr_in(peername).reverse : nil
+        end
+      end
+
+      #
+      # [ip, port] of the local server connect
+      #
+      def sock
+        @sock ||= begin
+          sockname = get_sockname
+          sockname ? Socket.unpack_sockaddr_in(sockname).reverse : nil
+        end
       end
 
       #
@@ -95,7 +107,7 @@ module EventMachine
         end
 
         # if all connections are terminated downstream, then notify client
-        if @servers.values.compact.size.zero? and close != :keep
+        if (@servers.values.compact.size.zero? && close != :keep) || (close == :close)
           close_connection_after_writing
         end
       end

data/spec/proxy_spec.rb

@@ -133,7 +133,7 @@ describe Proxy do
     lambda {
       EM.run do
         EventMachine.add_timer(0.1) do
-          http =EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get({:timeout => 1})
+          http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get({:timeout => 1})
           http.callback { EventMachine.stop }
         end
 
@@ -151,7 +151,7 @@ describe Proxy do
     lambda {
       EM.run do
         EventMachine.add_timer(0.1) do
-          http =EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get({:timeout => 1})
+          http = EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get({:timeout => 1})
           http.callback { EventMachine.stop }
         end
 
@@ -164,4 +164,4 @@ describe Proxy do
       end
     }.should_not raise_error
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-27 00:00:00.000000000 Z
+date: 2012-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2156629200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156629200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156628760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156628760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &2156628320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156628320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &2156627720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,28 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156627720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: EventMachine Proxy DSL
 email:
 - ilya@igvita.com
@@ -112,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: em-proxy
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: EventMachine Proxy DSL