shadowsocks 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f8f39128d624bf5685bbaeb8c14064a65138c85
-  data.tar.gz: 4213b2dab798ad6f171b433e2aa65720cbec65cb
+  metadata.gz: 210530027df71869738df356d97c6d3155592ab9
+  data.tar.gz: 8a45ea79d7cfe255af4f1926dd26eb9b7c4f3328
 SHA512:
-  metadata.gz: 0ca6c7ae4445e8ee40e7fbd911264feef6be241c43d5f349cd8c24b33abd1e92e5aa41ee5e2d134f6e2e56105182902b23746cbc865479864f3a827bc970eca4
-  data.tar.gz: 9a0d34d608289ea5587f4368d1e8dd3d991812eb763397ebfb12b7e4121c1fb56d9d9aa1e83d1b853f22d81f26591f29598c460684928ad26a4a59f81d95ca26
+  metadata.gz: 78fe95f2a08447581d78d6b2f6e31cf5ef9ca60fd5d27e722949b0f3a50070166cf6ac316a092e4c21f655168a2168e091c5b9ba365e807afa19b12ee99a8ce7
+  data.tar.gz: 73b565053f9dbee59d094485e68797e0e740475e4ccd56739f8df62f15b12f7c096e484b6b33aa11ae11e0709762f31f03a73980d6b15240c2172b732e80800c

data/README.md

@@ -1,6 +1,8 @@
 shadowsocks-ruby
 ================
 
+[![Code Climate](https://codeclimate.com/repos/524baea6c7f3a37df208dd4c/badges/9dd6c11b6a17c3a55631/gpa.png)](https://codeclimate.com/repos/524baea6c7f3a37df208dd4c/feed)
+
 Current version: 0.2
 
 shadowsocks-ruby is a lightweight tunnel proxy which can help you get through firewalls. It is a port of [shadowsocks](https://github.com/clowwindy/shadowsocks).

data/config.json

@@ -3,5 +3,5 @@
     "server_port":8388,
     "local_port":1080,
     "password":"barfoo!",
-    "timeout":600
+    "timeout":60
 }

data/lib/shadowsocks.rb

@@ -1,9 +1,10 @@
 require 'eventmachine'
 
 module Shadowsocks
-  autoload :Server,   'shadowsocks/server'
-  autoload :Local,    'shadowsocks/local'
-  autoload :Table,    'shadowsocks/table'
-  autoload :Tunnel,   'shadowsocks/tunnel'
-  autoload :Listener, 'shadowsocks/listener'
+  autoload :Connection, 'shadowsocks/connection'
+  autoload :Server,     'shadowsocks/server'
+  autoload :Local,      'shadowsocks/local'
+  autoload :Table,      'shadowsocks/table'
+  autoload :Tunnel,     'shadowsocks/tunnel'
+  autoload :Listener,   'shadowsocks/listener'
 end

data/lib/shadowsocks/connection.rb

@@ -0,0 +1,20 @@
+module Shadowsocks
+  class Connection < EventMachine::Connection
+    BackpressureLevel = 2097152 # 2m
+
+    private
+
+    def over_pressure?
+      remote.get_outbound_data_size > BackpressureLevel
+    end
+
+    def outbound_checker
+      if over_pressure?
+        pause unless paused?
+        EM.add_timer(1) { outbound_checker }
+      else
+        resume if paused?
+      end
+    end
+  end
+end

data/lib/shadowsocks/listener.rb

@@ -1,5 +1,5 @@
 module Shadowsocks
-  class Listener < EventMachine::Connection
+  class Listener < ::Shadowsocks::Connection
     include ::Shadowsocks::Table
 
     attr_accessor :stage, :remote_addr, :remote_port, :addr_to_send, :cached_pieces,
@@ -7,6 +7,7 @@ module Shadowsocks
 
     def receive_data data
       data_handler data
+      outbound_checker if connector
     end
 
     def post_init
@@ -20,6 +21,10 @@ module Shadowsocks
       connection_cleanup
     end
 
+    def remote
+      connector
+    end
+
     private
 
     def connection_cleanup

data/lib/shadowsocks/local.rb

@@ -14,6 +14,7 @@ module Shadowsocks
 
       def receive_data data
         server.send_data encrypt(table[:decrypt_table], data)
+        outbound_checker
       end
     end
 

data/lib/shadowsocks/server.rb

@@ -12,6 +12,7 @@ module Shadowsocks
 
       def receive_data data
         server.send_data encrypt(table[:encrypt_table], data)
+        outbound_checker
       end
     end
 

data/lib/shadowsocks/tunnel.rb

@@ -1,5 +1,5 @@
 module Shadowsocks
-  class Tunnel < EventMachine::Connection
+  class Tunnel < ::Shadowsocks::Connection
     attr_accessor :server, :table
 
     def initialize server, table
@@ -12,6 +12,10 @@ module Shadowsocks
       server.close_connection_after_writing
     end
 
+    def remote
+      server
+    end
+
     def encrypt table, data
       server.encrypt table, data
     end

data/lib/shadowsocks/version.rb

@@ -1,3 +1,3 @@
 module Shadowsocks
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shadowsocks
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Sen
@@ -117,6 +117,7 @@ files:
 - lib/shadowsocks.rb
 - lib/shadowsocks/cli.rb
 - lib/shadowsocks/config.rb
+- lib/shadowsocks/connection.rb
 - lib/shadowsocks/listener.rb
 - lib/shadowsocks/local.rb
 - lib/shadowsocks/server.rb
@@ -146,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: ruby version of shadowsocks