p2p2 0.26.0 → 0.27.0

data/lib/p2p2/paird.rb

@@ -0,0 +1,42 @@
+require 'json'
+require 'p2p2/head'
+require 'p2p2/paird_worker'
+require 'p2p2/version'
+require 'socket'
+
+##
+# P2p2::Paird - 配对服务。
+#
+module P2p2
+  class Paird
+
+    def initialize( config_path = nil )
+      if config_path then
+        conf = JSON.parse( IO.binread( config_path ), symbolize_names: true )
+        paird_port = conf[ :paird_port ]
+        infod_port = conf[ :infod_port ]
+      end
+
+      unless paird_port then
+        paird_port = 4040
+      end
+
+      unless infod_port then
+        infod_port = 4050
+      end
+
+      puts "p2p2 paird #{ P2p2::VERSION }"
+      puts "paird #{ paird_port } infod #{ infod_port }"
+
+      worker = P2p2::PairdWorker.new( paird_port, infod_port )
+
+      Signal.trap( :TERM ) do
+        puts 'exit'
+        worker.quit!
+      end
+
+      worker.looping
+    end
+
+  end
+end

data/lib/p2p2/paird_worker.rb

@@ -0,0 +1,158 @@
+module P2p2
+  class PairdWorker
+
+    ##
+    # initialize
+    #
+    def initialize( paird_port, infod_port )
+      @reads = []
+      @roles = {}      # :paird / :infod
+      @room_infos = {} # title => { p1_paird, p1_addrinfo, p2_paird, p2_addrinfo, updated_at }
+      new_pairds( paird_port )
+      new_a_infod( infod_port )
+    end
+
+    ##
+    # looping
+    #
+    def looping
+      puts "#{ Time.new } looping"
+
+      loop do
+        rs, _ = IO.select( @reads )
+
+        rs.each do | sock |
+          role = @roles[ sock ]
+
+          case role
+          when :paird
+            read_paird( sock )
+          when :infod
+            read_infod( sock )
+          else
+            puts "#{ Time.new } read unknown role #{ role }"
+          end
+        end
+      end
+    rescue Interrupt => e
+      puts e.class
+      quit!
+    end
+
+    ##
+    # quit!
+    #
+    def quit!
+      exit
+    end
+
+    private
+
+    ##
+    # add read
+    #
+    def add_read( sock, role = nil )
+      return if sock.nil? || sock.closed? || @reads.include?( sock )
+      @reads << sock
+
+      if role then
+        @roles[ sock ] = role
+      end
+    end
+
+    ##
+    # new a infod
+    #
+    def new_a_infod( infod_port )
+      infod = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
+      infod.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
+      infod.bind( Socket.sockaddr_in( infod_port, '127.0.0.1' ) )
+
+      puts "#{ Time.new } infod bind on #{ infod_port }"
+      add_read( infod, :infod )
+    end
+
+    ##
+    # new pairds
+    #
+    def new_pairds( begin_port )
+      10.times do | i |
+        paird_port = begin_port + i
+        paird = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
+        paird.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
+        paird.bind( Socket.sockaddr_in( paird_port, '0.0.0.0' ) )
+        puts "#{ Time.new } paird bind on #{ paird_port }"
+        add_read( paird, :paird )
+      end
+    end
+
+    ##
+    # send data
+    #
+    def send_data( sock, data, target_addr )
+      begin
+        sock.sendmsg_nonblock( data, 0, target_addr )
+      rescue Exception => e
+        puts "#{ Time.new } sendmsg #{ e.class }"
+      end
+    end
+
+    ##
+    # read paird
+    #
+    def read_paird( paird )
+      data, addrinfo, rflags, *controls = paird.recvmsg
+      return if data =~ /\r|\n/
+
+      is_p2 = ( data[ 0 ] == TO )
+      title = is_p2 ? data[ 1..-1 ] : data
+      return if title.empty? || ( title.size > ROOM_TITLE_LIMIT )
+
+      room_info = @room_infos[ title ]
+
+      unless is_p2 then
+        if room_info then
+          room_info[ :p1_paird ] = paird
+          room_info[ :p1_addrinfo ] = addrinfo
+          room_info[ :updated_at ] = Time.new
+        else
+          @room_infos[ title ] = {
+            p1_paird: paird,
+            p1_addrinfo: addrinfo,
+            p2_paird: nil,
+            p2_addrinfo: nil,
+            updated_at: Time.new
+          }
+        end
+
+        return
+      end
+
+      return unless room_info
+
+      room_info[ :p2_paird ] = paird
+      room_info[ :p2_addrinfo ] = addrinfo
+
+      puts "#{ Time.new } paired #{ room_info[ :p1_addrinfo ].inspect } #{ room_info[ :p2_addrinfo ].inspect }"
+      send_data( room_info[ :p1_paird ], room_info[ :p2_addrinfo ].to_sockaddr, room_info[ :p1_addrinfo ] )
+      send_data( room_info[ :p2_paird ], room_info[ :p1_addrinfo ].to_sockaddr, room_info[ :p2_addrinfo ] )
+    end
+
+    ##
+    # read infod
+    #
+    def read_infod( infod )
+      data, addrinfo, rflags, *controls = infod.recvmsg
+
+      data2 = @room_infos.sort_by{ | _, info | info[ :updated_at ] }.reverse.map do | title, info |
+        [
+          info[ :updated_at ],
+          title + ' ' * ( ROOM_TITLE_LIMIT - title.size ),
+          info[ :p1_addrinfo ].ip_unpack.join( ':' )
+        ].join( ' ' )
+      end.join( "\n" )
+
+      send_data( infod, data2, addrinfo )
+    end
+  end
+end

data/lib/p2p2/version.rb

@@ -1,3 +1,3 @@
-module P2p2
-  VERSION = '0.26.0'.freeze
-end
+module P2p2
+  VERSION = '0.27.0'.freeze
+end

data/p2p2.gemspec

@@ -1,34 +1,32 @@
-
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "p2p2/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "p2p2"
-  spec.version       = P2p2::VERSION
-  spec.authors       = ["takafan"]
-  spec.email         = ["qqtakafan@gmail.com"]
-
-  spec.summary       = %q{p2p}
-  spec.description   = %q{p2p通道。nat穿透。}
-  spec.homepage      = "https://github.com/takafan/p2p2"
-  spec.license       = "MIT"
-
-  spec.files         = %w[
-p2p2.gemspec
-lib/p2p2.rb
-lib/p2p2/custom.rb
-lib/p2p2/head.rb
-lib/p2p2/p1_custom.rb
-lib/p2p2/p1_worker.rb
-lib/p2p2/p1.rb
-lib/p2p2/p2_custom.rb
-lib/p2p2/p2_worker.rb
-lib/p2p2/p2.rb
-lib/p2p2/p2pd_worker.rb
-lib/p2p2/p2pd.rb
-lib/p2p2/version.rb
-  ]
-
-  spec.require_paths = ["lib"]
-end
+
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "p2p2/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "p2p2"
+  spec.version       = P2p2::VERSION
+  spec.authors       = ["takafan"]
+  spec.email         = ["qqtakafan@gmail.com"]
+
+  spec.summary       = %q{p2p}
+  spec.description   = %q{p2p连回家。}
+  spec.homepage      = "https://github.com/takafan/p2p2"
+  spec.license       = "MIT"
+
+  spec.files         = %w[
+p2p2.gemspec
+lib/p2p2.rb
+lib/p2p2/concurrent_hash.rb
+lib/p2p2/head.rb
+lib/p2p2/p1_worker.rb
+lib/p2p2/p1.rb
+lib/p2p2/p2_worker.rb
+lib/p2p2/p2.rb
+lib/p2p2/paird_worker.rb
+lib/p2p2/paird.rb
+lib/p2p2/version.rb
+  ]
+
+  spec.require_paths = ["lib"]
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: p2p2
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0
 platform: ruby
 authors:
 - takafan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-29 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies: []
-description: p2p通道。nat穿透。
+description: p2p连回家。
 email:
 - qqtakafan@gmail.com
 executables: []
@@ -18,23 +18,21 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/p2p2.rb
-- lib/p2p2/custom.rb
+- lib/p2p2/concurrent_hash.rb
 - lib/p2p2/head.rb
 - lib/p2p2/p1.rb
-- lib/p2p2/p1_custom.rb
 - lib/p2p2/p1_worker.rb
 - lib/p2p2/p2.rb
-- lib/p2p2/p2_custom.rb
 - lib/p2p2/p2_worker.rb
-- lib/p2p2/p2pd.rb
-- lib/p2p2/p2pd_worker.rb
+- lib/p2p2/paird.rb
+- lib/p2p2/paird_worker.rb
 - lib/p2p2/version.rb
 - p2p2.gemspec
 homepage: https://github.com/takafan/p2p2
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -49,8 +47,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: p2p
 test_files: []

data/lib/p2p2/custom.rb

@@ -1,12 +0,0 @@
-module P2p2
-  module Custom
-    def encode( data )
-      # overwrite me, you'll be free
-      data
-    end
-
-    def decode( data )
-      data
-    end
-  end
-end

data/lib/p2p2/p1_custom.rb

@@ -1,7 +0,0 @@
-require 'p2p2/custom'
-
-module P2p2
-  class P1Custom
-    include Custom
-  end
-end

data/lib/p2p2/p2_custom.rb

@@ -1,7 +0,0 @@
-require 'p2p2/custom'
-
-module P2p2
-  class P2Custom
-    include Custom
-  end
-end

data/lib/p2p2/p2pd.rb

@@ -1,120 +0,0 @@
-require 'json'
-require 'p2p2/head'
-require 'p2p2/p2pd_worker'
-require 'p2p2/version'
-require 'socket'
-
-##
-# P2p2::P2pd - 配对服务。
-#
-# 包结构
-# ======
-#
-# tund-p2pd, tun-p2pd:
-#
-# room
-#
-# p2pd-tund, p2pd-tun:
-#
-# Q>: 0  ctlmsg -> C:  1 peer addr -> tun sockaddr / tund sockaddr
-#
-# tun-tund:
-#
-# Q>: 0  ctlmsg -> C: 2 heartbeat     -> C: random char
-#                     3 a new source  -> Q>: src id
-#                     4 paired        -> Q>: src id -> n: dst port
-#                     5 dest status   -> n: dst port -> Q>: biggest relayed dst pack id -> Q>: continue src pack id
-#                     6 source status -> Q>: src id -> Q>: biggest relayed src pack id -> Q>: continue dst pack id
-#                     7 miss          -> Q>/n: src id / dst port -> Q>: pack id begin -> Q>: pack id end
-#                     8 fin1          -> Q>/n: src id / dst port -> Q>: biggest src pack id / biggest dst pack id -> Q>: continue dst pack id / continue src pack id
-#                     9 not use
-#                    10 fin2          -> Q>/n: src id / dst port
-#                    11 not use
-#                    12 tund fin
-#                    13 tun fin
-#
-# Q>: 1+ pack_id -> Q>/n: src id / dst port -> traffic
-#
-# close logic
-# ===========
-#
-# 1-1. after close src -> dst closed ? no -> send fin1
-# 1-2. tun recv fin2 -> del src ext
-#
-# 2-1. tun recv fin1 -> all traffic received ? -> close src after write
-# 2-2. tun recv traffic -> dst closed and all traffic received ? -> close src after write
-# 2-3. after close src -> dst closed ? yes -> del src ext -> send fin2
-#
-# 3-1. after close dst -> src closed ? no -> send fin1
-# 3-2. tund recv fin2 -> del dst ext
-#
-# 4-1. tund recv fin1 -> all traffic received ? -> close dst after write
-# 4-2. tund recv traffic -> src closed and all traffic received ? -> close dst after write
-# 4-3. after close dst -> src closed ? yes -> del dst ext -> send fin2
-#
-module P2p2
-  class P2pd
-
-    def initialize( config_path = nil )
-      unless config_path
-        config_path = File.expand_path( '../p2p2.conf.json', __FILE__ )
-      end
-
-      unless File.exist?( config_path )
-        raise "missing config file #{ config_path }"
-      end
-
-      conf = JSON.parse( IO.binread( config_path ), symbolize_names: true )
-      p2pd_port = conf[ :p2pd_port ]
-      p2pd_tmp_dir = conf[ :p2pd_tmp_dir ]
-
-      unless p2pd_port
-        p2pd_port = 2020
-      end
-
-      unless p2pd_tmp_dir
-        p2pd_tmp_dir = '/tmp/p2p2.p2pd'
-      end
-
-      unless File.exist?( p2pd_tmp_dir )
-        Dir.mkdir( p2pd_tmp_dir )
-      end
-
-      title = "p2p2 p2pd #{ P2p2::VERSION }"
-      puts title
-      puts "p2pd port #{ p2pd_port }"
-      puts "p2pd tmp dir #{ p2pd_tmp_dir }"
-
-      if RUBY_PLATFORM.include?( 'linux' )
-        $0 = title
-
-        pid = fork do
-          $0 = 'p2p2 p2pd worker'
-          worker = P2p2::P2pdWorker.new( p2pd_port, p2pd_tmp_dir )
-
-          Signal.trap( :TERM ) do
-            puts 'exit'
-            worker.quit!
-          end
-
-          worker.looping
-        end
-
-        Signal.trap( :TERM ) do
-          puts 'trap TERM'
-
-          begin
-            Process.kill( :TERM, pid )
-          rescue Errno::ESRCH => e
-            puts e.class
-          end
-        end
-
-        Process.waitall
-      else
-        P2p2::P2pdWorker.new( p2pd_port, p2pd_tmp_dir ).looping
-      end
-    end
-
-  end
-end