p2p2 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaf6056ab90a68ff5b5ce6fb268cb372c4a61b14db0db3a85535673baaf64c23
-  data.tar.gz: 32b5cf384d5662ba67907abd45f83f4a3eae4f274b26091e5d8ef2f607ace663
+  metadata.gz: 2af1321c46206a876f75cd74f50aab8b5ed2951d92ae7e70c2dce68d1b29a9cc
+  data.tar.gz: 1a85a3f615031cc62d321d0aedb1400417c4a312e586081d95ca0784192ccf34
 SHA512:
-  metadata.gz: 31237ac774d0eec40cf85501f399fc7bb63f113288d863d46745a48971b88d050e0fb2fe2ea2130ad86465a9e6e97424dc9fd82113de960b520f42048abe580a
-  data.tar.gz: ae550abcea97666ea3c9361ca948be3d83341a101aa2806c836cf30771980cb41ced8c80f52d0fa287411ed30c934fc6c9fc895c5952825ddbe9a0f3fdfbef84
+  metadata.gz: af88e6936b1bc6ffc54fc50a42591a40d218a8ce46eb8df3396065575a3b8b5422fa5ecfe3427d45eff9efdf9408f1d99aba988a49995bc207b9f13fe4954561
+  data.tar.gz: affad3adbe2c1d027fe55309e1dc915e9687af5f256a962aef34c1c260943e2347bf1c4d54d924373cefbe3e6985e8601295eae690f9169efe0078b37060107f

data/lib/p2p2/p1.rb

@@ -57,6 +57,8 @@ module P2p2
 
           ws.each do | sock |
             case @roles[ sock ]
+            when :room
+              write_room( sock )
             when :p1
               write_p1( sock )
             when :app
@@ -93,17 +95,14 @@ module P2p2
         data = sock.read_nonblock( PACK_SIZE )
       rescue IO::WaitReadable, Errno::EINTR, IO::WaitWritable => e
         return
-      rescue EOFError, Errno::ECONNRESET => e
+      rescue Errno::ECONNREFUSED, EOFError, Errno::ECONNRESET => e
         puts "read room #{ e.class } #{ Time.new }"
 
         if @is_renew
           raise e
         end
 
-        close_sock( @room )
-        sleep 5
-        new_room
-        @is_renew = true
+        add_closing( sock )
         return
       end
 
@@ -197,6 +196,29 @@ module P2p2
       add_write( @p1, data, NEED_CHUNK )
     end
 
+    def write_room( sock )
+      if @closings.include?( sock )
+        close_sock( sock )
+        sleep 5
+        new_room
+        @is_renew = true
+        @closings.delete( sock )
+
+        return
+      end
+
+      info = @infos[ sock ]
+      data = info[ :wbuff ]
+
+      if data.empty?
+        @writes.delete( sock )
+        return
+      end
+
+      sock.write( data )
+      info[ :wbuff ].clear
+    end
+
     def write_p1( sock )
       if @closings.include?( sock )
         close_sock( sock )
@@ -343,9 +365,15 @@ module P2p2
       room = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
       room.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
       room.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
-      room.connect( @roomd_sockaddr )
 
+      begin
+        room.connect_nonblock( @roomd_sockaddr )
+      rescue IO::WaitWritable, Errno::EINTR
+      end
+
+      bytes = @title.unpack( "C*" ).map{ | c | c.chr }.join
       room_info = {
+        wbuff: [ [ SET_TITLE, bytes.size ].pack( 'Cn' ), bytes ].join,
         p2_sockaddr: nil,
         rep2p: 0
       }
@@ -354,9 +382,7 @@ module P2p2
       @roles[ room ] = :room
       @infos[ room ] = room_info
       @reads << room
-
-      bytes = @title.unpack( "C*" ).map{ | c | c.chr }.join
-      @room.write( [ [ SET_TITLE, bytes.size ].pack( 'Cn' ), bytes ].join )
+      @writes << room
     end
 
     def new_p1

data/lib/p2p2/p2.rb

@@ -59,6 +59,8 @@ module P2p2
 
           ws.each do | sock |
             case @roles[ sock ]
+            when :room
+              write_room( sock )
             when :p2
               write_p2( sock )
             when :app
@@ -154,17 +156,14 @@ module P2p2
         data = sock.read_nonblock( PACK_SIZE )
       rescue IO::WaitReadable, Errno::EINTR, IO::WaitWritable => e
         return
-      rescue EOFError, Errno::ECONNRESET => e
+      rescue Errno::ECONNREFUSED, EOFError, Errno::ECONNRESET => e
         puts "read room #{ e.class } #{ Time.new }"
 
         if @is_renew
           raise e
         end
 
-        close_sock( @room )
-        sleep 5
-        new_room
-        @is_renew = true
+        add_closing( sock )
         return
       end
 
@@ -209,6 +208,29 @@ module P2p2
       add_write( @app, data, NEED_CHUNK )
     end
 
+    def write_room( sock )
+      if @closings.include?( sock )
+        close_sock( sock )
+        sleep 5
+        new_room
+        @is_renew = true
+        @closings.delete( sock )
+
+        return
+      end
+
+      info = @infos[ sock ]
+      data = info[ :wbuff ]
+
+      if data.empty?
+        @writes.delete( sock )
+        return
+      end
+
+      sock.write( data )
+      info[ :wbuff ].clear
+    end
+
     def write_p2( sock )
       if @closings.include?( sock )
         close_sock( sock )
@@ -367,9 +389,15 @@ module P2p2
       room = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
       room.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
       room.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
-      room.connect( @roomd_sockaddr )
 
+      begin
+        room.connect_nonblock( @roomd_sockaddr )
+      rescue IO::WaitWritable, Errno::EINTR
+      end
+
+      bytes = @title.unpack( "C*" ).map{ | c | c.chr }.join
       room_info = {
+        wbuff: [ [ PAIRING, bytes.size ].pack( 'Cn' ), bytes ].join,
         p1_sockaddr: nil,
         rep2p: 0
       }
@@ -378,9 +406,7 @@ module P2p2
       @roles[ room ] = :room
       @infos[ room ] = room_info
       @reads << room
-
-      bytes = @title.unpack( "C*" ).map{ | c | c.chr }.join
-      @room.write( [ [ PAIRING, bytes.size ].pack( 'Cn' ), bytes ].join )
+      @writes << room
     end
 
     def new_p2

data/lib/p2p2/version.rb

@@ -1,3 +1,3 @@
 module P2p2
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: p2p2
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - takafan