girl 0.92.0 → 0.93.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fa3e8cb3a29bc4e4e3c02508fe9277a3efc17d1864459999ec8992c685ed729
-  data.tar.gz: 88b5969712da8922962166e2b17e355c6c5042051e6b18f29f79e9d3aa15845b
+  metadata.gz: db00d3852751d26d014f0db01a04a8a3c4d7a43681003dc7b5a61b5af3f42db7
+  data.tar.gz: 1938878b1125a8868aa1415a3c9200cf9003dc4310665ebcd7d51aba5871358a
 SHA512:
-  metadata.gz: fcf011065b4049ab8d890abb4e38af6dd2f8001359fb78ae555e667fdc9142d6317c7de6c0ef7cfef8bddc537bef845e665d541734e2350f523aadc4e9e75853
-  data.tar.gz: 942f594fb209cc3797822b9492ac8ba81eaa8d63b1824cac260e21a472b5589b335b7453d2381f5f839b6d3926b501c33cee079aba9da12dd1d7264e2e68580d
+  metadata.gz: 6764a6e73718d396b02bac36d0d078741a659cfa1a32de13ef41183b4ed67b98be92e60a4d284abbdc3ee7ce929e872860f9aa7eab7caf715c3371c858eb6553
+  data.tar.gz: 1945f2f6bc976654fe9542df2c8145ab983aa16ebdad0100a8893948a4cf076bf7e4851813fbfd459b78601c66bfd1e5fe120d29808b329e1558375509fe4e9c

data/lib/girl/head.rb

@@ -2,7 +2,8 @@ module Girl
   READ_SIZE             = 1024 * 1024       # 一次读多少
   WBUFF_LIMIT           = 100 * 1024 * 1024 # 写前上限，超过上限暂停读
   RESUME_BELOW          = WBUFF_LIMIT / 2   # 降到多少以下恢复读
-  SEND_HELLO_COUNT      = 10                # hello最多发几次
+  SEND_HELLO_COUNT      = 10                # hello/a new source最多发几次
+  SEND_HELLO_INTERVAL   = 0.5               # 发送hello/a new source间隔
   EXPIRE_AFTER          = 300               # 多久没有新流量，过期
   CHECK_EXPIRE_INTERVAL = 30                # 检查过期间隔
   CHECK_RESUME_INTERVAL = 1                 # 检查恢复读间隔
@@ -42,6 +43,7 @@ EOF
     WBUFF_LIMIT
     RESUME_BELOW
     SEND_HELLO_COUNT
+    SEND_HELLO_INTERVAL
     EXPIRE_AFTER
     CHECK_EXPIRE_INTERVAL
     CHECK_RESUME_INTERVAL

data/lib/girl/proxy_worker.rb

@@ -353,7 +353,7 @@ module Girl
     def del_src_info( src )
       src_info = @src_infos.delete( src )
 
-      if src_info[ :stream ] && @tun && !@tun.closed? then
+      if ( src_info[ :proxy_type ] == :tunnel ) && @tun && !@tun.closed? then
         @tun_info[ :srcs ].delete( src_info[ :id ] )
       end
 
@@ -369,6 +369,7 @@ module Girl
           sleep CHECK_EXPIRE_INTERVAL
 
           @mutex.synchronize do
+            trigger = false
             now = Time.new
 
             if @tun && !@tun.closed? then
@@ -382,6 +383,8 @@ module Girl
                 data = [ 0, HEARTBEAT ].pack( 'Q>C' )
                 add_ctlmsg( data )
               end
+
+              trigger = true
             end
 
             @src_infos.each do | src, src_info |
@@ -391,10 +394,11 @@ module Girl
               if ( now - last_recv_at >= EXPIRE_AFTER ) && ( now - last_sent_at >= EXPIRE_AFTER ) then
                 puts "p#{ Process.pid } #{ Time.new } expire src #{ src_info[ :destination_domain ] }"
                 set_src_closing( src )
+                trigger = true
               end
             end
 
-            next_tick
+            next_tick if trigger
           end
         end
       end
@@ -492,7 +496,7 @@ module Girl
               next_tick
             end
 
-            sleep 1
+            sleep SEND_HELLO_INTERVAL
           end
         end
       end
@@ -667,7 +671,7 @@ module Girl
             next_tick
           end
 
-          sleep 1
+          sleep SEND_HELLO_INTERVAL
         end
       end
     end

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '0.92.0'.freeze
+  VERSION = '0.93.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 0.92.0
+  version: 0.93.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-11 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies: []
 description: escape evil.
 email: