p2p2 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 260396471208a2a26bf462d5715a8b3d19a7376446dd3d5eefdd5018dcd3cf1b
-  data.tar.gz: 4a2784bf9e55e8d3318f295901aa269f6dfb6ac6ba7c75f6bcf0197e613a606a
+  metadata.gz: 3a2f86bbf773a9d8c58099c2eecfb6d97ef0de25269a864d0566285ddd716d3a
+  data.tar.gz: d1ead80d1fbbecf687ddd0e47eb68ba44813134f52a23ee0ed135fe14c13a899
 SHA512:
-  metadata.gz: 27bc8ed465e51237c4e5c2c4234d5a983a50a8cdb9a24bc7d473d5d92bb08c36179c4e5f13ab24b790dcd8f117f1a35147a014054dd5a5c8055bcbe161f4605d
-  data.tar.gz: 0fbef6c2104a359183f06a87a4121a8d63dae70e4a48ea8055366e55f549299bfec84ae9b0b4a10ae92124e34a31a2c2e1102ae7126db483b7d528c41e09bde6
+  metadata.gz: 02af82e8959a69458fa5fb709386b2f4e283de4a71ccea60a0ddd2a1caf75801313f104140abe2b0394c5fdd7db46c8bbd6d7c745418e765b82c28a931221b44
+  data.tar.gz: 632689f40841f9bf7f75cc4dd111bba6bd619b4a4c24afbbd6e28828e5ed71772c0726474db082b26e129e067f679ef8a26686280c1f7dd657b05e550d833c51

data/lib/p2p2/p1.rb

@@ -10,8 +10,8 @@ module P2p2
   class P1
 
     ##
-    # roomd_host    匹配服务器ip
-    # roomd_port    匹配服务器端口
+    # roomd_host    配对服务器ip
+    # roomd_port    配对服务器端口
     # appd_host     任意的一个应用的ip
     # appd_port     应用端口
     # title         约定的房间名
@@ -35,8 +35,8 @@ module P2p2
 
       ctlr, ctlw = IO.pipe
       @ctlw = ctlw
-      @reads << ctlr
       @roles[ ctlr ] = :ctlr
+      @reads << ctlr
 
       new_room
     end
@@ -329,11 +329,11 @@ module P2p2
 
     def close_sock( sock )
       sock.close
+      @reads.delete( sock )
+      @writes.delete( sock )
       @closings.delete( sock )
       @renewings.delete( sock )
       @roles.delete( sock )
-      @reads.delete( sock )
-      @writes.delete( sock )
       info = @infos.delete( sock )
 
       if info && info[ :chunks ]

data/lib/p2p2/p2.rb

@@ -10,10 +10,10 @@ module P2p2
   class P2
 
     ##
-    # roomd_host    匹配服务器ip
-    # roomd_port    匹配服务器端口
-    # appd_host     '0.0.0.0'，或者只允许本地访问：'127.0.0.1'
-    # appd_port     代理p1的应用端口
+    # roomd_host    配对服务器ip
+    # roomd_port    配对服务器端口
+    # appd_host     代理地址 不限制访问：'0.0.0.0'，或者只允许本地访问：'127.0.0.1'
+    # appd_port     代理端口
     # title         约定的房间名
     # app_chunk_dir 文件缓存目录，缓存app来不及写的流量
     # p2_chunk_dir  文件缓存目录，缓存p2来不及写的流量
@@ -339,11 +339,11 @@ module P2p2
 
     def close_sock( sock )
       sock.close
+      @reads.delete( sock )
+      @writes.delete( sock )
       @closings.delete( sock )
       @renewings.delete( sock )
       @roles.delete( sock )
-      @reads.delete( sock )
-      @writes.delete( sock )
       info = @infos.delete( sock )
 
       if info && info[ :chunks ]

data/lib/p2p2/p2pd.rb

@@ -37,7 +37,7 @@ module P2p2
       @reads = []
       @writes = []
       @closings = []
-      @rooms = {} # object_id => room
+      @socks = {} # object_id => sock
       @pending_p1s = {} # title => room
       @pending_p2s = {} # title => room
       @roles = {} # sock => :roomd / :room
@@ -45,8 +45,8 @@ module P2p2
 
       ctlr, ctlw = IO.pipe
       @ctlw = ctlw
-      @reads << ctlr
       @roles[ ctlr ] = :ctlr
+      @reads << ctlr
 
       new_roomd
     end
@@ -112,10 +112,10 @@ module P2p2
       case sock.read( 1 )
       when CTL_CLOSE_ROOM
         room_id = sock.read( 4 ).unpack( 'N' ).first
-        room = @rooms[ room_id ]
+        room = @socks[ room_id ]
 
         if room
-          add_closing( @rooms[ room_id ] )
+          add_closing( room )
         end
       end
     end
@@ -127,7 +127,7 @@ module P2p2
         return
       end
 
-      @rooms[ room.object_id ] = room
+      @socks[ room.object_id ] = room
       @roles[ room ] = :room
       @infos[ room ] = {
         title: nil,
@@ -264,7 +264,7 @@ module P2p2
       @reads.delete( sock )
       @writes.delete( sock )
       @closings.delete( sock )
-      @rooms.delete( sock.object_id )
+      @socks.delete( sock.object_id )
       @roles.delete( sock )
       info = @infos.delete( sock )
 

data/lib/p2p2/version.rb

@@ -1,3 +1,3 @@
 module P2p2
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

metadata

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