p2p2 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f592be172011dd06ec67c135960733566f00fa1eb7a1c38653dc1b9cbe243d04
-  data.tar.gz: 13fe9278adb7a30300da415ab14b6e9b6559640a90a800852a6fec960485f11c
+  metadata.gz: b842b71209b16ce71a511f18800372793f12450b2b5fa19d63e734cb5af9ae4f
+  data.tar.gz: 5f5de12057407febe98aa968320be17346824120ba881c2556d768b351dd36d7
 SHA512:
-  metadata.gz: ac62a35279f5634182596b8fa62e4e17968d8aa732113071cdf65d875a7a85491f35383e576787b203709b1ae3553daa407afd746fcb64cbe899fab057b90226
-  data.tar.gz: ae071136ca81b01503a7d25e56944bcc693c11697a65f26cb5670a217d18306dbab9e1dfcacae197b7e5292d475660a2ed3eea5ae6337201fb353989b83b3fcf
+  metadata.gz: 9c9bd5ddf876bcf5686110c2e2a399b8c6f0cb5dc308773e84d060f31a9df86160022d6acb4dce45ee4e4e895ce9dde98493dc1e22763d358565b559beb8e1eb
+  data.tar.gz: d909aee5d91e2ebca9b41966e5a49150ba6741b7c69559f169b346045edc9a3922cfbccebaf3939dbdb1abb85f2c0e509f49663a9fcff744e21f5e30d61c2dbf

data/lib/p2p2/p1.rb

@@ -107,7 +107,6 @@ module P2p2
         sock = @socks[ sock_id ]
 
         if sock
-          # puts "debug ctlr close #{ sock_id } #{ Time.new }"
           add_closing( sock )
         end
       when CTL_RESUME
@@ -115,7 +114,6 @@ module P2p2
         sock = @socks[ sock_id ]
 
         if sock
-          puts "ctlr resume #{ sock_id } #{ Time.new }"
           add_write( sock )
         end
       end
@@ -186,6 +184,7 @@ module P2p2
           # puts "debug p2 addr #{ Addrinfo.new( info[ :p2_addr ] ).ip_unpack.inspect } #{ Time.new }"
           info[ :last_traffic_at ] = now
           loop_send_heartbeat( p1 )
+          loop_check_expire( p1 )
           loop_send_status( p1 )
         when A_NEW_APP
           return if sockaddr != info[ :p2_addr ]
@@ -212,6 +211,8 @@ module P2p2
 
             info[ :shadow_exts ][ shadow_id ] = {
               shadow: shadow,
+              created_at: now,
+              last_recv_at: nil,       # 上一次收到流量的时间
               wbuff: '',               # 写前缓存
               cache: '',               # 块读出缓存
               chunks: [],              # 块队列，写前达到块大小时结一个块 filename
@@ -424,6 +425,8 @@ module P2p2
       else
         ext[ :pieces ][ pack_id ] = data
       end
+
+      ext[ :last_recv_at ] = now
     end
 
     ##
@@ -680,18 +683,43 @@ module P2p2
           sleep HEARTBEAT_INTERVAL
           break if p1.closed?
 
+          @mutex.synchronize do
+            p1_info = @infos[ p1 ]
+            send_heartbeat( p1, p1_info[ :p2_addr ] )
+          end
+        end
+      end
+    end
+
+    def loop_check_expire( p1 )
+      Thread.new do
+        loop do
+          sleep 60
+          break if p1.closed?
+
+          now = Time.new
           p1_info = @infos[ p1 ]
 
-          if Time.new - p1_info[ :last_traffic_at ] > EXPIRE_AFTER
+          if now - p1_info[ :last_traffic_at ] > EXPIRE_AFTER
             @mutex.synchronize do
+              # puts "debug ctlw close p1 #{ p1.object_id } #{ Time.new } p#{ Process.pid }"
               @ctlw.write( [ CTL_CLOSE, p1.object_id ].pack( 'CQ>' ) )
             end
 
-            return
+            break
           end
 
-          @mutex.synchronize do
-            send_heartbeat( p1, p1_info[ :p2_addr ] )
+          exts = p1_info[ :shadow_exts ].select{ | _, ext | now - ext[ :created_at ] > 5 }
+
+          if exts.any?
+            @mutex.synchronize do
+              exts.each do | shadow_id, ext |
+                if ext[ :last_recv_at ].nil? || ( now - ext[ :last_recv_at ] > EXPIRE_AFTER )
+                  # puts "debug ctlw close shadow #{ shadow_id } #{ Time.new } p#{ Process.pid }"
+                  @ctlw.write( [ CTL_CLOSE, shadow_id ].pack( 'CQ>' ) )
+                end
+              end
+            end
           end
         end
       end
@@ -731,6 +759,7 @@ module P2p2
 
           if p1_info[ :paused ] && ( p1_info[ :shadow_exts ].map{ | _, ext | ext[ :wmems ].size }.sum < RESUME_BELOW )
             @mutex.synchronize do
+              puts "ctlw resume #{ p1.object_id } #{ Time.new }"
               @ctlw.write( [ CTL_RESUME, p1.object_id ].pack( 'CQ>' ) )
               p1_info[ :paused ] = false
             end

data/lib/p2p2/p2.rb

@@ -109,7 +109,6 @@ module P2p2
         sock = @socks[ sock_id ]
 
         if sock
-          # puts "debug ctlr close #{ sock_id } #{ Time.new }"
           add_closing( sock )
         end
       when CTL_RESUME
@@ -117,7 +116,6 @@ module P2p2
         sock = @socks[ sock_id ]
 
         if sock
-          puts "ctlr resume #{ sock_id } #{ Time.new }"
           add_write( sock )
         end
       end
@@ -148,6 +146,8 @@ module P2p2
       @p2_info[ :waitings ][ app_id ] = []
       @p2_info[ :app_exts ][ app_id ] = {
         app: app,
+        created_at: Time.new,
+        last_recv_at: nil,          # 上一次收到流量的时间
         wbuff: '',                  # 写前缓存
         cache: '',                  # 块读出缓存
         chunks: [],                 # 块队列，写前达到块大小时结一个块 filename
@@ -239,6 +239,7 @@ module P2p2
           # puts "debug p1 addr #{ Addrinfo.new( info[ :p1_addr ] ).ip_unpack.inspect } #{ Time.new }"
           info[ :last_traffic_at ] = now
           loop_send_heartbeat( p2 )
+          loop_check_expire( p2 )
           loop_send_status( p2 )
         when PAIRED
           return if sockaddr != info[ :p1_addr ]
@@ -443,6 +444,8 @@ module P2p2
       else
         ext[ :pieces ][ pack_id ] = data
       end
+
+      ext[ :last_recv_at ] = now
     end
 
     ##
@@ -710,18 +713,43 @@ module P2p2
           sleep HEARTBEAT_INTERVAL
           break if p2.closed?
 
+          @mutex.synchronize do
+            p2_info = @infos[ p2 ]
+            send_heartbeat( p2, p2_info[ :p1_addr ] )
+          end
+        end
+      end
+    end
+
+    def loop_check_expire( p2 )
+      Thread.new do
+        loop do
+          sleep 60
+          break if p2.closed?
+
+          now = Time.new
           p2_info = @infos[ p2 ]
 
-          if Time.new - p2_info[ :last_traffic_at ] > EXPIRE_AFTER
+          if now - p2_info[ :last_traffic_at ] > EXPIRE_AFTER
             @mutex.synchronize do
+              # puts "debug ctlw close p2 #{ p2.object_id } #{ Time.new } p#{ Process.pid }"
               @ctlw.write( [ CTL_CLOSE, p2.object_id ].pack( 'CQ>' ) )
             end
 
             break
           end
 
-          @mutex.synchronize do
-            send_heartbeat( p2, p2_info[ :p1_addr ] )
+          exts = p2_info[ :app_exts ].select{ | _, ext | now - ext[ :created_at ] > 5 }
+
+          if exts.any?
+            @mutex.synchronize do
+              exts.each do | app_id, ext |
+                if ext[ :last_recv_at ].nil? || ( now - ext[ :last_recv_at ] > EXPIRE_AFTER )
+                  # puts "debug ctlw close app #{ app_id } #{ Time.new } p#{ Process.pid }"
+                  @ctlw.write( [ CTL_CLOSE, app_id ].pack( 'CQ>' ) )
+                end
+              end
+            end
           end
         end
       end
@@ -761,6 +789,7 @@ module P2p2
 
           if p2_info[ :paused ] && ( p2_info[ :app_exts ].map{ | _, ext | ext[ :wmems ].size }.sum < RESUME_BELOW )
             @mutex.synchronize do
+              puts "ctlw resume #{ p2.object_id } #{ Time.new }"
               @ctlw.write( [ CTL_RESUME, p2.object_id ].pack( 'CQ>' ) )
               p2_info[ :paused ] = false
             end

data/lib/p2p2/version.rb

@@ -1,3 +1,3 @@
 module P2p2
-  VERSION = '0.13.2'.freeze
+  VERSION = '0.13.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: p2p2
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-31 00:00:00.000000000 Z
+date: 2019-09-01 00:00:00.000000000 Z
 dependencies: []
 description: 内网里的任意应用，访问另一个内网里的应用服务端。
 email: