girl 0.73.0 → 0.73.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d975dc92620d5ea2c27493ed0fbbb19a145fc7ecda564c2f5609eb710e06912d
-  data.tar.gz: 5c098f6b8aecc89d246e8e4b1c477eb42e86ce695b27d4329962255d380b4f09
+  metadata.gz: 33af151d416edee9c887ce27984d09f2dd29f9ab73b2f09beac406bdde96eba4
+  data.tar.gz: bd0271ae4f10083e473ec9ec9794becccb2a24f5d2888b94c48e8402ab08f475
 SHA512:
-  metadata.gz: 326b198254e6508e42b00145e00c56214574510448ba05b852b257b44da2c54b443509d1e2af514a668b1394e27cfff2ae93cf1957526adf9315a73e32a3ebbd
-  data.tar.gz: 21e0cab87ffe323314607d74c3884eb2987208a9375b417c1158d1768e7aafcf536d7370d5fdff58b08d1d7acb95da009eba57ddcc9d9d22702e405078b2c7e5
+  metadata.gz: 699f24fd304267c96841c882290a47961a3fefcd21bdf8b8bef509b20eaaa7200f5292d58cc10248a251e541cf6a5bb68d43bef1ad7f4d24881b8ef8c994130a
+  data.tar.gz: 7c3e71e1c31c9e61f3584b2b1b0a78b505a7e222c61d6b5edd041f7a25a985267ec13bf1432d6bcdfc46c89d9fb0bf32678fda57b47e8a917c40f4451da93e82

data/lib/girl/proxy_worker.rb

@@ -123,9 +123,7 @@ module Girl
             end
 
             @src_infos.each do | src, src_info |
-              is_expired = src_info[ :last_recv_at ].nil? && ( now - src_info[ :created_at ] > EXPIRE_NEW )
-
-              if is_expired
+              if now - src_info[ :last_continue_at ] > EXPIRE_AFTER
                 puts "p#{ Process.pid } #{ Time.new } expire src"
                 set_is_closing( src )
                 need_trigger = true
@@ -133,10 +131,8 @@ module Girl
             end
 
             @dst_infos.each do | dst, dst_info |
-              is_expired = dst_info[ :last_recv_at ].nil?  && ( now - dst_info[ :created_at ] > EXPIRE_NEW )
-
-              if is_expired
-                puts "p#{ Process.pid } #{ Time.new } expire dst"
+              if now - dst_info[ :last_continue_at ] > EXPIRE_AFTER
+                puts "p#{ Process.pid } #{ Time.new } expire dst #{ dst_info[ :domain ] }"
                 set_is_closing( dst )
                 need_trigger = true
               end
@@ -337,6 +333,7 @@ module Girl
     #
     def new_a_dst( src, ip_info )
       src_info = @src_infos[ src ]
+      domain = src_info[ :destination_domain ]
       destination_addr = Socket.sockaddr_in( src_info[ :destination_port ], ip_info.ip_address )
       dst = Socket.new( ip_info.ipv4? ? Socket::AF_INET : Socket::AF_INET6, Socket::SOCK_STREAM, 0 )
 
@@ -357,15 +354,15 @@ module Girl
       # puts "debug1 a new dst #{ dst.local_address.inspect }"
       local_port = dst.local_address.ip_port
       @dst_infos[ dst ] = {
-        local_port: local_port, # 本地端口
-        src: src,               # 对应src
-        wbuff: '',              # 写前
-        cache: '',              # 块读出缓存
-        chunks: [],             # 块队列，写前达到块大小时结一个块 filename
-        spring: 0,              # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
-        created_at: Time.new,   # 创建时间
-        last_recv_at: nil,      # 上一次收到流量的时间，过期关闭
-        is_closing: false       # 是否准备关闭
+        local_port: local_port,     # 本地端口
+        src: src,                   # 对应src
+        domain: domain,             # 域名
+        wbuff: '',                  # 写前
+        cache: '',                  # 块读出缓存
+        chunks: [],                 # 块队列，写前达到块大小时结一个块 filename
+        spring: 0,                  # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
+        last_continue_at: Time.new, # 上一次发生流量的时间
+        is_closing: false           # 是否准备关闭
       }
 
       add_read( dst, :dst )
@@ -407,7 +404,7 @@ module Girl
         is_dst_closed: false,      # dst是否已关闭
         biggest_dst_pack_id: 0,    # dst最大包号码
         completed_pack_id: 0,      # 完成到几（对面收到几）
-        last_continue_at: Time.new # 创建，或者上一次收到连续流量，或者发出新包的时间
+        last_continue_at: Time.new # 上一次发生流量的时间
       }
 
       src_info = @src_infos[ src ]
@@ -768,6 +765,7 @@ module Girl
       # puts "debug2 write src #{ written }"
       data = data[ written..-1 ]
       src_info[ from ] = data
+      src_info[ :last_continue_at ] = Time.new
     end
 
     ##
@@ -819,6 +817,7 @@ module Girl
       # puts "debug2 write dst #{ written }"
       data = data[ written..-1 ]
       dst_info[ from ] = data
+      dst_info[ :last_continue_at ] = Time.new
     end
 
     ##
@@ -971,22 +970,21 @@ module Girl
       # puts "debug1 accept a src #{ addrinfo.inspect } #{ id }"
 
       @src_infos[ src ] = {
-        id: id,                  # id
-        proxy_proto: :uncheck,   # :uncheck / :http / :socks5
-        proxy_type: :uncheck,    # :uncheck / :checking / :direct / :tunnel / :negotiation
-        dst: nil,                # :direct的场合，对应的dst
-        destination_domain: nil, # 目的地域名
-        destination_port: nil,   # 目的地端口
-        biggest_pack_id: 0,      # 最大包号码
-        is_connect: true,        # 代理协议是http的场合，是否是CONNECT
-        rbuffs: [],              # 非CONNECT，dst或者远端dst未准备好，暂存流量 [ pack_id, data ]
-        wbuff: '',               # 写前
-        cache: '',               # 块读出缓存
-        chunks: [],              # 块队列，写前达到块大小时结一个块 filename
-        spring: 0,               # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
-        created_at: Time.new,    # 创建时间
-        last_recv_at: nil,       # 上一次收到流量的时间，过期关闭
-        is_closing: false        # 是否准备关闭
+        id: id,                     # id
+        proxy_proto: :uncheck,      # :uncheck / :http / :socks5
+        proxy_type: :uncheck,       # :uncheck / :checking / :direct / :tunnel / :negotiation
+        dst: nil,                   # :direct的场合，对应的dst
+        destination_domain: nil,    # 目的地域名
+        destination_port: nil,      # 目的地端口
+        biggest_pack_id: 0,         # 最大包号码
+        is_connect: true,           # 代理协议是http的场合，是否是CONNECT
+        rbuffs: [],                 # 非CONNECT，dst或者远端dst未准备好，暂存流量 [ pack_id, data ]
+        wbuff: '',                  # 写前
+        cache: '',                  # 块读出缓存
+        chunks: [],                 # 块队列，写前达到块大小时结一个块 filename
+        spring: 0,                  # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
+        last_continue_at: Time.new, # 上一次发生流量的时间
+        is_closing: false           # 是否准备关闭
       }
 
       add_read( src, :src )
@@ -1008,7 +1006,7 @@ module Girl
 
       # puts "debug2 read src #{ data.inspect }"
       src_info = @src_infos[ src ]
-      src_info[ :last_recv_at ] = Time.new
+      src_info[ :last_continue_at ] = Time.new
       proxy_type = src_info[ :proxy_type ]
 
       case proxy_type
@@ -1198,7 +1196,7 @@ module Girl
 
       # puts "debug2 read dst #{ data.inspect }"
       dst_info = @dst_infos[ dst ]
-      dst_info[ :last_recv_at ] = Time.new
+      dst_info[ :last_continue_at ] = Time.new
       src = dst_info[ :src ]
 
       if src.closed?

data/lib/girl/proxyd_worker.rb

@@ -123,10 +123,8 @@ module Girl
             end
 
             @dst_infos.each do | dst, dst_info |
-              is_expired = dst_info[ :last_recv_at ].nil? && ( now - dst_info[ :created_at ] > EXPIRE_NEW )
-
-              if is_expired
-                puts "p#{ Process.pid } #{ Time.new } expire dst"
+              if now - dst_info[ :last_continue_at ] > EXPIRE_AFTER
+                puts "p#{ Process.pid } #{ Time.new } expire dst #{ dst_info[ :domain_port ] }"
                 set_is_closing( dst )
                 need_trigger = true
               end
@@ -195,7 +193,7 @@ module Girl
 
         if Time.new - created_at < RESOLV_CACHE_EXPIRE
           # puts "debug1 #{ destination_domain_port } hit resolv cache #{ Addrinfo.new( destination_addr ).inspect }"
-          deal_with_destination_addr( tund, src_id, destination_addr )
+          deal_with_destination_addr( tund, src_id, destination_addr, destination_domain_port )
           return
         end
 
@@ -223,7 +221,7 @@ module Girl
             @resolv_caches[ destination_domain_port ] = [ destination_addr, Time.new ]
 
             unless tund.closed?
-              if deal_with_destination_addr( tund, src_id, destination_addr )
+              if deal_with_destination_addr( tund, src_id, destination_addr, destination_domain_port )
                 next_tick
               end
             end
@@ -235,7 +233,7 @@ module Girl
     ##
     # deal with destination addr
     #
-    def deal_with_destination_addr( tund, src_id, destination_addr )
+    def deal_with_destination_addr( tund, src_id, destination_addr, destination_domain_port )
       dst = Socket.new( Addrinfo.new( destination_addr ).ipv4? ? Socket::AF_INET : Socket::AF_INET6, Socket::SOCK_STREAM, 0 )
       dst.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
 
@@ -250,16 +248,16 @@ module Girl
       local_port = dst.local_address.ip_port
 
       @dst_infos[ dst ] = {
-        local_port: local_port, # 本地端口
-        tund: tund,             # 对应tund
-        biggest_pack_id: 0,     # 最大包号码
-        wbuff: '',              # 写前
-        cache: '',              # 块读出缓存
-        chunks: [],             # 块队列，写前达到块大小时结一个块 filename
-        spring: 0,              # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
-        created_at: Time.new,   # 创建时间
-        last_recv_at: nil,      # 上一次收到流量的时间，过期关闭
-        is_closing: false       # 是否准备关闭
+        local_port: local_port,               # 本地端口
+        tund: tund,                           # 对应tund
+        domain_port: destination_domain_port, # 域名和端口
+        biggest_pack_id: 0,                   # 最大包号码
+        wbuff: '',                            # 写前
+        cache: '',                            # 块读出缓存
+        chunks: [],                           # 块队列，写前达到块大小时结一个块 filename
+        spring: 0,                            # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
+        last_continue_at: Time.new,           # 上一次发生流量的时间
+        is_closing: false                     # 是否准备关闭
       }
       add_read( dst, :dst )
 
@@ -276,7 +274,7 @@ module Girl
         is_src_closed: false,      # src是否已关闭
         biggest_src_pack_id: 0,    # src最大包号码
         completed_pack_id: 0,      # 完成到几（对面收到几）
-        last_continue_at: Time.new # 创建，或者上一次收到连续流量，或者发出新包的时间
+        last_continue_at: Time.new # 上一次发生流量的时间
       }
 
       data = [ 0, PAIRED, src_id, local_port ].pack( 'Q>CQ>n' )
@@ -586,6 +584,7 @@ module Girl
       # puts "debug2 write dst #{ written }"
       data = data[ written..-1 ]
       dst_info[ from ] = data
+      dst_info[ :last_continue_at ] = Time.new
     end
 
     ##
@@ -775,7 +774,7 @@ module Girl
 
       # puts "debug2 read dst #{ data.inspect }"
       dst_info = @dst_infos[ dst ]
-      dst_info[ :last_recv_at ] = Time.new
+      dst_info[ :last_continue_at ] = Time.new
       tund = dst_info[ :tund ]
 
       if tund.closed?

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '0.73.0'.freeze
+  VERSION = '0.73.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 0.73.0
+  version: 0.73.1
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-07-19 00:00:00.000000000 Z
 dependencies: []
 description: while internet is evil, here's a girl.
 email: