girl 9.1.6 → 9.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e4b19fc2e7fc3305e1b09f567f8f75cb2c94ae5cf61affddfdaead47c93b634
-  data.tar.gz: e6177ecd45c01e1aa6d379034bec3a6ab297feec8c2275296ba61767523a9299
+  metadata.gz: 0fb6e8b23d6592879331b008463de29fd523fa803ec64de30b276c21b6363c6e
+  data.tar.gz: ad47b37c7378b2ac44be6b1f2d6fcea90eed1367b2f17d878e60fad943abe82b
 SHA512:
-  metadata.gz: 46bf4e1a5d83fc8535e3086cae463fe978b5393eb638c750a984ef2cccf4b2fc25bc9e3cc77bd9568767e2f62f8a7e1e9fa256f327d5db21b716b5f12d4c4400
-  data.tar.gz: e9d6aab50fd9f471b49d01547ff4bc72214590e134cccdd84ee73ffb230333eecb63cb43ff355e91afe4402129ac777dd03faf2141a653c9765b7df1f6e9c5f9
+  metadata.gz: b9167e14d9e01219abe7ea2005bc340d75cb22427d6b31d37de53a78b1be6af52e65fbd8282e45d55a54abe8f2f8239fbe5d66fe203191e2362c6e538f3be4e7
+  data.tar.gz: a9f9c2298974bd7dd84d30d591aa0d76be07249f6c89135b409f1ba256ab36566c4ee46cef6294bcad8af65487ecec7df6aa2a09afa367bfd41b223e63526fc5

data/lib/girl/head.rb

@@ -2,8 +2,8 @@ module Girl
   BACKLOG              = 512               # 听队列大小，满后掉SYN包
   RLIMIT               = 1024              # sock数上限
   READ_SIZE            = 1 * 1024 * 1024   # 一次最多读多少
-  WBUFF_LIMIT          = 10 * 1024 * 1024  # 写前上限，超过上限暂停读另一头
-  CLOSE_ABOVE          = 100 * 1024 * 1024 # 超过多少强制关闭
+  WBUFF_LIMIT          = 20 * 1024 * 1024  # 写前上限，超过上限暂停读另一头
+  CLOSE_ABOVE          = 200 * 1024 * 1024 # 超过多少强制关闭
   HEARTBEAT_INTERVAL   = 10                # 心跳间隔
   CHECK_TRAFF_INTERVAL = 3600              # 多久检查一次，今天是不是流量计数重置日
   HTTP_OK = "HTTP/1.1 200 OK\r\n\r\n"

data/lib/girl/proxy.rb

@@ -33,18 +33,22 @@ module Girl
       remote_path = conf[:remote_path]
       appd_host = conf[:appd_host]
       appd_port = conf[:appd_port]
-      head_len = conf[:head_len]               # 头长度
-      h_a_new_source = conf[:h_a_new_source]   # A
-      h_a_new_p2 = conf[:h_a_new_p2]           # B
-      h_dst_close = conf[:h_dst_close]         # D
-      h_heartbeat = conf[:h_heartbeat]         # H
-      h_p1_close = conf[:h_p1_close]           # I
-      h_p2_close = conf[:h_p2_close]           # J
-      h_p2_traffic = conf[:h_p2_traffic]       # K
-      h_query = conf[:h_query]                 # Q
-      h_response = conf[:h_response]           # R
-      h_src_close = conf[:h_src_close]         # S
-      h_traffic = conf[:h_traffic]             # T
+      head_len = conf[:head_len]                       # 头长度
+      h_a_new_source = conf[:h_a_new_source]           # A
+      h_a_new_p2 = conf[:h_a_new_p2]                   # B
+      h_dst_close = conf[:h_dst_close]                 # D
+      h_heartbeat = conf[:h_heartbeat]                 # H
+      h_p1_close = conf[:h_p1_close]                   # I
+      h_p2_close = conf[:h_p2_close]                   # J
+      h_p2_traffic = conf[:h_p2_traffic]               # K
+      h_query = conf[:h_query]                         # Q
+      h_response = conf[:h_response]                   # R
+      h_src_close = conf[:h_src_close]                 # S
+      h_traffic = conf[:h_traffic]                     # T
+      h_dst_switch_to_big = conf[:h_dst_switch_to_big] # U
+      h_p2_switch_to_big = conf[:h_p2_switch_to_big]   # V
+      h_src_switch_to_big = conf[:h_src_switch_to_big] # W
+      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多久没有收到流量重建（秒）
@@ -91,6 +95,10 @@ module Girl
       h_response = h_response ? h_response.to_s : 'R'
       h_src_close = h_src_close ? h_src_close.to_s : 'S'
       h_traffic = h_traffic ? h_traffic.to_s : 'T'
+      h_dst_switch_to_big = h_dst_switch_to_big ? h_dst_switch_to_big.to_s : 'U'
+      h_p2_switch_to_big = h_p2_switch_to_big ? h_p2_switch_to_big.to_s : 'V'
+      h_src_switch_to_big = h_src_switch_to_big ? h_src_switch_to_big.to_s : 'W'
+      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
@@ -144,6 +152,10 @@ module Girl
         h_response,
         h_src_close,
         h_traffic,
+        h_dst_switch_to_big,
+        h_p2_switch_to_big,
+        h_src_switch_to_big,
+        h_p1_switch_to_big,
         expire_connecting,
         expire_long_after,
         expire_proxy_after,

data/lib/girl/proxy_worker.rb

@@ -29,6 +29,10 @@ module Girl
       h_response,
       h_src_close,
       h_traffic,
+      h_dst_switch_to_big,
+      h_p2_switch_to_big,
+      h_src_switch_to_big,
+      h_p1_switch_to_big,
       expire_connecting,
       expire_long_after,
       expire_proxy_after,
@@ -55,7 +59,7 @@ module Girl
       @proxy_infos = {}      # proxy => {:is_syn :rbuff :recv_at :wbuff}
       @big_infos = {}        # big => {:is_syn :overflowing :rbuff :recv_at :wbuff}
       @mem_infos = {}        # mem => {:wbuff}
-      @src_infos = {}        # src => {:addrinfo :closing :destination_domain :destination_port :dst :in :is_big :is_connect :overflowing :proxy_proto :proxy_type :rbuff :src_id :wbuff}
+      @src_infos = {}        # src => {:addrinfo :closing :destination_domain :destination_port :dst :in :is_big :is_connect :overflowing :proxy_proto :proxy_type :rbuff :src_id :switched :wbuff :wpend}
       @dst_infos = {}        # dst => {:closing :connected :domain :ip :overflowing :port :src :wbuff}
       @dns_infos = {}        # dns => {:domain :src}
       @rsv_infos = {}        # rsv => {:addrinfo :domain :type}
@@ -64,7 +68,7 @@ module Girl
       @is_direct_caches = {} # ip => true / false
       @response_caches = {}  # domain => [response created_at ip is_remote]
       @response6_caches = {} # domain => [response created_at ip is_remote]
-      @p1_infos = {}         # p1 => {:closing :connected :in :is_big :overflowing :p2_id :wbuff}
+      @p1_infos = {}         # p1 => {:closing :connected :in :is_big :overflowing :p2_id :switched :wbuff :wpend}
       @appd_addr = Socket.sockaddr_in(appd_port, appd_host)
       @head_len = head_len
       @h_a_new_source = h_a_new_source
@@ -78,6 +82,10 @@ module Girl
       @h_response = h_response
       @h_src_close = h_src_close
       @h_traffic = h_traffic
+      @h_dst_switch_to_big = h_dst_switch_to_big
+      @h_p2_switch_to_big = h_p2_switch_to_big
+      @h_src_switch_to_big = h_src_switch_to_big
+      @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
@@ -246,6 +254,30 @@ module Girl
       add_write(p1)
     end
 
+    def add_p1_wpend(p1, data)
+      return if p1.nil? || p1.closed? || data.nil? || data.empty?
+      p1_info = @p1_infos[p1]
+      puts "add p1 wpend #{data.bytesize}" if @is_debug
+      p1_info[:wpend] << data
+      bytesize = p1_info[:wpend].bytesize
+      p2_id = p1_info[:p2_id]
+
+      if bytesize >= CLOSE_ABOVE
+        puts "p1 wpend full"
+        close_p1(p1)
+      end
+
+      if !p1_info[:overflowing] && (bytesize >= WBUFF_LIMIT)
+        puts "p1 overflow #{p2_id}"
+        p1_info[:overflowing] = true
+
+        if @big
+          puts 'pause big'
+          @reads.delete(@big)
+        end
+      end
+    end
+
     def add_proxy_wbuff(data)
       return if @proxy.closed? || data.nil? || data.empty?
       proxy_info = @proxy_infos[@proxy]
@@ -291,7 +323,7 @@ module Girl
       puts "add src rbuff #{data.bytesize}" if @is_debug
       src_info[:rbuff] << data
 
-      if src_info[:rbuff].bytesize >= WBUFF_LIMIT
+      if src_info[:rbuff].bytesize >= CLOSE_ABOVE
         puts "src rbuff full"
         close_src(src)
       end
@@ -327,6 +359,34 @@ module Girl
       add_write(src)
     end
 
+    def add_src_wpend(src, data)
+      return if src.nil? || src.closed? || data.nil? || data.empty?
+      src_info = @src_infos[src]
+      puts "add src wpend #{data.bytesize}" if @is_debug
+      src_info[:wpend] << data
+      bytesize = src_info[:wpend].bytesize
+      src_id = src_info[:src_id]
+      domain = src_info[:destination_domain]
+
+      if bytesize >= CLOSE_ABOVE
+        puts "src wpend full"
+        close_src(src)
+      end
+
+      if !src_info[:overflowing] && (bytesize >= WBUFF_LIMIT)
+        puts "src overflow #{src_id} #{domain}"
+        src_info[:overflowing] = true
+
+        if src_info[:proxy_type] == :direct
+          puts "pause dst"
+          @reads.delete(src_info[:dst])
+        elsif src_info[:proxy_type] == :remote
+          puts "pause big"
+          @reads.delete(@big)
+        end
+      end
+    end
+
     def add_write(sock)
       return if sock.nil? || sock.closed? || @writes.include?(sock)
       @writes << sock
@@ -521,15 +581,29 @@ module Girl
         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_infos.find{|_, info| info[:p2_id] == p2_id}
-        add_p1_wbuff(p1, data)
+        p1, p1_info = @p1_infos.find{|_, info| info[:p2_id] == p2_id}
+
+        if p1_info
+          if p1_info[:switched]
+            add_p1_wbuff(p1, data)
+          else
+            add_p1_wpend(p1, data)
+          end
+        end
       when @h_traffic
         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_infos.find{|_, info| info[:src_id] == src_id}
-        add_src_wbuff(src, data)
+        src, src_info = @src_infos.find{|_, info| info[:src_id] == src_id}
+
+        if src_info
+          if src_info[:switched]
+            add_src_wbuff(src, data)
+          else
+            add_src_wpend(src, data)
+          end
+        end
       end
     end
 
@@ -599,6 +673,39 @@ module Girl
         data = data[9..-1]
         src, _ = @src_infos.find{|_, info| info[:src_id] == src_id}
         add_src_wbuff(src, data)
+      when @h_dst_switch_to_big
+        return if data.bytesize < 9
+        src_id = data[1, 8].unpack('Q>').first
+        puts "got h_dst_switch_to_big #{src_id}" if @is_debug
+        src, src_info = @src_infos.find{|_, info| info[:src_id] == src_id}
+
+        if src_info && !src_info[:switched]
+          src_info[:switched] = true
+          
+          unless src_info[:wpend].empty?
+            data = src_info[:wpend].dup
+            domain = src_info[:destination_domain]
+            puts "move src wpend to wbuff #{domain} #{data.bytesize}"
+            src_info[:wpend].clear
+            add_src_wbuff(src, data)
+          end
+        end
+      when @h_p2_switch_to_big
+        return if data.bytesize < 9
+        p2_id = data[1, 8].unpack('Q>').first
+        puts "got h_p2_switch_to_big #{p2_id}" if @is_debug
+        p1, p1_info = @p1_infos.find{|_, info| info[:p2_id] == p2_id}
+
+        if p1_info && !p1_info[:switched]
+          p1_info[:switched] = true
+          
+          unless p1_info[:wpend].empty?
+            data = p1_info[:wpend].dup
+            puts "move p1 wpend to wbuff #{p2_id} #{data.bytesize}"
+            p1_info[:wpend].clear
+            add_p1_wbuff(p1, data)
+          end
+        end
       end
     end
 
@@ -768,10 +875,11 @@ module Girl
 
       add_read(dst, :dst)
       add_write(dst)
-      data = src_info[:rbuff].dup
-
-      unless data.empty?
+      
+      unless src_info[:rbuff].empty?
+        data = src_info[:rbuff].dup
         puts "move src rbuff to dst #{domain} #{data.bytesize}" if @is_debug
+        src_info[:rbuff].clear
         add_dst_wbuff(dst, data)
       end
     end
@@ -830,7 +938,9 @@ module Girl
         is_big: false,
         overflowing: false,
         p2_id: p2_id,
-        wbuff: ''
+        switched: false,
+        wbuff: '',
+        wpend: ''
       }
       add_read(p1, :p1)
       add_write(p1)
@@ -1161,9 +1271,16 @@ module Girl
       p1_info[:in] += data.bytesize
       p2_id = p1_info[:p2_id]
 
+      if @proxy.closed?
+        close_p1(p1)
+        return
+      end
+
       if !p1_info[:is_big] && (p1_info[:in] >= READ_SIZE)
         puts "set p1 is big #{p2_id}"
         p1_info[:is_big] = true
+        msg = "#{@h_p1_switch_to_big}#{[p2_id].pack('Q>')}"
+        add_proxy_wbuff(pack_a_chunk(msg))
       end
 
       data = pack_p2_traffic(p2_id, data)
@@ -1181,11 +1298,6 @@ module Girl
           @reads.delete(p1)
         end
       else
-        if @proxy.closed?
-          close_p1(p1)
-          return
-        end
-
         add_proxy_wbuff(data)
       end
     end
@@ -1235,7 +1347,9 @@ module Girl
         proxy_type: :uncheck,  # :uncheck / :checking / :negotiation / :remote / :direct
         rbuff: '',
         src_id: src_id,
-        wbuff: ''
+        switched: false,
+        wbuff: '',
+        wpend: ''
       }
       add_read(src, :src)
     end
@@ -1497,9 +1611,16 @@ module Girl
         src_id = src_info[:src_id]
         domain = src_info[:destination_domain]
 
+        if @proxy.closed?
+          close_src(src)
+          return
+        end
+
         if !src_info[:is_big] && (src_info[:in] >= READ_SIZE)
           puts "set src is big #{src_id} #{domain}"
           src_info[:is_big] = true
+          msg = "#{@h_src_switch_to_big}#{[src_id].pack('Q>')}"
+          add_proxy_wbuff(pack_a_chunk(msg))
         end
 
         data = pack_traffic(src_id, data)
@@ -1517,11 +1638,6 @@ module Girl
             @reads.delete(src)
           end
         else
-          if @proxy.closed?
-            close_src(src)
-            return
-          end
-
           add_proxy_wbuff(data)
         end
       when :direct
@@ -1575,7 +1691,9 @@ module Girl
         proxy_type: :uncheck,  # :uncheck / :checking / :negotiation / :remote / :direct
         rbuff: '',
         src_id: src_id,
-        wbuff: ''
+        switched: false,
+        wbuff: '',
+        wpend: ''
       }
       add_read(src, :src)
       make_tunnel(dest_ip, src)
@@ -1698,10 +1816,11 @@ module Girl
       puts "add h_a_new_source #{src_id} #{domain_port}" if @is_debug
       msg = "#{@h_a_new_source}#{[src_id].pack('Q>')}#{domain_port}"
       add_proxy_wbuff(pack_a_chunk(msg))
-      data = src_info[:rbuff].dup
-
-      unless data.empty?
+      
+      unless src_info[:rbuff].empty?
+        data = src_info[:rbuff].dup
         puts "move src rbuff to proxy #{domain} #{data.bytesize}" if @is_debug
+        src_info[:rbuff].clear
         add_proxy_wbuff(pack_traffic(src_id, data))
       end
     end
@@ -1910,7 +2029,7 @@ module Girl
       p1_info[:wbuff] = data
       p2_id = p1_info[:p2_id]
 
-      if p1_info[:overflowing] && p1_info[:wbuff].empty?
+      if p1_info[:overflowing] && p1_info[:wbuff].empty? && p1_info[:wpend].empty?
         puts "p1 empty #{p2_id}"
         p1_info[:overflowing] = false
         puts "resume big"
@@ -1989,7 +2108,7 @@ module Girl
       data = data[written..-1]
       src_info[:wbuff] = data
 
-      if src_info[:wbuff].empty? && src_info[:overflowing]
+      if src_info[:overflowing] && src_info[:wbuff].empty? && src_info[:wpend].empty?
         src_id = src_info[:src_id]
         domain = src_info[:destination_domain]
         puts "src empty #{src_id} #{domain}"

data/lib/girl/proxyd.rb

@@ -24,18 +24,22 @@ module Girl
         ims = conf[:ims]
         p2d_host = conf[:p2d_host]
         p2d_port = conf[:p2d_port]
-        head_len = conf[:head_len]               # 头长度
-        h_a_new_source = conf[:h_a_new_source]   # A
-        h_a_new_p2 = conf[:h_a_new_p2]           # B
-        h_dst_close = conf[:h_dst_close]         # D
-        h_heartbeat = conf[:h_heartbeat]         # H
-        h_p1_close = conf[:h_p1_close]           # I
-        h_p2_close = conf[:h_p2_close]           # J
-        h_p2_traffic = conf[:h_p2_traffic]       # K
-        h_query = conf[:h_query]                 # Q
-        h_response = conf[:h_response]           # R
-        h_src_close = conf[:h_src_close]         # S
-        h_traffic = conf[:h_traffic]             # T
+        head_len = conf[:head_len]                       # 头长度
+        h_a_new_source = conf[:h_a_new_source]           # A
+        h_a_new_p2 = conf[:h_a_new_p2]                   # B
+        h_dst_close = conf[:h_dst_close]                 # D
+        h_heartbeat = conf[:h_heartbeat]                 # H
+        h_p1_close = conf[:h_p1_close]                   # I
+        h_p2_close = conf[:h_p2_close]                   # J
+        h_p2_traffic = conf[:h_p2_traffic]               # K
+        h_query = conf[:h_query]                         # Q
+        h_response = conf[:h_response]                   # R
+        h_src_close = conf[:h_src_close]                 # S
+        h_traffic = conf[:h_traffic]                     # T
+        h_dst_switch_to_big = conf[:h_dst_switch_to_big] # U
+        h_p2_switch_to_big = conf[:h_p2_switch_to_big]   # V
+        h_src_switch_to_big = conf[:h_src_switch_to_big] # W
+        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_resolv_cache = conf[:expire_resolv_cache] # dns查询结果缓存多久（秒）
@@ -84,6 +88,10 @@ module Girl
       h_response = h_response ? h_response.to_s : 'R'
       h_src_close = h_src_close ? h_src_close.to_s : 'S'
       h_traffic = h_traffic ? h_traffic.to_s : 'T'
+      h_dst_switch_to_big = h_dst_switch_to_big ? h_dst_switch_to_big.to_s : 'U'
+      h_p2_switch_to_big = h_p2_switch_to_big ? h_p2_switch_to_big.to_s : 'V'
+      h_src_switch_to_big = h_src_switch_to_big ? h_src_switch_to_big.to_s : 'W'
+      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_resolv_cache = expire_resolv_cache ? expire_resolv_cache.to_i : 600
@@ -127,6 +135,10 @@ module Girl
         h_response,
         h_src_close,
         h_traffic,
+        h_dst_switch_to_big,
+        h_p2_switch_to_big,
+        h_src_switch_to_big,
+        h_p1_switch_to_big,
         expire_connecting,
         expire_long_after,
         expire_resolv_cache,

data/lib/girl/proxyd_worker.rb

@@ -23,6 +23,10 @@ module Girl
       h_response,
       h_src_close,
       h_traffic,
+      h_dst_switch_to_big,
+      h_p2_switch_to_big,
+      h_src_switch_to_big,
+      h_p1_switch_to_big,
       expire_connecting,
       expire_long_after,
       expire_resolv_cache,
@@ -43,12 +47,12 @@ module Girl
       @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}
-      @dst_infos = {}      # dst => {:closing :connected :domain :im :in :ip :is_big :overflowing :port :rbuffs :src_id :wbuff}
+      @dst_infos = {}      # dst => {:closing :connected :domain :im :in :ip :is_big :overflowing :port :rbuffs :src_id :switched :wbuff :wpend}
       @dns_infos = {}      # dns => {:domain :im :port :src_id}
       @rsv_infos = {}      # rsv => {:domain :im :near_id}
       @resolv_caches = {}  # domain => [ip created_at]
       @p2d_infos = {}      # p2d => {:im}
-      @p2_infos = {}       # p2 => {:addrinfo :closing :im :in :is_big :overflowing :p2_id :wbuff}
+      @p2_infos = {}       # p2 => {:addrinfo :closing :im :in :is_big :overflowing :p2_id :switched :wbuff :wpend}
       @head_len = head_len
       @h_a_new_source = h_a_new_source
       @h_a_new_p2 = h_a_new_p2
@@ -61,6 +65,10 @@ module Girl
       @h_response = h_response
       @h_src_close = h_src_close
       @h_traffic = h_traffic
+      @h_dst_switch_to_big = h_dst_switch_to_big
+      @h_p2_switch_to_big = h_p2_switch_to_big
+      @h_src_switch_to_big = h_src_switch_to_big
+      @h_p1_switch_to_big = h_p1_switch_to_big
       @expire_connecting = expire_connecting
       @expire_long_after = expire_long_after
       @expire_resolv_cache = expire_resolv_cache
@@ -199,6 +207,37 @@ module Girl
       add_write(dst)
     end
 
+    def add_dst_wpend(dst, data)
+      return if dst.nil? || dst.closed? || data.nil? || data.empty?
+      dst_info = @dst_infos[dst]
+      puts "add dst wpend #{data.bytesize}" if @is_debug
+      dst_info[:wpend] << data
+      bytesize = dst_info[:wpend].bytesize
+      im = dst_info[:im]
+      domain = dst_info[:domain]
+
+      if bytesize >= CLOSE_ABOVE
+        puts "dst wpend full"
+        close_dst(dst)
+        return
+      end
+
+      if !dst_info[:overflowing] && (bytesize >= WBUFF_LIMIT)
+        puts "dst overflow #{im} #{domain}"
+        dst_info[:overflowing] = true
+        im_info = @im_infos[im]
+
+        if im_info
+          big = im_info[:big]
+
+          if big
+            puts 'pause big'
+            @reads.delete(big)
+          end
+        end
+      end
+    end
+
     def add_mem_wbuff(mem, data)
       return if mem.nil? || mem.closed? || data.nil? || data.empty?
       mem_info = @mem_infos[mem]
@@ -238,6 +277,37 @@ module Girl
       add_write(p2)
     end
 
+    def add_p2_wpend(p2, data)
+      return if p2.nil? || p2.closed? || data.nil? || data.empty?
+      p2_info = @p2_infos[p2]
+      puts "add p2 wpend #{data.bytesize}" if @is_debug
+      p2_info[:wpend] << data
+      bytesize = p2_info[:wpend].bytesize
+      im = p2_info[:im]
+      p2_id = p2_info[:p2_id]
+
+      if bytesize >= CLOSE_ABOVE
+        puts "p2 wpend full"
+        close_p2(p2)
+        return
+      end
+
+      if !p2_info[:overflowing] && (bytesize >= WBUFF_LIMIT)
+        puts "p2 overflow #{im} #{p2_id}"
+        p2_info[:overflowing] = true
+        im_info = @im_infos[im]
+
+        if im_info
+          big = im_info[:big]
+
+          if big
+            puts 'pause big'
+            @reads.delete(big)
+          end
+        end
+      end
+    end
+
     def add_proxy_wbuff(proxy, data)
       return if proxy.nil? || proxy.closed? || data.nil? || data.empty?
       proxy_info = @proxy_infos[proxy]
@@ -269,27 +339,6 @@ module Girl
       end
     end
 
-    def add_src_rbuff(src_id, data)
-      src_info = @src_infos[src_id]
-
-      if src_info
-        im = src_info[:im]
-        dst = src_info[:dst]
-
-        if dst
-          add_dst_wbuff(dst, data)
-        else
-          puts "add src rbuff #{im} #{data.bytesize}" if @is_debug
-          src_info[:rbuff] << data
-
-          if src_info[:rbuff].bytesize >= WBUFF_LIMIT
-            puts "src rbuff full"
-            @src_infos.delete(src_id)
-          end
-        end
-      end
-    end
-
     def add_write(sock)
       return if sock.nil? || sock.closed? || @writes.include?(sock)
       @writes << sock
@@ -499,14 +548,37 @@ module Girl
         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_infos.find{|_, info| (info[:im] == im) && (info[:p2_id] == p2_id)}
-        add_p2_wbuff(p2, data)
+        p2, p2_info = @p2_infos.find{|_, info| (info[:im] == im) && (info[:p2_id] == p2_id)}
+        
+        if p2_info
+          if p2_info[:switched]
+            add_p2_wbuff(p2, data)
+          else
+            add_p2_wpend(p2, data)
+          end
+        end
       when @h_traffic
         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
-        add_src_rbuff(src_id, data)
+        src_info = @src_infos[src_id]
+
+        if src_info
+          dst = src_info[:dst]
+
+          if dst
+            dst_info = @dst_infos[dst]
+
+            if dst_info
+              if dst_info[:switched]
+                add_dst_wbuff(dst, data)
+              else
+                add_dst_wpend(dst, data)
+              end
+            end
+          end
+        end
       end
     end
 
@@ -561,7 +633,64 @@ module Girl
         return if data.bytesize < 9
         src_id = data[1, 8].unpack('Q>').first
         data = data[9..-1]
-        add_src_rbuff(src_id, data)
+        src_info = @src_infos[src_id]
+
+        if src_info
+          dst = src_info[:dst]
+
+          if dst
+            add_dst_wbuff(dst, data)
+          else
+            puts "add src rbuff #{im} #{data.bytesize}" if @is_debug
+            src_info[:rbuff] << data
+
+            if src_info[:rbuff].bytesize >= CLOSE_ABOVE
+              puts "src rbuff full"
+              @src_infos.delete(src_id)
+            end
+          end
+        end
+      when @h_src_switch_to_big
+        return if data.bytesize < 9
+        src_id = data[1, 8].unpack('Q>').first
+        puts "got h_src_switch_to_big #{src_id}" if @is_debug
+        src_info = @src_infos[src_id]
+
+        if src_info
+          dst = src_info[:dst]
+
+          if dst
+            dst_info = @dst_infos[dst]
+
+            if dst_info && !dst_info[:switched]
+              dst_info[:switched] = true
+              
+              unless dst_info[:wpend].empty?
+                data = dst_info[:wpend].dup
+                domain = dst_info[:domain]
+                puts "move dst wpend to wbuff #{domain} #{data.bytesize}"
+                dst_info[:wpend].clear
+                add_dst_wbuff(dst, data)
+              end
+            end
+          end
+        end
+      when @h_p1_switch_to_big
+        return if data.bytesize < 9
+        p2_id = data[1, 8].unpack('Q>').first
+        puts "got h_p1_switch_to_big #{p2_id}" if @is_debug
+        p2, p2_info = @p2_infos.find{|_, info| (info[:im] == im) && (info[:p2_id] == p2_id)}
+
+        if p2_info && !p2_info[:switched]
+          p2_info[:switched] = true
+          
+          unless p2_info[:wpend].empty?
+            data = p2_info[:wpend].dup
+            puts "move p2 wpend to wbuff #{p2_id} #{data.bytesize}"
+            p2_info[:wpend].clear
+            add_p2_wbuff(p2, data)
+          end
+        end
       end
     end
 
@@ -685,12 +814,15 @@ module Girl
         port: port,
         rbuffs: [],
         src_id: src_id,
-        wbuff: src_info[:rbuff].dup
+        switched: false,
+        wbuff: src_info[:rbuff].dup,
+        wpend: ''
       }
 
       @dst_infos[dst] = dst_info
       add_read(dst, :dst)
       add_write(dst)
+      src_info[:rbuff].clear
       src_info[:dst] = dst
     end
 
@@ -958,19 +1090,27 @@ module Girl
       im = dst_info[:im]
       src_id = dst_info[:src_id]
       domain = dst_info[:domain]
+      im_info = @im_infos[im]
 
-      if !dst_info[:is_big] && (dst_info[:in] >= READ_SIZE)
-        puts "set dst is big #{im} #{src_id} #{domain}"
-        dst_info[:is_big] = true
+      unless im_info
+        close_dst(dst)
+        return
       end
 
-      im_info = @im_infos[im]
+      proxy = im_info[:proxy]
 
-      unless im_info
+      if proxy.nil? || proxy.closed?
         close_dst(dst)
         return
       end
 
+      if !dst_info[:is_big] && (dst_info[:in] >= READ_SIZE)
+        puts "set dst is big #{im} #{src_id} #{domain}"
+        dst_info[:is_big] = true
+        msg = "#{@h_dst_switch_to_big}#{[src_id].pack('Q>')}"
+        add_proxy_wbuff(proxy, pack_a_chunk(msg))
+      end
+
       im_info[:in] += data.bytesize
       data = pack_traffic(src_id, data)
 
@@ -989,13 +1129,6 @@ module Girl
           @reads.delete(dst)
         end
       else
-        proxy = im_info[:proxy]
-
-        if proxy.nil? || proxy.closed?
-          close_dst(dst)
-          return
-        end
-
         add_proxy_wbuff(proxy, data)
       end
     end
@@ -1115,19 +1248,27 @@ module Girl
       p2_info[:in] += data.bytesize
       im = p2_info[:im]
       p2_id = p2_info[:p2_id]
+      im_info = @im_infos[im]
 
-      if !p2_info[:is_big] && (p2_info[:in] >= READ_SIZE)
-        puts "set p2 is big #{im} #{p2_id}"
-        p2_info[:is_big] = true
+      unless im_info
+        close_p2(p2)
+        return
       end
 
-      im_info = @im_infos[im]
+      proxy = im_info[:proxy]
 
-      unless im_info
+      if proxy.nil? || proxy.closed?
         close_p2(p2)
         return
       end
 
+      if !p2_info[:is_big] && (p2_info[:in] >= READ_SIZE)
+        puts "set p2 is big #{im} #{p2_id}"
+        p2_info[:is_big] = true
+        msg = "#{@h_p2_switch_to_big}#{[p2_id].pack('Q>')}"
+        add_proxy_wbuff(proxy, pack_a_chunk(msg))
+      end
+
       data = pack_p2_traffic(p2_id, data)
 
       if p2_info[:is_big]
@@ -1145,13 +1286,6 @@ module Girl
           @reads.delete(p2)
         end
       else
-        proxy = im_info[:proxy]
-
-        if proxy.nil? || proxy.closed?
-          close_p2(p2)
-          return
-        end
-
         add_proxy_wbuff(proxy, data)
       end
     end
@@ -1177,7 +1311,9 @@ module Girl
         is_big: false, # 是否收流量大户
         overflowing: false,
         p2_id: p2_id,
-        wbuff: ''
+        switched: false,
+        wbuff: '',
+        wpend: ''
       }
       add_read(p2, :p2)
       im_info = @im_infos[im]
@@ -1537,7 +1673,7 @@ module Girl
       src_id = dst_info[:src_id]
       domain = dst_info[:domain]
 
-      if dst_info[:wbuff].empty? && dst_info[:overflowing]
+      if dst_info[:overflowing] && dst_info[:wbuff].empty? && dst_info[:wpend].empty?
         puts "dst empty #{im} #{src_id} #{domain}"
         dst_info[:overflowing] = false
 
@@ -1617,7 +1753,7 @@ module Girl
       p2_info[:wbuff] = data
       p2_id = p2_info[:p2_id]
 
-      if p2_info[:overflowing] && p2_info[:wbuff].empty?
+      if p2_info[:overflowing] && p2_info[:wbuff].empty? && p2_info[:wpend].empty?
         puts "p2 empty #{im} #{p2_id}"
         p2_info[:overflowing] = false
 

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '9.1.6'.freeze
+  VERSION = '9.1.7'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 9.1.6
+  version: 9.1.7
 platform: ruby
 authors:
 - takafan