p2p2 0.8.8 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76fa91db2c3174b30d207958c1363dfff3e299b2f5cea766a3002a793cd33e3c
-  data.tar.gz: e6cfe0a6f60d1f6f5cce3c19edabc21631ef29d680d03a7c4e157a9f6d003312
+  metadata.gz: 4a5f46d1721cdfa12068de247463e0b44225c073d236928a30ffe726b81ad341
+  data.tar.gz: e53f2852e23d3e6679c1c961fdac1189663fa840729a9dc7bbac812c27fdbbf6
 SHA512:
-  metadata.gz: 8d03a42f707fd4a4540f1f80fe9d7dff21aa9f713affbda68fb6057868f94f32b41f8ef48662bdc2fc046b8ccc19ce9a5f26d7771501a9f2c4561319b9fbb613
-  data.tar.gz: 3bab16a0ad35bb0b6d42c4b1cef529ee9775fb0b717829bee3997a3ee73489766d348ad161d30fda4a0a558b9bcfd75b0dce388eb51af32579fabb8cbd182949
+  metadata.gz: d378a5d52df695c89a77ae9532c75bb19cf3c4b3a3de765e480f6ae8a7f09bfe3d77e8e7686a71e825a6ba7207061a9a467df758b21283f73f3056b7b0a4e0d3
+  data.tar.gz: 668f2a7d06f4e07dd0ad5adcd22a7fbc4bbd3c0bc7931fa4e0fa801c62b197fbefd52a13532feed14e877d36e9b047008033243f8dc682853cb03aeaa2dcdd9a

data/lib/p2p2/p1.rb

@@ -48,7 +48,7 @@ module P2p2
       ctlr, ctlw = IO.pipe
       @ctlw = ctlw
       @roles[ ctlr ] = :ctlr
-      add_read( ctlr )
+      @reads << ctlr
     end
 
     def looping
@@ -155,7 +155,7 @@ module P2p2
         p1_info[ :wbuffs ].clear
       end
 
-      if p1_info[ :p2_addr ] && !p1_info[ :paused ]
+      unless p1_info[ :paused ]
         add_write( p1 )
       end
     end
@@ -176,15 +176,12 @@ module P2p2
           return if sockaddr != @p2pd_sockaddr
 
           unless info[ :p2_addr ]
-            # puts "debug peer addr #{ data[ 9..-1 ].inspect } #{ Time.new }"
             info[ :p2_addr ] = data[ 9..-1 ]
+            # puts "debug peer addr #{ Addrinfo.new( info[ :p2_addr ] ).ip_unpack.inspect } #{ Time.new }"
             info[ :last_traffic_at ] = now
-            add_write( p1 )
+            send_heartbeat( p1 )
             loop_send_status( p1 )
           end
-
-          ctlmsg = [ 0, HEARTBEAT, rand( 128 ) ].pack( 'Q>CC' )
-          send_pack( p1, ctlmsg, info[ :p2_addr ] )
         when A_NEW_APP
           return if sockaddr != info[ :p2_addr ]
 
@@ -219,12 +216,13 @@ module P2p2
               biggest_pack_id: 0,      # 发到几
               continue_app_pack_id: 0, # 收到几
               pieces: {},              # 跳号包 app_pack_id => data
-              app_id: app_id,          # 对面id
               is_app_closed: false,    # 对面是否已关闭
               biggest_app_pack_id: 0,  # 对面发到几
               completed_pack_id: 0,    # 完成到几（对面收到几）
-              last_traffic_at: nil     # 有收到有效流量，或者发出流量的时间戳
+              last_traffic_at: nil     # 收到有效流量，或者发出流量的时间戳
             }
+
+            info[ :shadow_ids ][ shadow_id ] = app_id
             info[ :app_ids ][ app_id ] = shadow_id
             add_read( shadow )
           end
@@ -357,7 +355,7 @@ module P2p2
 
           send_pack( p1, ctlmsg, info[ :p2_addr ] )
 
-          shadow_id = info[ :app_ids ].delete( app_id )
+          shadow_id = info[ :app_ids ][ app_id ]
           return unless shadow_id
 
           del_shadow_ext( info, shadow_id )
@@ -377,6 +375,8 @@ module P2p2
         return
       end
 
+      return if sockaddr != info[ :p2_addr ]
+
       shadow_id = info[ :app_ids ][ app_id ]
       return unless shadow_id
 
@@ -589,13 +589,14 @@ module P2p2
         chunks: [],          # 块队列 filename
         spring: 0,           # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
         p2_addr: nil,        # 远端地址
-        app_ids: {},         # app_id => shadow_id
         shadow_exts: {},     # 长命信息 shadow_id => {}
+        shadow_ids: {},      # shadow_id => app_id
+        app_ids: {},         # app_id => shadow_id
         fin1s: [],           # fin1: shadow已关闭，等待对面收完流量 shadow_id
         fin2s: [],           # fin2: 流量已收完 shadow_id
         paused: false,       # 是否暂停写
         resendings: [],      # 重传队列 [ shadow_id, pack_id ]
-        last_traffic_at: nil # 有收到有效流量，或者发出流量的时间戳
+        last_traffic_at: nil # 收到有效流量，或者发出流量的时间戳
       }
 
       @p1 = p1
@@ -624,8 +625,7 @@ module P2p2
             end
           else
             @mutex.synchronize do
-              ctlmsg = [ 0, HEARTBEAT, rand( 128 ) ].pack( 'Q>CC' )
-              send_pack( p1, ctlmsg, p1_info[ :p2_addr ] )
+              send_heartbeat( p1 )
             end
           end
         end
@@ -732,6 +732,12 @@ module P2p2
       end
     end
 
+    def send_heartbeat( p1 )
+      info = @infos[ p1 ]
+      ctlmsg = [ 0, HEARTBEAT, rand( 128 ) ].pack( 'Q>CC' )
+      send_pack( p1, ctlmsg, info[ :p2_addr ] )
+    end
+
     def send_pack( sock, data, target_sockaddr )
       begin
         sock.sendmsg( data, 0, target_sockaddr )
@@ -812,8 +818,6 @@ module P2p2
       ext = p1_info[ :shadow_exts ].delete( shadow_id )
 
       if ext
-        p1_info[ :app_ids ].delete( ext[ :app_id ] )
-
         ext[ :chunks ].each do | filename |
           begin
             File.delete( File.join( @shadow_chunk_dir, filename ) )
@@ -821,6 +825,12 @@ module P2p2
           end
         end
       end
+
+      app_id = p1_info[ :shadow_ids ].delete( shadow_id )
+
+      if app_id
+        p1_info[ :app_ids ].delete( app_id )
+      end
     end
 
   end

data/lib/p2p2/p2.rb

@@ -48,7 +48,7 @@ module P2p2
       ctlr, ctlw = IO.pipe
       @ctlw = ctlw
       @roles[ ctlr ] = :ctlr
-      add_read( ctlr )
+      @reads << ctlr
     end
 
     def looping
@@ -142,6 +142,7 @@ module P2p2
         p2: @p2
       }
 
+      @p2_info[ :waitings ][ app_id ] = []
       @p2_info[ :app_exts ][ app_id ] = {
         app: app,
         wbuff: '',                  # 写前缓存
@@ -153,11 +154,10 @@ module P2p2
         biggest_pack_id: 0,         # 发到几
         continue_shadow_pack_id: 0, # 收到几
         pieces: {},                 # 跳号包 shadow_pack_id => data
-        shadow_id: nil,             # 对面id
         is_shadow_closed: false,    # 对面是否已关闭
         biggest_shadow_pack_id: 0,  # 对面发到几
         completed_pack_id: 0,       # 完成到几（对面收到几）
-        last_traffic_at: nil        # 有收到有效流量，或者发出流量的时间戳
+        last_traffic_at: nil        # 收到有效流量，或者发出流量的时间戳
       }
 
       add_read( app )
@@ -185,8 +185,16 @@ module P2p2
         return
       end
 
+      app_id = app.object_id
       p2_info = @infos[ p2 ]
-      p2_info[ :wbuffs ] << [ app.object_id, data ]
+      shadow_id = p2_info[ :app_ids ][ app_id ]
+
+      if p2_info[ :p1_addr ].nil? || shadow_id.nil?
+        p2_info[ :waitings ][ app_id ] << data
+        return
+      end
+
+      p2_info[ :wbuffs ] << [ app_id, data ]
 
       if p2_info[ :wbuffs ].size >= WBUFFS_LIMIT
         spring = p2_info[ :chunks ].size > 0 ? ( p2_info[ :spring ] + 1 ) : 0
@@ -198,11 +206,13 @@ module P2p2
         p2_info[ :wbuffs ].clear
       end
 
-      if p2_info[ :p1_addr ] && !p2_info[ :paused ]
+      unless p2_info[ :paused ]
         add_write( p2 )
       end
     end
 
+
+
     ##
     # read p2
     #
@@ -219,26 +229,33 @@ module P2p2
           return if sockaddr != @p2pd_sockaddr
 
           unless info[ :p1_addr ]
-            # puts "debug peer addr #{ data[ 9..-1 ].inspect } #{ Time.new }"
             info[ :p1_addr ] = data[ 9..-1 ]
+            # puts "debug peer addr #{ Addrinfo.new( info[ :p1_addr ] ).ip_unpack.inspect } #{ Time.new }"
             info[ :last_traffic_at ] = now
-            add_write( p2 )
+            send_heartbeat( p2 )
             loop_send_status( p2 )
           end
-
-          ctlmsg = [ 0, HEARTBEAT, rand( 128 ) ].pack( 'Q>CC' )
-          send_pack( p2, ctlmsg, info[ :p1_addr ] )
         when PAIRED
           return if sockaddr != info[ :p1_addr ]
 
           app_id, shadow_id = data[ 9, 16 ].unpack( 'Q>Q>' )
+          return if info[ :app_ids ].include?( app_id )
+
           # puts "debug got PAIRED #{ app_id } #{ shadow_id } #{ Time.new }"
+          info[ :app_ids ][ app_id ] = shadow_id
+          info[ :shadow_ids ][ shadow_id ] = app_id
+          buffs = info[ :waitings ][ app_id ]
 
-          ext = info[ :app_exts ][ app_id ]
-          return if ext.nil? || ext[ :shadow_id ]
+          if buffs.any?
+            # puts "debug move #{ buffs.size } waiting buffs to wbuffs #{ Time.new } p#{ Process.pid }"
 
-          ext[ :shadow_id ] = shadow_id
-          info[ :shadow_ids ][ shadow_id ] = app_id
+            buffs.each do | buff |
+              info[ :wbuffs ] << [ app_id, buff ]
+            end
+
+            buffs.clear
+            add_write( p2 )
+          end
         when SHADOW_STATUS
           return if sockaddr != info[ :p1_addr ]
 
@@ -358,7 +375,7 @@ module P2p2
 
           send_pack( p2, ctlmsg, info[ :p1_addr ] )
 
-          app_id = info[ :shadow_ids ].delete( shadow_id )
+          app_id = info[ :shadow_ids ][ shadow_id ]
           return unless app_id
 
           del_app_ext( info, app_id )
@@ -376,6 +393,8 @@ module P2p2
         return
       end
 
+      return if sockaddr != info[ :p1_addr ]
+
       app_id = info[ :shadow_ids ][ shadow_id ]
       return unless app_id
 
@@ -592,18 +611,20 @@ module P2p2
       p2.bind( Socket.sockaddr_in( 0, '0.0.0.0' ) )
 
       p2_info = {
+        waitings: {},        # 还没连上p1，或者还没配上shadow，暂存流量 app_id => buffs[]
         wbuffs: [],          # 写前缓存 [ app_id, data ]
         caches: [],          # 块读出缓存 [ app_id, data ]
         chunks: [],          # 块队列 filename
         spring: 0,           # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
         p1_addr: nil,        # 远端地址
-        shadow_ids: {},      # shadow_id => app_id
         app_exts: {},        # 传输相关 app_id => {}
+        app_ids: {},         # app_id => shadow_id
+        shadow_ids: {},      # shadow_id => app_id
         fin1s: [],           # fin1: app已关闭，等待对面收完流量 app_id
         fin2s: [],           # fin2: 流量已收完 app_id
         paused: false,       # 是否暂停写
         resendings: [],      # 重传队列 [ app_id, pack_id ]
-        last_traffic_at: nil # 有收到有效流量，或者发出流量的时间戳
+        last_traffic_at: nil # 收到有效流量，或者发出流量的时间戳
       }
 
       @p2 = p2
@@ -632,8 +653,7 @@ module P2p2
             end
           else
             @mutex.synchronize do
-              ctlmsg = [ 0, HEARTBEAT, rand( 128 ) ].pack( 'Q>CC' )
-              send_pack( p2, ctlmsg, p2_info[ :p1_addr ] )
+              send_heartbeat( p2 )
             end
           end
         end
@@ -752,15 +772,16 @@ module P2p2
           p2_info = @infos[ p2 ]
 
           if p2_info[ :p1_addr ]
-            ext = p2_info[ :app_exts ][ app.object_id ]
+            app_id = app.object_id
+            shadow_id = p2_info[ :app_ids ][ app_id ]
 
-            if ext.nil? || ext[ :shadow_id ]
+            if shadow_id
               # puts "debug break a new app loop #{ Time.new }"
               break
             end
 
             @mutex.synchronize do
-              ctlmsg = [ 0, A_NEW_APP, app.object_id ].pack( 'Q>CQ>' )
+              ctlmsg = [ 0, A_NEW_APP, app_id ].pack( 'Q>CQ>' )
               # puts "debug send a new app #{ Time.new }"
               send_pack( p2, ctlmsg, p2_info[ :p1_addr ] )
             end
@@ -771,6 +792,12 @@ module P2p2
       end
     end
 
+    def send_heartbeat( p2 )
+      info = @infos[ p2 ]
+      ctlmsg = [ 0, HEARTBEAT, rand( 128 ) ].pack( 'Q>CC' )
+      send_pack( p2, ctlmsg, info[ :p1_addr ] )
+    end
+
     def send_pack( sock, data, target_sockaddr )
       begin
         sock.sendmsg( data, 0, target_sockaddr )
@@ -842,11 +869,10 @@ module P2p2
     end
 
     def del_app_ext( p2_info, app_id )
+      p2_info[ :waitings ].delete( app_id )
       ext = p2_info[ :app_exts ].delete( app_id )
 
       if ext
-        p2_info[ :shadow_ids ].delete( ext[ :shadow_id ] )
-
         ext[ :chunks ].each do | filename |
           begin
             File.delete( File.join( @app_chunk_dir, filename ) )
@@ -854,6 +880,12 @@ module P2p2
           end
         end
       end
+
+      shadow_id = p2_info[ :app_ids ].delete( app_id )
+
+      if shadow_id
+        p2_info[ :shadow_ids ].delete( shadow_id )
+      end
     end
 
   end

data/lib/p2p2/version.rb

@@ -1,3 +1,3 @@
 module P2p2
-  VERSION = "0.8.8"
+  VERSION = "0.9.0"
 end

metadata

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