girl 0.66.0 → 0.67.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b2ece41d566cc27562dff36a48b1c53c53000390587b5e424bc38e78636e74c
-  data.tar.gz: c3d80d9b98804d0f1f37cf479052fc5c68b7cf907c800813cf3dd0d9a1691855
+  metadata.gz: 9f8e5816785b5a946fbf35da638fc06a6e496704e3271153640ceb4301a27a84
+  data.tar.gz: 12813e957b5cdb5cbf726b5078792651197c5e84cfeaa4251c491897e6017a56
 SHA512:
-  metadata.gz: c2c0d92f7dbd582f04a8d49e5285d863e790070a3ffd2c08313695f66388df436fa59441b9fef992600e1611a39053ea3df8b3f453004e2bcbc0ad126c4e257e
-  data.tar.gz: e4baabb1843d03f27101e43407927febdf0dd3a1917a30ae017297c75cb5336a32f1fb033bc484ffc0f6cf053a4b3ea63ed8726b4aece5ae662bd72767ff730d
+  metadata.gz: 9d3721a009010761bbcc196a9e650e801cecdd287410cd118981e0ceaeb1225d720f592fedfb988a5341229e9eeef53c94ab949a9562b3ad659d53d40481b9ca
+  data.tar.gz: 18b23dc9a36b43d6a9aeda602fea61398d236d1fc2baf680d312f048e2f5270479aeb88b2b7c6b445ab98e146c8444624434dfc3a91f3608708af85afb598e22

data/lib/girl/proxy_worker.rb

@@ -180,6 +180,11 @@ module Girl
                 puts "p#{ Process.pid } #{ Time.new } resume tun"
                 @tun_info[ :paused ] = false
                 add_write( @tun )
+
+                @tun_info[ :src_exts ].each do | _, src_ext |
+                  add_write( src_ext[ :src ] )
+                end
+
                 need_trigger = true
               end
 
@@ -763,7 +768,15 @@ module Girl
 
       if data.empty?
         if src_info[ :is_closing ]
-          close_src( src )
+          if @tun.closed?
+            close_src( src )
+          elsif @tun_info[ :paused ]
+            @writes.delete( src )
+          elsif !@writes.include?( @tun )
+            # 转发光了，正式关闭
+            # puts "debug2 close src after tun empty"
+            close_src( src )
+          end
         else
           @writes.delete( src )
         end

data/lib/girl/proxyd_worker.rb

@@ -171,6 +171,11 @@ module Girl
                   puts "p#{ Process.pid } #{ Time.new } resume tund"
                   tund_info[ :paused ] = false
                   add_write( tund )
+
+                  tund_info[ :dst_exts ].each do | _, dst_ext |
+                    add_write( dst_ext[ :dst ] )
+                  end
+
                   need_trigger = true
                 end
               end
@@ -560,7 +565,19 @@ module Girl
 
       if data.empty?
         if dst_info[ :is_closing ]
-          close_dst( dst )
+          if dst_info[ :tund ].closed?
+            close_dst( dst )
+          else
+            tund_info = @tund_infos[ dst_info[ :tund ] ]
+
+            if tund_info[ :paused ]
+              @writes.delete( dst )
+            elsif !@writes.include?( dst_info[ :tund ] )
+              # 转发光了，正式关闭
+              # puts "debug2 close dst after tund empty"
+              close_dst( dst )
+            end
+          end
         else
           @writes.delete( dst )
         end

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '0.66.0'.freeze
+  VERSION = '0.67.0'.freeze
 end

metadata

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