girl 9.1.9 → 9.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8903a1ddd8c490bd520c6684412c5e3c9346d6a2b2b78717c33e68c9e4bf25cd
-  data.tar.gz: 92af066c0dd66a32a2cf762a7cbb0107712d22055b5bab04df500ada06b89c13
+  metadata.gz: d155f995eb24eb7cc229250e742c6774227409957f11174c083d5ffbc0786327
+  data.tar.gz: d9209954dea7a1a83e1afcb5caeb2c11df7f6a979da98148b9c89d20ab362558
 SHA512:
-  metadata.gz: de9cd1b645c64497a7c07774fec41cfc8082b6950aab8501cfabaa92847bab097ba7e4ac999efac499c72072c0db87e6efbf94ad301c0a5d6db6c60c0bf6f16c
-  data.tar.gz: 994c9a97eeee729ab09167d61bfaf5f4215437173547e8cca4ff71bde88b7957b0ad728fb16ae406c09fafa781ca9d2246ac70fa83db1d89fcbac83b2169fee6
+  metadata.gz: f173264881db0d06eaa9ed74b067344ce26b26e942c46e283ce9a7018f22f05948e3a34d54041a1bb2f263ff41046671f4873352c81e546adc1fefe15d372f20
+  data.tar.gz: 99b35c8abceafb34f19660f9721a737928ba9d652e171d5ebe7c309a032d9649e6dee86c80a2c63a5730e01ac05469a369fba202e2d8b718b13a5daa22feec47

data/lib/girl/proxyd_worker.rb

@@ -1585,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?
@@ -1611,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|
@@ -1640,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]
 
@@ -1663,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]
@@ -1679,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"
@@ -1727,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?
@@ -1749,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]
@@ -1759,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"
@@ -1794,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.9'.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.9
+  version: 9.2.0
 platform: ruby
 authors:
 - takafan