multitunnels 1.0.1 → 1.0.2

data/README.md

@@ -56,6 +56,10 @@ As the name implies, you can create lots of proxies in one command (but do not f
 
 This command creates four proxies.
 
+Compatibility
+---------
+MRI Ruby >= 1.8.7
+
 Copyright
 ---------
 

data/lib/tunnels.rb

@@ -1,12 +1,11 @@
 require 'tunnels/version'
+require 'tunnels/parser'
 require 'uri'
 require 'eventmachine'
 
 # most of code is from [thin-glazed](https://github.com/freelancing-god/thin-glazed).
 # Copyright © 2012, Thin::Glazed was a Rails Camp New Zealand project, and is developed and maintained by Pat Allan. It is released under the open MIT Licence.
 
-class ClientError < StandardError; end
-
 module Tunnels
   def self.run!(params)
     maps = parse_params params
@@ -33,8 +32,6 @@ module Tunnels
   rescue RuntimeError => e
     STDERR.puts e.message
     STDERR.puts "Maybe you should run on `sudo`"
-  rescue ClientError => e
-    STDERR.puts e.message
   end
 
   def self.help
@@ -132,16 +129,17 @@ Examples:
     end
 
     def receive_data(data)
-      unless data.nil?
-        client = nil
-        data.sub! /\r\nHost:\s*(.+?)\s*\r\n/i do
-          host, port = $1.split(':') if $1
-          client = client host, port
-          "\r\nHost: #{client.to_host}:#{client.to_port}\r\n"
-        end
+      parser << data unless data.nil?
+    end
 
-        client.send_data data
+    def send data
+      data.sub!(/\r\nHost:\s*(.+?)\s*\r\n/i) do
+        host, port = $1.split(':') if $1
+        self.last_client = client host, port
+        "\r\nHost: #{last_client.to_host}:#{last_client.to_port}\r\n"
       end
+
+      last_client.send_data data
     end
 
     def relay_from_client(data)
@@ -168,7 +166,7 @@ Examples:
                                           when :https
                                             EventMachine.connect to_host, to_port, HttpsClient, self, from_host, from_port, to_host, to_port
                                           else
-                                            raise ClientError.new "Cannot support scheme: #{to_scheme}"
+                                            STDERR.puts "Cannot support scheme: #{to_scheme}"
                                           end
       end
 
@@ -176,7 +174,7 @@ Examples:
         port = port.to_i
         search_client_by_host_and_port(host, port) ||
         search_client_by_host(host) ||
-        raise(ClientError.new "Cannot find a client for #{host}:#{port}")
+        STDERR.puts("Cannot find a client for #{host}:#{port}")
       end
 
       def search_client_by_host_and_port host, port
@@ -208,6 +206,24 @@ Examples:
       def clear_clients
         @clients.clear
       end
+
+      def parser
+        Thread.current['parser'] ||= begin
+          parser = Parser.new
+          parser.on_complete do |data|
+            send data
+          end
+          parser
+        end
+      end
+
+      def last_client
+        Thread.current['client'] ||= client '127.0.0.1'
+      end
+
+      def last_client= client
+        Thread.current['client'] = client
+      end
   end
 
   class HttpsProxy < HttpProxy

data/lib/tunnels/parser.rb

@@ -0,0 +1,27 @@
+require 'http/parser'
+
+class Parser
+  attr_reader :raw
+
+  def initialize
+    @parser = Http::Parser.new
+    @raw = ''
+  end
+
+  def << data
+    @raw << data
+    @parser << data
+  end
+
+  def on_complete
+    @parser.on_message_complete = proc do
+      yield @raw
+      reset
+    end
+  end
+
+  def reset
+    @parser.reset!
+    @raw.respond_to?(:clear) ? @raw.clear : @raw = ''
+  end
+end

data/lib/tunnels/version.rb

@@ -1,3 +1,3 @@
 module Tunnels
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/tunnels.gemspec

@@ -20,5 +20,7 @@ Gem::Specification.new do |s|
   # s.add_development_dependency "rspec"
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rr'
+  s.add_development_dependency 'rake'
   s.add_runtime_dependency 'eventmachine'
+  s.add_runtime_dependency 'http_parser.rb'
 end

metadata

@@ -1,101 +1,150 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: multitunnels
-version: !ruby/object:Gem::Version
-  version: 1.0.1
+version: !ruby/object:Gem::Version 
+  hash: 19
+  prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 2
+  version: 1.0.2
 platform: ruby
-authors:
+authors: 
 - jugyo
 - bachue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-06-06 00:00:00 +08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: http_parser.rb
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
 description: This tunnels http/https to http/https.
-email:
+email: 
 - jugyo.org@gmail.com
 - bachue.shu@gmail.com
-executables:
+executables: 
 - multitunnels
 extensions: []
+
 extra_rdoc_files: []
-files:
-- ".gitignore"
+
+files: 
+- .gitignore
 - Gemfile
 - README.md
 - Rakefile
 - bin/multitunnels
 - lib/tunnels.rb
+- lib/tunnels/parser.rb
 - lib/tunnels/version.rb
 - spec/spec_helper.rb
 - spec/tunnels_spec.rb
 - tunnels.gemspec
+has_rdoc: true
 homepage: https://github.com/bachue/tunnels
 licenses: []
-metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: https/http --(--)--> https/http
-test_files:
+test_files: 
 - spec/spec_helper.rb
 - spec/tunnels_spec.rb
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 96d6b4eb916daf80561c9c02514753883c61e322
-  data.tar.gz: 66b3abbe084a87245b39245ed0ca7fb41f6118d6
-SHA512:
-  metadata.gz: f3cf787c20df1330aa7340996132a39bd752e8d53d6a9b2e5d4ac8522186ee2b3827b62f5e51b25400f17b2bb4590efaaca1e41d482c98df2b0be212c609d0f0
-  data.tar.gz: a29d6e85a28278d081d6dfd3e9717b9e6823a0f9409e3787d628d467c3e0cdd369693f9425827eb769ddf8206c826e859ea958e2ea385c93a974cc69666e6f5f