girl 9.1.8 → 9.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2c6dd87559c942761c2b8c9ffc27801755af55ea4348d215e244a22eb322e73
-  data.tar.gz: 9d9600b04852239dc01e39ea078eb75353dc8734032ea96c00e56e14f84dfc85
+  metadata.gz: d155f995eb24eb7cc229250e742c6774227409957f11174c083d5ffbc0786327
+  data.tar.gz: d9209954dea7a1a83e1afcb5caeb2c11df7f6a979da98148b9c89d20ab362558
 SHA512:
-  metadata.gz: 54c9c01fef8adbb375aeba548473b117c1867cb515db9cd9672a959e3822589a122f27807b0523adf206b61b826f61df7c85e693cdbab757917b9fd56540826e
-  data.tar.gz: 3ff6355c411f60822c5c6d2a281b164c4d8a623af2de0f0003a84e5e215dada347b7637c7c1bd6867a2dd3f6011f692d0ae609d3a2070a429f5d61d661c92c59
+  metadata.gz: f173264881db0d06eaa9ed74b067344ce26b26e942c46e283ce9a7018f22f05948e3a34d54041a1bb2f263ff41046671f4873352c81e546adc1fefe15d372f20
+  data.tar.gz: 99b35c8abceafb34f19660f9721a737928ba9d652e171d5ebe7c309a032d9649e6dee86c80a2c63a5730e01ac05469a369fba202e2d8b718b13a5daa22feec47

data/girl.gemspec

@@ -27,4 +27,5 @@ lib/girl/version.rb
   ]
 
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 1.6.7'
 end

data/lib/girl/proxy.rb

@@ -51,7 +51,7 @@ module Girl
       h_p1_switch_to_big = conf[:h_p1_switch_to_big]   # X
       expire_connecting = conf[:expire_connecting]     # 连接多久没有建成关闭（秒）
       expire_long_after = conf[:expire_long_after]     # 长连接多久没有新流量关闭（秒）
-      expire_proxy_after = conf[:expire_proxy_after]   # proxy多久没有收到流量重建（秒）
+      expire_proxy_after = conf[:expire_proxy_after]   # proxy多久没有收到流量关闭（秒）
       expire_resolv_cache = conf[:expire_resolv_cache] # dns查询结果缓存多久（秒）
       expire_short_after = conf[:expire_short_after]   # 短连接创建多久后关闭（秒）
       is_debug = conf[:is_debug]

data/lib/girl/proxy_worker.rb

@@ -582,7 +582,6 @@ module Girl
         return if data.bytesize < 9
         p2_id = data[1, 8].unpack('Q>').first
         data = data[9..-1]
-        # puts "big got h_p2_traffic #{p2_id} #{data.bytesize}" if @is_debug
         p1, p1_info = @p1_infos.find{|_, info| info[:p2_id] == p2_id}
 
         if p1_info
@@ -596,7 +595,6 @@ module Girl
         return if data.bytesize < 9
         src_id = data[1, 8].unpack('Q>').first
         data = data[9..-1]
-        # puts "big got h_traffic #{src_id} #{data.bytesize}" if @is_debug
         src, src_info = @src_infos.find{|_, info| info[:src_id] == src_id}
 
         if src_info
@@ -1163,9 +1161,10 @@ module Girl
       when 'heartbeat'
         new_a_proxy if @proxy.closed?
         new_a_big if @big.closed?
+        now = Time.new
         proxy_info = @proxy_infos[@proxy]
         
-        if Time.new.to_i - proxy_info[:recv_at].to_i >= @expire_proxy_after
+        if now.to_i - proxy_info[:recv_at].to_i >= @expire_proxy_after
           puts "renew proxy"
           close_proxy(@proxy)
           new_a_proxy
@@ -1175,7 +1174,7 @@ module Girl
 
         big_info = @big_infos[@big]
 
-        if Time.new.to_i - big_info[:recv_at].to_i >= @expire_proxy_after
+        if now.to_i - big_info[:recv_at].to_i >= @expire_proxy_after
           puts "renew big"
           close_big(@big)
           new_a_big

data/lib/girl/proxyd.rb

@@ -42,6 +42,7 @@ module Girl
         h_p1_switch_to_big = conf[:h_p1_switch_to_big]   # X
         expire_connecting = conf[:expire_connecting]     # 连接多久没有建成关闭（秒）
         expire_long_after = conf[:expire_long_after]     # 长连接多久没有新流量关闭（秒）
+        expire_proxy_after = conf[:expire_proxy_after]   # proxy多久没有收到流量关闭（秒）
         expire_resolv_cache = conf[:expire_resolv_cache] # dns查询结果缓存多久（秒）
         expire_short_after = conf[:expire_short_after]   # 短连接创建多久后关闭（秒）
         is_debug = conf[:is_debug]
@@ -94,6 +95,7 @@ module Girl
       h_p1_switch_to_big = h_p1_switch_to_big ? h_p1_switch_to_big.to_s : 'X'
       expire_connecting = expire_connecting ? expire_connecting.to_i : 5
       expire_long_after = expire_long_after ? expire_long_after.to_i : 3600
+      expire_proxy_after = expire_proxy_after ? expire_proxy_after.to_i : 60
       expire_resolv_cache = expire_resolv_cache ? expire_resolv_cache.to_i : 600
       expire_short_after = expire_short_after ? expire_short_after.to_i : 5
       is_server_fastopen = false
@@ -141,6 +143,7 @@ module Girl
         h_p1_switch_to_big,
         expire_connecting,
         expire_long_after,
+        expire_proxy_after,
         expire_resolv_cache,
         expire_short_after,
         is_debug,

data/lib/girl/proxyd_worker.rb

@@ -29,6 +29,7 @@ module Girl
       h_p1_switch_to_big,
       expire_connecting,
       expire_long_after,
+      expire_proxy_after,
       expire_resolv_cache,
       expire_short_after,
       is_debug,
@@ -42,8 +43,8 @@ module Girl
       @writes = []         # 写池
       @roles = {}          # sock => :big / :bigd / :dns / :dst / :infod / :mem / :memd / :p2 / :p2d / :proxy / :proxyd / :rsv
       @updates = {}        # sock => updated_at
-      @proxy_infos = {}    # proxy => {:addrinfo :im :rbuff :wbuff}
-      @big_infos = {}      # big => {:addrinfo :im :overflowing :rbuff :wbuff}
+      @proxy_infos = {}    # proxy => {:addrinfo :im :rbuff :recv_at :wbuff}
+      @big_infos = {}      # big => {:addrinfo :im :overflowing :rbuff :recv_at :wbuff}
       @im_infos = {}       # im => {:addrinfo :big :big_connect_at :in :out :p2d :p2d_host :p2d_port :proxy :proxy_connect_at}
       @src_infos = {}      # src_id => {:created_at :dst :im :rbuff}
       @mem_infos = {}      # mem => {:wbuff}
@@ -71,6 +72,7 @@ module Girl
       @h_p1_switch_to_big = h_p1_switch_to_big
       @expire_connecting = expire_connecting
       @expire_long_after = expire_long_after
+      @expire_proxy_after = expire_proxy_after
       @expire_resolv_cache = expire_resolv_cache
       @expire_short_after = expire_short_after
       @is_debug = is_debug
@@ -349,8 +351,8 @@ module Girl
     def check_expire_bigs
       now = Time.new
 
-      @big_infos.select{|big, _| now.to_i - @updates[big].to_i >= @expire_long_after}.each do |big, info|
-        puts "expire big #{info[:im]}"
+      @big_infos.select{|big, info| now.to_i - info[:recv_at].to_i >= @expire_proxy_after}.each do |big, info|
+        puts "expire big #{info[:im]} #{info[:addrinfo].ip_unpack.inspect}"
         close_big(big)
       end
     end
@@ -394,8 +396,8 @@ module Girl
     def check_expire_proxies
       now = Time.new
 
-      @proxy_infos.select{|proxy, _| now.to_i - @updates[proxy].to_i >= @expire_long_after}.each do |proxy, info|
-        puts "expire proxy #{info[:im]}"
+      @proxy_infos.select{|proxy, info| now.to_i - info[:recv_at].to_i >= @expire_proxy_after}.each do |proxy, info|
+        puts "expire proxy #{info[:im]} #{info[:addrinfo].ip_unpack.inspect}"
         close_proxy(proxy)
       end
     end
@@ -540,6 +542,8 @@ module Girl
       big_info = @big_infos[big]
       im = big_info[:im]
       return unless im
+      now = Time.new
+      big_info[:recv_at] = now
       h = data[0]
 
       case h
@@ -547,7 +551,6 @@ module Girl
         return if data.bytesize < 9
         p2_id = data[1, 8].unpack('Q>').first
         data = data[9..-1]
-        # puts "big got h_p2_traffic #{im} #{p2_id} #{data.bytesize}" if @is_debug
         p2, p2_info = @p2_infos.find{|_, info| (info[:im] == im) && (info[:p2_id] == p2_id)}
         
         if p2_info
@@ -561,7 +564,6 @@ module Girl
         return if data.bytesize < 9
         src_id = data[1, 8].unpack('Q>').first
         data = data[9..-1]
-        # puts "big got h_traffic #{im} #{src_id} #{data.bytesize}" if @is_debug
         src_info = @src_infos[src_id]
 
         if src_info
@@ -587,6 +589,8 @@ module Girl
       proxy_info = @proxy_infos[proxy]
       im = proxy_info[:im]
       return unless im
+      now = Time.new
+      proxy_info[:recv_at] = now
       h = data[0]
 
       case h
@@ -597,7 +601,7 @@ module Girl
         domain_port = data[9..-1]
         puts "got h_a_new_source #{im} #{src_id} #{domain_port.inspect}" if @is_debug
         @src_infos[src_id] = {
-          created_at: Time.new,
+          created_at: now,
           dst: nil,
           im: im,
           rbuff: ''
@@ -1025,15 +1029,14 @@ module Girl
 
       puts "accept a big #{addrinfo.ip_unpack.inspect}"
 
-      big_info = {
+      @big_infos[big] = {
         addrinfo: addrinfo,
         im: nil,
         overflowing: false,
         rbuff: '',
+        recv_at: Time.new,
         wbuff: ''
       }
-
-      @big_infos[big] = big_info
       add_read(big, :big)
     end
 
@@ -1447,6 +1450,7 @@ module Girl
         addrinfo: addrinfo,
         im: nil,
         rbuff: '',
+        recv_at: Time.new,
         wbuff: ''
       }
       add_read(proxy, :proxy)
@@ -1581,15 +1585,6 @@ module Girl
         return
       end
 
-      im = big_info[:im]
-      im_info = @im_infos[im]
-
-      if im_info.nil? || im_info[:proxy].nil?
-        puts "proxy not found close big"
-        close_big(big)
-        return
-      end
-
       data = big_info[:wbuff]
 
       if data.empty?
@@ -1607,12 +1602,18 @@ module Girl
       end
 
       set_update(big)
-      im_info[:out] += written
+      im = big_info[:im]
+
+      if im
+        im_info = @im_infos[im]
+        im_info[:out] += written if im_info
+      end
+
       data = data[written..-1]
       big_info[:wbuff] = data
 
       if big_info[:wbuff].empty? && big_info[:overflowing]
-        puts "big empty #{big_info[:im]}"
+        puts "big empty #{im}"
         big_info[:overflowing] = false
 
         @dst_infos.select{|_, info| (info[:im] == im) && info[:is_big]}.each do |dst, info|
@@ -1636,6 +1637,15 @@ module Girl
         return
       end
 
+      im = dst_info[:im]
+      im_info = @im_infos[im]
+
+      unless im_info
+        puts "im info not found close dst"
+        close_dst(dst)
+        return
+      end
+
       dst_info[:connected] = true
       data = dst_info[:wbuff]
 
@@ -1659,14 +1669,7 @@ module Girl
       end
 
       set_update(dst)
-      im = dst_info[:im]
-      im_info = @im_infos[im]
-
-      if im_info
-        im_info[:out] += written
-        big = im_info[:big]
-      end
-      
+      im_info[:out] += written
       data = data[written..-1]
       dst_info[:wbuff] = data
       src_id = dst_info[:src_id]
@@ -1675,6 +1678,7 @@ module Girl
       if dst_info[:overflowing] && dst_info[:wbuff].empty? && dst_info[:wpend].empty?
         puts "dst empty #{im} #{src_id} #{domain}"
         dst_info[:overflowing] = false
+        big = im_info[:big]
 
         if big
           puts "resume big"
@@ -1723,6 +1727,15 @@ module Girl
         return
       end
 
+      im = p2_info[:im]
+      im_info = @im_infos[im]
+
+      unless im_info
+        puts "im info not found close p2"
+        close_p2(p2)
+        return
+      end
+
       data = p2_info[:wbuff]
 
       if data.empty?
@@ -1745,9 +1758,6 @@ module Girl
       end
 
       set_update(p2)
-      im = p2_info[:im]
-      im_info = @im_infos[im]
-      big = im_info[:big] if im_info
       data = data[written..-1]
       p2_info[:wbuff] = data
       p2_id = p2_info[:p2_id]
@@ -1755,6 +1765,7 @@ module Girl
       if p2_info[:overflowing] && p2_info[:wbuff].empty? && p2_info[:wpend].empty?
         puts "p2 empty #{im} #{p2_id}"
         p2_info[:overflowing] = false
+        big = im_info[:big]
 
         if big
           puts "resume big"
@@ -1790,8 +1801,12 @@ module Girl
 
       set_update(proxy)
       im = proxy_info[:im]
-      im_info = @im_infos[im]
-      im_info[:out] += written if im_info
+
+      if im
+        im_info = @im_infos[im]
+        im_info[:out] += written if im_info
+      end
+
       data = data[written..-1]
       proxy_info[:wbuff] = data
     end

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '9.1.8'.freeze
+  VERSION = '9.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 9.1.8
+  version: 9.2.0
 platform: ruby
 authors:
 - takafan
@@ -36,7 +36,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.6.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="