p2p2 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89df8a602b433ccee8fcd513d2c981f00fecec8e43fe87880b556e35f7d8501f
-  data.tar.gz: 5b038d3b9e91156b8a2daec9f8f68709c7e26f7dbbaac24fef988021402123a9
+  metadata.gz: 005d9edef0301a013f19fd3a2e0eb5bf9d379f0aa525110c7a897e00b6470fb1
+  data.tar.gz: 37f62fb12e229618dfb7e9fe89f7fb056d0ee6fc08cf2b74b3efc67f1478d43f
 SHA512:
-  metadata.gz: 429c289884013dcc5c38f053bdeb1bd633717fb7693bd3338587b82bbbfb8d502d4d8796b3c3d51692a070793564604cb724be8be9af62621bff4e7c4b382496
-  data.tar.gz: 3b5a22f02861ab18197630475857722c0bc51a7ab3954b375a0e218306b3f1b6d2a1950fa2a96b47f0ee9c40b5b000b3dec4402d911c88aae9f01a34257c2957
+  metadata.gz: 044470f121c082f378fd738fe287cfc0fe83cae57d4b76a96d568e92447c778497cc440255530fd9e590dbc6e07c2be716e24f90e5273e293ba94396ceff4fce
+  data.tar.gz: b30f178973e03d883345c0aaff52c4704bcb3aa909dad7471cde0146eed4521fe2fa9e38be1c6b17f249ce0c10e2b2c0097cc41c9810f545f4d532b56f5d6901

data/lib/p2p2/head.rb

@@ -5,6 +5,7 @@ module P2p2
   WMEMS_LIMIT           = 100_000          # 写后上限，到达上限暂停写
   RESUME_BELOW          = 50_000           # 降到多少以下恢复写
   EXPIRE_AFTER          = 1800             # 多久过期
+  HEARTBEAT_INTERVAL    = 3                # 心跳间隔
   STATUS_INTERVAL       = 0.3              # 发送状态间隔
   SEND_STATUS_UNTIL     = 20               # 持续的告之对面状态，直到没有流量往来，持续多少秒
   PEER_ADDR             = 1

data/lib/p2p2/p1.rb

@@ -178,15 +178,15 @@ module P2p2
           peer_addr = data[ 9..-1 ]
           info[ :peer_addr ] = data[ 9..-1 ]
           # puts "debug peer addr #{ Addrinfo.new( info[ :peer_addr ] ).ip_unpack.inspect } #{ Time.new }"
-          loop_send_heartbeat( p1 )
+          loop_punch_peer( p1 )
         when HEARTBEAT
           return if info[ :p2_addr ] || ( sockaddr != info[ :peer_addr ] )
 
           info[ :p2_addr ] = sockaddr
           # puts "debug p2 addr #{ Addrinfo.new( info[ :p2_addr ] ).ip_unpack.inspect } #{ Time.new }"
           info[ :last_traffic_at ] = now
+          loop_send_heartbeat( p1 )
           loop_send_status( p1 )
-          loop_expire( p1 )
         when A_NEW_APP
           return if sockaddr != info[ :p2_addr ]
 
@@ -621,7 +621,7 @@ module P2p2
         is_timeout = true
 
         12.times do
-          sleep 5
+          sleep HEARTBEAT_INTERVAL
 
           if p1.closed?
             is_timeout = false
@@ -648,7 +648,7 @@ module P2p2
       end
     end
 
-    def loop_send_heartbeat( p1 )
+    def loop_punch_peer( p1 )
       Thread.new do
         20.times do
           break if p1.closed?
@@ -674,20 +674,24 @@ module P2p2
       end
     end
 
-    def loop_expire( p1 )
+    def loop_send_heartbeat( p1 )
       Thread.new do
         loop do
-          sleep 5
+          sleep HEARTBEAT_INTERVAL
           break if p1.closed?
 
           p1_info = @infos[ p1 ]
 
-          @mutex.synchronize do
-            if Time.new - p1_info[ :last_traffic_at ] > EXPIRE_AFTER
+          if Time.new - p1_info[ :last_traffic_at ] > EXPIRE_AFTER
+            @mutex.synchronize do
               @ctlw.write( [ CTL_CLOSE, p1.object_id ].pack( 'CQ>' ) )
-            else
-              send_heartbeat( p1, p1_info[ :p2_addr ] )
             end
+            
+            return
+          end
+
+          @mutex.synchronize do
+            send_heartbeat( p1, p1_info[ :p2_addr ] )
           end
         end
       end

data/lib/p2p2/p2.rb

@@ -231,15 +231,15 @@ module P2p2
 
           info[ :peer_addr ] = data[ 9..-1 ]
           # puts "debug peer addr #{ Addrinfo.new( info[ :peer_addr ] ).ip_unpack.inspect } #{ Time.new }"
-          loop_send_heartbeat( p2 )
+          loop_punch_peer( p2 )
         when HEARTBEAT
           return if info[ :p1_addr ] || ( sockaddr != info[ :peer_addr ] )
 
           info[ :p1_addr ] = sockaddr
           # puts "debug p1 addr #{ Addrinfo.new( info[ :p1_addr ] ).ip_unpack.inspect } #{ Time.new }"
           info[ :last_traffic_at ] = now
+          loop_send_heartbeat( p2 )
           loop_send_status( p2 )
-          loop_expire( p2 )
         when PAIRED
           return if sockaddr != info[ :p1_addr ]
 
@@ -651,7 +651,7 @@ module P2p2
         is_timeout = true
 
         12.times do
-          sleep 5
+          sleep HEARTBEAT_INTERVAL
 
           if p2.closed?
             is_timeout = false
@@ -678,7 +678,7 @@ module P2p2
       end
     end
 
-    def loop_send_heartbeat( p2 )
+    def loop_punch_peer( p2 )
       Thread.new do
         20.times do
           break if p2.closed?
@@ -704,10 +704,10 @@ module P2p2
       end
     end
 
-    def loop_expire( p2 )
+    def loop_send_heartbeat( p2 )
       Thread.new do
         loop do
-          sleep 5
+          sleep HEARTBEAT_INTERVAL
           break if p2.closed?
 
           p2_info = @infos[ p2 ]
@@ -716,10 +716,12 @@ module P2p2
             @mutex.synchronize do
               @ctlw.write( [ CTL_CLOSE, p2.object_id ].pack( 'CQ>' ) )
             end
-          else
-            @mutex.synchronize do
-              send_heartbeat( p2, p2_info[ :p1_addr ] )
-            end
+
+            break
+          end
+
+          @mutex.synchronize do
+            send_heartbeat( p2, p2_info[ :p1_addr ] )
           end
         end
       end

data/lib/p2p2/version.rb

@@ -1,3 +1,3 @@
 module P2p2
-  VERSION = "0.13.0"
+  VERSION = '0.13.1'.freeze
 end

metadata

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