r_proxy 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f0065ab65442af3554629362b7ba10f12e247a4b81c53ededc545c381b4d5e8
-  data.tar.gz: 3882a0ec3c594581970a7db9cca5a79056563bc2d64dfa7bed91495724c903eb
+  metadata.gz: 50837a373486d272c73b9ed6db87ad8b493ddb8e1f8414cbeefc57fb48fe70fd
+  data.tar.gz: 871267b24a049f223e3685445744472cd0f4b1d34d907f080a0e0d7ae00abc1f
 SHA512:
-  metadata.gz: 0a53bd67b6d97a735a0cfc4d1a3b836f54ec6aa41301b5d450905f09612b0374dd52ea29e173873048fa1242439fa7025c1a60c89e25eab6d7231d7e6ad1846a
-  data.tar.gz: 867cd29058afb86b28aa7d45d9e30c1f6d2b5f5c16c806464de9e3388f30048bc6008943331f7c0cd87ac4b89d855a7f5a0b9014e7e56497cd34e360943e0d5d
+  metadata.gz: 3988856e3fd0aebf0cab190d8a56130db797d41f06b280fa880be8b083546223ace4d729c5e53bc1b125bf0bc614253bed106e55ef0f92a4c05a3d6d882a8e50
+  data.tar.gz: b6b1170d829f7167fafd6fceb72e125cb032aaf667a7e7cea3bd3cf03dbd0ab79b984b8d982c58b606c65eec21681d9b353ec985561749babfd8a4cb11641a96

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    r_proxy (0.2.3)
+    r_proxy (0.2.4)
       eventmachine (~> 1.2, >= 1.2.7)
       redis (~> 4.1, >= 4.1.4)
 

data/README.md

@@ -21,7 +21,7 @@ Or install it yourself as:
 
 ## Usage
 
-##### Currently only support `BSD` and `MacOS`
+##### Currently only support `BSD`, `Linux` and `MacOS`
 
 Http and Https proxy server
 

data/lib/r_proxy/callback_connection.rb

@@ -14,21 +14,24 @@ module RProxy
       @logger = logger
     end
 
-    def connection_completed
+    def post_init
       start_tls if @need_tls
       set_comm_inactivity_timeout(20)
+    end
+
+    def ssl_handshake_completed
       send_data(@http_request)
     end
 
+    def connection_completed
+      send_data(@http_request) if !@need_tls
+    end
+
     def receive_data(data)
       @response = data.split("\r\n")[0]
       close_connection
     end
 
-    def ssl_handshake_completed
-      send_data(@http_request)
-    end
-
     def unbind
       @logger.info("#{@uri.host}#{@path} response status: #{@response}") if @logger
     end

data/lib/r_proxy/callback_service.rb

@@ -4,7 +4,6 @@ module RProxy
       return if url.nil? || url.empty?
       uri = URI(url)
       tls = uri.scheme == 'https'
-
       EventMachine.connect(
         uri.host,
         uri.port,

data/lib/r_proxy/connection_handler.rb

@@ -14,7 +14,6 @@ module RProxy
       @cache_pool = cache_pool
       @usage_manager = RProxy::UsageManager.new(config, @cache_pool, @redis)
       @http_parser = HttpProxyParser.new(@usage_manager)
-      @snapshot_service = RProxy::CheckSnapshotService.new(@redis, @config)
       @enable_force_quit = config.enable_force_quit
     end
 
@@ -59,9 +58,6 @@ module RProxy
           @username = @http_parser.username
           @password = @http_parser.password
           @target_connection.assign_user_and_password(@username, @password)
-
-          # check snapshot
-          @snapshot_service.call(@username, @password, remain)
         end
       rescue RProxy::HTTPAuthFailed
         send_data(RProxy::Constants::HTTP_FAILED_AUTH)

data/lib/r_proxy/master_process.rb

@@ -39,7 +39,7 @@ module RProxy
         next unless pid
         Process.kill("TERM", pid)
       end
-      @watchers.each { |t| t.join }
+      sleep(1)
       @logger.info('all process exited....') if @logger
     end
 

data/lib/r_proxy/usage_manager.rb

@@ -5,12 +5,11 @@ module RProxy
       @cache_pool = cache_pool
       @redis = redis
       @no_cache_below = config.no_cache_below
+      @check_snapshot_service = RProxy::CheckSnapshotService.new(@redis, config)
     end
 
     def auth_user(user, pass)
-      key = proxy_key(user, pass)
-
-      value = fetch_usage(key)
+      value = fetch_usage(user, pass)
 
       return value if !value.nil? && value.to_i > 0
       nil
@@ -32,15 +31,23 @@ module RProxy
 
     private
 
-    def fetch_usage(key)
-      return @redis.get(key) if !@enable_cache || !@cache_pool.writable?
+    def fetch_usage(user, pass)
+      key = proxy_key(user, pass)
+      if !@enable_cache || !@cache_pool.writable?
+        value = @redis.get(key)
+        @check_snapshot_service.call(user, pass, value)
+      end
 
       cache = @cache_pool[key]
 
       if cache.nil?
+
         value = @redis.get(key)
 
-        return value if !value.nil? && value.to_i <= @no_cache_below
+        if !value.nil?
+          @check_snapshot_service.call(user, pass, value)
+          return value if value.to_i <= @no_cache_below
+        end
 
         @cache_pool[key] = {
           usage: value,

data/lib/r_proxy/version.rb

@@ -1,3 +1,3 @@
 module RProxy
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r_proxy
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Nick An
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-09 00:00:00.000000000 Z
+date: 2020-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine